From nobody Fri Jun 30 07:20:52 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 4Qsmv90d1hz4kqf1; Fri, 30 Jun 2023 07:20:53 +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 4Qsmv86Xbsz3ttB; Fri, 30 Jun 2023 07:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109652; 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=53E1KXdcd9mjBQaxIkEWpgWlQR+7xWn8VG64e+GO/so=; b=pobGSw0OgkbVfYSslmAXFnWaL0GdPTA1HFamrryZIKc9rwvNpToWVZMJU+uKXDadTkK2qX k0LnNNwwAK5ypDFt0YZWdP1cd8EEp/AvvUXm89DwrnN0SFlqaPNmLH09JE3NXHE+l+dun6 S4zsE/pAv/9CW3q20L5IrjdUOaOK+CsmTTTuZt/w16RKyIKdYM8dAeuc/btmy3xq69YVHz gzMgXVym3M6AbYjBwyh4e9SpoJE8jWry6MB8CGrdKdGpwgI0mLAk4Ud6TYd9yCtSagKylv er4gkYy4FsV01l6KikOsvT/CZv6vgoqxbu8p8OG3pn5NCxiJ2N+vrFR/15Qj8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109652; 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=53E1KXdcd9mjBQaxIkEWpgWlQR+7xWn8VG64e+GO/so=; b=oYO/QzCJFcyt4eZplXJ47CTe6HGI5hGrJzn+C6YMyM1UBN3mrgkhyoZfzA8EgqxsmZb/ba 87nMt5iIy33XzXv7uqX+RelflEvh0VOyEKBO+CbOC0+pCuKLNi6gVJuEBt6tTxedTXMTeH 1bQd0pPThG2SHkpZH0xXgiRUyXon+B8PR0KS2uxF8Y0Wqg6eMdOZqjH/ydnxcp8A0L4Q3T RlpZkd7+8Yu35NaChK0364KVfEFwNzntG1jtcq2gkf4fY4GB5UnMHg48T5aHbx1atc8RMu WJ0n9XY93YISGVAiH2T1aA4il1nC7JfYCPwiV1xZAhBuupFDE2yFHrEElopHPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109652; a=rsa-sha256; cv=none; b=afc4XHaZxTp4xJgfNMYFwnvyKmUww5j28J5P2XUDOQzFYkUCeY7wyBValfU5qUOnkRFyNi AA7nDC4DVGa5Cjk2R+CdyhLcNs67OVnuNdEZ01higjohcbZjYBoMhQkxJKWnAx1au4Eofj c5NNq+K7SoZJwUY8k6jL+n5gwgqtAPhbHTMxNIRRuQms6CHtsq2a0qxLY2474dM3NWOiDJ ahfRmxkX0XyCi6QquXSuhR1QhBoWRyzp0lzOJF6yttcKLe0Hr87efmzwE0hO107EzkTb8Z c2ZNTFkXfxtpRbIKfQVtz+5IfknJ45GOCIPhEMohx/EiPsbD5b2bHO7JlWqC/w== 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 4Qsmv85dTCzq9H; Fri, 30 Jun 2023 07:20:52 +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 35U7Kqkf076184; Fri, 30 Jun 2023 07:20:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7Kqov076183; Fri, 30 Jun 2023 07:20:52 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:20:52 GMT Message-Id: <202306300720.35U7Kqov076183@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: e62ba962ba4d - main - textproc/py-mistune0: Avoid runtime conflict with py-mistune 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e62ba962ba4d0186ab1dbdbef7863d9fab1dfd46 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e62ba962ba4d0186ab1dbdbef7863d9fab1dfd46 commit e62ba962ba4d0186ab1dbdbef7863d9fab1dfd46 Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:05:10 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:05:10 +0000 textproc/py-mistune0: Avoid runtime conflict with py-mistune - Build and install mistune as mistune0 - Bump PORTREVISION for package change PR: 263956 --- textproc/py-mistune0/Makefile | 4 ++++ textproc/py-mistune0/files/patch-setup.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/textproc/py-mistune0/Makefile b/textproc/py-mistune0/Makefile index 7f909cf62783..8a6612813d0b 100644 --- a/textproc/py-mistune0/Makefile +++ b/textproc/py-mistune0/Makefile @@ -1,5 +1,6 @@ PORTNAME= mistune PORTVERSION= 0.8.4 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -23,6 +24,9 @@ CPE_VENDOR= mistune_project PORTSCOUT= limit:^0\. +post-patch: + @${MV} ${WRKSRC}/mistune.py ${WRKSRC}/mistune0.py + do-test: cd ${WRKSRC} && ${PYTHON_CMD} -m nose -v diff --git a/textproc/py-mistune0/files/patch-setup.py b/textproc/py-mistune0/files/patch-setup.py new file mode 100644 index 000000000000..0c6ba0c20482 --- /dev/null +++ b/textproc/py-mistune0/files/patch-setup.py @@ -0,0 +1,29 @@ +--- setup.py.orig 2018-10-11 06:57:07 UTC ++++ setup.py +@@ -1,6 +1,6 @@ + #!/usr/bin/env python + # coding: utf-8 +-import mistune ++import mistune0 + from setuptools import setup + + +@@ -10,15 +10,15 @@ def fread(filepath): + + + setup( +- name='mistune', +- version=mistune.__version__, ++ name='mistune0', ++ version=mistune0.__version__, + url='https://github.com/lepture/mistune', + author='Hsiaoming Yang', + author_email='me@lepture.com', + description='The fastest markdown parser in pure Python', + long_description=fread('README.rst'), + license='BSD', +- py_modules=['mistune'], ++ py_modules=['mistune0'], + zip_safe=False, + platforms='any', + tests_require=['nose'],