- Move all "share" files to share/examples/postfix; all of them are used

  as samples, either by the user or by bsd.pkg.install.mk.
- Correctly handle configuration files, that is, avoid touching the conf
  directory directly.
- Use OWN_DIRS to handle the spool directory.
- Run post-install through an INSTALL script.
- Sort PLIST after all these changes.
- Bump PKGREVISION to 1.

10 files changed, 105 insertions, 85 deletions

diff --git a/mail/postfix/INSTALL b/mail/postfix/INSTALL
new file mode 100644
index 00000000000..ac3be9f1cde
--- /dev/null
+++ b/mail/postfix/INSTALL
@@ -0,0 +1,11 @@
+# $NetBSD: INSTALL,v 1.1 2003/05/01 14:07:56 jmmv Exp $
+#
+
+SHAREDIR=@SHAREDIR@
+
+case $STAGE in
+POST-INSTALL)
+	echo "===> Running postfix's post-install script"
+	@SHAREDIR@/post-install first-install
+	;;
+esac
diff --git a/mail/postfix/MESSAGE b/mail/postfix/MESSAGE
index a97e64974fd..760552c4a8d 100644
--- a/mail/postfix/MESSAGE
+++ b/mail/postfix/MESSAGE
@@ -1,11 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/04/06 16:26:01 taca Exp $
+$NetBSD: MESSAGE,v 1.4 2003/05/01 14:07:56 jmmv Exp $
 
 To activate postfix:
 
 - Check the configuration files in ${PKG_SYSCONFDIR}
-   (see ${PREFIX}/share/postfix)
-- Modify /etc/mailer.conf (see ${PREFIX}/etc/mailer.conf.postfix)
+   (see ${SHAREDIR})
+- Modify /etc/mailer.conf (see ${SHAREDIR}/mailer.conf)
 - Set postfix=YES in /etc/rc.conf
 
 If you are running NetBSD 1.5 (or newer), the existing /etc/rc.d/postfix
diff --git a/mail/postfix/MESSAGE.sasl b/mail/postfix/MESSAGE.sasl
index e106c9f55ec..827e7cc2b34 100644
--- a/mail/postfix/MESSAGE.sasl
+++ b/mail/postfix/MESSAGE.sasl
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE.sasl,v 1.1 2001/12/03 04:47:41 kent Exp $
+$NetBSD: MESSAGE.sasl,v 1.2 2003/05/01 14:07:57 jmmv Exp $
 
 To enable SASL authentication, you might need to change permission
 of ${PKG_SYSCONFDIR}/sasldb.db so that smtpd can read it, and configure
-/etc/postfix/main.cf (See ${PREFIX}/share/postfix/sample-auth.cf.)
+${PKG_SYSCONFDIR}/main.cf (See ${SHAREDIR}/sample-auth.cf.)
 ===========================================================================
diff --git a/mail/postfix/MESSAGE.tls b/mail/postfix/MESSAGE.tls
index d3fc8a16df6..90b33e438bd 100644
--- a/mail/postfix/MESSAGE.tls
+++ b/mail/postfix/MESSAGE.tls
@@ -1,8 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE.tls,v 1.1 2002/07/22 10:39:26 martti Exp $
+$NetBSD: MESSAGE.tls,v 1.2 2003/05/01 14:07:57 jmmv Exp $
 
 To enable TLS, you might need to reconfigure /etc/postfix/main.cf and
-/etc/postfix/master.cf (See ${PREFIX}/share/postfix/sample-tls.cf.)
+${PKG_SYSCONFDIR}/master.cf (See ${SHAREDIR}/sample-tls.cf.)
 
 master.cf:
 ----------
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index e0a40ae4c58..218807cb19f 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2003/04/21 06:25:50 martti Exp $
+# $NetBSD: Makefile,v 1.93 2003/05/01 14:07:57 jmmv Exp $
 
 DISTNAME=	postfix-2.0.9
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
@@ -17,6 +18,8 @@ USE_PKGINSTALL=	yes
 
 PKG_SYSCONFSUBDIR=	postfix
 
+OWN_DIRS=	${POSTFIX_SPOOL}
+
 CCARGS+=	-DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
 CCARGS+=	-DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
 CCARGS+=	-DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
