svn commit: r308871 - in head/mail/opendkim: . files

[Guido Falsi]

Author: madpilot
Date: Thu Dec 13 21:40:51 2012
New Revision: 308871
URL: http://svnweb.freebsd.org/changeset/ports/308871

Log:
  - Update to 2.7.3
  - Use GROUP options
  
  PR:		ports/173635
  Submitted by: 	Hirohisa Yamaguchi <umq at ueo.co.jp> (maintainer)

Deleted:
  head/mail/opendkim/files/patch-Makefile.in
  head/mail/opendkim/files/patch-libopendkim__dkim.c
Modified:
  head/mail/opendkim/Makefile
  head/mail/opendkim/Makefile.features
  head/mail/opendkim/Makefile.options
  head/mail/opendkim/distinfo
  head/mail/opendkim/pkg-plist

Modified: head/mail/opendkim/Makefile
==============================================================================
--- head/mail/opendkim/Makefile	Thu Dec 13 21:23:52 2012	(r308870)
+++ head/mail/opendkim/Makefile	Thu Dec 13 21:40:51 2012	(r308871)
@@ -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

Modified: head/mail/opendkim/Makefile.features
==============================================================================
--- head/mail/opendkim/Makefile.features	Thu Dec 13 21:23:52 2012	(r308870)
+++ head/mail/opendkim/Makefile.features	Thu Dec 13 21:40:51 2012	(r308871)
@@ -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}

Modified: head/mail/opendkim/Makefile.options
==============================================================================
--- head/mail/opendkim/Makefile.options	Thu Dec 13 21:23:52 2012	(r308870)
+++ head/mail/opendkim/Makefile.options	Thu Dec 13 21:40:51 2012	(r308871)
@@ -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 \

Modified: head/mail/opendkim/distinfo
==============================================================================
--- head/mail/opendkim/distinfo	Thu Dec 13 21:23:52 2012	(r308870)
+++ head/mail/opendkim/distinfo	Thu Dec 13 21:40:51 2012	(r308871)
@@ -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

Modified: head/mail/opendkim/pkg-plist
==============================================================================
--- head/mail/opendkim/pkg-plist	Thu Dec 13 21:23:52 2012	(r308870)
+++ head/mail/opendkim/pkg-plist	Thu Dec 13 21:40:51 2012	(r308871)
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+%%REPUTE%%%%JANSSON%%bin/autobuild
 %%LUA%%bin/miltertest
 %%REPRRD%%bin/opendkim-reprrdimport
 %%ODBX%%%%STATS%%bin/opendkim-spam