- Add patches to fix IPv6 support. [1]

- Add a comment to mark bundled recursor as deprecated (by the author). [2]
- s/INSTALLS_SHLIB/USE_LDCONFIG/ to satisfy portlint.

PR:		105490 [1], 105491 [2]
Submitted by:	Sten Spans<sten@blinkenlights.nl> [1], [2]
Approved by:	maintainer [1], [2]

8 files changed, 62 insertions, 4 deletions

diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index c33d95db9f73..21fa7fed0491 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost
 USE_GMAKE=	YES
 USE_SUBMAKE=	YES
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	YES
+USE_LDCONFIG=	YES
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/dns/powerdns-devel/files/configure.powerdns b/dns/powerdns-devel/files/configure.powerdns
index 6efa46c6c648..43c9b3e1e685 100644
--- a/dns/powerdns-devel/files/configure.powerdns
+++ b/dns/powerdns-devel/files/configure.powerdns
@@ -16,7 +16,7 @@ PostgreSQL	"PostgreSQL driver" ON \
 MySQL		"MySQL driver" OFF \
 OpenLDAP	"OpenLDAP backend" OFF \
 SQLite		"SQLite backend" OFF \
-Recursor	"Build Recursor" OFF \
+Recursor	"Build Recursor (DEPRECATED)" OFF \
 2> /tmp/checklist.tmp.$$
 
         retval=$?
diff --git a/dns/powerdns-devel/files/patch-pdns_nameserver.cc b/dns/powerdns-devel/files/patch-pdns_nameserver.cc
new file mode 100644
index 000000000000..fc7334537c61
--- /dev/null
+++ b/dns/powerdns-devel/files/patch-pdns_nameserver.cc
@@ -0,0 +1,14 @@
+--- pdns/nameserver.cc.orig	Sun Nov 19 16:09:10 2006
++++ pdns/nameserver.cc	Sun Nov 19 16:10:28 2006
+@@ -145,9 +145,9 @@
+     }
+ 
+     sockaddr_in6 locala;
+-    locala.sin6_port=ntohs(arg().asNum("local-port"));
++    memset(&locala, 0, sizeof(locala));
++    locala.sin6_port=htons(arg().asNum("local-port"));
+     locala.sin6_family=AF_INET6;
+-    locala.sin6_flowinfo=0;
+ 
+     if(!inet_pton(AF_INET6, localname.c_str(), (void *)&locala.sin6_addr)) {
+       addrinfo *addrinfos;
diff --git a/dns/powerdns-devel/files/patch-pdns_tcpreceiver.cc b/dns/powerdns-devel/files/patch-pdns_tcpreceiver.cc
new file mode 100644
index 000000000000..7d7baba77fdc
--- /dev/null
+++ b/dns/powerdns-devel/files/patch-pdns_tcpreceiver.cc
@@ -0,0 +1,15 @@
+--- pdns/tcpreceiver.cc.orig	Sun Nov 19 16:11:25 2006
++++ pdns/tcpreceiver.cc	Sun Nov 19 16:13:27 2006
+@@ -480,10 +480,9 @@
+       throw AhuException("Unable to acquire TCPv6 socket: "+stringerror());
+ 
+     sockaddr_in6 locala;
+-    locala.sin6_port=ntohs(arg().asNum("local-port"));
++    memset(&locala, 0, sizeof(locala));
++    locala.sin6_port=htons(arg().asNum("local-port"));
+     locala.sin6_family=AF_INET6;
+-    locala.sin6_flowinfo=0;
+-
+ 
+     if(!inet_pton(AF_INET6, laddr->c_str(), (void *)&locala.sin6_addr)) {
+       addrinfo *addrinfos;
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index c33d95db9f73..21fa7fed0491 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost
 USE_GMAKE=	YES
 USE_SUBMAKE=	YES
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	YES
+USE_LDCONFIG=	YES
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/dns/powerdns/files/configure.powerdns b/dns/powerdns/files/configure.powerdns
index 6efa46c6c648..43c9b3e1e685 100644
--- a/dns/powerdns/files/configure.powerdns
+++ b/dns/powerdns/files/configure.powerdns
@@ -16,7 +16,7 @@ PostgreSQL	"PostgreSQL driver" ON \
 MySQL		"MySQL driver" OFF \
 OpenLDAP	"OpenLDAP backend" OFF \
 SQLite		"SQLite backend" OFF \
-Recursor	"Build Recursor" OFF \
+Recursor	"Build Recursor (DEPRECATED)" OFF \
 2> /tmp/checklist.tmp.$$
 
         retval=$?
diff --git a/dns/powerdns/files/patch-pdns_nameserver.cc b/dns/powerdns/files/patch-pdns_nameserver.cc
new file mode 100644
index 000000000000..fc7334537c61
--- /dev/null
+++ b/dns/powerdns/files/patch-pdns_nameserver.cc
@@ -0,0 +1,14 @@
+--- pdns/nameserver.cc.orig	Sun Nov 19 16:09:10 2006
++++ pdns/nameserver.cc	Sun Nov 19 16:10:28 2006
+@@ -145,9 +145,9 @@
+     }
+ 
+     sockaddr_in6 locala;
+-    locala.sin6_port=ntohs(arg().asNum("local-port"));
++    memset(&locala, 0, sizeof(locala));
++    locala.sin6_port=htons(arg().asNum("local-port"));
+     locala.sin6_family=AF_INET6;
+-    locala.sin6_flowinfo=0;
+ 
+     if(!inet_pton(AF_INET6, localname.c_str(), (void *)&locala.sin6_addr)) {
+       addrinfo *addrinfos;
diff --git a/dns/powerdns/files/patch-pdns_tcpreceiver.cc b/dns/powerdns/files/patch-pdns_tcpreceiver.cc
new file mode 100644
index 000000000000..7d7baba77fdc
--- /dev/null
+++ b/dns/powerdns/files/patch-pdns_tcpreceiver.cc
@@ -0,0 +1,15 @@
+--- pdns/tcpreceiver.cc.orig	Sun Nov 19 16:11:25 2006
++++ pdns/tcpreceiver.cc	Sun Nov 19 16:13:27 2006
+@@ -480,10 +480,9 @@
+       throw AhuException("Unable to acquire TCPv6 socket: "+stringerror());
+ 
+     sockaddr_in6 locala;
+-    locala.sin6_port=ntohs(arg().asNum("local-port"));
++    memset(&locala, 0, sizeof(locala));
++    locala.sin6_port=htons(arg().asNum("local-port"));
+     locala.sin6_family=AF_INET6;
+-    locala.sin6_flowinfo=0;
+-
+ 
+     if(!inet_pton(AF_INET6, laddr->c_str(), (void *)&locala.sin6_addr)) {
+       addrinfo *addrinfos;