diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
index ee4cc584e6d1..0c753b8cb130 100644
--- a/net/isc-dhcp41-server/Makefile
+++ b/net/isc-dhcp41-server/Makefile
@@ -1,188 +1,193 @@
 # $FreeBSD$
 
 PORTNAME=	dhcp
 DISTVERSION=	4.1-ESV
 PORTREVISION=	${DHCP_PORTREVISION}
 PORTEPOCH=	2
 CATEGORIES=	net
 MASTER_SITES=	ISC/${PORTNAME}/${DISTVERSION}-${PATCHLEVEL}
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	41-${SUBSYS}
 DISTFILES=	${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}${EXTRACT_SUFX}
 
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT?=	The ISC Dynamic Host Configuration Protocol server
 
 LICENSE=	ISCL
 
-PATCHLEVEL=	R7
-PORTREVISION_SERVER=	9
-PORTREVISION_CLIENT=	2
-PORTREVISION_RELAY=	5
+PATCHLEVEL=	R12-P1
+PORTREVISION_SERVER=	10
+PORTREVISION_CLIENT=	3
+PORTREVISION_RELAY=	6
+
+DEPRECATED=	isc-dhcp 4.1 is now End of Life
+EXPIRES=	2016-03-01
 
 SUBSYS?=	server
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
 
 OPTIONS_DEFINE=	IPV6
 OPTIONS_DEFAULT=IPV6
 
 .if ${SUBSYS} == server
 OPTIONS_DEFINE+=	PARANOIA LDAP LDAP_SSL
 OPTIONS_DEFAULT+=	PARANOIA LDAP_SSL
 PARANOIA_DESC=	Enable support for chroot
 LDAP_SSL_DESC=	Support LDAP over SSL/TLS
 .endif
 
 # PORTREVISION and CONFLICTS handling
 .if ${SUBSYS} == client
 CONFLICTS=	isc-dhcp3?-client* isc-dhcp4[2-9]-client*
 DHCP_PORTREVISION=	${PORTREVISION_CLIENT}
 .elif ${SUBSYS} == relay
 CONFLICTS=	isc-dhcp3?-relay* isc-dhcp4[2-9]-relay*
 DHCP_PORTREVISION=	${PORTREVISION_RELAY}
 .else
 CONFLICTS=	isc-dhcp3?-server* isc-dhcp4[2-9]-server*
 DHCP_PORTREVISION=	${PORTREVISION_SERVER}
 .endif
 
 .if ${SUBSYS} == server
 USERS=		dhcpd
 GROUPS=		dhcpd
 .endif
 
 MAN_COMPRESSED=	no
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-D_PATH_DHCLIENT_SCRIPT='\"${PREFIX}/sbin/dhclient-script\"' -D_PATH_DHCLIENT_CONF='\"${PREFIX}/etc/dhclient.conf\"' -D_PATH_DHCPD_CONF='\"${PREFIX}/etc/dhcpd.conf\"'
 SCRIPTS_ENV+=	PKG_PREFIX=${PREFIX}
 
 .include <bsd.port.options.mk>
 
 .if ${SUBSYS} == server
 CONFIGURE_ARGS+=	--localstatedir=/var
 CFLAGS+=	-fPIC
 .endif
 
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 .if ${SUBSYS} == server
 USE_RC_SUBR=	isc-dhcpd
 .elif ${SUBSYS} == relay
 USE_RC_SUBR=	isc-dhcrelay
 .endif
 
 SCHEMA_DIR=	${PREFIX}/share/${PKGBASE}
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 DATADIR=	/var/db
 
 MSG_FILE=	${.CURDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 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 ${PORT_OPTIONS:MLDAP}
 MASTER_SITES+=		http://cloud.github.com/downloads/dcantrell/ldap-for-dhcp/:ldap
 LDAPPATCHRELEASE=	2
 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
 LDAP_SCRIPT=		${WRKDIR}/${LDAPPATCHDIST}/dhcpd-conf-to-ldap
 LDAP_SCHEMA=		${WRKDIR}/${LDAPPATCHDIST}/dhcp.schema
 USES+=			autoreconf perl5
 USE_PERL5=		run
 USE_OPENLDAP=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 LIBS+=			-L${LOCALBASE}/lib
 LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-ldap
 .else
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
 # WITH_DHCP_LDAP_SSL without WITH_DHCP_LDAP is silly.
 .if ${PORT_OPTIONS:MLDAP_SSL} && ${PORT_OPTIONS:MLDAP}
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-ldapcrypto
 LIBS+=		-lssl
 # hack to get bsd.openssl.mk included at this late state
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .endif
 
 .if ${PORT_OPTIONS:MPARANOIA}
 CONFIGURE_ARGS+=	--enable-paranoia --enable-early-chroot
 SUB_LIST+=		PARANOIA="yes"
 .else
 SUB_LIST+=		PARANOIA="no"
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-dhcpv6
 PLIST_SUB+=		IPV6=""
 .else
 CONFIGURE_ARGS+=	--disable-dhcpv6
 PLIST_SUB+=		IPV6="@comment "
 .endif
 
 pre-patch:
 .if ${SUBSYS} == server && ${PORT_OPTIONS:MLDAP}
 	@${PATCH} ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE} ${FILESDIR}/extra-patch-${LDAPPATCHFILE}
 	@cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE}
 .endif
 
 post-patch:
 	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${MSG_FILE} > ${PKGMESSAGE}
 	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${WRKSRC}/client/dhclient.conf
