[pkgsrc/trunk]: pkgsrc/net Add a CONFLICTS for the upcoming import of 4.x

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a811afb777d
branches:  trunk
changeset: 537059:1a811afb777d
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Thu Jan 03 12:25:01 2008 +0000

description:
Add a CONFLICTS for the upcoming import of 4.x
Sync PID file location between versions
PKGREVISION++

diffstat:

 net/isc-dhclient/Makefile          |  4 ++--
 net/isc-dhcp/Makefile              |  3 ++-
 net/isc-dhcp/Makefile.common       |  4 +++-
 net/isc-dhcp/files/isc_dhclient.sh |  4 ++--
 net/isc-dhcp/files/isc_dhcrelay.sh |  4 ++--
 net/isc-dhcp/files/site.h          |  2 ++
 net/isc-dhcpd/Makefile             |  4 ++--
 net/isc-dhcrelay/Makefile          |  4 ++--
 8 files changed, 17 insertions(+), 12 deletions(-)

diffs (129 lines):

diff -r e8957aa9f02e -r 1a811afb777d net/isc-dhclient/Makefile
--- a/net/isc-dhclient/Makefile Thu Jan 03 12:16:32 2008 +0000
+++ b/net/isc-dhclient/Makefile Thu Jan 03 12:25:01 2008 +0000
@@ -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 -r e8957aa9f02e -r 1a811afb777d net/isc-dhcp/Makefile
--- a/net/isc-dhcp/Makefile     Thu Jan 03 12:16:32 2008 +0000
+++ b/net/isc-dhcp/Makefile     Thu Jan 03 12:25:01 2008 +0000
@@ -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 -r e8957aa9f02e -r 1a811afb777d net/isc-dhcp/Makefile.common
--- a/net/isc-dhcp/Makefile.common      Thu Jan 03 12:16:32 2008 +0000
+++ b/net/isc-dhcp/Makefile.common      Thu Jan 03 12:25:01 2008 +0000
@@ -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 @@
 MAINTAINER=            adrianp%NetBSD.org@localhost
 HOMEPAGE=              http://www.isc.org/sw/dhcp/
 
+CONFLICTS+=            isc-dhcp-base-4.*{,nb*}
+
 .include "../../mk/bsd.prefs.mk"
 
 HAS_CONFIGURE=         yes
diff -r e8957aa9f02e -r 1a811afb777d net/isc-dhcp/files/isc_dhclient.sh
--- a/net/isc-dhcp/files/isc_dhclient.sh        Thu Jan 03 12:16:32 2008 +0000
+++ b/net/isc-dhcp/files/isc_dhclient.sh        Thu Jan 03 12:25:01 2008 +0000
@@ -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 @@
 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 -r e8957aa9f02e -r 1a811afb777d net/isc-dhcp/files/isc_dhcrelay.sh
--- a/net/isc-dhcp/files/isc_dhcrelay.sh        Thu Jan 03 12:16:32 2008 +0000
+++ b/net/isc-dhcp/files/isc_dhcrelay.sh        Thu Jan 03 12:25:01 2008 +0000
@@ -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 @@
 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 -r e8957aa9f02e -r 1a811afb777d net/isc-dhcp/files/site.h
--- a/net/isc-dhcp/files/site.h Thu Jan 03 12:16:32 2008 +0000
+++ b/net/isc-dhcp/files/site.h Thu Jan 03 12:25:01 2008 +0000
@@ -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 -r e8957aa9f02e -r 1a811afb777d net/isc-dhcpd/Makefile
--- a/net/isc-dhcpd/Makefile    Thu Jan 03 12:16:32 2008 +0000
+++ b/net/isc-dhcpd/Makefile    Thu Jan 03 12:25:01 2008 +0000
@@ -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 -r e8957aa9f02e -r 1a811afb777d net/isc-dhcrelay/Makefile
--- a/net/isc-dhcrelay/Makefile Thu Jan 03 12:16:32 2008 +0000
+++ b/net/isc-dhcrelay/Makefile Thu Jan 03 12:25:01 2008 +0000
@@ -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