1 files changed, 17 insertions, 14 deletions

diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile
index 1fba6505e8b2..1b6d813d60da 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -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@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=${PORTVERSION}
 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>