Install more of the example configuration files into installed examples

directory.  Back out modification to postfix-install that was ignoring our
setting for config_directory.

4 files changed, 39 insertions, 32 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 1bbab623d6e..1f853a9b9c8 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2004/07/19 19:59:16 jlam Exp $
+# $NetBSD: Makefile,v 1.141 2004/07/19 22:04:40 jlam Exp $
 
 DISTNAME=	postfix-2.1.3
 CATEGORIES=	mail
@@ -74,18 +74,20 @@ MAKE_DIRS+=		${PKG_SYSCONFDIR}
 PKG_GROUPS?=		postfix maildrop
 PKG_USERS?=		postfix:postfix::Postfix\\ User:${POSTFIX_QUEUE_DIR}
 
-CONF_FILES=		${EXAMPLEDIR}/main.cf ${PKG_SYSCONFDIR}/main.cf
-CONF_FILES+=		${EXAMPLEDIR}/master.cf ${PKG_SYSCONFDIR}/master.cf
+CONF_FILES=		# empty
+.for _file_ in main.cf master.cf postfix-files
+CONF_FILES+=		${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_}
+.endfor
+CONF_FILES_PERMS=	# empty
+.for _file_ in post-install postfix-script
+CONF_FILES_PERMS+=	${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
+			${ROOT_USER} ${ROOT_GROUP} 755
+.endfor
+.undef _file_
 .if !empty(_POSTFIX_OPTIONS:Msasl)
 MAKE_DIRS+=		${SASLLIBDIR}
 CONF_FILES+=		${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
 .endif
-CONF_FILES_PERMS=	# empty
-.for confscr in post-install postfix-files postfix-script
-CONF_FILES_PERMS+=	${EXAMPLEDIR}/${confscr} ${PKG_SYSCONFDIR}/${confscr} \
-			${ROOT_USER} ${ROOT_GROUP} 755
-.endfor
-.undef confscr
 
 POSTFIX_CONF_FILES=	conf/main.cf src/util/sys_defs.h		\
 			src/global/mail_params.h postfix-install
@@ -109,6 +111,10 @@ post-build:
 	${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
 .endif
 
+POSTFIX_EXAMPLE_FILES=	LICENSE access aliases canonical header_checks	\
+			main.cf main.cf.default makedefs.out master.cf	\
+			postfix-files relocated transport virtual
+
 do-install:
 	${INSTALL_DATA_DIR} ${LIBEXECDIR}
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
@@ -117,13 +123,13 @@ do-install:
 .if !empty(_POSTFIX_OPTIONS:Msasl)
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
 .endif
+	@for i in ${POSTFIX_EXAMPLE_FILES}; do				\
+		${INSTALL_DATA} ${WRKSRC}/conf/$$i ${EXAMPLEDIR}/$$i;	\
+	done
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${EXAMPLEDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
-	cd ${WRKSRC} && ${SETENV} config_directory="${EXAMPLEDIR}"	\
-		${SH} postfix-install -non-interactive
+	cd ${WRKSRC}; ${SH} ./postfix-install -non-interactive		\
+		config_directory="${EXAMPLEDIR}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index 4cd6f1e8909..ad060984efa 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/06/21 16:13:23 martti Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/07/19 22:04:40 jlam Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/bounce
@@ -127,12 +127,21 @@ share/doc/postfix/VERP_README
 share/doc/postfix/VIRTUAL_README
 share/doc/postfix/XCLIENT_README
 share/doc/postfix/XFORWARD_README
-share/examples/postfix/mailer.conf
+share/examples/postfix/LICENSE
+share/examples/postfix/access
+share/examples/postfix/aliases
+share/examples/postfix/canonical
+share/examples/postfix/header_checks
 share/examples/postfix/main.cf
+share/examples/postfix/main.cf.default
+share/examples/postfix/makedefs.out
 share/examples/postfix/master.cf
-share/examples/postfix/post-install
 share/examples/postfix/postfix-files
+share/examples/postfix/relocated
+share/examples/postfix/transport
+share/examples/postfix/virtual
 share/examples/postfix/postfix-script
+share/examples/postfix/post-install
 @dirrm share/examples/postfix
 @dirrm share/doc/postfix
 @dirrm libexec/postfix
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 9afdd1ffc6c..751cc5be986 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2004/07/18 19:16:31 jlam Exp $
+$NetBSD: distinfo,v 1.69 2004/07/19 22:04:40 jlam Exp $
 
 SHA1 (postfix/postfix-2.1.3.tar.gz) = 1c08947afa33a1cf1477954d906aa8d95922ea6f
 Size (postfix/postfix-2.1.3.tar.gz) = 1971632 bytes
@@ -6,7 +6,7 @@ SHA1 (postfix/postfix-2.1.1-canonical_classes.diff) = f97f8879a7a047db062ba8f53f
 Size (postfix/postfix-2.1.1-canonical_classes.diff) = 9645 bytes
 SHA1 (postfix/tls+ipv6-1.25-pf-2.1.3.patch.gz) = f3d41d0c1d135379df80e727fa2b658a6a6d4c5a
 Size (postfix/tls+ipv6-1.25-pf-2.1.3.patch.gz) = 256591 bytes
-SHA1 (patch-aa) = ca3d2739c35c89056b2f0c19a2cbcb9e018013c6
+SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
 SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d
 SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2
 SHA1 (patch-ae) = 3c0884fc2969d8353809895479f0f58897c5f133
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index b7b9b847da8..6d24824eebe 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2004/06/21 16:13:23 martti Exp $
+$NetBSD: patch-aa,v 1.15 2004/07/19 22:04:40 jlam Exp $
 
---- postfix-install.orig	2004-04-14 11:45:23.000000000 -0400
-+++ postfix-install	2004-05-23 22:32:31.000000000 -0400
-@@ -354,33 +354,13 @@
+--- postfix-install.orig	Wed Apr 14 11:45:23 2004
++++ postfix-install
+@@ -354,26 +354,6 @@ HTML files. Specify \"no\" if you do not
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
  
@@ -29,15 +29,7 @@ $NetBSD: patch-aa,v 1.14 2004/06/21 16:13:23 martti Exp $
  # In case some systems special-case pathnames beginning with //.
  
  case $install_root in
- /) install_root=
- esac
- 
--CONFIG_DIRECTORY=$install_root$config_directory
-+CONFIG_DIRECTORY=conf
- 
- # If a parameter is not set via the command line or environment,
- # try to use settings from installed configuration files.
-@@ -715,10 +695,3 @@
+@@ -715,10 +695,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1