Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Apr 2016 16:41:35 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
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
Message-ID:  <201604021641.u32GfZMk055209@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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" \



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