summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-07-24 09:19:14 +0000
committerjlam <jlam@pkgsrc.org>2004-07-24 09:19:14 +0000
commitec4b3da2c7fa3ce52a34f060ec74a80f44d298ca (patch)
tree4197225b117e569fdbb639835ab0c7aeb3effb41 /mail
parentacfa8463d34450b5b120c6d4e3617ba070f77844 (diff)
downloadpkgsrc-ec4b3da2c7fa3ce52a34f060ec74a80f44d298ca.tar.gz
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 (limited to 'mail')
-rw-r--r--mail/mailwrapper/DEINSTALL7
-rw-r--r--mail/mailwrapper/INSTALL13
-rw-r--r--mail/mailwrapper/Makefile9
3 files changed, 17 insertions, 12 deletions
diff --git a/mail/mailwrapper/DEINSTALL b/mail/mailwrapper/DEINSTALL
index e66231467d1..bdfa5525264 100644
--- a/mail/mailwrapper/DEINSTALL
+++ b/mail/mailwrapper/DEINSTALL
@@ -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 @@ case ${STAGE} in
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 --git a/mail/mailwrapper/INSTALL b/mail/mailwrapper/INSTALL
index 8a1682bb43f..1bc9504eebb 100644
--- a/mail/mailwrapper/INSTALL
+++ b/mail/mailwrapper/INSTALL
@@ -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 --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index 8b0b9dfdc09..678f6c04dff 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -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 @@ DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
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}; \