[pkgsrc/trunk]: pkgsrc/mail/mailwrapper As suggested by reed@, use '.pkgsrc.m...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/754120c76899
branches:  trunk
changeset: 478469:754120c76899
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Jul 24 09:19:14 2004 +0000

description:
As suggested by reed@, use '.pkgsrc.mailwrapper' as the backup suffix so
that it's more apparent who owns that file.  Bump the PKGREVISION.

diffstat:

 mail/mailwrapper/DEINSTALL |   7 ++++---
 mail/mailwrapper/INSTALL   |  13 +++++++------
 mail/mailwrapper/Makefile  |   9 ++++++---
 3 files changed, 17 insertions(+), 12 deletions(-)

diffs (92 lines):

diff -r 9cc505e501e3 -r 754120c76899 mail/mailwrapper/DEINSTALL
--- a/mail/mailwrapper/DEINSTALL        Sat Jul 24 08:48:57 2004 +0000
+++ b/mail/mailwrapper/DEINSTALL        Sat Jul 24 09:19:14 2004 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: DEINSTALL,v 1.1 2004/07/23 23:01:23 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2004/07/24 09:19:14 jlam Exp $
 
 MAILWRAPPEES="@MAILWRAPPEES@"
 MAILWRAPPER="${PKG_PREFIX}/sbin/mailwrapper"
 MAILER_CONF="${PKG_SYSCONFDIR}/mailer.conf"
 MAILER_CONF_SAMPLE="${PKG_PREFIX}/share/examples/mailwrapper/mailer.conf.sendmail"
+MW_BACKUP_SFX="@MAILWRAPPER_BACKUP_SFX@"
 
 ALL_FILES="${ALL_FILES} ${MAILER_CONF_SAMPLE} ${MAILER_CONF}"
 
@@ -11,9 +12,9 @@
 DEINSTALL)
        for file in ${MAILWRAPPEES}; do
                if [ -f ${file}.mailwrappee ]; then
-                       ${ECHO} "Restoring ${file}.mailwrappee to ${file}."
+                       ${ECHO} "Restoring ${file}${MW_BACKUP_SFX} to ${file}."
                        ${RM} -f ${file}
-                       ${MV} -f ${file}.mailwrappee ${file}
+                       ${MV} -f ${file}${MW_BACKUP_SFX} ${file}
                fi
        done
        ;;
diff -r 9cc505e501e3 -r 754120c76899 mail/mailwrapper/INSTALL
--- a/mail/mailwrapper/INSTALL  Sat Jul 24 08:48:57 2004 +0000
+++ b/mail/mailwrapper/INSTALL  Sat Jul 24 09:19:14 2004 +0000
@@ -1,26 +1,27 @@
-# $NetBSD: INSTALL,v 1.1 2004/07/23 23:01:23 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2004/07/24 09:19:15 jlam Exp $
 
 MAILWRAPPEES="@MAILWRAPPEES@"
 MAILWRAPPER="${PKG_PREFIX}/sbin/mailwrapper"
 MAILER_CONF="${PKG_SYSCONFDIR}/mailer.conf"
-MAILER_CONF_SAMPLE="${PKG_SYSCONFDIR}/mailer.conf.sendmail"
+MAILER_CONF_SAMPLE="${PKG_PREFIX}/share/examples/mailwrapper/mailer.conf.sendmail"
+MW_BACKUP_SFX="@MAILWRAPPER_BACKUP_SFX@"
 
 case ${STAGE} in
 POST-INSTALL)
        for file in ${MAILWRAPPEES}; do
                if [ -f ${file} ]; then
-                       ${ECHO} "Backing up ${file} as ${file}.mailwrappee."
-                       ${MV} -f ${file} ${file}.mailwrappee
+                       ${ECHO} "Backing up ${file} as ${file}${MW_BACKUP_SFX}."
+                       ${MV} -f ${file} ${file}${MW_BACKUP_SFX}
                        ${LN} -fs ${MAILWRAPPER} ${file}
                fi
        done
        if [ ! -f ${MAILER_CONF} ]; then
                for file in ${MAILWRAPPEES}; do
                        if [ -f ${file}.mailwrappee ]; then
-                               ${ECHO} "`${BASENAME} ${file}`  ${file}.mailwrappee" >> ${MAILER_CONF}
+                               ${ECHO} "`${BASENAME} ${file}`  ${file}${MW_BACKUP_SFX}" >> ${MAILER_CONF}
                                case ${file} in
                                */sendmail)
-                                       ${ECHO} "send-mail      ${file}.mailwrappee" >> ${MAILER_CONF}
+                                       ${ECHO} "send-mail      ${file}${MW_BACKUP_SFX}" >> ${MAILER_CONF}
                                        ;;
                                esac
                        fi
diff -r 9cc505e501e3 -r 754120c76899 mail/mailwrapper/Makefile
--- a/mail/mailwrapper/Makefile Sat Jul 24 08:48:57 2004 +0000
+++ b/mail/mailwrapper/Makefile Sat Jul 24 09:19:14 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/07/23 23:01:23 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2004/07/24 09:19:15 jlam Exp $
 
 DISTNAME=      mailwrapper-19990412
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
@@ -18,10 +18,13 @@
 INSTALL_EXTRA_TMPL=    ${.CURDIR}/INSTALL
 EGDIR=                 ${PREFIX}/share/examples/mailwrapper
 
+MAILWRAPPER_BACKUP_SFX=        .pkgsrc.mailwrapper
+FILES_SUBST+=  MAILWRAPPER_BACKUP_SFX=${MAILWRAPPER_BACKUP_SFX}
+
 MAILWRAPPEES=  /usr/bin/mailq                                          \
                /usr/bin/newaliases     /usr/sbin/newaliases            \
                /usr/sbin/sendmail      /usr/lib/sendmail
-FILES_SUBST=   MAILWRAPPEES=${MAILWRAPPEES:Q}
+FILES_SUBST+=  MAILWRAPPEES=${MAILWRAPPEES:Q}
 
 do-configure:
        cd ${WRKSRC};                                                   \