From e9cd567cfc99a77021077d8102c2bc347bcf7ae0 Mon Sep 17 00:00:00 2001 From: kim Date: Thu, 2 Mar 2000 05:11:42 +0000 Subject: Fixes: - added missing checksum for the distribution file - put back GCOS_HACK define (it was removed from patch-cb) - do not include mhn.defaults in the PLIST to keep protecting it from upgrades in case it has local modifications - install mhn.defaults.dist from the "files" directory instead of using a dynamically generated one (this was the intention always) - mhn.defaults and mts.conf get installed if they don't exist; new users do not have to worry about copying *.dist files now - added comments about the configuration file philosophy in Makefile --- mail/nmh/Makefile | 23 ++++++++- mail/nmh/files/md5 | 4 +- mail/nmh/files/mhn.defaults | 14 ------ mail/nmh/files/mhn.defaults.dist | 14 ++++++ mail/nmh/files/patch-sum | 4 +- mail/nmh/patches/patch-cb | 20 ++++++-- mail/nmh/pkg/INSTALL | 11 +--- mail/nmh/pkg/PLIST | 105 ++++++++++++++++++++------------------- 8 files changed, 109 insertions(+), 86 deletions(-) delete mode 100644 mail/nmh/files/mhn.defaults create mode 100644 mail/nmh/files/mhn.defaults.dist (limited to 'mail/nmh') diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile index 17e04320f4b..70a241cffe0 100644 --- a/mail/nmh/Makefile +++ b/mail/nmh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2000/03/02 00:23:14 hubertf Exp $ +# $NetBSD: Makefile,v 1.34 2000/03/02 05:11:42 kim Exp $ # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp # @@ -60,12 +60,31 @@ post-configure: < ${WRKSRC}/config.h.bak > ${WRKSRC}/config.h .endif +# ABOUT CONFIGURATION FILES: +# - mhn.defaults is generated by nmh during make; we don't use that +# copy because its contents depend on what happened to be installed +# on the build system; we want a reliably reconstructable package +# - mhn.defaults and mts.conf are only created if they don't exist; +# the PLIST only has mhn.defaults.dist and mts.conf.dist, so that +# local modifications to the configuration files won't get lost on +# upgrading the package + post-install: @${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR} @for f in `grep '^${DOCDIR}/' ${PKGDIR}/PLIST`; do \ ${INSTALL_DATA} ${WRKSRC}/`basename $$f` ${PREFIX}/${DOCDIR}; \ done - @${INSTALL_DATA} ${FILESDIR}/mhn.defaults ${PREFIX}/etc/nmh + @${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist ${PREFIX}/etc/nmh + @if [ ! -f ${PREFIX}/etc/nmh/mhn.defaults ]; then \ + cp -p \ + ${PREFIX}/etc/nmh/mhn.defaults.dist \ + ${PREFIX}/etc/nmh/mhn.defaults; \ + fi + @if [ ! -f ${PREFIX}/etc/nmh/mts.conf ]; then \ + cp -p \ + ${PREFIX}/etc/nmh/mts.conf.dist \ + ${PREFIX}/etc/nmh/mts.conf; \ + fi @PKG_PREFIX='${PREFIX}' ${SH} -f ${PKGDIR}/INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/mail/nmh/files/md5 b/mail/nmh/files/md5 index e7e912e3b0f..75fe6502916 100644 --- a/mail/nmh/files/md5 +++ b/mail/nmh/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.12 1999/03/04 09:12:40 kim Exp $ +$NetBSD: md5,v 1.13 2000/03/02 05:11:44 kim Exp $ -MD5 (nmh-1.0.tar.gz) = 712f93d485ab77a7b28e5abaa7341034 +MD5 (nmh-1.0.3.tar.gz) = 02519bf8f7ff8590ecfbee9f9500ea07 diff --git a/mail/nmh/files/mhn.defaults b/mail/nmh/files/mhn.defaults deleted file mode 100644 index 72552997c08..00000000000 --- a/mail/nmh/files/mhn.defaults +++ /dev/null @@ -1,14 +0,0 @@ -#: $NetBSD: mhn.defaults,v 1.1 1999/03/04 09:12:40 kim Exp $ -#: -mhstore-store-application/PostScript: %m%P.ps -mhstore-store-text: %m%P.txt -mhstore-store-text/richtext: %m%P.rt -mhstore-store-video/mpeg: %m%P.mpg -#: -#: If you install more packages you could enable these -#: -#: mhshow-show-application/PostScript: %plpr -Pps -#: mhshow-show-application/x-ivs: %pivs_replay -o '%F' -#: mhshow-show-image: %pxv '%f' -#: mhshow-show-text/richtext: %prichtext -p '%F' -#: mhshow-show-video/mpeg: %pmpeg_play '%f'" >> $TMP diff --git a/mail/nmh/files/mhn.defaults.dist b/mail/nmh/files/mhn.defaults.dist new file mode 100644 index 00000000000..48980d3a302 --- /dev/null +++ b/mail/nmh/files/mhn.defaults.dist @@ -0,0 +1,14 @@ +#: $NetBSD: mhn.defaults.dist,v 1.1 2000/03/02 05:11:44 kim Exp $ +#: +mhstore-store-application/PostScript: %m%P.ps +mhstore-store-text: %m%P.txt +mhstore-store-text/richtext: %m%P.rt +mhstore-store-video/mpeg: %m%P.mpg +#: +#: If you install more packages you could enable these +#: +#: mhshow-show-application/PostScript: %plpr -Pps +#: mhshow-show-application/x-ivs: %pivs_replay -o '%F' +#: mhshow-show-image: %pxv '%f' +#: mhshow-show-text/richtext: %prichtext -p '%F' +#: mhshow-show-video/mpeg: %pmpeg_play '%f'" >> $TMP diff --git a/mail/nmh/files/patch-sum b/mail/nmh/files/patch-sum index f549ebcb3d3..fcd02ccd53f 100644 --- a/mail/nmh/files/patch-sum +++ b/mail/nmh/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.3 2000/03/02 00:23:15 hubertf Exp $ +$NetBSD: patch-sum,v 1.4 2000/03/02 05:11:45 kim Exp $ MD5 (patch-ca) = ba8bde6090ca48b315ac84f6a3c04f2d -MD5 (patch-cb) = 6ba803e016659cde1f688f27f6ce09b5 +MD5 (patch-cb) = 9045625460e75f206c0f11ab0c4a74e6 MD5 (patch-cc) = 14aab99374bf88d3d661ca795fdd2af8 diff --git a/mail/nmh/patches/patch-cb b/mail/nmh/patches/patch-cb index 9e638adcd48..2aff52725ff 100644 --- a/mail/nmh/patches/patch-cb +++ b/mail/nmh/patches/patch-cb @@ -1,7 +1,7 @@ -$NetBSD: patch-cb,v 1.5 2000/03/02 00:23:15 hubertf Exp $ +$NetBSD: patch-cb,v 1.6 2000/03/02 05:11:45 kim Exp $ ---- config.h.in.orig Sun Feb 6 13:40:21 2000 -+++ config.h.in Thu Mar 2 00:47:13 2000 +--- config.h.in.orig Sun Feb 6 07:40:21 2000 ++++ config.h.in Wed Mar 1 23:31:04 2000 @@ -1,5 +1,12 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -15,7 +15,19 @@ $NetBSD: patch-cb,v 1.5 2000/03/02 00:23:15 hubertf Exp $ /****** BEGIN USER CONFIGURATION SECTION *****/ /* -@@ -405,9 +412,6 @@ +@@ -58,6 +65,11 @@ + /* #define REALLYDUMB 1 */ + + /* ++ * Replace & in the GCOS field with the login name. ++ */ ++#define GCOS_HACK 1 ++ ++/* + * Directs inc/slocal to extract the envelope sender from "From " + * line. If inc/slocal is saving message to folder, then this + * sender information is then used to create a Return-Path +@@ -405,9 +417,6 @@ /* Define if you have the header file. */ #undef HAVE_SYS_NDIR_H diff --git a/mail/nmh/pkg/INSTALL b/mail/nmh/pkg/INSTALL index 1ba727b996d..682cbe87b64 100644 --- a/mail/nmh/pkg/INSTALL +++ b/mail/nmh/pkg/INSTALL @@ -1,21 +1,12 @@ #! /bin/sh # -# $NetBSD: INSTALL,v 1.4 2000/01/18 15:50:33 agc Exp $ +# $NetBSD: INSTALL,v 1.5 2000/03/02 05:11:45 kim Exp $ # case "$2" in ""|POST-INSTALL) cat </dev/null || true -- cgit v1.2.3