[pkgsrc/trunk]: pkgsrc/mail/postfix Don't blindly run the post-install script...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4d2998c93a3
branches:  trunk
changeset: 478177:b4d2998c93a3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jul 19 03:25:11 2004 +0000

description:
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.

diffstat:

 mail/postfix/INSTALL        |  11 -----------
 mail/postfix/MESSAGE        |  18 ++++++++++++------
 mail/postfix/MESSAGE.NetBSD |   3 ++-
 mail/postfix/Makefile       |   4 +---
 4 files changed, 15 insertions(+), 21 deletions(-)

diffs (75 lines):

diff -r ba90289bead8 -r b4d2998c93a3 mail/postfix/INSTALL
--- a/mail/postfix/INSTALL      Mon Jul 19 03:09:50 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r ba90289bead8 -r b4d2998c93a3 mail/postfix/MESSAGE
--- a/mail/postfix/MESSAGE      Mon Jul 19 03:09:50 2004 +0000
+++ b/mail/postfix/MESSAGE      Mon Jul 19 03:25:11 2004 +0000
@@ -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:
+
+       ${PREFIX}/sbin/postfix set-permissions upgrade-configuration
 
-- Check the configuration files in ${PKG_SYSCONFDIR}
-   (see ${EXAMPLEDIR})
-- Modify /etc/mailer.conf (see ${EXAMPLEDIR}/mailer.conf)
-- Set postfix=YES in /etc/rc.conf
+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 -r ba90289bead8 -r b4d2998c93a3 mail/postfix/MESSAGE.NetBSD
--- a/mail/postfix/MESSAGE.NetBSD       Mon Jul 19 03:09:50 2004 +0000
+++ b/mail/postfix/MESSAGE.NetBSD       Mon Jul 19 03:25:11 2004 +0000
@@ -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 -r ba90289bead8 -r b4d2998c93a3 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Mon Jul 19 03:09:50 2004 +0000
+++ b/mail/postfix/Makefile     Mon Jul 19 03:25:11 2004 +0000
@@ -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 @@
 .endfor
 .undef confscr
 
-INSTALL_EXTRA_TMPL+=   ${PKGDIR}/INSTALL
-
 pre-configure:
        @for i in ${POSTFIX_CONF_FILES}; do                             \
                ${CP} ${WRKSRC}/$${i} ${WRKSRC}/$${i}.dist;             \