3 files changed, 68 insertions, 8 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 198afbf7fc4e..179c8c44a2f2 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -13,7 +13,7 @@
 ## base system, building this port may fail.
 
 PORTNAME=	dkim-milter
-PORTVERSION=	0.6.5
+PORTVERSION=	0.6.6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -47,9 +47,48 @@ SENDMAIL_MILTER_PORT?=	sendmail
 SUB_FILES=	milter-dkim.sh
 WCONF=		${WRKSRC}/devtools/Site
 MAN8=		dkim-filter.8
-PLIST_FILES=	libexec/dkim-filter sbin/gentxt-dkim
+PLIST_FILES=	libexec/dkim-filter sbin/gentxt-dkim \
+		%%STATS%%libexec/dkim-stats
 PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
-		autorespond.csh
+		autorespond.csh \
+		draft-allman-dkim-ssp-02.txt draft-hoffman-dac-vbr-00.txt \
+		draft-ietf-dkim-base-10.txt draft-ietf-dkim-overview-04.txt \
+		draft-ietf-dkim-ssp-requirements-02.txt rfc4686.txt
+.if !defined(NOPORTDOCS)
+LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
+		${DOCSDIR_REL}/libdkim/overview.html \
+		${DOCSDIR_REL}/libdkim/dkim.html \
+		${DOCSDIR_REL}/libdkim/dkim_alg_t.html \
+		${DOCSDIR_REL}/libdkim/dkim_body.html \
+		${DOCSDIR_REL}/libdkim/dkim_canon_t.html \
+		${DOCSDIR_REL}/libdkim/dkim_close.html \
+		${DOCSDIR_REL}/libdkim/dkim_eoh.html \
+		${DOCSDIR_REL}/libdkim/dkim_eom.html \
+		${DOCSDIR_REL}/libdkim/dkim_free.html \
+		${DOCSDIR_REL}/libdkim/dkim_getcanonlen.html \
+		${DOCSDIR_REL}/libdkim/dkim_getidentity.html \
+		${DOCSDIR_REL}/libdkim/dkim_getkeysize.html \
+		${DOCSDIR_REL}/libdkim/dkim_getsighdr.html \
+		${DOCSDIR_REL}/libdkim/dkim_getsignalg.html \
+		${DOCSDIR_REL}/libdkim/dkim_getsigntime.html \
+		${DOCSDIR_REL}/libdkim/dkim_header.html \
+		${DOCSDIR_REL}/libdkim/dkim_init.html \
+		${DOCSDIR_REL}/libdkim/dkim_lib.html \
+		${DOCSDIR_REL}/libdkim/dkim_options.html \
+		${DOCSDIR_REL}/libdkim/dkim_policy.html \
+		${DOCSDIR_REL}/libdkim/dkim_policy_t.html \
+		${DOCSDIR_REL}/libdkim/dkim_query_t.html \
+		${DOCSDIR_REL}/libdkim/dkim_reportinfo.html \
+		${DOCSDIR_REL}/libdkim/dkim_sigkey_t.html \
+		${DOCSDIR_REL}/libdkim/dkim_sign.html \
+		${DOCSDIR_REL}/libdkim/dkim_ssl_version.html \
+		${DOCSDIR_REL}/libdkim/dkim_stat.html \
+		${DOCSDIR_REL}/libdkim/dkim_verify.html \
+		${DOCSDIR_REL}/libdkim/rfc2822_mailbox_split.html
+PLIST_FILES+=	${DOCSDIR_REL}/README.dkim-filter \
+		${LIBDOCS}
+PLIST_DIRS+=	${DOCSDIR_REL}/libdkim
+.endif
 
 SITE+=		${FILESDIR}/site.config.m4
 .if !defined(SENDMAIL_MILTER_IN_BASE)
