From 2809465025d7ba98321aafed4dde4c2af0850378 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sat, 30 Sep 2000 18:42:33 +0000 Subject: [PATCH] Remove dependancy on he BIND8 port. Add more manpages. Update DESCR. Tweak more Makefiles so CFLAGS are apended to, rather than overriding ours. PR: 21632 Submitted by: Cyrille Lefevre --- net/isc-dhcp3-server/Makefile | 4 +-- net/isc-dhcp3-server/files/patch-site.conf | 8 +++--- net/isc-dhcp3-server/pkg-descr | 27 ++++++++++++++------- net/isc-dhcp3/Makefile | 4 +-- net/isc-dhcp3/files/patch-site.conf | 8 +++--- net/isc-dhcp3/pkg-descr | 27 ++++++++++++++------- net/isc-dhcp30-server/Makefile | 4 +-- net/isc-dhcp30-server/files/patch-site.conf | 8 +++--- net/isc-dhcp30-server/pkg-descr | 27 ++++++++++++++------- net/isc-dhcp31-server/Makefile | 4 +-- net/isc-dhcp31-server/files/patch-site.conf | 8 +++--- net/isc-dhcp31-server/pkg-descr | 27 ++++++++++++++------- net/isc-dhcp40-server/Makefile | 4 +-- net/isc-dhcp40-server/files/patch-site.conf | 8 +++--- net/isc-dhcp40-server/pkg-descr | 27 ++++++++++++++------- 15 files changed, 120 insertions(+), 75 deletions(-) diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile index bbe831a5ca3d..ac2a7372fd1f 100644 --- a/net/isc-dhcp3-server/Makefile +++ b/net/isc-dhcp3-server/Makefile @@ -14,13 +14,11 @@ DISTNAME= dhcp-3.0b2pl5 MAINTAINER= obrien@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8 - Y2K= http://www.isc.org/y2k.html HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-nsupdate +MAN3= dhcpctl.3 omapi.3 MAN5= dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \ dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \ dhcpd.leases.5 diff --git a/net/isc-dhcp3-server/files/patch-site.conf b/net/isc-dhcp3-server/files/patch-site.conf index 5c537dbcf298..177b0a77e6d6 100644 --- a/net/isc-dhcp3-server/files/patch-site.conf +++ b/net/isc-dhcp3-server/files/patch-site.conf @@ -1,6 +1,6 @@ ---- site.conf Wed Jul 7 17:20:10 1999 -+++ site.conf Tue May 9 21:23:20 2000 -@@ -1,2 +1,21 @@ +--- site.conf.orig Wed Jul 7 08:20:10 1999 ++++ site.conf Sat Sep 30 11:34:07 2000 +@@ -1,2 +1,23 @@ # Put local site configuration stuff here to override the default # settings in Makefile.conf + @@ -14,6 +14,8 @@ +ADMMANEXT = .8 +FFMANDIR = $(PREFIX)/man/man5 +FFMANEXT = .5 ++LIBMANDIR = $(PREFIX)/man/man3 ++LIBMANEXT = 3 + +BINDLIBDEF = -L$(PREFIX)/lib -lbind +BINDINCDEF = -I$(PREFIX)/include/bind diff --git a/net/isc-dhcp3-server/pkg-descr b/net/isc-dhcp3-server/pkg-descr index ea6d2eeb6dd6..46bdf5ebae8e 100644 --- a/net/isc-dhcp3-server/pkg-descr +++ b/net/isc-dhcp3-server/pkg-descr @@ -5,15 +5,24 @@ DHCP Server (ISC dhcpd). In this release, support for the core DHCP protocol is provided. BOOTP support is also provided for backwards compatibility. -Version 3 of the ISC DHCP Distribution adds conditional behaviour, -address pools with access control, and client classing. An interim -implementation of dynamic DNS updates for the server only is -included, but is not supported. +Version 3, Beta 2 of the ISC DHCP Distribution includes the following +features that are new since version 2.0: + + * DHCP Failover Protocol support + * OMAPI, an API for accessing and modifying the DHCP + server and client state. + * Conditional behaviour + * Storing arbitrary information on leases + * Address pools with access control + * Client classing + * Address allocation restriction by class + * Relay agent information option support + * Dynamic DNS updates + * Many bug fixes, performance enhancements, and minor + new DHCP protocol features. + +A fully-featured implementation of dynamic DNS updates is included in +this release. There are no build dependencies with any BIND version. -Features in upcoming releases, starting with 3.1, will include the -final asynchronous Dynamic DNS Support, DHCPv4 16-bit option codes, -asynchronous DNS query resolution, DHCP Authentication, and support -for a DHCP Interserver Protocol and live querying and update of the -DHCP database. WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile index bbe831a5ca3d..ac2a7372fd1f 100644 --- a/net/isc-dhcp3/Makefile +++ b/net/isc-dhcp3/Makefile @@ -14,13 +14,11 @@ DISTNAME= dhcp-3.0b2pl5 MAINTAINER= obrien@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8 - Y2K= http://www.isc.org/y2k.html HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-nsupdate +MAN3= dhcpctl.3 omapi.3 MAN5= dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \ dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \ dhcpd.leases.5 diff --git a/net/isc-dhcp3/files/patch-site.conf b/net/isc-dhcp3/files/patch-site.conf index 5c537dbcf298..177b0a77e6d6 100644 --- a/net/isc-dhcp3/files/patch-site.conf +++ b/net/isc-dhcp3/files/patch-site.conf @@ -1,6 +1,6 @@ ---- site.conf Wed Jul 7 17:20:10 1999 -+++ site.conf Tue May 9 21:23:20 2000 -@@ -1,2 +1,21 @@ +--- site.conf.orig Wed Jul 7 08:20:10 1999 ++++ site.conf Sat Sep 30 11:34:07 2000 +@@ -1,2 +1,23 @@ # Put local site configuration stuff here to override the default # settings in Makefile.conf + @@ -14,6 +14,8 @@ +ADMMANEXT = .8 +FFMANDIR = $(PREFIX)/man/man5 +FFMANEXT = .5 ++LIBMANDIR = $(PREFIX)/man/man3 ++LIBMANEXT = 3 + +BINDLIBDEF = -L$(PREFIX)/lib -lbind +BINDINCDEF = -I$(PREFIX)/include/bind diff --git a/net/isc-dhcp3/pkg-descr b/net/isc-dhcp3/pkg-descr index ea6d2eeb6dd6..46bdf5ebae8e 100644 --- a/net/isc-dhcp3/pkg-descr +++ b/net/isc-dhcp3/pkg-descr @@ -5,15 +5,24 @@ DHCP Server (ISC dhcpd). In this release, support for the core DHCP protocol is provided. BOOTP support is also provided for backwards compatibility. -Version 3 of the ISC DHCP Distribution adds conditional behaviour, -address pools with access control, and client classing. An interim -implementation of dynamic DNS updates for the server only is -included, but is not supported. +Version 3, Beta 2 of the ISC DHCP Distribution includes the following +features that are new since version 2.0: + + * DHCP Failover Protocol support + * OMAPI, an API for accessing and modifying the DHCP + server and client state. + * Conditional behaviour + * Storing arbitrary information on leases + * Address pools with access control + * Client classing + * Address allocation restriction by class + * Relay agent information option support + * Dynamic DNS updates + * Many bug fixes, performance enhancements, and minor + new DHCP protocol features. + +A fully-featured implementation of dynamic DNS updates is included in +this release. There are no build dependencies with any BIND version. -Features in upcoming releases, starting with 3.1, will include the -final asynchronous Dynamic DNS Support, DHCPv4 16-bit option codes, -asynchronous DNS query resolution, DHCP Authentication, and support -for a DHCP Interserver Protocol and live querying and update of the -DHCP database. WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile index bbe831a5ca3d..ac2a7372fd1f 100644 --- a/net/isc-dhcp30-server/Makefile +++ b/net/isc-dhcp30-server/Makefile @@ -14,13 +14,11 @@ DISTNAME= dhcp-3.0b2pl5 MAINTAINER= obrien@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8 - Y2K= http://www.isc.org/y2k.html HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-nsupdate +MAN3= dhcpctl.3 omapi.3 MAN5= dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \ dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \ dhcpd.leases.5 diff --git a/net/isc-dhcp30-server/files/patch-site.conf b/net/isc-dhcp30-server/files/patch-site.conf index 5c537dbcf298..177b0a77e6d6 100644 --- a/net/isc-dhcp30-server/files/patch-site.conf +++ b/net/isc-dhcp30-server/files/patch-site.conf @@ -1,6 +1,6 @@ ---- site.conf Wed Jul 7 17:20:10 1999 -+++ site.conf Tue May 9 21:23:20 2000 -@@ -1,2 +1,21 @@ +--- site.conf.orig Wed Jul 7 08:20:10 1999 ++++ site.conf Sat Sep 30 11:34:07 2000 +@@ -1,2 +1,23 @@ # Put local site configuration stuff here to override the default # settings in Makefile.conf + @@ -14,6 +14,8 @@ +ADMMANEXT = .8 +FFMANDIR = $(PREFIX)/man/man5 +FFMANEXT = .5 ++LIBMANDIR = $(PREFIX)/man/man3 ++LIBMANEXT = 3 + +BINDLIBDEF = -L$(PREFIX)/lib -lbind +BINDINCDEF = -I$(PREFIX)/include/bind diff --git a/net/isc-dhcp30-server/pkg-descr b/net/isc-dhcp30-server/pkg-descr index ea6d2eeb6dd6..46bdf5ebae8e 100644 --- a/net/isc-dhcp30-server/pkg-descr +++ b/net/isc-dhcp30-server/pkg-descr @@ -5,15 +5,24 @@ DHCP Server (ISC dhcpd). In this release, support for the core DHCP protocol is provided. BOOTP support is also provided for backwards compatibility. -Version 3 of the ISC DHCP Distribution adds conditional behaviour, -address pools with access control, and client classing. An interim -implementation of dynamic DNS updates for the server only is -included, but is not supported. +Version 3, Beta 2 of the ISC DHCP Distribution includes the following +features that are new since version 2.0: + + * DHCP Failover Protocol support + * OMAPI, an API for accessing and modifying the DHCP + server and client state. + * Conditional behaviour + * Storing arbitrary information on leases + * Address pools with access control + * Client classing + * Address allocation restriction by class + * Relay agent information option support + * Dynamic DNS updates + * Many bug fixes, performance enhancements, and minor + new DHCP protocol features. + +A fully-featured implementation of dynamic DNS updates is included in +this release. There are no build dependencies with any BIND version. -Features in upcoming releases, starting with 3.1, will include the -final asynchronous Dynamic DNS Support, DHCPv4 16-bit option codes, -asynchronous DNS query resolution, DHCP Authentication, and support -for a DHCP Interserver Protocol and live querying and update of the -DHCP database. WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile index bbe831a5ca3d..ac2a7372fd1f 100644 --- a/net/isc-dhcp31-server/Makefile +++ b/net/isc-dhcp31-server/Makefile @@ -14,13 +14,11 @@ DISTNAME= dhcp-3.0b2pl5 MAINTAINER= obrien@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8 - Y2K= http://www.isc.org/y2k.html HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-nsupdate +MAN3= dhcpctl.3 omapi.3 MAN5= dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \ dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \ dhcpd.leases.5 diff --git a/net/isc-dhcp31-server/files/patch-site.conf b/net/isc-dhcp31-server/files/patch-site.conf index 5c537dbcf298..177b0a77e6d6 100644 --- a/net/isc-dhcp31-server/files/patch-site.conf +++ b/net/isc-dhcp31-server/files/patch-site.conf @@ -1,6 +1,6 @@ ---- site.conf Wed Jul 7 17:20:10 1999 -+++ site.conf Tue May 9 21:23:20 2000 -@@ -1,2 +1,21 @@ +--- site.conf.orig Wed Jul 7 08:20:10 1999 ++++ site.conf Sat Sep 30 11:34:07 2000 +@@ -1,2 +1,23 @@ # Put local site configuration stuff here to override the default # settings in Makefile.conf + @@ -14,6 +14,8 @@ +ADMMANEXT = .8 +FFMANDIR = $(PREFIX)/man/man5 +FFMANEXT = .5 ++LIBMANDIR = $(PREFIX)/man/man3 ++LIBMANEXT = 3 + +BINDLIBDEF = -L$(PREFIX)/lib -lbind +BINDINCDEF = -I$(PREFIX)/include/bind diff --git a/net/isc-dhcp31-server/pkg-descr b/net/isc-dhcp31-server/pkg-descr index ea6d2eeb6dd6..46bdf5ebae8e 100644 --- a/net/isc-dhcp31-server/pkg-descr +++ b/net/isc-dhcp31-server/pkg-descr @@ -5,15 +5,24 @@ DHCP Server (ISC dhcpd). In this release, support for the core DHCP protocol is provided. BOOTP support is also provided for backwards compatibility. -Version 3 of the ISC DHCP Distribution adds conditional behaviour, -address pools with access control, and client classing. An interim -implementation of dynamic DNS updates for the server only is -included, but is not supported. +Version 3, Beta 2 of the ISC DHCP Distribution includes the following +features that are new since version 2.0: + + * DHCP Failover Protocol support + * OMAPI, an API for accessing and modifying the DHCP + server and client state. + * Conditional behaviour + * Storing arbitrary information on leases + * Address pools with access control + * Client classing + * Address allocation restriction by class + * Relay agent information option support + * Dynamic DNS updates + * Many bug fixes, performance enhancements, and minor + new DHCP protocol features. + +A fully-featured implementation of dynamic DNS updates is included in +this release. There are no build dependencies with any BIND version. -Features in upcoming releases, starting with 3.1, will include the -final asynchronous Dynamic DNS Support, DHCPv4 16-bit option codes, -asynchronous DNS query resolution, DHCP Authentication, and support -for a DHCP Interserver Protocol and live querying and update of the -DHCP database. WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile index bbe831a5ca3d..ac2a7372fd1f 100644 --- a/net/isc-dhcp40-server/Makefile +++ b/net/isc-dhcp40-server/Makefile @@ -14,13 +14,11 @@ DISTNAME= dhcp-3.0b2pl5 MAINTAINER= obrien@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/include/bind/res_update.h:${PORTSDIR}/net/bind8 - Y2K= http://www.isc.org/y2k.html HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-nsupdate +MAN3= dhcpctl.3 omapi.3 MAN5= dhclient.conf.5 dhclient.leases.5 dhcp-contrib.5 \ dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \ dhcpd.leases.5 diff --git a/net/isc-dhcp40-server/files/patch-site.conf b/net/isc-dhcp40-server/files/patch-site.conf index 5c537dbcf298..177b0a77e6d6 100644 --- a/net/isc-dhcp40-server/files/patch-site.conf +++ b/net/isc-dhcp40-server/files/patch-site.conf @@ -1,6 +1,6 @@ ---- site.conf Wed Jul 7 17:20:10 1999 -+++ site.conf Tue May 9 21:23:20 2000 -@@ -1,2 +1,21 @@ +--- site.conf.orig Wed Jul 7 08:20:10 1999 ++++ site.conf Sat Sep 30 11:34:07 2000 +@@ -1,2 +1,23 @@ # Put local site configuration stuff here to override the default # settings in Makefile.conf + @@ -14,6 +14,8 @@ +ADMMANEXT = .8 +FFMANDIR = $(PREFIX)/man/man5 +FFMANEXT = .5 ++LIBMANDIR = $(PREFIX)/man/man3 ++LIBMANEXT = 3 + +BINDLIBDEF = -L$(PREFIX)/lib -lbind +BINDINCDEF = -I$(PREFIX)/include/bind diff --git a/net/isc-dhcp40-server/pkg-descr b/net/isc-dhcp40-server/pkg-descr index ea6d2eeb6dd6..46bdf5ebae8e 100644 --- a/net/isc-dhcp40-server/pkg-descr +++ b/net/isc-dhcp40-server/pkg-descr @@ -5,15 +5,24 @@ DHCP Server (ISC dhcpd). In this release, support for the core DHCP protocol is provided. BOOTP support is also provided for backwards compatibility. -Version 3 of the ISC DHCP Distribution adds conditional behaviour, -address pools with access control, and client classing. An interim -implementation of dynamic DNS updates for the server only is -included, but is not supported. +Version 3, Beta 2 of the ISC DHCP Distribution includes the following +features that are new since version 2.0: + + * DHCP Failover Protocol support + * OMAPI, an API for accessing and modifying the DHCP + server and client state. + * Conditional behaviour + * Storing arbitrary information on leases + * Address pools with access control + * Client classing + * Address allocation restriction by class + * Relay agent information option support + * Dynamic DNS updates + * Many bug fixes, performance enhancements, and minor + new DHCP protocol features. + +A fully-featured implementation of dynamic DNS updates is included in +this release. There are no build dependencies with any BIND version. -Features in upcoming releases, starting with 3.1, will include the -final asynchronous Dynamic DNS Support, DHCPv4 16-bit option codes, -asynchronous DNS query resolution, DHCP Authentication, and support -for a DHCP Interserver Protocol and live querying and update of the -DHCP database. WWW: http://www.isc.org/products/DHCP/