From owner-freebsd-ports Sat Nov 27 22:46:14 1999 Delivered-To: freebsd-ports@freebsd.org Received: from ducky.net (gate.ducky.net [199.2.211.252]) by hub.freebsd.org (Postfix) with ESMTP id C18621512C for ; Sat, 27 Nov 1999 22:45:59 -0800 (PST) (envelope-from mike@ducky.net) Received: from ducky.net (localhost.ducky.net [127.0.0.1]) by ducky.net (8.9.1/8.8.5) with ESMTP id WAA27504; Sat, 27 Nov 1999 22:45:14 -0800 (PST) Message-Id: <199911280645.WAA27504@ducky.net> To: freebsd-ports@freebsd.org Cc: Scott.Blachowicz@seaslug.org Subject: upgrade to FreeBSD ports/mail/nmh MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" Content-ID: <27480.943771444.0@ducky.net> Date: Sat, 27 Nov 1999 22:45:14 -0800 From: Mike Haertel Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="us-ascii" Content-ID: <27480.943771444.1@ducky.net> This message contains changes to upgrade ports/mail/nmh to version 1.0.2. The first attachment is a set of diffs to be applied in ports/mail/nmh. The second attachment is a single patch file which supersedes ports/mail/nmh/patches/patch-a[a-d]. This attachment should be installed as patches/patch-aa and patches/patch-a{b,c,d} should be removed. ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="us-ascii" Content-ID: <27480.943771444.2@ducky.net> Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/nmh/Makefile,v retrieving revision 1.16 diff -r1.16 Makefile 32c32 < DISTNAME= nmh-1.0 --- > DISTNAME= nmh-1.0.2 Index: files/md5 =================================================================== RCS file: /home/ncvs/ports/mail/nmh/files/md5,v retrieving revision 1.11 diff -r1.11 md5 1c1 < MD5 (nmh-1.0.tar.gz) = 712f93d485ab77a7b28e5abaa7341034 --- > MD5 (nmh-1.0.2.tar.gz) = eb0ab031b13bf9d10406661c7ad86e50 Index: pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/mail/nmh/pkg/PLIST,v retrieving revision 1.7 diff -r1.7 PLIST 53a54 > etc/nmh/rcvdistcomps.outbox ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="us-ascii" Content-ID: <27480.943771444.3@ducky.net> diff -rc2 ../ORIG/nmh-1.0.2/Makefile.in ./Makefile.in *** ../ORIG/nmh-1.0.2/Makefile.in Sun Sep 26 12:43:15 1999 --- ./Makefile.in Sat Nov 27 22:12:11 1999 *************** *** 27,31 **** # location of support binaries and scripts ! libdir = @libdir@ # location of nmh configuration and formats files --- 27,31 ---- # location of support binaries and scripts ! libexecdir = @libexecdir@ # location of nmh configuration and formats files *************** *** 60,64 **** CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \ prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \ ! etcdir='$(etcdir)' libdir='$(libdir)' mandir='$(mandir)' \ mailspool='$(mailspool)' sendmailpath='$(sendmailpath)' \ default_editor='$(default_editor)' default_pager='$(default_pager)' --- 60,64 ---- CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \ prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \ ! etcdir='$(etcdir)' libexecdir='$(libexecdir)' mandir='$(mandir)' \ mailspool='$(mailspool)' sendmailpath='$(sendmailpath)' \ default_editor='$(default_editor)' default_pager='$(default_pager)' diff -rc2 ../ORIG/nmh-1.0.2/acconfig.h ./acconfig.h *** ../ORIG/nmh-1.0.2/acconfig.h Thu Oct 21 11:58:09 1999 --- ./acconfig.h Sat Nov 27 22:12:11 1999 *************** *** 23,30 **** * Currently you can only use one type. */ ! #define DOT_LOCKING 1 /* #define FCNTL_LOCKING 1 */ /* #define LOCKF_LOCKING 1 */ ! /* #define FLOCK_LOCKING 1 */ /* --- 23,30 ---- * Currently you can only use one type. */ ! /* #define DOT_LOCKING 1 */ /* #define FCNTL_LOCKING 1 */ /* #define LOCKF_LOCKING 1 */ ! #define FLOCK_LOCKING 1 /* *************** *** 105,109 **** * are "removed" by rmm. This should typically be `,' or `#' */ ! #define BACKUP_PREFIX "," /* --- 105,109 ---- * are "removed" by rmm. This should typically be `,' or `#' */ ! #define BACKUP_PREFIX "#" /* *************** *** 232,236 **** * but this #define will add some extra security checks. */ ! #undef MAILGROUP /* Define ruserpass as _ruserpass if your libraries have a bug * --- 232,236 ---- * but this #define will add some extra security checks. */ ! #define MAILGROUP 1 /* Define ruserpass as _ruserpass if your libraries have a bug * diff -rc2 ../ORIG/nmh-1.0.2/config/Makefile.in ./config/Makefile.in *** ../ORIG/nmh-1.0.2/config/Makefile.in Fri Apr 30 11:08:34 1999 --- ./config/Makefile.in Sat Nov 27 22:12:11 1999 *************** *** 17,20 **** --- 17,21 ---- exec_prefix = @exec_prefix@ bindir = @bindir@ + libexecdir = @libexecdir@ libdir = @libdir@ etcdir = @sysconfdir@ *************** *** 27,31 **** DEFS = @DEFS@ INCLUDES = -I.. -I$(top_srcdir) ! CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBDIR='"$(libdir)"' \ -DDEFAULT_EDITOR='"$(default_editor)"' -DDEFAULT_PAGER='"$(default_pager)"' --- 28,32 ---- DEFS = @DEFS@ INCLUDES = -I.. -I$(top_srcdir) ! CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBEXECDIR='"$(libexecdir)"' -DNMHLIBDIR='"$(libdir)"' \ -DDEFAULT_EDITOR='"$(default_editor)"' -DDEFAULT_PAGER='"$(default_pager)"' diff -rc2 ../ORIG/nmh-1.0.2/config/config.c ./config/config.c *** ../ORIG/nmh-1.0.2/config/config.c Fri Apr 30 11:08:34 1999 --- ./config/config.c Sat Nov 27 22:12:11 1999 *************** *** 15,18 **** --- 15,19 ---- #define nmhetcdir(file) NMHETCDIR#file #define nmhlibdir(file) NMHLIBDIR#file + #define nmhlibexecdir(file) NMHLIBEXECDIR#file *************** *** 141,144 **** --- 142,146 ---- char *mhlibdir = NMHLIBDIR; + char *mhlibexecdir = NMHLIBEXECDIR; char *mhetcdir = NMHETCDIR; *************** *** 212,216 **** */ ! char *installproc = nmhlibdir (/install-mh); /* --- 214,218 ---- */ ! char *installproc = nmhlibexecdir (/install-mh); /* *************** *** 246,250 **** */ ! char *mhlproc = nmhlibdir (/mhl); /* --- 248,252 ---- */ ! char *mhlproc = nmhlibexecdir (/mhl); /* *************** *** 266,270 **** */ ! char *postproc = nmhlibdir (/post); /* --- 268,272 ---- */ ! char *postproc = nmhlibexecdir (/post); /* *************** *** 273,277 **** */ ! char *rcvstoreproc = nmhlibdir (/rcvstore); /* --- 275,279 ---- */ ! char *rcvstoreproc = nmhlibexecdir (/rcvstore); /* *************** *** 309,313 **** */ ! char *showproc = nmhlibdir (/mhl); /* --- 311,315 ---- */ ! char *showproc = nmhlibexecdir (/mhl); /* diff -rc2 ../ORIG/nmh-1.0.2/config.h.in ./config.h.in *** ../ORIG/nmh-1.0.2/config.h.in Thu Oct 21 11:58:09 1999 --- ./config.h.in Sat Nov 27 22:14:28 1999 *************** *** 24,31 **** * Currently you can only use one type. */ ! #define DOT_LOCKING 1 /* #define FCNTL_LOCKING 1 */ /* #define LOCKF_LOCKING 1 */ ! /* #define FLOCK_LOCKING 1 */ /* --- 24,31 ---- * Currently you can only use one type. */ ! /* #define DOT_LOCKING 1 */ /* #define FCNTL_LOCKING 1 */ /* #define LOCKF_LOCKING 1 */ ! #define FLOCK_LOCKING 1 /* *************** *** 106,110 **** * are "removed" by rmm. This should typically be `,' or `#' */ ! #define BACKUP_PREFIX "," /* --- 106,110 ---- * are "removed" by rmm. This should typically be `,' or `#' */ ! #define BACKUP_PREFIX "#" /* *************** *** 279,283 **** * but this #define will add some extra security checks. */ ! #undef MAILGROUP /* Define ruserpass as _ruserpass if your libraries have a bug * --- 279,283 ---- * but this #define will add some extra security checks. */ ! #define MAILGROUP 1 /* Define ruserpass as _ruserpass if your libraries have a bug * diff -rc2 ../ORIG/nmh-1.0.2/configure ./configure *** ../ORIG/nmh-1.0.2/configure Tue Oct 26 22:19:32 1999 --- ./configure Sat Nov 27 22:14:30 1999 *************** *** 4845,4849 **** eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}" eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}" ! eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}" eval "nmhman=${mandir}" --- 4845,4849 ---- eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}" eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}" ! eval "nmhlib=${libexecdir}"; eval "nmhlib2=${nmhlib}" eval "nmhman=${mandir}" diff -rc2 ../ORIG/nmh-1.0.2/configure.in ./configure.in *** ../ORIG/nmh-1.0.2/configure.in Tue Oct 26 14:12:37 1999 --- ./configure.in Sat Nov 27 22:12:11 1999 *************** *** 650,654 **** eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}" eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}" ! eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}" eval "nmhman=${mandir}" --- 650,654 ---- eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}" eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}" ! eval "nmhlib=${libexecdir}"; eval "nmhlib2=${nmhlib}" eval "nmhman=${mandir}" diff -rc2 ../ORIG/nmh-1.0.2/etc/Makefile.in ./etc/Makefile.in *** ../ORIG/nmh-1.0.2/etc/Makefile.in Thu Jul 15 17:43:04 1999 --- ./etc/Makefile.in Sat Nov 27 22:12:11 1999 *************** *** 14,18 **** exec_prefix = @exec_prefix@ bindir = @bindir@ ! libdir = @libdir@ etcdir = @sysconfdir@ --- 14,18 ---- exec_prefix = @exec_prefix@ bindir = @bindir@ ! libexecdir = @libexecdir@ etcdir = @sysconfdir@ *************** *** 21,24 **** --- 21,25 ---- INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ *************** *** 88,94 **** install-scripts: ! $(top_srcdir)/mkinstalldirs $(libdir) for script in $(SCRIPTS); do \ ! $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \ done --- 89,95 ---- install-scripts: ! $(top_srcdir)/mkinstalldirs $(libexecdir) for script in $(SCRIPTS); do \ ! $(INSTALL_SCRIPT) $(srcdir)/$$script $(libexecdir)/$$script; \ done *************** *** 102,106 **** uninstall-scripts: for script in $(SCRIPTS); do \ ! rm -f $(libdir)/$$script; \ done --- 103,107 ---- uninstall-scripts: for script in $(SCRIPTS); do \ ! rm -f $(libexecdir)/$$script; \ done diff -rc2 ../ORIG/nmh-1.0.2/man/Makefile.in ./man/Makefile.in *** ../ORIG/nmh-1.0.2/man/Makefile.in Wed Oct 13 07:56:41 1999 --- ./man/Makefile.in Sat Nov 27 22:12:11 1999 *************** *** 146,153 **** $(INSTALL_DATA) $$file $(mandir)/man$(manext5) ; \ done - if [ ! -f mh_profile.$(manext5) ] ; then \ - ( cd $(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \ - mh_profile.$(manext5) ) \ - fi # install the man pages in man8 --- 146,149 ---- diff -rc2 ../ORIG/nmh-1.0.2/uip/Makefile.in ./uip/Makefile.in *** ../ORIG/nmh-1.0.2/uip/Makefile.in Thu Oct 21 11:58:34 1999 --- ./uip/Makefile.in Sat Nov 27 22:12:11 1999 *************** *** 14,18 **** exec_prefix = @exec_prefix@ bindir = @bindir@ ! libdir = @libdir@ etcdir = @sysconfdir@ --- 14,18 ---- exec_prefix = @exec_prefix@ bindir = @bindir@ ! libexecdir = @libexecdir@ etcdir = @sysconfdir@ *************** *** 267,273 **** # install misc support binaries install-misc: ! $(top_srcdir)/mkinstalldirs $(libdir) for misc in $(MISC); do \ ! $(INSTALL_PROGRAM) $$misc $(libdir)/$$misc; \ done --- 267,273 ---- # install misc support binaries install-misc: ! $(top_srcdir)/mkinstalldirs $(libexecdir) for misc in $(MISC); do \ ! $(INSTALL_PROGRAM) $$misc $(libexecdir)/$$misc; \ done *************** *** 288,292 **** done for misc in $(MISC); do \ ! rm -f $(libdir)/$$misc; \ done for cmd in $(SCMDS); do \ --- 288,292 ---- done for misc in $(MISC); do \ ! rm -f $(libexecdir)/$$misc; \ done for cmd in $(SCMDS); do \ diff -rc2 ../ORIG/nmh-1.0.2/uip/mhparam.c ./uip/mhparam.c *** ../ORIG/nmh-1.0.2/uip/mhparam.c Thu Jul 15 18:29:28 1999 --- ./uip/mhparam.c Sat Nov 27 22:12:11 1999 *************** *** 12,15 **** --- 12,16 ---- extern char *mhlibdir; + extern char *mhlibexecdir; extern char *mhetcdir; *************** *** 66,69 **** --- 67,71 ---- { "etcdir", &mhetcdir }, { "libdir", &mhlibdir }, + { "libexecdir", &mhlibexecdir }, { "sbackup", &sbackup }, { "link", &slink }, ------- =_aaaaaaaaaa0-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message