Limit inclusion of boost headers to only those necessary to avoid

conflicting type errors, notably uint_t.  Add -lsocket -lnsl on Solaris.

Fixes package on Solaris.

6 files changed, 74 insertions, 2 deletions

diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index 3c0a3bcad21..16d2cf9b3b7 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/01/25 10:21:12 ghen Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/02 12:20:47 jperkin Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -24,4 +24,6 @@ SUBST_FILES.conf=	pdns/pdns.conf-dist
 SUBST_SED.conf=		-e 's,@PREFIX@,${PREFIX},'
 SUBST_SED.conf+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},'
 
+LDFLAGS.SunOS+=		-lsocket -lnsl
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/powerdns/distinfo b/net/powerdns/distinfo
index e569aada808..a22660a6c6d 100644
--- a/net/powerdns/distinfo
+++ b/net/powerdns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2012/05/20 19:37:49 marino Exp $
+$NetBSD: distinfo,v 1.12 2012/10/02 12:20:47 jperkin Exp $
 
 SHA1 (pdns-2.9.22.5.tar.gz) = 7a514fe624c110afb8a262f4d76376d0f8e17bea
 RMD160 (pdns-2.9.22.5.tar.gz) = 8be76a7a63c3366d55724815245e2f955ec0adda
@@ -7,7 +7,11 @@ SHA1 (patch-aa) = e31080087d9369349e912c94e7dbfce72c9fc629
 SHA1 (patch-ab) = f54ace6ff60162e50119eb11bcb2f5db5e1ea480
 SHA1 (patch-configure) = 2a0beb262c421d7887dcabc56102c04b340a920b
 SHA1 (patch-pdns_aes_brg_endian.h) = f7e5294251cd0d89e8ff802292f27b0c4cb50be7
+SHA1 (patch-pdns_backends_bind_bindbackend2.cc) = d6d5d2c4a726f19c8846d7f0c96a45bd5f2e3a8a
 SHA1 (patch-pdns_dns.hh) = f7d95f4c28fd986e76b4c25333b1b063992aa0c5
 SHA1 (patch-pdns_dynmessenger.cc) = df89ba91abc96319b323fc19b413b127112f4afb
 SHA1 (patch-pdns_ext_nedmalloc_malloc.c) = 979ccbf76edf9ff8ceeded0cf6fc1e401d1c1504
+SHA1 (patch-pdns_packethandler.cc) = db36bf022ebf1e27f52e2e5f05f5fb81783f2288
 SHA1 (patch-pdns_pdns_recursor.cc) = f8dff83d9153d8c1eef2aeda23bf9338f9319b1a
+SHA1 (patch-pdns_receiver.cc) = 8a9932413f5c8234478cd9d5b3f5237fcf9ac087
+SHA1 (patch-pdns_resolver.cc) = fec1bfc0083c59963c1bfa44210fe84266b4bb56
diff --git a/net/powerdns/patches/patch-pdns_backends_bind_bindbackend2.cc b/net/powerdns/patches/patch-pdns_backends_bind_bindbackend2.cc
new file mode 100644
index 00000000000..6b2688c75b7
--- /dev/null
+++ b/net/powerdns/patches/patch-pdns_backends_bind_bindbackend2.cc
@@ -0,0 +1,18 @@
+$NetBSD: patch-pdns_backends_bind_bindbackend2.cc,v 1.1 2012/10/02 12:20:47 jperkin Exp $
+
+Limit inclusion of boost headers to only those necessary to avoid conflicting
+types errors on Solaris.
+
+--- pdns/backends/bind/bindbackend2.cc.orig	2012-01-05 13:54:51.000000000 +0000
++++ pdns/backends/bind/bindbackend2.cc	2012-10-02 10:41:01.017473672 +0000
+@@ -26,8 +26,8 @@
+ #include <fstream>
+ #include <fcntl.h>
+ #include <sstream>
+-#include <boost/bind.hpp>
+-#include <boost/algorithm/string.hpp>
++#include <boost/algorithm/string/erase.hpp>
++#include <boost/algorithm/string/trim.hpp>
+ using namespace std;
+ 
+ #include "dns.hh"
diff --git a/net/powerdns/patches/patch-pdns_packethandler.cc b/net/powerdns/patches/patch-pdns_packethandler.cc
new file mode 100644
index 00000000000..0c671d97cb3
--- /dev/null
+++ b/net/powerdns/patches/patch-pdns_packethandler.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-pdns_packethandler.cc,v 1.1 2012/10/02 12:20:47 jperkin Exp $
+
+Limit inclusion of boost headers to only those necessary to avoid conflicting
+types errors on Solaris.
+
+--- pdns/packethandler.cc.orig	2012-01-05 13:54:51.000000000 +0000
++++ pdns/packethandler.cc	2012-10-02 10:36:35.971513178 +0000
+@@ -19,7 +19,7 @@
+ #include "utility.hh"
+ #include <string>
+ #include <sys/types.h>
+-#include <boost/algorithm/string.hpp>
++#include <boost/algorithm/string/predicate.hpp>
+ #include "dns.hh"
+ #include "dnsbackend.hh"
+ #include "ueberbackend.hh"
diff --git a/net/powerdns/patches/patch-pdns_receiver.cc b/net/powerdns/patches/patch-pdns_receiver.cc
new file mode 100644
index 00000000000..4ffe24b6576
--- /dev/null
+++ b/net/powerdns/patches/patch-pdns_receiver.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-pdns_receiver.cc,v 1.1 2012/10/02 12:20:47 jperkin Exp $
+
+Limit inclusion of boost headers to only those necessary to avoid conflicting
+types errors on Solaris.
+
+--- pdns/receiver.cc.orig	2012-01-05 13:54:51.000000000 +0000
++++ pdns/receiver.cc	2012-10-02 10:37:52.894235670 +0000
+@@ -39,7 +39,7 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <fstream>
+-#include <boost/algorithm/string.hpp>
++#include <boost/algorithm/string/trim.hpp>
+ 
+ #include "config.h"
+ #include "dns.hh"
diff --git a/net/powerdns/patches/patch-pdns_resolver.cc b/net/powerdns/patches/patch-pdns_resolver.cc
new file mode 100644
index 00000000000..490bb091825
--- /dev/null
+++ b/net/powerdns/patches/patch-pdns_resolver.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-pdns_resolver.cc,v 1.1 2012/10/02 12:20:47 jperkin Exp $
+
+Limit inclusion of boost headers to only those necessary to avoid conflicting
+types errors on Solaris.
+
+--- pdns/resolver.cc.orig	2012-01-05 13:54:51.000000000 +0000
++++ pdns/resolver.cc	2012-10-02 10:39:23.879764460 +0000
+@@ -29,7 +29,7 @@
+ #include <cstring>
+ #include <string>
+ #include <vector>
+-#include <boost/algorithm/string.hpp>
++#include <boost/algorithm/string/erase.hpp>
+ #include "dns.hh"
+ #include "qtype.hh"
+ #include "tcpreceiver.hh"