From owner-svn-ports-head@FreeBSD.ORG Thu Jan 3 20:57:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 269546D7; Thu, 3 Jan 2013 20:57:19 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 172C6381; Thu, 3 Jan 2013 20:57:19 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r03KvImV082768; Thu, 3 Jan 2013 20:57:18 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r03KvI8I082763; Thu, 3 Jan 2013 20:57:18 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201301032057.r03KvI8I082763@svn.freebsd.org> From: Cy Schubert Date: Thu, 3 Jan 2013 20:57:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309906 - in head/mail/nmh: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jan 2013 20:57:19 -0000 Author: cy Date: Thu Jan 3 20:57:17 2013 New Revision: 309906 URL: http://svnweb.freebsd.org/changeset/ports/309906 Log: update 1.3 --> 1.5. Assume maintainership. PR: 174312 Submitted by: cy Approved by: Maintainer timeout Added: head/mail/nmh/files/patch-Makefile.in (contents, props changed) Deleted: head/mail/nmh/files/extra-patch-utmpx head/mail/nmh/files/patch-etc_Makefile_in Modified: head/mail/nmh/Makefile head/mail/nmh/distinfo head/mail/nmh/pkg-plist Modified: head/mail/nmh/Makefile ============================================================================== --- head/mail/nmh/Makefile Thu Jan 3 19:59:29 2013 (r309905) +++ head/mail/nmh/Makefile Thu Jan 3 20:57:17 2013 (r309906) @@ -52,18 +52,16 @@ # PORTNAME= nmh -PORTVERSION= 1.3 -PORTREVISION= 1 +PORTVERSION= 1.5 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= nmh -MAINTAINER= scott+ports@sabami.seaslug.org +MAINTAINER= cy@FreeBSD.org COMMENT= A cleaned up MH mailer suite USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf CONFIGURE_ARGS= --libdir=${PREFIX}/libexec/nmh \ --sysconfdir=${PREFIX}/etc/nmh .ifdef NMH_EDITOR @@ -100,23 +98,21 @@ OPTIONS= SASL2 "Cyrus SASL2" OFF .include -.if ${OSVERSION} >= 900007 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx -.endif +CONFIGURE_ARGS+= --docdir=${DOCSDIR} .if defined(WITH_SASL2) LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --with-cyrus-sasl=${PREFIX} .endif -MAN1= ali.1 anno.1 burst.1 comp.1 dist.1 flist.1 flists.1 \ - folder.1 folders.1 forw.1 inc.1 install-mh.1 mark.1 \ +MAN1= ali.1 anno.1 burst.1 comp.1 dist.1 flist.1 flists.1 fnext.1 \ + folder.1 folders.1 forw.1 fprev.1 inc.1 install-mh.1 mark.1 \ mh-chart.1 mhbuild.1 mhl.1 mhlist.1 mhmail.1 mhn.1 \ mhparam.1 mhpath.1 mhshow.1 mhstore.1 msgchk.1 msh.1 \ - next.1 nmh.1 packf.1 pick.1 prev.1 prompter.1 rcvdist.1 \ + next.1 new.1 nmh.1 packf.1 pick.1 prev.1 prompter.1 rcvdist.1 \ rcvpack.1 rcvstore.1 rcvtty.1 refile.1 repl.1 rmf.1 rmm.1 \ scan.1 send.1 sendfiles.1 show.1 slocal.1 \ - sortm.1 whatnow.1 whom.1 + sortm.1 unseen.1 whatnow.1 whom.1 MAN5= mh-alias.5 mh-draft.5 mh-format.5 mh-mail.5 mh-profile.5 \ mh-sequence.5 mh-tailor.5 mts.conf.5 Modified: head/mail/nmh/distinfo ============================================================================== --- head/mail/nmh/distinfo Thu Jan 3 19:59:29 2013 (r309905) +++ head/mail/nmh/distinfo Thu Jan 3 20:57:17 2013 (r309906) @@ -1,2 +1,2 @@ -SHA256 (nmh-1.3.tar.gz) = 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47 -SIZE (nmh-1.3.tar.gz) = 847614 +SHA256 (nmh-1.5.tar.gz) = af5342de8fe9fba5d615caccc9fbcb43cac60b6eb71432f7e112d43850d31c39 +SIZE (nmh-1.5.tar.gz) = 935919 Added: head/mail/nmh/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/nmh/files/patch-Makefile.in Thu Jan 3 20:57:17 2013 (r309906) @@ -0,0 +1,44 @@ +--- Makefile.in.orig 2012-12-09 14:41:01.479883313 -0800 ++++ Makefile.in 2012-12-09 14:48:13.430726025 -0800 +@@ -3573,16 +3573,16 @@ + @list='$(dist_sysconf_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ ++ echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \ ++ $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f-dist"; \ + done + + uninstall-dist_sysconfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_sysconf_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \ ++ echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \ ++ rm -f "$(DESTDIR)$(sysconfdir)/$$f-dist"; \ + done + install-sysconfDATA: $(sysconf_DATA) + @$(NORMAL_INSTALL) +@@ -3590,16 +3590,16 @@ + @list='$(sysconf_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ ++ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \ ++ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f-dist"; \ + done + + uninstall-sysconfDATA: + @$(NORMAL_UNINSTALL) + @list='$(sysconf_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \ ++ echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \ ++ rm -f "$(DESTDIR)$(sysconfdir)/$$f-dist"; \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) Modified: head/mail/nmh/pkg-plist ============================================================================== --- head/mail/nmh/pkg-plist Thu Jan 3 19:59:29 2013 (r309905) +++ head/mail/nmh/pkg-plist Thu Jan 3 20:57:17 2013 (r309906) @@ -5,9 +5,11 @@ bin/comp bin/dist bin/flist bin/flists +bin/fnext bin/folder bin/folders bin/forw +bin/fprev bin/inc bin/install-mh bin/mark @@ -22,6 +24,7 @@ bin/mhstore bin/msgchk bin/msh bin/next +bin/new bin/packf bin/pick bin/prev @@ -35,6 +38,7 @@ bin/send bin/sendfiles bin/show bin/sortm +bin/unseen bin/whatnow bin/whom @unexec if cmp -s %D/etc/nmh/MailAliases %D/etc/nmh/MailAliases-dist; then rm -f %D/etc/nmh/MailAliases; else echo 'Local changes: %D/etc/nmh/MailAliases (not removed)' >&2; fi @@ -88,6 +92,7 @@ etc/nmh/replcomps-dist @unexec if cmp -s %D/etc/nmh/replgroupcomps %D/etc/nmh/replgroupcomps-dist; then rm -f %D/etc/nmh/replgroupcomps; else echo 'Local changes: %D/etc/nmh/replgroupcomps (not removed)' >&2; fi etc/nmh/replgroupcomps-dist @exec [ -f %D/etc/nmh/replgroupcomps ] || cp %D/etc/nmh/replgroupcomps-dist %D/etc/nmh/replgroupcomps +@unexec if cmp -s %D/etc/nmh/scan.MMDDYY %D/etc/nmh/scan-dist; then rm -f %D/etc/nmh/scan; else echo 'Local changes: %D/etc/nmh/scan (not removed)' >&2; fi @unexec if cmp -s %D/etc/nmh/scan.MMDDYY %D/etc/nmh/scan.MMDDYY-dist; then rm -f %D/etc/nmh/scan.MMDDYY; else echo 'Local changes: %D/etc/nmh/scan.MMDDYY (not removed)' >&2; fi etc/nmh/scan.MMDDYY-dist @exec [ -f %D/etc/nmh/scan.MMDDYY ] || cp %D/etc/nmh/scan.MMDDYY-dist %D/etc/nmh/scan.MMDDYY @@ -129,5 +134,30 @@ libexec/nmh/rcvtty libexec/nmh/slocal libexec/nmh/spost libexec/nmh/viamail -@dirrm etc/nmh +%%DOCSDIR%%/README.about +%%DOCSDIR%%/MAILING-LISTS +%%DOCSDIR%%/README.SASL +%%DOCSDIR%%/COPYRIGHT +%%DOCSDIR%%/README.manpages +%%DOCSDIR%%/MAIL.FILTERING +%%DOCSDIR%%/NEWS +%%DOCSDIR%%/README-components +%%DOCSDIR%%/README-ATTACHMENTS +%%DOCSDIR%%/COMPLETION-ZSH +%%DOCSDIR%%/README +%%DOCSDIR%%/README-HOOKS +%%DOCSDIR%%/FAQ +%%DOCSDIR%%/contrib/build_nmh +%%DOCSDIR%%/contrib/nmh.spec +%%DOCSDIR%%/contrib/replyfilter +%%DOCSDIR%%/DIFFERENCES +%%DOCSDIR%%/COMPLETION-BASH +%%DOCSDIR%%/README.developers +%%DOCSDIR%%/COMPLETION-TCSH +%%DOCSDIR%%/INSTALL +%%DOCSDIR%%/TODO +%%DOCSDIR%%/VERSION +@dirrmtry etc/nmh @dirrm libexec/nmh +@dirrm %%DOCSDIR%%/contrib +@dirrm %%DOCSDIR%%