1) change COMMENT resembling to mail/dk-milter

2) rename gentxt as mail/dk-milter installs it in the same location
3) do not install libar
4) new option to make it run as a DomainKeys verifier as well.

 # 1, 2, and 3 were pointed by ache.
PR:             105185
Submitted by:   Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)

2 files changed, 37 insertions, 4 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 245e0af2a580..f6feef6e713c 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -14,12 +14,13 @@
 
 PORTNAME=	dkim-milter
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	umq@ueo.co.jp
-COMMENT=	Domainkeys milter for Sendmail
+COMMENT=	Domainkeys Identified Mail (DKIM) milter
 
 USE_RC_SUBR=	milter-dkim.sh
 
@@ -46,7 +47,7 @@ SENDMAIL_MILTER_PORT?=	sendmail
 SUB_FILES=	milter-dkim.sh
 WCONF=		${WRKSRC}/devtools/Site
 MAN8=		dkim-filter.8
-PLIST_FILES=	lib/libar.a libexec/dkim-filter sbin/gentxt
+PLIST_FILES=	libexec/dkim-filter sbin/gentxt-dkim
 PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
 		autorespond.csh
 
@@ -64,13 +65,27 @@ SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}"
 SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR}"
 .endif
 
-.if defined(SENDMAIL_WITHOUT_MILTER)
+.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
+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
+
 pre-fetch:
+.if defined(SENDMAIL_WITHOUT_MILTER)
 	@${ECHO_MSG}
 	@${ECHO_MSG} You must unset variable SENDMAIL_WITHOUT_MILTER,
 	@${ECHO_MSG} and rebuild sendmail in the ports
 	@${FALSE}
 .endif
+	@${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} " SENDMAIL_MILTER_IN_BASE=yes	Build to run with base sendmail"
+	@${ECHO_MSG} " WITH_POSTFIX=yes		Build to run with postfix port"
+	@${ECHO_MSG}
+	@sleep 5
 
 post-extract:
 	@${CP} ${WRKSRC}/dkim-filter/autorespond.csh ${WRKSRC}
@@ -85,10 +100,18 @@ post-patch:
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${SITE} > ${WCONF}/site.config.m4
 
+.if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
+	@${REINPLACE_CMD} -e "/bldPUSH_SMLIB(\`dk')/s|^dnl ||" \
+		-e "/-I\.\.\/libdk\//s|^dnl ||" \
+		-e '/-D_FFR_VERIFY_DOMAINKEYS/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+	${LN} -s ${LIBDK_PATH} ${WRKSRC}/
+.endif
+
 post-install:
 	@${STRIP_CMD} ${PREFIX}/libexec/dkim-filter
 	${INSTALL_SCRIPT} ${WRKSRC}/dkim-filter/gentxt.csh \
-		${PREFIX}/sbin/gentxt
+		${PREFIX}/sbin/gentxt-dkim
 .for i in ${MAN8}
 	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8/
diff --git a/mail/dkim-milter/files/patch-libar-Makefile.m4 b/mail/dkim-milter/files/patch-libar-Makefile.m4
new file mode 100644
index 000000000000..ab389510e0a8
--- /dev/null
+++ b/mail/dkim-milter/files/patch-libar-Makefile.m4
@@ -0,0 +1,10 @@
+--- ./libar/Makefile.m4.orig	Sun Sep 17 08:00:43 2006
++++ ./libar/Makefile.m4	Mon Nov  6 00:28:03 2006
+@@ -12,7 +12,6 @@
+ 
+ bldPRODUCT_START(`library', `libar')
+ define(`bldSOURCES', `ar.c manual.c ')
+-define(`bldINSTALLABLE', `true')
+ bldPRODUCT_END
+ 
+ bldPRODUCT_START(`manpage', `ar')