@@ -61,13 +100,18 @@ SITE+=		${FILESDIR}/site.config.m4.milter
 SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"
 
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
-BROKEN=		dkim-milter does not verify DomainKeys correctly
 LIBDK_PORT=	mail/dk-milter
 BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/${LIBDK_PORT}:patch
 DKMILTER_DISTNAME!=	cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V DISTNAME
 LIBDK_PATH=	${PORTSDIR}/${LIBDK_PORT}/work/${DKMILTER_DISTNAME}/libdk
 .endif
 
+.if defined(WITH_STATS) && !defined(WITHOUT_STATS)
+PLIST_SUB+=	STATS=""
+.else
+PLIST_SUB+=	STATS="@comment "
+.endif
+
 pre-fetch:
 .if defined(SENDMAIL_WITHOUT_MILTER)
 	@${ECHO_MSG}
@@ -81,7 +125,7 @@ pre-fetch:
 	@${ECHO_MSG} "which is requied in the latest specification."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "dkim-milter has the following tunable option(s):"
-#	@${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes	Verify DomainKeys using dk-milter's libdk"
+	@${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes	Verify DomainKeys using dk-milter's libdk"
 	@${ECHO_MSG} " SENDMAIL_MILTER_IN_BASE=yes	Build to run with base sendmail"
 	@${ECHO_MSG} " WITH_POSTFIX=yes		Build to run with postfix port"
 	@${ECHO_MSG}
@@ -125,6 +169,11 @@ post-install:
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/dkim-filter/README ${DOCSDIR}/README.dkim-filter
+	${MKDIR} ${DOCSDIR}/libdkim
+.for f in ${LIBDOCS}
+	${INSTALL_DATA} ${WRKSRC}/libdkim/docs/`${BASENAME} ${f}` ${DOCSDIR}/libdkim/
+.endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/mail/dkim-milter/Makefile.features b/mail/dkim-milter/Makefile.features
index d5a8d4da8ac7..5d77eb61e49b 100644
--- a/mail/dkim-milter/Makefile.features
+++ b/mail/dkim-milter/Makefile.features
@@ -28,6 +28,11 @@
 		${WRKSRC}/dkim-filter/Makefile.m4
 .endif
 
+.if defined(WITH_HASH_BUFFERING) && !defined(WITHOUT_HASH_BUFFERING)
+	@${REINPLACE_CMD} -e '/-D_FFR_HASH_BUFFERING/s|^dnl ||' \
+		${WRKSRC}/libdkim/Makefile.m4
+.endif
+
 .if defined(WITH_LOG_SSL_ERRORS) && !defined(WITHOUT_LOG_SSL_ERRORS)
 	@${REINPLACE_CMD} -e '/-D_FFR_LOG_SSL_ERRORS/s|^dnl ||' \
 		${WRKSRC}/dkim-filter/Makefile.m4
@@ -90,6 +95,12 @@
 		${WRKSRC}/dkim-filter/Makefile.m4
 .endif
 
+.if defined(WITH_STATS) && !defined(WITHOUT_STATS)
+	@${REINPLACE_CMD} -e '/-D_FFR_STATS/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4 \
+		${WRKSRC}/libdkim/Makefile.m4
+.endif
+
 .if defined(WITH_VBR) && !defined(WITHOUT_VBR)
 	@${REINPLACE_CMD} -e '/-D_FFR_VBR/s|^dnl ||' \
 		${WRKSRC}/dkim-filter/Makefile.m4 \
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 466857301c53..6f489e73c807 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,3 +1,3 @@
-MD5 (dkim-milter-0.6.5.tar.gz) = ecbfa29e8b1fafac1a43345ca8c418da
-SHA256 (dkim-milter-0.6.5.tar.gz) = 3b93b408223d90bfda9a8517da1269be24c20b2f15662526498651b8df81b3e9
-SIZE (dkim-milter-0.6.5.tar.gz) = 487509
+MD5 (dkim-milter-0.6.6.tar.gz) = 7967e57b2df7a3019a4156a24971d5a8
+SHA256 (dkim-milter-0.6.6.tar.gz) = 25705f3fade8ba5db86272c1e937f006a645958467b47b7650b8d89451086bcb
+SIZE (dkim-milter-0.6.6.tar.gz) = 492420