Upgrade repository copy of isc-dhcp to a pre-2.0 snapshot.

5 files changed, 33 insertions, 58 deletions

diff --git a/net/isc-dhcp2/Makefile b/net/isc-dhcp2/Makefile
index 05224b8bba54..25c6c016c299 100644
--- a/net/isc-dhcp2/Makefile
+++ b/net/isc-dhcp2/Makefile
@@ -1,24 +1,28 @@
 # Ports collection makefile for:    dhcp
-# Version required:     ISC-DHCP-BETA-16
+# Version required:     97-11-22
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
-# $Id: Makefile,v 1.12 1997/10/13 09:14:51 tg Exp $
+# $Id: Makefile,v 1.13 1997/11/14 14:19:02 obrien Exp $
 #
 
-DISTNAME=       DHCPD-BETA-5.16
-PKGNAME=	isc-dhcp-b5.16
+DISTNAME=       dhcp-971122
+PKGNAME=	isc-${DISTNAME}
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
 
-MAINTAINER=	jseger@freebsd.org
+MAINTAINER=	jseger@FreeBSD.org
 
 HAS_CONFIGURE=	yes
 
-MAN5=		dhcpd.conf.5
-MAN8=		dhcpd.8
+CAT5=		dhclient.conf.5 dhclient.leases.5 dhcp-options.5 dhcpd.conf.5 \
+		dhcpd.leases.5
+CAT8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
+
+_MANPAGES+=	${CAT5:S%^%${MANPREFIX}/man/cat5/%}
+_MANPAGES+=	${CAT8:S%^%${MANPREFIX}/man/cat8/%}
 
 post-install:
-	touch /var/db/dhcpd.leases
+	${TOUCH} /var/db/dhcpd.leases
 
 .include <bsd.port.mk>
diff --git a/net/isc-dhcp2/distinfo b/net/isc-dhcp2/distinfo
index 20ddc9163ba1..87f9c5ad19a4 100644
--- a/net/isc-dhcp2/distinfo
+++ b/net/isc-dhcp2/distinfo
@@ -1 +1 @@
-MD5 (DHCPD-BETA-5.16.tar.gz) = 2edf24d34f3f5ae3d23b108fe2cf4cdf
+MD5 (dhcp-971122.tar.gz) = 38f9b1b576caa5ffc7696a99c3ca5138
diff --git a/net/isc-dhcp2/files/patch-ab b/net/isc-dhcp2/files/patch-ab
index a0dd903786dc..89c5ce7b347c 100644
--- a/net/isc-dhcp2/files/patch-ab
+++ b/net/isc-dhcp2/files/patch-ab
@@ -1,55 +1,16 @@
---- Makefile.dist.orig	Fri May  9 01:44:13 1997
-+++ Makefile.dist	Fri Nov 14 06:06:07 1997
-@@ -121,6 +121,16 @@
- ## FreeBSD
+--- Makefile.conf.orig	Mon Dec  1 16:14:31 1997
++++ Makefile.conf	Mon Dec  1 16:19:04 1997
+@@ -143,6 +143,13 @@
  ##--freebsd--
  #CF = cf/freebsd.h
-+#COPTS  = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \
-+#	  -Wno-uninitialized -Werror
+ #SCRIPT=freebsd
 +#PREFIX ?= /usr/local
 +#BINDIR = ${PREFIX}/sbin
-+#ETC = ${PREFIX}/etc
-+#CATMANPAGES = dhcpd.out8 dhcpd.conf.out5
-+#ADMMANDIR = ${PREFIX}/man/man8
++#CLIENTBINDIR = ${PREFIX}/sbin
++#ADMMANDIR = ${PREFIX}/man/cat8
 +#ADMMANEXT = .8
-+#FFMANDIR = ${PREFIX}/man/man5
++#FFMANDIR = ${PREFIX}/man/cat5
 +#FFMANEXT = .5
  ##--freebsd--
  
  ## NetBSD
-@@ -199,7 +209,7 @@
- MAN    = dhcpd.8 dhcpd.conf.5
- 
- DEBUG  = -g
--CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
-+CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
- 
- all:	$(PROG) $(CATMANPAGES)
- 
-@@ -217,9 +227,9 @@
- 	  mkdir $(VARDB); \
- 	  chmod 755 $(VARDB); \
- 	fi
--	$(MANINSTALL) $(MANFROM) dhcpd.cat8 $(MANTO) \
-+	$(MANINSTALL) $(MANFROM) dhcpd.out8 $(MANTO) \
- 				$(ADMMANDIR)/dhcpd$(ADMMANEXT)
--	$(MANINSTALL) $(MANFROM) dhcpd.conf.cat5 $(MANTO) \
-+	$(MANINSTALL) $(MANFROM) dhcpd.conf.out5 $(MANTO) \
- 				$(FFMANDIR)/dhcpd.conf$(FFMANEXT)
- 
- clean:
-@@ -242,6 +252,14 @@
- 
- dhcpd.conf.cat5:	dhcpd.conf.5
- 	nroff -man dhcpd.conf.5 >dhcpd.conf.cat5
-+
-+dhcpd.out8:	dhcpd.8
-+	sed -e "s#ETCDIR#$(ETC)#" -e "s#DBDIR#$(VARDB)#" \
-+		-e "s#RUNDIR#$(VARRUN)#" < dhcpd.8 >dhcpd.out8
-+
-+dhcpd.conf.out5:	dhcpd.conf.5
-+	cp dhcpd.conf.5 dhcpd.conf.out5
-+
- 
- dhcpd:	$(OBJS) $(COBJ)
- 	$(CC) $(LFLAGS) -o dhcpd $(OBJS) $(COBJ) $(LIBS)
diff --git a/net/isc-dhcp2/pkg-descr b/net/isc-dhcp2/pkg-descr
index 2e7a04bcb820..8d19f0fc60f4 100644
--- a/net/isc-dhcp2/pkg-descr
+++ b/net/isc-dhcp2/pkg-descr
@@ -4,4 +4,3 @@ This is a beta release of the Internet Software Consortium
 DHCP Server (ISC dhcpd).  In this Beta release, support for the core
 DHCP protocol is provided.  BOOTP support is also provided for
 backwards compatibility. 
-
diff --git a/net/isc-dhcp2/pkg-plist b/net/isc-dhcp2/pkg-plist
index f5b4d3434bf4..6aecf6db64fd 100644
--- a/net/isc-dhcp2/pkg-plist
+++ b/net/isc-dhcp2/pkg-plist
@@ -1,4 +1,15 @@
-man/man5/dhcpd.conf.5.gz
-man/man8/dhcpd.8.gz
+man/cat5/dhclient.conf.5.gz
+man/cat5/dhclient.leases.5.gz
+man/cat5/dhcp-options.5.gz
+man/cat5/dhcpd.conf.5.gz
+man/cat5/dhcpd.leases.5.gz
+man/cat8/dhclient.8.gz
+man/cat8/dhclient-script.8.gz
+man/cat8/dhcpd.8.gz
+man/cat8/dhcrelay.8.gz
+sbin/dhclient
 sbin/dhcpd
+sbin/dhcrelay
+sbin/statmsg
+sbin/sysconfd
 @exec touch /var/db/dhcpd.leases