From nobody Sat Nov 11 01:55:20 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRzKj1QhWz50KVm; Sat, 11 Nov 2023 01:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRzKj0n38z4S5m; Sat, 11 Nov 2023 01:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699667721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkZFQnwMe+ghMXCJy15LcuTVJFihdmTqhkCmAiH72pg=; b=US4SYGWzOQqLKK9AYqf0GZcsecWVahsIEaRBWMIZZ5eeWmUL9+yezUy1XQ87bwIik3BB3v oUWuaphZg8nuLd+YW3L4hv00/iElfDmACZMEg7TW3bzjY8smVC+eCslW0/SO3kZu9J5xHr FeVlktDuC3wT7+WKO3UZWA98hfr5oryiq2XJnzCif+pmNLW2EcgJSySAWxOeYRrJalylVN f3sxH8JT9+3IbfJvOigut8oyU8Se4c783i36N1dfH38wfVbD/2tiJYbUZHfkMqEQaMyzsU iEZDNCN7Bqycmn+4AyStvWtbrEkqs+psgPLrY74hDzKnw2HPq4k9SUHDdt25qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699667721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkZFQnwMe+ghMXCJy15LcuTVJFihdmTqhkCmAiH72pg=; b=dwxPTTMBeCZ/vPXjrXuV089zXENy7Z4p6Bm1PuvVFM72he5/rnFVdIrHYBDkl1bYzKamrE 79mNignuPEAEQ0YdlR38a4AbUAuZ+ANkX8nmFUcEp3tRiG3ndAoT4fsTuc7PTc+Ci6WeSS aw7JheTOK2BVEcmP6JNNRL1/Mxh8ZDo1rsxmfoH8xaOMHcT3zBYqYkKpAo0S14D/jc1h3s boUEfHbAoI5mO5nn1jlUjYorIIVtOzyoXs/eRdNqhct1N+QH7n/ZxoJMvWZOcszNoXB0O+ MHHOc9Azdal+FdXy4x+ZK0NVbuTXArFyEPxX5fzMML+4e8aeMhWPjufNmw3/mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699667721; a=rsa-sha256; cv=none; b=eBffxaHjpF9Rg6xDNxZdSWWbK3gubRpP6YNsUUI1QHg+Uzaxl755nmrVL6YjGxqXy0i9O1 eoKICsItLLLVTiAs+5ctO+N7wIsrbGyBxnUXx0vrTay2KW5iQ+lku9VUCO3upO1NO2Cl3V QyBS4Do3RcXIPGmhrCOYFgoVH04wqG4OiJws3NRmH2kDQNLy6zHNoVVoi37i8Ay6dUNecP /d2Y5tlrGq5kSTjjhbeFWPVpbJr0gU4EdhIDNpjR9piFCdiyiwC0ePTenmxxaoi5nGZ+MU 77drmoyRicrMSrq/K6z5kyPqgBBlArwML79tlLITYfo/xZwSdxJqvftOpWc+cQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRzKh6zdmz72H; Sat, 11 Nov 2023 01:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AB1tKpc002444; Sat, 11 Nov 2023 01:55:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AB1tKuW002441; Sat, 11 Nov 2023 01:55:20 GMT (envelope-from git) Date: Sat, 11 Nov 2023 01:55:20 GMT Message-Id: <202311110155.3AB1tKuW002441@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Romain =?utf-8?Q?Tarti=C3=A8re?= Subject: git: 2c93a03bbcd5 - main - textproc/py-CommonMark: Allow installation with textproc/cmark List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c93a03bbcd528fcdce6e06ef7f2b71017e07050 Auto-Submitted: auto-generated The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c93a03bbcd528fcdce6e06ef7f2b71017e07050 commit 2c93a03bbcd528fcdce6e06ef7f2b71017e07050 Author: Romain Tartière AuthorDate: 2023-11-11 01:42:15 +0000 Commit: Romain Tartière CommitDate: 2023-11-11 01:54:11 +0000 textproc/py-CommonMark: Allow installation with textproc/cmark Both ports install bin/cmark. Users of textproc/py-CommonMark are supposely more interested in the python module rather than the command line tool: nothing in the ports tree seems to use bin/cmark from this port. Rename the command to cmark-py to fix conflict PR: 274848 Reported by: jcfyecrayz@liamekaens.com --- textproc/cmark/Makefile | 2 -- textproc/py-CommonMark/Makefile | 3 +-- textproc/py-CommonMark/files/patch-setup.py | 11 +++++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/textproc/cmark/Makefile b/textproc/cmark/Makefile index 0f9c912ef48c..9fcb4977160a 100644 --- a/textproc/cmark/Makefile +++ b/textproc/cmark/Makefile @@ -14,8 +14,6 @@ USE_GITHUB= yes GH_ACCOUNT= commonmark USE_LDCONFIG= yes -CONFLICTS_INSTALL= py*-CommonMark # bin/cmark - CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR:STRING="lib" PLIST_SUB= VERSION=${PORTVERSION} TEST_TARGET= test diff --git a/textproc/py-CommonMark/Makefile b/textproc/py-CommonMark/Makefile index a6ef2128e115..1889c819e234 100644 --- a/textproc/py-CommonMark/Makefile +++ b/textproc/py-CommonMark/Makefile @@ -1,5 +1,6 @@ PORTNAME= CommonMark PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} -CONFLICTS_INSTALL= cmark - USES= python USE_PYTHON= autoplist concurrent distutils diff --git a/textproc/py-CommonMark/files/patch-setup.py b/textproc/py-CommonMark/files/patch-setup.py new file mode 100644 index 000000000000..27857d162967 --- /dev/null +++ b/textproc/py-CommonMark/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2023-11-11 01:20:49 UTC ++++ setup.py +@@ -48,7 +48,7 @@ setup( + keywords=["markup", "markdown", "commonmark"], + entry_points={ + 'console_scripts': [ +- 'cmark = commonmark.cmark:main', ++ 'cmark-py = commonmark.cmark:main', + ] + }, + cmdclass={'test': Test},