Update isc-dhcp4 and related packages to 4.3.1.

                        Changes since 4.3.1rc1

- None

                        Changes since 4.3.1b1

- Modify the linux and openwrt dhclient scripts to process information
  from a stateless request.  Thanks to Jiri Popelka at Red Hat for the
  bug report and patch.
  [ISC-Bugs 36102]

- Remove more unused RCSID tags.  These weren't noticed in 4.3 as
  the code isn't used anymore but we remove them here to keep the
  code consistent across versions.
  [ISC-Bugs #36451]

5 files changed, 16 insertions, 17 deletions

diff --git a/net/isc-dhcp4/Makefile b/net/isc-dhcp4/Makefile
index 426c793f2e4..cfdee55f410 100644
--- a/net/isc-dhcp4/Makefile
+++ b/net/isc-dhcp4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2014/02/12 23:18:21 tron Exp $
+# $NetBSD: Makefile,v 1.15 2014/10/14 13:53:00 taca Exp $
 
 PKGNAME=	isc-dhcp-${DHVER}
-PKGREVISION=	1
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Base
 BUILD_SUBDIR=	bind includes tests common # dst
 SUBDIR=		includes common # dst
diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 9aaaa9667c6..5608c4c9aa9 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2014/02/09 04:34:31 taca Exp $
+# $NetBSD: Makefile.common,v 1.23 2014/10/14 13:53:00 taca Exp $
 #
 # used by net/isc-dhcp4/Makefile
 # used by net/isc-dhcpd4/Makefile
@@ -17,7 +17,7 @@ LICENSE=		isc
 
 CONFLICTS+=		isc-dhcp-base-3.*{,nb*}
 
-VERSION=		4.3.0
+VERSION=		4.3.1
 
 .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 8c98e695de8..087a924a56a 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 $
+$NetBSD: distinfo,v 1.19 2014/10/14 13:53:00 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.1.tar.gz) = 4d2b79b3b9f9e7c2791951db86ec32c291e62875
+RMD160 (dhcp-4.3.1.tar.gz) = c31e25b37b6885895e1ba82fdf16a6f1593eeaba
+Size (dhcp-4.3.1.tar.gz) = 8980806 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) = bea739b7d38a4235b05a4609e9a4d18c47a38154
+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_configure b/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_configure
index 82a53ed3a80..55ff46fa76b 100644
--- a/net/isc-dhcp4/patches/patch-bind_bind-9.9.5_configure
+++ b/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_configure
@@ -1,9 +1,9 @@
-$NetBSD: patch-bind_bind-9.9.5_configure,v 1.1 2014/02/09 04:34:31 taca Exp $
+$NetBSD: patch-bind_bind-9.9.5-P1_configure,v 1.1 2014/10/14 13:53:01 taca Exp $
 
 * Avoid using "==" for argument of test(1).
 
---- bind/bind-9.9.5/configure.orig	2014-01-27 18:58:24.000000000 +0000
-+++ bind/bind-9.9.5/configure
+--- bind/bind-9.9.5-P1/configure.orig	2014-05-23 13:42:39.000000000 +0000
++++ bind/bind-9.9.5-P1/configure
 @@ -11685,7 +11685,7 @@ done
  
  			;;
diff --git a/net/isc-dhcp4/patches/patch-bind_bind-9.9.5_lib_export_dns_Makefile.in b/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in
index c188887ba95..f28ef743552 100644
--- a/net/isc-dhcp4/patches/patch-bind_bind-9.9.5_lib_export_dns_Makefile.in
+++ b/net/isc-dhcp4/patches/patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-bind_bind-9.9.5_lib_export_dns_Makefile.in,v 1.1 2014/02/09 04:34:31 taca Exp $
+$NetBSD: patch-bind_bind-9.9.5-P1_lib_export_dns_Makefile.in,v 1.1 2014/10/14 13:53:01 taca Exp $
 
 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/lib/export/dns/Makefile.in.orig	2014-01-27 18:58:24.000000000 +0000
-+++ bind/bind-9.9.5/lib/export/dns/Makefile.in
+--- 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