3 files changed, 12 insertions, 28 deletions

diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
index 7f2b45d70248..5f2054593507 100644
--- a/net/isc-dhcp41-server/Makefile
+++ b/net/isc-dhcp41-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dhcp
-DISTVERSION=	4.1.1-${PATCHLEVEL}
+DISTVERSION=	4.1.2
 PORTREVISION=	${DHCP_PORTREVISION}
 PORTEPOCH=	1
 CATEGORIES=	net
@@ -19,10 +19,9 @@ DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT?=	The ISC Dynamic Host Configuration Protocol server
 
-PATCHLEVEL=	P1
-PORTREVISION_SERVER=	4
-PORTREVISION_CLIENT=	2
-PORTREVISION_RELAY=	1
+PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	0
+PORTREVISION_RELAY=	0
 
 SUBSYS?=	server
 
@@ -94,11 +93,12 @@ REINPLACE_SUB=	PREFIX="${PREFIX}"
 PKGMESSAGE_SUB=	PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
 		DOCSDIR="${DOCSDIR}"
 
+# XXX: Have to hardcode 4.1.1 here as there is no release for 4.1.2 or later.
 .if defined(WITH_DHCP_LDAP)
 MASTER_SITES+=		http://cloud.github.com/downloads/dcantrell/ldap-for-dhcp/:ldap
 LDAPPATCHRELEASE=	2
-LDAPPATCHDIST=		ldap-for-dhcp-${PORTVERSION:S/.${PATCHLEVEL:L}$//}-${LDAPPATCHRELEASE}
-LDAPPATCHFILE=		dhcp-${PORTVERSION:S/.${PATCHLEVEL:L}$//}-ldap.patch
+LDAPPATCHDIST=		ldap-for-dhcp-4.1.1-${LDAPPATCHRELEASE}
+LDAPPATCHFILE=		dhcp-4.1.1-ldap.patch
 DISTFILES+=		${LDAPPATCHDIST}.tar.gz:ldap
 PLIST_SUB+=		SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" LDAP=""
 PORTDOCS+=		README.ldap LICENSE.ldap
diff --git a/net/isc-dhcp41-server/distinfo b/net/isc-dhcp41-server/distinfo
index 71d20166b201..a2a1f42b2de5 100644
--- a/net/isc-dhcp41-server/distinfo
+++ b/net/isc-dhcp41-server/distinfo
@@ -1,6 +1,4 @@
-MD5 (dhcp-4.1.1-P1.tar.gz) = ee390a35687dd75dbfc32c856c0938d1
-SHA256 (dhcp-4.1.1-P1.tar.gz) = 2f640350cbb1966ec3090198c3f128d649a3655f747f96ce910a477fe63263da
-SIZE (dhcp-4.1.1-P1.tar.gz) = 1085414
-MD5 (ldap-for-dhcp-4.1.1-2.tar.gz) = 9fa2f64826c969a55fd28263e4b6cad6
+SHA256 (dhcp-4.1.2.tar.gz) = 82e0f6627a91990870fddac1a1e8e1e076ddf20981cd03d396199f182a714e29
+SIZE (dhcp-4.1.2.tar.gz) = 1092220
 SHA256 (ldap-for-dhcp-4.1.1-2.tar.gz) = 566b7be2ebefdc583d0bf0095c804ba69807b67e5cc29a2b64b1b39202b37d0d
 SIZE (ldap-for-dhcp-4.1.1-2.tar.gz) = 39004
diff --git a/net/isc-dhcp41-server/files/patch-client__Makefile.in b/net/isc-dhcp41-server/files/patch-client__Makefile.in
index cb02e370fe5d..77d7639365d1 100644
--- a/net/isc-dhcp41-server/files/patch-client__Makefile.in
+++ b/net/isc-dhcp41-server/files/patch-client__Makefile.in
@@ -1,6 +1,6 @@
---- client/Makefile.in.orig	2010-01-07 19:47:06.000000000 -0500
-+++ client/Makefile.in	2010-05-29 17:24:48.814048529 -0400
-@@ -351,8 +351,8 @@
+--- client/Makefile.in.orig	2010-11-24 13:58:02.077206326 -0500
++++ client/Makefile.in	2010-11-24 13:59:01.452202855 -0500
+@@ -354,8 +354,8 @@
  	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  	  f=$(am__strip_dir) \
@@ -11,17 +11,3 @@
  	done
  
  uninstall-dist_sysconfDATA:
-@@ -537,11 +537,11 @@
- 
- 
- dhclient.o: dhclient.c
--	$(COMPILE) -DCLIENT_PATH='"$(sbindir)"' \
-+	$(COMPILE) -DCLIENT_PATH='"PATH=/sbin:/usr/sbin:$(sbindir)"' \
- 		   -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c
- 
- dhc6.o: dhc6.c
--	$(COMPILE) -DCLIENT_PATH='"$(sbindir)"' \
-+	$(COMPILE) -DCLIENT_PATH='"PATH=/sbin:/usr/sbin:$(sbindir)"' \
- 		   -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.