- Update to 2.2.2

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

4 files changed, 36 insertions, 23 deletions

diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 69b7412e98a4..bbef38f2b98f 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -6,13 +6,20 @@
 #
 
 PORTNAME=	opendkim
-PORTVERSION=	2.1.3
+PORTVERSION=	2.2.2
 CATEGORIES=	mail security
 MASTER_SITES=	SF/opendkim
 
 MAINTAINER=	umq@ueo.co.jp
 COMMENT=	DKIM library and milter implimentation
 
+LICENSE=	BSD SENDMAIL
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE_SENDMAIL=	${WRKSRC}/LICENSE.Sendmail
+LICENSE_GROUPS_SENDMAIL=	FSF OSI
+LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
+LICENSE_PERMS_SENDMAIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_RC_SUBR=	milter-opendkim
@@ -74,7 +81,6 @@ CONFIGURE_ARGS+=	--with-db-incdir=${BDB_INCLUDE_DIR} \
 USE_BDB=		41+
 .endif
 .if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)
-BROKEN=		configure fails since arlib cannot be disabled
 .if defined(WITH_ARLIB)
 IGNORE=		libar cannot be used simultaneously with libunbound
 .endif
@@ -106,7 +112,7 @@ LIB_DEPENDS+=		opendbx:${PORTSDIR}/databases/opendbx
 CONFIGURE_ARGS+=	--with-openldap
 USE_OPENLDAP=		yes
 .endif
-.if defined(WITH_LUA)
+.if defined(WITH_LUA) || defined(WITH_STATSEXT)
 CONFIGURE_ARGS+=	--with-lua
 MAN3+=			opendkim-lua.3
 MAN8+=			miltertest.8
diff --git a/mail/opendkim/Makefile.features b/mail/opendkim/Makefile.features
index e60f50857018..8e464ea423c8 100644
--- a/mail/opendkim/Makefile.features
+++ b/mail/opendkim/Makefile.features
@@ -7,6 +7,10 @@
 # $FreeBSD$
 #
 
+.if defined(WITH_ADSP_LISTS) && !defined(WITHOUT_ADSP_LISTS)
+CONFIGURE_ARGS+=	--enable-adsp_lists
+.endif
+
 .if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS)
 CONFIGURE_ARGS+=	--enable-allsymbols
 .endif
@@ -23,6 +27,10 @@ CONFIGURE_ARGS+=	--enable-capture_unknown_errors
 CONFIGURE_ARGS+=	--enable-codecoverage
 .endif
 
+.if defined(WITH_DEFAULT_SENDER) && !defined(WITHOUT_DEFAULT_SENDER)
+CONFIGURE_ARGS+=	--enable-default_sender
+.endif
+
 .if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)
 CONFIGURE_ARGS+=	--enable-diffheaders
 LIB_DEPENDS+=		tre:${PORTSDIR}/textproc/libtre
@@ -32,10 +40,6 @@ LIB_DEPENDS+=		tre:${PORTSDIR}/textproc/libtre
 CONFIGURE_ARGS+=	--enable-dkim_reputation
 .endif
 
-.if defined(WITH_DNS_UPGRADE) && !defined(WITHOUT_DNS_UPGRADE)
-CONFIGURE_ARGS+=	--enable-dnsupgrade
-.endif
-
 .if defined(WITH_IDENTITY_HEADER) && !defined(WITHOUT_IDENTITY_HEADER)
 CONFIGURE_ARGS+=	--enable-identity_header
 .endif
@@ -78,7 +82,7 @@ CONFIGURE_ARGS+=	--enable-selector_header
 CONFIGURE_ARGS+=	--enable-sender_macro
 .endif
 
-.if defined(WITH_STATS) && !defined(WITHOUT_STATS)
+.if defined(WITH_STATS) || defined(WITH_STATS_I) || defined(WITH_STATSEXT)
 CONFIGURE_ARGS+=	--enable-stats
 MAN8+=			opendkim-stats.8
 PLIST_SUB+=		STATS=""
@@ -86,10 +90,14 @@ PLIST_SUB+=		STATS=""
 PLIST_SUB+=		STATS="@comment "
 .endif
 
-.if defined(WITH_VBR) && !defined(WITHOUT_VBR)
-CONFIGURE_ARGS+=	--enable-vbr
+.if defined(WITH_STATS_I) && !defined(WITHOUT_STATS_I)
+CONFIGURE_ARGS+=	--enable-stats_i
+.endif
+
+.if defined(WITH_STATSEXT) && !defined(WITHOUT_STATSEXT)
+CONFIGURE_ARGS+=	--enable-statsext
 .endif
 
-.if defined(WITH_ZTAGS) && !defined(WITHOUT_ZTAGS)
-CONFIGURE_ARGS+=	--enable-ztags
+.if defined(WITH_VBR) && !defined(WITHOUT_VBR)
+CONFIGURE_ARGS+=	--enable-vbr
 .endif
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index 5fecbd07e730..10488e23865c 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,3 +1,2 @@
-MD5 (opendkim-2.1.3.tar.gz) = 6ea7ea0adfd9f76ca028592d82ef5358
-SHA256 (opendkim-2.1.3.tar.gz) = c889f18ec98ff9454bc211eaad4c746365a763500127ca022e03c087a7028eba
-SIZE (opendkim-2.1.3.tar.gz) = 1011019
+SHA256 (opendkim-2.2.2.tar.gz) = 049fbf05ad6c22dacd0005886e4067533af6af6ebbd9ffb76ddcd2410d84c80b
+SIZE (opendkim-2.2.2.tar.gz) = 1098812
diff --git a/mail/opendkim/pkg-plist b/mail/opendkim/pkg-plist
index 7e4f552ce6fb..82322ee5e690 100644
--- a/mail/opendkim/pkg-plist
+++ b/mail/opendkim/pkg-plist
@@ -1,4 +1,10 @@
 @comment $FreeBSD$
+%%LUA%%bin/miltertest
+bin/opendkim-genkey
+bin/opendkim-genzone
+%%STATS%%bin/opendkim-stats
+bin/opendkim-testadsp
+bin/opendkim-testkey
 etc/mail/opendkim.conf.sample
 %%ARLIB%%include/ar/ar.h
 %%ARLIB%%include/ar/manual.h
@@ -6,20 +12,14 @@ include/opendkim/dkim.h
 %%ARLIB%%lib/libar.a
 %%ARLIB%%lib/libar.la
 %%ARLIB%%lib/libar.so
-%%ARLIB%%lib/libar.so.0
+%%ARLIB%%lib/libar.so.2
 lib/libopendkim.a
 lib/libopendkim.la
 lib/libopendkim.so
-lib/libopendkim.so.2
+lib/libopendkim.so.3
 %%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
 @dirrm include/opendkim
 %%ARLIB%%@dirrm include/ar
 @dirrmtry etc/mail