diff options
author | kim <kim@pkgsrc.org> | 1999-03-04 09:12:39 +0000 |
---|---|---|
committer | kim <kim@pkgsrc.org> | 1999-03-04 09:12:39 +0000 |
commit | 3c4a00b8d312a911a9f23931bb82bb13a2cbdcf0 (patch) | |
tree | 0fdefca3abde3213f2ab06906915c768d74144ab /mail/nmh | |
parent | 9b1b024f643464817267fcee208b8ef53685d498 (diff) | |
download | pkgsrc-3c4a00b8d312a911a9f23931bb82bb13a2cbdcf0.tar.gz |
Upgraded to nmh-1.0
Diffstat (limited to 'mail/nmh')
-rw-r--r-- | mail/nmh/Makefile | 23 | ||||
-rw-r--r-- | mail/nmh/files/md5 | 4 | ||||
-rw-r--r-- | mail/nmh/files/mhn.defaults | 14 | ||||
-rw-r--r-- | mail/nmh/patches/patch-aa | 45 | ||||
-rw-r--r-- | mail/nmh/patches/patch-ab | 13 | ||||
-rw-r--r-- | mail/nmh/patches/patch-ac | 96 | ||||
-rw-r--r-- | mail/nmh/patches/patch-ad | 49 | ||||
-rw-r--r-- | mail/nmh/patches/patch-ba | 13 | ||||
-rw-r--r-- | mail/nmh/patches/patch-ca | 21 | ||||
-rw-r--r-- | mail/nmh/patches/patch-cb | 17 | ||||
-rw-r--r-- | mail/nmh/pkg/DESCR | 14 | ||||
-rw-r--r-- | mail/nmh/pkg/PLIST | 132 |
12 files changed, 156 insertions, 285 deletions
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile index 215b0d87779..a2eb01dc66c 100644 --- a/mail/nmh/Makefile +++ b/mail/nmh/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 1999/02/20 22:48:34 hubertf Exp $ +# $NetBSD: Makefile,v 1.22 1999/03/04 09:12:39 kim Exp $ # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp # -DISTNAME= nmh-0.27 +DISTNAME= nmh-1.0 CATEGORIES= mail MASTER_SITES= ftp://ftp.math.gatech.edu/pub/nmh/ @@ -13,16 +13,29 @@ HOMEPAGE= http://www.math.gatech.edu/nmh/ NMH_MTA?= smtp GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nmh \ - --sysconfdir=${PREFIX}/etc/nmh --enable-nmh-pop \ +CONFIGURE_ARGS+= \ + --libdir=${PREFIX}/libexec/nmh \ + --sysconfdir=${PREFIX}/etc/nmh \ + --enable-nmh-pop \ --with-mts=${NMH_MTA} +.if exists(/usr/lib/libkrb.a) && (defined(MAKE_EBONES) || defined(MAKE_KERBEROS4)) +CONFIGURE_ARGS+= --with-krb4=yes +.endif + +DOCDIR= share/doc/nmh + # Since we patch the autoconf files as well as their outputs, avoid attempt # to regenerate header input files with 'autoheader' by Makefile. post-patch: - ${ECHO} > ${WRKSRC}/stamp-h.in + ${TOUCH} ${WRKSRC}/stamp-h.in 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 @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 9f1d3973014..e7e912e3b0f 100644 --- a/mail/nmh/files/md5 +++ b/mail/nmh/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.11 1998/08/07 13:25:02 agc Exp $ +$NetBSD: md5,v 1.12 1999/03/04 09:12:40 kim Exp $ -MD5 (nmh-0.27.tar.gz) = 62395d23c686b230ed0f2f17fbc2e01a +MD5 (nmh-1.0.tar.gz) = 712f93d485ab77a7b28e5abaa7341034 diff --git a/mail/nmh/files/mhn.defaults b/mail/nmh/files/mhn.defaults new file mode 100644 index 00000000000..72552997c08 --- /dev/null +++ b/mail/nmh/files/mhn.defaults @@ -0,0 +1,14 @@ +#: $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/patches/patch-aa b/mail/nmh/patches/patch-aa deleted file mode 100644 index a9b7e5ec89a..00000000000 --- a/mail/nmh/patches/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 11:09:43 agc Exp $ - -diff -ur nmh-0.14-dist/acconfig.h nmh-0.14/acconfig.h ---- acconfig.h-dist Wed Apr 16 21:25:42 1997 -+++ acconfig.h Tue May 20 18:59:52 1997 -@@ -1,3 +1,9 @@ -+/* Define if you have the <sys/param.h> header file. */ -+#undef HAVE_SYS_PARAM_H -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif -+ - - /****** BEGIN USER CONFIGURATION SECTION *****/ - -@@ -37,9 +40,11 @@ - * OpenBSD 2.x - * BSD/OS 2.x - */ --/* #define BIND 1 */ --/* #define BSD42 1 */ --/* #define BSD44 1 */ -+#ifdef BSD4_4 -+#define BIND 1 -+#define BSD42 1 -+#define BSD44 1 -+#endif - - /* - * SCO 4.x -@@ -72,10 +77,14 @@ - * other programs which may modify your maildrops. - * Currently you can only use one type. - */ -+#if defined(BSD44) -+#define FCNTL_LOCKING 1 -+#else - #define DOT_LOCKING 1 - /* #define FCNTL_LOCKING 1 */ - /* #define LOCKF_LOCKING 1 */ - /* #define FLOCK_LOCKING 1 */ -+#endif - - /* - * If you have defined DOT_LOCKING, then the default is to diff --git a/mail/nmh/patches/patch-ab b/mail/nmh/patches/patch-ab deleted file mode 100644 index edb9a31e5d9..00000000000 --- a/mail/nmh/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 11:09:43 agc Exp $ - ---- configure.in.orig Tue Dec 16 23:18:12 1997 -+++ configure.in Fri Dec 19 12:37:22 1997 -@@ -400,7 +400,7 @@ - - eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}" - eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}" --eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}" -+eval "nmhlib=${libexecdir}"; eval "nmhlib2=${nmhlib}" - eval "nmhman=${mandir}" - - echo " diff --git a/mail/nmh/patches/patch-ac b/mail/nmh/patches/patch-ac deleted file mode 100644 index b4d1d43370b..00000000000 --- a/mail/nmh/patches/patch-ac +++ /dev/null @@ -1,96 +0,0 @@ -$NetBSD: patch-ac,v 1.4 1998/08/07 11:09:43 agc Exp $ - ---- ./Makefile.in 1997/12/19 13:00:53 1.1 -+++ ./Makefile.in 1997/12/19 13:03:28 -@@ -26,7 +26,7 @@ - bindir = @bindir@ - - # location of support binaries and scripts --libdir = @libdir@ -+libdir = @libexecdir@ - - # location of nmh configuration and formats files - etcdir = @sysconfdir@ ---- config/Makefile.in 1997/12/19 13:00:55 1.1 -+++ config/Makefile.in 1997/12/19 13:03:59 -@@ -16,7 +16,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --libdir = @libdir@ -+libdir = @libexecdir@ - etcdir = @sysconfdir@ - - default_editor = @vipath@ ---- mts/sendmail/Makefile.in 1997/12/19 13:00:59 1.1 -+++ mts/sendmail/Makefile.in 1997/12/19 13:07:13 -@@ -13,7 +13,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --libdir = @libdir@ -+libdir = @libexecdir@ - etcdir = @sysconfdir@ - - CC = @CC@ ---- mts/mmdf/Makefile.in 1997/12/19 13:01:00 1.1 -+++ mts/mmdf/Makefile.in 1997/12/19 13:07:54 -@@ -12,7 +12,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --libdir = @libdir@ -+libdir = @libexecdir@ - etcdir = @sysconfdir@ - - .SUFFIXES: ---- uip/Makefile.in 1997/12/19 13:01:01 1.1 -+++ uip/Makefile.in 1997/12/19 13:08:19 -@@ -13,7 +13,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --libdir = @libdir@ -+libdir = @libexecdir@ - etcdir = @sysconfdir@ - - CC = @CC@ ---- man/Makefile.in 1997/12/19 13:01:04 1.1 -+++ man/Makefile.in 1997/12/19 13:01:28 -@@ -15,7 +15,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --libdir = @libdir@ -+libdir = @libexecdir@ - etcdir = @sysconfdir@ - mandir = @mandir@ - manext1 = 1 ---- etc/Makefile.in 1998/06/01 12:43:22 1.1 -+++ etc/Makefile.in 1998/06/01 12:46:59 -@@ -13,7 +13,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --libdir = @libdir@ -+libdir = @libexecdir@ - etcdir = @sysconfdir@ - - mailspool = @mailspool@ -@@ -21,6 +21,7 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_SCRIPT= ${BSD_INSTALL_SCRIPT} - - # Path to search for programs to display content - # for mhn. Used to create mhn.defaults -@@ -88,7 +89,7 @@ - install-scripts: - $(top_srcdir)/mkinstalldirs $(libdir) - for script in $(SCRIPTS); do \ -- $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \ -+ $(INSTALL_SCRIPT) $(srcdir)/$$script $(libdir)/$$script; \ - done - - uninstall: uninstall-files uninstall-scripts diff --git a/mail/nmh/patches/patch-ad b/mail/nmh/patches/patch-ad deleted file mode 100644 index ab759619bbd..00000000000 --- a/mail/nmh/patches/patch-ad +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ad,v 1.2 1998/08/07 11:09:44 agc Exp $ - -# Do this patch after acconfig.h to avoid having autoconf regenerate the -# config.h.in file in case end user has autoconf... -diff -ur config.h.in-dist config.h.in ---- config.h.in-dist Fri May 2 12:33:46 1997 -+++ config.h.in Thu May 15 22:46:22 1997 -@@ -1,5 +1,11 @@ - /* config.h.in. Generated automatically from configure.in by autoheader. */ - -+/* Define if you have the <sys/param.h> header file. */ -+#undef HAVE_SYS_PARAM_H -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif -+ - /****** BEGIN USER CONFIGURATION SECTION *****/ - - /* -@@ -38,9 +44,11 @@ - * OpenBSD 2.x - * BSD/OS 2.x - */ --/* #define BIND 1 */ --/* #define BSD42 1 */ --/* #define BSD44 1 */ -+#if defined(BSD4_4) -+#define BIND 1 -+#define BSD42 1 -+#define BSD44 1 -+#endif - - /* - * SCO 4.x -@@ -73,10 +81,13 @@ - * other programs which may modify your maildrops. - * Currently you can only use one type. - */ -+#if defined(BSD44) -+#define FCNTL_LOCKING 1 -+#else - #define DOT_LOCKING 1 --/* #define FCNTL_LOCKING 1 */ - /* #define LOCKF_LOCKING 1 */ - /* #define FLOCK_LOCKING 1 */ -+#endif - - /* - * If you have defined DOT_LOCKING, then the default is to diff --git a/mail/nmh/patches/patch-ba b/mail/nmh/patches/patch-ba deleted file mode 100644 index 5808048796c..00000000000 --- a/mail/nmh/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.3 1998/08/07 11:09:44 agc Exp $ - ---- configure.orig Thu Dec 18 01:31:57 1997 -+++ configure Fri Dec 19 12:47:03 1997 -@@ -3692,7 +3692,7 @@ - - eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}" - eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}" --eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}" -+eval "nmhlib=${libexecdir}"; eval "nmhlib2=${nmhlib}" - eval "nmhman=${mandir}" - - echo " diff --git a/mail/nmh/patches/patch-ca b/mail/nmh/patches/patch-ca new file mode 100644 index 00000000000..8b033797e4b --- /dev/null +++ b/mail/nmh/patches/patch-ca @@ -0,0 +1,21 @@ +$NetBSD: patch-ca,v 1.1 1999/03/04 09:12:42 kim Exp $ + +--- etc/Makefile.in.orig Fri Oct 2 23:38:38 1998 ++++ etc/Makefile.in Thu Mar 4 01:41:05 1999 +@@ -21,6 +21,7 @@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} + + # Path to search for programs to handle MIME + # content. Used to create mhn.defaults +@@ -88,7 +89,7 @@ + install-scripts: + $(top_srcdir)/mkinstalldirs $(libdir) + for script in $(SCRIPTS); do \ +- $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \ ++ $(INSTALL_SCRIPT) $(srcdir)/$$script $(libdir)/$$script; \ + done + + uninstall: uninstall-files uninstall-scripts diff --git a/mail/nmh/patches/patch-cb b/mail/nmh/patches/patch-cb new file mode 100644 index 00000000000..af48e7369f3 --- /dev/null +++ b/mail/nmh/patches/patch-cb @@ -0,0 +1,17 @@ +$NetBSD: patch-cb,v 1.1 1999/03/04 09:12:42 kim Exp $ + +--- config.h.in.orig Sat Jan 23 21:27:49 1999 ++++ config.h.in Thu Mar 4 02:02:07 1999 +@@ -37,9 +37,9 @@ + * OpenBSD 2.x + * BSD/OS 2.x + */ +-/* #define BIND 1 */ +-/* #define BSD42 1 */ +-/* #define BSD44 1 */ ++#define BIND 1 ++#define BSD42 1 ++#define BSD44 1 + + /* + * SCO 4.x diff --git a/mail/nmh/pkg/DESCR b/mail/nmh/pkg/DESCR index a3fdfda74fd..fdbe66aa75b 100644 --- a/mail/nmh/pkg/DESCR +++ b/mail/nmh/pkg/DESCR @@ -5,6 +5,14 @@ nmh (new MH) is an electronic mail handling system. It was originally based on the package MH-6.8.3, and is intended to be a (mostly) compatible drop-in replacement for MH. -nmh is currently in BETA testing/development. It seems to be -generally stable, but things may break from release to release -as changes are made. +Although development of nmh is ongoing, it appears to be generally +stable and is in current use. But it is possible that I may break +things as changes are made. + +--------------- +nmh maintenance +--------------- +nmh is currently being developed and maintained by +Richard Coleman <coleman@math.gatech.edu>. Please send bug reports +and suggestions to the nmh development mailing list at +nmh-workers@math.gatech.edu. diff --git a/mail/nmh/pkg/PLIST b/mail/nmh/pkg/PLIST index c8d8ef28560..45070f3ba35 100644 --- a/mail/nmh/pkg/PLIST +++ b/mail/nmh/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 1998/07/12 21:29:46 frueauf Exp $ +@comment $NetBSD: PLIST,v 1.10 1999/03/04 09:12:42 kim Exp $ bin/ali bin/anno bin/burst @@ -12,10 +12,14 @@ bin/forw bin/inc bin/mark bin/mhbuild +bin/mhlist bin/mhmail bin/mhn bin/mhparam bin/mhpath +bin/mhshow +bin/mhstore +bin/mhtest bin/msgchk bin/msh bin/next @@ -72,62 +76,72 @@ libexec/nmh/rcvtty libexec/nmh/sendfiles libexec/nmh/slocal libexec/nmh/spost -man/man1/ali.1.gz -man/man1/anno.1.gz -man/man1/burst.1.gz -man/man1/comp.1.gz -man/man1/dist.1.gz -man/man1/flist.1.gz -man/man1/folder.1.gz -man/man1/forw.1.gz -man/man1/inc.1.gz -man/man1/mark.1.gz -man/man1/mh-chart.1.gz -man/man1/mhbuild.1.gz -man/man1/mhl.1.gz -man/man1/mhmail.1.gz -man/man1/mhn.1.gz -man/man1/mhparam.1.gz -man/man1/mhpath.1.gz -man/man1/msgchk.1.gz -man/man1/msh.1.gz -man/man1/next.1.gz -man/man1/nmh.1.gz -man/man1/packf.1.gz -man/man1/pick.1.gz -man/man1/prev.1.gz -man/man1/prompter.1.gz -man/man1/rcvdist.1.gz -man/man1/rcvpack.1.gz -man/man1/rcvstore.1.gz -man/man1/rcvtty.1.gz -man/man1/refile.1.gz -man/man1/repl.1.gz -man/man1/rmf.1.gz -man/man1/rmm.1.gz -man/man1/scan.1.gz -man/man1/send.1.gz -man/man1/sendfiles.1.gz -man/man1/show.1.gz -man/man1/slocal.1.gz -man/man1/sortm.1.gz -man/man1/vmh.1.gz -man/man1/whatnow.1.gz -man/man1/whom.1.gz -man/man5/mh-alias.5.gz -man/man5/mh-draft.5.gz -man/man5/mh-format.5.gz -man/man5/mh-mail.5.gz -man/man5/mh-profile.5.gz -man/man5/mh-sequence.5.gz -man/man5/mh-tailor.5.gz -man/man8/ap.8.gz -man/man8/conflict.8.gz -man/man8/dp.8.gz -man/man8/fmtdump.8.gz -man/man8/install-mh.8.gz -man/man8/mh-mts.8.gz -man/man8/post.8.gz -@unexec (for ent in %D/etc/nmh/*.old; do [ -f $ent ] && mv $ent %D/etc/nmh/`basename $ent .old`; done) || /usr/bin/true -@unexec rmdir %D/etc/nmh || /usr/bin/true +man/man1/ali.1 +man/man1/anno.1 +man/man1/burst.1 +man/man1/comp.1 +man/man1/dist.1 +man/man1/flist.1 +man/man1/folder.1 +man/man1/forw.1 +man/man1/inc.1 +man/man1/mark.1 +man/man1/mh-chart.1 +man/man1/mhbuild.1 +man/man1/mhl.1 +man/man1/mhlist.1 +man/man1/mhmail.1 +man/man1/mhn.1 +man/man1/mhparam.1 +man/man1/mhpath.1 +man/man1/mhshow.1 +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 +man/man1/prompter.1 +man/man1/rcvdist.1 +man/man1/rcvpack.1 +man/man1/rcvstore.1 +man/man1/rcvtty.1 +man/man1/refile.1 +man/man1/repl.1 +man/man1/rmf.1 +man/man1/rmm.1 +man/man1/scan.1 +man/man1/send.1 +man/man1/sendfiles.1 +man/man1/show.1 +man/man1/slocal.1 +man/man1/sortm.1 +man/man1/vmh.1 +man/man1/whatnow.1 +man/man1/whom.1 +man/man5/mh-alias.5 +man/man5/mh-draft.5 +man/man5/mh-format.5 +man/man5/mh-mail.5 +man/man5/mh-profile.5 +man/man5/mh-sequence.5 +man/man5/mh-tailor.5 +man/man8/ap.8 +man/man8/conflict.8 +man/man8/dp.8 +man/man8/fmtdump.8 +man/man8/install-mh.8 +man/man8/mh-mts.8 +man/man8/post.8 +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/ZSH.COMPLETION +@dirrm etc/nmh @dirrm libexec/nmh +@dirrm share/doc/nmh |