Index: head/net/isc-dhcp2/Makefile
===================================================================
--- head/net/isc-dhcp2/Makefile	(revision 19591)
+++ head/net/isc-dhcp2/Makefile	(revision 19592)
@@ -1,37 +1,35 @@
 # Ports collection makefile for:    dhcp
 # Version required:     2.0b1pl27
 # 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
 PKGNAME=	isc-dhcp-2.b1.27
 CATEGORIES=	net
 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
 
 CAT5=		dhclient.conf.5 dhclient.leases.5 dhcp-options.5 dhcpd.conf.5 \
 		dhcpd.leases.5
 CAT8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
 
 _MANPAGES+=	${CAT5:S%^%${MANPREFIX}/man/cat5/%}
 _MANPAGES+=	${CAT8:S%^%${MANPREFIX}/man/cat8/%}
 
 post-install:
 	${TOUCH} /var/db/dhcpd.leases
 .for file in dhclient dhcpd dhcrelay
 	if [ -f ${PREFIX}/sbin/${file} ]; then \
 		strip ${PREFIX}/sbin/${file}; \
 	fi
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.28
\ No newline at end of property
+1.29
\ No newline at end of property
Index: head/net/isc-dhcp2/files/patch-aj
===================================================================
--- head/net/isc-dhcp2/files/patch-aj	(nonexistent)
+++ head/net/isc-dhcp2/files/patch-aj	(revision 19592)
@@ -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

Property changes on: head/net/isc-dhcp2/files/patch-aj
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/isc-dhcp2/pkg-plist
===================================================================
--- head/net/isc-dhcp2/pkg-plist	(revision 19591)
+++ head/net/isc-dhcp2/pkg-plist	(revision 19592)
@@ -1,6 +1,6 @@
 etc/dhclient-script
 sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf

Property changes on: head/net/isc-dhcp2/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/net/isc-dhcp3/Makefile
===================================================================
--- head/net/isc-dhcp3/Makefile	(revision 19591)
+++ head/net/isc-dhcp3/Makefile	(revision 19592)
@@ -1,37 +1,35 @@
 # Ports collection makefile for:    dhcp
 # Version required:     2.0b1pl27
 # 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
 PKGNAME=	isc-dhcp-2.b1.27
 CATEGORIES=	net
 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
 
 CAT5=		dhclient.conf.5 dhclient.leases.5 dhcp-options.5 dhcpd.conf.5 \
 		dhcpd.leases.5
 CAT8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
 
 _MANPAGES+=	${CAT5:S%^%${MANPREFIX}/man/cat5/%}
 _MANPAGES+=	${CAT8:S%^%${MANPREFIX}/man/cat8/%}
 
 post-install:
 	${TOUCH} /var/db/dhcpd.leases
 .for file in dhclient dhcpd dhcrelay
 	if [ -f ${PREFIX}/sbin/${file} ]; then \
 		strip ${PREFIX}/sbin/${file}; \
 	fi
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.28
\ No newline at end of property
+1.29
\ No newline at end of property
Index: head/net/isc-dhcp3/files/patch-aj
===================================================================
--- head/net/isc-dhcp3/files/patch-aj	(nonexistent)
+++ head/net/isc-dhcp3/files/patch-aj	(revision 19592)
@@ -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

Property changes on: head/net/isc-dhcp3/files/patch-aj
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/isc-dhcp3/pkg-plist
===================================================================
--- head/net/isc-dhcp3/pkg-plist	(revision 19591)
+++ head/net/isc-dhcp3/pkg-plist	(revision 19592)
@@ -1,6 +1,6 @@
 etc/dhclient-script
 sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf

Property changes on: head/net/isc-dhcp3/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/net/isc-dhcp3-server/Makefile
===================================================================
--- head/net/isc-dhcp3-server/Makefile	(revision 19591)
+++ head/net/isc-dhcp3-server/Makefile	(revision 19592)
@@ -1,37 +1,35 @@
 # Ports collection makefile for:    dhcp
 # Version required:     2.0b1pl27
 # 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
 PKGNAME=	isc-dhcp-2.b1.27
 CATEGORIES=	net
 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
 
 CAT5=		dhclient.conf.5 dhclient.leases.5 dhcp-options.5 dhcpd.conf.5 \
 		dhcpd.leases.5
 CAT8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
 
 _MANPAGES+=	${CAT5:S%^%${MANPREFIX}/man/cat5/%}
 _MANPAGES+=	${CAT8:S%^%${MANPREFIX}/man/cat8/%}
 
 post-install:
 	${TOUCH} /var/db/dhcpd.leases
 .for file in dhclient dhcpd dhcrelay
 	if [ -f ${PREFIX}/sbin/${file} ]; then \
 		strip ${PREFIX}/sbin/${file}; \
 	fi
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp3-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.28
\ No newline at end of property
+1.29
\ No newline at end of property
Index: head/net/isc-dhcp3-server/files/patch-aj
===================================================================
--- head/net/isc-dhcp3-server/files/patch-aj	(nonexistent)
+++ head/net/isc-dhcp3-server/files/patch-aj	(revision 19592)
@@ -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

Property changes on: head/net/isc-dhcp3-server/files/patch-aj
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/isc-dhcp3-server/pkg-plist
===================================================================
--- head/net/isc-dhcp3-server/pkg-plist	(revision 19591)
+++ head/net/isc-dhcp3-server/pkg-plist	(revision 19592)
@@ -1,6 +1,6 @@
 etc/dhclient-script
 sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf

