Don't blindly run the post-install script; instead, tell the user to do

so in the MESSAGE file.  This makes upgrading existing Postfix
installations less annoying.

4 files changed, 15 insertions, 21 deletions

diff --git a/mail/postfix/INSTALL b/mail/postfix/INSTALL
deleted file mode 100644
index c67626ec28f..00000000000
--- a/mail/postfix/INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2004/07/19 02:33:31 jlam Exp $
-#
-
-EXAMPLEDIR=@EXAMPLEDIR@
-
-case $STAGE in
-POST-INSTALL)
-	echo "===> Running postfix's post-install script"
-	@EXAMPLEDIR@/post-install command_directory=@PREFIX@/sbin first-install
-	;;
-esac
diff --git a/mail/postfix/MESSAGE b/mail/postfix/MESSAGE
index 3a7f85d1e12..11ca600023c 100644
--- a/mail/postfix/MESSAGE
+++ b/mail/postfix/MESSAGE
@@ -1,11 +1,17 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.6 2004/07/19 02:33:31 jlam Exp $
+$NetBSD: MESSAGE,v 1.7 2004/07/19 03:25:11 jlam Exp $
 
-To activate postfix:
+Please run the following command to update main.cf and master.cf with
+the latest Postfix services and configuration directives:
 
-- Check the configuration files in ${PKG_SYSCONFDIR}
-   (see ${EXAMPLEDIR})
-- Modify /etc/mailer.conf (see ${EXAMPLEDIR}/mailer.conf)
-- Set postfix=YES in /etc/rc.conf
+	${PREFIX}/sbin/postfix set-permissions upgrade-configuration
+
+If you are upgrading from a previous Postfix installation, you may want
+to back up any existing configuration files before running the above
+command.
+
+Postfix may be activated by executing:
+
+	${PREFIX}/sbin/postfix start
 
 ===========================================================================
diff --git a/mail/postfix/MESSAGE.NetBSD b/mail/postfix/MESSAGE.NetBSD
index 69e7476b165..dea3c22db1b 100644
--- a/mail/postfix/MESSAGE.NetBSD
+++ b/mail/postfix/MESSAGE.NetBSD
@@ -1,9 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2004/03/06 06:28:22 grant Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.2 2004/07/19 03:25:11 jlam Exp $
 
 If you are running NetBSD 1.5 (or newer), the existing /etc/rc.d/postfix
 can be forced to start ${PREFIX}/sbin/postfix instead of /usr/sbin/postfix,
 by adding the following lines to /etc/rc.conf.d/postfix:
+
 	required_files='${PKG_SYSCONFDIR}/main.cf'
 	start_cmd='${PREFIX}/sbin/postfix start'
 	stop_cmd='${PREFIX}/sbin/postfix stop'
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 56e1c63c5fd..ebed309e8b7 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2004/07/19 02:33:31 jlam Exp $
+# $NetBSD: Makefile,v 1.137 2004/07/19 03:25:11 jlam Exp $
 
 DISTNAME=	postfix-2.1.3
 CATEGORIES=	mail
@@ -175,8 +175,6 @@ CONF_FILES_PERMS+=	${EXAMPLEDIR}/${confscr} ${PKG_SYSCONFDIR}/${confscr} \
 .endfor
 .undef confscr
 
-INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
-
 pre-configure:
 	@for i in ${POSTFIX_CONF_FILES}; do				\
 		${CP} ${WRKSRC}/$${i} ${WRKSRC}/$${i}.dist;		\