Module Name: src
Committed By: tron
Date: Tue Jun 23 17:55:06 UTC 2009
Modified Files:
src/external/ibm-public/postfix: Makefile
src/external/ibm-public/postfix/conf: Makefile
src/external/ibm-public/postfix/postfix-etc: Makefile
src/external/ibm-public/postfix/postfix-script: Makefile
Log Message:
Install all helper scripts to "/usr/libexec/postfix" which is were Postfix
expects them now. Remove all comments indicating that they should be
in that directory.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/conf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/postfix-etc/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/ibm-public/postfix/postfix-script/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/Makefile
diff -u src/external/ibm-public/postfix/Makefile:1.1 src/external/ibm-public/postfix/Makefile:1.2
--- src/external/ibm-public/postfix/Makefile:1.1 Tue Jun 23 15:02:51 2009
+++ src/external/ibm-public/postfix/Makefile Tue Jun 23 17:55:06 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:55:06 tron Exp $
# The first four/five of these are libraries and have to be built first.
@@ -11,7 +11,7 @@
.endif
SUBDIR+=README_FILES anvil bounce cleanup discard error flush html \
local man master oqmgr pickup pipe postalias \
- postcat postconf postdrop postfix postkick postlock \
+ postcat postconf postdrop postfix postfix-script postkick postlock \
postlog postmap postmulti postqueue postsuper proxymap qmgr scache \
sendmail showq smtp smtpd spawn trivial-rewrite verify \
virtual proxymap
@@ -21,13 +21,7 @@
SUBDIR+=conf
.endif
-# We don't want to build postfix-script (at least for now) because
-# we're now treating it as a configuration file, per Wietse Venema's
-# request. We now have conf/Makefile install a copy into
-# share/examples/postfix, and postfix-etc/Makefile (only called by
-# make configinstall) installs a copy in /etc/postfix
-
-# also not built: fsstone (unneeded), smtpstone (unneeded), qmqpd (unneeded)
+# Not built: fsstone (unneeded), smtpstone (unneeded), qmqpd (unneeded)
# The configinstall: target is invoked from the make distribution
# target in src/etc/Makefile. It is there for building the /etc/
Index: src/external/ibm-public/postfix/conf/Makefile
diff -u src/external/ibm-public/postfix/conf/Makefile:1.1 src/external/ibm-public/postfix/conf/Makefile:1.2
--- src/external/ibm-public/postfix/conf/Makefile:1.1 Tue Jun 23 15:02:51 2009
+++ src/external/ibm-public/postfix/conf/Makefile Tue Jun 23 17:55:06 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:55:06 tron Exp $
.include <bsd.own.mk>
@@ -9,10 +9,8 @@
# Not built: main.cf.default
-FILES= ../LICENSE ../TLS_LICENSE access aliases canonical generic header_checks \
- main.cf master.cf post-install postfix-files relocated transport \
- virtual
-
-SCRIPTS= postfix-script postfix-wrapper
+FILES= ../LICENSE ../TLS_LICENSE access aliases canonical generic \
+ header_checks main.cf master.cf post-install postfix-files relocated \
+ transport virtual
.include <bsd.prog.mk>
Index: src/external/ibm-public/postfix/postfix-etc/Makefile
diff -u src/external/ibm-public/postfix/postfix-etc/Makefile:1.1 src/external/ibm-public/postfix/postfix-etc/Makefile:1.2
--- src/external/ibm-public/postfix/postfix-etc/Makefile:1.1 Tue Jun 23 15:02:54 2009
+++ src/external/ibm-public/postfix/postfix-etc/Makefile Tue Jun 23 17:55:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/23 15:02:54 tron Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/23 17:55:06 tron Exp $
.include <bsd.own.mk>
@@ -13,19 +13,6 @@
# real information at all, just the man page sources, and are not
# needed by default.
#
-CONFIGFILES= main.cf master.cf postfix-files README
-
-# And of course, we need the postfix-script file. It isn't clear that
-# this should be considered configuration and not a candidate for
-# libexec, but Wietse explicitly wants it this way, since he wants
-# the user to be able to use postfix-script as a place to install hooks.
-#
-CONFIGFILES+= postfix-script post-install
-FILESMODE_postfix-script= ${BINMODE}
-FILESMODE_post-install= ${BINMODE}
-
-CONFIGFILES+= postfix-wrapper postmulti-script
-FILESMODE_postfix-wrapper= ${BINMODE}
-FILESMODE_postmulti-script= ${BINMODE}
+CONFIGFILES= main.cf master.cf README
.include <bsd.prog.mk>
Index: src/external/ibm-public/postfix/postfix-script/Makefile
diff -u src/external/ibm-public/postfix/postfix-script/Makefile:1.1 src/external/ibm-public/postfix/postfix-script/Makefile:1.2
--- src/external/ibm-public/postfix/postfix-script/Makefile:1.1 Tue Jun 23 15:02:54 2009
+++ src/external/ibm-public/postfix/postfix-script/Makefile Tue Jun 23 17:55:06 2009
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2009/06/23 15:02:54 tron Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/23 17:55:06 tron Exp $
.include <bsd.own.mk>
DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/conf
.PATH: ${DIST}
-# XXX Should go in /usr/libexec/postfix, but we'll need some source
-# changes before we can do that for real. Meanwhile, /etc/postfix
-#BINDIR= ${PFIX_LIBEXECDIR}
-BINDIR= ${PFIX_ETCDIR}
+BINDIR= ${PFIX_LIBEXECDIR}
-SCRIPTS= postfix-script postfix-wrapper
+SCRIPTS= post-install postfix-script postfix-wrapper postmulti-script
+
+FILES= postfix-files
+FILESDIR= ${PFIX_LIBEXECDIR}
.include <bsd.prog.mk>
