summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/opendkim/Makefile20
-rw-r--r--mail/opendkim/Makefile.options3
-rw-r--r--mail/opendkim/distinfo4
-rw-r--r--mail/opendkim/files/patch-libopendkim__tests__Makefile.in8
-rw-r--r--mail/opendkim/files/patch-opendkim__tests__Makefile.in8
-rw-r--r--mail/opendkim/pkg-plist6
-rw-r--r--mail/p5-Mail-OpenDKIM/Makefile4
7 files changed, 31 insertions, 22 deletions
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index efd77f599cd1..1905c042cb83 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -2,13 +2,13 @@
# $FreeBSD$
PORTNAME= opendkim
-PORTVERSION= 2.9.2
-PORTREVISION= 7
+PORTVERSION= 2.10.3
CATEGORIES= mail security
MASTER_SITES= SF/${PORTNAME} \
- SF/${PORTNAME}/Previous%20Releases
+ SF/${PORTNAME}/Previous%20Releases \
+ ftp://ftpmirror.uk/freebsd-ports/${PORTNAME}/
-MAINTAINER= umq@ueo.co.jp
+MAINTAINER= freebsd-ports@dan.me.uk
COMMENT= DKIM library and milter implementation
LICENSE= BSD3CLAUSE SENDMAIL
@@ -21,7 +21,7 @@ LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
GNU_CONFIGURE= yes
NO_OPTIONS_SORT=yes
-USES= pkgconfig perl5 shebangfix libtool
+USES= libtool perl5 pkgconfig shebangfix
USE_PERL5= run
SHEBANG_FILES= opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \
reprrd/opendkim-reprrdimport*
@@ -120,19 +120,19 @@ CONFIGURE_ARGS+= --with-milter=${MILTERBASE}
.if ${PORT_OPTIONS:MLUA_ONLY_SIGNING} || \
${PORT_OPTIONS:MRBL}
.if !${PORT_OPTIONS:MLUA}
-IGNORE= Options LUA_ONLY_SIGNING and RBL require LUA as well
+IGNORE= options LUA_ONLY_SIGNING and RBL require LUA as well
.endif
.endif
.if ${PORT_OPTIONS:MREPUTATION}
.if !${PORT_OPTIONS:MCURL} || !${PORT_OPTIONS:MJANSSON}
-IGNORE= Option REPUTATION requires CURL and JANSSON as well
+IGNORE= option REPUTATION requires CURL and JANSSON as well
.endif
.endif
.if ${PORT_OPTIONS:MSTATSEXT}
.if !${PORT_OPTIONS:MSTATS} || !${PORT_OPTIONS:MLUA}
-IGNORE= Option STATSEXT requires STATS and LUA as well
+IGNORE= option STATSEXT requires STATS and LUA as well
.endif
.endif
@@ -151,6 +151,10 @@ USE_BDB= 40+
. endif
.endif
+.if ${PORT_OPTIONS:MCODECOVERAGE}
+LDFLAGS+= -lpthread
+.endif
+
pre-configure:
${REINPLACE_CMD} -e '/LIBLUA_LIBS/s/lua5\.[0-9]/lua-${LUA_VER}/' \
-e '/PKG_CONFIG/s/lua5\.[0-9]/lua-${LUA_VER}/' \
diff --git a/mail/opendkim/Makefile.options b/mail/opendkim/Makefile.options
index 5508aa13fef2..df50d0e8a98a 100644
--- a/mail/opendkim/Makefile.options
+++ b/mail/opendkim/Makefile.options
@@ -47,6 +47,9 @@ DEFAULT_SENDER_CONFIGURE_ENABLE=default_sender
DIFFHEADERS_DESC= Compare signed and verified headers (experimental)
DIFFHEADERS_CONFIGURE_ENABLE= diffheaders
+DIFFHEADERS_LIB_DEPENDS= libtre.so:${PORTSDIR}/textproc/libtre
+DIFFHEADERS_CONFIGURE_WITH= tre=${LOCALBASE}
+DIFFHEADERS_CONFIGURE_OFF= --without-tre
IDENTITY_HEADER_DESC= Special header to set identity
IDENTITY_HEADER_CONFIGURE_ENABLE= identity_header
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index de58b8ab9eb1..885a4b01db17 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendkim-2.9.2.tar.gz) = 1f0c66afbe48f6223d2ab985b2c27594ae45035e3e81eba887d8ec6e5e1282c0
-SIZE (opendkim-2.9.2.tar.gz) = 1229383
+SHA256 (opendkim-2.10.3.tar.gz) = 43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
+SIZE (opendkim-2.10.3.tar.gz) = 1210224
diff --git a/mail/opendkim/files/patch-libopendkim__tests__Makefile.in b/mail/opendkim/files/patch-libopendkim__tests__Makefile.in
index 213f3538cd34..242cdb388596 100644
--- a/mail/opendkim/files/patch-libopendkim__tests__Makefile.in
+++ b/mail/opendkim/files/patch-libopendkim__tests__Makefile.in
@@ -1,6 +1,6 @@
---- ./libopendkim/tests/Makefile.in.orig 2013-02-26 06:06:04.000000000 +0900
-+++ ./libopendkim/tests/Makefile.in 2013-02-26 19:58:50.000000000 +0900
-@@ -1049,8 +1049,10 @@
+--- libopendkim/tests/Makefile.in.orig 2015-05-12 18:43:48 UTC
++++ libopendkim/tests/Makefile.in
+@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_set
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
END { for (dir in files) print dir, files[dir] }'
am__base_list = \
@@ -13,7 +13,7 @@
am__uninstall_files_from_dir = { \
test -z "$$files" \
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-@@ -2782,16 +2784,19 @@
+@@ -4131,16 +4133,19 @@ uninstall-am: uninstall-dist_docDATA
@LCOV_TRUE@description.txt: $(check_PROGRAMS) $(check_SCRIPTS)
@LCOV_TRUE@ rm -f $@
@LCOV_TRUE@ for i in $(check_PROGRAMS); do \
diff --git a/mail/opendkim/files/patch-opendkim__tests__Makefile.in b/mail/opendkim/files/patch-opendkim__tests__Makefile.in
index ff03b46ca54d..8134aca9b561 100644
--- a/mail/opendkim/files/patch-opendkim__tests__Makefile.in
+++ b/mail/opendkim/files/patch-opendkim__tests__Makefile.in
@@ -1,6 +1,6 @@
---- ./opendkim/tests/Makefile.in.orig 2013-02-26 06:06:06.000000000 +0900
-+++ ./opendkim/tests/Makefile.in 2013-02-26 19:58:50.000000000 +0900
-@@ -98,8 +98,10 @@
+--- opendkim/tests/Makefile.in.orig 2015-05-12 18:43:49 UTC
++++ opendkim/tests/Makefile.in
+@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_set
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
END { for (dir in files) print dir, files[dir] }'
am__base_list = \
@@ -13,7 +13,7 @@
am__uninstall_files_from_dir = { \
test -z "$$files" \
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-@@ -778,14 +780,16 @@
+@@ -1298,14 +1300,16 @@ uninstall-am: uninstall-dist_docDATA
@LCOV_TRUE@description.txt: $(check_SCRIPTS)
@LCOV_TRUE@ rm -f $@
@LCOV_TRUE@ for test in $? ; do \
diff --git a/mail/opendkim/pkg-plist b/mail/opendkim/pkg-plist
index e50803e150e9..76288b17ecde 100644
--- a/mail/opendkim/pkg-plist
+++ b/mail/opendkim/pkg-plist
@@ -65,16 +65,14 @@
include/opendkim/dkim.h
lib/libopendkim.a
lib/libopendkim.so
-lib/libopendkim.so.9
-lib/libopendkim.so.9.0.3
+lib/libopendkim.so.10
+lib/libopendkim.so.10.0.3
libdata/pkgconfig/opendkim.pc
man/man8/opendkim-genkey.8.gz
man/man8/opendkim-genzone.8.gz
-man/man8/opendkim-testadsp.8.gz
man/man8/opendkim-testkey.8.gz
man/man8/opendkim-testmsg.8.gz
sbin/opendkim-genkey
sbin/opendkim-genzone
-sbin/opendkim-testadsp
sbin/opendkim-testkey
sbin/opendkim-testmsg
diff --git a/mail/p5-Mail-OpenDKIM/Makefile b/mail/p5-Mail-OpenDKIM/Makefile
index bad821ea2d0e..7ba3790d712a 100644
--- a/mail/p5-Mail-OpenDKIM/Makefile
+++ b/mail/p5-Mail-OpenDKIM/Makefile
@@ -22,6 +22,10 @@ RUN_DEPENDS= opendkim>=2.5.0:${PORTSDIR}/mail/opendkim \
USES= perl5
USE_PERL5= configure
+BROKEN= fails to compile with present version of mail/opendkim port
+DEPRECATED= Does not compile with newer opendkim port. Please use mail/p5-Mail-DKIM instead.
+EXPIRATION_DATE= 2015-10-31
+
PLIST_FILES= %%SITE_ARCH%%/Mail/OpenDKIM.pm \
%%SITE_ARCH%%/Mail/OpenDKIM/DKIM.pm \
%%SITE_ARCH%%/Mail/OpenDKIM/PrivateKey.pm \
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-07 03:31:56 +0000