From owner-svn-ports-head@freebsd.org Wed Jun 20 18:51:28 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C40331003E5D; Wed, 20 Jun 2018 18:51:28 +0000 (UTC) (envelope-from yuri@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 753A66D241; Wed, 20 Jun 2018 18:51:28 +0000 (UTC) (envelope-from yuri@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 5677D262AC; Wed, 20 Jun 2018 18:51:28 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5KIpS7S036005; Wed, 20 Jun 2018 18:51:28 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5KIpSWW036003; Wed, 20 Jun 2018 18:51:28 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201806201851.w5KIpSWW036003@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Wed, 20 Jun 2018 18:51:28 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/textproc: cmark py-CommonMark X-SVN-Commit-Revision: 472898 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.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jun 2018 18:51:28 -0000 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