Module Name: src
Committed By: tron
Date: Tue Jun 23 17:58:31 UTC 2009
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi
src/etc: Makefile
src/external: Makefile
src/external/ibm-public: Makefile
src/gnu/usr.sbin: Makefile
src/usr.sbin/postinstall: postinstall
Removed Files:
src/gnu/usr.sbin/postfix: Makefile Makefile.inc
src/gnu/usr.sbin/postfix/README_FILES: Makefile
src/gnu/usr.sbin/postfix/anvil: Makefile
src/gnu/usr.sbin/postfix/bounce: Makefile
src/gnu/usr.sbin/postfix/cleanup: Makefile
src/gnu/usr.sbin/postfix/conf: Makefile
src/gnu/usr.sbin/postfix/discard: Makefile
src/gnu/usr.sbin/postfix/dns: Makefile
src/gnu/usr.sbin/postfix/error: Makefile
src/gnu/usr.sbin/postfix/flush: Makefile
src/gnu/usr.sbin/postfix/global: Makefile
src/gnu/usr.sbin/postfix/html: Makefile
src/gnu/usr.sbin/postfix/local: Makefile
src/gnu/usr.sbin/postfix/man: Makefile
src/gnu/usr.sbin/postfix/man/man1: Makefile
src/gnu/usr.sbin/postfix/man/man5: Makefile
src/gnu/usr.sbin/postfix/man/man8: Makefile
src/gnu/usr.sbin/postfix/master: Makefile
src/gnu/usr.sbin/postfix/masterlib: Makefile
src/gnu/usr.sbin/postfix/milter: Makefile
src/gnu/usr.sbin/postfix/oqmgr: Makefile
src/gnu/usr.sbin/postfix/pickup: Makefile
src/gnu/usr.sbin/postfix/pipe: Makefile
src/gnu/usr.sbin/postfix/postalias: Makefile
src/gnu/usr.sbin/postfix/postcat: Makefile
src/gnu/usr.sbin/postfix/postconf: Makefile
src/gnu/usr.sbin/postfix/postdrop: Makefile
src/gnu/usr.sbin/postfix/postfix: Makefile
src/gnu/usr.sbin/postfix/postfix-etc: Makefile README
src/gnu/usr.sbin/postfix/postfix-script: Makefile
src/gnu/usr.sbin/postfix/postkick: Makefile
src/gnu/usr.sbin/postfix/postlock: Makefile
src/gnu/usr.sbin/postfix/postlog: Makefile
src/gnu/usr.sbin/postfix/postmap: Makefile
src/gnu/usr.sbin/postfix/postqueue: Makefile
src/gnu/usr.sbin/postfix/postsuper: Makefile
src/gnu/usr.sbin/postfix/proxymap: Makefile
src/gnu/usr.sbin/postfix/qmgr: Makefile
src/gnu/usr.sbin/postfix/scache: Makefile
src/gnu/usr.sbin/postfix/sendmail: Makefile
src/gnu/usr.sbin/postfix/showq: Makefile
src/gnu/usr.sbin/postfix/smtp: Makefile
src/gnu/usr.sbin/postfix/smtpd: Makefile
src/gnu/usr.sbin/postfix/spawn: Makefile
src/gnu/usr.sbin/postfix/tls: Makefile
src/gnu/usr.sbin/postfix/tlsmgr: Makefile
src/gnu/usr.sbin/postfix/trivial-rewrite: Makefile
src/gnu/usr.sbin/postfix/util: Makefile
src/gnu/usr.sbin/postfix/verify: Makefile
src/gnu/usr.sbin/postfix/virtual: Makefile
src/gnu/usr.sbin/postfix/xsasl: Makefile
Log Message:
Switch to building Postfix 2.6.2 via "external/ibm-public/postfix".
To generate a diff of this commit:
cvs rdiff -u -r1.819 -r1.820 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1272 -r1.1273 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.210 -r1.211 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1141 -r1.1142 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.366 -r1.367 src/etc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/Makefile
cvs rdiff -u -r1.15 -r1.16 src/gnu/usr.sbin/Makefile
cvs rdiff -u -r1.17 -r0 src/gnu/usr.sbin/postfix/Makefile
cvs rdiff -u -r1.19 -r0 src/gnu/usr.sbin/postfix/Makefile.inc
cvs rdiff -u -r1.13 -r0 src/gnu/usr.sbin/postfix/README_FILES/Makefile
cvs rdiff -u -r1.1 -r0 src/gnu/usr.sbin/postfix/anvil/Makefile
cvs rdiff -u -r1.8 -r0 src/gnu/usr.sbin/postfix/bounce/Makefile
cvs rdiff -u -r1.7 -r0 src/gnu/usr.sbin/postfix/cleanup/Makefile
cvs rdiff -u -r1.10 -r0 src/gnu/usr.sbin/postfix/conf/Makefile
cvs rdiff -u -r1.1 -r0 src/gnu/usr.sbin/postfix/discard/Makefile
cvs rdiff -u -r1.7 -r0 src/gnu/usr.sbin/postfix/dns/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/error/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/flush/Makefile
cvs rdiff -u -r1.16 -r0 src/gnu/usr.sbin/postfix/global/Makefile
cvs rdiff -u -r1.18 -r0 src/gnu/usr.sbin/postfix/html/Makefile
cvs rdiff -u -r1.5 -r0 src/gnu/usr.sbin/postfix/local/Makefile
cvs rdiff -u -r1.1 -r0 src/gnu/usr.sbin/postfix/man/Makefile
cvs rdiff -u -r1.12 -r0 src/gnu/usr.sbin/postfix/man/man1/Makefile
cvs rdiff -u -r1.12 -r0 src/gnu/usr.sbin/postfix/man/man5/Makefile
cvs rdiff -u -r1.13 -r0 src/gnu/usr.sbin/postfix/man/man8/Makefile
cvs rdiff -u -r1.6 -r0 src/gnu/usr.sbin/postfix/master/Makefile
cvs rdiff -u -r1.7 -r0 src/gnu/usr.sbin/postfix/masterlib/Makefile
cvs rdiff -u -r1.3 -r0 src/gnu/usr.sbin/postfix/milter/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/oqmgr/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/pickup/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/pipe/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/postalias/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/postcat/Makefile
cvs rdiff -u -r1.14 -r0 src/gnu/usr.sbin/postfix/postconf/Makefile
cvs rdiff -u -r1.5 -r0 src/gnu/usr.sbin/postfix/postdrop/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/postfix/Makefile
cvs rdiff -u -r1.7 -r0 src/gnu/usr.sbin/postfix/postfix-etc/Makefile
cvs rdiff -u -r1.1 -r0 src/gnu/usr.sbin/postfix/postfix-etc/README
cvs rdiff -u -r1.3 -r0 src/gnu/usr.sbin/postfix/postfix-script/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/postkick/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/postlock/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/postlog/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/postmap/Makefile
cvs rdiff -u -r1.3 -r0 src/gnu/usr.sbin/postfix/postqueue/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/postsuper/Makefile
cvs rdiff -u -r1.1 -r0 src/gnu/usr.sbin/postfix/proxymap/Makefile
cvs rdiff -u -r1.8 -r0 src/gnu/usr.sbin/postfix/qmgr/Makefile
cvs rdiff -u -r1.1 -r0 src/gnu/usr.sbin/postfix/scache/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/sendmail/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/showq/Makefile
cvs rdiff -u -r1.11 -r0 src/gnu/usr.sbin/postfix/smtp/Makefile
cvs rdiff -u -r1.10 -r0 src/gnu/usr.sbin/postfix/smtpd/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/spawn/Makefile
cvs rdiff -u -r1.3 -r0 src/gnu/usr.sbin/postfix/tls/Makefile
cvs rdiff -u -r1.3 -r0 src/gnu/usr.sbin/postfix/tlsmgr/Makefile
cvs rdiff -u -r1.4 -r0 src/gnu/usr.sbin/postfix/trivial-rewrite/Makefile
cvs rdiff -u -r1.19 -r0 src/gnu/usr.sbin/postfix/util/Makefile
cvs rdiff -u -r1.1 -r0 src/gnu/usr.sbin/postfix/verify/Makefile
cvs rdiff -u -r1.2 -r0 src/gnu/usr.sbin/postfix/virtual/Makefile
cvs rdiff -u -r1.2 -r0 src/gnu/usr.sbin/postfix/xsasl/Makefile
cvs rdiff -u -r1.98 -r1.99 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.819 src/distrib/sets/lists/base/mi:1.820
--- src/distrib/sets/lists/base/mi:1.819 Sat Jun 20 04:20:21 2009
+++ src/distrib/sets/lists/base/mi Tue Jun 23 17:58:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.819 2009/06/20 04:20:21 agc Exp $
+# $NetBSD: mi,v 1.820 2009/06/23 17:58:22 tron Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1262,10 +1262,15 @@
./usr/libexec/postfix/lmtp base-postfix-bin postfix
./usr/libexec/postfix/local base-postfix-bin postfix
./usr/libexec/postfix/master base-postfix-bin postfix
-./usr/libexec/postfix/nqmgr base-obsolete obsolete
+./usr/libexec/postfix/nqmgr base-obsolete obsolete
./usr/libexec/postfix/oqmgr base-postfix-bin postfix
./usr/libexec/postfix/pickup base-postfix-bin postfix
./usr/libexec/postfix/pipe base-postfix-bin postfix
+./usr/libexec/postfix/post-install base-postfix-bin postfix
+./usr/libexec/postfix/postfix-files base-postfix-bin postfix
+./usr/libexec/postfix/postfix-script base-postfix-bin postfix
+./usr/libexec/postfix/postfix-wrapper base-postfix-bin postfix
+./usr/libexec/postfix/postmulti-script base-postfix-bin postfix
./usr/libexec/postfix/proxymap base-postfix-bin postfix
./usr/libexec/postfix/qmgr base-postfix-bin postfix
./usr/libexec/postfix/qmqpd base-obsolete obsolete
@@ -1553,6 +1558,7 @@
./usr/sbin/postlock base-postfix-bin postfix
./usr/sbin/postlog base-postfix-bin postfix
./usr/sbin/postmap base-postfix-bin postfix
+./usr/sbin/postmulti base-postfix-bin postfix
./usr/sbin/postqueue base-postfix-bin postfix
./usr/sbin/postsuper base-postfix-bin postfix
./usr/sbin/powerd base-sysutil-bin
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1272 src/distrib/sets/lists/comp/mi:1.1273
--- src/distrib/sets/lists/comp/mi:1.1272 Sat Jun 20 14:29:48 2009
+++ src/distrib/sets/lists/comp/mi Tue Jun 23 17:58:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1272 2009/06/20 14:29:48 christos Exp $
+# $NetBSD: mi,v 1.1273 2009/06/23 17:58:22 tron Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3421,6 +3421,7 @@
./usr/libdata/debug/usr/sbin/postlock.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/postlog.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/postmap.debug comp-postfix-debug postfix,debug
+./usr/libdata/debug/usr/sbin/postmulti.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/postqueue.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/postsuper.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/powerd.debug comp-sysutil-debug debug
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.210 src/distrib/sets/lists/etc/mi:1.211
--- src/distrib/sets/lists/etc/mi:1.210 Sun Jun 21 01:55:34 2009
+++ src/distrib/sets/lists/etc/mi Tue Jun 23 17:58:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.210 2009/06/21 01:55:34 christos Exp $
+# $NetBSD: mi,v 1.211 2009/06/23 17:58:23 tron Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -132,9 +132,9 @@
./etc/postfix/README etc-postfix-etc postfix
./etc/postfix/main.cf etc-postfix-etc postfix
./etc/postfix/master.cf etc-postfix-etc postfix
-./etc/postfix/post-install etc-postfix-etc postfix
-./etc/postfix/postfix-files etc-postfix-etc postfix
-./etc/postfix/postfix-script etc-postfix-etc postfix
+./etc/postfix/post-install etc-obsolete obsolete
+./etc/postfix/postfix-files etc-obsolete obsolete
+./etc/postfix/postfix-script etc-obsolete obsolete
./etc/postinstall etc-obsolete obsolete
./etc/powerd/scripts/acadapter etc-sysutil-etc
./etc/powerd/scripts/hotkey_button etc-sysutil-etc
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1141 src/distrib/sets/lists/man/mi:1.1142
--- src/distrib/sets/lists/man/mi:1.1141 Sun Jun 21 01:55:35 2009
+++ src/distrib/sets/lists/man/mi Tue Jun 23 17:58:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1141 2009/06/21 01:55:35 christos Exp $
+# $NetBSD: mi,v 1.1142 2009/06/23 17:58:23 tron Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -385,6 +385,7 @@
./usr/share/man/cat1/postlock.0 man-postfix-catman postfix,.cat
./usr/share/man/cat1/postlog.0 man-postfix-catman postfix,.cat
./usr/share/man/cat1/postmap.0 man-postfix-catman postfix,.cat
+./usr/share/man/cat1/postmulti.0 man-postfix-catman postfix,.cat
./usr/share/man/cat1/postqueue.0 man-postfix-catman postfix,.cat
./usr/share/man/cat1/postsuper.0 man-postfix-catman postfix,.cat
./usr/share/man/cat1/pr.0 man-util-catman .cat
@@ -1820,6 +1821,7 @@
./usr/share/man/cat5/pkg_install.conf.0 man-pkgutil-catman .cat
./usr/share/man/cat5/pkg_summary.0 man-pkgutil-catman .cat
./usr/share/man/cat5/postconf.0 man-postfix-catman postfix,.cat
+./usr/share/man/cat5/postfix-wrapper.0 man-postfix-catman postfix,.cat
./usr/share/man/cat5/primes.0 man-obsolete obsolete
./usr/share/man/cat5/printcap.0 man-lpr-catman .cat
./usr/share/man/cat5/protocols.0 man-net-catman .cat
@@ -3049,6 +3051,7 @@
./usr/share/man/html1/postlock.html man-postfix-htmlman postfix,html
./usr/share/man/html1/postlog.html man-postfix-htmlman postfix,html
./usr/share/man/html1/postmap.html man-postfix-htmlman postfix,html
+./usr/share/man/html1/postmulti.html man-postfix-htmlman postfix,html
./usr/share/man/html1/postqueue.html man-postfix-htmlman postfix,html
./usr/share/man/html1/postsuper.html man-postfix-htmlman postfix,html
./usr/share/man/html1/pr.html man-util-htmlman html
@@ -4329,6 +4332,7 @@
./usr/share/man/html5/pkg_install.conf.html man-pkgutil-htmlman html
./usr/share/man/html5/pkg_summary.html man-pkgutil-htmlman html
./usr/share/man/html5/postconf.html man-postfix-htmlman postfix,html
+./usr/share/man/html5/postfix-wrapper.html man-postfix-htmlman postfix,html
./usr/share/man/html5/printcap.html man-lpr-htmlman html
./usr/share/man/html5/protocols.html man-net-htmlman html
./usr/share/man/html5/racoon.conf.html man-netutil-htmlman crypto,html
@@ -5365,6 +5369,7 @@
./usr/share/man/man1/postlock.1 man-postfix-man postfix,.man
./usr/share/man/man1/postlog.1 man-postfix-man postfix,.man
./usr/share/man/man1/postmap.1 man-postfix-man postfix,.man
+./usr/share/man/man1/postmulti.1 man-postfix-man postfix,.man
./usr/share/man/man1/postqueue.1 man-postfix-man postfix,.man
./usr/share/man/man1/postsuper.1 man-postfix-man postfix,.man
./usr/share/man/man1/pr.1 man-util-man .man
@@ -6800,6 +6805,7 @@
./usr/share/man/man5/pkg_install.conf.5 man-pkgutil-man .man
./usr/share/man/man5/pkg_summary.5 man-pkgutil-man .man
./usr/share/man/man5/postconf.5 man-postfix-man postfix,.man
+./usr/share/man/man5/postfix-wrapper.5 man-postfix-man postfix,.man
./usr/share/man/man5/primes.5 man-obsolete obsolete
./usr/share/man/man5/printcap.5 man-lpr-man .man
./usr/share/man/man5/protocols.5 man-net-man .man
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.159 src/distrib/sets/lists/misc/mi:1.160
--- src/distrib/sets/lists/misc/mi:1.159 Fri May 15 02:34:07 2009
+++ src/distrib/sets/lists/misc/mi Tue Jun 23 17:58:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.159 2009/05/15 02:34:07 ginsbach Exp $
+# $NetBSD: mi,v 1.160 2009/06/23 17:58:23 tron Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -276,6 +276,7 @@
./usr/share/doc/html/postfix/LOCAL_RECIPIENT_README.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/MAILDROP_README.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/MILTER_README.html misc-postfix-htmldoc postfix,doc
+./usr/share/doc/html/postfix/MULTI_INSTANCE_README.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/MYSQL_README.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/NFS_README.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/OVERVIEW.html misc-postfix-htmldoc postfix,doc
@@ -349,10 +350,12 @@
./usr/share/doc/html/postfix/postfix-logo.jpg misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/postfix-manuals.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/postfix.1.html misc-postfix-htmldoc postfix,doc
+./usr/share/doc/html/postfix/postfix-wrapper.5.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/postkick.1.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/postlock.1.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/postlog.1.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/postmap.1.html misc-postfix-htmldoc postfix,doc
+./usr/share/doc/html/postfix/postmulti.1.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/postqueue.1.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/postsuper.1.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/html/postfix/proxymap.8.html misc-postfix-htmldoc postfix,doc
@@ -748,6 +751,7 @@
./usr/share/examples/postfix/LOCAL_RECIPIENT_README misc-postfix-examples postfix,doc
./usr/share/examples/postfix/MAILDROP_README misc-postfix-examples postfix,doc
./usr/share/examples/postfix/MILTER_README misc-postfix-examples postfix,doc
+./usr/share/examples/postfix/MULTI_INSTANCE_README misc-postfix-examples postfix,doc
./usr/share/examples/postfix/MYSQL_README misc-postfix-examples postfix,doc
./usr/share/examples/postfix/NFS_README misc-postfix-examples postfix,doc
./usr/share/examples/postfix/OVERVIEW misc-postfix-examples postfix,doc
@@ -780,9 +784,9 @@
./usr/share/examples/postfix/main.cf misc-postfix-examples postfix,share
./usr/share/examples/postfix/master.cf misc-postfix-examples postfix,share
./usr/share/examples/postfix/pcre_table misc-obsolete obsolete
-./usr/share/examples/postfix/post-install misc-postfix-examples postfix,share
-./usr/share/examples/postfix/postfix-files misc-postfix-examples postfix,share
-./usr/share/examples/postfix/postfix-script misc-postfix-examples postfix,share
+./usr/share/examples/postfix/post-install misc-obsolete obsolete
+./usr/share/examples/postfix/postfix-files misc-obsolete obsolete
+./usr/share/examples/postfix/postfix-script misc-obsolete obsolete
./usr/share/examples/postfix/regexp_table misc-obsolete obsolete
./usr/share/examples/postfix/relocated misc-postfix-examples postfix,share
./usr/share/examples/postfix/sample-aliases.cf misc-obsolete obsolete
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.366 src/etc/Makefile:1.367
--- src/etc/Makefile:1.366 Thu Apr 23 11:29:29 2009
+++ src/etc/Makefile Tue Jun 23 17:58:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.366 2009/04/23 11:29:29 apb Exp $
+# $NetBSD: Makefile,v 1.367 2009/06/23 17:58:23 tron Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -350,7 +350,7 @@
${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.bin/ssh configinstall
.endif
.if (${MKPOSTFIX} != "no")
- ${MAKEDIRTARGET} ${NETBSDSRCDIR}/gnu/usr.sbin/postfix configinstall
+ ${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/ibm-public/postfix configinstall
.endif
.if (${MKATF} != "no")
${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/atf/etc/atf configinstall
Index: src/external/Makefile
diff -u src/external/Makefile:1.3 src/external/Makefile:1.4
--- src/external/Makefile:1.3 Fri Dec 19 15:24:04 2008
+++ src/external/Makefile Tue Jun 23 17:58:23 2009
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2008/12/19 15:24:04 haad Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/23 17:58:23 tron Exp $
SUBDIR+= lib .WAIT
-SUBDIR+= bsd intel-fw-eula intel-fw-public gpl2
+SUBDIR+= bsd intel-fw-eula intel-fw-public gpl2 ibm-public
.include <bsd.subdir.mk>
Index: src/external/ibm-public/Makefile
diff -u src/external/ibm-public/Makefile:1.1 src/external/ibm-public/Makefile:1.2
--- src/external/ibm-public/Makefile:1.1 Tue Jun 23 15:02:51 2009
+++ src/external/ibm-public/Makefile Tue Jun 23 17:58:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/23 15:02:51 tron Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/23 17:58:24 tron Exp $
.include <bsd.own.mk>
@@ -6,4 +6,8 @@
SUBDIR+= postfix
.endif
+# Speedup stubs for some subtrees that don't need to run these rules
+includes-postfix:
+ @true
+
.include <bsd.subdir.mk>
Index: src/gnu/usr.sbin/Makefile
diff -u src/gnu/usr.sbin/Makefile:1.15 src/gnu/usr.sbin/Makefile:1.16
--- src/gnu/usr.sbin/Makefile:1.15 Tue May 30 00:43:09 2006
+++ src/gnu/usr.sbin/Makefile Tue Jun 23 17:58:24 2009
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2006/05/30 00:43:09 christos Exp $
+# $NetBSD: Makefile,v 1.16 2009/06/23 17:58:24 tron Exp $
.include <bsd.own.mk>
SUBDIR= dbsym mdsetimage ncdcs
-.if ${MKPOSTFIX} != "no"
-SUBDIR+= postfix
-.endif
-
# Speedup stubs for some subtrees that don't need to run these rules
-includes-dbsym includes-mdsetimage includes-postfix:
+includes-dbsym includes-mdsetimage:
@true
.include <bsd.subdir.mk>
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.98 src/usr.sbin/postinstall/postinstall:1.99
--- src/usr.sbin/postinstall/postinstall:1.98 Fri May 22 15:23:17 2009
+++ src/usr.sbin/postinstall/postinstall Tue Jun 23 17:58:30 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.98 2009/05/22 15:23:17 pgoyette Exp $
+# $NetBSD: postinstall,v 1.99 2009/06/23 17:58:30 tron Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -767,7 +767,7 @@
[ -n "$1" ] || err 3 "USAGE: do_gid fix|check"
check_ids "$1" groups "${DEST_DIR}/etc/group" \
- named ntpd postfix sshd authpf _pflogd _rwhod _proxy _timedc \
+ named ntpd sshd authpf _pflogd _rwhod _proxy _timedc \
_sdpd _httpd
}
@@ -967,31 +967,6 @@
}
#
-# postfix
-#
-additem postfix "/etc/postfix/ being up to date"
-do_postfix()
-{
- [ -n "$1" ] || err 3 "USAGE: do_postfix fix|check"
- op="$1"
- failed=0
-
- find_file_in_dirlist postfix-script "postfix scripts" \
- "${SRC_DIR}/gnu/dist/postfix/conf" \
- "${DEST_DIR}/usr/share/examples/postfix" \
- || return 1
- # ${dir} is set by find_file_in_dirlist()
- compare_dir "${op}" "${dir}" "${DEST_DIR}/etc/postfix" 555 \
- post-install postfix-script
- failed=$(( ${failed} + $? ))
- compare_dir "${op}" "${dir}" "${DEST_DIR}/etc/postfix" 444 \
- postfix-files
- failed=$(( ${failed} + $? ))
-
- return ${failed}
-}
-
-#
# rc
#
additem rc "/etc/rc* and /etc/rc.d/ being up to date"
