Remove expired ports:

2016-06-01 net/omcmd: Unfetchable and depends on expired net/isc-dhcp41-server
2016-03-01 net/isc-dhcp41-server: isc-dhcp 4.1 is now End of Life

17 files changed, 2 insertions, 1008 deletions

diff --git a/MOVED b/MOVED
index 27b07c606bfa..fc0588ab670a 100644
--- a/MOVED
+++ b/MOVED
@@ -8334,3 +8334,5 @@ textproc/py-curator|textproc/py-elasticsearch-curator-py|2016-05-29|Follow exist
 databases/py-psycopg|databases/py-psycopg2|2016-05-29|Has expired: This port is obsoleted by databases/py-psycopg2.
 security/py-clamav|security/py-pyclamd|2016-05-30|Has expired: Not updated since 2008 by upstream and abandoned in favor of pyClamd (security/py-pyclamd)
 graphics/ruby-gdal||2016-05-31|Has expired: disabled by upstream (https://trac.osgeo.org/gdal/changeset/28756)
+net/omcmd||2016-06-01|Has expired: Unfetchable and depends on expired net/isc-dhcp41-server
+net/isc-dhcp41-server|net/isc-dhcp43-server|2016-06-01|Has expired: isc-dhcp 4.1 is now End of Life
diff --git a/net/Makefile b/net/Makefile
index 8108de577200..adca75e64dfa 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -261,7 +261,6 @@
     SUBDIR += ipxe
     SUBDIR += irrd
     SUBDIR += isboot-kmod
-    SUBDIR += isc-dhcp41-server
     SUBDIR += isc-dhcp43-client
     SUBDIR += isc-dhcp43-relay
     SUBDIR += isc-dhcp43-server
@@ -471,7 +470,6 @@
     SUBDIR += ocserv
     SUBDIR += ohphone
     SUBDIR += olsrd
-    SUBDIR += omcmd
     SUBDIR += omnitty
     SUBDIR += onenetd
     SUBDIR += onioncat
diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
deleted file mode 100644
index 8feb6051e511..000000000000
--- a/net/isc-dhcp41-server/Makefile
+++ /dev/null
@@ -1,192 +0,0 @@
-# $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=	R12-P1
-PORTREVISION_SERVER=	10
-PORTREVISION_CLIENT=	3
-PORTREVISION_RELAY=	6
-
-DEPRECATED=	isc-dhcp 4.1 is now End of Life
-EXPIRATION_DATE=	2016-03-01
-
-SUBSYS?=	server
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
-
-OPTIONS_DEFINE=	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.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
deleted file mode 100644
index 42d29c7084fa..000000000000
--- a/net/isc-dhcp41-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-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/extra-patch-dhcp-4.1.1-ldap.patch b/net/isc-dhcp41-server/files/extra-patch-dhcp-4.1.1-ldap.patch
deleted file mode 100644
index 1bcc2d136fb8..000000000000
--- a/net/isc-dhcp41-server/files/extra-patch-dhcp-4.1.1-ldap.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- dhcp-4.1.1-ldap.patch.orig	2010-02-16 09:15:45.000000000 -0800
-+++ dhcp-4.1.1-ldap.patch	2011-08-16 21:45:26.000000000 -0700
-@@ -2,10 +2,10 @@
- --- dhcp-4.1.1/common/conflex.c.ldap	2009-07-23 09:02:09.000000000 -1000
- +++ dhcp-4.1.1/common/conflex.c	2010-02-16 07:14:11.000000000 -1000
- @@ -43,6 +43,7 @@ static enum dhcp_token read_string PROTO
-- static enum dhcp_token read_number PROTO ((int, struct parse *));
-- static enum dhcp_token read_num_or_name PROTO ((int, struct parse *));
-- static enum dhcp_token intern PROTO ((char *, enum dhcp_token));
--+static int read_function PROTO ((struct parse *));
-+ static enum dhcp_token read_number (int, struct parse *);
-+ static enum dhcp_token read_num_or_name (int, struct parse *);
-+ static enum dhcp_token intern (char *, enum dhcp_token);
-++static int read_function (struct parse *);
-  
-  isc_result_t new_parse (cfile, file, inbuf, buflen, name, eolp)
-  	struct parse **cfile;
-@@ -243,10 +243,10 @@
-  char *quotify_string (const char *, const char *, int);
-  char *quotify_buf (const unsigned char *, unsigned, const char *, int);
-  char *print_base64 (const unsigned char *, unsigned, const char *, int);
---char *print_hw_addr PROTO ((int, int, unsigned char *));
--+char *print_hw_addr PROTO ((const int, const int, const unsigned char *));
-- void print_lease PROTO ((struct lease *));
-- void dump_raw PROTO ((const unsigned char *, unsigned));
-+-char *print_hw_addr (int, int, unsigned char *);
-++char *print_hw_addr (const int, const int, const unsigned char *);
-+ void print_lease (struct lease *);
-+ void dump_raw (const unsigned char *, unsigned);
-  void dump_packet_option (struct option_cache *, struct packet *,
- @@ -3234,6 +3290,20 @@ OMAPI_OBJECT_ALLOC_DECL (dhcp_failover_l
-  
diff --git a/net/isc-dhcp41-server/files/isc-dhcpd.in b/net/isc-dhcp41-server/files/isc-dhcpd.in
deleted file mode 100644
index 57cc0cf4dd1a..000000000000
--- a/net/isc-dhcp41-server/files/isc-dhcpd.in
+++ /dev/null
@@ -1,526 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dhcpd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable dhcpd:
-#
-# dhcpd_enable="YES"
-
-. /etc/rc.subr
-
-case $0 in
-/etc/rc*)
-	# during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
-	# so get the name of the script from $_file
-	name=$_file
-	;;
-*)
-	name=$0
-	;;
-esac
-
-name=${name##*/isc-}
-paranoia=%%PARANOIA%%				# compiled in paranoia?
-
-load_rc_config ${name}
-
-# override these variables in /etc/rc.conf
-eval ": \${${name}_enable:=\"NO\"}"
-# dhcpd_flags=""		# -q -early_chroot	# command option(s)
-# dhcpd_ifaces=""					# ethernet interface(s)
-eval ": \${${name}_conf:=%%PREFIX%%/etc/${name}.conf}"	# configuration file
-eval ": \${${name}_withumask:=022}"			# file creation mask
-
-eval ": \${${name}_chuser_enable:=\"%%PARANOIA%%\"}"	# runs w/o privileges?
-eval ": \${${name}_withuser:=dhcpd}"			# user name to run as
-eval ": \${${name}_withgroup:=dhcpd}"			# group name to run as
-
-eval ": \${${name}_chroot_enable:=\"NO\"}"		# runs chrooted?
-eval ": \${${name}_devfs_enable:=\"YES\"}"		# devfs if available?
-eval ": \${${name}_rootdir:=/var/db/${name}}"		# directory to run in
-# dhcpd_includedir=""			# directory for included config files
-
-safe_run ()	# rc command [args...]
-{
-	local _rc
-
-	_rc=$1
-	shift
-
-	if [ "${_rc}" -eq 0 ]; then
-		debug safe_run: "$@"
-		"$@" || _rc=1
-	else
-		warn safe_run: "$@"
-	fi
-	return ${_rc}
-}
-
-precious ()	# entry...
-{
-	local _entry _rc
-
-	_rc=0
-	for _entry; do
-		# do nothing if /dev, /var/run or /var/db
-		echo ${_entry} | egrep -q '^//*(dev|var//*(run|db))?/*$' || _rc=1
-	done
-	debug precious: "$@" rc=${_rc}
-	return ${_rc}
-}
-
-lsmod ()	# user group file...
-{
-	local _entry _user _group _rc
-
-	_user=$1 _group=$2
-	shift 2
-
-	_rc=0
-	for _entry; do
-		ls -ld ${_entry} 2> /dev/null |
-		awk -v u=${_user} -v g=${_group} '{
-		    exit ((u && $3 != u) || (g && $4 != g))
-		}' || _rc=1
-	done
-	debug lsmod: "$@" rc=${_rc}
-	return ${_rc}
-}
-
-safe_chmog ()	# entry...
-{
-	local _entry _user _group _usergroup _rc
-
-	eval "_user=\${${name}_withuser}"
-	eval "_group=\${${name}_withgroup}"
-
-	_rc=0
-	if [ -n "${_user}" -o -n "${_group}" ]; then
-		_usergroup=${_user}${_group:+:${_group}}
-		for _entry; do
-			if [ -d ${_entry} ] && mounted ${_entry}; then
-				continue
-			fi
-			if [ -e ${_entry} ] &&
-			   ! precious ${_entry} &&
-			   ! lsmod ${_user} ${_group} ${_entry} &&
-			   ! safe_run ${_rc} chown ${_usergroup} ${_entry}; then
-				warn "unable to change permissions of ${_entry}"
-				_rc=1
-			fi
-		done
-	fi
-	return ${_rc}
-}
-
-safe_mkdir ()	# dir...
-{
-	local _dir _rc
-
-	_rc=0
-	for _dir; do
-		if [ ! -d ${_dir} ] &&
-		   ! precious ${_dir} &&
-		   ! safe_run ${_rc} mkdir -p ${_dir}; then
-			err 1 "unable to create directory ${_dir}"
-			_rc=1
-		fi
-	done
-	safe_run ${_rc} safe_chmog "$@" || _rc=1
-	return ${_rc}
-}
-
-safe_rmdir ()	# dir...
-{
-	local _dir _rc
-
-	_rc=0
-	for _dir; do
-		if [ -d ${_dir} ] &&
-		   ! precious ${_dir} &&
-		   ! mounted ${_dir}; then
-			if safe_run ${_rc} rmdir ${_dir}; then
-				safe_run ${_rc} safe_rmdir ${_dir%/*} || _rc=1
-			else
-				warn "unable to remove directory ${_dir}"
-				_rc=1
-			fi
-		fi
-	done
-	return ${_rc}
-}
-
-safe_touch ()	# file...
-{
-	local _file _rc
-
-	_rc=0
-	for _file; do
-		if [ ! -e ${_file} ] &&
-		   ! safe_run ${_rc} touch ${_file}; then
-			err 1 "unable to create file ${_file}"
-			_rc=1
-		fi
-	done
-	safe_run ${_rc} safe_chmog "$@" || _rc=1
-	return ${_rc}
-}
-
-safe_remove ()	# entry...
-{
-	local _entry _rc
-
-	_rc=0
-	for _entry; do
-		if [ -f ${_entry} ]; then
-			if ! safe_run ${_rc} rm -f ${_entry}; then
-				warn "unable to remove file ${_entry}"
-				_rc=1
-			fi
-		elif [ -d ${_entry} ] &&
-		     ! precious ${_entry} &&
-		     ! mounted ${_entry}; then
-			if ! safe_run ${_rc} rm -rf ${_entry}; then
-				warn "unable to remove directory ${_entry}"
-				_rc=1
-			fi
-		fi
-	done
-	return ${_rc}
-}
-
-safe_copy ()	# src dst
-{
-	local _src _dst _rc
-
-	_src=$1 _dst=$2
-
-	_rc=0
-	if [ -f ${_src} ]; then
-		if ! safe_run ${_rc} safe_remove ${_dst} ||
-		   ! safe_run ${_rc} cp -p ${_src} ${_dst}; then
-			err 1 "unable to copy file ${_src} to ${_dst}"
-			_rc=1
-		fi
-		safe_run ${_rc} safe_chmog ${_dst} || _rc=1
-	elif [ -d ${_src} ] &&
-	     ! precious ${_dst} &&
-	     ! mounted ${_dst}; then
-		if ! safe_run ${_rc} pax -rw -pe -ts "|^${_src}||" \
-		   ${_src} ${_dst}; then
-			err 1 "unable to copy directory ${_src} to ${_dst}"
-			_rc=1
-		fi
-	else
-		err 1 "unable to copy ${_src} to ${_dst}" \
-		      "-- not a file or a directory"
-		_rc=1
-	fi
-	return ${_rc}
-}
-
-mounted ()	# dir...
-{
-	local _rc
-
-	_rc=1
-	if checkyesno ${name}_devfs_enable; then
-		mount -t devfs | awk '
-		    BEGIN { n = ARGC; ARGC = 2 }
-		    { for (i = 2; i != n; i++) if ($3 == ARGV[i]) exit 1 }
-		' - "$@" || _rc=0
-	fi
-	debug mounted: "$@" rc=${_rc}
-	return ${_rc}
-}
-
-safe_mount ()	# dir
-{
-	local _dir _rc
-
-	_dir=$1
-
-	_rc=0
-	if checkyesno ${name}_devfs_enable &&
-	   ! mounted ${_dir} &&
-	   ! safe_run ${_rc} mount -t devfs devfs ${_dir}; then
-		err 1 "unable to mount ${_dir}"
-		_rc=1
-	fi
-	return ${_rc}
-}
-
-safe_umount ()	# dir
-{
-	local _dir _rc
-
-	_dir=$1
-
-	_rc=0
-	if checkyesno ${name}_devfs_enable &&
-	   mounted ${_dir} &&
-	   ! safe_run ${_rc} umount ${_dir}; then
-		warn "unable to unmount ${_dir}"
-		_rc=1
-	fi
-	return ${_rc}
-}
-
-check_chuser ()
-{
-	if checkyesno paranoia; then
-		if checkyesno ${name}_chuser_enable &&
-		   eval "[ -z \"\${${name}_withuser}\" -a -z \"\${${name}_withgroup}\" ]"; then
-			err 1 "one of ${name}_withuser and ${name}_withgroup" \
-			      "must be set if ${name}_chuser_enable is enabled"
-		fi
-	else
-		if checkyesno ${name}_chuser_enable; then
-			warn "${name}_chuser_enable disabled -- not compiled in"
-			eval "${name}_chuser_enable=NO"
-		fi
-	fi
-}
-
-check_chroot ()
-{
-	if checkyesno paranoia; then
-		if checkyesno ${name}_chroot_enable; then
-			if eval "[ -z \"\${${name}_rootdir}\" ]"; then
-				err 1 "${name}_rootdir must be set" \
-				      "if ${name}_chroot_enable is enabled"
-			fi
-		else
-			eval "${name}_devfs_enable=NO"
-		fi
-	else
-		if checkyesno ${name}_chroot_enable; then
-			warn "${name}_chroot_enable disabled -- not compiled in"
-			eval "${name}_chroot_enable=NO"
-		fi
-		eval "${name}_devfs_enable=NO"
-	fi
-}
-
-rcvar_chuser ()
-{
-	if checkyesno paranoia && checkyesno ${name}_chuser_enable; then
-		eval "${name}_piddir=\${__dhcpd_piddir}/\${name}"
-		eval "${name}_leasesdir=\${__dhcpd_leasesdir}/\${name}"
-	else
-		eval unset "${name}_withuser= ${name}_withgroup="
-	fi
-}
-
-rcvar_chroot ()
-{
-	if ! checkyesno paranoia || ! checkyesno ${name}_chroot_enable; then
-		eval "${name}_rootdir="
-	elif checkyesno paranoia && checkyesno ${name}_chroot_enable; then
-		eval "${name}_devdir=\${__dhcpd_devdir}"
-		eval "${name}_etcdir=\${__dhcpd_etcdir}"
-	fi
-}
-
-rcvar_pidnleases ()
-{
-	if ! checkyesno ${name}_chuser_enable; then
-		eval "${name}_piddir=\${__dhcpd_piddir}"
-		eval "${name}_leasesdir=\${__dhcpd_leasesdir}"
-	fi
-	eval "${name}_pidfile=\${${name}_piddir}/\${name}.pid"
-	eval "${name}_leasesfile=\${${name}_leasesdir}/\${name}.leases"
-	eval "${name}_conffile=\${${name}_conf}"	# for convenience only
-	eval "${name}_confdir=\$(dirname \${${name}_conffile})"
-}
-
-rcvar_rooted ()
-{
-	eval "_dhcpd_rootdir=\${${name}_rootdir}"
-	eval "_dhcpd_devdir=\${${name}_rootdir}\${${name}_devdir}"
-	eval "_dhcpd_etcdir=\${${name}_rootdir}\${${name}_etcdir}"
-	eval "_dhcpd_confdir=\${${name}_rootdir}\${${name}_confdir}"
-	eval "_dhcpd_includedir=\${${name}_rootdir}\${${name}_includedir}"
-	eval "_dhcpd_piddir=\${${name}_rootdir}\${${name}_piddir}"
-	eval "_dhcpd_leasesdir=\${${name}_rootdir}\${${name}_leasesdir}"
-	eval "_dhcpd_conffile=\${${name}_rootdir}\${${name}_conffile}"
-	eval "_dhcpd_pidfile=\${${name}_rootdir}\${${name}_pidfile}"
-	eval "_dhcpd_leasesfile=\${${name}_rootdir}\${${name}_leasesfile}"
-}
-
-setup_umask ()
-{
-	if eval "[ -n \"\${${name}_withumask}\" ]"; then
-		eval "umask \${${name}_withumask}"
-	fi
-}
-
-setup_chroot ()
-{
-	local _hconf _hosts _ltime _rconf
-
-	_hconf=host.conf
-	_hosts=hosts
-	_ltime=localtime
-	_rconf=resolv.conf
-
-	if checkyesno paranoia && checkyesno ${name}_chroot_enable; then
-		if ! mounted ${_dhcpd_devdir}; then
-			safe_mkdir ${_dhcpd_devdir}/_
-			# XXX /_ hack! so, .../dev is root owned.
-		fi
-		safe_mkdir ${_dhcpd_rootdir} ${_dhcpd_etcdir}/_ ${_dhcpd_confdir}
-		# XXX /_ hack! so, .../etc is root owned.
-		if checkyesno ${name}_devfs_enable; then
-			safe_mount ${_dhcpd_devdir}
-		else
-			eval "safe_copy \${${name}_devdir} \${_dhcpd_devdir}"
-		fi
-		eval "safe_copy \${${name}_conffile} \${_dhcpd_conffile}"
-		eval "safe_copy \${${name}_etcdir}/\$_hconf \${_dhcpd_etcdir}/\$_hconf"
-		eval "safe_copy \${${name}_etcdir}/\$_hosts \${_dhcpd_etcdir}/\$_hosts"
-		# copy localtime only if it exists
-		if eval "[ -f \"\${${name}_etcdir}/\$_ltime\" ]"; then
-			eval "safe_copy \${${name}_etcdir}/\$_ltime \${_dhcpd_etcdir}/\$_ltime"
-		fi
-		eval "safe_copy \${${name}_etcdir}/\$_rconf \${_dhcpd_etcdir}/\$_rconf"
-		# copy dhcpd_includedir if defined and available
-		if eval "[ -d \"\${${name}_includedir}\" ]"; then
-			safe_mkdir ${_dhcpd_includedir}
-			eval "safe_copy \${${name}_includedir} \${_dhcpd_includedir}"
-		fi
-	fi
-}
-
-setup_chuser ()
-{
-	if checkyesno paranoia && {
-	   checkyesno ${name}_chuser_enable || checkyesno ${name}_chroot_enable
-	}; then
-		safe_mkdir ${_dhcpd_piddir} ${_dhcpd_leasesdir}
-	fi
-}
-
-setup_leases ()
-{
-	safe_touch ${_dhcpd_leasesfile}
-}
-
-setup_flags ()
-{
-	if [ "${name}" = "dhcpd6" ]; then
-		rc_flags="${rc_flags} -6"
-	fi
-	if eval "[ -n \"\${${name}_conf}\" ]"; then
-		eval "rc_flags=\"\${rc_flags} -cf \${${name}_conf}\""
-	fi
-	if eval "[ -n \"\${${name}_leasesfile}\" ]"; then
-		eval "rc_flags=\"\${rc_flags} -lf \${${name}_leasesfile}\""
-	fi
-	if eval "[ -n \"\${${name}_pidfile}\" ]"; then
-		eval "rc_flags=\"\${rc_flags} -pf \${${name}_pidfile}\""
-	fi
-	if eval "[ -n \"\${${name}_withuser}\" ]"; then
-		eval "rc_flags=\"\${rc_flags} -user \${${name}_withuser}\""
-	fi
-	if eval "[ -n \"\${${name}_withgroup}\" ]"; then
-		eval "rc_flags=\"\${rc_flags} -group \${${name}_withgroup}\""
-	fi
-	if eval "[ -n \"\${${name}_rootdir}\" ]"; then
-		eval "rc_flags=\"\${rc_flags} -chroot \${${name}_rootdir}\""
-	fi
-	eval "rc_flags=\"\${rc_flags} \${${name}_ifaces}\""
-}
-
-cleanup_chroot ()
-{
-	if checkyesno paranoia && checkyesno ${name}_chroot_enable; then
-		safe_umount ${_dhcpd_devdir}
-	fi
-}
-
-dhcpd_stop ()
-{
-	if sh $0 forcestatus; then
-		sh $0 forcestop
-	fi
-}
-
-dhcpd_check ()
-{
-	check_chuser
-	check_chroot
-}
-
-dhcpd_rcvar ()
-{
-	rcvar_chuser
-	rcvar_chroot
-	rcvar_pidnleases
-	rcvar_rooted
-}
-
-dhcpd_precmd ()
-{
-	setup_umask
-	setup_chroot
-	setup_chuser
-	setup_leases
-	setup_flags
-}
-
-dhcpd_postcmd ()
-{
-	cleanup_chroot
-}
-
-dhcpd_restartprecmd ()
-{
-	setup_chroot
-	setup_flags
-	dhcpd_checkconfig
-}
-
-dhcpd_checkconfig ()
-{
-        local rc_flags_mod
-        setup_flags
-	rc_flags_mod="$rc_flags"
-        # Eliminate '-q' flag if it is present
-	case "$rc_flags" in
-	*-q*)	rc_flags_mod=`echo "${rc_flags}" | sed -Ee 's/(^-q | -q | -q$)//'` ;;
-	esac
-        if ! ${command} -t -q ${rc_flags_mod}; then
-                err 1 "`${command} -t ${rc_flags_mod}` Configuration file sanity check failed"
-        fi
-}
-
-rcvar=${name}_enable
-load_rc_config ${name}
-
-__dhcpd_uninstall="NO"			# internal use only
-__dhcpd_devdir=/dev			# devices directory
-__dhcpd_etcdir=/etc			# etc directory
-__dhcpd_piddir=/var/run			# pid file directory
-__dhcpd_leasesdir=/var/db		# leases file directory
-#__dhcpd_rootdir=/var/db/${name}	# root directory
-
-dhcpd_check
-dhcpd_rcvar
-
-command=%%PREFIX%%/sbin/dhcpd
-pidfile=${_dhcpd_pidfile}
-eval "required_files=\${${name}_conf}"
-start_precmd=dhcpd_precmd
-stop_postcmd=dhcpd_postcmd
-restart_precmd="dhcpd_restartprecmd"
-uninstall_cmd=dhcpd_uninstall
-configtest_cmd="dhcpd_restartprecmd"
-extra_commands="uninstall configtest"
-
-run_rc_command "$1"
diff --git a/net/isc-dhcp41-server/files/isc-dhcrelay.in b/net/isc-dhcp41-server/files/isc-dhcrelay.in
deleted file mode 100644
index 4bba50a44c7e..000000000000
--- a/net/isc-dhcp41-server/files/isc-dhcrelay.in
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp41-server/files/isc-dhcrelay.in,v 1.5 2012-04-18 17:55:19 zi Exp $
-#
-# PROVIDE: dhcrelay
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable dhcrelay:
-#
-# dhcrelay_enable="YES"
-#
-
-# override these variables in /etc/rc.conf
-dhcrelay_enable=${dhcrelay_enable:-"NO"}
-dhcrelay6_enable=${dhcrelay6_enable:-"NO"}
-# dhcrelay_flags=""			# command option(s)
-# dhcrelay_servers=""			# v4 dhcrelay server(s)
-# dhcrelay_ifaces=""			# v4 ethernet interface(s)
-# dhcrelay6_lowers=""			# v6 "lower" network interface(s)
-# dhcrelay6_uppers=""			# v6 "upper" network interface(s)
-
-
-case $0 in
-/etc/rc*)
-	# during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
-	# so get the name of the script from $_file
-	name=$_file
-	;;
-*)
-	name=$0
-	;;
-esac
-
-name=${name##*/isc-}
-
-case ${name} in
-*6)
-	ipversion=-6
-	;;
-*)
-	ipversion=-4
-	;;
-esac
-
-dhcrelay_precmd ()
-{
-	local ifaces _servers _ifaces
-
-	eval "_servers=\${${name}_servers}"
-	eval "_ifaces=\${${name}_ifaces}"
-
-	if [ -z "${_servers}" ]; then
-		err 1 "no ${name} server(s) configured."
-	fi
-
-	ifaces=
-	for iface in ${_ifaces}; do
-		ifaces="${ifaces} -i ${iface}"
-	done
-
-	rc_flags="${rc_flags} ${ipversion} ${ifaces} ${_servers}"
-}
-
-dhcrelay6_precmd ()
-{
-	local lowers _lowers uppers _uppers
-
-	eval "_lowers=\${${name}_lowers}"
-	eval "_uppers=\${${name}_uppers}"
-
-	if [ -z "${_lowers}" ]; then
-		err 1 "no ${name} lower(s) configured."
-	fi
-
-	if [ -z "${_uppers}" ]; then
-		err 1 "no ${name} upper(s) configured."
-	fi
-
-	lowers=
-	for lower in ${_lowers}; do
-		lowers="${lowers} -l ${lower}"
-	done
-
-	uppers=
-	for upper in ${_uppers}; do
-		uppers="${uppers} -u ${upper}"
-	done
-
-	rc_flags="${rc_flags} ${ipversion} ${lowers} ${uppers}"
-}
-
-. /etc/rc.subr
-
-rcvar=${name}_enable
-
-command=%%PREFIX%%/sbin/dhcrelay
-pidfile=/var/run/${name}.pid
-start_precmd=${name}_precmd
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example b/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example
deleted file mode 100644
index 5caeb53b8e0c..000000000000
--- a/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-descr b/net/isc-dhcp41-server/pkg-descr
deleted file mode 100644
index e0974d75614d..000000000000
--- a/net/isc-dhcp41-server/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server (this port)
-  * A DHCP client
-  * A DHCP relay agent
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp41-server/pkg-message b/net/isc-dhcp41-server/pkg-message
deleted file mode 100644
index ccfead6a5cb8..000000000000
--- a/net/isc-dhcp41-server/pkg-message
+++ /dev/null
@@ -1,30 +0,0 @@
-****  To setup dhcpd, please edit %%PREFIX%%/etc/dhcpd.conf.
-
-****  This port installs dhcp daemon, but doesn't invoke dhcpd by default. If
-      you want to invoke dhcpd at startup, put these lines into /etc/rc.conf.
-
-	    dhcpd_enable="YES"				# dhcpd enabled?
-	    dhcpd_flags="-q"				# command option(s)
-	    dhcpd_conf="%%PREFIX%%/etc/dhcpd.conf"	# configuration file
-	    dhcpd_ifaces=""				# ethernet interface(s)
-	    dhcpd_withumask="022"			# file creation mask
-
-****  If compiled with paranoia support (the default), the following lines
-      are also supported:
-
-	    dhcpd_chuser_enable="YES"		# runs w/o privileges?
-	    dhcpd_withuser="dhcpd"		# user name to run as
-	    dhcpd_withgroup="dhcpd"		# group name to run as
-	    dhcpd_chroot_enable="YES"		# runs chrooted?
-	    dhcpd_devfs_enable="YES"		# use devfs if available?
-	    dhcpd_rootdir="/var/db/dhcpd"	# directory to run in
-	    dhcpd_includedir="<some_dir>"	# directory with config-
-						  files to include
-
-****  WARNING: never edit the chrooted or jailed dhcpd.conf file but
-      %%PREFIX%%/etc/dhcpd.conf instead which is always copied where
-      needed upon startup.
-
-****  WARNING: %%PREFIX%%/etc/rc.isc-dhcpd.conf is obsolete. rc.conf like
-      variables are no longer read from there. Also, the dhcpd_options
-      variable is obsolete. Use dhcpd_flags instead.
diff --git a/net/isc-dhcp41-server/pkg-plist b/net/isc-dhcp41-server/pkg-plist
deleted file mode 100644
index ec4d1dc99360..000000000000
--- a/net/isc-dhcp41-server/pkg-plist
+++ /dev/null
@@ -1,40 +0,0 @@
-@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
-%%IPV6%%@unexec %D/etc/rc.d/isc-dhcpd6 forcestop 2>/dev/null || true
-@sample etc/dhcpd.conf.sample
-%%IPV6%%@sample etc/dhcpd6.conf.sample
-%%IPV6%%etc/rc.d/isc-dhcpd6
-sbin/dhcpd
-bin/omshell
-%%LDAP%%bin/dhcpd-conf-to-ldap
-man/man1/omshell.1.gz
-man/man3/dhcpctl.3.gz
-man/man3/omapi.3.gz
-man/man5/dhcpd.conf.5.gz
-man/man5/dhcpd.leases.5.gz
-man/man5/dhcp-eval.5.gz
-man/man5/dhcp-options.5.gz
-man/man8/dhcpd.8.gz
-include/dhcpctl.h
-include/isc-dhcp/boolean.h
-include/isc-dhcp/dst.h
-include/isc-dhcp/int.h
-include/isc-dhcp/lang.h
-include/isc-dhcp/list.h
-include/isc-dhcp/result.h
-include/isc-dhcp/types.h
-include/isc-dhcp/string.h
-include/isc-dhcp/print.h
-include/isc-dhcp/commandline.h
-include/isc-dhcp/mem.h
-include/isc-dhcp/formatcheck.h
-include/omapip/alloc.h
-include/omapip/buffer.h
-include/omapip/omapip.h
-include/omapip/omapip_p.h
-include/omapip/hash.h
-include/omapip/trace.h
-include/omapip/convert.h
-lib/libdhcpctl.a
-lib/libomapi.a
-lib/libdst.a
-%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
diff --git a/net/omcmd/Makefile b/net/omcmd/Makefile
deleted file mode 100644
index 3bff3cb35fd5..000000000000
--- a/net/omcmd/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Pavel Volkov
-# $FreeBSD$
-
-PORTNAME=	omcmd
-PORTVERSION=	0.4.8
-CATEGORIES=	net
-MASTER_SITES=	http://people.bridgewater.edu/~dparsley/omcmd/
-
-MAINTAINER=	pavelivolkov@googlemail.com
-COMMENT=	CLI utility for performing OMAPI queries and updates on a ISC DHCP
-
-DEPRECATED=	Unfetchable and depends on expired net/isc-dhcp41-server
-EXPIRATION_DATE=2016-06-01
-
-BUILD_DEPENDS=	${LOCALBASE}/sbin/dhcpd:net/isc-dhcp41-server
-
-PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
-.include <bsd.port.mk>
diff --git a/net/omcmd/distinfo b/net/omcmd/distinfo
deleted file mode 100644
index a51cd924ca76..000000000000
--- a/net/omcmd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (omcmd-0.4.8.tar.gz) = eda03815bd6e21d7a6a789b3b407951839afb3a47dc34627c3aab4581bbe1622
-SIZE (omcmd-0.4.8.tar.gz) = 90174
diff --git a/net/omcmd/files/patch-Makefile b/net/omcmd/files/patch-Makefile
deleted file mode 100644
index 400d1e7823a5..000000000000
--- a/net/omcmd/files/patch-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	2010-07-05 14:25:42.000000000 +0400
-+++ Makefile	2010-07-05 14:31:08.000000000 +0400
-@@ -1,6 +1,6 @@
- objects = base64.o omfuncs.o
- #DEBUG=-g
--CFLAGS=$(DEBUG)
-+CFLAGS=$(DEBUG) -I/usr/local/include -L/usr/local/lib
- 
- all: omcmd
- 
diff --git a/net/omcmd/files/patch-base64.c b/net/omcmd/files/patch-base64.c
deleted file mode 100644
index 678f40300848..000000000000
--- a/net/omcmd/files/patch-base64.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- base64.c.orig	2010-07-05 14:55:31.000000000 +0400
-+++ base64.c	2010-07-05 14:56:37.000000000 +0400
-@@ -13,6 +13,7 @@
-  * Removed unneeded encode function. 2004-07-17 David L. Parsley
-  * parsley@linuxjedi.org
-  */
-+#include <sys/time.h>
- #include <ctype.h>
- #include "omcmd.h"
- 
diff --git a/net/omcmd/files/patch-omfuncs.c b/net/omcmd/files/patch-omfuncs.c
deleted file mode 100644
index d1358cee1633..000000000000
--- a/net/omcmd/files/patch-omfuncs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- omfuncs.c.orig	2010-07-05 14:29:11.000000000 +0400
-+++ omfuncs.c	2010-07-05 14:30:01.000000000 +0400
-@@ -6,6 +6,8 @@
- #include <time.h>
- #include <string.h>
- #include <stdarg.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
- #include <stdlib.h>
diff --git a/net/omcmd/pkg-descr b/net/omcmd/pkg-descr
deleted file mode 100644
index ca9ff2543cfa..000000000000
--- a/net/omcmd/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-omcmd is a CLI utility for performing OMAPI queries and updates on a
-running ISC DHCP server, such as adding a host entry or querying a lease.
-Unlike omshell, it is designed to be readily usable by shell scripts;
-it has simple one-shot commands and returns error codes.
-
-WWW: http://freshmeat.net/projects/omcmd