Property changes on: head/net/isc-dhcp3-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/net/isc-dhcp30-server/Makefile
===================================================================
--- head/net/isc-dhcp30-server/Makefile	(revision 19591)
+++ head/net/isc-dhcp30-server/Makefile	(revision 19592)
@@ -1,37 +1,35 @@
 # Ports collection makefile for:    dhcp
 # Version required:     2.0b1pl27
 # 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
 PKGNAME=	isc-dhcp-2.b1.27
 CATEGORIES=	net
 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
 
 CAT5=		dhclient.conf.5 dhclient.leases.5 dhcp-options.5 dhcpd.conf.5 \
 		dhcpd.leases.5
 CAT8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
 
 _MANPAGES+=	${CAT5:S%^%${MANPREFIX}/man/cat5/%}
 _MANPAGES+=	${CAT8:S%^%${MANPREFIX}/man/cat8/%}
 
 post-install:
 	${TOUCH} /var/db/dhcpd.leases
 .for file in dhclient dhcpd dhcrelay
 	if [ -f ${PREFIX}/sbin/${file} ]; then \
 		strip ${PREFIX}/sbin/${file}; \
 	fi
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp30-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.28
\ No newline at end of property
+1.29
\ No newline at end of property
Index: head/net/isc-dhcp30-server/files/patch-aj
===================================================================
--- head/net/isc-dhcp30-server/files/patch-aj	(nonexistent)
+++ head/net/isc-dhcp30-server/files/patch-aj	(revision 19592)
@@ -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

Property changes on: head/net/isc-dhcp30-server/files/patch-aj
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/isc-dhcp30-server/pkg-plist
===================================================================
--- head/net/isc-dhcp30-server/pkg-plist	(revision 19591)
+++ head/net/isc-dhcp30-server/pkg-plist	(revision 19592)
@@ -1,6 +1,6 @@
 etc/dhclient-script
 sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf

Property changes on: head/net/isc-dhcp30-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/net/isc-dhcp31-server/Makefile
===================================================================
--- head/net/isc-dhcp31-server/Makefile	(revision 19591)
+++ head/net/isc-dhcp31-server/Makefile	(revision 19592)
@@ -1,37 +1,35 @@
 # Ports collection makefile for:    dhcp
 # Version required:     2.0b1pl27
 # 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
 PKGNAME=	isc-dhcp-2.b1.27
 CATEGORIES=	net
 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
 
 CAT5=		dhclient.conf.5 dhclient.leases.5 dhcp-options.5 dhcpd.conf.5 \
 		dhcpd.leases.5
 CAT8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
 
 _MANPAGES+=	${CAT5:S%^%${MANPREFIX}/man/cat5/%}
 _MANPAGES+=	${CAT8:S%^%${MANPREFIX}/man/cat8/%}
 
 post-install:
 	${TOUCH} /var/db/dhcpd.leases
 .for file in dhclient dhcpd dhcrelay
 	if [ -f ${PREFIX}/sbin/${file} ]; then \
 		strip ${PREFIX}/sbin/${file}; \
 	fi
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp31-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.28
\ No newline at end of property
+1.29
\ No newline at end of property
Index: head/net/isc-dhcp31-server/files/patch-aj
===================================================================
--- head/net/isc-dhcp31-server/files/patch-aj	(nonexistent)
+++ head/net/isc-dhcp31-server/files/patch-aj	(revision 19592)
@@ -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

Property changes on: head/net/isc-dhcp31-server/files/patch-aj
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/isc-dhcp31-server/pkg-plist
===================================================================
--- head/net/isc-dhcp31-server/pkg-plist	(revision 19591)
+++ head/net/isc-dhcp31-server/pkg-plist	(revision 19592)
@@ -1,6 +1,6 @@
 etc/dhclient-script
 sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf

Property changes on: head/net/isc-dhcp31-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/net/isc-dhcp40-server/Makefile
===================================================================
--- head/net/isc-dhcp40-server/Makefile	(revision 19591)
+++ head/net/isc-dhcp40-server/Makefile	(revision 19592)
@@ -1,37 +1,35 @@
 # Ports collection makefile for:    dhcp
 # Version required:     2.0b1pl27
 # 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
 PKGNAME=	isc-dhcp-2.b1.27
 CATEGORIES=	net
 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
 
 CAT5=		dhclient.conf.5 dhclient.leases.5 dhcp-options.5 dhcpd.conf.5 \
 		dhcpd.leases.5
 CAT8=		dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
 
 _MANPAGES+=	${CAT5:S%^%${MANPREFIX}/man/cat5/%}
 _MANPAGES+=	${CAT8:S%^%${MANPREFIX}/man/cat8/%}
 
 post-install:
 	${TOUCH} /var/db/dhcpd.leases
 .for file in dhclient dhcpd dhcrelay
 	if [ -f ${PREFIX}/sbin/${file} ]; then \
 		strip ${PREFIX}/sbin/${file}; \
 	fi
 .endfor
 
 .include <bsd.port.mk>

Property changes on: head/net/isc-dhcp40-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.28
\ No newline at end of property
+1.29
\ No newline at end of property
Index: head/net/isc-dhcp40-server/files/patch-aj
===================================================================
--- head/net/isc-dhcp40-server/files/patch-aj	(nonexistent)
+++ head/net/isc-dhcp40-server/files/patch-aj	(revision 19592)
@@ -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

Property changes on: head/net/isc-dhcp40-server/files/patch-aj
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/isc-dhcp40-server/pkg-plist
===================================================================
--- head/net/isc-dhcp40-server/pkg-plist	(revision 19591)
+++ head/net/isc-dhcp40-server/pkg-plist	(revision 19592)
@@ -1,6 +1,6 @@
 etc/dhclient-script
 sbin/dhclient
 sbin/dhcpd
 sbin/dhcrelay
 @exec touch /var/db/dhcpd.leases
-@exec touch /etc/dhclient.conf
+@exec touch %D/etc/dhclient.conf

Property changes on: head/net/isc-dhcp40-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property