mail/mutt: update 1.14.0 -> 1.14.1

- Rename DEBUG option to DEBUG_LOGS
- Add lang/perl5 deps that triggers a Muttrc rebuild
- Make smime patch optional due to perl build deps.
- Remove unnecessary doc patches and REINPLACE_CMD
- Move build changing patches to make targets
- ASPELL updates the (pre)built Muttrc to not require a rebuild

PR:		246559
Submitted by:	Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)
Relnotes:	https://marc.info/?l=mutt-users&m=158965668315387&w=2

9 files changed, 44 insertions, 118 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index d6dfb3ae5c25..714ea3aed729 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mutt
-DISTVERSION=	1.14.0
+DISTVERSION=	1.14.1
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -46,10 +46,10 @@ GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	AUTOCRYPT DEBUG DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
+OPTIONS_DEFINE=	AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
 		GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
 		MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \
-		REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW
+		REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW
 
 OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
 OPTIONS_RADIO=	SPELL
@@ -59,7 +59,7 @@ OPTIONS_SINGLE_HCACHE=	HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE
 OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
 
 AUTOCRYPT_DESC=	Convenient End-to-End Encryption
-DEBUG_DESC=	Debugging capabilities
+DEBUG_LOGS_DESC=	Debugging capabilities
 FLOCK_DESC=	flock() usage
 FORCEBASE64_DESC=	Option to force base64 encoding for compose
 GPGME_DESC=	Gpgme interface
@@ -80,14 +80,15 @@ NLS_DESC=	Native language support (implies ICONV)
 QUOTE_PATCH_DESC=	Extended quoting
 REVERSE_REPLY_PATCH_DESC=	Reverse_reply
 SASL_DESC=	SASL authentication
+SMIME_DESC=	SMIME email check option patch
 SLANG_DESC=	SLANG support
 SMART_DATE_DESC=	Dynamic date formatting with "%@"
 SMTP_DESC=	SMTP relay support
 URLVIEW_DESC=	Use urlview for the URL selector menu
 
-OPTIONS_DEFAULT=	AUTOCRYPT DEBUG GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
+OPTIONS_DEFAULT=	AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
 		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \
-		NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW
+		NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW
 
 .ifmake makesum # for optional distfiles patchfiles
 OPTIONS_OVERRIDE=	${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}
@@ -109,7 +110,7 @@ ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
 
-DEBUG_CONFIGURE_ON=	--enable-debug
+DEBUG_LOGS_CONFIGURE_ON=	--enable-debug
 
 # Handle ncurses/ncurses-port/slang
 SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE}
@@ -150,10 +151,16 @@ ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 ICONV_CONFIGURE_OFF=	--disable-iconv
 
 REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply
+REVERSE_REPLY_PATCH_USES=		perl5
+REVERSE_REPLY_PATCH_VARS=		USE_PERL5=build
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
 
+SMIME_EXTRA_PATCHES=	${PATCHDIR}/extra-smime-sender
+SMIME_USES=		perl5
+SMIME_VARS=		USE_PERL5=build
+
 SMART_DATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smartdate
 
 FLOCK_CONFIGURE_ENABLE=	flock
@@ -166,6 +173,8 @@ IDN_CONFIGURE_WITH=	idn2=${LOCALBASE}
 IDN_IMPLIES=	ICONV
 
 IFDEF_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ifdef
+IFDEF_PATCH_USES=		perl5
+IFDEF_PATCH_VARS=		USE_PERL5=build
 
 GPGME_LIB_DEPENDS+=	libgpgme.so:security/gpgme
 GPGME_LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error
@@ -175,15 +184,19 @@ GPGME_CONFIGURE_ENABLE=	gpgme
 SMTP_CONFIGURE_ENABLE=	smtp
 
 FORCEBASE64_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-forcebase64
+FORCEBASE64_USES=		perl5
+FORCEBASE64_VARS=		USE_PERL5=build
 
 MAILDIR_MTIME_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-maildir-mtime
 
 GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
+GREETING_PATCH_USES=		perl5
+GREETING_PATCH_VARS=		USE_PERL5=build
 
 QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
 	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
-
-DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
+QUOTE_PATCH_USES=		perl5
+QUOTE_PATCH_VARS=		USE_PERL5=build
 
 .include <bsd.port.options.mk>
 
@@ -195,25 +208,17 @@ post-install:
 	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
 
 pre-configure::
+	# Stop make from setgid mutt_dotlock
+	@${REINPLACE_CMD} \
+		-e '/if test.*mutt_dotlock.*DOTLOCK_GROUP/s/if/if ${FALSE} \&\&/' \
+		${WRKSRC}/Makefile.in
+	# Base FreeBSD krb5-config --version returns "FreeBSD heimdal"
 	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
