Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Jun 2018 18:51:28 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r472898 - in head/textproc: cmark py-CommonMark
Message-ID:  <201806201851.w5KIpSWW036003@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Wed Jun 20 18:51:27 2018
New Revision: 472898
URL: https://svnweb.freebsd.org/changeset/ports/472898

Log:
  Add CONFLICTS_INSTALL to py-CommonMark/Makefile and cmark/Makefile
  
  They both install bin/cmark
  
  Approved by:	portmgr

Modified:
  head/textproc/cmark/Makefile
  head/textproc/py-CommonMark/Makefile

Modified: head/textproc/cmark/Makefile
==============================================================================
--- head/textproc/cmark/Makefile	Wed Jun 20 18:49:52 2018	(r472897)
+++ head/textproc/cmark/Makefile	Wed Jun 20 18:51:27 2018	(r472898)
@@ -11,6 +11,8 @@ COMMENT=	CommonMark parsing and rendering library and 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+CONFLICTS_INSTALL=	py[2-3][0-9]-CommonMark
+
 USES=		cmake:outsource python:3.4+,test
 USE_GITHUB=	yes
 GH_ACCOUNT=	commonmark

Modified: head/textproc/py-CommonMark/Makefile
==============================================================================
--- head/textproc/py-CommonMark/Makefile	Wed Jun 20 18:49:52 2018	(r472897)
+++ head/textproc/py-CommonMark/Makefile	Wed Jun 20 18:51:27 2018	(r472898)
@@ -13,6 +13,8 @@ COMMENT=	Python parser for the CommonMark Markdown spe
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+CONFLICTS_INSTALL=	cmark
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
 
 USES=		python



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