Unbreak this port - it's easy enough to get the config files in the

right places.

18 files changed, 216 insertions, 24 deletions

diff --git a/net/isc-dhcp2/Makefile b/net/isc-dhcp2/Makefile
index 2f77c32f5015..9b16d7fe0df3 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.27 1999/05/02 11:19:06 jseger Exp $
+# $Id: Makefile,v 1.28 1999/06/15 00:40:08 obrien Exp $
 #
 
 DISTNAME=       dhcp-2.0b1pl27
@@ -13,8 +13,6 @@ MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
 
 MAINTAINER=	jseger@FreeBSD.org
 
-BROKEN='BROKEN='port installs files into /etc (dhclient.conf) rather than PREFIX/etc'
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp2/files/patch-aj b/net/isc-dhcp2/files/patch-aj
new file mode 100644
index 000000000000..4e86342367bf
--- /dev/null
+++ b/net/isc-dhcp2/files/patch-aj
@@ -0,0 +1,34 @@
+--- 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
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF	"/usr/local/etc/dhcpd.conf"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_DB
+-#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
++#define _PATH_DHCPD_DB		"/usr/local/etc/dhcpd.leases"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_PID
+@@ -431,7 +431,7 @@
+ #endif
+ 
+ #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 @@
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_DB
+-#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
++#define _PATH_DHCLIENT_DB	"/usr/local/etc/dhclient.leases"
+ #endif
+ 
+ #ifndef _PATH_RESOLV_CONF
diff --git a/net/isc-dhcp2/pkg-plist b/net/isc-dhcp2/pkg-plist
index c18356d090d3..7a882e2ce1c7 100644
--- a/net/isc-dhcp2/pkg-plist
+++ b/net/isc-dhcp2/pkg-plist
@@ -3,4 +3,4 @@ sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index 2f77c32f5015..9b16d7fe0df3 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.27 1999/05/02 11:19:06 jseger Exp $
+# $Id: Makefile,v 1.28 1999/06/15 00:40:08 obrien Exp $
 #
 
 DISTNAME=       dhcp-2.0b1pl27
@@ -13,8 +13,6 @@ MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
 
 MAINTAINER=	jseger@FreeBSD.org
 
-BROKEN='BROKEN='port installs files into /etc (dhclient.conf) rather than PREFIX/etc'
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp3-server/files/patch-aj b/net/isc-dhcp3-server/files/patch-aj
new file mode 100644
index 000000000000..4e86342367bf
--- /dev/null
+++ b/net/isc-dhcp3-server/files/patch-aj
@@ -0,0 +1,34 @@
+--- 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
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF	"/usr/local/etc/dhcpd.conf"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_DB
+-#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
++#define _PATH_DHCPD_DB		"/usr/local/etc/dhcpd.leases"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_PID
+@@ -431,7 +431,7 @@
+ #endif
+ 
+ #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 @@
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_DB
+-#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
++#define _PATH_DHCLIENT_DB	"/usr/local/etc/dhclient.leases"
+ #endif
+ 
+ #ifndef _PATH_RESOLV_CONF
diff --git a/net/isc-dhcp3-server/pkg-plist b/net/isc-dhcp3-server/pkg-plist
index c18356d090d3..7a882e2ce1c7 100644
--- a/net/isc-dhcp3-server/pkg-plist
+++ b/net/isc-dhcp3-server/pkg-plist
@@ -3,4 +3,4 @@ sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index 2f77c32f5015..9b16d7fe0df3 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.27 1999/05/02 11:19:06 jseger Exp $
+# $Id: Makefile,v 1.28 1999/06/15 00:40:08 obrien Exp $
 #
 
 DISTNAME=       dhcp-2.0b1pl27
@@ -13,8 +13,6 @@ MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
 
 MAINTAINER=	jseger@FreeBSD.org
 
-BROKEN='BROKEN='port installs files into /etc (dhclient.conf) rather than PREFIX/etc'
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp3/files/patch-aj b/net/isc-dhcp3/files/patch-aj
new file mode 100644
index 000000000000..4e86342367bf
--- /dev/null
+++ b/net/isc-dhcp3/files/patch-aj
@@ -0,0 +1,34 @@
+--- 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
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF	"/usr/local/etc/dhcpd.conf"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_DB
+-#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
++#define _PATH_DHCPD_DB		"/usr/local/etc/dhcpd.leases"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_PID
+@@ -431,7 +431,7 @@
+ #endif
+ 
+ #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 @@
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_DB
+-#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
++#define _PATH_DHCLIENT_DB	"/usr/local/etc/dhclient.leases"
+ #endif
+ 
+ #ifndef _PATH_RESOLV_CONF
diff --git a/net/isc-dhcp3/pkg-plist b/net/isc-dhcp3/pkg-plist
index c18356d090d3..7a882e2ce1c7 100644
--- a/net/isc-dhcp3/pkg-plist
+++ b/net/isc-dhcp3/pkg-plist
@@ -3,4 +3,4 @@ sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 2f77c32f5015..9b16d7fe0df3 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.27 1999/05/02 11:19:06 jseger Exp $
+# $Id: Makefile,v 1.28 1999/06/15 00:40:08 obrien Exp $
 #
 
 DISTNAME=       dhcp-2.0b1pl27