@@ -111,6 +114,8 @@ MAKE_ENV+=	AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
 POSTFIX_CONF_FILES=	conf/main.cf src/util/sys_defs.h postfix-install
 POSTFIX_CONF_FILES+=	conf/sample-misc.cf src/global/mail_params.h
 
+FILES_SUBST+=	SHAREDIR=${SHAREDIR}
+MESSAGE_SUBST+=	SHAREDIR=${SHAREDIR}
 PLIST_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 PLIST_SUBST+=	POSTFIX_SPOOL=${POSTFIX_SPOOL}
 
@@ -118,10 +123,18 @@ PKG_GROUPS?=	postfix maildrop
 PKG_USERS?=	postfix:postfix::Postfix\\ User:${POSTFIX_SPOOL}
 
 LIBEXECDIR=	${PREFIX}/libexec/${PKGBASE}
-SHAREDIR=	${PREFIX}/share/${PKGBASE}
+SHAREDIR=	${PREFIX}/share/examples/${PKGBASE}
 
-CONF_FILES+=	${SHAREDIR}/main.cf ${PKG_SYSCONFDIR}/main.cf
+CONF_FILES=	${SHAREDIR}/main.cf ${PKG_SYSCONFDIR}/main.cf
 CONF_FILES+=	${SHAREDIR}/master.cf ${PKG_SYSCONFDIR}/master.cf
+CONF_FILES_PERMS=
+.for confscr in post-install postfix-files postfix-script
+CONF_FILES_PERMS+=	${SHAREDIR}/${confscr} ${PKG_SYSCONFDIR}/${confscr} \
+			${ROOT_USER} ${ROOT_GROUP} 755
+.endfor
+.undef confscr
+
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 pre-configure:
 	@for i in ${POSTFIX_CONF_FILES}; do				\
@@ -154,25 +167,14 @@ pre-install:
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${PREFIX}/lib/sasl
 	${ECHO} lib/sasl/smtpd.conf > ${WRKDIR}/PLIST.sasl
 .endif
