summaryrefslogtreecommitdiff
path: root/mail/dkim-milter
diff options
context:
space:
mode:
authorpettai <pettai>2010-10-18 08:42:31 +0000
committerpettai <pettai>2010-10-18 08:42:31 +0000
commit322cf32ca9c8e273e29b7ebd94db7513f4b958f0 (patch)
tree227a46b7ef057152884c7e3413b18c5d6632d6e8 /mail/dkim-milter
parent01843da0a25205348af7e18637db8dd76b8daba8 (diff)
downloadpkgsrc-322cf32ca9c8e273e29b7ebd94db7513f4b958f0.tar.gz
- Add vbr option (FFR). See http://en.wikipedia.org/wiki/Vouch_by_Reference
Diffstat (limited to 'mail/dkim-milter')
-rw-r--r--mail/dkim-milter/Makefile3
-rw-r--r--mail/dkim-milter/distinfo4
-rw-r--r--mail/dkim-milter/options.mk13
-rw-r--r--mail/dkim-milter/patches/patch-aa7
4 files changed, 19 insertions, 8 deletions
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 768e7db5012..08c036ab9a8 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2010/03/14 16:59:27 pettai Exp $
+# $NetBSD: Makefile,v 1.25 2010/10/18 08:42:31 pettai Exp $
DISTNAME= dkim-milter-2.8.3
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index d9862ebaa62..eeace9816c4 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2010/03/14 16:59:27 pettai Exp $
+$NetBSD: distinfo,v 1.11 2010/10/18 08:42:31 pettai Exp $
SHA1 (dkim-milter-2.8.3.tar.gz) = ee8f7aa1429f763f6a4012e902296733df0fa0e6
RMD160 (dkim-milter-2.8.3.tar.gz) = 339886a8ec02615a785b5a5605b2b752e8e946bb
Size (dkim-milter-2.8.3.tar.gz) = 748415 bytes
-SHA1 (patch-aa) = e3564e641979ae4e94a85790c699e14f7c6c8ca1
+SHA1 (patch-aa) = 3d5a6acc971c5755057e22e335e55560b960bc4c
SHA1 (patch-ab) = ab99d7cbc6cf3ad5aff905d32c50caac7d5c02e0
SHA1 (patch-ac) = 863ff7ec1ac1ebf06732a78c8429fcc1b2799ac4
diff --git a/mail/dkim-milter/options.mk b/mail/dkim-milter/options.mk
index f9a0d84a553..9b63e5458b9 100644
--- a/mail/dkim-milter/options.mk
+++ b/mail/dkim-milter/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.7 2009/02/28 15:44:55 manu Exp $
+# $NetBSD: options.mk,v 1.8 2010/10/18 08:42:31 pettai Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dkim-milter
-PKG_SUPPORTED_OPTIONS= inet6 dkim-milter-arlib debug dkim-stats without-libsm
+PKG_SUPPORTED_OPTIONS= inet6 dkim-milter-arlib debug dkim-stats without-libsm vbr
.include "../../mk/bsd.options.mk"
@@ -46,6 +46,15 @@ SUBST_SED.libs+= -e 's|@WITHOUTLIBSM@|dnl|g'
.endif
###
+### Build with VBR support
+###
+.if !empty(PKG_OPTIONS:Mvbr)
+SUBST_SED.libs+= -e 's|@VBR@||g'
+.else
+SUBST_SED.libs+= -e 's|@VBR@|dnl|g'
+.endif
+
+###
### Install dkim-stats(8) which outputs dkim-milter statistics
###
PLIST_VARS+= stats
diff --git a/mail/dkim-milter/patches/patch-aa b/mail/dkim-milter/patches/patch-aa
index 3fc25385510..7475c9941fd 100644
--- a/mail/dkim-milter/patches/patch-aa
+++ b/mail/dkim-milter/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2009/02/28 15:44:55 manu Exp $
+$NetBSD: patch-aa,v 1.8 2010/10/18 08:42:31 pettai Exp $
---- devtools/Site/site.config.m4.orig 2009-02-18 11:02:11.000000000 +0100
+--- devtools/Site/site.config.m4.orig 2010-10-18 07:58:27.000000000 +0000
+++ devtools/Site/site.config.m4
@@ -11,7 +11,7 @@
dnl If you are encountering coredumps and want to be able to analyze them
@@ -67,8 +67,9 @@ $NetBSD: patch-aa,v 1.7 2009/02/28 15:44:55 manu Exp $
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ')
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECTOR_HEADER ')
-dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
+-dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
+@STATS@ APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
++@VBR@ APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ')
+@INET6@ APPENDDEF(`confENVDEF', `-DNETINET6 ')