- Update to 2.1.3

- Define OPTIONS
- Respect NOPORTDOCS
- Remove unnecessary patches
- Fix alignment in Makefile header

PR:		ports/148397
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)

8 files changed, 99 insertions, 182 deletions

diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index ed607b5af877..69b7412e98a4 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -1,34 +1,42 @@
 # New ports collection makefile for:	opendkim
-# Date created:		2009-08-26
-# Whom:			Hirohisa Yamaguchi <umq@ueo.co.jp>
+# Date created:				2009-08-26
+# Whom:					Hirohisa Yamaguchi <umq@ueo.co.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	opendkim
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	2.1.3
 CATEGORIES=	mail security
 MASTER_SITES=	SF/opendkim
 
 MAINTAINER=	umq@ueo.co.jp
-COMMENT=	DKIM milter implimentation
+COMMENT=	DKIM library and milter implimentation
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_RC_SUBR=	milter-opendkim
 USE_LDCONFIG=	yes
 
-MAN_COMPRESSED=	no
-MAN3=		ar.3
 MAN5=		opendkim.conf.5
-MAN8=		opendkim-genkey.8 opendkim-testadsp.8 \
-		opendkim-testkey.8 opendkim.8
-PORTDOCS0=	FEATURES INSTALL KNOWNBUGS LICENSE LICENSE.Sendmail \
-		README RELEASE_NOTES RELEASE_NOTES.Sendmail
-PORTDOCS=	docs/*
+MAN8=		opendkim-genkey.8 opendkim-genzone.8 \
+		opendkim-testadsp.8 opendkim-testkey.8 \
+		opendkim.8
+
 SUB_FILES=	pkg-message
 
+OPTIONS= \
+	ARLIB		"Asynchronous thread-safe DNS library"	On  \
+	LUA		"Describe filter policy with lua"	Off \
+	OPENDBX		"Store filter policies via OpenDBX"	Off \
+	OPENLDAP	"Store filter policies in LDAP"		Off \
+	OPENSSL_PORT	"Use OpenSSL in ports"			Off \
+	POPAUTH		"Use POP authentication DB"		Off \
+	QUERY_CACHE	"Cache DNS query results locally"	Off \
+	UNBOUND		"Use unbound DNS library"		Off
+
+MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
+
 .include <bsd.port.pre.mk>
 
 WITHOUT_MILTER_CFLAGS=	yes
@@ -48,14 +56,22 @@ CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.else
+CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
+.endif
+
 .if (defined(WITH_POPAUTH) \
 	|| defined(WITH_QUERY_CACHE) \
 	|| defined(WITH_BODYLENGTH_DB) \
+	|| defined(WITH_LDAP_CACHING) \
 	|| defined(WITH_STATS)) \
 	&& !defined(WITH_BDB_BASE)
-#BROKEN=		LIBDB_INCDIR nor LIBDB_LIBDIRS cannot be set individually
-CONFIGURE_ARGS+=	--with-db
-USE_BDB=	41+
+CONFIGURE_ARGS+=	--with-db-incdir=${BDB_INCLUDE_DIR} \
+			--with-db-libdir=${BDB_LIB_DIR} \
+			--with-db-lib=${BDB_LIB_NAME}
+USE_BDB=		41+
 .endif
 .if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)
 BROKEN=		configure fails since arlib cannot be disabled
@@ -64,12 +80,13 @@ IGNORE=		libar cannot be used simultaneously with libunbound
 .endif
 CONFIGURE_ARGS+=	--with-unbound \
 			--disable-arlib
-LIB_DEPENDS+=	unbound:${PORTSDIR}/dns/unbound
+LIB_DEPENDS+=		unbound:${PORTSDIR}/dns/unbound
 PLIST_SUB+=		ARLIB="@comment "
 .else
-.if !defined(WITHOUT_ARLIB)
+.if defined(WITH_ARLIB)
 PLIST_SUB+=		ARLIB=""
 CONFIGURE_ARGS+=	--enable-arlib
+MAN3=			ar.3
 .else
 CONFIGURE_ARGS+=	--disable-arlib
 PLIST_SUB+=		ARLIB="@comment "
@@ -79,13 +96,25 @@ PLIST_SUB+=		ARLIB="@comment "
 CONFIGURE_ARGS+=	--enable-popauth
 .endif
 .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
-CONFIGURE_ARGS+=	--enable-querycache
+CONFIGURE_ARGS+=	--enable-query_cache
+.endif
+.if defined(WITH_OPENDBX)
+CONFIGURE_ARGS+=	--with-odbx
+LIB_DEPENDS+=		opendbx:${PORTSDIR}/databases/opendbx
+.endif
+.if defined(WITH_OPENLDAP)
+CONFIGURE_ARGS+=	--with-openldap
+USE_OPENLDAP=		yes
+.endif
+.if defined(WITH_LUA)
+CONFIGURE_ARGS+=	--with-lua
+MAN3+=			opendkim-lua.3
+MAN8+=			miltertest.8
+PLIST_SUB+=		LUA=""
+USE_LUA=		5.1
+.else
+PLIST_SUB+=		LUA="@comment "
 .endif
-
-post-extract:
-.for f in ${PORTDOCS0}
-	@${CP} ${WRKSRC}/${f} ${WRKSRC}/docs/
-.endfor
 
 post-install:
 .if !defined(WITH_DEBUG)
@@ -93,13 +122,6 @@ post-install:
 .endif
 	@${MKDIR} ${PREFIX}/etc/mail
 	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${PREFIX}/etc/mail/
-.if !defined(NOPORTDOCS)
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.else
-	@${RM} -rf ${DOCSDIR}
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/opendkim/Makefile.features b/mail/opendkim/Makefile.features
index f5a98303898b..e60f50857018 100644
--- a/mail/opendkim/Makefile.features
+++ b/mail/opendkim/Makefile.features
@@ -7,16 +7,20 @@
 # $FreeBSD$
 #
 
+.if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS)
+CONFIGURE_ARGS+=	--enable-allsymbols
+.endif
+
 .if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB)
-CONFIGURE_ARGS+=	--enable-bodylengthdb
+CONFIGURE_ARGS+=	--enable-bodylength_db
 .endif
 
 .if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS)
-CONFIGURE_ARGS+=	--enable-captureerrors
+CONFIGURE_ARGS+=	--enable-capture_unknown_errors
 .endif
 
-.if defined(WITH_COMMAIZE) && !defined(WITHOUT_COMMAIZE)
-CONFIGURE_ARGS+=	--enable-commaize
+.if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE)
+CONFIGURE_ARGS+=	--enable-codecoverage
 .endif
 
 .if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)
@@ -25,15 +29,20 @@ LIB_DEPENDS+=		tre:${PORTSDIR}/textproc/libtre
 .endif
 
 .if defined(WITH_DKIM_REPUTATION) && !defined(WITHOUT_DKIM_REPUTATION)
-CONFIGURE_ARGS+=	--enable-dkimreputation
+CONFIGURE_ARGS+=	--enable-dkim_reputation
 .endif
 
 .if defined(WITH_DNS_UPGRADE) && !defined(WITHOUT_DNS_UPGRADE)
 CONFIGURE_ARGS+=	--enable-dnsupgrade
 .endif
 
-.if defined(WITH_MULTIPLE_SIGNATURES) && !defined(WITHOUT_MULTIPLE_SIGNATURES)
-CONFIGURE_ARGS+=	--enable-multiplesigs
+.if defined(WITH_IDENTITY_HEADER) && !defined(WITHOUT_IDENTITY_HEADER)
+CONFIGURE_ARGS+=	--enable-identity_header
+.endif
+
+.if defined(WITH_LDAP_CACHING) && !defined(WITHOUT_LDAP_CACHING)
+WITH_OPENLDAP=		yes
+CONFIGURE_ARGS+=	--enable-ldap_caching
 .endif
 
 .if defined(WITH_PARSE_TIME) && !defined(WITHOUT_PARSE_TIME)
@@ -41,24 +50,32 @@ BROKEN=		The feature ``_FFR_PARSE_TIME'' is incomplete, does not work
 CONFIGURE_ARGS+=	--enable-parsetime
 .endif
 
+.if defined(WITH_REDIRECT) && !defined(WITHOUT_REDIRECT)
+CONFIGURE_ARGS+=	--enable-redirect
+.endif
+
 .if defined(WITH_REPLACE_RULES) && !defined(WITHOUT_REPLACE_RULES)
-CONFIGURE_ARGS+=	-enable-replacerules
+CONFIGURE_ARGS+=	--enable-replace_rules
 .endif
 
 .if defined(WITH_REPORT_INTERVALS) && !defined(WITHOUT_REPORT_INTERVALS)
-CONFIGURE_ARGS+=	--enable-reportintervals
+CONFIGURE_ARGS+=	--enable-report_intervals
+.endif
+
+.if defined(WITH_RESIGN) && !defined(WITHOUT_RESIGN)
+CONFIGURE_ARGS+=	--enable-resign
 .endif
 
 .if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
-CONFIGURE_ARGS+=	--enable-selectcanon
+CONFIGURE_ARGS+=	--enable-select_canonicalization
 .endif
 
 .if defined(WITH_SELECTOR_HEADER) && !defined(WITHOUT_SELECTOR_HEADER)
-CONFIGURE_ARGS+=	--enable-selectorheader
+CONFIGURE_ARGS+=	--enable-selector_header
 .endif
 
-.if defined(WITH_SENDER_HEADERS) && !defined(WITHOUT_SENDER_HEADERS)
-CONFIGURE_ARGS+=	--enable-senderheaders
+.if defined(WITH_SENDER_MACRO) && !defined(WITHOUT_SENDER_MACRO)
+CONFIGURE_ARGS+=	--enable-sender_macro
 .endif
 
 .if defined(WITH_STATS) && !defined(WITHOUT_STATS)
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index 9706ba5f5dde..5fecbd07e730 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,3 +1,3 @@
-MD5 (opendkim-1.1.2.tar.gz) = f869f90aad3561a01b377e9ca61dedc3
-SHA256 (opendkim-1.1.2.tar.gz) = 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
-SIZE (opendkim-1.1.2.tar.gz) = 856455
+MD5 (opendkim-2.1.3.tar.gz) = 6ea7ea0adfd9f76ca028592d82ef5358
+SHA256 (opendkim-2.1.3.tar.gz) = c889f18ec98ff9454bc211eaad4c746365a763500127ca022e03c087a7028eba
+SIZE (opendkim-2.1.3.tar.gz) = 1011019
diff --git a/mail/opendkim/files/milter-opendkim.in b/mail/opendkim/files/milter-opendkim.in
index 0098eb267a6b..f075bf6c2ef4 100644
--- a/mail/opendkim/files/milter-opendkim.in
+++ b/mail/opendkim/files/milter-opendkim.in
@@ -36,11 +36,13 @@
 name="milteropendkim"
 rcvar=`set_rcvar`
 
+extra_commands="reload"
 start_precmd="dkim_prepcmd"
 stop_postcmd="dkim_postcmd"
 command="%%PREFIX%%/sbin/opendkim"
 _piddir="/var/run/milteropendkim"
 pidfile="${_piddir}/pid"
+sig_reload="USR1"
 
 load_rc_config $name
 
diff --git a/mail/opendkim/files/patch-FEATURES b/mail/opendkim/files/patch-FEATURES
deleted file mode 100644
index 165f3585f22e..000000000000
--- a/mail/opendkim/files/patch-FEATURES
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./FEATURES.orig	2009-08-04 06:31:48.000000000 +0900
-+++ ./FEATURES	2009-08-27 20:35:42.000000000 +0900
-@@ -74,6 +74,9 @@
- 		to use when signing based on the contents of an arbitrary
- 		header.  (opendkim)
- 
-+senderheaders	Optional control over which headers are used by the filter
-+		to make the sign vs. verify decision.  (opendkim)
-+
- stats		Optional generation of statistics about pass/fail sorted
- 		by domain and canonicalization.  Requires Sleepycat DB.
- 		(opendkim, libopendkim)
diff --git a/mail/opendkim/files/patch-opendkim__Makefile.in b/mail/opendkim/files/patch-opendkim__Makefile.in
deleted file mode 100644
index 2723f90aeace..000000000000
--- a/mail/opendkim/files/patch-opendkim__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./opendkim/Makefile.in.orig	2009-08-15 01:44:49.000000000 +0900
-+++ ./opendkim/Makefile.in	2009-08-27 20:36:49.000000000 +0900
-@@ -327,7 +327,7 @@
- AM_LDFLAGS = -pthread
- sbin_SCRIPTS = opendkim-genkey.sh
- exampledir = $(datarootdir)/doc/@PACKAGE@
--example_DATA = opendkim.conf.sample
-+example_DATA = 
- @BUILD_FILTER_TRUE@opendkim_SOURCES = opendkim.c opendkim.h opendkim-ar.c opendkim-ar.h opendkim-arf.c opendkim-arf.h opendkim-config.h opendkim-crypto.c opendkim-crypto.h opendkim-db.c opendkim-db.h config.c config.h stats.c stats.h test.c test.h util.c util.h
- @BUILD_FILTER_TRUE@opendkim_CFLAGS = $(am__append_2) $(am__append_6) \
- @BUILD_FILTER_TRUE@	$(am__append_7) $(am__append_8) \
diff --git a/mail/opendkim/pkg-descr b/mail/opendkim/pkg-descr
index ecb21dd91bf4..0a9ed96e99b1 100644
--- a/mail/opendkim/pkg-descr
+++ b/mail/opendkim/pkg-descr
@@ -1,10 +1,12 @@
-OpenDKIM is an open source implementation of the DKIM sender authentication
-system proposed by the E-mail Signing Technology Group (ESTG), now a proposed
-standard of the IETF (RFC4871).
+OpenDKIM is an open source implementation of the DKIM (Domain Keys Identified 
+Mail) sender authentication system proposed by the E-mail Signing Technology 
+Group (ESTG), now standardized by the IETF (RFC4871). It also includes 
+implementations of the Author Domain Signing Practises (ADSP, RFC5617) and 
+Vouch By Reference (VBR, RFC5518) proposed standards.
 
 The OpenDKIM package consists of a library that implements the DKIM service
 and a milter-based filter application that can plug in to any milter-aware
 MTA to provide that service to sufficiently recent sendmail MTAs and other
 MTAs that support the milter protocol. 
 
-WWW:	http://opendkim.org/
+WWW: http://opendkim.org/
diff --git a/mail/opendkim/pkg-plist b/mail/opendkim/pkg-plist
index f547d10ea7d3..7e4f552ce6fb 100644
--- a/mail/opendkim/pkg-plist
+++ b/mail/opendkim/pkg-plist
@@ -10,119 +10,16 @@ include/opendkim/dkim.h
 lib/libopendkim.a
 lib/libopendkim.la
 lib/libopendkim.so
-lib/libopendkim.so.0
+lib/libopendkim.so.2
+%%ARLIB%%libdata/pkgconfig/ar.pc
+libdata/pkgconfig/opendkim.pc
+%%LUA%%sbin/miltertest
 sbin/opendkim
 sbin/opendkim-genkey.sh
+sbin/opendkim-genzone
 %%STATS%%sbin/opendkim-stats
 sbin/opendkim-testadsp
 sbin/opendkim-testkey
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.Sendmail
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.Sendmail
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-dkim-deployment-09.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-kucherawy-dkim-reporting-06.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-shafranovich-feedback-report-08.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc4686.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc4871.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc5016.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc5451.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc5518.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc5585.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc5617.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc5672.txt
-%%DATADIR%%/dkim.html
-%%DATADIR%%/dkim_alg_t.html
-%%DATADIR%%/dkim_body.html
-%%DATADIR%%/dkim_canon_t.html
-%%DATADIR%%/dkim_cbstat.html
-%%DATADIR%%/dkim_chunk.html
-%%DATADIR%%/dkim_close.html
-%%DATADIR%%/dkim_diffheaders.html
-%%DATADIR%%/dkim_dnssec.html
-%%DATADIR%%/dkim_eoh.html
-%%DATADIR%%/dkim_eom.html
-%%DATADIR%%/dkim_flush_cache.html
-%%DATADIR%%/dkim_free.html
-%%DATADIR%%/dkim_get_user_context.html
-%%DATADIR%%/dkim_getcachestats.html
-%%DATADIR%%/dkim_getdomain.html
-%%DATADIR%%/dkim_geterror.html
-%%DATADIR%%/dkim_getmode.html
-%%DATADIR%%/dkim_get_msgdate.html
-%%DATADIR%%/dkim_getpartial.html
-%%DATADIR%%/dkim_getpolicystr.html
-%%DATADIR%%/dkim_getpresult.html
-%%DATADIR%%/dkim_getpresultstr.html
-%%DATADIR%%/dkim_get_reputation.html
-%%DATADIR%%/dkim_getresultstr.html
-%%DATADIR%%/dkim_getsighdr.html
-%%DATADIR%%/dkim_getsiglist.html
-%%DATADIR%%/dkim_getsignature.html
-%%DATADIR%%/dkim_header.html
-%%DATADIR%%/dkim_init.html
-%%DATADIR%%/dkim_key_syntax.html
-%%DATADIR%%/dkim_lib.html
-%%DATADIR%%/dkim_minbody.html
-%%DATADIR%%/dkim_ohdrs.html
-%%DATADIR%%/dkim_options.html
-%%DATADIR%%/dkim_param_t.html
-%%DATADIR%%/dkim_policy.html
-%%DATADIR%%/dkim_policy_getdnssec.html
-%%DATADIR%%/dkim_policy_getreportinfo.html
-%%DATADIR%%/dkim_policy_syntax.html
-%%DATADIR%%/dkim_policy_t.html
-%%DATADIR%%/dkim_presult.html
-%%DATADIR%%/dkim_pstate.html
-%%DATADIR%%/dkim_query_t.html
-%%DATADIR%%/dkim_set_dns_callback.html
-%%DATADIR%%/dkim_set_final.html
-%%DATADIR%%/dkim_set_key_lookup.html
-%%DATADIR%%/dkim_set_margin.html
-%%DATADIR%%/dkim_set_policy_lookup.html
-%%DATADIR%%/dkim_setpartial.html
-%%DATADIR%%/dkim_set_prescreen.html
-%%DATADIR%%/dkim_set_signature_handle.html
-%%DATADIR%%/dkim_set_signature_handle_free.html
-%%DATADIR%%/dkim_set_signature_tagvalues.html
-%%DATADIR%%/dkim_set_signer.html
-%%DATADIR%%/dkim_set_trust_anchor.html
-%%DATADIR%%/dkim_set_user_context.html
-%%DATADIR%%/dkim_sig_getbh.html
-%%DATADIR%%/dkim_sig_getcanonlen.html
-%%DATADIR%%/dkim_sig_getcanons.html
-%%DATADIR%%/dkim_sig_getcontext.html
-%%DATADIR%%/dkim_sig_getdnssec.html
-%%DATADIR%%/dkim_sig_getdomain.html
-%%DATADIR%%/dkim_sig_geterror.html
-%%DATADIR%%/dkim_sig_geterrorstr.html
-%%DATADIR%%/dkim_sig_getflags.html
-%%DATADIR%%/dkim_sig_getidentity.html
-%%DATADIR%%/dkim_sig_getkeysize.html
-%%DATADIR%%/dkim_sig_getreportinfo.html
-%%DATADIR%%/dkim_sig_getselector.html
-%%DATADIR%%/dkim_sig_getsignalg.html
-%%DATADIR%%/dkim_sig_getsigntime.html
-%%DATADIR%%/dkim_sig_hdrsigned.html
-%%DATADIR%%/dkim_sig_ignore.html
-%%DATADIR%%/dkim_sig_process.html
-%%DATADIR%%/dkim_sig_syntax.html
-%%DATADIR%%/dkim_sigerror.html
-%%DATADIR%%/dkim_siginfo.html
-%%DATADIR%%/dkim_sigkey_t.html
-%%DATADIR%%/dkim_sign.html
-%%DATADIR%%/dkim_libfeature.html
-%%DATADIR%%/dkim_ssl_version.html
-%%DATADIR%%/dkim_stat.html
-%%DATADIR%%/dkim_verify.html
-%%DATADIR%%/index.html
-%%DATADIR%%/overview.html
-%%DATADIR%%/rfc2822_mailbox_split.html
-@dirrm %%DATADIR%%
 @dirrm include/opendkim
-@dirrm include/ar
+%%ARLIB%%@dirrm include/ar
 @dirrmtry etc/mail