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)

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 <bsd.port.mk>
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%%",
 +)