From owner-svn-ports-head@freebsd.org  Sat Apr  2 16:41:36 2016
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 AFC5BB0021D;
 Sat,  2 Apr 2016 16:41:36 +0000 (UTC)
 (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 820EA15E2;
 Sat,  2 Apr 2016 16:41:36 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u32GfZMo055211;
 Sat, 2 Apr 2016 16:41:35 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u32GfZMk055209;
 Sat, 2 Apr 2016 16:41:35 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201604021641.u32GfZMk055209@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sat, 2 Apr 2016 16:41:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r412419 - in head/graphics: sekrit-twc-zimg zimg
X-SVN-Group: ports-head
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.21
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: Sat, 02 Apr 2016 16:41:36 -0000

Author: jbeich
Date: Sat Apr  2 16:41:35 2016
New Revision: 412419
URL: https://svnweb.freebsd.org/changeset/ports/412419

Log:
  graphics/zimg: conflict with graphics/sekrit-twc-zimg

Modified:
  head/graphics/sekrit-twc-zimg/Makefile   (contents, props changed)
  head/graphics/zimg/Makefile   (contents, props changed)

Modified: head/graphics/sekrit-twc-zimg/Makefile
==============================================================================
--- head/graphics/sekrit-twc-zimg/Makefile	Sat Apr  2 16:30:12 2016	(r412418)
+++ head/graphics/sekrit-twc-zimg/Makefile	Sat Apr  2 16:41:35 2016	(r412419)
@@ -17,6 +17,8 @@ LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
 USE_GITHUB=	yes
 GH_ACCOUNT=	sekrit-twc
 
+CONFLICTS_INSTALL=	zimg-[0-9]* # include/zimg.h
+
 USES=		autoreconf compiler:c++11-lib gmake libtool pathfix
 EXTRACT_AFTER_ARGS=	--exclude test/extra
 PATHFIX_MAKEFILEIN=	Makefile.am

Modified: head/graphics/zimg/Makefile
==============================================================================
--- head/graphics/zimg/Makefile	Sat Apr  2 16:30:12 2016	(r412418)
+++ head/graphics/zimg/Makefile	Sat Apr  2 16:41:35 2016	(r412419)
@@ -12,6 +12,8 @@ COMMENT=	Image-generator that uses ASCII
 
 LIB_DEPENDS=	libgd.so:graphics/gd
 
+CONFLICTS_INSTALL=	sekrit-twc-zimg-* # include/zimg.h
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-dynaload-cc="${CC}" \
 		--with-dynaload-cflags="${CFLAGS} -shared" \