Date: Sat, 11 Dec 1999 12:58:06 -0800 (PST) From: Scott.Blachowicz@seaslug.org To: FreeBSD-gnats-submit@freebsd.org Cc: Scott.Blachowicz@seaslug.org Subject: ports/15423: update mail/nmh port to nmh-1.0.2 Message-ID: <199912112058.MAA61478@sabmail.rresearch.com>
next in thread | raw e-mail | index | archive | help
>Number: 15423 >Category: ports >Synopsis: update mail/nmh port to nmh-1.0.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 11 13:00:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Scott Blachowicz >Release: FreeBSD 3.2-RELEASE i386 >Organization: none >Environment: FreeBSD >Description: Update port to most recent version of the nmh software. Following changes made to port: 1) Updated to nmh-1.0.2 from nmh-1.0. 2) No longer have the added complexity of patching "-libdir" option to be "-libexecdir", since everything that gets installed to the nmh "libdir" need to go to "libexec". Just set -libdir=PREFIX/libexec instead. 3) Now run autoconf via USE_AUTOCONF flag instead of trying to patch both autoconf input & output files. 4) Removed what appears to be an ineffective attempt to patch things to do FLOCK_LOCKING instead of DOT_LOCKING (when it should be using dot locking anyways). 5) Tweaked DESCR to make it more obvious this is a MUA package. >How-To-Repeat: >Fix: Apply patch: diff -ur ../nmh-curr/Makefile ./Makefile --- ../nmh-curr/Makefile Wed Aug 25 02:20:03 1999 +++ ./Makefile Sat Dec 11 11:39:12 1999 @@ -1,5 +1,5 @@ # New ports collection makefile for: nmh -# Version required: 1.0 +# Version required: 1.0.2 # Date created: 07 Feb 1999 # Whom: Scott Blachowicz <Scott.Blachowicz@seaslug.org> # @@ -29,15 +29,15 @@ # script's '--with-pager' option. # -DISTNAME= nmh-1.0 +DISTNAME= nmh-1.0.2 CATEGORIES= mail MASTER_SITES= ftp://ftp.mhost.com/pub/nmh/ \ http://www.freebsd.org/~jkoshy/PORTS/ MAINTAINER= Scott.Blachowicz@seaslug.org -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/nmh \ +USE_AUTOCONF= yes +CONFIGURE_ARGS= --libdir=${PREFIX}/libexec/nmh \ --sysconfdir=${PREFIX}/etc/nmh --enable-nmh-pop .ifdef NMH_MTS CONFIGURE_ARGS+= --with-mts=${NMH_MTS} @@ -59,8 +59,12 @@ MAN5= mh-alias.5 mh-draft.5 mh-format.5 mh-mail.5 mh-profile.5 \ mh-sequence.5 mh-tailor.5 +MLINKS= mh-profile.5 mh_profile.5 MAN8= ap.8 conflict.8 dp.8 fmtdump.8 install-mh.8 mh-mts.8 post.8 + +pre-configure: + cd ${WRKSRC}; chmod +w configure # Since we patch the autoconf files as well as their outputs, avoid attempt # to regenerate header input files with 'autoheader' by Makefile. diff -ur ../nmh-curr/files/md5 ./files/md5 --- ../nmh-curr/files/md5 Thu Feb 11 02:01:57 1999 +++ ./files/md5 Sun Nov 14 20:58:48 1999 @@ -1 +1 @@ -MD5 (nmh-1.0.tar.gz) = 712f93d485ab77a7b28e5abaa7341034 +MD5 (nmh-1.0.2.tar.gz) = eb0ab031b13bf9d10406661c7ad86e50 diff -ur ../nmh-curr/patches/patch-aa ./patches/patch-aa --- ../nmh-curr/patches/patch-aa Mon Jan 5 23:30:00 1998 +++ ./patches/patch-aa Sat Dec 11 12:21:28 1999 @@ -1,46 +1,35 @@ ---- ../nmh-0.19.ORIG/acconfig.h Mon Dec 1 07:52:31 1997 -+++ acconfig.h Mon Jan 5 20:03:43 1998 -@@ -36,9 +36,9 @@ - * OpenBSD 2.x - * BSD/OS 2.x +diff -ur ../../nmh-1.0.2-DIST/acconfig.h ./acconfig.h +--- ../../nmh-1.0.2-DIST/acconfig.h Thu Oct 21 11:58:09 1999 ++++ ./acconfig.h Sat Dec 11 11:54:28 1999 +@@ -104,7 +104,7 @@ + * The prefix which is prepended to the name of messages when they + * are "removed" by rmm. This should typically be `,' or `#' */ --/* #define BIND 1 */ --/* #define BSD42 1 */ --/* #define BSD44 1 */ -+#define BIND 1 -+#define BSD42 1 -+#define BSD44 1 +-#define BACKUP_PREFIX "," ++#define BACKUP_PREFIX "#" /* - * SCO 4.x -@@ -58,7 +58,7 @@ - * group and add the setgid bit to `inc' manually after - * installation. - */ --/* #define MAILGROUP 1 */ -+#define MAILGROUP 1 + * Name of link to file to which you are replying. +@@ -128,11 +128,11 @@ + /* Defined for Solaris 2.x, Irix, OSF/1, HP-UX, AIX */ + #undef SVR4 + /* Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac OS X/Rhapsody */ +-#undef BSD44 ++#define BSD44 - /* - * Turn on locale (setlocale) support -@@ -71,10 +71,10 @@ - * other programs which may modify your maildrops. - * Currently you can only use one type. - */ --#define DOT_LOCKING 1 -+/* #define DOT_LOCKING 1 */ - /* #define FCNTL_LOCKING 1 */ - /* #define LOCKF_LOCKING 1 */ --/* #define FLOCK_LOCKING 1 */ -+#define FLOCK_LOCKING 1 + /* Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac OS X/Rhapsody + * -- does PicoBSD have uname? :) */ +-#undef BSD42 ++#define BSD42 - /* - * If you have defined DOT_LOCKING, then the default is to -@@ -154,7 +154,7 @@ - /* - * The prefix to use when messages are "removed" by rmm. + /* Defined for SCO5 */ + #undef SCO_5_STDIO +@@ -231,7 +231,7 @@ + * not world writable. There are no guarantees as to the safety of doing this, + * but this #define will add some extra security checks. */ --#define BACKUP_PREFIX "," -+#define BACKUP_PREFIX "#" +-#undef MAILGROUP ++#define MAILGROUP - /* - * Name of link to file to which you are replying. + /* Define ruserpass as _ruserpass if your libraries have a bug * + * such that it can't find ruserpass, but can find _ruserpass. */ diff -ur ../nmh-curr/patches/patch-ab ./patches/patch-ab --- ../nmh-curr/patches/patch-ab Sat Jun 6 02:01:59 1998 +++ ./patches/patch-ab Sat Dec 11 12:26:52 1999 @@ -1,23 +1,7 @@ -diff -udr ../nmh-0.19.ORIG/Makefile.in ./Makefile.in ---- ../nmh-0.19.ORIG/Makefile.in Sat Jul 26 06:38:35 1997 -+++ ./Makefile.in Mon Jan 5 20:29:42 1998 -@@ -26,7 +26,7 @@ - bindir = @bindir@ - - # location of support binaries and scripts --libdir = @libdir@ -+libexecdir = @libexecdir@ - - # location of nmh configuration and formats files - etcdir = @sysconfdir@ -@@ -59,12 +59,13 @@ - MAKEDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' \ - CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \ - prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \ --etcdir='$(etcdir)' libdir='$(libdir)' mandir='$(mandir)' \ -+etcdir='$(etcdir)' libexecdir='$(libexecdir)' mandir='$(mandir)' \ - mailspool='$(mailspool)' sendmailpath='$(sendmailpath)' \ - default_editor='$(default_editor)' default_pager='$(default_pager)' +diff -ur ../../nmh-1.0.2-DIST/Makefile.in ./Makefile.in +--- ../../nmh-1.0.2-DIST/Makefile.in Sun Sep 26 12:43:15 1999 ++++ ./Makefile.in Sat Dec 11 11:54:28 1999 +@@ -65,6 +65,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -25,117 +9,38 @@ INSTALL_DATA = @INSTALL_DATA@ .SUFFIXES: -diff -udr ../nmh-0.19.ORIG/configure.in ./configure.in ---- ../nmh-0.19.ORIG/configure.in Wed Dec 17 01:18:12 1997 -+++ ./configure.in Mon Jan 5 20:20:08 1998 -@@ -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 " -@@ -413,7 +413,7 @@ - linker flags : ${LDFLAGS} - source code location : ${srcdir} - binary install path : ${nmhbin2} --libary install path : ${nmhlib2} -+libexec install path : ${nmhlib2} - config files install path : ${nmhsysconf2} - man page install path : ${nmhman}" - echo "" -diff -udr ../nmh-0.26.ORIG/etc/Makefile.in ./etc/Makefile.in ---- ../nmh-0.26.ORIG/etc/Makefile.in Sat May 16 21:05:03 1998 -+++ ./etc/Makefile.in Mon Jun 1 21:05:45 1998 -@@ -13,13 +13,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --libdir = @libdir@ -+libexecdir = @libexecdir@ - etcdir = @sysconfdir@ - - mailspool = @mailspool@ +diff -ur ../../nmh-1.0.2-DIST/etc/Makefile.in ./etc/Makefile.in +--- ../../nmh-1.0.2-DIST/etc/Makefile.in Thu Jul 15 17:43:04 1999 ++++ ./etc/Makefile.in Sat Dec 11 12:12:53 1999 +@@ -20,6 +20,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ - # Path to search for programs to display content -@@ -86,9 +87,9 @@ - done - + # Path to search for programs to handle MIME +@@ -89,7 +90,7 @@ install-scripts: -- $(top_srcdir)/mkinstalldirs $(libdir) -+ $(top_srcdir)/mkinstalldirs $(libexecdir) + $(top_srcdir)/mkinstalldirs $(libdir) for script in $(SCRIPTS); do \ - $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \ -+ $(INSTALL_SCRIPT) $(srcdir)/$$script $(libexecdir)/$$script; \ ++ $(INSTALL_SCRIPT) $(srcdir)/$$script $(libdir)/$$script; \ done uninstall: uninstall-files uninstall-scripts -@@ -100,7 +101,7 @@ - - uninstall-scripts: - for script in $(SCRIPTS); do \ -- rm -f $(libdir)/$$script; \ -+ rm -f $(libexecdir)/$$script; \ - done - - # ========== DEPENDENCIES FOR CLEANUP ========== -diff -udr ../nmh-0.19.ORIG/uip/Makefile.in ./uip/Makefile.in ---- ../nmh-0.19.ORIG/uip/Makefile.in Thu Dec 4 02:16:04 1997 -+++ ./uip/Makefile.in Mon Jan 5 20:29:16 1998 -@@ -13,7 +13,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --libdir = @libdir@ -+libexecdir = @libexecdir@ - etcdir = @sysconfdir@ - - CC = @CC@ -@@ -235,9 +235,9 @@ - - # install misc support binaries - install-misc: -- $(top_srcdir)/mkinstalldirs $(libdir) -+ $(top_srcdir)/mkinstalldirs $(libexecdir) - for misc in $(MISC); do \ -- $(INSTALL_PROGRAM) $$misc $(libdir)/$$misc; \ -+ $(INSTALL_PROGRAM) $$misc $(libexecdir)/$$misc; \ - done - - uninstall: -@@ -248,7 +248,7 @@ - rm -f $(bindir)/$$lcmd; \ - done - for misc in $(MISC); do \ -- rm -f $(libdir)/$$misc; \ -+ rm -f $(libexecdir)/$$misc; \ - done - - # ========== DEPENDENCIES FOR CLEANUP ========== -diff -udr ../nmh-0.19.ORIG/config/Makefile.in ./config/Makefile.in ---- ../nmh-0.19.ORIG/config/Makefile.in Sat Jul 26 06:38:57 1997 -+++ ./config/Makefile.in Mon Jan 5 22:02:45 1998 -@@ -17,6 +17,7 @@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ - libdir = @libdir@ -+libexecdir = @libexecdir@ - etcdir = @sysconfdir@ - - default_editor = @vipath@ -@@ -26,7 +27,7 @@ - CFLAGS = @CFLAGS@ - DEFS = @DEFS@ - INCLUDES = -I.. -I$(top_srcdir) --CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBDIR='"$(libdir)"' \ -+CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBDIR='"$(libdir)"' -DNMHLIBEXECDIR='"$(libexecdir)"' \ - -DDEFAULT_EDITOR='"$(default_editor)"' -DDEFAULT_PAGER='"$(default_pager)"' +diff -ur ../../nmh-1.0.2-DIST/man/Makefile.in ./man/Makefile.in +--- ../../nmh-1.0.2-DIST/man/Makefile.in Wed Oct 13 07:56:41 1999 ++++ ./man/Makefile.in Sat Dec 11 11:52:33 1999 +@@ -146,8 +146,9 @@ + $(INSTALL_DATA) $$file $(mandir)/man$(manext5) ; \ + done + if [ ! -f mh_profile.$(manext5) ] ; then \ +- ( cd $(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \ +- mh_profile.$(manext5) ) \ ++ ( cd $(mandir)/man$(manext5) ; \ ++ rm -f mh_profile.$(manext5) ; \ ++ ln mh-profile.$(manext5) mh_profile.$(manext5) ) \ + fi - COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS) + # install the man pages in man8 diff -ur ../nmh-curr/patches/patch-ac ./patches/patch-ac --- ../nmh-curr/patches/patch-ac Mon Jan 5 19:11:00 1998 +++ ./patches/patch-ac Sat Dec 11 12:21:54 1999 @@ -1,37 +1,14 @@ ---- ../nmh-0.19.ORIG/configure Sun Dec 28 12:19:27 1997 -+++ configure Mon Jan 5 20:34:08 1998 -@@ -967,6 +967,8 @@ - # It thinks the first close brace ends the variable substitution. - test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - +--- ../../nmh-1.0.2-DIST/configure.in Tue Oct 26 14:12:37 1999 ++++ ./configure.in Sat Dec 11 11:54:28 1999 +@@ -160,6 +160,11 @@ + dnl ------------------ + AC_PROG_MAKE_SET dnl Does make define $MAKE + AC_PROG_INSTALL dnl Check for BSD compatible `install' ++ +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755' + - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 -@@ -3449,6 +3451,7 @@ - s%@CC@%$CC%g - s%@SET_MAKE@%$SET_MAKE%g - s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g - s%@INSTALL_DATA@%$INSTALL_DATA%g - s%@RANLIB@%$RANLIB%g - s%@AWK@%$AWK%g -@@ -3692,7 +3695,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 " -@@ -3705,7 +3708,7 @@ - linker flags : ${LDFLAGS} - source code location : ${srcdir} - binary install path : ${nmhbin2} --libary install path : ${nmhlib2} -+libexec install path : ${nmhlib2} - config files install path : ${nmhsysconf2} - man page install path : ${nmhman}" - echo "" ++AC_SUBST(INSTALL_SCRIPT) ++ + AC_PROG_RANLIB dnl Check for `ranlib' + AC_PROG_AWK dnl Check for mawk,gawk,nawk, then awk + AC_PROG_LEX dnl Check for lex/flex diff -ur ../nmh-curr/pkg/DESCR ./pkg/DESCR --- ../nmh-curr/pkg/DESCR Mon Jun 14 02:08:51 1999 +++ ./pkg/DESCR Sat Dec 11 11:19:51 1999 @@ -1,9 +1,10 @@ ----------- -what is it? +What is it? ----------- -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 (new MH) is an electronic mail handling system - a MUA (Mail +User Agent) package for end-users to handle their e-mail. 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 consists of a collection of fairly simple single-purpose programs to send, receive, save, retrieve, and manipulate e-mail messages. Since diff -ur ../nmh-curr/pkg/PLIST ./pkg/PLIST --- ../nmh-curr/pkg/PLIST Thu Feb 11 02:01:58 1999 +++ ./pkg/PLIST Sat Dec 11 11:58:41 1999 @@ -51,6 +51,7 @@ etc/nmh/mhn.defaults etc/nmh/mts.conf etc/nmh/rcvdistcomps +etc/nmh/rcvdistcomps.outbox etc/nmh/replcomps etc/nmh/replgroupcomps etc/nmh/scan.default >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199912112058.MAA61478>