ports/131884: [maintainetr] mail/dkim-milter build tunes

[Hirohisa Yamaguchi]

>Number:         131884
>Category:       ports
>Synopsis:       [maintainetr] mail/dkim-milter build tunes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 19 19:00:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 8.0-CURRENT FreeBSD 8.0-CURRENT #17: Thu Jul 10 06:27:38 JST 2008 root at calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64

>Description:
	1. use strl*() functions in libc, instead of sm_strl*()
	2. add an option to link against libunbound

>How-To-Repeat:
	N/A
>Fix:

	The patch follows:

cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v
retrieving revision 1.59
diff -p -u -r1.59 Makefile
--- Makefile	19 Feb 2009 01:35:36 -0000	1.59
+++ Makefile	19 Feb 2009 18:51:37 -0000
@@ -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'
@@ -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
 
cvs diff: Diffing files
Index: files/site.config.m4
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/files/site.config.m4,v
retrieving revision 1.9
diff -p -u -r1.9 site.config.m4
--- files/site.config.m4	19 Feb 2009 01:35:36 -0000	1.9
+++ files/site.config.m4	19 Feb 2009 18:51:37 -0000
@@ -6,6 +6,7 @@ define(`confINCLUDEDIR',`%%PREFIX%%/incl
 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 ')

>Release-Note:
>Audit-Trail:
>Unformatted: