- Update to 2.7.3

- Use GROUP options

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

7 files changed, 28 insertions, 59 deletions

diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 6905eacd04fa..8eeb8a605e81 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		opendkim
-PORTVERSION=		2.7.1
+PORTVERSION=		2.7.3
 CATEGORIES=		mail security
 MASTER_SITES=		SF
 MASTER_SITE_SUBDIR=	${PORTNAME} \
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+=	--enable-debug
 CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
 .endif
 
-.if ${PORT_OPTIONS:MSTATS} || ${PORT_OPTIONS:MSTATSEXT}
+.if ${PORT_OPTIONS:MSTATS}
 CONFIGURE_ARGS+=	--enable-stats
 MAN8+=			opendkim-expire.8 opendkim-gengraphs.8 \
 			opendkim-genstats.8 opendkim-stats.8
@@ -99,8 +99,8 @@ PLIST_SUB+=		STATS="@comment "
 .endif
 .if ${PORT_OPTIONS:MPOPAUTH} \
 	|| ${PORT_OPTIONS:MQUERY_CACHE} \
-	|| ${PORT_OPTIONS:MLDAP_CACHING} \
-	|| ${PORT_OPTIONS:MREPUTATION} \
+	|| (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MLDAP_CACHING} ) \
+	|| (${PORT_OPTIONS:MFFR} && ${PORT_OPTIONS:MREPUTATION} ) \
 	|| ${PORT_OPTIONS:MSTATS}
 . if ${PORT_OPTIONS:MBDB_BASE}
 CONFIGURE_ARGS+=	--with-db-lib=c
@@ -142,7 +142,7 @@ USE_OPENLDAP=		yes
 .else
 CONFIGURE_ARGS+=	--without-openldap
 .endif
-.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MRBL} || ${PORT_OPTIONS:MSTATSEXT}
+.if ${PORT_OPTIONS:MLUA}
 CONFIGURE_ARGS+=	--with-lua
 . if ${PORT_OPTIONS:MFILTER}
 MAN3+=			opendkim-lua.3
diff --git a/mail/opendkim/Makefile.features b/mail/opendkim/Makefile.features
index ae30a4b217cc..5449085e512b 100644
--- a/mail/opendkim/Makefile.features
+++ b/mail/opendkim/Makefile.features
@@ -4,6 +4,8 @@
 # This file is used to tune build time options.
 # Please refer FEATURES file distributed with the source for details.
 
+.if ${PORT_OPTIONS:MFFR}
+
 .if ${PORT_OPTIONS:MADSP_LISTS}
 CONFIGURE_ARGS+=	--enable-adsp_lists
 .endif
@@ -75,6 +77,7 @@ CONFIGURE_ARGS+=	--enable-rate_limit
 CONFIGURE_ARGS+=	--enable-rbl
 MAN3+=			rbl.3
 PLIST_SUB+=		RBL=""
+PORT_OPTIONS+=		LUA
 .else
 PLIST_SUB+=		RBL="@comment "
 .endif
@@ -102,11 +105,14 @@ CONFIGURE_ARGS+=	--enable-reputation \
 			--with-libcurl
 LIB_DEPENDS+=		curl:${PORTSDIR}/ftp/curl
 . if ${PORT_OPTIONS:MXML}
-CONFIGURE_ARGS+=	--with-libxml2
+CONFIGURE_ARGS+=	--without-libjansson --with-libxml2
 LIB_DEPENDS+=		xml2:${PORTSDIR}/textproc/libxml2
+PLIST_SUB+=		JANSSON="@comment "
 . else
 CONFIGURE_ARGS+=	--with-libjansson
 LIB_DEPENDS+=		jansson:${PORTSDIR}/devel/jansson
+MAN8+=			autobuild.8
+PLIST_SUB+=		JANSSON=""
 . endif
 MAN3+=			ut.3
 MAN8+=			opendkim-genrates.8 opendkim-modtotals.8 \
@@ -131,6 +137,7 @@ CONFIGURE_ARGS+=	--enable-socketdb
 
 .if ${PORT_OPTIONS:MSTATSEXT}
 CONFIGURE_ARGS+=	--enable-statsext
+PORT_OPTIONS+=		LUA STATS
 .endif
 
 .if ${PORT_OPTIONS:MVBR}
@@ -140,3 +147,13 @@ PLIST_SUB+=		VBR=""
 .else
 PLIST_SUB+=		VBR="@comment "
 .endif
+
+.else # ${PORT_OPTIONS:MFFR}
+PLIST_SUB+=		ATPS="@comment "
+PLIST_SUB+=		DKIMREP="@comment "
+PLIST_SUB+=		RBL="@comment "
+PLIST_SUB+=		REPRRD="@comment "
+PLIST_SUB+=		JANSSON="@comment "
+PLIST_SUB+=		REPUTE="@comment "
+PLIST_SUB+=		VBR="@comment "
+.endif # ${PORT_OPTIONS:MFFR}
diff --git a/mail/opendkim/Makefile.options b/mail/opendkim/Makefile.options
index 482306d0ff11..3b1c332bad07 100644
--- a/mail/opendkim/Makefile.options
+++ b/mail/opendkim/Makefile.options
@@ -8,8 +8,8 @@ OPTIONS_DEFINE+=	XML FFR
 XML_DESC=		Prefer textproc/libxml2 to devel/jansson for JSON processing
 FFR_DESC=		Use features marked as For-Future-Releases
 
-OPTIONS_MULTI+=		FFR
-OPTIONS_MULTI_FFR=	ADSP_LISTS ALLSYMBOLS ATPS CODECOVERAGE \
+OPTIONS_GROUP+=		FFR
+OPTIONS_GROUP_FFR=	ADSP_LISTS ALLSYMBOLS ATPS CODECOVERAGE \
 			DB_HANDLE_POOLS DEFAULT_SENDER DIFFHEADERS \
 			DKIM_REPUTATION ERLANG IDENTITY_HEADER \
 			LDAP_CACHING POSTGRES_RECONNECT_HACK \
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index b8d2dae131d8..afb013d7b29b 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendkim-2.7.1.tar.gz) = 782c030ce3b09d9ef536d2b98910d5a9289ba2128e8392e6ff568b2ade0282ed
-SIZE (opendkim-2.7.1.tar.gz) = 1153665
+SHA256 (opendkim-2.7.3.tar.gz) = c1fdaddc38dc47dc655ad78feae60934aab7ebf3adc7b518735d6948d1a25778
+SIZE (opendkim-2.7.3.tar.gz) = 1157432
diff --git a/mail/opendkim/files/patch-Makefile.in b/mail/opendkim/files/patch-Makefile.in
deleted file mode 100644
index 16552954edf4..000000000000
--- a/mail/opendkim/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./Makefile.in.orig	2012-10-31 03:14:49.000000000 +0900
-+++ ./Makefile.in	2012-11-12 16:39:23.000000000 +0900
-@@ -61,7 +61,6 @@
- @STATS_TRUE@am__append_6 = stats
- @REPUTE_TRUE@am__append_7 = libut reputation
- @REPRRD_TRUE@am__append_8 = reprrd
--@JANSSON_TRUE@am__append_9 = autobuild
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-@@ -139,8 +138,7 @@
- CTAGS = ctags
- CSCOPE = cscope
- DIST_SUBDIRS = libstrl libopendkim contrib docs libvbr librbl \
--	libdkimrep miltertest stats libut reputation reprrd autobuild \
--	opendkim
-+	libdkimrep miltertest stats libut reputation reprrd opendkim
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -419,7 +417,7 @@
- SUBDIRS = $(am__append_1) libopendkim contrib docs $(am__append_2) \
- 	$(am__append_3) $(am__append_4) $(am__append_5) \
- 	$(am__append_6) $(am__append_7) $(am__append_8) \
--	$(am__append_9) opendkim
-+	opendkim
- dist_doc_DATA = FEATURES KNOWNBUGS LICENSE LICENSE.Sendmail \
- 	RELEASE_NOTES.Sendmail
- 
diff --git a/mail/opendkim/files/patch-libopendkim__dkim.c b/mail/opendkim/files/patch-libopendkim__dkim.c
deleted file mode 100644
index fdda68fc4693..000000000000
--- a/mail/opendkim/files/patch-libopendkim__dkim.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./libopendkim/dkim.c.orig	2012-10-19 05:22:16.000000000 +0900
-+++ ./libopendkim/dkim.c	2012-10-20 15:52:54.000000000 +0900
-@@ -938,7 +938,7 @@
- 			dkim_dstring_cat(dkim->dkim_sslerrbuf, "; ");
- 
- 		dkim_dstring_cat(dkim->dkim_sslerrbuf,
--		                 gnutls_strerror(status));
-+		                 (u_char *) gnutls_strerror(status));
- 	}
- 
- #else /* USE_GNUTLS */
-@@ -1004,7 +1004,7 @@
- 			dkim_dstring_cat(sig->sig_sslerrbuf, "; ");
- 
- 		dkim_dstring_cat(sig->sig_sslerrbuf,
--		                 gnutls_strerror(status));
-+		                 (u_char *) gnutls_strerror(status));
- 	}
- 
- #else /* USE_GNUTLS */
diff --git a/mail/opendkim/pkg-plist b/mail/opendkim/pkg-plist
index e3659b66521e..489471d39b36 100644
--- a/mail/opendkim/pkg-plist
+++ b/mail/opendkim/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+%%REPUTE%%%%JANSSON%%bin/autobuild
 %%LUA%%bin/miltertest
 %%REPRRD%%bin/opendkim-reprrdimport
 %%ODBX%%%%STATS%%bin/opendkim-spam