From 6ec9afdc4a9fdfbe055dbc9c371b51d3d69db8dc Mon Sep 17 00:00:00 2001
From: cos <cos>
Date: Tue, 19 Mar 2024 15:25:02 +0100
Subject: fixup! deskutils/py-calendar_cli: New port: Simple command-line
 CalDav client

---
 deskutils/py-calendar_cli/Makefile  | 24 +++++++++++++++++-------
 deskutils/py-calendar_cli/pkg-plist | 12 ------------
 2 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 deskutils/py-calendar_cli/pkg-plist

diff --git a/deskutils/py-calendar_cli/Makefile b/deskutils/py-calendar_cli/Makefile
index 4337cd47e50b..4a68970f2841 100644
--- a/deskutils/py-calendar_cli/Makefile
+++ b/deskutils/py-calendar_cli/Makefile
@@ -2,7 +2,15 @@ PORTNAME=	calendar_cli
 DISTVERSION=	1.0.1
 CATEGORIES=	deskutils python
 MASTER_SITES=	PYPI
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+# According to https://wiki.freebsd.org/Python/PortsPolicy#PKGNAMEPREFIX
+#
+#  > Ports MUST use PKGNAMEPREFIX, unless there is a compelling case not to.
+#
+# PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+#
+# But this tool being an end-user application is hopefully a compelling reason
+# to skip the prefix. A typical user couldn't care less what its implementation
+# language is, or which version of python that.
 
 MAINTAINER=	cos
 COMMENT=	Simple command-line CalDav client
@@ -12,15 +20,17 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 PY_DEPENDS=	icalendar:devel/py-icalendar@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>0,1:devel/py-tzlocal@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>0,1:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}caldav>=0.12-dev0:www/py-caldav@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyyaml:devel/py-pyyaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Click:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+
+RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist distutils noflavors
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/py-calendar_cli/pkg-plist b/deskutils/py-calendar_cli/pkg-plist
deleted file mode 100644
index 5d6894a50e23..000000000000
--- a/deskutils/py-calendar_cli/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-%%PYTHON_SITELIBDIR%%/bin/calendar-cli
-%%PYTHON_SITELIBDIR%%/bin/calendar-cli.py
-%%PYTHON_SITELIBDIR%%/calendar_cli
-%%PYTHON_SITELIBDIR%%/calendar_cli/__init__.py
-%%PYTHON_SITELIBDIR%%/calendar_cli/metadata.py
-%%PYTHON_SITELIBDIR%%/calendar_cli/template.py
-%%PYTHON_SITELIBDIR%%/calendar_cli/legacy.py
-%%PYTHON_SITELIBDIR%%/calendar_cli/config.py
-%%PYTHON_SITELIBDIR%%/calendar_cli/__pycache__
-%%PYTHON_SITELIBDIR%%/calendar_cli/__pycache__/__init__.cpython-39.pyc
-%%PYTHON_SITELIBDIR%%/calendar_cli/__pycache__/metadata.cpython-39.pyc
-
-- 
cgit v1.2.3