It calls itself both cmu-dhcp and cmu-dhcpd. We'll pick cmu-dhcpd

5 files changed, 0 insertions, 73 deletions

diff --git a/net/cmu-dhcp/DESCR b/net/cmu-dhcp/DESCR
deleted file mode 100644
index 63d23d89707..00000000000
--- a/net/cmu-dhcp/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-CMU dhcpd 3.3.7 is a combined BootP and DHCP server, available from
-Carnegie Mellon University.
-
-Development of this sofware at CMU has been halted.  At Princeton
-we've added a few new features, and fixed some bugs (and probably
-introduced new ones, naturally).  We've also incorporated patches
-that others have posted.
diff --git a/net/cmu-dhcp/Makefile b/net/cmu-dhcp/Makefile
deleted file mode 100644
index 628620a6d02..00000000000
--- a/net/cmu-dhcp/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/18 22:03:49 abs Exp $
-#
-
-DISTNAME=	CMU-dhcp-3.3.7+PU-9
-PKGNAME=	cmu-dhcp-3.3.7.9
-CATEGORIES=	net
-MASTER_SITES=	http://heymon.princeton.edu/software/dhcpd/
-EXTRACT_SUFX=	.tar.Z
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://heymon.princeton.edu/software/dhcpd/
-COMMENT=	CMU BootP and DHCP server, plus Princeton patches
-
-WRKSRC=		${WRKDIR}/CMU-dhcp-3.3.7+PU-9
-GNU_CONFIGURE=	YES
-
-do-install:
-	${INSTALL_DATA_DIR} /var/db/bindings
-	${INSTALL_PROGRAM} ${WRKSRC}/dhcpd ${PREFIX}/sbin/cmu-dhcpd
-	${INSTALL_MAN} ${WRKSRC}/man/bootptab.5 ${PREFIX}/man/man5/bootptab.5
-	${INSTALL_MAN} ${WRKSRC}/man/dhcpd.8 ${PREFIX}/man/man8/dhcpd.8
-	${INSTALL_MAN} ${WRKSRC}/man/dhcpd.conf.5 ${PREFIX}/man/man5/dhcpd.conf.5
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/cmu-dhcp/PLIST b/net/cmu-dhcp/PLIST
deleted file mode 100644
index 8aaec6bd4cb..00000000000
--- a/net/cmu-dhcp/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/18 22:03:49 abs Exp $
-man/man5/bootptab.5
-man/man5/dhcpd.conf.5
-man/man8/dhcpd.8
-sbin/cmu-dhcpd
diff --git a/net/cmu-dhcp/distinfo b/net/cmu-dhcp/distinfo
deleted file mode 100644
index a525a52acd7..00000000000
--- a/net/cmu-dhcp/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/10/18 22:03:49 abs Exp $
-
-SHA1 (CMU-dhcp-3.3.7+PU-9.tar.Z) = 9c7eb8f498eddd35d0eb9ceaa90451f06bb5cf27
-Size (CMU-dhcp-3.3.7+PU-9.tar.Z) = 752011 bytes
-SHA1 (patch-aa) = bbedb6f3c01d6459f5e0623e8e165ecef6d09374
diff --git a/net/cmu-dhcp/patches/patch-aa b/net/cmu-dhcp/patches/patch-aa
deleted file mode 100644
index 133f05d5764..00000000000
--- a/net/cmu-dhcp/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/18 22:03:49 abs Exp $
-
---- defaults.h.orig	Wed Oct 20 20:14:15 1999
-+++ defaults.h
-@@ -41,7 +41,7 @@
- /* override each of them from the commandline.                        */
- 
- /* Absolute path to pidfile. */ 
--#define PID_FILE "/etc/dhcpd.pid"
-+#define PID_FILE "/var/run/cmu-dhcpd.pid"
- 
- /* Absolute path to bootptab file. */
- #define TAB_FILE "/etc/bootptab"
-@@ -50,7 +50,7 @@
- #define CONFIG_FILE "/etc/dhcpd.conf"
- 
- /* Absolute path to bindings directory. */ 
--#define LASTBINDDIR "/etc/bindings"
-+#define LASTBINDDIR "/var/db/bindings"
- 
- /* Absolute path to bootptab dump file. */ 
- #define DUMPTAB_FILE "/tmp/bootpd.dump"
-@@ -81,6 +81,9 @@
-    do this, if your platform needs that route to work right, you'll need
-    to add the route manually before starting the daemon. */
- /* #define NOBROADCAST */
-+#ifdef __NetBSD__
-+#define NOBROADCAST
-+#endif
- 
- /*                                                                    */
- /**********************************************************************/