Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -14479,3 +14479,4 @@
 www/node8|www/node10|2020-03-10|Has expired: Node.js 8.x has reached end-of-life, see https://github.com/nodejs/Release
 www/npm-node8|www/npm-node10|2020-03-10|Removed, slave of www/node8
 www/yarn-node8|www/yarn-node10|2020-03-10|Removed, slave of www/node8
+sysutils/py-crontab|sysutils/py-python-crontab|2020-03-13|Match canonical/registered (PyPI/CHEESESHOP) name
Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -965,7 +965,6 @@
     SUBDIR += py-cpuinfo
     SUBDIR += py-cron-descriptor
     SUBDIR += py-croniter
-    SUBDIR += py-crontab
     SUBDIR += py-diffoscope
     SUBDIR += py-dirsync
     SUBDIR += py-distro
@@ -1001,6 +1000,7 @@
     SUBDIR += py-psutil121
     SUBDIR += py-ptyprocess
     SUBDIR += py-python-consul
+    SUBDIR += py-python-crontab
     SUBDIR += py-python-nomad
     SUBDIR += py-pytsk
     SUBDIR += py-pywatchman
Index: sysutils/py-crontab/Makefile
===================================================================
--- sysutils/py-crontab/Makefile
+++ sysutils/py-crontab/Makefile
@@ -1,22 +0,0 @@
-# Created by: Steven Kreuzer <skreuzer@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	crontab
-PORTVERSION=	1.9.5
-CATEGORIES=	sysutils python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	skreuzer@FreeBSD.org
-COMMENT=	Read and write crontab files using a direct API
-
-LICENSE=	GPLv3
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${PY_FLAVOR}
-
-USES=		python
-USE_PYTHON=	autoplist distutils
-
-.include <bsd.port.mk>
Index: sysutils/py-crontab/distinfo
===================================================================
--- sysutils/py-crontab/distinfo
+++ sysutils/py-crontab/distinfo
@@ -1,2 +0,0 @@
-SHA256 (python-crontab-1.9.5.tar.gz) = 7c96916dcef835f02ab62b3f648285658700aa916ae663bf37952faf5eea9b2c
-SIZE (python-crontab-1.9.5.tar.gz) = 31765
Index: sysutils/py-crontab/pkg-descr
===================================================================
--- sysutils/py-crontab/pkg-descr
+++ sysutils/py-crontab/pkg-descr
@@ -1,4 +0,0 @@
-Module for reading and writing crontab files and accessing the system cron
-automatically and simply using a direct API.
-
-WWW: https://pypi.org/project/crontab/
Index: sysutils/py-python-crontab/Makefile
===================================================================
--- sysutils/py-python-crontab/Makefile
+++ sysutils/py-python-crontab/Makefile
@@ -1,22 +1,38 @@
 # Created by: Steven Kreuzer <skreuzer@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	crontab
-PORTVERSION=	1.9.5
+PORTNAME=	python-crontab
+PORTVERSION=	2.4.0
 CATEGORIES=	sysutils python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Read and write crontab files using a direct API
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cron-descriptor>0:sysutils/py-cron-descriptor@${PY_FLAVOR}
 
-USES=		python
+USES=		python shebangfix
+SHEBANG_FILES=	${WRKSRC}/tests/data/crontest
 USE_PYTHON=	autoplist distutils
 
-.include <bsd.port.mk>
+USE_GITLAB=	yes
+GL_ACCOUNT=	doctormo
+GL_PROJECT=	python-crontab
+GL_COMMIT=	ba23056ddf1a00ecfd14b0a31c2e0cdad132f8d0
+
+.include <bsd.port.pre.mk>
+
+# The UTF-8 mode is enabled by default when the locale is C since Python 3.7.
+.if ${PYTHON_REL} < 3700
+TEST_ENV+=	LC_ALL=C.UTF-8
+.endif
+
+do-test:
+	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+
+.include <bsd.port.post.mk>
Index: sysutils/py-python-crontab/distinfo
===================================================================
--- sysutils/py-python-crontab/distinfo
+++ sysutils/py-python-crontab/distinfo
@@ -1,2 +1,3 @@
-SHA256 (python-crontab-1.9.5.tar.gz) = 7c96916dcef835f02ab62b3f648285658700aa916ae663bf37952faf5eea9b2c
-SIZE (python-crontab-1.9.5.tar.gz) = 31765
+TIMESTAMP = 1582976298
+SHA256 (doctormo-python-crontab-ba23056ddf1a00ecfd14b0a31c2e0cdad132f8d0_GL0.tar.gz) = 1d1b744ff3ee337c229e992813d2c43829c2b58228e22ec19444a6fd19340805
+SIZE (doctormo-python-crontab-ba23056ddf1a00ecfd14b0a31c2e0cdad132f8d0_GL0.tar.gz) = 45416
Index: sysutils/py-python-crontab/pkg-descr
===================================================================
--- sysutils/py-python-crontab/pkg-descr
+++ sysutils/py-python-crontab/pkg-descr
@@ -1,4 +1,4 @@
 Module for reading and writing crontab files and accessing the system cron
 automatically and simply using a direct API.
 
-WWW: https://pypi.org/project/crontab/
+WWW: https://gitlab.com/doctormo/python-crontab