summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Traina <pst@FreeBSD.org>1997-01-14 20:16:10 +0000
committerPaul Traina <pst@FreeBSD.org>1997-01-14 20:16:10 +0000
commita6621d4552eb65f3223d21de562fc9f0bdc8a1a3 (patch)
tree72f9fc2f5d3d4441ea33f7bb7cd760f493e2fc18
parentRemove RUN_DEPENDS to gs, there are too many versions around (3 (diff)
Serves me right for committing work I hadn't looked at in over a month.
This cleans up everything, installs man pages properly, et al. The dhcp client is not installed, since it is not yet functional.
Notes
Notes: svn path=/head/; revision=5355
-rw-r--r--net/isc-dhcp2/Makefile8
-rw-r--r--net/isc-dhcp2/files/patch-ab87
-rw-r--r--net/isc-dhcp2/pkg-descr8
-rw-r--r--net/isc-dhcp2/pkg-plist1
-rw-r--r--net/isc-dhcp3-server/Makefile8
-rw-r--r--net/isc-dhcp3-server/pkg-descr8
-rw-r--r--net/isc-dhcp3-server/pkg-plist1
-rw-r--r--net/isc-dhcp3/Makefile8
-rw-r--r--net/isc-dhcp3/pkg-descr8
-rw-r--r--net/isc-dhcp3/pkg-plist1
-rw-r--r--net/isc-dhcp30-server/Makefile8
-rw-r--r--net/isc-dhcp30-server/pkg-descr8
-rw-r--r--net/isc-dhcp30-server/pkg-plist1
-rw-r--r--net/isc-dhcp31-server/Makefile8
-rw-r--r--net/isc-dhcp31-server/pkg-descr8
-rw-r--r--net/isc-dhcp31-server/pkg-plist1
-rw-r--r--net/isc-dhcp40-server/Makefile8
-rw-r--r--net/isc-dhcp40-server/pkg-descr8
-rw-r--r--net/isc-dhcp40-server/pkg-plist1
19 files changed, 111 insertions, 78 deletions
diff --git a/net/isc-dhcp2/Makefile b/net/isc-dhcp2/Makefile
index 5b4cf99f1838..767f98523914 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.4 1996/11/18 11:35:12 asami Exp $
+# $Id: Makefile,v 1.5 1997/01/14 05:29:25 pst Exp $
#
DISTNAME= DHCPD-BETA-5.14
@@ -12,13 +12,9 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.vix.com/pub/dhcp/
MAINTAINER= se@FreeBSD.ORG
+HAS_CONFIGURE= yes
MAN5= dhcpd.conf.5${ZEXTENSION}
MAN8= dhcpd.8${ZEXTENSION}
-do-install:
- cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-
.include <bsd.port.mk>
diff --git a/net/isc-dhcp2/files/patch-ab b/net/isc-dhcp2/files/patch-ab
new file mode 100644
index 000000000000..707d83c1f000
--- /dev/null
+++ b/net/isc-dhcp2/files/patch-ab
@@ -0,0 +1,87 @@
+*** 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)
diff --git a/net/isc-dhcp2/pkg-descr b/net/isc-dhcp2/pkg-descr
index e19d71018175..2e7a04bcb820 100644
--- a/net/isc-dhcp2/pkg-descr
+++ b/net/isc-dhcp2/pkg-descr
@@ -1,11 +1,7 @@
-ISC-DHCP (BETA 0) Dynamic Host Configuration Protocol server and client
+ISC-DHCP Dynamic Host Configuration Protocol server
-This is the first Beta release of the Internet Software Consortium
+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.
-This release of dhcpd does not contain support for DHCPINFORM.
-Support for DHCPINFORM will be present in the next release.
-DHCPINFORM is somewhat tangential to the main purpose of the DHCP
-protocol, so this probably won't be a major problem for most users.
diff --git a/net/isc-dhcp2/pkg-plist b/net/isc-dhcp2/pkg-plist
index d0a99e410498..54b1e574e2d6 100644
--- a/net/isc-dhcp2/pkg-plist
+++ b/net/isc-dhcp2/pkg-plist
@@ -1,4 +1,3 @@
man/man5/dhcpd.conf.5.gz
man/man8/dhcpd.8.gz
sbin/dhcpd
-sbin/dhclient
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index 5b4cf99f1838..767f98523914 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -3,7 +3,7 @@
# Date created: 7 Mar 1996
# Whom: se
#
-# $Id: Makefile,v 1.4 1996/11/18 11:35:12 asami Exp $
+# $Id: Makefile,v 1.5 1997/01/14 05:29:25 pst Exp $
#
DISTNAME= DHCPD-BETA-5.14
@@ -12,13 +12,9 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.vix.com/pub/dhcp/
MAINTAINER= se@FreeBSD.ORG
+HAS_CONFIGURE= yes
MAN5= dhcpd.conf.5${ZEXTENSION}
MAN8= dhcpd.8${ZEXTENSION}
-do-install:
- cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-
.include <bsd.port.mk>
diff --git a/net/isc-dhcp3-server/pkg-descr b/net/isc-dhcp3-server/pkg-descr
index e19d71018175..2e7a04bcb820 100644
--- a/net/isc-dhcp3-server/pkg-descr
+++ b/net/isc-dhcp3-server/pkg-descr
@@ -1,11 +1,7 @@
-ISC-DHCP (BETA 0) Dynamic Host Configuration Protocol server and client
+ISC-DHCP Dynamic Host Configuration Protocol server
-This is the first Beta release of the Internet Software Consortium
+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.
-This release of dhcpd does not contain support for DHCPINFORM.
-Support for DHCPINFORM will be present in the next release.
-DHCPINFORM is somewhat tangential to the main purpose of the DHCP
-protocol, so this probably won't be a major problem for most users.
diff --git a/net/isc-dhcp3-server/pkg-plist b/net/isc-dhcp3-server/pkg-plist
index d0a99e410498..54b1e574e2d6 100644
--- a/net/isc-dhcp3-server/pkg-plist
+++ b/net/isc-dhcp3-server/pkg-plist
@@ -1,4 +1,3 @@
man/man5/dhcpd.conf.5.gz
man/man8/dhcpd.8.gz
sbin/dhcpd
-sbin/dhclient
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index 5b4cf99f1838..767f98523914 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -3,7 +3,7 @@
# Date created: 7 Mar 1996
# Whom: se
#
-# $Id: Makefile,v 1.4 1996/11/18 11:35:12 asami Exp $
+# $Id: Makefile,v 1.5 1997/01/14 05:29:25 pst Exp $
#
DISTNAME= DHCPD-BETA-5.14
@@ -12,13 +12,9 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.vix.com/pub/dhcp/
MAINTAINER= se@FreeBSD.ORG
+HAS_CONFIGURE= yes
MAN5= dhcpd.conf.5${ZEXTENSION}
MAN8= dhcpd.8${ZEXTENSION}
-do-install:
- cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-
.include <bsd.port.mk>
diff --git a/net/isc-dhcp3/pkg-descr b/net/isc-dhcp3/pkg-descr
index e19d71018175..2e7a04bcb820 100644
--- a/net/isc-dhcp3/pkg-descr
+++ b/net/isc-dhcp3/pkg-descr
@@ -1,11 +1,7 @@
-ISC-DHCP (BETA 0) Dynamic Host Configuration Protocol server and client
+ISC-DHCP Dynamic Host Configuration Protocol server
-This is the first Beta release of the Internet Software Consortium
+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.
-This release of dhcpd does not contain support for DHCPINFORM.
-Support for DHCPINFORM will be present in the next release.
-DHCPINFORM is somewhat tangential to the main purpose of the DHCP
-protocol, so this probably won't be a major problem for most users.
diff --git a/net/isc-dhcp3/pkg-plist b/net/isc-dhcp3/pkg-plist
index d0a99e410498..54b1e574e2d6 100644
--- a/net/isc-dhcp3/pkg-plist
+++ b/net/isc-dhcp3/pkg-plist
@@ -1,4 +1,3 @@
man/man5/dhcpd.conf.5.gz
man/man8/dhcpd.8.gz
sbin/dhcpd
-sbin/dhclient
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 5b4cf99f1838..767f98523914 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -3,7 +3,7 @@
# Date created: 7 Mar 1996
# Whom: se
#
-# $Id: Makefile,v 1.4 1996/11/18 11:35:12 asami Exp $
+# $Id: Makefile,v 1.5 1997/01/14 05:29:25 pst Exp $
#
DISTNAME= DHCPD-BETA-5.14
@@ -12,13 +12,9 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.vix.com/pub/dhcp/
MAINTAINER= se@FreeBSD.ORG
+HAS_CONFIGURE= yes
MAN5= dhcpd.conf.5${ZEXTENSION}
MAN8= dhcpd.8${ZEXTENSION}
-do-install:
- cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-
.include <bsd.port.mk>
diff --git a/net/isc-dhcp30-server/pkg-descr b/net/isc-dhcp30-server/pkg-descr
index e19d71018175..2e7a04bcb820 100644
--- a/net/isc-dhcp30-server/pkg-descr
+++ b/net/isc-dhcp30-server/pkg-descr
@@ -1,11 +1,7 @@
-ISC-DHCP (BETA 0) Dynamic Host Configuration Protocol server and client
+ISC-DHCP Dynamic Host Configuration Protocol server
-This is the first Beta release of the Internet Software Consortium
+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.
-This release of dhcpd does not contain support for DHCPINFORM.
-Support for DHCPINFORM will be present in the next release.
-DHCPINFORM is somewhat tangential to the main purpose of the DHCP
-protocol, so this probably won't be a major problem for most users.
diff --git a/net/isc-dhcp30-server/pkg-plist b/net/isc-dhcp30-server/pkg-plist
index d0a99e410498..54b1e574e2d6 100644
--- a/net/isc-dhcp30-server/pkg-plist
+++ b/net/isc-dhcp30-server/pkg-plist
@@ -1,4 +1,3 @@
man/man5/dhcpd.conf.5.gz
man/man8/dhcpd.8.gz
sbin/dhcpd
-sbin/dhclient
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 5b4cf99f1838..767f98523914 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -3,7 +3,7 @@
# Date created: 7 Mar 1996
# Whom: se
#
-# $Id: Makefile,v 1.4 1996/11/18 11:35:12 asami Exp $
+# $Id: Makefile,v 1.5 1997/01/14 05:29:25 pst Exp $
#
DISTNAME= DHCPD-BETA-5.14
@@ -12,13 +12,9 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.vix.com/pub/dhcp/
MAINTAINER= se@FreeBSD.ORG
+HAS_CONFIGURE= yes
MAN5= dhcpd.conf.5${ZEXTENSION}
MAN8= dhcpd.8${ZEXTENSION}
-do-install:
- cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-
.include <bsd.port.mk>
diff --git a/net/isc-dhcp31-server/pkg-descr b/net/isc-dhcp31-server/pkg-descr
index e19d71018175..2e7a04bcb820 100644
--- a/net/isc-dhcp31-server/pkg-descr
+++ b/net/isc-dhcp31-server/pkg-descr
@@ -1,11 +1,7 @@
-ISC-DHCP (BETA 0) Dynamic Host Configuration Protocol server and client
+ISC-DHCP Dynamic Host Configuration Protocol server
-This is the first Beta release of the Internet Software Consortium
+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.
-This release of dhcpd does not contain support for DHCPINFORM.
-Support for DHCPINFORM will be present in the next release.
-DHCPINFORM is somewhat tangential to the main purpose of the DHCP
-protocol, so this probably won't be a major problem for most users.
diff --git a/net/isc-dhcp31-server/pkg-plist b/net/isc-dhcp31-server/pkg-plist
index d0a99e410498..54b1e574e2d6 100644
--- a/net/isc-dhcp31-server/pkg-plist
+++ b/net/isc-dhcp31-server/pkg-plist
@@ -1,4 +1,3 @@
man/man5/dhcpd.conf.5.gz
man/man8/dhcpd.8.gz
sbin/dhcpd
-sbin/dhclient
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 5b4cf99f1838..767f98523914 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -3,7 +3,7 @@
# Date created: 7 Mar 1996
# Whom: se
#
-# $Id: Makefile,v 1.4 1996/11/18 11:35:12 asami Exp $
+# $Id: Makefile,v 1.5 1997/01/14 05:29:25 pst Exp $
#
DISTNAME= DHCPD-BETA-5.14
@@ -12,13 +12,9 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.vix.com/pub/dhcp/
MAINTAINER= se@FreeBSD.ORG
+HAS_CONFIGURE= yes
MAN5= dhcpd.conf.5${ZEXTENSION}
MAN8= dhcpd.8${ZEXTENSION}
-do-install:
- cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
- cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-
.include <bsd.port.mk>
diff --git a/net/isc-dhcp40-server/pkg-descr b/net/isc-dhcp40-server/pkg-descr
index e19d71018175..2e7a04bcb820 100644
--- a/net/isc-dhcp40-server/pkg-descr
+++ b/net/isc-dhcp40-server/pkg-descr
@@ -1,11 +1,7 @@
-ISC-DHCP (BETA 0) Dynamic Host Configuration Protocol server and client
+ISC-DHCP Dynamic Host Configuration Protocol server
-This is the first Beta release of the Internet Software Consortium
+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.
-This release of dhcpd does not contain support for DHCPINFORM.
-Support for DHCPINFORM will be present in the next release.
-DHCPINFORM is somewhat tangential to the main purpose of the DHCP
-protocol, so this probably won't be a major problem for most users.
diff --git a/net/isc-dhcp40-server/pkg-plist b/net/isc-dhcp40-server/pkg-plist
index d0a99e410498..54b1e574e2d6 100644
--- a/net/isc-dhcp40-server/pkg-plist
+++ b/net/isc-dhcp40-server/pkg-plist
@@ -1,4 +1,3 @@
man/man5/dhcpd.conf.5.gz
man/man8/dhcpd.8.gz
sbin/dhcpd
-sbin/dhclient