summaryrefslogtreecommitdiff
path: root/net/isc-dhcp31-server
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2000-06-14 16:21:21 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2000-06-14 16:21:21 +0000
commitca783cc60b9d4cc558ccff7274abfb9a0a562e8e (patch)
tree168778ea86451ade8a5e5de2248c775d696242ab /net/isc-dhcp31-server
parentThis fixes the suposed fix of Makefile rev 1.29 ad patch-aj rev 1.1. (diff)
Update to Beta version of ISC's version 3 DHCP suite.
This may be useful to monitor changes in the DHCP suite.
Notes
Notes: svn path=/head/; revision=29601
Diffstat (limited to 'net/isc-dhcp31-server')
-rw-r--r--net/isc-dhcp31-server/Makefile12
-rw-r--r--net/isc-dhcp31-server/distinfo2
-rw-r--r--net/isc-dhcp31-server/files/patch-aj32
3 files changed, 19 insertions, 27 deletions
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index d9f92558eff6..1b0d74a28f4c 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# Ports collection makefile for: dhcp
# Date created: 7 Mar 1996
# Whom: se
@@ -5,13 +6,13 @@
# $FreeBSD$
#
-PORTNAME= isc-dhcp
-PORTVERSION= 2.0
+PORTNAME= isc-dhcp3
+PORTVERSION= 3.0.b1.13
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
-DISTNAME= dhcp-${PORTVERSION}
+DISTNAME= dhcp-3.0b1pl13
-MAINTAINER= jseger@FreeBSD.org
+MAINTAINER= obrien@FreeBSD.org
Y2K= http://www.isc.org/y2k.html
@@ -21,6 +22,9 @@ MAN5= dhclient.conf.5 dhclient.leases.5 dhcp-options.5 dhcpd.conf.5 \
dhcpd.leases.5
MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
+post-patch:
+ @${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/includes/dhcpd.h
+
post-install:
${TOUCH} /var/db/dhcpd.leases
.for file in dhclient dhcpd dhcrelay
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index 5cc55bb33e25..54f4ab44ddec 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1 +1 @@
-MD5 (dhcp-2.0.tar.gz) = eff5d5359a50f878e4c0da082bf10475
+MD5 (dhcp-3.0b1pl13.tar.gz) = faf269bd5aba70eefe29345ddb905eee
diff --git a/net/isc-dhcp31-server/files/patch-aj b/net/isc-dhcp31-server/files/patch-aj
index 4e86342367bf..01405d8411ef 100644
--- a/net/isc-dhcp31-server/files/patch-aj
+++ b/net/isc-dhcp31-server/files/patch-aj
@@ -1,34 +1,22 @@
---- includes/dhcpd.h.orig Sun Jun 20 14:52:30 1999
-+++ includes/dhcpd.h Sun Jun 20 14:53:39 1999
-@@ -418,11 +418,11 @@
- #define _PATH_DHCPD_DB "dhcpd.leases"
- #else
+--- includes/dhcpd.h.orig Wed Feb 2 09:01:17 2000
++++ includes/dhcpd.h Wed Jun 14 08:28:48 2000
+@@ -773,3 +773,3 @@
#ifndef _PATH_DHCPD_CONF
-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
-+#define _PATH_DHCPD_CONF "/usr/local/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF "!!PREFIX!!/etc/dhcpd.conf"
#endif
-
+@@ -777,3 +777,3 @@
#ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB "/etc/dhcpd.leases"
-+#define _PATH_DHCPD_DB "/usr/local/etc/dhcpd.leases"
++#define _PATH_DHCPD_DB "!!PREFIX!!/etc/dhcpd.leases"
#endif
-
- #ifndef _PATH_DHCPD_PID
-@@ -431,7 +431,7 @@
- #endif
-
+@@ -786,3 +786,3 @@
#ifndef _PATH_DHCLIENT_CONF
-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
-+#define _PATH_DHCLIENT_CONF "/usr/local/etc/dhclient.conf"
- #endif
-
- #ifndef _PATH_DHCLIENT_PID
-@@ -439,7 +439,7 @@
++#define _PATH_DHCLIENT_CONF "!!PREFIX!!/etc/dhclient.conf"
#endif
-
+@@ -794,3 +794,3 @@
#ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB "/etc/dhclient.leases"
-+#define _PATH_DHCLIENT_DB "/usr/local/etc/dhclient.leases"
++#define _PATH_DHCLIENT_DB "!!PREFIX!!/etc/dhclient.leases"
#endif
-
- #ifndef _PATH_RESOLV_CONF