-	for pf in postfix-files postfix-script main.cf master.cf; do \
-		${TEST} -f ${PKG_SYSCONFDIR}/$$pf || \
-		    ${INSTALL_DATA} ${WRKSRC}/conf/$$pf ${PKG_SYSCONFDIR}; \
-	done
-
-do-install:
-	(cd ${WRKSRC} && ${SH} postfix-install -non-interactive)
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${SHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${SHAREDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${SHAREDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${SHAREDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${SHAREDIR}
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc
-	${LN} -sf ${SHAREDIR}/post-install ${PKG_SYSCONFDIR}
-	${LN} -sf ${SHAREDIR}/postfix-files ${PKG_SYSCONFDIR}
-	${LN} -sf ${SHAREDIR}/postfix-script ${PKG_SYSCONFDIR}
-	${INSTALL_DATA_DIR} ${POSTFIX_SPOOL}
-	${CHMOD} 755 ${POSTFIX_SPOOL}
+	${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${SHAREDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${SHAREDIR}
+	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${SHAREDIR}/mailer.conf
+
+do-install:
+	(cd ${WRKSRC} && ${SETENV} config_directory="${SHAREDIR}" ${SH} postfix-install -non-interactive)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index 389b92c72a8..37caf985045 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2003/01/31 23:53:05 lukem Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/05/01 14:07:57 jmmv Exp $
 bin/mailq
 bin/newaliases
-etc/mailer.conf.postfix
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/error
@@ -76,9 +75,6 @@ sbin/postqueue
 sbin/postsuper
 sbin/sendmail
 share/doc/postfix/ADDRESS_CLASS_README
-share/doc/postfix/LOCAL_RECIPIENT_README
-share/doc/postfix/MAILDROP_README
-share/doc/postfix/RELEASE_NOTES
 share/doc/postfix/DB_README
 share/doc/postfix/DEBUG_README
 share/doc/postfix/ETRN_README
@@ -87,57 +83,54 @@ share/doc/postfix/INSTALL
 share/doc/postfix/LDAP_README
 share/doc/postfix/LINUX_README
 share/doc/postfix/LMTP_README
+share/doc/postfix/LOCAL_RECIPIENT_README
 share/doc/postfix/MACOSX_README
+share/doc/postfix/MAILDROP_README
 share/doc/postfix/MYSQL_README
 share/doc/postfix/NFS_README
 share/doc/postfix/PACKAGE_README
 share/doc/postfix/PCRE_README
 share/doc/postfix/QMQP_README
+share/doc/postfix/RELEASE_NOTES
 share/doc/postfix/RESTRICTION_CLASS_README
 share/doc/postfix/SASL_README
 share/doc/postfix/ULTRIX_README
 share/doc/postfix/UUCP_README
 share/doc/postfix/VERP_README
 share/doc/postfix/VIRTUAL_README
-share/postfix/main.cf
-share/postfix/master.cf
-share/postfix/post-install
-share/postfix/postfix-files
-share/postfix/postfix-script
-share/postfix/sample-aliases.cf
-share/postfix/sample-auth.cf
-share/postfix/sample-canonical.cf
-share/postfix/sample-compatibility.cf
-share/postfix/sample-debug.cf
-share/postfix/sample-filter.cf
-share/postfix/sample-flush.cf
-share/postfix/sample-ldap.cf
-share/postfix/sample-lmtp.cf
-share/postfix/sample-local.cf
-share/postfix/sample-mime.cf
-share/postfix/sample-misc.cf
-share/postfix/sample-pcre-access.cf
-share/postfix/sample-pcre-body.cf
-share/postfix/sample-pcre-header.cf
-share/postfix/sample-qmqpd.cf
-share/postfix/sample-rate.cf
-share/postfix/sample-regexp-access.cf
-share/postfix/sample-regexp-body.cf
-share/postfix/sample-regexp-header.cf
-share/postfix/sample-relocated.cf
-share/postfix/sample-resource.cf
-share/postfix/sample-rewrite.cf
-share/postfix/sample-smtp.cf
-share/postfix/sample-smtpd.cf
-share/postfix/sample-transport.cf
-share/postfix/sample-virtual.cf
-@exec if [ ! -d ${POSTFIX_SPOOL} ]; then ${MKDIR} ${POSTFIX_SPOOL}; ${CHMOD} 755 ${POSTFIX_SPOOL} ; fi
-@exec ${LN} -sf %D/share/postfix/post-install ${PKG_SYSCONFDIR}
-@unexec ${RM} -f ${PKG_SYSCONFDIR}/post-install
-@exec ${LN} -sf %D/share/postfix/postfix-files ${PKG_SYSCONFDIR}
-@unexec ${RM} -f ${PKG_SYSCONFDIR}/postfix-files
-@exec ${LN} -sf %D/share/postfix/postfix-script ${PKG_SYSCONFDIR}
-@unexec ${RM} -f ${PKG_SYSCONFDIR}/postfix-script
-@dirrm libexec/postfix
+share/examples/postfix/mailer.conf
+share/examples/postfix/main.cf
+share/examples/postfix/master.cf
+share/examples/postfix/post-install
+share/examples/postfix/postfix-files
+share/examples/postfix/postfix-script
+share/examples/postfix/sample-aliases.cf
+share/examples/postfix/sample-auth.cf
+share/examples/postfix/sample-canonical.cf
+share/examples/postfix/sample-compatibility.cf
+share/examples/postfix/sample-debug.cf
+share/examples/postfix/sample-filter.cf
+share/examples/postfix/sample-flush.cf
+share/examples/postfix/sample-ldap.cf
+share/examples/postfix/sample-lmtp.cf
+share/examples/postfix/sample-local.cf
+share/examples/postfix/sample-mime.cf
+share/examples/postfix/sample-misc.cf
+share/examples/postfix/sample-pcre-access.cf
+share/examples/postfix/sample-pcre-body.cf
+share/examples/postfix/sample-pcre-header.cf
+share/examples/postfix/sample-qmqpd.cf
+share/examples/postfix/sample-rate.cf
+share/examples/postfix/sample-regexp-access.cf
+share/examples/postfix/sample-regexp-body.cf
+share/examples/postfix/sample-regexp-header.cf
+share/examples/postfix/sample-relocated.cf
+share/examples/postfix/sample-resource.cf
+share/examples/postfix/sample-rewrite.cf
+share/examples/postfix/sample-smtp.cf
+share/examples/postfix/sample-smtpd.cf
+share/examples/postfix/sample-transport.cf
+share/examples/postfix/sample-virtual.cf
+@dirrm share/examples/postfix
 @dirrm share/doc/postfix
-@dirrm share/postfix
+@dirrm libexec/postfix
diff --git a/mail/postfix/PLIST.tls b/mail/postfix/PLIST.tls
index df9f94c520e..03319428537 100644
--- a/mail/postfix/PLIST.tls
+++ b/mail/postfix/PLIST.tls
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.tls,v 1.1 2002/07/22 10:39:26 martti Exp $
+@comment $NetBSD: PLIST.tls,v 1.2 2003/05/01 14:07:57 jmmv Exp $
 libexec/postfix/tlsmgr
 man/man8/tlsmgr.8
-share/postfix/sample-tls.cf
+share/examples/postfix/sample-tls.cf
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 5eccc41aa6d..4a113bd57cd 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.40 2003/04/21 06:25:50 martti Exp $
+$NetBSD: distinfo,v 1.41 2003/05/01 14:07:57 jmmv Exp $
 
 SHA1 (postfix/postfix-2.0.9.tar.gz) = 2fe1fb816e06ca8aff6a4df2b418df6330b66ac3
 Size (postfix/postfix-2.0.9.tar.gz) = 1347572 bytes
-SHA1 (patch-aa) = f45060427494d6ea9c415a20add1f5aab547ba34
+SHA1 (patch-aa) = 39a89a28cec3fd264dbda97633e34695eaad01e9
 SHA1 (patch-ad) = 2f83cc6108eea4a1c401fe9e549d93430166f7fa
 SHA1 (patch-ae) = daa160ef54d725ca156f29322d45efcf4af6c02a
-SHA1 (patch-af) = 1020280735f4d4aeb352f576e00e3bdb28f152a6
+SHA1 (patch-af) = 4d3a6c21d284dce1c75dcd4fc537af17a28a5e66
 SHA1 (patch-ag) = 7c59f4bee987dedc2fd5f193a8d5c980ac09ae82
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index 521294995c7..12d3025fdbd 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2003/04/17 06:22:18 martti Exp $
+$NetBSD: patch-aa,v 1.13 2003/05/01 14:07:58 jmmv Exp $
 
---- postfix-install.orig	2003-03-21 21:04:53.000000000 +0200
-+++ postfix-install	2003-04-17 08:53:23.000000000 +0300
-@@ -338,33 +338,13 @@
+--- postfix-install.orig	2003-03-21 20:04:53.000000000 +0100
++++ postfix-install
+@@ -338,33 +338,13 @@ README files. Specify \"no\" if you do n
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
  
@@ -37,3 +37,17 @@ $NetBSD: patch-aa,v 1.12 2003/04/17 06:22:18 martti Exp $
  
  # If a parameter is not set via the command line or environment,
  # try to use settings from installed configuration files.
+@@ -652,13 +632,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+     "sample_directory = $sample_directory" \
+     "readme_directory = $readme_directory" \
+ || exit 1
+-
+-# If Postfix is being installed locally from source code, do the
+-# post-install processing now.
+-
+-test -n "$install_root" || {
+-    export daemon_directory command_directory queue_directory sendmail_path \
+-	newaliases_path mailq_path mail_owner setgid_group manpage_directory \
+-	sample_directory readme_directory
+-    ${SHELL} conf/post-install $post_install_options || exit 1
+-}
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index 1807d028cf5..56496b57efa 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.16 2003/02/21 11:49:57 martti Exp $
+$NetBSD: patch-af,v 1.17 2003/05/01 14:07:58 jmmv Exp $
 
 --- conf/main.cf.orig	2003-02-20 16:44:47.000000000 +0200
 +++ conf/main.cf	2003-02-21 13:27:20.000000000 +0200
@@ -18,7 +18,7 @@ $NetBSD: patch-af,v 1.16 2003/02/21 11:49:57 martti Exp $
 +
 +# Shared files and etc directory
 +etc_directory = __PKG_SYSCONFDIR
-+share_directory = __PREFIX/share/postfix
++share_directory = __PREFIX/share/examples/postfix
 +man_directory = __PREFIX/man
  
  # QUEUE AND PROCESS OWNERSHIP
@@ -47,7 +47,7 @@ $NetBSD: patch-af,v 1.16 2003/02/21 11:49:57 martti Exp $
  # sample_directory: The location of the Postfix sample configuration files.
  #
 -sample_directory =
-+sample_directory = __PREFIX/share/postfix
++sample_directory = __PREFIX/share/examples/postfix
  
  # readme_directory: The location of the Postfix README files.
  #