summaryrefslogtreecommitdiff
path: root/net/isc-dhcp2
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1997-11-14 14:19:06 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1997-11-14 14:19:06 +0000
commitc4882abee0aeea5838e6ddbd88dbd30690270590 (patch)
tree1c5026af7143e98a84d629ed6962fab814a8ac4f /net/isc-dhcp2
parentActivate hfsutils. (diff)
Must create empty /var/db/dhcpd.leases file at install.
Read config file from PREFIX/etc rather than /etc.
Diffstat (limited to 'net/isc-dhcp2')
-rw-r--r--net/isc-dhcp2/Makefile5
-rw-r--r--net/isc-dhcp2/files/patch-ab142
-rw-r--r--net/isc-dhcp2/pkg-plist1
3 files changed, 60 insertions, 88 deletions
diff --git a/net/isc-dhcp2/Makefile b/net/isc-dhcp2/Makefile
index 72c71dbddeb8..05224b8bba54 100644
--- a/net/isc-dhcp2/Makefile
+++ b/net/isc-dhcp2/Makefile
@@ -3,7 +3,7 @@
# Date created: 7 Mar 1996
# Whom: se
#
-# $Id: Makefile,v 1.11 1997/06/03 22:11:37 asami Exp $
+# $Id: Makefile,v 1.12 1997/10/13 09:14:51 tg Exp $
#
DISTNAME= DHCPD-BETA-5.16
@@ -18,4 +18,7 @@ HAS_CONFIGURE= yes
MAN5= dhcpd.conf.5
MAN8= dhcpd.8
+post-install:
+ touch /var/db/dhcpd.leases
+
.include <bsd.port.mk>
diff --git a/net/isc-dhcp2/files/patch-ab b/net/isc-dhcp2/files/patch-ab
index 707d83c1f000..a0dd903786dc 100644
--- a/net/isc-dhcp2/files/patch-ab
+++ b/net/isc-dhcp2/files/patch-ab
@@ -1,87 +1,55 @@
-*** Makefile.dist Fri Nov 8 12:28:18 1996
---- Makefile.dist Tue Jan 14 12:07:47 1997
-***************
-*** 119,127 ****
- ##--bsdos--
-
- ## FreeBSD
-! ##--freebsd--
-! #CF = cf/freebsd.h
-! ##--freebsd--
-
- ## NetBSD
- ##--netbsd--
---- 119,136 ----
- ##--bsdos--
-
- ## FreeBSD
-! ##--freebsd--
-! #CF = cf/freebsd.h
-! #COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \
-! # -Wno-uninitialized -Werror
-! #PREFIX ?= /usr/local
-! #BINDIR = ${PREFIX}/sbin
-! #CATMANPAGES = dhcpd.out8 dhcpd.conf.out5
-! #ADMMANDIR = ${PREFIX}/man/man8
-! #ADMMANEXT = .8
-! #FFMANDIR = ${PREFIX}/man/man5
-! #FFMANEXT = .5
-! ##--freebsd--
-
- ## NetBSD
- ##--netbsd--
-***************
-*** 196,202 ****
- MAN = dhcpd.8 dhcpd.conf.5
-
- DEBUG = -g
-! CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
-
- all: dhcpd dhclient dhcpxlt $(CATMANPAGES)
-
---- 205,211 ----
- MAN = dhcpd.8 dhcpd.conf.5
-
- DEBUG = -g
-! CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
-
- all: dhcpd dhclient dhcpxlt $(CATMANPAGES)
-
-***************
-*** 214,222 ****
- mkdir $(VARDB); \
- chmod 755 $(VARDB); \
- fi
-! $(MANINSTALL) $(MANFROM) dhcpd.cat8 $(MANTO) \
- $(ADMMANDIR)/dhcpd$(ADMMANEXT)
-! $(MANINSTALL) $(MANFROM) dhcpd.conf.cat5 $(MANTO) \
- $(FFMANDIR)/dhcpd.conf$(FFMANEXT)
-
- clean:
---- 223,231 ----
- mkdir $(VARDB); \
- chmod 755 $(VARDB); \
- fi
-! $(MANINSTALL) $(MANFROM) dhcpd.out8 $(MANTO) \
- $(ADMMANDIR)/dhcpd$(ADMMANEXT)
-! $(MANINSTALL) $(MANFROM) dhcpd.conf.out5 $(MANTO) \
- $(FFMANDIR)/dhcpd.conf$(FFMANEXT)
-
- clean:
-***************
-*** 239,244 ****
---- 248,261 ----
-
- 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)
+--- Makefile.dist.orig Fri May 9 01:44:13 1997
++++ Makefile.dist Fri Nov 14 06:06:07 1997
+@@ -121,6 +121,16 @@
+ ## FreeBSD
+ ##--freebsd--
+ #CF = cf/freebsd.h
++#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \
++# -Wno-uninitialized -Werror
++#PREFIX ?= /usr/local
++#BINDIR = ${PREFIX}/sbin
++#ETC = ${PREFIX}/etc
++#CATMANPAGES = dhcpd.out8 dhcpd.conf.out5
++#ADMMANDIR = ${PREFIX}/man/man8
++#ADMMANEXT = .8
++#FFMANDIR = ${PREFIX}/man/man5
++#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-plist b/net/isc-dhcp2/pkg-plist
index 54b1e574e2d6..f5b4d3434bf4 100644
--- a/net/isc-dhcp2/pkg-plist
+++ b/net/isc-dhcp2/pkg-plist
@@ -1,3 +1,4 @@
man/man5/dhcpd.conf.5.gz
man/man8/dhcpd.8.gz
sbin/dhcpd
+@exec touch /var/db/dhcpd.leases