Index: head/mail/opendkim/Makefile =================================================================== --- head/mail/opendkim/Makefile (revision 273246) +++ head/mail/opendkim/Makefile (revision 273247) @@ -1,133 +1,135 @@ # New ports collection makefile for: opendkim # Date created: 2009-08-26 # Whom: Hirohisa Yamaguchi # # $FreeBSD$ # PORTNAME= opendkim -PORTVERSION= 2.2.2 +PORTVERSION= 2.3.2 CATEGORIES= mail security -MASTER_SITES= SF/opendkim +MASTER_SITES= SF +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= umq@ueo.co.jp -COMMENT= DKIM library and milter implimentation +COMMENT= DKIM library and milter implementation 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 USE_LDCONFIG= yes MAN5= opendkim.conf.5 MAN8= opendkim-genkey.8 opendkim-genzone.8 \ opendkim-testadsp.8 opendkim-testkey.8 \ opendkim.8 SUB_FILES= pkg-message OPTIONS= \ ARLIB "Asynchronous thread-safe DNS library" On \ LUA "Describe filter policy with lua" Off \ OPENDBX "Store filter policies via OpenDBX" Off \ OPENLDAP "Store filter policies in LDAP" Off \ - OPENSSL_PORT "Use OpenSSL in ports" Off \ POPAUTH "Use POP authentication DB" Off \ QUERY_CACHE "Cache DNS query results locally" Off \ UNBOUND "Use unbound DNS library" Off MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig" .include WITHOUT_MILTER_CFLAGS= yes WITHOUT_MILTER_LDFLAGS= yes .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" CONFIGURE_ARGS+= --with-milter=${MILTERBASE} -.if ${OSVERSION} < 700000 -WITH_OPENSSL_PORT= yes -.endif -.include "${PORTSDIR}/Mk/bsd.openssl.mk" +.if defined(WITH_GNUTLS) +BROKEN= WITH_GNUTLS option requires security/gnutls 2.12.0 or later +LIB_DEPENDS+= gnutls.44:${PORTSDIR}/security/gnutls +CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE} +.else CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +.endif .include "${.CURDIR}/Makefile.features" .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif .if !defined(NOPORTDOCS) PORTDOCS= * .else 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) CONFIGURE_ARGS+= --with-db-incdir=${BDB_INCLUDE_DIR} \ --with-db-libdir=${BDB_LIB_DIR} \ --with-db-lib=${BDB_LIB_NAME} USE_BDB= 41+ .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 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) CONFIGURE_ARGS+= --enable-popauth .endif .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE) CONFIGURE_ARGS+= --enable-query_cache .endif .if defined(WITH_OPENDBX) CONFIGURE_ARGS+= --with-odbx LIB_DEPENDS+= opendbx:${PORTSDIR}/databases/opendbx .endif .if defined(WITH_OPENLDAP) CONFIGURE_ARGS+= --with-openldap USE_OPENLDAP= yes .endif -.if defined(WITH_LUA) || defined(WITH_STATSEXT) +.if defined(WITH_LUA) || defined(WITH_RBL) || defined(WITH_STATSEXT) CONFIGURE_ARGS+= --with-lua MAN3+= opendkim-lua.3 MAN8+= miltertest.8 PLIST_SUB+= LUA="" USE_LUA= 5.1 .else PLIST_SUB+= LUA="@comment " .endif post-install: .if !defined(WITH_DEBUG) @${STRIP_CMD} ${PREFIX}/sbin/opendkim .endif @${MKDIR} ${PREFIX}/etc/mail ${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${PREFIX}/etc/mail/ @${CAT} ${PKGMESSAGE} .include Property changes on: head/mail/opendkim/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/mail/opendkim/Makefile.features =================================================================== --- head/mail/opendkim/Makefile.features (revision 273246) +++ head/mail/opendkim/Makefile.features (revision 273247) @@ -1,103 +1,115 @@ # Makefile.features # Author: Hirohisa Yamaguchi # # 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) CONFIGURE_ARGS+= --enable-adsp_lists .endif .if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS) CONFIGURE_ARGS+= --enable-allsymbols .endif +.if defined(WITH_ATPS) && !defined(WITHOUT_ATPS) +CONFIGURE_ARGS+= --enable-atps +.endif + .if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB) CONFIGURE_ARGS+= --enable-bodylength_db .endif -.if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS) -CONFIGURE_ARGS+= --enable-capture_unknown_errors -.endif - .if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE) 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 .endif .if defined(WITH_DKIM_REPUTATION) && !defined(WITHOUT_DKIM_REPUTATION) CONFIGURE_ARGS+= --enable-dkim_reputation .endif .if defined(WITH_IDENTITY_HEADER) && !defined(WITHOUT_IDENTITY_HEADER) CONFIGURE_ARGS+= --enable-identity_header .endif .if defined(WITH_LDAP_CACHING) && !defined(WITHOUT_LDAP_CACHING) WITH_OPENLDAP= yes CONFIGURE_ARGS+= --enable-ldap_caching .endif +.if defined(WITH_MAXVERIFY) && !defined(WITHOUT_MAXVERIFY) +CONFIGURE_ARGS+= --enable-maxverify +.endif + +.if defined(WITH_OVERSIGN) && !defined(WITHOUT_OVERSIGN) +CONFIGURE_ARGS+= --enable-oversign +.endif + .if defined(WITH_PARSE_TIME) && !defined(WITHOUT_PARSE_TIME) BROKEN= The feature ``_FFR_PARSE_TIME'' is incomplete, does not work 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_RBL) && !defined(WITHOUT_RBL) +CONFIGURE_ARGS+= --enable-rbl +.endif + .if defined(WITH_REDIRECT) && !defined(WITHOUT_REDIRECT) CONFIGURE_ARGS+= --enable-redirect .endif .if defined(WITH_REPLACE_RULES) && !defined(WITHOUT_REPLACE_RULES) CONFIGURE_ARGS+= --enable-replace_rules .endif .if defined(WITH_REPORT_INTERVALS) && !defined(WITHOUT_REPORT_INTERVALS) CONFIGURE_ARGS+= --enable-report_intervals .endif .if defined(WITH_RESIGN) && !defined(WITHOUT_RESIGN) 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) CONFIGURE_ARGS+= --enable-sender_macro .endif .if defined(WITH_STATS) || defined(WITH_STATS_I) || defined(WITH_STATSEXT) CONFIGURE_ARGS+= --enable-stats MAN8+= opendkim-stats.8 PLIST_SUB+= STATS="" .else PLIST_SUB+= STATS="@comment " -.endif - -.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_VBR) && !defined(WITHOUT_VBR) CONFIGURE_ARGS+= --enable-vbr .endif Property changes on: head/mail/opendkim/Makefile.features ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/mail/opendkim/distinfo =================================================================== --- head/mail/opendkim/distinfo (revision 273246) +++ head/mail/opendkim/distinfo (revision 273247) @@ -1,2 +1,2 @@ -SHA256 (opendkim-2.2.2.tar.gz) = 049fbf05ad6c22dacd0005886e4067533af6af6ebbd9ffb76ddcd2410d84c80b -SIZE (opendkim-2.2.2.tar.gz) = 1098812 +SHA256 (opendkim-2.3.2.tar.gz) = 40c566fe0a182d3c9019d39f3748928c7fa7178cafbfc678630ca85248f55548 +SIZE (opendkim-2.3.2.tar.gz) = 1281269 Property changes on: head/mail/opendkim/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/mail/opendkim/pkg-plist =================================================================== --- head/mail/opendkim/pkg-plist (revision 273246) +++ head/mail/opendkim/pkg-plist (revision 273247) @@ -1,25 +1,24 @@ @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 include/opendkim/dkim.h %%ARLIB%%lib/libar.a %%ARLIB%%lib/libar.la %%ARLIB%%lib/libar.so %%ARLIB%%lib/libar.so.2 lib/libopendkim.a lib/libopendkim.la lib/libopendkim.so lib/libopendkim.so.3 %%ARLIB%%libdata/pkgconfig/ar.pc libdata/pkgconfig/opendkim.pc sbin/opendkim @dirrm include/opendkim %%ARLIB%%@dirrm include/ar @dirrmtry etc/mail Property changes on: head/mail/opendkim/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property