@@ -13,8 +13,6 @@ MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
 
 MAINTAINER=	jseger@FreeBSD.org
 
-BROKEN='BROKEN='port installs files into /etc (dhclient.conf) rather than PREFIX/etc'
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp30-server/files/patch-aj b/net/isc-dhcp30-server/files/patch-aj
new file mode 100644
index 000000000000..4e86342367bf
--- /dev/null
+++ b/net/isc-dhcp30-server/files/patch-aj
@@ -0,0 +1,34 @@
+--- 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
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF	"/usr/local/etc/dhcpd.conf"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_DB
+-#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
++#define _PATH_DHCPD_DB		"/usr/local/etc/dhcpd.leases"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_PID
+@@ -431,7 +431,7 @@
+ #endif
+ 
+ #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 @@
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_DB
+-#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
++#define _PATH_DHCLIENT_DB	"/usr/local/etc/dhclient.leases"
+ #endif
+ 
+ #ifndef _PATH_RESOLV_CONF
diff --git a/net/isc-dhcp30-server/pkg-plist b/net/isc-dhcp30-server/pkg-plist
index c18356d090d3..7a882e2ce1c7 100644
--- a/net/isc-dhcp30-server/pkg-plist
+++ b/net/isc-dhcp30-server/pkg-plist
@@ -3,4 +3,4 @@ sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 2f77c32f5015..9b16d7fe0df3 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.27 1999/05/02 11:19:06 jseger Exp $
+# $Id: Makefile,v 1.28 1999/06/15 00:40:08 obrien Exp $
 #
 
 DISTNAME=       dhcp-2.0b1pl27
@@ -13,8 +13,6 @@ MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
 
 MAINTAINER=	jseger@FreeBSD.org
 
-BROKEN='BROKEN='port installs files into /etc (dhclient.conf) rather than PREFIX/etc'
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp31-server/files/patch-aj b/net/isc-dhcp31-server/files/patch-aj
new file mode 100644
index 000000000000..4e86342367bf
--- /dev/null
+++ b/net/isc-dhcp31-server/files/patch-aj
@@ -0,0 +1,34 @@
+--- 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
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF	"/usr/local/etc/dhcpd.conf"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_DB
+-#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
++#define _PATH_DHCPD_DB		"/usr/local/etc/dhcpd.leases"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_PID
+@@ -431,7 +431,7 @@
+ #endif
+ 
+ #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 @@
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_DB
+-#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
++#define _PATH_DHCLIENT_DB	"/usr/local/etc/dhclient.leases"
+ #endif
+ 
+ #ifndef _PATH_RESOLV_CONF
diff --git a/net/isc-dhcp31-server/pkg-plist b/net/isc-dhcp31-server/pkg-plist
index c18356d090d3..7a882e2ce1c7 100644
--- a/net/isc-dhcp31-server/pkg-plist
+++ b/net/isc-dhcp31-server/pkg-plist
@@ -3,4 +3,4 @@ sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 2f77c32f5015..9b16d7fe0df3 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.27 1999/05/02 11:19:06 jseger Exp $
+# $Id: Makefile,v 1.28 1999/06/15 00:40:08 obrien Exp $
 #
 
 DISTNAME=       dhcp-2.0b1pl27
@@ -13,8 +13,6 @@ MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
 
 MAINTAINER=	jseger@FreeBSD.org
 
-BROKEN='BROKEN='port installs files into /etc (dhclient.conf) rather than PREFIX/etc'
-
 Y2K=		http://www.isc.org/y2k.html
 
 HAS_CONFIGURE=	yes
diff --git a/net/isc-dhcp40-server/files/patch-aj b/net/isc-dhcp40-server/files/patch-aj
new file mode 100644
index 000000000000..4e86342367bf
--- /dev/null
+++ b/net/isc-dhcp40-server/files/patch-aj
@@ -0,0 +1,34 @@
+--- 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
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF	"/usr/local/etc/dhcpd.conf"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_DB
+-#define _PATH_DHCPD_DB		"/etc/dhcpd.leases"
++#define _PATH_DHCPD_DB		"/usr/local/etc/dhcpd.leases"
+ #endif
+ 
+ #ifndef _PATH_DHCPD_PID
+@@ -431,7 +431,7 @@
+ #endif
+ 
+ #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 @@
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_DB
+-#define _PATH_DHCLIENT_DB	"/etc/dhclient.leases"
++#define _PATH_DHCLIENT_DB	"/usr/local/etc/dhclient.leases"
+ #endif
+ 
+ #ifndef _PATH_RESOLV_CONF
diff --git a/net/isc-dhcp40-server/pkg-plist b/net/isc-dhcp40-server/pkg-plist
index c18356d090d3..7a882e2ce1c7 100644
--- a/net/isc-dhcp40-server/pkg-plist
+++ b/net/isc-dhcp40-server/pkg-plist
@@ -3,4 +3,4 @@ sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf