From 31bd121371746ddd18405d0b8e546017a9062729 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 16 Jun 2008 14:52:58 +0000 Subject: Make sure that DHCP 3 packages only pull in v3, not v4. Bump revisions. --- net/isc-dhclient/Makefile | 3 ++- net/isc-dhcp/buildlink3.mk | 4 ++-- net/isc-dhcrelay/Makefile | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net/isc-dhclient/Makefile b/net/isc-dhclient/Makefile index 861d31153ea..e8e982abeca 100644 --- a/net/isc-dhclient/Makefile +++ b/net/isc-dhclient/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2008/05/27 19:35:16 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2008/06/16 14:52:58 joerg Exp $ # COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Client COMPONENT= client SUBDIR= client +PKGREVISION= 1 CONFLICTS+= isc-dhclient-[0-9]* diff --git a/net/isc-dhcp/buildlink3.mk b/net/isc-dhcp/buildlink3.mk index 5d041e65e92..11c5fc0ffa5 100644 --- a/net/isc-dhcp/buildlink3.mk +++ b/net/isc-dhcp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/12/13 02:54:49 taca Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2008/06/16 14:52:58 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ISC_DHCP_BASE_BUILDLINK3_MK:= ${ISC_DHCP_BASE_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= isc-dhcp-base BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}isc-dhcp-base .if ${ISC_DHCP_BASE_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.isc-dhcp-base+= isc-dhcp-base>=3.1.0 +BUILDLINK_API_DEPENDS.isc-dhcp-base+= isc-dhcp-base>=3.1.0<4 BUILDLINK_PKGSRCDIR.isc-dhcp-base?= ../../net/isc-dhcp .endif # ISC_DHCP_BASE_BUILDLINK3_MK diff --git a/net/isc-dhcrelay/Makefile b/net/isc-dhcrelay/Makefile index 8b6b3f3c2b8..1d63df318e5 100644 --- a/net/isc-dhcrelay/Makefile +++ b/net/isc-dhcrelay/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2008/05/27 19:35:36 adrianp Exp $ +# $NetBSD: Makefile,v 1.6 2008/06/16 14:52:58 joerg Exp $ # COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Relay COMPONENT= relay SUBDIR= relay +PKGREVISION= 1 RCD_SCRIPTS= isc_dhcrelay MAN_FILES= man8/dhcrelay.8 -- cgit v1.2.3