-		${WRKSRC}/contrib/pgp6.rc
-	@${REINPLACE_CMD} -E -e 's#(/samples|samples/)#share/examples/mutt#g' \
-		${WRKSRC}/doc/reference.html \
-		${WRKSRC}/doc/manual.html \
-		${WRKSRC}/doc/manual.txt \
-		${WRKSRC}/doc/Muttrc \
-		${WRKSRC}/INSTALL \
-		${WRKSRC}/init.h
+	# Install contrib samples to ${EXAMPLESDIR}
 	@${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
 		${WRKSRC}/contrib/Makefile.in
 
-pre-configure-ASPELL-on:
-	@${REINPLACE_CMD} -e '/^# append-hook/p' \
-		-e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \
-	${WRKSRC}/doc/Muttrc.head
-
 pre-configure-HCACHE_BDB-on:
 	@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -221,4 +226,16 @@ pre-configure-HCACHE_BDB-on:
 pre-build::
 	@${REINPLACE_CMD} -e '/^BUILD_DOC_TARGETS/s/=.*/=/' ${WRKSRC}/doc/Makefile
 
+# Undo some dist. installed files
+post-stage::
+	@${MV} ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.dist \
+	    	${STAGEDIR}/${LOCALBASE}/etc/Muttrc.sample
+	@${RM} ${STAGEDIR}/${LOCALBASE}/etc/mime.types*
+
+# Change default ispell
+post-build-ASPELL-on:
+	@${REINPLACE_CMD} -e '/^# append-hook/p' \
+		-e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \
+		${WRKSRC}/doc/Muttrc
+
 .include <bsd.port.mk>
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 06082081cda9..edc0c304471c 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1588634875
-SHA256 (mutt/mutt-1.14.0.tar.gz) = df2e82a83ad38c9a9fd36f44c5ab2b726defa4bb1a17de794dd3800f3353f9f8
-SIZE (mutt/mutt-1.14.0.tar.gz) = 5220515
+TIMESTAMP = 1589659243
+SHA256 (mutt/mutt-1.14.1.tar.gz) = 35d564c335f7364b8a43349fe0115a7cdc8ebf1ba8bf809d3fc51b9828844425
+SIZE (mutt/mutt-1.14.1.tar.gz) = 5221810
 SHA256 (mutt/mutt-1.14.0.vc.greeting) = 5da9ecdded840fd06063bc16bb1934fb4cae9217f0d4f531322ecd5a009e5b4f
 SIZE (mutt/mutt-1.14.0.vc.greeting) = 4470
 SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
diff --git a/mail/mutt/files/extra-patch-doc-ref b/mail/mutt/files/extra-patch-doc-ref
deleted file mode 100644
index 362192f310c8..000000000000
--- a/mail/mutt/files/extra-patch-doc-ref
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/mutt.man.orig	2020-05-02 21:08:56 UTC
-+++ doc/mutt.man
-@@ -67,7 +67,8 @@ mutt \- The Mutt Mail User Agent
- .PP
- Mutt is a small but very powerful text based program for reading and sending electronic
- mail under unix operating systems, including support for color terminals, MIME,
--OpenPGP, and a threaded sorting mode.
-+OpenPGP, and a threaded sorting mode. Details of how to use all of this is
-+available in @docdir@.
- .PP
- .I Note:
- .IR
diff --git a/mail/mutt/files/patch-smime-sender b/mail/mutt/files/extra-smime-sender
index 351bba964cc6..351bba964cc6 100644
--- a/mail/mutt/files/patch-smime-sender
+++ b/mail/mutt/files/extra-smime-sender
diff --git a/mail/mutt/files/patch-Makefile.in b/mail/mutt/files/patch-Makefile.in
deleted file mode 100644
index a0c8916a6b69..000000000000
--- a/mail/mutt/files/patch-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.in.orig	2020-05-02 21:31:42 UTC
-+++ Makefile.in
-@@ -530,7 +530,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
- @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
- @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt
- @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt
--SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR)
-+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR) . doc
- bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
- @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
- BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION)
-@@ -1660,18 +1660,9 @@ install-exec-hook:
- 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
- 		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
- 	fi
--	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
--		chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
--		chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
--		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
--	fi
- 
- install-data-local:
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
--	$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
--	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
--		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
--	fi
- 
- uninstall-local:
- 	for i in mime.types ; do \
diff --git a/mail/mutt/files/patch-contrib_Makefile.in b/mail/mutt/files/patch-contrib_Makefile.in
deleted file mode 100644
index 1985e152c6db..000000000000
--- a/mail/mutt/files/patch-contrib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig	2020-05-02 21:32:34 UTC
-+++ contrib/Makefile.in
-@@ -279,7 +279,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- subdir = contrib
--SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
- 	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
- 	sample.muttrc-compress sample.muttrc-starter \
- 	sample.vimrc-sidebar colors.default colors.linux smime.rc \
diff --git a/mail/mutt/files/patch-doc_Makefile.in b/mail/mutt/files/patch-doc_Makefile.in
deleted file mode 100644
index eb3d77f9d6af..000000000000
--- a/mail/mutt/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- doc/Makefile.in.orig	2020-05-02 21:31:43 UTC
-+++ doc/Makefile.in
-@@ -561,14 +561,7 @@ install-data-local: makedoc-all instdoc
- 	    $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
- 	  fi \
- 	done
--	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
--	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
--		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
--	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
--	 	mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
--	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
--		$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
--	fi
-+	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
- 	-if [ -f mutt.info ] ; then \
- 	  $(MKDIR_P) $(DESTDIR)$(infodir) ; \
- 	  $(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \
-@@ -604,9 +597,7 @@ uninstall-local:
- 
- check:
- manual.txt: manual.html
--	-LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
--	LC_ALL=C w3m -dump manual.html > $@ || \
--	LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
-+	-LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@
- 
- Muttrc: stamp-doc-rc
- 
diff --git a/mail/mutt/files/patch-doc_manual.xml.head b/mail/mutt/files/patch-doc_manual.xml.head
deleted file mode 100644
index c95fd1ee64d3..000000000000
--- a/mail/mutt/files/patch-doc_manual.xml.head
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/manual.xml.head.orig	2020-05-02 21:08:56 UTC
-+++ doc/manual.xml.head
-@@ -1,6 +1,6 @@
- <?xml version="1.0" standalone="no"?>
- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
--  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-+  "/usr/local/share/xml/docbook/4.2/docbookx.dtd">
- <book>
- 
- <bookinfo>
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index f85acccb6af4..a59a2131d438 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -72,6 +72,7 @@ man/man5/muttrc.5.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/markdown2html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp5.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc