mail/postfix/patches/200-manpages.patch

   1 diff -Naur postfix-2.10.2/conf/post-install postfix-2.10.2_patched/conf/post-install
   2 --- postfix-2.10.2/conf/post-install    2013-06-13 18:07:46.000000000 +0400
   3 +++ postfix-2.10.2_patched/conf/post-install    2013-11-19 21:17:49.572820573 +0400
   4 @@ -359,10 +359,10 @@
   5
   6  # Sanity checks
   7
   8 -case $manpage_directory in
   9 - no) echo $0: Error: manpage_directory no longer accepts \"no\" values. 1>&2
  10 -     echo Try again with \"$0 manpage_directory=/pathname ...\". 1>&2; exit 1;;
  11 -esac
  12 +#case $manpage_directory in
  13 +# no) echo $0: Error: manpage_directory no longer accepts \"no\" values. 1>&2
  14 +#     echo Try again with \"$0 manpage_directory=/pathname ...\". 1>&2; exit 1;;
  15 +#esac
  16
  17  case $setgid_group in
  18   no) echo $0: Error: setgid_group no longer accepts \"no\" values. 1>&2
  19 @@ -370,7 +370,7 @@
  20  esac
  21
  22  for path in "$daemon_directory" "$command_directory" "$queue_directory" \
  23 -    "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory" \
  24 +    "$sendmail_path" "$newaliases_path" "$mailq_path" \
  25      "$meta_directory"
  26  do
  27     case "$path" in
  28 @@ -379,7 +379,7 @@
  29     esac
  30  done
  31
  32 -for path in "$html_directory" "$readme_directory" "$shlib_directory"
  33 +for path in "$html_directory" "$readme_directory" "$shlib_directory" "$manpage_directory"
  34  do
  35     case "$path" in
  36     /*) ;;
  37 diff -Naur postfix-2.10.2/postfix-install postfix-2.10.2_patched/postfix-install
  38 --- postfix-2.10.2/postfix-install      2012-05-22 23:40:29.000000000 +0400
  39 +++ postfix-2.10.2_patched/postfix-install      2013-11-19 21:12:20.694160734 +0400
  40 @@ -543,13 +543,13 @@
  41       exit 1;;
  42  esac
  43
  44 -case "$manpage_directory" in
  45 - no) (echo $0: Error: the manpage_directory parameter no longer accepts
  46 -     echo \"no\" values.  Try again with \"manpage_directory=/path/name\"
  47 -     echo on the command line or execute \"make install\" and specify
  48 -     echo manpage_directory interactively.) | ${FMT} 1>&2
  49 -     exit 1;;
  50 -esac
  51 +#case "$manpage_directory" in
  52 +# no) (echo $0: Error: the manpage_directory parameter no longer accepts
  53 +#     echo \"no\" values.  Try again with \"manpage_directory=/path/name\"
  54 +#     echo on the command line or execute \"make install\" and specify
  55 +#     echo manpage_directory interactively.) | ${FMT} 1>&2
  56 +#     exit 1;;
  57 +#esac
  58
  59  for path in "$html_directory" "$readme_directory" "$shlib_directory"
  60  do
  61 @@ -562,7 +562,7 @@
  62  done
  63
  64  for path in "$daemon_directory" "$data_directory" "$command_directory" "$queue_directory" \
  65 -    "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory" \
  66 +    "$sendmail_path" "$newaliases_path" "$mailq_path" \
  67      "$meta_directory"
  68  do
  69     case "$path" in
  70 @@ -758,8 +758,8 @@
  71                 compare_or_replace $mode "$owner" "$group" html/$file \
  72                     $HTML_DIRECTORY/$file || exit 1;;
  73         '$manpage_directory')
  74 -           check_parent $MANPAGE_DIRECTORY/$file || exit 1
  75 -           compare_or_replace $mode "$owner" "$group" man/$file \
  76 +           test "$manpage_directory" = "no" || check_parent $MANPAGE_DIRECTORY/$file || exit 1
  77 +           test "$manpage_directory" = "no" || compare_or_replace $mode "$owner" "$group" man/$file \
  78                 $MANPAGE_DIRECTORY/$file || exit 1;;
  79         '$readme_directory')
  80             test "$readme_directory" = "no" ||