diff options
author | kim <kim@pkgsrc.org> | 2000-03-02 05:11:42 +0000 |
---|---|---|
committer | kim <kim@pkgsrc.org> | 2000-03-02 05:11:42 +0000 |
commit | e9c091498c988ec0be3b6c49608adafb34e01d65 (patch) | |
tree | fa865456932f1716bdc0e4651ce9dc4b15e4a951 /mail | |
parent | 45094ad92d3c5406bbae3994358365cff1bbca46 (diff) | |
download | pkgsrc-e9c091498c988ec0be3b6c49608adafb34e01d65.tar.gz |
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
Diffstat (limited to 'mail')
-rw-r--r-- | mail/nmh/Makefile | 23 | ||||
-rw-r--r-- | mail/nmh/files/md5 | 4 | ||||
-rw-r--r-- | mail/nmh/files/mhn.defaults.dist (renamed from mail/nmh/files/mhn.defaults) | 2 | ||||
-rw-r--r-- | mail/nmh/files/patch-sum | 4 | ||||
-rw-r--r-- | mail/nmh/patches/patch-cb | 20 | ||||
-rw-r--r-- | mail/nmh/pkg/INSTALL | 11 | ||||
-rw-r--r-- | mail/nmh/pkg/PLIST | 105 |
7 files changed, 96 insertions, 73 deletions
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.dist index 72552997c08..48980d3a302 100644 --- a/mail/nmh/files/mhn.defaults +++ b/mail/nmh/files/mhn.defaults.dist @@ -1,4 +1,4 @@ -#: $NetBSD: mhn.defaults,v 1.1 1999/03/04 09:12:40 kim Exp $ +#: $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 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 <sys/ndir.h> 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 <<EOF ============================================================= -You will need to copy the files: - - ${PKG_PREFIX}/etc/nmh/*.dist - -to be - - ${PKG_PREFIX}/etc/nmh/* - -(i.e. "delete the .dist" suffix) Some files you might need to customize include the following: ${PKG_PREFIX}/etc/nmh/mhn.defaults diff --git a/mail/nmh/pkg/PLIST b/mail/nmh/pkg/PLIST index 665ddb68ad1..d0f8f13451b 100644 --- a/mail/nmh/pkg/PLIST +++ b/mail/nmh/pkg/PLIST @@ -1,25 +1,30 @@ -@comment $NetBSD: PLIST,v 1.13 2000/03/02 02:04:07 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.14 2000/03/02 05:11:45 kim Exp $ bin/ali -bin/mhn bin/anno bin/burst bin/comp bin/dist bin/flist +bin/flists bin/folder +bin/folders bin/forw +bin/inc bin/mark bin/mhbuild bin/mhlist bin/mhmail +bin/mhn bin/mhparam bin/mhpath bin/mhshow bin/mhstore bin/msgchk bin/msh +bin/next bin/packf bin/pick +bin/prev bin/prompter bin/refile bin/repl @@ -27,17 +32,51 @@ bin/rmf bin/rmm bin/scan bin/send +bin/sendfiles bin/show bin/sortm -bin/inc bin/viamail bin/whatnow bin/whom -bin/flists -bin/folders -bin/prev -bin/next -bin/sendfiles +etc/nmh/MailAliases +etc/nmh/components +etc/nmh/digestcomps +etc/nmh/distcomps +etc/nmh/forwcomps +etc/nmh/mhl.body +etc/nmh/mhl.digest +etc/nmh/mhl.format +etc/nmh/mhl.forward +etc/nmh/mhl.headers +etc/nmh/mhl.reply +etc/nmh/mhn.defaults.dist +etc/nmh/mts.conf.dist +etc/nmh/rcvdistcomps +etc/nmh/rcvdistcomps.outbox +etc/nmh/replcomps +etc/nmh/replgroupcomps +etc/nmh/scan.default +etc/nmh/scan.mailx +etc/nmh/scan.nomime +etc/nmh/scan.size +etc/nmh/scan.time +etc/nmh/scan.timely +etc/nmh/scan.unseen +etc/nmh/tmac.h +libexec/nmh/ap +libexec/nmh/conflict +libexec/nmh/dp +libexec/nmh/fmtdump +libexec/nmh/install-mh +libexec/nmh/mhl +libexec/nmh/mhtest +libexec/nmh/post +libexec/nmh/rcvdist +libexec/nmh/rcvpack +libexec/nmh/rcvstore +libexec/nmh/rcvtty +libexec/nmh/slocal +libexec/nmh/spost man/man1/ali.1 man/man1/anno.1 man/man1/burst.1 @@ -49,7 +88,6 @@ man/man1/forw.1 man/man1/inc.1 man/man1/mark.1 man/man1/mh-chart.1 -man/man1/nmh.1 man/man1/mhbuild.1 man/man1/mhl.1 man/man1/mhlist.1 @@ -62,6 +100,7 @@ man/man1/mhstore.1 man/man1/msgchk.1 man/man1/msh.1 man/man1/next.1 +man/man1/nmh.1 man/man1/packf.1 man/man1/pick.1 man/man1/prev.1 @@ -98,53 +137,15 @@ man/man8/fmtdump.8 man/man8/install-mh.8 man/man8/mh-mts.8 man/man8/post.8 +share/doc/nmh/COMPLETION-ZSH share/doc/nmh/COPYRIGHT share/doc/nmh/DIFFERENCES share/doc/nmh/FAQ share/doc/nmh/MAIL.FILTERING share/doc/nmh/README share/doc/nmh/TODO -share/doc/nmh/COMPLETION-ZSH -etc/nmh/mhl.body -etc/nmh/mhl.digest -etc/nmh/mhl.format -etc/nmh/mhl.forward -etc/nmh/mhl.headers -etc/nmh/mhl.reply -etc/nmh/scan.default -etc/nmh/scan.mailx -etc/nmh/scan.nomime -etc/nmh/scan.size -etc/nmh/scan.time -etc/nmh/scan.timely -etc/nmh/scan.unseen -etc/nmh/components -etc/nmh/digestcomps -etc/nmh/distcomps -etc/nmh/forwcomps -etc/nmh/rcvdistcomps -etc/nmh/rcvdistcomps.outbox -etc/nmh/replcomps -etc/nmh/replgroupcomps -etc/nmh/MailAliases -etc/nmh/mhn.defaults.dist -etc/nmh/mts.conf.dist -etc/nmh/tmac.h -etc/nmh/mhn.defaults -libexec/nmh/ap -libexec/nmh/conflict -libexec/nmh/dp -libexec/nmh/fmtdump -libexec/nmh/install-mh -libexec/nmh/mhl -libexec/nmh/post -libexec/nmh/rcvdist -libexec/nmh/rcvpack -libexec/nmh/rcvstore -libexec/nmh/rcvtty -libexec/nmh/slocal -libexec/nmh/spost -libexec/nmh/mhtest -@dirrm share/doc/nmh @dirrm libexec/nmh -@dirrm etc/nmh +@dirrm share/doc/nmh +@exec if [ ! -f %D/etc/nmh/mhn.defaults ]; then cp -p %D/etc/nmh/mhn.defaults.dist %D/etc/nmh/mhn.defaults; fi +@exec if [ ! -f %D/etc/nmh/mts.conf ]; then cp -p %D/etc/nmh/mts.conf.dist %D/etc/nmh/mts.conf; fi +@unexec rmdir %D/etc/nmh 2>/dev/null || true |