- use strl*() functions in libc, instead of sm_strl*()

- add an option to link against libunbound

PR:		ports/131884
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)

2 files changed, 17 insertions, 2 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index c1ae7aa434a1..8f9f70fa034e 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -14,6 +14,7 @@
 
 PORTNAME=	dkim-milter
 PORTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -182,8 +183,18 @@ PLIST_SUB+=	LIBDKIMSHARED="@comment "
 .if defined(WITH_DEBUG)
 SITE_SUB+=	-e '\|confOPTIMIZE.*-g|s/^dnl //g'
 .endif
+.if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)
+.if defined(WITH_ARLIB)
+IGNORE=		libar cannot be used simultaneously with unbound
+.endif
+LIB_DEPENDS+=	unbound:${PORTSDIR}/dns/unbound
+SITE_SUB+=	-e 's|%%UNBOUND%%||g' \
+		-e '\|bld_USE_UNBOUND.*true|s/^dnl //g'
+.else
+SITE_SUB+=	-e 's|%%UNBOUND%%|dnl |g'
 .if !defined(WITHOUT_ARLIB)
-SITE_SUB+=	-e '\|bld_USE_ARLIB|s/^dnl //g'
+SITE_SUB+=	-e '\|bld_USE_ARLIB.*true|s/^dnl //g'
+.endif
 .endif
 .if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH)
 SITE_SUB+=	-e '/-DPOPAUTH/s/^dnl //g'
@@ -243,7 +254,7 @@ pre-fetch:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If you do not have OpenSSL 0.9.8 or later installed,"
 	@${ECHO_MSG} "set WITH_OPENSSL_PORT=yes to support rsa-sha256 algorithm"
-	@${ECHO_MSG} "which is requied in the latest specification."
+	@${ECHO_MSG} "which is required in the latest specification."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "dkim-milter has the following tunable option(s):"
 	@${ECHO_MSG} " WITH_POPAUTH=yes		Query POP-before-SMTP authentication database"
@@ -253,6 +264,7 @@ pre-fetch:
 	@${ECHO_MSG} " WITH_SENDMAIL_PORT=yes		Build to run with ports' sendmail"
 	@${ECHO_MSG} " WITH_POSTFIX=yes		Build to run with postfix port"
 	@${ECHO_MSG} " WITH_LIBDKIM_INSTALL=yes	Install libdkim library"
+	@${ECHO_MSG} " WITH_UNBOUND=yes		Link against libunbound"
 	@${ECHO_MSG}
 	@sleep 5
 
diff --git a/mail/dkim-milter/files/site.config.m4 b/mail/dkim-milter/files/site.config.m4
index 47af2c0dfee4..f3de4e0ce614 100644
--- a/mail/dkim-milter/files/site.config.m4
+++ b/mail/dkim-milter/files/site.config.m4
@@ -6,6 +6,7 @@ define(`confINCLUDEDIR',`%%PREFIX%%/include')
 define(`confLIBDIR',`%%PREFIX%%/lib')
 define(`confSHAREDLIBDIR',`%%PREFIX%%/lib')
 define(`confDONT_INSTALL_CATMAN',`True')
+APPENDDEF(`confENVDEF', `-DWITHOUT_LIBSM')
 APPENDDEF(`confMAPDEF', `-fPIC ')
 APPENDDEF(`confMTCCOPTS', `-fPIC ')
 %%STATIC%%APPENDDEF(`confLIBS', `-static ')
@@ -18,3 +19,5 @@ APPENDDEF(`confMTCCOPTS', `-fPIC ')
 %%LIBTRE%%APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib ')
 %%LIBTRE%%APPENDDEF(`confLIBS', `-ltre ')
 %%STATIC%%%%LIBTRE%%APPENDDEF(`confLIBS', `-lintl -liconv ')
+%%UNBOUND%%APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include ')
+%%UNBOUND%%APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib ')