Attachment 143855 Details for Bug 191111 – patch

[patch] patch

nmh2.patch (text/plain), 11.39 KB, created by mp39590 on 2014-06-16 22:18:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mp39590

Created: 2014-06-16 22:18:56 UTC

Size: 11.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 358054)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	nmh
>-PORTVERSION=	1.5
>-PORTREVISION=	1
>+PORTVERSION=	1.6
> CATEGORIES=	mail
> MASTER_SITES=	${MASTER_SITE_SAVANNAH}
> MASTER_SITE_SUBDIR=	nmh
>@@ -13,50 +12,39 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-USES=		gmake
>+USES=		gmake iconv shebangfix
>+SHEBANG_FILES=	docs/contrib/ml docs/contrib/replyfilter docs/contrib/vpick
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec/nmh \
> 		--sysconfdir=${PREFIX}/etc/nmh \
> 		--docdir=${DOCSDIR}
> 
>-.ifdef NMH_EDITOR
>-CONFIGURE_ARGS+=	--with-editor=${NMH_EDITOR}
>-.endif
>-.ifdef NMH_MASQUERADE
>-CONFIGURE_ARGS+=	--enable-masquerade="${NMH_MASQUERADE}"
>-.endif
>-.ifdef NMH_PAGER
>-CONFIGURE_ARGS+=	--with-pager=${NMH_PAGER}
>-.endif
>-.ifdef NMH_SMTPSERVERS
>-CONFIGURE_ARGS+=	--with-smtpservers="${NMH_SMTPSERVERS}"
>-.endif
>-
>-.ifdef NMH_EXTRA_CONFIGURE_ARGS
>-CONFIGURE_ARGS+=	${NMH_EXTRA_CONFIGURE_ARGS}
>-.endif
>-MAKE_JOBS_UNSAFE=	yes
>-
> OPTIONS_DEFINE=	DOCS HASH_BKP SASL2 TLS REPLYFILTER
> OPTIONS_SINGLE=	MTS LOCKING
>-OPTIONS_SINGLE_MTS=	SMTP SENDMAIL
>+OPTIONS_SINGLE_MTS=	SMTP SENDMAIL_SMTP SENDMAIL_PIPE
> OPTIONS_SINGLE_LOCKING=	DOT FCNTL FLOCK LOCKF
> 
> SASL2_DESC=	SASL2 support
>-SASL2_CONFIGURE_ON=	--with-cyrus-sasl
>+SASL2_CONFIGURE_WITH=	cyrus-sasl
> SASL2_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
> SASL2_LDFLAGS=-L${LOCALBASE}/lib
> SASL2_CPPFLAGS=-I${LOCALBASE}/include
>+
> HASH_BKP_DESC=	Use hash as backup prefix (default is a comma)
>-HASH_BKP_CONFIGURE_ON=	--with-hash-backup
>+HASH_BKP_CONFIGURE_WITH=	hash-backup
>+
> REPLYFILTER_DESC=	Install dependencies for contrib/replyfilter
> REPLYFILTER_RUN_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
>-				p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
>+				p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
>+				w3m>=0:${PORTSDIR}/www/w3m \
>+				par>=0:${PORTSDIR}/textproc/par
> 
> SMTP_DESC=	Use remote SMTP
> SMTP_CONFIGURE_ON=	--with-mts=smtp
>-SENDMAIL_DESC=	Use local sendmail
>-SENDMAIL_CONFIGURE_ON=	--with-mts=sendmail
>+SENDMAIL_SMTP_DESC=	Use local sendmail (connect through socket)
>+SENDMAIL_SMTP_CONFIGURE_ON=	--with-mts=sendmail/smtp
>+SENDMAIL_PIPE_DESC=	Use local sendmail (connect through pipe)
>+SENDMAIL_PIPE_CONFIGURE_ON=	--with-mts=sendmail/pipe
> 
> DOT_DESC=	Dot file locking
> DOT_CONFIGURE_ON=	--with-locking=dot
>@@ -67,7 +55,7 @@
> LOCKF_DESC=	lockf file locking
> LOCKF_CONFIGURE_ON=	--with-locking=lockf
> 
>-OPTIONS_DEFAULT=	SMTP DOT
>+OPTIONS_DEFAULT=	SMTP FLOCK
> 
> .include <bsd.port.options.mk>
> 
>@@ -84,8 +72,4 @@
> 
> CONFLICTS=	ja-mh-[0-9]*
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e "s|autoconf|${AUTOCONF}|;\
>-		s|autoheader|${AUTOHEADER}|" ${WRKSRC}/Makefile.in
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 358054)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (nmh-1.5.tar.gz) = af5342de8fe9fba5d615caccc9fbcb43cac60b6eb71432f7e112d43850d31c39
>-SIZE (nmh-1.5.tar.gz) = 935919
>+SHA256 (nmh-1.6.tar.gz) = 29338ae2bc8722fe8a5904b7b601a63943b72b07b6fcda53f3a354edb6a64bc3
>+SIZE (nmh-1.6.tar.gz) = 1197272
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 358054)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,44 +1,22 @@
>---- 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 \
>+--- Makefile.in.orig	2014-06-16 00:34:16.000000000 +0400
>++++ Makefile.in	2014-06-17 00:50:44.000000000 +0400
>+@@ -4037,7 +4037,8 @@
>+ 	fi; \
>+ 	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 \
>+-	  echo "$$d$$p"; \
>++	  cp "$$p" "$$p-dist"; \
>++	  echo "$$d$$p-dist"; \
>+ 	done | $(am__base_list) | \
>+ 	while read files; do \
>+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
>+@@ -4058,7 +4059,8 @@
>+ 	fi; \
>+ 	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)
>+-	  echo "$$d$$p"; \
>++	  cp "$$p" "$$p-dist"; \
>++	  echo "$$d$$p-dist"; \
>+ 	done | $(am__base_list) | \
>+ 	while read files; do \
>+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 358054)
>+++ pkg-plist	(working copy)
>@@ -5,6 +5,7 @@
> bin/dist
> bin/flist
> bin/flists
>+bin/fmttest
> bin/fnext
> bin/folder
> bin/folders
>@@ -18,6 +19,7 @@
> bin/install-mh
> bin/mark
> bin/mhbuild
>+bin/mhfixmsg
> bin/mhlist
> bin/mhmail
> bin/mhn
>@@ -27,8 +29,8 @@
> bin/mhstore
> bin/msgchk
> bin/msh
>+bin/new
> bin/next
>-bin/new
> bin/packf
> bin/pick
> bin/prev
>@@ -81,6 +83,9 @@
> @unexec if cmp -s %D/etc/nmh/mhn.defaults %D/etc/nmh/mhn.defaults-dist; then rm -f %D/etc/nmh/mhn.defaults; else echo 'Local changes: %D/etc/nmh/mhn.defaults (not removed)' >&2; fi
> etc/nmh/mhn.defaults-dist
> @exec [ -f %D/etc/nmh/mhn.defaults ] || cp %D/etc/nmh/mhn.defaults-dist %D/etc/nmh/mhn.defaults
>+@unexec if cmp -s %D/etc/nmh/mhshow.marker %D/etc/nmh/mhshow.marker-dist; then rm -f %D/etc/nmh/mhshow.marker; else echo 'Local changes: %D/etc/nmh/mhshow.marker (not removed)' >&2; fi
>+etc/nmh/mhshow.marker-dist
>+@exec [ -f %D/etc/nmh/mhshow.marker ] || cp %D/etc/nmh/mhshow.marker-dist %D/etc/nmh/mhshow.marker
> @unexec if cmp -s %D/etc/nmh/mts.conf %D/etc/nmh/mts.conf-dist; then rm -f %D/etc/nmh/mts.conf; else echo 'Local changes: %D/etc/nmh/mts.conf (not removed)' >&2; fi
> etc/nmh/mts.conf-dist
> @exec [ -f %D/etc/nmh/mts.conf ] || cp %D/etc/nmh/mts.conf-dist %D/etc/nmh/mts.conf
>@@ -102,9 +107,15 @@
> @unexec if cmp -s %D/etc/nmh/scan.YYYYMMDD %D/etc/nmh/scan.YYYYMMDD-dist; then rm -f %D/etc/nmh/scan.YYYYMMDD; else echo 'Local changes: %D/etc/nmh/scan.YYYYMMDD (not removed)' >&2; fi
> etc/nmh/scan.YYYYMMDD-dist
> @exec [ -f %D/etc/nmh/scan.YYYYMMDD ] || cp %D/etc/nmh/scan.YYYYMMDD-dist %D/etc/nmh/scan.YYYYMMDD
>+@unexec if cmp -s %D/etc/nmh/scan.curses %D/etc/nmh/scan.curses-dist; then rm -f %D/etc/nmh/scan.curses; else echo 'Local changes: %D/etc/nmh/scan.curses (not removed)' >&2; fi
>+etc/nmh/scan.curses-dist
>+@exec [ -f %D/etc/nmh/scan.curses ] || cp %D/etc/nmh/scan.curses-dist %D/etc/nmh/scan.curses
> @unexec if cmp -s %D/etc/nmh/scan.default %D/etc/nmh/scan.default-dist; then rm -f %D/etc/nmh/scan.default; else echo 'Local changes: %D/etc/nmh/scan.default (not removed)' >&2; fi
> etc/nmh/scan.default-dist
> @exec [ -f %D/etc/nmh/scan.default ] || cp %D/etc/nmh/scan.default-dist %D/etc/nmh/scan.default
>+@unexec if cmp -s %D/etc/nmh/scan.highlighted %D/etc/nmh/scan.highlighted-dist; then rm -f %D/etc/nmh/scan.highlighted; else echo 'Local changes: %D/etc/nmh/scan.highlighted (not removed)' >&2; fi
>+etc/nmh/scan.highlighted-dist
>+@exec [ -f %D/etc/nmh/scan.highlighted ] || cp %D/etc/nmh/scan.highlighted-dist %D/etc/nmh/scan.highlighted
> @unexec if cmp -s %D/etc/nmh/scan.mailx %D/etc/nmh/scan.mailx-dist; then rm -f %D/etc/nmh/scan.mailx; else echo 'Local changes: %D/etc/nmh/scan.mailx (not removed)' >&2; fi
> etc/nmh/scan.mailx-dist
> @exec [ -f %D/etc/nmh/scan.mailx ] || cp %D/etc/nmh/scan.mailx-dist %D/etc/nmh/scan.mailx
>@@ -129,6 +140,7 @@
> libexec/nmh/fmtdump
> libexec/nmh/mhl
> libexec/nmh/mhtest
>+libexec/nmh/mkstemp
> libexec/nmh/post
> libexec/nmh/rcvdist
> libexec/nmh/rcvpack
>@@ -144,6 +156,7 @@
> man/man1/dist.1.gz
> man/man1/flist.1.gz
> man/man1/flists.1.gz
>+man/man1/fmttest.1.gz
> man/man1/fnext.1.gz
> man/man1/folder.1.gz
> man/man1/folders.1.gz
>@@ -152,8 +165,9 @@
> man/man1/inc.1.gz
> man/man1/install-mh.1.gz
> man/man1/mark.1.gz
>-man/man1/mh-chart.1.gz
>+man/man1/mh-mkstemp.1.gz
> man/man1/mhbuild.1.gz
>+man/man1/mhfixmsg.1.gz
> man/man1/mhl.1.gz
> man/man1/mhlist.1.gz
> man/man1/mhmail.1.gz
>@@ -166,7 +180,6 @@
> man/man1/msh.1.gz
> man/man1/new.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
>@@ -190,6 +203,7 @@
> man/man1/whom.1.gz
> man/man5/mh-alias.5.gz
> man/man5/mh-draft.5.gz
>+man/man5/mh-folders.5.gz
> man/man5/mh-format.5.gz
> man/man5/mh-mail.5.gz
> man/man5/mh-profile.5.gz
>@@ -197,34 +211,39 @@
> man/man5/mh-tailor.5.gz
> man/man5/mh_profile.5.gz
> man/man5/mts.conf.5.gz
>+man/man7/mh-chart.7.gz
>+man/man7/mh-mime.7.gz
>+man/man7/nmh.7.gz
> man/man8/ap.8.gz
> man/man8/conflict.8.gz
> man/man8/dp.8.gz
> man/man8/fmtdump.8.gz
> man/man8/post.8.gz
>-%%PORTDOCS%%%%DOCSDIR%%/README.about
>-%%PORTDOCS%%%%DOCSDIR%%/MAILING-LISTS
>-%%PORTDOCS%%%%DOCSDIR%%/README.SASL
>+%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-BASH
>+%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-TCSH
>+%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-ZSH
> %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
>-%%PORTDOCS%%%%DOCSDIR%%/README.manpages
>+%%PORTDOCS%%%%DOCSDIR%%/DIFFERENCES
>+%%PORTDOCS%%%%DOCSDIR%%/FAQ
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
> %%PORTDOCS%%%%DOCSDIR%%/MAIL.FILTERING
>+%%PORTDOCS%%%%DOCSDIR%%/MAILING-LISTS
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
>-%%PORTDOCS%%%%DOCSDIR%%/README-components
>+%%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/README-ATTACHMENTS
>-%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-ZSH
>-%%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/README-HOOKS
>-%%PORTDOCS%%%%DOCSDIR%%/FAQ
>-%%PORTDOCS%%%%DOCSDIR%%/contrib/build_nmh
>-%%PORTDOCS%%%%DOCSDIR%%/contrib/nmh.spec
>-%%PORTDOCS%%%%DOCSDIR%%/contrib/replyfilter
>-%%PORTDOCS%%%%DOCSDIR%%/DIFFERENCES
>-%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-BASH
>+%%PORTDOCS%%%%DOCSDIR%%/README-components
>+%%PORTDOCS%%%%DOCSDIR%%/README-iCalendar
>+%%PORTDOCS%%%%DOCSDIR%%/README.SASL
>+%%PORTDOCS%%%%DOCSDIR%%/README.about
> %%PORTDOCS%%%%DOCSDIR%%/README.developers
>-%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-TCSH
>-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+%%PORTDOCS%%%%DOCSDIR%%/README.manpages
> %%PORTDOCS%%%%DOCSDIR%%/TODO
> %%PORTDOCS%%%%DOCSDIR%%/VERSION
>+%%PORTDOCS%%%%DOCSDIR%%/contrib/build_nmh
>+%%PORTDOCS%%%%DOCSDIR%%/contrib/ml
>+%%PORTDOCS%%%%DOCSDIR%%/contrib/replyfilter
>+%%PORTDOCS%%%%DOCSDIR%%/contrib/vpick
> @dirrmtry etc/nmh
> @dirrm libexec/nmh
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib

Actions: View | Diff

Attachments on bug 191111: 143855