+		${WRKSRC}/client/dhclient.conf.example
 
 do-install:
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/${SUBSYS} install
 .if ${SUBSYS} == server
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/dhcpctl install
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/dst install
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/omapip install
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/includes install
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/common install
 	${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${STAGEDIR}${PREFIX}/include
 .if ${PORT_OPTIONS:MIPV6}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \
 		${STAGEDIR}${PREFIX}/etc/dhcpd6.conf.sample
 .endif
 .endif
 .if ${PORT_OPTIONS:MLDAP}
 	@${MKDIR} ${STAGEDIR}${SCHEMA_DIR}
 	${INSTALL_DATA} ${LDAP_SCHEMA} ${STAGEDIR}${SCHEMA_DIR}
 	${INSTALL_SCRIPT} ${LDAP_SCRIPT} ${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MLDAP}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKDIR}/${LDAPPATCHDIST}/README.ldap  ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKDIR}/${LDAPPATCHDIST}/LICENSE.ldap ${STAGEDIR}${DOCSDIR}
 .endif
 
 post-install:
 .if ${SUBSYS} == client
 	${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${STAGEDIR}${PREFIX}/sbin/dhclient-script
+	${MV} ${STAGEDIR}${PREFIX}/etc/dhclient.conf.example ${STAGEDIR}${PREFIX}/etc/dhclient.conf.sample
 .elif ${SUBSYS} == server
+	${MV} ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.example ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.sample
 .if ${PORT_OPTIONS:MIPV6}
 	@${LN} -sf isc-dhcpd ${STAGEDIR}${PREFIX}/etc/rc.d/isc-dhcpd6
 .endif
 .elif ${SUBSYS} == relay
 .if ${PORT_OPTIONS:MIPV6}
 	@${LN} -sf isc-dhcrelay ${STAGEDIR}${PREFIX}/etc/rc.d/isc-dhcrelay6
 .endif
 .endif
 	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${MSG_FILE} > ${PKGMESSAGE}
 .if ${PORT_OPTIONS:MLDAP}
 	@${REINPLACE_CMD} -e 's|^%%LDAP%%||g' ${PKGMESSAGE}
 .else
 	@${REINPLACE_CMD} -e '/^%%LDAP%%/d' ${PKGMESSAGE}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/isc-dhcp41-server/distinfo b/net/isc-dhcp41-server/distinfo
index 814bdcf0e02c..42d29c7084fa 100644
--- a/net/isc-dhcp41-server/distinfo
+++ b/net/isc-dhcp41-server/distinfo
@@ -1,4 +1,2 @@
-SHA256 (dhcp-4.1-ESV-R7.tar.gz) = 25d579291a13ccce39c5dbb0e2f2ce8e974c82015bc4e3ee653cf95a4ed15ca4
-SIZE (dhcp-4.1-ESV-R7.tar.gz) = 1162002
-SHA256 (ldap-for-dhcp-4.1.1-2.tar.gz) = 566b7be2ebefdc583d0bf0095c804ba69807b67e5cc29a2b64b1b39202b37d0d
-SIZE (ldap-for-dhcp-4.1.1-2.tar.gz) = 39004
+SHA256 (dhcp-4.1-ESV-R12-P1.tar.gz) = d46af9ce8fb19b797d7bd3d8542a05353522bae8d77231eb07736af0007feb62
+SIZE (dhcp-4.1-ESV-R12-P1.tar.gz) = 1252652
diff --git a/net/isc-dhcp41-server/files/patch-client__Makefile.in b/net/isc-dhcp41-server/files/patch-client__Makefile.in
deleted file mode 100644
index 77d7639365d1..000000000000
--- a/net/isc-dhcp41-server/files/patch-client__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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) \
--	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f.sample'"; \
-+	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \
- 	done
- 
- uninstall-dist_sysconfDATA:
diff --git a/net/isc-dhcp41-server/files/patch-client__dhclient.conf b/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example
similarity index 57%
rename from net/isc-dhcp41-server/files/patch-client__dhclient.conf
rename to net/isc-dhcp41-server/files/patch-client_dhclient.conf.example
index 163beaee6394..5caeb53b8e0c 100644
--- a/net/isc-dhcp41-server/files/patch-client__dhclient.conf
+++ b/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example
@@ -1,11 +1,11 @@
---- ./client/dhclient.conf.orig	2010-05-02 20:39:06.000000000 -0400
-+++ ./client/dhclient.conf	2010-05-02 20:39:16.000000000 -0400
-@@ -11,7 +11,7 @@
+--- client/dhclient.conf.example.orig	2016-01-17 18:48:11 UTC
++++ client/dhclient.conf.example
+@@ -11,7 +11,7 @@ retry 60;
  reboot 10;
  select-timeout 5;
  initial-interval 2;
 -script "/etc/dhclient-script";
 +script "%%PREFIX%%/sbin/dhclient-script";
  media "-link0 -link1 -link2", "link0 link1";
  reject 192.33.137.209;
  
diff --git a/net/isc-dhcp41-server/files/patch-server__Makefile.am b/net/isc-dhcp41-server/files/patch-server__Makefile.am
deleted file mode 100644
index d92124b72909..000000000000
--- a/net/isc-dhcp41-server/files/patch-server__Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
---- server/Makefile.am.orig	2010-10-24 11:42:38.419499721 -0400
-+++ server/Makefile.am	2010-10-24 11:44:01.489499357 -0400
-@@ -1,6 +1,7 @@
- AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
- 
- dist_sysconf_DATA = dhcpd.conf
-+dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
- sbin_PROGRAMS = dhcpd
- dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
- 		omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
-@@ -13,3 +14,12 @@
- man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
- EXTRA_DIST = $(man_MANS)
- 
-+install-dist_sysconfDATA: $(dist_sysconf_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-+	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
-+	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+		$(am__strip_dir) \
-+		echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f.sample'"; \
-+		$(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \
-+	done
diff --git a/net/isc-dhcp41-server/files/patch-server__Makefile.in b/net/isc-dhcp41-server/files/patch-server__Makefile.in
deleted file mode 100644
index 6ae828933da5..000000000000
--- a/net/isc-dhcp41-server/files/patch-server__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./server/Makefile.in.orig	2010-01-07 19:47:06.000000000 -0500
-+++ ./server/Makefile.in	2010-05-02 20:38:26.000000000 -0400
-@@ -370,8 +370,8 @@
- 	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f.sample'"; \
-+	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \
- 	done
- 
- uninstall-dist_sysconfDATA:
diff --git a/net/isc-dhcp41-server/files/patch-server__bpf.c b/net/isc-dhcp41-server/files/patch-server__bpf.c
deleted file mode 100644
index 8bf85e902537..000000000000
--- a/net/isc-dhcp41-server/files/patch-server__bpf.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/bpf.c.orig	2010-10-22 10:38:06.623559939 +0400
-+++ common/bpf.c	2010-10-22 10:38:26.436563986 +0400
-@@ -577,6 +577,7 @@
- 	 */
-         switch (sa->sdl_type) {
-                 case IFT_ETHER:
-+                case IFT_L2VLAN:
-                         hw->hlen = sa->sdl_alen + 1;
-                         hw->hbuf[0] = HTYPE_ETHER;
-                         memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);