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

[Alexey Dokuchaev]

Author: danfe
Date: Fri Dec 30 19:16:19 2016
New Revision: 430016
URL: https://svnweb.freebsd.org/changeset/ports/430016

Log:
  - Unbreak MH option and introduce EMACS one
  - Simplify startup (rc.d) scripts a bit
  - Minor port description adjustments

Modified:
  head/mail/mailutils/Makefile
  head/mail/mailutils/files/comsatd.in
  head/mail/mailutils/files/imap4d.in
  head/mail/mailutils/files/pop3d.in
  head/mail/mailutils/pkg-descr
  head/mail/mailutils/pkg-plist

Modified: head/mail/mailutils/Makefile
==============================================================================
--- head/mail/mailutils/Makefile	Fri Dec 30 19:02:35 2016	(r430015)
+++ head/mail/mailutils/Makefile	Fri Dec 30 19:16:19 2016	(r430016)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mailutils
 PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	GNU
 
@@ -23,7 +23,7 @@ INSTALL_TARGET=	install-strip
 INFO=		${PORTNAME}
 PORTDOCS=	AUTHORS ChangeLog NEWS README* THANKS TODO
 
-OPTIONS_DEFINE=		DOCS GNUTLS GSSAPI GUILE MH NNTP NLS PAM PYTHON
+OPTIONS_DEFINE=		DOCS EMACS GNUTLS GSSAPI GUILE MH NNTP NLS PAM PYTHON
 OPTIONS_DEFAULT=	BDB GNUTLS PAM
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	BDB GDBM KYOTOCABINET LDAP MYSQL PGSQL TOKYOCABINET
@@ -31,10 +31,14 @@ OPTIONS_SUB=		yes
 
 BDB_DESC=		Berkeley DB v4.8 support (last working one)
 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
 
+EMACS_USE=		EMACS=yes
+EMACS_IMPLIES=		MH
+
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 
@@ -81,6 +85,12 @@ PGSQL_CONFIGURE_WITH=	postgres
 TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMH} && exists(${LOCALBASE}/bin/emacs)
+USE_EMACS=	yes
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/need_charset_alias=/s|true|false|' \
 		${WRKSRC}/lib/gnu/Makefile.in

Modified: head/mail/mailutils/files/comsatd.in
==============================================================================
--- head/mail/mailutils/files/comsatd.in	Fri Dec 30 19:02:35 2016	(r430015)
+++ head/mail/mailutils/files/comsatd.in	Fri Dec 30 19:16:19 2016	(r430016)
@@ -17,7 +17,6 @@ pidfile="/var/run/${name}.pid"
 
 load_rc_config ${name}
 
-comsatd_enable=${comsatd_enable:-"NO"}
-comsatd_flags=${comsatd_flags:-""}
+: ${comsatd_enable="NO"}
 
 run_rc_command "$1"

Modified: head/mail/mailutils/files/imap4d.in
==============================================================================
--- head/mail/mailutils/files/imap4d.in	Fri Dec 30 19:02:35 2016	(r430015)
+++ head/mail/mailutils/files/imap4d.in	Fri Dec 30 19:16:19 2016	(r430016)
@@ -17,7 +17,6 @@ pidfile="/var/run/${name}.pid"
 
 load_rc_config ${name}
 
-imap4d_enable=${imap4d_enable:-"NO"}
-imap4d_flags=${imap4d_flags:-""}
+: ${imap4d_enable="NO"}
 
 run_rc_command "$1"

Modified: head/mail/mailutils/files/pop3d.in
==============================================================================
--- head/mail/mailutils/files/pop3d.in	Fri Dec 30 19:02:35 2016	(r430015)
+++ head/mail/mailutils/files/pop3d.in	Fri Dec 30 19:16:19 2016	(r430016)
@@ -17,7 +17,6 @@ pidfile="/var/run/${name}.pid"
 
 load_rc_config ${name}
 
-pop3d_enable=${pop3d_enable:-"NO"}
-pop3d_flags=${pop3d_flags:-""}
+: ${pop3d_enable="NO"}
 
 run_rc_command "$1"

Modified: head/mail/mailutils/pkg-descr
==============================================================================
--- head/mail/mailutils/pkg-descr	Fri Dec 30 19:02:35 2016	(r430015)
+++ head/mail/mailutils/pkg-descr	Fri Dec 30 19:16:19 2016	(r430016)
@@ -1,8 +1,8 @@
 Mailutils is a Swiss Army knife of electronic mail handling.  It offers
-a rich set of utilities and daemons for processing the e-mail.
+a rich set of utilities, daemons, and filters for processing the e-mail.
 
 All Mailutils programs are able to operate on mailboxes of any existing
-format, ranging from standard UNIX maildrops, through maildir and up to
+format, ranging from standard Unix maildrops, through maildir and up to
 remote mailboxes, which are transparently accessed using IMAP4, POP3,
 and SMTP.
 

Modified: head/mail/mailutils/pkg-plist
==============================================================================
--- head/mail/mailutils/pkg-plist	Fri Dec 30 19:02:35 2016	(r430015)
+++ head/mail/mailutils/pkg-plist	Fri Dec 30 19:16:19 2016	(r430016)
@@ -311,8 +311,8 @@ sbin/imap4d
 @(root,mail,4755) sbin/maidag
 sbin/pop3d
 share/aclocal/mailutils.m4
-%%MH%%share/emacs/site-lisp/mailutils-mh.el
-%%MH%%share/emacs/site-lisp/mailutils-mh.elc
+%%MH%%%%EMACS%%share/emacs/site-lisp/mailutils-mh.el
+%%MH%%%%EMACS%%share/emacs/site-lisp/mailutils-mh.elc
 %%GUILE%%share/guile/site/mailutils/guile-procedures.txt
 %%GUILE%%share/guile/site/mailutils/mailutils.scm
 %%GUILE%%share/guile/site/mailutils/sieve-core.scm