ports/162177: mail/opendkim - make dependency to Sendmail optional

[Michele Mazzucchi]

>Number:         162177
>Category:       ports
>Synopsis:       mail/opendkim - make dependency to Sendmail optional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 30 22:20:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Michele Mazzucchi
>Release:        8.2-PRERELEASE
>Organization:
FrontDam GmbH
>Environment:
>Description:
OpenDKIM is composed of a DKIM signature library AND a milter. The current port installs both, thus incurring a dependency on mail/sendmail on systems without Sendmail (e.g. because WITHOUT_SENDMAIL is set in src.conf). This patch allows people who run MTAs other than the bat to use the port without dragging on sendmail as well. The milter component is enabled/disabled with a suitable switch in OPTIONS.

For compatibility, the "FILTER" option is currently on by default, thus reproducing the behavior of the former port in interactive mode.
@Hirohisa: you may consider toggling the FILTER option to default-off in future releases, or breaking down the port in a libopendkim (slave) and a opendkim-milter.

cheers
michele
--
http://www.frontdam.com
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN opendkim-orig/Makefile opendkim/Makefile
--- opendkim-orig/Makefile	2011-07-02 13:55:27.000000000 +0200
+++ opendkim/Makefile	2011-10-30 22:11:44.000000000 +0100
@@ -25,7 +25,6 @@
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_RC_SUBR=	milter-opendkim
 USE_LDCONFIG=	yes
 
 MAN5=		opendkim.conf.5
@@ -35,8 +34,9 @@
 
 SUB_FILES=	pkg-message
 
-OPTIONS= \
+OPTIONS=	\
 	ARLIB		"Asynchronous thread-safe DNS library"	On  \
+	FILTER		"opendkim filter, requires libmilter/Sendmail"	On \
 	GNUTLS		"Use GnuTLS instead of OpenSSL"		Off \
 	LUA		"Describe filter policy with lua"	Off \
 	MEMCACHED	"Use memcached as a data set"		Off \
@@ -50,10 +50,13 @@
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER)
+USE_RC_SUBR=	milter-opendkim
 WITHOUT_MILTER_CFLAGS=	yes
 WITHOUT_MILTER_LDFLAGS=	yes
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 CONFIGURE_ARGS+=	--with-milter=${MILTERBASE}
+.endif
 
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
diff -ruN opendkim-orig/Makefile.features opendkim/Makefile.features
--- opendkim-orig/Makefile.features	2011-07-02 13:55:27.000000000 +0200
+++ opendkim/Makefile.features	2011-10-30 21:52:29.000000000 +0100
@@ -11,6 +11,10 @@
 CONFIGURE_ARGS+=	--enable-adsp_lists
 .endif
 
+.if !defined(WITH_FILTER) && defined(WITHOUT_FILTER)
+CONFIGURE_ARGS+=    --disable-filter
+.endif
+
 .if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS)
 CONFIGURE_ARGS+=	--enable-allsymbols
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted: