summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authoritojun <itojun@pkgsrc.org>2000-08-14 06:56:55 +0000
committeritojun <itojun@pkgsrc.org>2000-08-14 06:56:55 +0000
commit51b0ed2f2ce195bcad86c5ccc4337a514992b843 (patch)
tree2c2351d52dfbd773f2672c33ac95b83d29300d6d /mail
parentf2980f3b042a932dec7f0d9ce36a4a5c34595216 (diff)
downloadpkgsrc-51b0ed2f2ce195bcad86c5ccc4337a514992b843.tar.gz
we should not play with "install_root" in INSTALL.sh.
Diffstat (limited to 'mail')
-rw-r--r--mail/postfix-current/files/patch-sum4
-rw-r--r--mail/postfix-current/patches/patch-aa28
2 files changed, 12 insertions, 20 deletions
diff --git a/mail/postfix-current/files/patch-sum b/mail/postfix-current/files/patch-sum
index 0007e0a113f..387497e3d61 100644
--- a/mail/postfix-current/files/patch-sum
+++ b/mail/postfix-current/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/08/14 05:49:43 itojun Exp $
+$NetBSD: patch-sum,v 1.6 2000/08/14 06:56:55 itojun Exp $
-MD5 (patch-aa) = def7410118f309d537f9d2a2da964f9d
+MD5 (patch-aa) = 68ffad3419a83994f0813e7b96798435
MD5 (patch-af) = f441d8a6613df506f8fbe9b87537035e
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
index cf8d3d8739b..7dbf58bcdd1 100644
--- a/mail/postfix-current/patches/patch-aa
+++ b/mail/postfix-current/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2000/08/14 05:49:45 itojun Exp $
---- INSTALL.sh.orig Mon Aug 14 14:40:29 2000
-+++ INSTALL.sh Mon Aug 14 14:43:19 2000
+$NetBSD: patch-aa,v 1.5 2000/08/14 06:56:56 itojun Exp $
+--- INSTALL.sh.orig Mon Aug 14 15:47:00 2000
++++ INSTALL.sh Mon Aug 14 15:47:55 2000
@@ -8,35 +8,35 @@
-cat <<EOF
@@ -70,17 +70,14 @@ $NetBSD: patch-aa,v 1.4 2000/08/14 05:49:45 itojun Exp $
+#
+#EOF
-@@ -104,17 +104,14 @@
-
--install_root=/
-+install_root=__PREFIX
+@@ -106,15 +106,12 @@
tempdir=`pwd`
-config_directory=/etc/postfix
-daemon_directory=/usr/libexec/postfix
-command_directory=/usr/sbin
-+config_directory=/share/postfix
-+daemon_directory=/libexec/postfix
-+command_directory=/sbin
++config_directory=__PREFIX/share/postfix
++daemon_directory=__PREFIX/libexec/postfix
++command_directory=__PREFIX/sbin
queue_directory=/var/spool/postfix
-if [ -f /usr/lib/sendmail ]
- then sendmail_path=/usr/lib/sendmail
@@ -88,13 +85,13 @@ $NetBSD: patch-aa,v 1.4 2000/08/14 05:49:45 itojun Exp $
-fi
-newaliases_path=/usr/bin/newaliases
-mailq_path=/usr/bin/mailq
-+sendmail_path=/libexec/postfix/sendmail
++sendmail_path=__PREFIX/libexec/postfix/sendmail
+#newaliases_path=/usr/bin/newaliases
+#mailq_path=/usr/bin/mailq
mail_owner=postfix
setgid=no
-manpages=/usr/local/man
-+manpages=/man
++manpages=__PREFIX/man
@@ -122,14 +119,14 @@
@@ -176,12 +173,7 @@ $NetBSD: patch-aa,v 1.4 2000/08/14 05:49:45 itojun Exp $
+# compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH
+# compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH
}
-@@ -286,4 +283,2 @@
- bin/postconf -c $CONFIG_DIRECTORY -e \
-- "daemon_directory = $daemon_directory" \
-- "command_directory = $command_directory" \
- "queue_directory = $queue_directory" \
-@@ -292,9 +287,9 @@
+@@ -292,9 +289,9 @@
-(echo "# This file was generated by $0"
-for name in sendmail_path newaliases_path mailq_path setgid manpages