Add a CONFLICTS for the upcoming import of 4.x

Sync PID file location between versions
PKGREVISION++

8 files changed, 17 insertions, 12 deletions

diff --git a/net/isc-dhclient/Makefile b/net/isc-dhclient/Makefile
index 3ff8b33fc9c..11ef710cca3 100644
--- a/net/isc-dhclient/Makefile
+++ b/net/isc-dhclient/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/12/30 12:30:53 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2008/01/03 12:25:01 adrianp Exp $
 #
 
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Client
 COMPONENT=	client
-PKGREVISION=	1
+PKGREVISION=	2
 SUBDIR=		client
 
 CONF_FILES+=	${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf
diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile
index dfe7e6f958a..9264bb690e7 100644
--- a/net/isc-dhcp/Makefile
+++ b/net/isc-dhcp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/12/13 02:54:49 taca Exp $
+# $NetBSD: Makefile,v 1.3 2008/01/03 12:25:01 adrianp Exp $
 #
 
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Base
 COMPONENT=	base
+PKGREVISION=	1
 SUBDIR=		common minires dst
 
 MAN_FILES=	man5/dhcp-eval.5 man5/dhcp-options.5
diff --git a/net/isc-dhcp/Makefile.common b/net/isc-dhcp/Makefile.common
index 5b2f776f5e8..bdd4b577223 100644
--- a/net/isc-dhcp/Makefile.common
+++ b/net/isc-dhcp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2007/12/12 20:02:08 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.2 2008/01/03 12:25:01 adrianp Exp $
 #
 
 DISTNAME=		dhcp-3.1.0
@@ -10,6 +10,8 @@ MASTER_SITES=		http://ftp.isc.org/isc/dhcp/ \
 MAINTAINER=		adrianp@NetBSD.org
 HOMEPAGE=		http://www.isc.org/sw/dhcp/
 
+CONFLICTS+=		isc-dhcp-base-4.*{,nb*}
+
 .include "../../mk/bsd.prefs.mk"
 
 HAS_CONFIGURE=		yes
diff --git a/net/isc-dhcp/files/isc_dhclient.sh b/net/isc-dhcp/files/isc_dhclient.sh
index 4878e329df1..f9c1d6c779c 100755
--- a/net/isc-dhcp/files/isc_dhclient.sh
+++ b/net/isc-dhcp/files/isc_dhclient.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: isc_dhclient.sh,v 1.2 2007/12/30 12:30:52 adrianp Exp $
+# $NetBSD: isc_dhclient.sh,v 1.3 2008/01/03 12:25:01 adrianp Exp $
 #
 
 # PROVIDE: dhclient
@@ -18,7 +18,7 @@ fi
 name="dhclient"
 rcvar="isc_${name}"
 command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/dhclient.pid"
+pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
 start_precmd="isc_dhclient_precmd"
 
 isc_dhclient_precmd()
diff --git a/net/isc-dhcp/files/isc_dhcrelay.sh b/net/isc-dhcp/files/isc_dhcrelay.sh
index 78d3236c648..8bd8372b45b 100755
--- a/net/isc-dhcp/files/isc_dhcrelay.sh
+++ b/net/isc-dhcp/files/isc_dhcrelay.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: isc_dhcrelay.sh,v 1.2 2007/12/30 12:30:52 adrianp Exp $
+# $NetBSD: isc_dhcrelay.sh,v 1.3 2008/01/03 12:25:01 adrianp Exp $
 #
 
 # PROVIDE: dhcrelay
@@ -18,7 +18,7 @@ fi
 name="dhcrelay"
 rcvar="isc_${name}"
 command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/${name}.pid"
+pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
 start_precmd="isc_dhcrelay_precmd"
 
 isc_dhcrelay_precmd()
diff --git a/net/isc-dhcp/files/site.h b/net/isc-dhcp/files/site.h
index 6f9ba313b28..aee45aec0d2 100644
--- a/net/isc-dhcp/files/site.h
+++ b/net/isc-dhcp/files/site.h
@@ -1,6 +1,8 @@
 #define _PATH_DHCPD_CONF "@@SYSCONFDIR@@/dhcpd.conf"
 #define _PATH_DHCPD_PID "@@VARBASE@@/run/isc-dhcp/isc-dhcpd.pid"
 #define _PATH_DHCPD_DB "@@VARBASE@@/db/isc-dhcp/dhcpd.leases"
+#define _PATH_DHCLIENT_PID "@@VARBASE@@/run/isc-dhcp/isc-dhclient.pid"
 #define _PATH_DHCLIENT_DB "@@VARBASE@@/db/isc-dhcp/dhclient.leases"
 #define _PATH_DHCLIENT_SCRIPT "@@PREFIX@@/sbin/dhclient-script"
+#define _PATH_DHCRELAY_PID "@@VARBASE@@/run/isc-dhcp/isc-dhcrelay.pid"
 #define DHCPD_LOG_FACILITY LOG_LOCAL@@DHCP_SYSLOG_LEVEL@@
diff --git a/net/isc-dhcpd/Makefile b/net/isc-dhcpd/Makefile
index 0a102f8c63f..e75c2a5be49 100644
--- a/net/isc-dhcpd/Makefile
+++ b/net/isc-dhcpd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/12/29 01:06:53 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2008/01/03 12:25:02 adrianp Exp $
 #
 
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Server
 COMPONENT=	server
-PKGREVISION=	1
+PKGREVISION=	2
 SUBDIR=		omapip dhcpctl server
 
 CONF_FILES+=	${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf
diff --git a/net/isc-dhcrelay/Makefile b/net/isc-dhcrelay/Makefile
index 2af9467d5f4..942b72dd2c6 100644
--- a/net/isc-dhcrelay/Makefile
+++ b/net/isc-dhcrelay/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/12/30 12:30:53 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2008/01/03 12:25:02 adrianp Exp $
 #
 
 COMMENT=	ISC Dynamic Host Configuration Protocol (DHCP) Relay
 COMPONENT=	relay
-PKGREVISION=	1
+PKGREVISION=	2
 SUBDIR=		relay
 
 RCD_SCRIPTS=	isc_dhcrelay