Install install.cf to ensure spool is created with correct permissions

Bump PORTREVISION

PR:		30751
Submitted by:	Yen-Ming Lee

36 files changed, 216 insertions, 13 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 50109382c5bb..43d4ce6a2486 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010808
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -40,7 +40,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-qmqpd.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master nqmgr pickup \
 	pipe qmgr qmqpd showq smtp smtpd spawn trivial-rewrite virtual
@@ -77,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix-current/files/install.cf b/mail/postfix-current/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix-current/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index d146b0bb6b61..641f7b35096a 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -1,7 +1,9 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 bin/rmail
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix/files/install.cf b/mail/postfix/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix/pkg-plist
+++ b/mail/postfix/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix1/files/install.cf b/mail/postfix1/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix1/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix1/pkg-plist b/mail/postfix1/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix1/pkg-plist
+++ b/mail/postfix1/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix20/files/install.cf b/mail/postfix20/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix20/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix20/pkg-plist b/mail/postfix20/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix20/pkg-plist
+++ b/mail/postfix20/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix21/files/install.cf b/mail/postfix21/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix21/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix21/pkg-plist
+++ b/mail/postfix21/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix22/files/install.cf b/mail/postfix22/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix22/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix22/pkg-plist
+++ b/mail/postfix22/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix23/files/install.cf b/mail/postfix23/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix23/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix23/pkg-plist
+++ b/mail/postfix23/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix24/files/install.cf b/mail/postfix24/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix24/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix24/pkg-plist
+++ b/mail/postfix24/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix25/files/install.cf b/mail/postfix25/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix25/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix25/pkg-plist
+++ b/mail/postfix25/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix26/files/install.cf b/mail/postfix26/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix26/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix26/pkg-plist
+++ b/mail/postfix26/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix27/files/install.cf b/mail/postfix27/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix27/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix27/pkg-plist
+++ b/mail/postfix27/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 1e3e94f18b80..87c7f815ba94 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010228.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -38,7 +39,7 @@ CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf
+	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
 
 BIN1=	bounce cleanup error flush lmtp local master pickup \
 	pipe qmgr showq smtp smtpd spawn trivial-rewrite
@@ -76,6 +77,9 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
+
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix28/files/install.cf b/mail/postfix28/files/install.cf
new file mode 100644
index 000000000000..5b70ac6a9111
--- /dev/null
+++ b/mail/postfix28/files/install.cf
@@ -0,0 +1,11 @@
+# $FreeBSD$
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
+sendmail_path=/usr/sbin/sendmail
+newaliases_path=/usr/bin/newaliases
+mailq_path=/usr/bin/mailq
+setgid=maildrop
+manpages=!!PREFIX!!/man
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
index b7656bbe5982..78552bf9d11c 100644
--- a/mail/postfix28/pkg-plist
+++ b/mail/postfix28/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 etc/postfix/LICENSE
+etc/postfix/install.cf
 etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases