svn commit: r518346 - in head/mail/mailutils: . files

[Joseph Mingrone]

Author: jrm
Date: Sun Nov 24 18:43:59 2019
New Revision: 518346
URL: https://svnweb.freebsd.org/changeset/ports/518346

Log:
  mail/mailutils: Update to 3.8; fix circular [1] / missing dependencies
  
  - Remove the build dependency on Emacs since the installed elisp file is
    simple and does not need to be byte compiled.
  
  - Collapse the EMACS option in to the MH option [2].
  
  PR:		235890
  Submitted by:	John Hein <jcfyecrayz at liamekaens.com> [2]
  Reported by:	John Hein <jcfyecrayz at liamekaens.com> [1]
  Reviewed by:	John Hein <jcfyecrayz at liamekaens.com>
  Approved by:	danfe, Zeus Panchenko <zeus at gnu.org.ua> (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D22351

Deleted:
  head/mail/mailutils/files/git-018df5d
  head/mail/mailutils/files/git-113e144
Modified:
  head/mail/mailutils/Makefile   (contents, props changed)
  head/mail/mailutils/distinfo   (contents, props changed)
  head/mail/mailutils/pkg-plist   (contents, props changed)

Modified: head/mail/mailutils/Makefile
==============================================================================
--- head/mail/mailutils/Makefile	Sun Nov 24 18:32:11 2019	(r518345)
+++ head/mail/mailutils/Makefile	Sun Nov 24 18:43:59 2019	(r518346)
@@ -2,20 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	mailutils
-PORTVERSION=	3.7
-PORTREVISION=	2
+PORTVERSION=	3.8
 CATEGORIES=	mail
 MASTER_SITES=	GNU GNU_ALPHA
 
-EXTRA_PATCHES=	${FILESDIR}/git-018df5d:-p1 \
-		${FILESDIR}/git-113e144:-p1 files/git-de640c83e9:-p1
+EXTRA_PATCHES=	${FILESDIR}/git-de640c83e9:-p1
 
 MAINTAINER=	zeus at gnu.org.ua
 COMMENT=	Utilities, daemons, and filters for processing e-mail
 
 LICENSE=	GPLv3+
 
-LIB_DEPENDS=	libltdl.so:devel/libltdl
+LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
+		libltdl.so:devel/libltdl \
+		libunistring.so:devel/libunistring
+TEST_DEPENDS=	automake:devel/automake
 
 USES=		gmake iconv libtool localbase readline tar:xz
 GNU_CONFIGURE=	yes
@@ -29,35 +30,34 @@ PLIST_SUB+=	LIBVERSION=6.0.0 LIBSUFX=6 VERSION=${PORTV
 INFO=		${PORTNAME}
 PORTDOCS=	AUTHORS ChangeLog NEWS README* THANKS TODO
 
-OPTIONS_DEFINE=		DEBUG DOCS EMACS GNUTLS GSSAPI GUILE MH NNTP NLS \
-			PAM PYTHON
+OPTIONS_DEFINE=		DEBUG DOCS GNUTLS GSSAPI GUILE MH NNTP NLS PAM PYTHON
 OPTIONS_DEFAULT=	GDBM GNUTLS PAM
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	BDB GDBM KYOTOCABINET LDAP MYSQL PGSQL TOKYOCABINET
 OPTIONS_SUB=		yes
 
 DB_DESC=		Database configuration
-EMACS_DESC=		Emacs interface to MH (implies MH)
 KYOTOCABINET_DESC=	Kyoto Cabinet database support
 MH_DESC=		MH (Message Handling) system support
 TOKYOCABINET_DESC=	Tokyo Cabinet database support
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 
-EMACS_USES=		emacs:build
-EMACS_IMPLIES=		MH
-
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 
 GSSAPI_RUN_DEPENDS=	cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
+GSSAPI_USES=		ssl
 GSSAPI_CONFIGURE_WITH=	gssapi
 
 GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2 libgmp.so:math/gmp
 GUILE_USES=		makeinfo pkgconfig
 GUILE_CONFIGURE_WITH=	guile
 
+MH_CONFIGURE_ENV=	ac_cv_prog_EMACS=no
 MH_CONFIGURE_ENABLE=	mh
+MH_USES=		emacs:noflavors
+MH_VARS=		EMACS_NO_DEPENDS=yes
 
 NNTP_CONFIGURE_ENABLE=	nntp
 
@@ -96,13 +96,16 @@ TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet
 post-patch:
 	@${REINPLACE_CMD} -e '/need_charset_alias=/s|true|false|' \
 		${WRKSRC}/lib/gnu/Makefile.in
-	@${REINPLACE_CMD} -e '/chown/,+1s|ch|#&|' \
-		${WRKSRC}/dotlock/Makefile.in \
-		${WRKSRC}/maidag/Makefile.in
+	@${REINPLACE_CMD} -e '/chown/,+1s|ch|#&|' ${WRKSRC}/dotlock/Makefile.in
 	@${REINPLACE_CMD} -e 's,-E,& -P,' ${WRKSRC}/libmu_scm/Makefile.in
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+post-install-MH-on:
+	@${MKDIR} ${STAGEDIR}${EMACS_SITE_LISPDIR}
+	${RLN} ${STAGEDIR}${DATADIR}/mh/mailutils-mh.el \
+		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.mk>

Modified: head/mail/mailutils/distinfo
==============================================================================
--- head/mail/mailutils/distinfo	Sun Nov 24 18:32:11 2019	(r518345)
+++ head/mail/mailutils/distinfo	Sun Nov 24 18:43:59 2019	(r518346)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561122130
-SHA256 (mailutils-3.7.tar.xz) = 187258d3848fe70201f85f7d9e0f3d3243d46faa0d342af39f2db834a8968abf
-SIZE (mailutils-3.7.tar.xz) = 2846864
+TIMESTAMP = 1573650731
+SHA256 (mailutils-3.8.tar.xz) = 472da317f7f5fef7cf3c20a524979654d7c24709694ad4483e871063204b76f2
+SIZE (mailutils-3.8.tar.xz) = 2998596

Modified: head/mail/mailutils/pkg-plist
==============================================================================
--- head/mail/mailutils/pkg-plist	Sun Nov 24 18:32:11 2019	(r518345)
+++ head/mail/mailutils/pkg-plist	Sun Nov 24 18:43:59 2019	(r518346)
@@ -40,6 +40,7 @@ bin/movemail
 %%MH%%bin/mu-mh/whatnow
 %%MH%%bin/mu-mh/whom
 bin/popauth
+bin/putmail
 bin/readmsg
 bin/sieve
 include/mailutils/acl.h
@@ -163,6 +164,7 @@ include/mailutils/sys/temp_file_stream.h
 include/mailutils/sys/tls-stream.h
 include/mailutils/sys/url.h
 include/mailutils/sys/xscript-stream.h
+include/mailutils/sys/wordsplit.h
 include/mailutils/syslog.h
 include/mailutils/tls.h
 include/mailutils/types.h
@@ -333,11 +335,11 @@ man/man1/pop3d.1.gz
 man/man1/popauth.1.gz
 sbin/comsatd
 sbin/imap4d
-@(root,mail,4755) sbin/maidag
+sbin/lmtpd
+sbin/mda
 sbin/pop3d
 share/aclocal/mailutils.m4
-%%MH%%%%EMACS%%share/emacs/site-lisp/mailutils-mh.el
-%%MH%%%%EMACS%%share/emacs/site-lisp/mailutils-mh.elc
+%%MH%%%%EMACS_SITE_LISPDIR%%/mailutils-mh.el
 %%GUILE%%share/guile/site/2.2/mailutils/guile-procedures.txt
 %%GUILE%%share/guile/site/2.2/mailutils/mailutils.scm
 %%NLS%%share/locale/ca/LC_MESSAGES/mailutils.mo