pkgsrc update for isc-dhcpd 4.3.1b1 (beta)

isc-dhcp4-4.3.1b1.diff

diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 9aaaa96..6cd87b2 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -17,7 +17,7 @@ LICENSE=              isc
 
 CONFLICTS+=            isc-dhcp-base-3.*{,nb*}
 
-VERSION=               4.3.0
+VERSION=               4.3.1b1
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -81,7 +81,7 @@ BIND_CONFIGURE_ARGS+= --with-export-includedir=${WRKSRC}/bind/include
 BIND_CONFIGURE_ARGS+=  --with-export-libdir=${WRKSRC}/bind/lib
 BIND_CONFIGURE_ARGS+=  --with-gssapi=no
 
-BIND_WRKSRC=           ${WRKSRC}/bind/bind-9.9.5
+BIND_WRKSRC=           ${WRKSRC}/bind/bind-9.9.5-P1
 
 post-configure:
        ${RUN}${_ULIMIT_CMD}                                    \
diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo
index 8c98e69..7192c07 100644
--- a/net/isc-dhcp4/distinfo
+++ b/net/isc-dhcp4/distinfo
@@ -1,12 +1,12 @@
 $NetBSD: distinfo,v 1.18 2014/02/09 04:34:31 taca Exp $
 
-SHA1 (dhcp-4.3.0.tar.gz) = deed72a4636461042b74de68c2825dc52623e1d1
-RMD160 (dhcp-4.3.0.tar.gz) = 915e94fb080a6726f4d8357e249aad7104e2fd1a
-Size (dhcp-4.3.0.tar.gz) = 8960567 bytes
+SHA1 (dhcp-4.3.1b1.tar.gz) = 7f42166bf817cba74478bef0190f6439cc863f3b
+RMD160 (dhcp-4.3.1b1.tar.gz) = 8364d4f9e45135b5275506fe2f7124d404912ac2
+Size (dhcp-4.3.1b1.tar.gz) = 8979814 bytes
 SHA1 (patch-aa) = 27afe063248db97c3022d726f4e1653e83aeedff
 SHA1 (patch-ab) = c87ae71fdd70137a97f918d3240a1025a4dbe0cc
 SHA1 (patch-ac) = 440cd2d3db555fb7f4a433f218e2c9aa6bcf390c
-SHA1 (patch-bind_bind-9.9.5_configure) = 645603865146fe43b5f0ea109d8dbe590611f124
-SHA1 (patch-bind_bind-9.9.5_lib_export_dns_Makefile.in) = 2cb8fd2a90b577376b0f9512545b82724acb0e1d
+SHA1 (patch-bind_bind-9.9.5-P1_configure) = c99dd3cbcd126ceb66af1301d0d3f6823a8b2e2e
+SHA1 (patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in) = e77ae72f5fee2643146f27cd6c7db9d7b89898a4
 SHA1 (patch-common_dlpi.c) = 76e30ca92a7d3ba10ed73b4f03de0582bccb2acc
 SHA1 (patch-includes_Makefile.in) = 8b40bd1bf1e828fb99250450fc1b887580fc9233
diff --git a/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_configure b/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_configure
new file mode 100644
index 0000000..9c81dbf
--- /dev/null
+++ b/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_configure
@@ -0,0 +1,14 @@
+$NetBSD$
+
+* Avoid using "==" for argument of test(1).
+--- bind/bind-9.9.5-P1/configure.orig  2014-07-11 18:56:21.857903734 +0000
++++ bind/bind-9.9.5-P1/configure
+@@ -11685,7 +11685,7 @@ done
+ 
+                       ;;
+               esac
+-              if test "X$PYTHON" == "X"
++              if test "X$PYTHON" = "X"
+               then
+                       case "$use_python" in
+                       unspec)
diff --git a/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in b/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in
new file mode 100644
index 0000000..4f3b058
--- /dev/null
+++ b/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Build gen with BUILD_CC and the associated BUILD_* flags so it can run
+on the build platform when cross-compiling.
+
+--- bind/bind-9.9.5-P1/lib/export/dns/Makefile.in.orig 2014-05-23 13:42:39.000000000 +0000
++++ bind/bind-9.9.5-P1/lib/export/dns/Makefile.in
+@@ -168,7 +168,8 @@ code.h:    gen
+       ./gen -s ${srcdir} > code.h
+ 
+ gen: ${srcdir}/gen.c
+-      ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
++      ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
++      ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
+ 
+ #We don't need rbtdb64 for this library
+ #rbtdb64.@O@: rbtdb.c