4 files changed, 38 insertions, 35 deletions
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 7f108b2e269..4778b2be269 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 12:19:19 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/11/12 19:23:35 pettai Exp $
 
-DISTNAME=	opendkim-2.5.2
+DISTNAME=	opendkim-2.6.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opendkim/}
 
diff --git a/mail/opendkim/PLIST b/mail/opendkim/PLIST
index 8001176a04b..e3dd85d557b 100644
--- a/mail/opendkim/PLIST
+++ b/mail/opendkim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/06/16 20:20:15 pettai Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/11/12 19:23:35 pettai Exp $
 bin/opendkim-genkey
 bin/opendkim-genzone
 bin/opendkim-testadsp
@@ -20,6 +20,7 @@ share/doc/opendkim/README
 share/doc/opendkim/README.LDAP
 share/doc/opendkim/README.SQL
 share/doc/opendkim/README.opendkim-reportstats
+share/doc/opendkim/README.specs.html
 share/doc/opendkim/RELEASE_NOTES.Sendmail
 share/doc/opendkim/authheaders-check-setup-hook.lua
 share/doc/opendkim/chroot
@@ -131,44 +132,17 @@ share/doc/opendkim/dkim_ssl_version.html
 share/doc/opendkim/dkim_stat.html
 share/doc/opendkim/dkim_verify.html
 share/doc/opendkim/dns.html
-share/doc/opendkim/draft-ietf-marf-as-11.txt
-share/doc/opendkim/draft-ietf-marf-authfailure-report-10.txt
-share/doc/opendkim/draft-ietf-marf-dkim-reporting-16.txt
-share/doc/opendkim/draft-ietf-repute-email-identifiers-02.txt
-share/doc/opendkim/draft-ietf-repute-media-type-01.txt
-share/doc/opendkim/draft-ietf-repute-model-01.txt
-share/doc/opendkim/draft-ietf-repute-query-http-01.txt
 share/doc/opendkim/example.com.ldif
 share/doc/opendkim/index.html
 share/doc/opendkim/opendkim
 share/doc/opendkim/opendkim-fixipaddrs.pl
-share/doc/opendkim/opendkim-reportstats
 share/doc/opendkim/opendkim-spam-ignore-cmdswitch.patch
 share/doc/opendkim/opendkim.conf.sample
 share/doc/opendkim/opendkim.conf.simple
 share/doc/opendkim/opendkim.conf.simple-verify
+share/doc/opendkim/opendkim.ldif
 share/doc/opendkim/opendkim.schema
 share/doc/opendkim/opendkim.spec.in
 share/doc/opendkim/opendkim.xml
 share/doc/opendkim/overview.html
-share/doc/opendkim/report-rfc4871.txt
-share/doc/opendkim/rfc2254.txt
-share/doc/opendkim/rfc3447.txt
-share/doc/opendkim/rfc4686.txt
-share/doc/opendkim/rfc5016.txt
-share/doc/opendkim/rfc5322.txt
-share/doc/opendkim/rfc5451.txt
-share/doc/opendkim/rfc5518.txt
-share/doc/opendkim/rfc5585.txt
-share/doc/opendkim/rfc5617.txt
-share/doc/opendkim/rfc5672.txt
-share/doc/opendkim/rfc5863.txt
-share/doc/opendkim/rfc5965.txt
-share/doc/opendkim/rfc6008.txt
-share/doc/opendkim/rfc6212.txt
-share/doc/opendkim/rfc6376.txt
-share/doc/opendkim/rfc6377.txt
-share/doc/opendkim/rfc6522.txt
-share/doc/opendkim/rfc6541.txt
-share/doc/opendkim/rfc6570.txt
 share/doc/opendkim/stats.lua
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index 84a2680fa7c..49821600234 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/06/16 20:20:15 pettai Exp $
+$NetBSD: distinfo,v 1.7 2012/11/12 19:23:35 pettai Exp $
 
-SHA1 (opendkim-2.5.2.tar.gz) = 778f27162501879dec6ac3c957055d5bc9a1ac42
-RMD160 (opendkim-2.5.2.tar.gz) = 1fe0ea26cd00728226d1788e72f48366b3fafb03
-Size (opendkim-2.5.2.tar.gz) = 1475225 bytes
+SHA1 (opendkim-2.6.7.tar.gz) = db689bbb9c2df7c0140a470504f050e6ffe2c24b
+RMD160 (opendkim-2.6.7.tar.gz) = 54fc6693d610f5e746360904415c003396ab5012
+Size (opendkim-2.6.7.tar.gz) = 1129124 bytes
+SHA1 (patch-configure) = 22f29d4d166df0fa870a0223ad95131d2b022a24
diff --git a/mail/opendkim/patches/patch-configure b/mail/opendkim/patches/patch-configure
new file mode 100644
index 00000000000..91fb89878be
--- /dev/null
+++ b/mail/opendkim/patches/patch-configure
@@ -0,0 +1,28 @@
+$NetBSD: patch-configure,v 1.1 2012/11/12 19:23:36 pettai Exp $
+
+Portability fixes
+
+--- configure.orig	2012-11-12 18:55:05.000000000 +0000
++++ configure
+@@ -18989,18 +18989,18 @@ then
+ 	as_fn_error $? "reputation requires libxml2 or libjansson" "$LINENO" 5
+ fi
+ 
+-if test  x"$xml2_found" == x"yes" -a x"$jansson_found" == x"yes"
++if test  x"$xml2_found" = x"yes" -a x"$jansson_found" = x"yes"
+ then
+ 	as_fn_error $? "cannot use both libxml2 and libjansson" "$LINENO" 5
+ fi
+ 
+-if test x"$xml2_found" == x"yes"
++if test x"$xml2_found" = x"yes"
+ then
+ 
+ $as_echo "#define USE_XML2 1" >>confdefs.h
+ 
+ fi
+-if test x"$jansson_found" == x"yes"
++if test x"$jansson_found" = x"yes"
+ then
+ 
+ $as_echo "#define USE_JANSSON 1" >>confdefs.h