ports/182631: [MAINTAINER] dns/powerdns: fix build with both botan 1.8 and 1.10 installed

[Ralf van der Enden]

>Number:         182631
>Category:       ports
>Synopsis:       [MAINTAINER] dns/powerdns: fix build with both botan 1.8 and 1.10 installed
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 04 10:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Ralf van der Enden
>Release:        FreeBSD 9.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD lan.cainites.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255981: Wed Oct  2 10:15:07
>Description:
- Fix build with both botan 1.8 and 1.10 installed
- Allow staging
- Convert lib depends to new format


Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- powerdns-3.3_1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 329279)
+++ Makefile	(working copy)
@@ -12,7 +12,7 @@
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	boost_serialization:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_serialization.so:${PORTSDIR}/devel/boost-libs
 
 USE_LUA=	5.1
 LUA_COMPS=	lua
@@ -61,7 +61,6 @@
 
 OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .include <bsd.port.pre.mk>
@@ -156,7 +155,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MOPENDBX}
-LIB_DEPENDS+=		opendbx:${PORTSDIR}/databases/opendbx
+LIB_DEPENDS+=		libopendbx.so:${PORTSDIR}/databases/opendbx
 CONFIGURE_MODULES+=	"opendbx"
 PLIST_SUB+=		WITHOPENDBX=""
 CXXFLAGS+=		-L${LOCALBASE}/lib
@@ -167,17 +166,17 @@
 .if ${PORT_OPTIONS:MPOLARSSL}
 CONFIGURE_ARGS+=	--without-system-polarssl
 .else
-LIB_DEPENDS+=		polarssl:${PORTSDIR}/security/polarssl
+LIB_DEPENDS+=		libpolarssl.so:${PORTSDIR}/security/polarssl
 .endif
 
 .if ${PORT_OPTIONS:MBOTAN110}
 CONFIGURE_ARGS+=	--enable-botan1.10
-LIB_DEPENDS+=		botan-1.10:${PORTSDIR}/security/botan110
+LIB_DEPENDS+=		libbotan-1.10.so:${PORTSDIR}/security/botan110
 .endif
 
 .if ${PORT_OPTIONS:MCRYPTOPP}
 .if exists(${LOCALBASE}/lib/libcryptopp.so)
-LIB_DEPENDS+=		cryptopp:${PORTSDIR}/security/cryptopp
+LIB_DEPENDS+=		libcryptopp.so:${PORTSDIR}/security/cryptopp
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
 .endif
@@ -202,19 +201,16 @@
 .if !exists(${PREFIX}/etc/pdns/pdns.conf)
 	${INSTALL_DATA} ${PREFIX}/etc/pdns/pdns.conf-dist ${PREFIX}/etc/pdns/pdns.conf
 .endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in pdns.conf
-	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${FILESDIR}/$i ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
-.endif
 .for j in libgpgsqlbackend.so libgmysqlbackend.so libgsqlitebackend.so \
 	libgsqlite3backend.so libldapbackend.so libopendbxbackend.so \
 	libgeobackend.so libpipebackend.so
-	@if ([ -f ${PREFIX}/lib/$j ] && [ ! -f ${PREFIX}/lib/$j.0 ]); then \
-		${LN} -sf ${PREFIX}/lib/$j ${PREFIX}/lib/$j.0; \
+	@if ([ -f ${STAGEDIR}${PREFIX}/lib/$j ] && [ ! -f ${STAGEDIR}${PREFIX}/lib/$j.0 ]); then \
+		${LN} -sf ${PREFIX}/lib/$j ${STAGEDIR}${PREFIX}/lib/$j.0; \
 	fi
 .endfor
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: files/patch-pdns_Makefile_in
===================================================================
--- files/patch-pdns_Makefile_in	(revision 329279)
+++ files/patch-pdns_Makefile_in	(working copy)
@@ -1,5 +1,5 @@
---- pdns/Makefile.in.orig	2013-06-27 13:47:04.000000000 +0200
-+++ pdns/Makefile.in	2013-06-28 10:28:35.191325678 +0200
+--- pdns/Makefile.in.orig	2013-07-05 08:30:48.000000000 +0200
++++ pdns/Makefile.in	2013-10-03 14:09:43.775941652 +0200
 @@ -49,7 +49,7 @@
  	nproxy$(EXEEXT) notify$(EXEEXT) pdnssec$(EXEEXT) \
  	dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT)
@@ -18,6 +18,17 @@
  @BOTAN18_TRUE at am__append_14 = botan18signers.cc botansigners.cc
  @BOTAN18_TRUE at am__append_15 = $(BOTAN18_LIBS) -lgmp
  @CRYPTOPP_TRUE at am__append_16 = cryptoppsigners.cc
+@@ -717,8 +717,8 @@
+ top_srcdir = @top_srcdir@
+ @HAVE_LIBPOLARSSL_FALSE at AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include -Iext/rapidjson/include
+ @HAVE_LIBPOLARSSL_TRUE at AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -I ext/rapidjson/include
+-AM_CPPFLAGS = -Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ \
+-	$(LIBCURL_CFLAGS) $(am__append_1) $(am__append_2)
++AM_CPPFLAGS = -Ibackends/bind @THREADFLAGS@ \
++	$(am__append_1) $(am__append_2) $(BOOST_CPPFLAGS)
+ EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8  \
+ 	docs/pdns_server.8 docs/zone2sql.8 docs/zone2ldap.8 docs/pdnssec.8 \
+ 	docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \
 @@ -766,7 +766,7 @@
  pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic 
  pdns_server_LDADD = ext/polarssl-1.1.2/library/libpolarssl.a \
--- powerdns-3.3_1.patch ends here ---

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