Remove the rest of isc-dhcp.

11 files changed, 1 insertions, 258 deletions

diff --git a/net/Makefile b/net/Makefile
index aabbce6494d..5bf6c8c6c2e 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.802 2010/02/11 19:00:47 jnemeth Exp $
+# $NetBSD: Makefile,v 1.803 2010/02/11 19:20:48 joerg Exp $
 #
 
 COMMENT=	Networking tools
@@ -178,7 +178,6 @@ SUBDIR+=	irrd
 SUBDIR+=	irrtoolset-nox11
 SUBDIR+=	irrtoolset5
 SUBDIR+=	isc-dhclient4
-#SUBDIR+=	isc-dhcp		# just pieces, no Makefile
 SUBDIR+=	isc-dhcp4
 SUBDIR+=	isc-dhcpd4
 SUBDIR+=	isc-dhcrelay4
diff --git a/net/isc-dhcp/Makefile.common b/net/isc-dhcp/Makefile.common
deleted file mode 100644
index d50a054c89c..00000000000
--- a/net/isc-dhcp/Makefile.common
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile.common,v 1.5 2009/07/16 18:29:49 adrianp Exp $
-#
-# used by net/isc-dhcp/Makefile
-# used by net/isc-dhcpd/Makefile
-# used by net/isc-dhclient/Makefile
-# used by net/isc-dhcrelay/Makefile
-
-DISTNAME=		dhcp-3.1.2p1
-PKGNAME=		${DISTNAME:S/dhcp/isc-dhcp-${COMPONENT}/}
-CATEGORIES=		net
-MASTER_SITES=		http://ftp.isc.org/isc/dhcp/ \
-			http://ftp.isc.org/isc/dhcp/dhcp-3.0-history/
-
-MAINTAINER=		adrianp@NetBSD.org
-HOMEPAGE=		http://www.isc.org/sw/dhcp/
-
-CONFLICTS+=		isc-dhcp-base-4.*{,nb*}
-
-.include "../../mk/bsd.prefs.mk"
-
-HAS_CONFIGURE=		yes
-DHCP_HOME?=		${VARBASE}/db/isc-dhcp
-DHCP_SYSLOG_LEVEL?=	1
-PKG_SYSCONFSUBDIR=	dhcp
-USE_TOOLS+=		nroff
-
-FILESDIR=		${.CURDIR}/../isc-dhcp/files
-PATCHDIR=		${.CURDIR}/../isc-dhcp/patches
-EGDIR=			${PREFIX}/share/examples/isc-dhcp-${COMPONENT}
-BUILD_DEFS+=		VARBASE DHCP_HOME DHCP_SYSLOG_LEVEL
-
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=       pre-configure
-SUBST_MESSAGE.conf=	Fixing configuration files.
-SUBST_FILES.conf=	includes/site.h site.conf
-SUBST_SED.conf=		-e 's|@@DHCP_SYSLOG_LEVEL@@|${DHCP_SYSLOG_LEVEL}|g'
-SUBST_SED.conf+=	-e 's|@@VARBASE@@|${VARBASE}|g'
-SUBST_SED.conf+=	-e 's|@@SYSCONFDIR@@|${PKG_SYSCONFDIR}|g'
-SUBST_SED.conf+=	-e 's|@@PREFIX@@|${PREFIX}|g'
-SUBST_SED.conf+=	-e 's|@@CC@@|${CC:Q}|g'
-SUBST_SED.conf+=	-e 's|@@CFLAGS@@|${CFLAGS:Q}|g'
-SUBST_SED.conf+=	-e 's|@@PKGMANDIR@@|${PKGMANDIR}|g'
-
-post-extract:
-	${CAT} ${FILESDIR}/site.h >> ${WRKSRC}/includes/site.h
-	${CAT} ${FILESDIR}/site.conf >> ${WRKSRC}/site.conf
-
-do-install:
-.	for d in ${SUBDIR}
-		cd ${WRKSRC}/work.`${WRKSRC}/configure --print-sysname`/${d} \
-			&& ${SETENV} ${MAKE_ENV} ${MAKE} install
-.	endfor
-
-.	for m in ${MAN_FILES}
-		${CHMOD} ${MANMODE} ${PREFIX}/${PKGMANDIR}/${m}
-.	endfor
diff --git a/net/isc-dhcp/buildlink3.mk b/net/isc-dhcp/buildlink3.mk
deleted file mode 100644
index d5680e30c18..00000000000
--- a/net/isc-dhcp/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:08 joerg Exp $
-
-BUILDLINK_TREE+=	isc-dhcp-base
-
-.if !defined(ISC_DHCP_BASE_BUILDLINK3_MK)
-ISC_DHCP_BASE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.isc-dhcp-base+=	isc-dhcp-base>=3.1.0<4
-BUILDLINK_PKGSRCDIR.isc-dhcp-base?=	../../net/isc-dhcp
-.endif # ISC_DHCP_BASE_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-isc-dhcp-base
diff --git a/net/isc-dhcp/files/isc_dhclient.sh b/net/isc-dhcp/files/isc_dhclient.sh
deleted file mode 100755
index f9c1d6c779c..00000000000
--- a/net/isc-dhcp/files/isc_dhclient.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: isc_dhclient.sh,v 1.3 2008/01/03 12:25:01 adrianp Exp $
-#
-
-# PROVIDE: dhclient
-# REQUIRE: network mountcritlocal
-# BEFORE:  NETWORKING
-#
-#	Note that there no syslog logging of dhclient messages at boot because
-#	dhclient needs to start before services that syslog depends upon do.
-#
-
-if [ -f /etc/rc.subr ]; then
-        . /etc/rc.subr
-fi
-
-name="dhclient"
-rcvar="isc_${name}"
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
-start_precmd="isc_dhclient_precmd"
-
-isc_dhclient_precmd()
-{
-	if [ ! -d @VARBASE@/run/isc-dhcp ]; then
-		@MKDIR@ @VARBASE@/run/isc-dhcp
-		@CHMOD@ 0770 @VARBASE@/run/isc-dhcp
-	fi
-}
-
-load_rc_config $rcvar
-run_rc_command "$1"
diff --git a/net/isc-dhcp/files/isc_dhcpd.sh b/net/isc-dhcp/files/isc_dhcpd.sh
deleted file mode 100755
index 83eb33cdec3..00000000000
--- a/net/isc-dhcp/files/isc_dhcpd.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: isc_dhcpd.sh,v 1.2 2007/12/30 12:30:52 adrianp Exp $
-#
-
-# PROVIDE: dhcpd
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-if [ -f /etc/rc.subr ]; then
-        . /etc/rc.subr
-fi
-
-name="dhcpd"
-rcvar="isc_${name}"
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-start_precmd="isc_dhcpd_precmd"
-
-isc_dhcpd_precmd()
-{
-	if [ ! -d @VARBASE@/run/isc-dhcp ]; then
-		@MKDIR@ @VARBASE@/run/isc-dhcp
-		@CHMOD@ 0770 @VARBASE@/run/isc-dhcp
-	fi
-
-	if [ ! -f @DHCP_HOME@/dhcpd.leases ]; then
-		@MKDIR@ @DHCP_HOME@
-		@TOUCH@ @DHCP_HOME@/dhcpd.leases
-		@CHMOD@ 0640 @DHCP_HOME@/dhcpd.leases
-	fi
-}
-
-load_rc_config $rcvar
-run_rc_command "$1"
diff --git a/net/isc-dhcp/files/isc_dhcrelay.sh b/net/isc-dhcp/files/isc_dhcrelay.sh
deleted file mode 100755
index 8bd8372b45b..00000000000
--- a/net/isc-dhcp/files/isc_dhcrelay.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: isc_dhcrelay.sh,v 1.3 2008/01/03 12:25:01 adrianp Exp $
-#
-
-# PROVIDE: dhcrelay
-# REQUIRE: DAEMON
-# BEFORE:  NETWORKING
-#
-#	Note that there no syslog logging of dhclient messages at boot because
-#	dhclient needs to start before services that syslog depends upon do.
-#
-
-if [ -f /etc/rc.subr ]; then
-        . /etc/rc.subr
-fi
-
-name="dhcrelay"
-rcvar="isc_${name}"
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
-start_precmd="isc_dhcrelay_precmd"
-
-isc_dhcrelay_precmd()
-{
-	if [ ! -d @VARBASE@/run/isc-dhcp ]; then
-		@MKDIR@ @VARBASE@/run/isc-dhcp
-		@CHMOD@ 0770 @VARBASE@/run/isc-dhcp
-	fi
-}
-
-load_rc_config $rcvar
-run_rc_command "$1"
diff --git a/net/isc-dhcp/files/site.conf b/net/isc-dhcp/files/site.conf
deleted file mode 100644
index 26fd78756e1..00000000000
--- a/net/isc-dhcp/files/site.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-CC = @@CC@@
-CC_OPTIONS = @@CFLAGS@@
-USERBINDIR = @@PREFIX@@/bin
-BINDIR = @@PREFIX@@/sbin
-CLIENTBINDIR = @@PREFIX@@/sbin
-ADMMANDIR = @@PREFIX@@/@@PKGMANDIR@@/man8
-FFMANDIR = @@PREFIX@@/@@PKGMANDIR@@/man5
-LIBMANDIR = @@PREFIX@@/@@PKGMANDIR@@/man3
-USRMANDIR = @@PREFIX@@/@@PKGMANDIR@@/man1
-ADMMANEXT = .8
-FFMANEXT = .5
-LIBMANEXT = .3
-USRMANEXT = .1
-MANCAT = man
-#ADMMANDIR = @@PREFIX@@/@@PKGMANDIR@@/cat8
-#FFMANDIR = @@PREFIX@@/@@PKGMANDIR@@/cat5
-#LIBMANDIR = @@PREFIX@@/@@PKGMANDIR@@/cat3
-#USRMANDIR = @@PREFIX@@/@@PKGMANDIR@@/cat1
-ETC = @@SYSCONFDIR@@
-VARRUN = @@VARBASE@@/run/isc-dhcp
-VARDB = @@VARBASE@@/db/isc-dhcp
-LIBDIR = @@PREFIX@@/lib
-INCDIR = @@PREFIX@@/include
-CLIENT_PATH = '"PATH=@@PREFIX@@/bin:@@PREFIX@@/sbin:/usr/ucb:/usr/bin:/usr/sbin:/bin:/sbin"'
-DEBUG = 
diff --git a/net/isc-dhcp/files/site.h b/net/isc-dhcp/files/site.h
deleted file mode 100644
index aee45aec0d2..00000000000
--- a/net/isc-dhcp/files/site.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#define _PATH_DHCPD_CONF "@@SYSCONFDIR@@/dhcpd.conf"
-#define _PATH_DHCPD_PID "@@VARBASE@@/run/isc-dhcp/isc-dhcpd.pid"
-#define _PATH_DHCPD_DB "@@VARBASE@@/db/isc-dhcp/dhcpd.leases"
-#define _PATH_DHCLIENT_PID "@@VARBASE@@/run/isc-dhcp/isc-dhclient.pid"
-#define _PATH_DHCLIENT_DB "@@VARBASE@@/db/isc-dhcp/dhclient.leases"
-#define _PATH_DHCLIENT_SCRIPT "@@PREFIX@@/sbin/dhclient-script"
-#define _PATH_DHCRELAY_PID "@@VARBASE@@/run/isc-dhcp/isc-dhcrelay.pid"
-#define DHCPD_LOG_FACILITY LOG_LOCAL@@DHCP_SYSLOG_LEVEL@@
diff --git a/net/isc-dhcp/patches/patch-aa b/net/isc-dhcp/patches/patch-aa
deleted file mode 100644
index 70cda285718..00000000000
--- a/net/isc-dhcp/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/08/18 19:19:59 hasso Exp $
-
---- includes/osdep.h.orig	2009-08-08 14:12:41 +0300
-+++ includes/osdep.h	2009-08-08 14:13:18 +0300
-@@ -89,7 +89,7 @@
- #  include "cf/netbsd.h"
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #  include "cf/freebsd.h"
- #endif
- 
diff --git a/net/isc-dhcp/patches/patch-ab b/net/isc-dhcp/patches/patch-ab
deleted file mode 100644
index a87ec5e1aff..00000000000
--- a/net/isc-dhcp/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/08/18 19:19:59 hasso Exp $
-
---- configure.orig	2005-03-17 22:14:55 +0200
-+++ configure	2009-08-08 14:06:41 +0300
-@@ -139,6 +139,8 @@ if [ "$sysname" = "" ]; then
-       sysname=openbsd;;
-     FreeBSD)
-       sysname=freebsd;;
-+    DragonFly)
-+      sysname=freebsd;;
-     hpux)
-       IFS=":"
-       for foo in $PATH; do
-@@ -259,7 +261,7 @@ for foo in $dirs; do
- 				<Makefile.conf; \
- 		cat site.conf; \
- 		echo "TOP = `pwd`"; \
--		echo CC_OPTIONS = $copts; \
-+		echo CC_OPTIONS ?= $copts; \
- 		cat $foo/Makefile.dist)	\
- 				>${workname}/$bar/Makefile
- done
diff --git a/net/isc-dhcp/patches/patch-ad b/net/isc-dhcp/patches/patch-ad
deleted file mode 100644
index 649e1f3c16b..00000000000
--- a/net/isc-dhcp/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/12/12 20:02:08 adrianp Exp $
-
---- /dev/null	2007-11-18 12:32:58.000000000 +0000
-+++ includes/omapip/trace_mr.h	2007-11-18 12:35:30.000000000 +0000
-@@ -0,0 +1,13 @@
-+ssize_t trace_mr_send (int, const void *, size_t, int);
-+ssize_t trace_mr_read_playback (struct sockaddr_in *, void *, size_t);
-+void trace_mr_read_record (struct sockaddr_in *, void *, ssize_t);
-+ssize_t trace_mr_recvfrom (int s, void *, size_t, int,
-+                           struct sockaddr *, SOCKLEN_T *);
-+ssize_t trace_mr_read (int, void *, size_t);
-+int trace_mr_connect (int s, struct sockaddr *, SOCKLEN_T);
-+int trace_mr_socket (int, int, int);
-+int trace_mr_bind (int, struct sockaddr *, SOCKLEN_T);
-+int trace_mr_close (int);
-+time_t trace_mr_time (time_t *);
-+int trace_mr_select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
-+unsigned int trace_mr_res_randomid (unsigned int);