[beat@tinderbox] ~/dev/RELENG_9_1_0/> svn info Path: . Working Copy Root Path: /usr/home/beat/dev/RELENG_9_1_0 URL: svn+ssh://svn.freebsd.org/ports/branches/RELENG_9_1_0 Repository Root: svn+ssh://svn.freebsd.org/ports Repository UUID: 35697150-7ecd-e111-bb59-0022644237b5 Revision: 307367 Node Kind: directory Schedule: normal Last Changed Author: rene Last Changed Rev: 307353 Last Changed Date: 2012-11-13 00:15:03 +0100 (Tue, 13 Nov 2012) [beat@tinderbox] ~/dev/RELENG_9_1_0/> svn merge -c 307334 ^/head --- Merging r307334 into 'mail': UU mail/opendkim/distinfo A mail/opendkim/files/patch-libopendkim__dkim.c A mail/opendkim/files/patch-Makefile.in A mail/opendkim/Makefile.options UU mail/opendkim/Makefile.features UU mail/opendkim/pkg-plist UU mail/opendkim/Makefile Conflict discovered in '/usr/home/beat/dev/RELENG_9_1_0/security/vuxml/vuln.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: mc --- Merging r307334 into 'security': U security/vuxml/vuln.xml --- Recording mergeinfo for merge of r307334 into '.': U . --- Recording mergeinfo for merge of r307334 into 'mail': G mail --- Eliding mergeinfo from 'mail': U mail --- Recording mergeinfo for merge of r307334 into 'security': G security --- Eliding mergeinfo from 'security': U security [beat@tinderbox] ~/dev/RELENG_9_1_0/> svn status M . MM mail/opendkim/Makefile MM mail/opendkim/Makefile.features A + mail/opendkim/Makefile.options MM mail/opendkim/distinfo A + mail/opendkim/files/patch-Makefile.in A + mail/opendkim/files/patch-libopendkim__dkim.c MM mail/opendkim/pkg-plist ? ports-mgmt/pkg/work [beat@tinderbox] ~/dev/RELENG_9_1_0/> rm -rf ports-mgmt/pkg/work [beat@tinderbox] ~/dev/RELENG_9_1_0/> svn merge -c 307335 --record-only ^/head --- Recording mergeinfo for merge of r307335 into '.': G . --- Recording mergeinfo for merge of r307335 into '.cvsignore': G .cvsignore --- Eliding mergeinfo from '.cvsignore': U .cvsignore --- Recording mergeinfo for merge of r307335 into 'CHANGES': G CHANGES --- Eliding mergeinfo from 'CHANGES': U CHANGES --- Recording mergeinfo for merge of r307335 into 'COPYRIGHT': G COPYRIGHT --- Eliding mergeinfo from 'COPYRIGHT': U COPYRIGHT --- Recording mergeinfo for merge of r307335 into 'GIDs': G GIDs --- Eliding mergeinfo from 'GIDs': U GIDs --- Recording mergeinfo for merge of r307335 into 'KNOBS': G KNOBS --- Eliding mergeinfo from 'KNOBS': U KNOBS --- Recording mergeinfo for merge of r307335 into 'LEGAL': G LEGAL --- Eliding mergeinfo from 'LEGAL': U LEGAL --- Recording mergeinfo for merge of r307335 into 'MOVED': G MOVED --- Eliding mergeinfo from 'MOVED': U MOVED --- Recording mergeinfo for merge of r307335 into 'Makefile': G Makefile --- Eliding mergeinfo from 'Makefile': U Makefile --- Recording mergeinfo for merge of r307335 into 'Mk': G Mk --- Eliding mergeinfo from 'Mk': U Mk --- Recording mergeinfo for merge of r307335 into 'README': G README --- Eliding mergeinfo from 'README': U README --- Recording mergeinfo for merge of r307335 into 'Templates': G Templates --- Eliding mergeinfo from 'Templates': U Templates --- Recording mergeinfo for merge of r307335 into 'Tools': G Tools --- Eliding mergeinfo from 'Tools': U Tools --- Recording mergeinfo for merge of r307335 into 'UIDs': G UIDs --- Eliding mergeinfo from 'UIDs': U UIDs --- Recording mergeinfo for merge of r307335 into 'UPDATING': G UPDATING --- Eliding mergeinfo from 'UPDATING': U UPDATING --- Recording mergeinfo for merge of r307335 into 'accessibility': G accessibility --- Eliding mergeinfo from 'accessibility': U accessibility --- Recording mergeinfo for merge of r307335 into 'arabic': G arabic --- Eliding mergeinfo from 'arabic': U arabic --- Recording mergeinfo for merge of r307335 into 'archivers': G archivers --- Eliding mergeinfo from 'archivers': U archivers --- Recording mergeinfo for merge of r307335 into 'astro': G astro --- Eliding mergeinfo from 'astro': U astro --- Recording mergeinfo for merge of r307335 into 'audio': G audio --- Eliding mergeinfo from 'audio': U audio --- Recording mergeinfo for merge of r307335 into 'benchmarks': G benchmarks --- Eliding mergeinfo from 'benchmarks': U benchmarks --- Recording mergeinfo for merge of r307335 into 'biology': G biology --- Eliding mergeinfo from 'biology': U biology --- Recording mergeinfo for merge of r307335 into 'cad': G cad --- Eliding mergeinfo from 'cad': U cad --- Recording mergeinfo for merge of r307335 into 'chinese': G chinese --- Eliding mergeinfo from 'chinese': U chinese --- Recording mergeinfo for merge of r307335 into 'comms': G comms --- Eliding mergeinfo from 'comms': U comms --- Recording mergeinfo for merge of r307335 into 'converters': G converters --- Eliding mergeinfo from 'converters': U converters --- Recording mergeinfo for merge of r307335 into 'databases': G databases --- Eliding mergeinfo from 'databases': U databases --- Recording mergeinfo for merge of r307335 into 'deskutils': G deskutils --- Eliding mergeinfo from 'deskutils': U deskutils --- Recording mergeinfo for merge of r307335 into 'devel': G devel --- Eliding mergeinfo from 'devel': U devel --- Recording mergeinfo for merge of r307335 into 'dns': G dns --- Eliding mergeinfo from 'dns': U dns --- Recording mergeinfo for merge of r307335 into 'editors': G editors --- Eliding mergeinfo from 'editors': U editors --- Recording mergeinfo for merge of r307335 into 'emulators': G emulators --- Eliding mergeinfo from 'emulators': U emulators --- Recording mergeinfo for merge of r307335 into 'finance': G finance --- Eliding mergeinfo from 'finance': U finance --- Recording mergeinfo for merge of r307335 into 'french': G french --- Eliding mergeinfo from 'french': U french --- Recording mergeinfo for merge of r307335 into 'ftp': G ftp --- Eliding mergeinfo from 'ftp': U ftp --- Recording mergeinfo for merge of r307335 into 'games': G games --- Eliding mergeinfo from 'games': U games --- Recording mergeinfo for merge of r307335 into 'german': G german --- Eliding mergeinfo from 'german': U german --- Recording mergeinfo for merge of r307335 into 'graphics': G graphics --- Eliding mergeinfo from 'graphics': U graphics --- Recording mergeinfo for merge of r307335 into 'hebrew': G hebrew --- Eliding mergeinfo from 'hebrew': U hebrew --- Recording mergeinfo for merge of r307335 into 'hungarian': G hungarian --- Eliding mergeinfo from 'hungarian': U hungarian --- Recording mergeinfo for merge of r307335 into 'irc': G irc --- Eliding mergeinfo from 'irc': U irc --- Recording mergeinfo for merge of r307335 into 'japanese': G japanese --- Eliding mergeinfo from 'japanese': U japanese --- Recording mergeinfo for merge of r307335 into 'java': G java --- Eliding mergeinfo from 'java': U java --- Recording mergeinfo for merge of r307335 into 'korean': G korean --- Eliding mergeinfo from 'korean': U korean --- Recording mergeinfo for merge of r307335 into 'lang': G lang --- Eliding mergeinfo from 'lang': U lang --- Recording mergeinfo for merge of r307335 into 'mail': G mail --- Eliding mergeinfo from 'mail': U mail --- Recording mergeinfo for merge of r307335 into 'math': G math --- Eliding mergeinfo from 'math': U math --- Recording mergeinfo for merge of r307335 into 'misc': G misc --- Eliding mergeinfo from 'misc': U misc --- Recording mergeinfo for merge of r307335 into 'multimedia': G multimedia --- Eliding mergeinfo from 'multimedia': U multimedia --- Recording mergeinfo for merge of r307335 into 'net': G net --- Eliding mergeinfo from 'net': U net --- Recording mergeinfo for merge of r307335 into 'net-im': G net-im --- Eliding mergeinfo from 'net-im': U net-im --- Recording mergeinfo for merge of r307335 into 'net-mgmt': G net-mgmt --- Eliding mergeinfo from 'net-mgmt': U net-mgmt --- Recording mergeinfo for merge of r307335 into 'net-p2p': G net-p2p --- Eliding mergeinfo from 'net-p2p': U net-p2p --- Recording mergeinfo for merge of r307335 into 'news': G news --- Eliding mergeinfo from 'news': U news --- Recording mergeinfo for merge of r307335 into 'palm': G palm --- Eliding mergeinfo from 'palm': U palm --- Recording mergeinfo for merge of r307335 into 'polish': G polish --- Eliding mergeinfo from 'polish': U polish --- Recording mergeinfo for merge of r307335 into 'ports-mgmt': G ports-mgmt --- Eliding mergeinfo from 'ports-mgmt': U ports-mgmt --- Recording mergeinfo for merge of r307335 into 'portuguese': G portuguese --- Eliding mergeinfo from 'portuguese': U portuguese --- Recording mergeinfo for merge of r307335 into 'print': G print --- Eliding mergeinfo from 'print': U print --- Recording mergeinfo for merge of r307335 into 'russian': G russian --- Eliding mergeinfo from 'russian': U russian --- Recording mergeinfo for merge of r307335 into 'science': G science --- Eliding mergeinfo from 'science': U science --- Recording mergeinfo for merge of r307335 into 'security': G security --- Eliding mergeinfo from 'security': U security --- Recording mergeinfo for merge of r307335 into 'shells': G shells --- Eliding mergeinfo from 'shells': U shells --- Recording mergeinfo for merge of r307335 into 'sysutils': G sysutils --- Eliding mergeinfo from 'sysutils': U sysutils --- Recording mergeinfo for merge of r307335 into 'textproc': G textproc --- Eliding mergeinfo from 'textproc': U textproc --- Recording mergeinfo for merge of r307335 into 'ukrainian': G ukrainian --- Eliding mergeinfo from 'ukrainian': U ukrainian --- Recording mergeinfo for merge of r307335 into 'vietnamese': G vietnamese --- Eliding mergeinfo from 'vietnamese': U vietnamese --- Recording mergeinfo for merge of r307335 into 'www': G www --- Eliding mergeinfo from 'www': U www --- Recording mergeinfo for merge of r307335 into 'x11': G x11 --- Eliding mergeinfo from 'x11': U x11 --- Recording mergeinfo for merge of r307335 into 'x11-clocks': G x11-clocks --- Eliding mergeinfo from 'x11-clocks': U x11-clocks --- Recording mergeinfo for merge of r307335 into 'x11-drivers': G x11-drivers --- Eliding mergeinfo from 'x11-drivers': U x11-drivers --- Recording mergeinfo for merge of r307335 into 'x11-fm': G x11-fm --- Eliding mergeinfo from 'x11-fm': U x11-fm --- Recording mergeinfo for merge of r307335 into 'x11-fonts': G x11-fonts --- Eliding mergeinfo from 'x11-fonts': U x11-fonts --- Recording mergeinfo for merge of r307335 into 'x11-servers': G x11-servers --- Eliding mergeinfo from 'x11-servers': U x11-servers --- Recording mergeinfo for merge of r307335 into 'x11-themes': G x11-themes --- Eliding mergeinfo from 'x11-themes': U x11-themes --- Recording mergeinfo for merge of r307335 into 'x11-toolkits': G x11-toolkits --- Eliding mergeinfo from 'x11-toolkits': U x11-toolkits --- Recording mergeinfo for merge of r307335 into 'x11-wm': G x11-wm --- Eliding mergeinfo from 'x11-wm': U x11-wm [beat@tinderbox] ~/dev/RELENG_9_1_0/> svn status M . MM mail/opendkim/Makefile MM mail/opendkim/Makefile.features A + mail/opendkim/Makefile.options MM mail/opendkim/distinfo A + mail/opendkim/files/patch-Makefile.in A + mail/opendkim/files/patch-libopendkim__dkim.c MM mail/opendkim/pkg-plist [beat@tinderbox] ~/dev/RELENG_9_1_0/> svn diff . Index: . =================================================================== --- . (revision 307367) +++ . (working copy) Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /head:r307334-307335 Index: mail/opendkim/Makefile =================================================================== --- mail/opendkim/Makefile (revision 307367) +++ mail/opendkim/Makefile (working copy) @@ -1,12 +1,8 @@ -# New ports collection makefile for: opendkim -# Date created: 2009-08-26 -# Whom: Hirohisa Yamaguchi -# +# Created by: Hirohisa Yamaguchi # $FreeBSD$ -# PORTNAME= opendkim -PORTVERSION= 2.5.2 +PORTVERSION= 2.7.1 CATEGORIES= mail security MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME} \ @@ -17,7 +13,6 @@ LICENSE= BSD SENDMAIL LICENSE_COMB= multi -LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE_SENDMAIL= ${WRKSRC}/LICENSE.Sendmail LICENSE_GROUPS_SENDMAIL= FSF OSI @@ -25,29 +20,40 @@ LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes +MAKE_JOBS_SAFE= yes +NO_OPTIONS_SORT=yes USE_OPENSSL= yes USE_LDCONFIG= yes MAN8= opendkim-genkey.8 opendkim-genzone.8 opendkim-testadsp.8 \ opendkim-testkey.8 opendkim-testmsg.8 +PORTDOCS= * -OPTIONS= \ - 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= RESOLV +OPTIONS_SINGLE_RESOLV= STOCK_RESOLVER UNBOUND +OPTIONS_DEFINE= FILTER GNUTLS LUA MEMCACHED BDB_BASE OPENDBX OPENLDAP \ + POPAUTH QUERY_CACHE STATS +OPTIONS_DEFAULT= FILTER LUA UNBOUND +STOCK_RESOLVER_DESC= Use the stock resolver library +UNBOUND_DESC= Use unbound DNS library +FILTER_DESC= OpenDKIM filter, requires libmilter/Sendmail +GNUTLS_DESC= Use GnuTLS instead of OpenSSL +LUA_DESC= Describe filter policy with lua +MEMCACHED_DESC= Use memcached as a data set +BDB_BASE_DESC= Use Berkeley DB from base +OPENDBX_DESC= Store filter policies via OpenDBX +OPENLDAP_DESC= Store filter policies in LDAP +POPAUTH_DESC= Use POP authentication DB +QUERY_CACHE_DESC= Cache DNS query results locally +STATS_DESC= Setup statistics tools + MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig" -.include +.include "${.CURDIR}/Makefile.options" +.include -.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER) +.if ${PORT_OPTIONS:MFILTER} USE_RC_SUBR= milter-opendkim MAN5+= opendkim.conf.5 MAN8+= opendkim.8 @@ -62,8 +68,8 @@ PLIST_SUB+= FILTER="@comment " .endif -.if defined(WITH_GNUTLS) -LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls +.if ${PORT_OPTIONS:MGNUTLS} +LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE} .else CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} @@ -71,66 +77,74 @@ .include "${.CURDIR}/Makefile.features" -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif -.if !defined(NOPORTDOCS) -PORTDOCS= * -.else +.if ! ${PORT_OPTIONS:MDOCS} 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) +.if ${PORT_OPTIONS:MSTATS} || ${PORT_OPTIONS:MSTATSEXT} +CONFIGURE_ARGS+= --enable-stats +MAN8+= opendkim-expire.8 opendkim-gengraphs.8 \ + opendkim-genstats.8 opendkim-stats.8 +. if ${PORT_OPTIONS:MOPENDBX} +MAN1+= opendkim-spam.1 +MAN8+= opendkim-importstats.8 +. endif +PLIST_SUB+= STATS="" +.else +PLIST_SUB+= STATS="@comment " +.endif +.if ${PORT_OPTIONS:MPOPAUTH} \ + || ${PORT_OPTIONS:MQUERY_CACHE} \ + || ${PORT_OPTIONS:MLDAP_CACHING} \ + || ${PORT_OPTIONS:MREPUTATION} \ + || ${PORT_OPTIONS:MSTATS} +. if ${PORT_OPTIONS:MBDB_BASE} +CONFIGURE_ARGS+= --with-db-lib=c +. else CONFIGURE_ARGS+= --with-db-incdir=${BDB_INCLUDE_DIR} \ --with-db-libdir=${BDB_LIB_DIR} \ --with-db-lib=${BDB_LIB_NAME} USE_BDB= 41+ +. endif .endif -.if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND) -.if defined(WITH_ARLIB) -IGNORE= libar cannot be used simultaneously with libunbound -.endif -CONFIGURE_ARGS+= --with-unbound \ - --disable-arlib +.if ${PORT_OPTIONS:MUNBOUND} +CONFIGURE_ARGS+= --with-unbound LIB_DEPENDS+= unbound:${PORTSDIR}/dns/unbound -PLIST_SUB+= ARLIB="@comment " -.else -.if defined(WITH_ARLIB) -PLIST_SUB+= ARLIB="" -CONFIGURE_ARGS+= --enable-arlib -MAN3= ar.3 -.else -CONFIGURE_ARGS+= --disable-arlib -PLIST_SUB+= ARLIB="@comment " .endif -.endif -.if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH) +.if ${PORT_OPTIONS:MPOPAUTH} CONFIGURE_ARGS+= --enable-popauth .endif -.if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE) +.if ${PORT_OPTIONS:MQUERY_CACHE} CONFIGURE_ARGS+= --enable-query_cache .endif -.if defined(WITH_MEMCACHED) +.if ${PORT_OPTIONS:MMEMCACHED} CONFIGURE_ARGS+= --with-libmemcached LIB_DEPENDS+= memcached:${PORTSDIR}/databases/libmemcached +.else +CONFIGURE_ARGS+= --without-libmemcached .endif -.if defined(WITH_OPENDBX) +.if ${PORT_OPTIONS:MOPENDBX} CONFIGURE_ARGS+= --with-odbx LIB_DEPENDS+= opendbx:${PORTSDIR}/databases/opendbx +PLIST_SUB+= ODBX="" +.else +CONFIGURE_ARGS+= --without-odbx +PLIST_SUB+= ODBX="@comment " .endif -.if defined(WITH_OPENLDAP) +.if ${PORT_OPTIONS:MOPENLDAP} CONFIGURE_ARGS+= --with-openldap +LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap24-sasl-client USE_OPENLDAP= yes +.else +CONFIGURE_ARGS+= --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+= --with-lua -. if !defined(WITHOUT_FILTER) +. if ${PORT_OPTIONS:MFILTER} MAN3+= opendkim-lua.3 . endif MAN8+= miltertest.8 @@ -141,16 +155,16 @@ .endif 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 regression-test: build cd ${WRKSRC} ; ${MAKE} check -.include +.include Property changes on: mail/opendkim/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: mail/opendkim/Makefile.features =================================================================== --- mail/opendkim/Makefile.features (revision 307367) +++ mail/opendkim/Makefile.features (working copy) @@ -1,22 +1,18 @@ -# Makefile.features -# Author: Hirohisa Yamaguchi -# +# Created by: Hirohisa Yamaguchi +# $FreeBSD$ + # This file is used to tune build time options. # Please refer FEATURES file distributed with the source for details. -# -# $FreeBSD$ -# -.if defined(WITH_ADSP_LISTS) && !defined(WITHOUT_ADSP_LISTS) +.if ${PORT_OPTIONS:MADSP_LISTS} CONFIGURE_ARGS+= --enable-adsp_lists .endif -.if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS) +.if ${PORT_OPTIONS:MALLSYMBOLS} CONFIGURE_ARGS+= --enable-allsymbols .endif -.if defined(WITH_ATPS) && !defined(WITHOUT_ATPS) -WITH_XTAGS= yes +.if ${PORT_OPTIONS:MATPS} CONFIGURE_ARGS+= --enable-atps MAN8+= opendkim-atpszone.8 PLIST_SUB+= ATPS="" @@ -24,24 +20,26 @@ PLIST_SUB+= ATPS="@comment " .endif -.if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE) +.if ${PORT_OPTIONS:MCODECOVERAGE} CONFIGURE_ARGS+= --enable-codecoverage .endif -.if defined(WITH_DB_HANDLE_POOLS) && !defined(WITHOUT_DB_HANDLE_POOLS) +.if ${PORT_OPTIONS:MDB_HANDLE_POOLS} CONFIGURE_ARGS+= --enable-db_handle_pools .endif -.if defined(WITH_DEFAULT_SENDER) && !defined(WITHOUT_DEFAULT_SENDER) +.if ${PORT_OPTIONS:MDEFAULT_SENDER} CONFIGURE_ARGS+= --enable-default_sender .endif -.if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS) +.if ${PORT_OPTIONS:MDIFFHEADERS} CONFIGURE_ARGS+= --enable-diffheaders LIB_DEPENDS+= tre:${PORTSDIR}/textproc/libtre +.else +CONFIGURE_ARGS+= --without-tre .endif -.if defined(WITH_DKIM_REPUTATION) && !defined(WITHOUT_DKIM_REPUTATION) +.if ${PORT_OPTIONS:MDKIM_REPUTATION} CONFIGURE_ARGS+= --enable-dkim_reputation MAN3+= dkim-rep.3 PLIST_SUB+= DKIMREP="" @@ -49,37 +47,31 @@ PLIST_SUB+= DKIMREP="@comment " .endif -.if defined(WITH_IDENTITY_HEADER) && !defined(WITHOUT_IDENTITY_HEADER) +.if ${PORT_OPTIONS:MERLANG} +BUILD_DEPENDS+= erl:${PORTSDIR}/lang/erlang +CONFIGURE_ARGS+= --with-erlang +.else +CONFIGURE_ARGS+= --without-erlang +.endif + +.if ${PORT_OPTIONS:MIDENTITY_HEADER} CONFIGURE_ARGS+= --enable-identity_header .endif -.if defined(WITH_LDAP_CACHING) && !defined(WITHOUT_LDAP_CACHING) +.if ${PORT_OPTIONS:MLDAP_CACHING} WITH_OPENLDAP= yes CONFIGURE_ARGS+= --enable-ldap_caching .endif -.if defined(WITH_LUA_GLOBALS) && !defined(WITHOUT_LUA_GLOBALS) -CONFIGURE_ARGS+= --enable-lua_globals -WITH_LUA= yes +.if ${PORT_OPTIONS:MPOSTGRES_RECONNECT_HACK} +CONFIGURE_ARGS+= --enable-postgresql_reconnect_hack .endif -.if defined(WITH_OVERSIGN) && !defined(WITHOUT_OVERSIGN) -CONFIGURE_ARGS+= --enable-oversign -.endif - -.if defined(WITH_PARSE_TIME) && !defined(WITHOUT_PARSE_TIME) -CONFIGURE_ARGS+= --enable-parsetime -.endif - -.if defined(WITH_POSTGRES_RECONNECT_HACK) && !defined(WITHOUT_POSTGRES_RECONNECT_HACK) -CONFIGURE_ARGS+= --enable-postgres_reconnect_hack -.endif - -.if defined(WITH_RATE_LIMIT) || defined(WITH_RESIGN) +.if ${PORT_OPTIONS:MRATE_LIMIT} CONFIGURE_ARGS+= --enable-rate_limit .endif -.if defined(WITH_RBL) && !defined(WITHOUT_RBL) +.if ${PORT_OPTIONS:MRBL} CONFIGURE_ARGS+= --enable-rbl MAN3+= rbl.3 PLIST_SUB+= RBL="" @@ -87,64 +79,64 @@ PLIST_SUB+= RBL="@comment " .endif -.if defined(WITH_REDIRECT) && !defined(WITHOUT_REDIRECT) +.if ${PORT_OPTIONS:MREDIRECT} CONFIGURE_ARGS+= --enable-redirect .endif -.if defined(WITH_REPLACE_RULES) && !defined(WITHOUT_REPLACE_RULES) +.if ${PORT_OPTIONS:MREPLACE_RULES} CONFIGURE_ARGS+= --enable-replace_rules .endif -.if defined(WITH_REPUTATION) && !defined(WITHOUT_REPUTATION) -CONFIGURE_ARGS+= --enable-reputation +.if ${PORT_OPTIONS:MREPRRD} +CONFIGURE_ARGS+= --enable-reprrd +MAN8+= opendkim-reprrdimport.8 +PLIST_SUB+= REPRRD="" +BUILD_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool +.else +CONFIGURE_ARGS+= --disable-reprrd +PLIST_SUB+= REPRRD="@comment " +.endif + +.if ${PORT_OPTIONS:MREPUTATION} +CONFIGURE_ARGS+= --enable-reputation \ + --with-libcurl +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +. if ${PORT_OPTIONS:MXML} +CONFIGURE_ARGS+= --with-libxml2 +LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2 +. else +CONFIGURE_ARGS+= --with-libjansson +LIB_DEPENDS+= jansson:${PORTSDIR}/devel/jansson +. endif MAN3+= ut.3 -MAN8+= opendkim-genrates.8 opendkim-modtotals.8 +MAN8+= opendkim-genrates.8 opendkim-modtotals.8 \ + opendkim-rephistory.8 PLIST_SUB+= REPUTE="" .else +CONFIGURE_ARGS+= --without-libcurl PLIST_SUB+= REPUTE="@comment " .endif -.if defined(WITH_REPUTATION_CACHE) && !defined(WITHOUT_REPUTATION_CACHE) -CONFIGURE_ARGS+= --enable-reputation_cache -.endif - -.if defined(WITH_RESIGN) && !defined(WITHOUT_RESIGN) +.if ${PORT_OPTIONS:MRESIGN} CONFIGURE_ARGS+= --enable-resign .endif -.if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION) -CONFIGURE_ARGS+= --enable-select_canonicalization -.endif - -.if defined(WITH_SELECTOR_HEADER) && !defined(WITHOUT_SELECTOR_HEADER) -CONFIGURE_ARGS+= --enable-selector_header -.endif - -.if defined(WITH_SENDER_MACRO) && !defined(WITHOUT_SENDER_MACRO) +.if ${PORT_OPTIONS:MSENDER_MACRO} CONFIGURE_ARGS+= --enable-sender_macro .endif -.if defined(WITH_STATS) || defined(WITH_STATSEXT) -CONFIGURE_ARGS+= --enable-stats -MAN1+= opendkim-spam.1 -MAN8+= opendkim-stats.8 -PLIST_SUB+= STATS="" -.else -PLIST_SUB+= STATS="@comment " +.if ${PORT_OPTIONS:MSOCKETDB} +CONFIGURE_ARGS+= --enable-socketdb .endif -.if defined(WITH_STATSEXT) && !defined(WITHOUT_STATSEXT) +.if ${PORT_OPTIONS:MSTATSEXT} CONFIGURE_ARGS+= --enable-statsext .endif -.if defined(WITH_VBR) && !defined(WITHOUT_VBR) +.if ${PORT_OPTIONS:MVBR} CONFIGURE_ARGS+= --enable-vbr MAN3+= vbr.3 PLIST_SUB+= VBR="" .else PLIST_SUB+= VBR="@comment " .endif - -.if defined(WITH_XTAGS) && !defined(WITHOUT_XTAGS) -CONFIGURE_ARGS+= --enable-xtags -.endif Property changes on: mail/opendkim/Makefile.features ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: mail/opendkim/distinfo =================================================================== --- mail/opendkim/distinfo (revision 307367) +++ mail/opendkim/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (opendkim-2.5.2.tar.gz) = fb6994ea4bbd7e93772517cd3ee0b4ec338ed502a920fa2fa98b34869db167a9 -SIZE (opendkim-2.5.2.tar.gz) = 1475225 +SHA256 (opendkim-2.7.1.tar.gz) = 782c030ce3b09d9ef536d2b98910d5a9289ba2128e8392e6ff568b2ade0282ed +SIZE (opendkim-2.7.1.tar.gz) = 1153665 Property changes on: mail/opendkim/distinfo ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: mail/opendkim/pkg-plist =================================================================== --- mail/opendkim/pkg-plist (revision 307367) +++ mail/opendkim/pkg-plist (working copy) @@ -1,27 +1,15 @@ @comment $FreeBSD$ %%LUA%%bin/miltertest -%%ATPS%%bin/opendkim-atpszone -bin/opendkim-genkey -%%REPUTE%%bin/opendkim-genrates -bin/opendkim-genzone -%%REPUTE%%bin/opendkim-modtotals -%%STATS%%bin/opendkim-spam -%%STATS%%bin/opendkim-stats -bin/opendkim-testadsp -bin/opendkim-testkey -bin/opendkim-testmsg +%%REPRRD%%bin/opendkim-reprrdimport +%%ODBX%%%%STATS%%bin/opendkim-spam etc/mail/opendkim.conf.sample -%%ARLIB%%include/async-resolv.h %%DKIMREP%%include/dkim-rep/dkim-rep.h include/opendkim/dkim.h %%RBL%%include/rbl/rbl.h +%%REPRRD%%include/reprrd/reprrd.h %%REPUTE%%include/repute/repute.h %%REPUTE%%include/ut/ut.h %%VBR%%include/vbr/vbr.h -%%ARLIB%%lib/libar.a -%%ARLIB%%lib/libar.la -%%ARLIB%%lib/libar.so -%%ARLIB%%lib/libar.so.2 %%DKIMREP%%lib/libdkimrep.a %%DKIMREP%%lib/libdkimrep.la %%DKIMREP%%lib/libdkimrep.so @@ -29,11 +17,15 @@ lib/libopendkim.a lib/libopendkim.la lib/libopendkim.so -lib/libopendkim.so.6 +lib/libopendkim.so.8 %%RBL%%lib/librbl.a %%RBL%%lib/librbl.la %%RBL%%lib/librbl.so %%RBL%%lib/librbl.so.1 +%%REPRRD%%lib/libreprrd.a +%%REPRRD%%lib/libreprrd.la +%%REPRRD%%lib/libreprrd.so +%%REPRRD%%lib/libreprrd.so.1 %%REPUTE%%lib/librepute.a %%REPUTE%%lib/librepute.la %%REPUTE%%lib/librepute.so @@ -46,7 +38,6 @@ %%VBR%%lib/libvbr.la %%VBR%%lib/libvbr.so %%VBR%%lib/libvbr.so.2 -%%ARLIB%%libdata/pkgconfig/ar.pc %%DKIMREP%%libdata/pkgconfig/dkim-rep.pc libdata/pkgconfig/opendkim.pc %%RBL%%libdata/pkgconfig/rbl.pc @@ -54,5 +45,26 @@ %%REPUTE%%libdata/pkgconfig/ut.pc %%VBR%%libdata/pkgconfig/vbr.pc %%FILTER%%sbin/opendkim +%%ATPS%%sbin/opendkim-atpszone +%%STATS%%sbin/opendkim-expire +%%STATS%%sbin/opendkim-gengraphs +sbin/opendkim-genkey +%%REPUTE%%sbin/opendkim-genrates +%%STATS%%sbin/opendkim-genstats +sbin/opendkim-genzone +%%ODBX%%%%STATS%%sbin/opendkim-importstats +%%REPUTE%%sbin/opendkim-modtotals +%%REPUTE%%sbin/opendkim-rephistory +%%STATS%%sbin/opendkim-reportstats +%%STATS%%sbin/opendkim-stats +sbin/opendkim-testadsp +sbin/opendkim-testkey +sbin/opendkim-testmsg +%%VBR%%@dirrm include/vbr +%%REPUTE%%@dirrm include/ut +%%REPUTE%%@dirrm include/repute +%%REPRRD%%@dirrm include/reprrd +%%RBL%%@dirrm include/rbl @dirrm include/opendkim +%%DKIMREP%%@dirrm include/dkim-rep @dirrmtry etc/mail Property changes on: mail/opendkim/pkg-plist ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property