From nobody Sat Sep 2 08:25:36 2023 X-Original-To: dev-commits-ports-all@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 4Rd7JJ4Z5Mz4sMwN; Sat, 2 Sep 2023 08:25:36 +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 4Rd7JJ3crmz3X3G; Sat, 2 Sep 2023 08:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693643136; 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=WALxj6KUMIN3hzAIO4E86QZL1xayWJ13qPQj4sVLIyQ=; b=hqCT3+9ZNuazzFOSDK23b07BX14r7f2WxeaVnUroIUQPerPlOMf9JmdsoWlZeOtMKLWvp0 tiBnkLzwYJd+CsB5z2bSErCOBHzInWmXkQ+Rl6c7E3xZNCJ7oImDbAlAOPG7+t2UX2emHq RoElLYRYZT0yB6HfZrqzFyExFYTXuEYEhXbJlrE4iSk+vANOnjqzY7DJ1U6fRHZqA1hBFc Fv3Y5WxvpxCGrtbOWjpKfC6JSGJApvJ9kndtGmqd1K6THTYonPgnWwoliT+3YCp55hPEyN k4xVxyNsYYtnsclX23QY0BrVLTtBRY4oCkwl2ertoq4d+SlS1uTmOM6FFkbRVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693643136; a=rsa-sha256; cv=none; b=vDg6gG4GDjgHxcVmweeJQyFGa9n68sHj6xE3FZTLOMFhJl5iA3SXt3dF32/PpOa33dN5Fw S2kOLxw2/DCH3E72+Zvu0IH1ZmamkPR5KR2Z2TRJVfo/C92zwdh0HQ0Ez1GSEd/yH4FrcW AmOtmQvytVTEG6w/TC5nk06H6wH4p4Rf9w0329T5qRkUDA+fkzNXvsT8N8bPiobarpyI7e uCr56TvON+5RUUNKinQ+U/myINcNAnA5/QtDC9nXza7eXwif4Kejmpsh76ionG9zD1wlJb EhLplauN4Uk8TlR2VeI3Cs0dpXSJOHHwSDML3aBk5Joxh362/9VKFr36ReiLrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693643136; 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=WALxj6KUMIN3hzAIO4E86QZL1xayWJ13qPQj4sVLIyQ=; b=oMp5EROTFPPUFGk/VfKmyIrTyTKQP+CA6psp0YD6wH2Rmok3teGn/CQJtwCR5C8SWVRLRw /VOWDZhHZ5MErwm7II7gEYsq1jG2tWEXrtcK+cFA7J2Ox1Wbdqa/Me98gPT9+vffvcbMPP 9VHl48e4WZsxfh/VN4hl5ZFf+uIs1UXa9UiCNPkflRIVg6MbGMzHBzFvPVb6Uplw8g7v1L A5gf/sBHNEG9eg73X2ntbFRyySu3P2tX1EfavBqxKCqrkTf8s+olgWUdSDz7bYkmc0WMIY /PERuRV+RbkXKNgahO3gFmqslhWpL4HuYB/JUMPRUxjkEMboBVKSpsPa59F3lg== 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 4Rd7JJ2HvLzc74; Sat, 2 Sep 2023 08:25:36 +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 3828PaiE015617; Sat, 2 Sep 2023 08:25:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3828PaRd015614; Sat, 2 Sep 2023 08:25:36 GMT (envelope-from git) Date: Sat, 2 Sep 2023 08:25:36 GMT Message-Id: <202309020825.3828PaRd015614@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Vin=C3=ADcius?= Zavam Subject: git: 6ca711ce977c - main - www/py-lektor: update 3.3.7 to 3.3.10 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: egypcio X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ca711ce977ce59511172e6f5a6bf69055e9e8c3 Auto-Submitted: auto-generated The branch main has been updated by egypcio: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ca711ce977ce59511172e6f5a6bf69055e9e8c3 commit 6ca711ce977ce59511172e6f5a6bf69055e9e8c3 Author: Vinícius Zavam AuthorDate: 2023-09-02 08:19:48 +0000 Commit: Vinícius Zavam CommitDate: 2023-09-02 08:19:48 +0000 www/py-lektor: update 3.3.7 to 3.3.10 WHILE HERE * added markupsafe and pytz dependencies; * changed "patch-mistune" by not patching many files with one single diff; * reflecting $PORTVERSION on setup.py properly on 'post-patch'. CHANGELOG * https://github.com/lektor/lektor/blob/v3.3.10/CHANGES.md Sponsored by: The Tor Project Sponsored by: TorBSD Diversity Project (TDP) --- www/py-lektor/Makefile | 8 ++++++-- www/py-lektor/distinfo | 6 +++--- www/py-lektor/files/patch-lektor_markdown.py | 11 +++++++++++ www/py-lektor/files/patch-mistune | 22 ---------------------- www/py-lektor/files/patch-setup.cfg | 12 ++++++++---- www/py-lektor/files/patch-setup.py | 4 ++-- 6 files changed, 30 insertions(+), 33 deletions(-) diff --git a/www/py-lektor/Makefile b/www/py-lektor/Makefile index a86d8de84415..6bca19fe5a8c 100644 --- a/www/py-lektor/Makefile +++ b/www/py-lektor/Makefile @@ -1,6 +1,5 @@ PORTNAME= Lektor -PORTVERSION= 3.3.7 -PORTREVISION= 1 +PORTVERSION= 3.3.10 CATEGORIES= www devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,10 +19,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=0:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}enum-compat>=0:devel/py-enum-compat@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}filetype>=1.0.7:devel/py-filetype@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}inifile>=0:devel/py-inifile@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mistune0>=0.7.0<2:textproc/py-mistune0@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-slugify>=0:textproc/py-python-slugify@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ @@ -35,4 +36,7 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes +post-patch: + ${REINPLACE_CMD} 's/%%PORTVERSION%%/${PORTVERSION}/g' ${WRKSRC}/setup.py + .include diff --git a/www/py-lektor/distinfo b/www/py-lektor/distinfo index 7961f6e057a9..bc84e24f4c20 100644 --- a/www/py-lektor/distinfo +++ b/www/py-lektor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665819345 -SHA256 (Lektor-3.3.7.tar.gz) = db2eb3cf360dc187500f347f83ef40bd6093b5e07c3f511867bf84215d2d63f1 -SIZE (Lektor-3.3.7.tar.gz) = 2344349 +TIMESTAMP = 1693640536 +SHA256 (Lektor-3.3.10.tar.gz) = 7c1645643a3aa0a6c8e8c13534c348299387524bd4872ce45a2aca8778e6b5b2 +SIZE (Lektor-3.3.10.tar.gz) = 2349176 diff --git a/www/py-lektor/files/patch-lektor_markdown.py b/www/py-lektor/files/patch-lektor_markdown.py new file mode 100644 index 000000000000..4426ffd56c63 --- /dev/null +++ b/www/py-lektor/files/patch-lektor_markdown.py @@ -0,0 +1,11 @@ +--- lektor/markdown.py.orig 2023-09-02 08:00:20 UTC ++++ lektor/markdown.py +@@ -2,7 +2,7 @@ import threading + from urllib.parse import urlsplit + from weakref import ref as weakref + +-import mistune ++import mistune0 as mistune + from markupsafe import Markup + + from lektor.context import get_ctx diff --git a/www/py-lektor/files/patch-mistune b/www/py-lektor/files/patch-mistune deleted file mode 100644 index ae223fdd6783..000000000000 --- a/www/py-lektor/files/patch-mistune +++ /dev/null @@ -1,22 +0,0 @@ ---- lektor/markdown.py.orig 2022-09-21 19:15:42 UTC -+++ lektor/markdown.py -@@ -1,7 +1,7 @@ - import threading - from weakref import ref as weakref - --import mistune -+import mistune0 as mistune - from markupsafe import Markup - from werkzeug.urls import url_parse - ---- setup.cfg.orig 2022-09-21 19:16:28 UTC -+++ setup.cfg -@@ -42,7 +42,7 @@ install_requires = - Flask - inifile>=0.4.1 - Jinja2>=3.0 -- mistune>=0.7.0,<2 -+ mistune0>=0.7.0,<2 - pip - python-slugify - requests[security] diff --git a/www/py-lektor/files/patch-setup.cfg b/www/py-lektor/files/patch-setup.cfg index 38f184be4272..7958ddae653d 100644 --- a/www/py-lektor/files/patch-setup.cfg +++ b/www/py-lektor/files/patch-setup.cfg @@ -1,11 +1,15 @@ ---- setup.cfg.orig 2022-07-31 16:11:11 UTC +--- setup.cfg.orig 2023-05-05 21:48:09 UTC +++ setup.cfg -@@ -35,7 +35,7 @@ install_requires = +@@ -41,10 +41,10 @@ install_requires = EXIFRead filetype>=1.0.7 Flask - inifile>=0.4.1 + inifile>=0.4 Jinja2>=3.0 - mistune>=0.7.0,<2 - pip + markupsafe +- mistune>=0.7.0,<2 ++ mistune0>=0.7.0,<2 + pip>=21.1 + python-slugify + pytz diff --git a/www/py-lektor/files/patch-setup.py b/www/py-lektor/files/patch-setup.py index 22af075176c5..84d5e6aaab37 100644 --- a/www/py-lektor/files/patch-setup.py +++ b/www/py-lektor/files/patch-setup.py @@ -1,9 +1,9 @@ ---- setup.py.orig 2022-07-31 16:11:11 UTC +--- setup.py.orig 2023-09-02 08:00:00 UTC +++ setup.py @@ -0,0 +1,6 @@ +from setuptools import setup + +setup( + name="Lektor", -+ version="3.3.6", ++ version="%%PORTVERSION%%", +)