Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Feb 2014 02:54:22 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342625 - head/net/isc-dhcp42-server
Message-ID:  <201402050254.s152sMwc095772@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zi
Date: Wed Feb  5 02:54:22 2014
New Revision: 342625
URL: http://svnweb.freebsd.org/changeset/ports/342625
QAT: https://qat.redports.org/buildarchive/r342625/

Log:
  - Update to 4.2.6
  - Update CONFLICTS for upcoming isc-dhcp43-* ports

Modified:
  head/net/isc-dhcp42-server/Makefile
  head/net/isc-dhcp42-server/distinfo

Modified: head/net/isc-dhcp42-server/Makefile
==============================================================================
--- head/net/isc-dhcp42-server/Makefile	Wed Feb  5 02:15:47 2014	(r342624)
+++ head/net/isc-dhcp42-server/Makefile	Wed Feb  5 02:54:22 2014	(r342625)
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	dhcp
-DISTVERSION=	4.2.5
+DISTVERSION=	4.2.6
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${DISTVERSION}-${PATCHLEVEL}
+MASTER_SITE_SUBDIR=	${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	42-${SUBSYS}
-DISTNAME=	${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
+#DISTNAME=	${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT?=	The ISC Dynamic Host Configuration Protocol server
@@ -24,7 +24,7 @@ PORTREVISION_CLIENT=	0
 PORTREVISION_RELAY=	0
 
 SUBSYS?=	server
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
+#WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
 
 UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
@@ -41,14 +41,15 @@ BIND_SYMBOLS_DESC=	Enable BIND internal 
 
 # PORTREVISION and CONFLICTS handling
 .if ${SUBSYS} == client
-CONFLICTS=	isc-dhcp3?-client-[0-9]* isc-dhcp41-client-[0-9]*
+CONFLICTS=	isc-dhcp3?-client-[0-9]* isc-dhcp4[13]-client-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_CLIENT}
 .elif ${SUBSYS} == relay
-CONFLICTS=	isc-dhcp3?-relay-[0-9]* isc-dhcp41-relay-[0-9]*
+CONFLICTS=	isc-dhcp3?-relay-[0-9]* isc-dhcp4[13]-relay-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_RELAY}
 .else
-CONFLICTS=	isc-dhcp3?-server-[0-9]* isc-dhcp41-server-[0-9]*
+CONFLICTS=	isc-dhcp3?-server-[0-9]* isc-dhcp4[13]-server-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_SERVER}
+MAKE_JOBS_UNSAFE=	yes
 .endif
 
 .if ${SUBSYS} == server

Modified: head/net/isc-dhcp42-server/distinfo
==============================================================================
--- head/net/isc-dhcp42-server/distinfo	Wed Feb  5 02:15:47 2014	(r342624)
+++ head/net/isc-dhcp42-server/distinfo	Wed Feb  5 02:54:22 2014	(r342625)
@@ -1,2 +1,2 @@
-SHA256 (dhcp-4.2.5-P1.tar.gz) = 59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250
-SIZE (dhcp-4.2.5-P1.tar.gz) = 8255960
+SHA256 (dhcp-4.2.6.tar.gz) = ab3aaab3c938a1c0e44fd75ee4d51682d35eb8328e991006cc6ee17514bfe291
+SIZE (dhcp-4.2.6.tar.gz) = 8935311



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402050254.s152sMwc095772>