From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 16 13:18:46 2012 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E27FF106566B; Sun, 16 Sep 2012 13:18:46 +0000 (UTC) (envelope-from umq@ueo.co.jp) Received: from msa03a.plala.or.jp (msa03.plala.or.jp [IPv6:2400:7800:0:5010::3]) by mx1.freebsd.org (Postfix) with ESMTP id 0B9AA8FC12; Sun, 16 Sep 2012 13:18:45 +0000 (UTC) Received: from terpsichore.kaumoge.org ([125.205.3.39]) by msa02b.plala.or.jp with ESMTP id <20120916131708.KCGX31463.msa02b.plala.or.jp@terpsichore.kaumoge.org>; Sun, 16 Sep 2012 22:17:08 +0900 Received: from hestia.kaumoge.org (hestia.kaumoge.org [192.168.24.126]) by terpsichore.kaumoge.org (8.14.4/8.14.4/20101205) with ESMTP id q8GDH2MW015404; Sun, 16 Sep 2012 22:17:04 +0900 (JST) (envelope-from umq@ueo.co.jp) Mime-Version: 1.0 (Apple Message framework v1278) Content-Type: text/plain; charset=us-ascii From: Yamaguchi Hirohisa In-Reply-To: <201209071442.q87EgW3p053727@freefall.freebsd.org> Date: Sun, 16 Sep 2012 22:17:02 +0900 Content-Transfer-Encoding: quoted-printable Message-Id: <89F342CE-BC79-4A69-8BB3-F9DC14FE3884@ueo.co.jp> References: <201209071442.q87EgW3p053727@freefall.freebsd.org> To: bdrewery@FreeBSD.org X-Mailer: Apple Mail (2.1278) X-VirusScan: Outbound; msa02b; Sun, 16 Sep 2012 22:17:08 +0900 Cc: freebsd-ports-bugs@FreeBSD.org, jaap@NLnetLabs.nl Subject: Re: ports/171276: [PATCH] mail/opendkim: update to 2.6.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Sep 2012 13:18:47 -0000 Hi, I try attaching the patch again. On 09/07/2012, at 23:42, bdrewery@FreeBSD.org wrote: > Synopsis: [PATCH] mail/opendkim: update to 2.6.7 > I'll take it. >=20 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D171276 --=20 end Hirohisa Yamaguchi umq@ueo.co.jp Index: opendkim/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- opendkim/Makefile (revision 304330) +++ opendkim/Makefile (working copy) @@ -6,10 +6,11 @@ # =20 PORTNAME=3D opendkim -PORTVERSION=3D 2.5.2 +PORTVERSION=3D 2.6.7 CATEGORIES=3D mail security MASTER_SITES=3D SF MASTER_SITE_SUBDIR=3D ${PORTNAME} \ + ${PORTNAME}/Pre-Releases \ ${PORTNAME}/Previous%20Releases =20 MAINTAINER=3D umq@ueo.co.jp @@ -17,7 +18,6 @@ =20 LICENSE=3D BSD SENDMAIL LICENSE_COMB=3D multi -LICENSE_FILE=3D ${WRKSRC}/LICENSE =20 LICENSE_FILE_SENDMAIL=3D ${WRKSRC}/LICENSE.Sendmail LICENSE_GROUPS_SENDMAIL=3D FSF OSI @@ -25,29 +25,39 @@ LICENSE_PERMS_SENDMAIL=3D dist-mirror dist-sell pkg-mirror = pkg-sell auto-accept =20 GNU_CONFIGURE=3D yes +NO_OPTIONS_SORT=3Dyes USE_OPENSSL=3D yes USE_LDCONFIG=3D yes =20 MAN8=3D opendkim-genkey.8 opendkim-genzone.8 = opendkim-testadsp.8 \ opendkim-testkey.8 opendkim-testmsg.8 =20 -OPTIONS=3D \ - 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 \ - OPENDBX "Store filter policies via OpenDBX" Off \ - OPENLDAP "Store filter policies in LDAP" Off \ - POPAUTH "Use POP authentication DB" Off \ - QUERY_CACHE "Cache DNS query results locally" Off \ - UNBOUND "Use unbound DNS library" Off +OPTIONS_SINGLE=3D RESOLV +OPTIONS_SINGLE_RESOLV=3D ARLIB STOCK_RESOLVER UNBOUND +OPTIONS_DEFINE=3D FILTER GNUTLS LUA MEMCACHED OPENDBX = OPENLDAP \ + POPAUTH QUERY_CACHE STATS +OPTIONS_DEFAULT=3D FILTER LUA UNBOUND =20 +ARLIB_DESC=3D Asynchronous thread-safe DNS library +STOCK_RESOLVER_DESC=3D Use the stock resolver library +UNBOUND_DESC=3D Use unbound DNS library +FILTER_DESC=3D OpenDKIM filter, requires libmilter/Sendmail +GNUTLS_DESC=3D Use GnuTLS instead of OpenSSL +LUA_DESC=3D Describe filter policy with lua +MEMCACHED_DESC=3D Use memcached as a data set +OPENDBX_DESC=3D Store filter policies via OpenDBX +OPENLDAP_DESC=3D Store filter policies in LDAP +POPAUTH_DESC=3D Use POP authentication DB +QUERY_CACHE_DESC=3D Cache DNS query results locally +STATS_DESC=3D Setup statistics tools +FFR_DESC=3D Use features marked as For-Future-Releases + MAKE_ARGS+=3D pkgconfigdir=3D"${PREFIX}/libdata/pkgconfig" =20 +.include "${.CURDIR}/Makefile.options" .include =20 -.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER) +.if ${PORT_OPTIONS:MFILTER} USE_RC_SUBR=3D milter-opendkim MAN5+=3D opendkim.conf.5 MAN8+=3D opendkim.8 @@ -61,9 +71,10 @@ CONFIGURE_ARGS+=3D --disable-filter PLIST_SUB+=3D FILTER=3D"@comment " .endif +WRKSRC=3D ${WRKDIR}/${PORTNAME}-${DISTVERSION} =20 -.if defined(WITH_GNUTLS) -LIB_DEPENDS+=3D gnutls.47:${PORTSDIR}/security/gnutls +.if ${PORT_OPTIONS:MGNUTLS} +LIB_DEPENDS+=3D gnutls>=3D47:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=3D --with-gnutls=3D${LOCALBASE} .else CONFIGURE_ARGS+=3D --with-openssl=3D${OPENSSLBASE} @@ -71,7 +82,7 @@ =20 .include "${.CURDIR}/Makefile.features" =20 -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=3D --enable-debug .endif =20 @@ -81,56 +92,65 @@ CONFIGURE_ARGS+=3D--docdir=3D${WRKDIR}/doc .endif =20 -.if (defined(WITH_POPAUTH) \ - || defined(WITH_QUERY_CACHE) \ - || defined(WITH_BODYLENGTH_DB) \ - || defined(WITH_LDAP_CACHING) \ - || defined(WITH_STATS)) \ - && !defined(WITH_BDB_BASE) +.if ${PORT_OPTIONS:MSTATS} || ${PORT_OPTIONS:MSTATSEXT} +CONFIGURE_ARGS+=3D --enable-stats +MAN1+=3D opendkim-spam.1 +MAN8+=3D opendkim-stats.8 +PLIST_SUB+=3D STATS=3D"" +.else +PLIST_SUB+=3D STATS=3D"@comment " +.endif +.if ${PORT_OPTIONS:MPOPAUTH} \ + || ${PORT_OPTIONS:MQUERY_CACHE} \ + || ${PORT_OPTIONS:MLDAP_CACHING} \ + || ${PORT_OPTIONS:MSTATS} +. if !defined(WITH_BDB_BASE) CONFIGURE_ARGS+=3D --with-db-incdir=3D${BDB_INCLUDE_DIR} \ --with-db-libdir=3D${BDB_LIB_DIR} \ --with-db-lib=3D${BDB_LIB_NAME} USE_BDB=3D 41+ +. endif .endif -.if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND) -.if defined(WITH_ARLIB) -IGNORE=3D libar cannot be used simultaneously with = libunbound +.if ${PORT_OPTIONS:MUNBOUND} +CONFIGURE_ARGS+=3D --with-unbound +LIB_DEPENDS+=3D unbound:${PORTSDIR}/dns/unbound .endif -CONFIGURE_ARGS+=3D --with-unbound \ - --disable-arlib -LIB_DEPENDS+=3D unbound:${PORTSDIR}/dns/unbound -PLIST_SUB+=3D ARLIB=3D"@comment " -.else -.if defined(WITH_ARLIB) +.if ${PORT_OPTIONS:MARLIB} PLIST_SUB+=3D ARLIB=3D"" CONFIGURE_ARGS+=3D --enable-arlib -MAN3=3D ar.3 +MAN3+=3D ar.3 .else CONFIGURE_ARGS+=3D --disable-arlib PLIST_SUB+=3D ARLIB=3D"@comment " .endif -.endif -.if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH) +.if ${PORT_OPTIONS:MPOPAUTH} CONFIGURE_ARGS+=3D --enable-popauth .endif -.if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE) +.if ${PORT_OPTIONS:MQUERY_CACHE} CONFIGURE_ARGS+=3D --enable-query_cache .endif -.if defined(WITH_MEMCACHED) +.if ${PORT_OPTIONS:MMEMCACHED} CONFIGURE_ARGS+=3D --with-libmemcached LIB_DEPENDS+=3D = memcached:${PORTSDIR}/databases/libmemcached +.else +CONFIGURE_ARGS+=3D --without-libmemcached .endif -.if defined(WITH_OPENDBX) +.if ${PORT_OPTIONS:MOPENDBX} CONFIGURE_ARGS+=3D --with-odbx LIB_DEPENDS+=3D opendbx:${PORTSDIR}/databases/opendbx +.else +CONFIGURE_ARGS+=3D --without-odbx .endif -.if defined(WITH_OPENLDAP) +.if ${PORT_OPTIONS:MOPENLDAP} CONFIGURE_ARGS+=3D --with-openldap +LIB_DEPENDS+=3D = ldap:${PORTSDIR}/net/openldap24-sasl-client USE_OPENLDAP=3D yes +.else +CONFIGURE_ARGS+=3D --without-openldap .endif -.if defined(WITH_LUA) || defined(WITH_RBL) || defined(WITH_STATSEXT) +.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MRBL} || = ${PORT_OPTIONS:MSTATSEXT} CONFIGURE_ARGS+=3D --with-lua -. if !defined(WITHOUT_FILTER) +. if ${PORT_OPTIONS:MFILTER} MAN3+=3D opendkim-lua.3 . endif MAN8+=3D miltertest.8 @@ -141,12 +161,12 @@ .endif =20 post-install: -.if !defined(WITH_DEBUG) && defined(WITH_FILTER) && = !defined(WITHOUT_FILTER) +.if !${PORT_OPTIONS:MDEBUG} && ${PORT_OPTIONS:MFILTER} @${STRIP_CMD} ${PREFIX}/sbin/opendkim .endif @${MKDIR} ${PREFIX}/etc/mail ${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample = ${PREFIX}/etc/mail/ -.if !defined(WITHOUT_FILTER) +.if ${PORT_OPTIONS:MFILTER} @${CAT} ${PKGMESSAGE} .endif =20 Index: opendkim/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- opendkim/distinfo (revision 304330) +++ opendkim/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (opendkim-2.5.2.tar.gz) =3D = fb6994ea4bbd7e93772517cd3ee0b4ec338ed502a920fa2fa98b34869db167a9 -SIZE (opendkim-2.5.2.tar.gz) =3D 1475225 +SHA256 (opendkim-2.6.7.tar.gz) =3D = 45da209ccddfb6f6888ac2366b6e38a6460b36ff0da527aed910217cead6fc84 +SIZE (opendkim-2.6.7.tar.gz) =3D 1129124 Index: opendkim/Makefile.options =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- opendkim/Makefile.options (revision 0) +++ opendkim/Makefile.options (working copy) @@ -0,0 +1,44 @@ +# Makefile.options +# Author: Hirohisa Yamaguchi +# +# This file is used to tune build time options. +# Please refer FEATURES file distributed with the source for details. +# +# $FreeBSD$ +# + +OPTIONS_DEFINE+=3D FFR +OPTIONS_MULTI+=3D FFR +OPTIONS_MULTI_FFR=3D ADSP_LISTS ALLSYMBOLS ATPS CODECOVERAGE \ + DB_HANDLE_POOLS DEFAULT_SENDER DIFFHEADERS \ + DKIM_REPUTATION ERLANG IDENTITY_HEADER = LDAP_CACHING \ + LUA_GLOBALS OVERSIGN POSTGRES_RECONNECT_HACK \ + RATE_LIMIT RBL REDIRECT REPLACE_RULES \ + REPUTATION REPUTATION_CACHE RESIGN \ + SENDER_MACRO SOCKETDB STATSEXT VBR + +ADSP_LISTS_DESC=3D ADSP filtering for lists (experimental) +ALLSYMBOLS_DESC=3D Export internal symbols for test +ATPS_DESC=3D Authorized Third Party Sign check +CODECOVERAGE_DESC=3D Include coverage/profile code +DB_HANDLE_POOLS_DESC=3D Database handle pools = (experimental) +DEFAULT_SENDER_DESC=3D Default sender address +DIFFHEADERS_DESC=3D Compare signed and verified headers = (experimental) +DKIM_REPUTATION_DESC=3D DKIM reputation check = (experimental) +ERLANG_DESC=3D Support for Erlang datasets +IDENTITY_HEADER_DESC=3D Special header to set identity +LDAP_CACHING_DESC=3D LDAP query piggybacking and caching +LUA_GLOBALS_DESC=3D Passing global variabls between Lua = scripts +OVERSIGN_DESC=3D Enable optional header field = over-signing +POSTGRES_RECONNECT_HACK_DESC=3D PostgreSQL connection error = detection bug hack +RATE_LIMIT_DESC=3D DKIM based rate limiting support +RBL_DESC=3D Realtime Blacklist query support +REDIRECT_DESC=3D Redirecting failed verification = to a mailbox +REPLACE_RULES_DESC=3D String substition when signing +REPUTATION_DESC=3D Reputation check (experimental) +REPUTATION_CACHE_DESC=3D Reputation caching = (experimental) +RESIGN_DESC=3D One-step resigning +SENDER_MACRO_DESC=3D Macro to determine sender +SOCKETDB_DESC=3D Arbitrary socket data sets +STATSEXT_DESC=3D Extended stats +VBR_DESC=3D Vouch-By-Reference support Index: opendkim/Makefile.features =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- opendkim/Makefile.features (revision 304330) +++ opendkim/Makefile.features (working copy) @@ -7,16 +7,15 @@ # $FreeBSD$ # =20 -.if defined(WITH_ADSP_LISTS) && !defined(WITHOUT_ADSP_LISTS) +.if ${PORT_OPTIONS:MADSP_LISTS} CONFIGURE_ARGS+=3D --enable-adsp_lists .endif =20 -.if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS) +.if ${PORT_OPTIONS:MALLSYMBOLS} CONFIGURE_ARGS+=3D --enable-allsymbols .endif =20 -.if defined(WITH_ATPS) && !defined(WITHOUT_ATPS) -WITH_XTAGS=3D yes +.if ${PORT_OPTIONS:MATPS} CONFIGURE_ARGS+=3D --enable-atps MAN8+=3D opendkim-atpszone.8 PLIST_SUB+=3D ATPS=3D"" @@ -24,24 +23,26 @@ PLIST_SUB+=3D ATPS=3D"@comment " .endif =20 -.if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE) +.if ${PORT_OPTIONS:MCODECOVERAGE} CONFIGURE_ARGS+=3D --enable-codecoverage .endif =20 -.if defined(WITH_DB_HANDLE_POOLS) && !defined(WITHOUT_DB_HANDLE_POOLS) +.if ${PORT_OPTIONS:MDB_HANDLE_POOLS} CONFIGURE_ARGS+=3D --enable-db_handle_pools .endif =20 -.if defined(WITH_DEFAULT_SENDER) && !defined(WITHOUT_DEFAULT_SENDER) +.if ${PORT_OPTIONS:MDEFAULT_SENDER} CONFIGURE_ARGS+=3D --enable-default_sender .endif =20 -.if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS) +.if ${PORT_OPTIONS:MDIFFHEADERS} CONFIGURE_ARGS+=3D --enable-diffheaders LIB_DEPENDS+=3D tre:${PORTSDIR}/textproc/libtre +.else +CONFIGURE_ARGS+=3D --without-tre .endif =20 -.if defined(WITH_DKIM_REPUTATION) && !defined(WITHOUT_DKIM_REPUTATION) +.if ${PORT_OPTIONS:MDKIM_REPUTATION} CONFIGURE_ARGS+=3D --enable-dkim_reputation MAN3+=3D dkim-rep.3 PLIST_SUB+=3D DKIMREP=3D"" @@ -49,37 +50,40 @@ PLIST_SUB+=3D DKIMREP=3D"@comment " .endif =20 -.if defined(WITH_IDENTITY_HEADER) && !defined(WITHOUT_IDENTITY_HEADER) +.if ${PORT_OPTIONS:MERLANG} +BUILD_DEPENDS+=3D erl:${PORTSDIR}/lang/erlang +CONFIGURE_ARGS+=3D --with-erlang +.else +CONFIGURE_ARGS+=3D --without-erlang +.endif + +.if ${PORT_OPTIONS:MIDENTITY_HEADER} CONFIGURE_ARGS+=3D --enable-identity_header .endif =20 -.if defined(WITH_LDAP_CACHING) && !defined(WITHOUT_LDAP_CACHING) +.if ${PORT_OPTIONS:MLDAP_CACHING} WITH_OPENLDAP=3D yes CONFIGURE_ARGS+=3D --enable-ldap_caching .endif =20 -.if defined(WITH_LUA_GLOBALS) && !defined(WITHOUT_LUA_GLOBALS) +.if ${PORT_OPTIONS:MLUA_GLOBALS} CONFIGURE_ARGS+=3D --enable-lua_globals WITH_LUA=3D yes .endif =20 -.if defined(WITH_OVERSIGN) && !defined(WITHOUT_OVERSIGN) +.if ${PORT_OPTIONS:MOVERSIGN} CONFIGURE_ARGS+=3D --enable-oversign .endif =20 -.if defined(WITH_PARSE_TIME) && !defined(WITHOUT_PARSE_TIME) -CONFIGURE_ARGS+=3D --enable-parsetime +.if ${PORT_OPTIONS:MPOSTGRES_RECONNECT_HACK} +CONFIGURE_ARGS+=3D --enable-postgresql_reconnect_hack .endif =20 -.if defined(WITH_POSTGRES_RECONNECT_HACK) && = !defined(WITHOUT_POSTGRES_RECONNECT_HACK) -CONFIGURE_ARGS+=3D --enable-postgres_reconnect_hack -.endif - -.if defined(WITH_RATE_LIMIT) || defined(WITH_RESIGN) +.if ${PORT_OPTIONS:MRATE_LIMIT} || ${PORT_OPTIONS:MRESIGN} CONFIGURE_ARGS+=3D --enable-rate_limit .endif =20 -.if defined(WITH_RBL) && !defined(WITHOUT_RBL) +.if ${PORT_OPTIONS:MRBL} CONFIGURE_ARGS+=3D --enable-rbl MAN3+=3D rbl.3 PLIST_SUB+=3D RBL=3D"" @@ -87,64 +91,57 @@ PLIST_SUB+=3D RBL=3D"@comment " .endif =20 -.if defined(WITH_REDIRECT) && !defined(WITHOUT_REDIRECT) +.if ${PORT_OPTIONS:MREDIRECT} CONFIGURE_ARGS+=3D --enable-redirect .endif =20 -.if defined(WITH_REPLACE_RULES) && !defined(WITHOUT_REPLACE_RULES) +.if ${PORT_OPTIONS:MREPLACE_RULES} CONFIGURE_ARGS+=3D --enable-replace_rules .endif =20 -.if defined(WITH_REPUTATION) && !defined(WITHOUT_REPUTATION) -CONFIGURE_ARGS+=3D --enable-reputation +.if ${PORT_OPTIONS:MREPUTATION} +CONFIGURE_ARGS+=3D --enable-reputation \ + --with-libcurl +LIB_DEPENDS+=3D curl:${PORTSDIR}/ftp/curl +. if defined(WITH_LIBXML2) && !defined(WITHOUT_LIBXML2) +CONFIGURE_ARGS+=3D --with-libxml2 +LIB_DEPENDS+=3D xml2:${PORTSDIR}/devel/libxml2 +. else +CONFIGURE_ARGS+=3D --with-libjansson +LIB_DEPENDS+=3D jansson:${PORTSDIR}/devel/jansson +. endif MAN3+=3D ut.3 MAN8+=3D opendkim-genrates.8 opendkim-modtotals.8 PLIST_SUB+=3D REPUTE=3D"" .else +CONFIGURE_ARGS+=3D --without-libcurl PLIST_SUB+=3D REPUTE=3D"@comment " .endif =20 -.if defined(WITH_REPUTATION_CACHE) && = !defined(WITHOUT_REPUTATION_CACHE) +.if ${PORT_OPTIONS:MREPUTATION_CACHE} CONFIGURE_ARGS+=3D --enable-reputation_cache .endif =20 -.if defined(WITH_RESIGN) && !defined(WITHOUT_RESIGN) +.if ${PORT_OPTIONS:MRESIGN} CONFIGURE_ARGS+=3D --enable-resign .endif =20 -.if defined(WITH_SELECT_CANONICALIZATION) && = !defined(WITHOUT_SELECT_CANONICALIZATION) -CONFIGURE_ARGS+=3D --enable-select_canonicalization -.endif - -.if defined(WITH_SELECTOR_HEADER) && !defined(WITHOUT_SELECTOR_HEADER) -CONFIGURE_ARGS+=3D --enable-selector_header -.endif - -.if defined(WITH_SENDER_MACRO) && !defined(WITHOUT_SENDER_MACRO) +.if ${PORT_OPTIONS:MSENDER_MACRO} CONFIGURE_ARGS+=3D --enable-sender_macro .endif =20 -.if defined(WITH_STATS) || defined(WITH_STATSEXT) -CONFIGURE_ARGS+=3D --enable-stats -MAN1+=3D opendkim-spam.1 -MAN8+=3D opendkim-stats.8 -PLIST_SUB+=3D STATS=3D"" -.else -PLIST_SUB+=3D STATS=3D"@comment " +.if ${PORT_OPTIONS:MSOCKETDB} +CONFIGURE_ARGS+=3D --enable-socketdb .endif =20 -.if defined(WITH_STATSEXT) && !defined(WITHOUT_STATSEXT) +.if ${PORT_OPTIONS:MSTATSEXT} CONFIGURE_ARGS+=3D --enable-statsext .endif =20 -.if defined(WITH_VBR) && !defined(WITHOUT_VBR) +.if ${PORT_OPTIONS:MVBR} CONFIGURE_ARGS+=3D --enable-vbr MAN3+=3D vbr.3 PLIST_SUB+=3D VBR=3D"" .else PLIST_SUB+=3D VBR=3D"@comment " .endif - -.if defined(WITH_XTAGS) && !defined(WITHOUT_XTAGS) -CONFIGURE_ARGS+=3D --enable-xtags -.endif Index: opendkim/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- opendkim/pkg-plist (revision 304330) +++ opendkim/pkg-plist (working copy) @@ -21,7 +21,7 @@ %%ARLIB%%lib/libar.a %%ARLIB%%lib/libar.la %%ARLIB%%lib/libar.so -%%ARLIB%%lib/libar.so.2 +%%ARLIB%%lib/libar.so.3 %%DKIMREP%%lib/libdkimrep.a %%DKIMREP%%lib/libdkimrep.la %%DKIMREP%%lib/libdkimrep.so @@ -29,7 +29,7 @@ lib/libopendkim.a lib/libopendkim.la lib/libopendkim.so -lib/libopendkim.so.6 +lib/libopendkim.so.7 %%RBL%%lib/librbl.a %%RBL%%lib/librbl.la %%RBL%%lib/librbl.so