aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorMichael Scheidell <scheidell@FreeBSD.org>2012-01-08 01:23:47 +0000
committerMichael Scheidell <scheidell@FreeBSD.org>2012-01-08 01:23:47 +0000
commitee8b41eed3248e80be1d8dd4811a351512ee6f04 (patch)
tree5575a077719eba370febda3d3235f1a4a3c8352b /mail
parent0de731b16edbd1e8d041daf3cb00cae0ebf0c497 (diff)
downloadports-ee8b41eed3248e80be1d8dd4811a351512ee6f04.tar.gz
ports-ee8b41eed3248e80be1d8dd4811a351512ee6f04.zip
Notes
Diffstat (limited to 'mail')
-rw-r--r--mail/opendkim/Makefile21
-rw-r--r--mail/opendkim/Makefile.features1
-rw-r--r--mail/opendkim/distinfo4
-rw-r--r--mail/opendkim/pkg-plist2
4 files changed, 19 insertions, 9 deletions
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index d03420893547..d02a18c10bda 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= opendkim
-PORTVERSION= 2.4.1
+PORTVERSION= 2.4.2
CATEGORIES= mail security
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -25,18 +25,16 @@ 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
+ opendkim-testadsp.8 opendkim-testkey.8
SUB_FILES= pkg-message
-OPTIONS= \
+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 \
@@ -50,10 +48,19 @@ MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
.include <bsd.port.pre.mk>
+.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER)
+USE_RC_SUBR= milter-opendkim
+MAN5+= opendkim.conf.5
+MAN8+= opendkim.8
+PLIST_SUB+= FILTER=""
WITHOUT_MILTER_CFLAGS= yes
WITHOUT_MILTER_LDFLAGS= yes
.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
CONFIGURE_ARGS+= --with-milter=${MILTERBASE}
+.else
+CONFIGURE_ARGS+= --disable-filter
+PLIST_SUB+= FILTER="@comment "
+.endif
.if defined(WITH_GNUTLS)
LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls
@@ -126,7 +133,9 @@ USE_OPENLDAP= yes
.endif
.if defined(WITH_LUA) || defined(WITH_RBL) || defined(WITH_STATSEXT)
CONFIGURE_ARGS+= --with-lua
+. if !defined(WITHOUT_FILTER)
MAN3+= opendkim-lua.3
+. endif
MAN8+= miltertest.8
PLIST_SUB+= LUA=""
USE_LUA= 5.1
diff --git a/mail/opendkim/Makefile.features b/mail/opendkim/Makefile.features
index 73860d61381f..8a3c2ed96d6e 100644
--- a/mail/opendkim/Makefile.features
+++ b/mail/opendkim/Makefile.features
@@ -16,6 +16,7 @@ CONFIGURE_ARGS+= --enable-allsymbols
.endif
.if defined(WITH_ATPS) && !defined(WITHOUT_ATPS)
+WITH_XTAGS= yes
CONFIGURE_ARGS+= --enable-atps
.endif
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index 69da3c8d5a6e..9301edf1ca33 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendkim-2.4.1.tar.gz) = 1567a6d41dba92977d3eaae726580c5ecdc74766866331e87fc201792333b1f2
-SIZE (opendkim-2.4.1.tar.gz) = 1322057
+SHA256 (opendkim-2.4.2.tar.gz) = 930a9ef845822ba310666dfc918d306d1ffa44cc0a8d9f56d7c0b0426d668f3f
+SIZE (opendkim-2.4.2.tar.gz) = 1374662
diff --git a/mail/opendkim/pkg-plist b/mail/opendkim/pkg-plist
index 2a97883a8bcf..cf5f3d81d458 100644
--- a/mail/opendkim/pkg-plist
+++ b/mail/opendkim/pkg-plist
@@ -18,7 +18,7 @@ lib/libopendkim.so
lib/libopendkim.so.5
%%ARLIB%%libdata/pkgconfig/ar.pc
libdata/pkgconfig/opendkim.pc
-sbin/opendkim
+%%FILTER%%sbin/opendkim
@dirrm include/opendkim
%%ARLIB%%@dirrm include/ar
@dirrmtry etc/mail