From owner-svn-ports-head@freebsd.org  Tue Jan  9 20:37:19 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 43AC4E70AFC;
 Tue,  9 Jan 2018 20:37:19 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1E7D76F7C7;
 Tue,  9 Jan 2018 20:37:19 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 44AE61BE89;
 Tue,  9 Jan 2018 20:37:18 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w09KbIZ2089508;
 Tue, 9 Jan 2018 20:37:18 GMT (envelope-from zi@FreeBSD.org)
Received: (from zi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w09KbI47089507;
 Tue, 9 Jan 2018 20:37:18 GMT (envelope-from zi@FreeBSD.org)
Message-Id: <201801092037.w09KbI47089507@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org
 using -f
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Tue, 9 Jan 2018 20:37:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r458567 - head/net/isc-dhcp43-server
X-SVN-Group: ports-head
X-SVN-Commit-Author: zi
X-SVN-Commit-Paths: head/net/isc-dhcp43-server
X-SVN-Commit-Revision: 458567
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jan 2018 20:37:19 -0000

Author: zi
Date: Tue Jan  9 20:37:17 2018
New Revision: 458567
URL: https://svnweb.freebsd.org/changeset/ports/458567

Log:
  - Note CONFLICTS with upcoming isc-dhcp44-* ports

Modified:
  head/net/isc-dhcp43-server/Makefile

Modified: head/net/isc-dhcp43-server/Makefile
==============================================================================
--- head/net/isc-dhcp43-server/Makefile	Tue Jan  9 20:26:55 2018	(r458566)
+++ head/net/isc-dhcp43-server/Makefile	Tue Jan  9 20:37:17 2018	(r458567)
@@ -37,13 +37,13 @@ BIND_SYMBOLS_DESC=	Enable BIND internal symbol table
 
 # PORTREVISION and CONFLICTS handling
 .if ${SUBSYS} == client
-CONFLICTS=	isc-dhcp3?-client-[0-9]* isc-dhcp4[12]-client-[0-9]*
+CONFLICTS=	isc-dhcp3?-client-[0-9]* isc-dhcp4[124]-client-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_CLIENT}
 .elif ${SUBSYS} == relay
-CONFLICTS=	isc-dhcp3?-relay-[0-9]* isc-dhcp4[12]-relay-[0-9]*
+CONFLICTS=	isc-dhcp3?-relay-[0-9]* isc-dhcp4[124]-relay-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_RELAY}
 .else
-CONFLICTS=	isc-dhcp3?-server-[0-9]* isc-dhcp4[12]-server-[0-9]*
+CONFLICTS=	isc-dhcp3?-server-[0-9]* isc-dhcp4[124]-server-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_SERVER}
 .endif
 MAKE_JOBS_UNSAFE=	yes