svn commit: r488491 - in head/mail/mutt: . files

[Steve Wills]

Author: swills
Date: Wed Dec 26 23:46:01 2018
New Revision: 488491
URL: https://svnweb.freebsd.org/changeset/ports/488491

Log:
  mail/mutt: Use updated VVV patches
  
  PR:		234384
  Submitted by:	Derek Schrock <dereks at lifeofadishwasher.com> (maintainer)

Added:
  head/mail/mutt/files/extra-nntp-depfiles   (contents, props changed)
Modified:
  head/mail/mutt/Makefile   (contents, props changed)
  head/mail/mutt/distinfo   (contents, props changed)

Modified: head/mail/mutt/Makefile
==============================================================================
--- head/mail/mutt/Makefile	Wed Dec 26 23:24:22 2018	(r488490)
+++ head/mail/mutt/Makefile	Wed Dec 26 23:46:01 2018	(r488491)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mutt
 DISTVERSION=	1.11.1
+PORTREVISION=	1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -29,9 +30,6 @@ USES=		cpe shebangfix ssl
 
 CONFLICTS=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
 
-DOCSDIR?=	${PREFIX}/share/doc/mutt
-EXAMPLESDIR?=	${PREFIX}/share/examples/mutt
-DATADIR?=	${PREFIX}/share/mutt
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-fcntl --with-ssl=${OPENSSLBASE} \
 		--with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
@@ -174,11 +172,11 @@ SMTP_CONFIGURE_ENABLE=	smtp
 
 GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
 
-QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
-			patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
+QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
+			patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
 
-NNTP_BROKEN=	NNTP 1.10.0 broken with mutt ${DISTVERSION}
-NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
+NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
+NNTP_EXTRA_PATCHES=	${PATCHDIR}/extra-nntp-depfiles
 NNTP_CONFIGURE_ON=	--enable-nntp
 NNTP_VARS=	XML_NEEDED=yes
 NNTP_CATEGORIES=	news
@@ -189,7 +187,7 @@ DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
 .include <bsd.port.options.mk>
 
 # un/comment as each VERSION is created for PORTVERSION
-VVV_PATCH_VERSION=	1.10.0
+#VVV_PATCH_VERSION=	1.11.1
 #GREETING_PATCH_VERSION=	1.11.1
 
 .if !defined(VVV_PATCH_VERSION)
@@ -231,8 +229,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 pre-configure::
 	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
-		${WRKSRC}/contrib/gpg.rc
 	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
 		${WRKSRC}/contrib/pgp6.rc
 	@${REINPLACE_CMD} -E -e 's#(/samples|samples/)#share/examples/mutt#g' \

Modified: head/mail/mutt/distinfo
==============================================================================
--- head/mail/mutt/distinfo	Wed Dec 26 23:24:22 2018	(r488490)
+++ head/mail/mutt/distinfo	Wed Dec 26 23:46:01 2018	(r488491)
@@ -1,11 +1,11 @@
-TIMESTAMP = 1543914710
+TIMESTAMP = 1544918718
 SHA256 (mutt/mutt-1.11.1.tar.gz) = 705141013662e53b78e49ed545360281f30a09ddda908f4de733277a60b1db05
 SIZE (mutt/mutt-1.11.1.tar.gz) = 4579062
 SHA256 (mutt/mutt-1.11.1.vc.greeting) = 57bd75016350e3ab8516f27154016e23a29176d2f1163258d31531f4aa722afc
 SIZE (mutt/mutt-1.11.1.vc.greeting) = 4560
-SHA256 (mutt/patch-1.10.0.vvv.nntp.gz) = 895c168f00cd073234c6cbb0d6972b5b390c64bf9ee5a13f58e0ea0652cabe4a
-SIZE (mutt/patch-1.10.0.vvv.nntp.gz) = 60723
-SHA256 (mutt/patch-1.10.0.vvv.initials.gz) = 7254751c439d4b138e89b47f71bd4e37c1c257130a8c88af91189fd8e4f249bb
-SIZE (mutt/patch-1.10.0.vvv.initials.gz) = 707
-SHA256 (mutt/patch-1.10.0.vvv.quote.gz) = 219716ddd4d6fcbb9ee9803b0620227cec5b1b04b2c14adf82d17a15f099ada1
-SIZE (mutt/patch-1.10.0.vvv.quote.gz) = 1309
+SHA256 (mutt/patch-1.11.1.vvv.nntp.xz) = 2a6386a82cbf9afde162bfb1989e545fb222bf40c5f6fac169d9249d4c904c79
+SIZE (mutt/patch-1.11.1.vvv.nntp.xz) = 49384
+SHA256 (mutt/patch-1.11.1.vvv.initials.xz) = af45defbda3a85f86db3f8ef5235ddb6613a36fdc35540cdc9afa38409114a07
+SIZE (mutt/patch-1.11.1.vvv.initials.xz) = 712
+SHA256 (mutt/patch-1.11.1.vvv.quote.xz) = 36896cbdebbe22f1ffea00e79a8735847246063f6498935d4dde3d5492b71c6c
+SIZE (mutt/patch-1.11.1.vvv.quote.xz) = 1316

Added: head/mail/mutt/files/extra-nntp-depfiles
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/mutt/files/extra-nntp-depfiles	Wed Dec 26 23:46:01 2018	(r488491)
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	2018-12-22 21:21:33 UTC
++++ Makefile.in
+@@ -240,7 +240,8 @@ am__depfiles_remade = $(DEPDIR)/mkdtemp.Po $(DEPDIR)/r
+ 	./$(DEPDIR)/mutt_sasl.Po ./$(DEPDIR)/mutt_socket.Po \
+ 	./$(DEPDIR)/mutt_ssl.Po ./$(DEPDIR)/mutt_ssl_gnutls.Po \
+ 	./$(DEPDIR)/mutt_tunnel.Po ./$(DEPDIR)/muttlib.Po \
+-	./$(DEPDIR)/mx.Po ./$(DEPDIR)/pager.Po ./$(DEPDIR)/parse.Po \
++	./$(DEPDIR)/mx.Po ./$(DEPDIR)/newsrc.Po ./$(DEPDIR)/nntp.Po \
++	./$(DEPDIR)/pager.Po ./$(DEPDIR)/parse.Po \
+ 	./$(DEPDIR)/patchlist.Po ./$(DEPDIR)/pattern.Po \
+ 	./$(DEPDIR)/pgp.Po ./$(DEPDIR)/pgpewrap.Po \
+ 	./$(DEPDIR)/pgpinvoke.Po ./$(DEPDIR)/pgpkey.Po \