- Return port to ports@, at the maintainers request (private mail in

  response to a bug report); Attila Nagy is not using the port any more.

- Add/fix GUILE option (to make it build in Tinderbox) and fix the pkg-plist
  accordingly, so that the port now installs successfully and uninstalls
  without left-over files with default options (i. e. no options) and
  with GUILE enabled.

- Remove versions from LIB_DEPENDS.

WARNING: THIS PORT NEEDS MORE ATTENTION, known issues:

- movemail is reported to stall on messages containing NUL bytes in the
  middle of (body) lines

- enabling the PYTHON option causes pkg-plist breakage, missing
  bin/popauth, and other issues

- Note the upstream has released a 2.99.96 alpha/beta version earlier
  this year, but I did not have the time to review bug fixes and other
  changes.  It seems a massive overhaul, partial rewrite, though.

2 files changed, 30 insertions, 6 deletions

diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile
index 721c32da7a8d..eb5a6c61624e 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	mailutils
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	GNU
 
-MAINTAINER=	bra@fsn.hu
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mailutils offers utilities and daemons for processing e-mail
 
 GNU_CONFIGURE=	yes
@@ -15,14 +15,16 @@ CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS+=--disable-build-comsat
 MAKE_JOBS_UNSAFE=	yes
 
-LDFLAGS=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
 
 INFO=		${PORTNAME}
 MAN1=		imap4d.1 mail.1 pop3d.1 popauth.1
 
 OPTIONS_DEFINE=		GDBM BDB TOKYOCABINET GNUTLS MYSQL PGSQL LDAP PYTHON
-OPTIONS_DEFAULT=	
+OPTIONS_DEFINE+=	GUILE
+OPTIONS_DEFAULT=
+OPTIONS_SUB=		yes
 
 GDBM_DESC=		Use GNU DBM
 BDB_DESC=		Use Berkeley DB
@@ -37,7 +39,7 @@ PYTHON_DESC=		Enable Python support
 
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=	--with-gdbm
-LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
 .else
 CONFIGURE_ARGS+=	--without-gdbm
 .endif
@@ -51,7 +53,7 @@ CONFIGURE_ARGS+=	--without-berkeley-db
 
 .if ${PORT_OPTIONS:MTOKYOCABINET}
 CONFIGURE_ARGS+=	--with-tokyocabinet
-LIB_DEPENDS+=		tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=		tokyocabinet:${PORTSDIR}/databases/tokyocabinet
 PLIST_SUB+=		TOKYOCABINET=""
 .else
 CONFIGURE_ARGS+=	--without-tokyocabinet
@@ -103,6 +105,10 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
+GUILE_CONFIGURE_ON=	--with-guile
+GUILE_CONFIGURE_ON=	--without-guile
+GUILE_LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile
+
 post-patch:
 	@${REINPLACE_CMD} -e '/need_charset_alias=/s|true|false|g' ${WRKSRC}/lib/Makefile.in
 
diff --git a/mail/mailutils/pkg-plist b/mail/mailutils/pkg-plist
index 686c51c52986..74c5506231df 100644
--- a/mail/mailutils/pkg-plist
+++ b/mail/mailutils/pkg-plist
@@ -276,6 +276,24 @@ sbin/imap4d
 sbin/maidag
 sbin/pop3d
 share/aclocal/mailutils.m4
+%%GUILE%%bin/sieve.scm
+%%GUILE%%bin/guimb
+%%GUILE%%lib/libmu_scm.so.3
+%%GUILE%%lib/libmu_scm.so
+%%GUILE%%lib/libmu_scm.la
+%%GUILE%%lib/libmu_scm.a
+%%GUILE%%lib/libguile-mailutils-v-2.2.so
+%%GUILE%%share/guile/site/mailutils/mailutils.scm
+%%GUILE%%share/guile/site/mailutils/guile-procedures.txt
+%%GUILE%%share/guile/site/mailutils/sieve-modules/mimeheader.scm
+%%GUILE%%share/guile/site/mailutils/sieve-modules/numaddr.scm
+%%GUILE%%share/guile/site/mailutils/sieve-modules/redirect.scm
+%%GUILE%%share/guile/site/mailutils/sieve-modules/reject.scm
+%%GUILE%%share/guile/site/mailutils/sieve-modules/vacation.scm
+%%GUILE%%share/guile/site/mailutils/sieve-core.scm
+%%GUILE%%@dirrmtry share/guile/site/mailutils/sieve-modules
+%%GUILE%%@dirrmtry share/guile/site/mailutils
+%%GUILE%%@dirrmtry share/guile/site%%NLS%%share/locale/ca/LC_MESSAGES/mailutils.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mailutils.mo
 %%NLS%%share/locale/es/LC_MESSAGES/mailutils.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mailutils.mo