Radicale: convert to egg.mk

2 files changed, 46 insertions, 46 deletions

diff --git a/net/Radicale/Makefile b/net/Radicale/Makefile
index 7174e63da73..17a10487f7f 100644
--- a/net/Radicale/Makefile
+++ b/net/Radicale/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2021/01/16 20:24:16 maya Exp $
+# $NetBSD: Makefile,v 1.27 2022/01/09 15:37:47 wiz Exp $
 
 DISTNAME=	Radicale-1.1.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	net time www
 MASTER_SITES=	${MASTER_SITE_PYPI:=R/Radicale/}
 
@@ -48,5 +48,5 @@ DEPENDS+=		${PYPKGPREFIX}-passlib-[0-9]*:../../security/py-passlib
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/config ${DESTDIR}${PREFIX}/${EGDIR}/config
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/Radicale/PLIST b/net/Radicale/PLIST
index c36b93bae3a..35e3f0ff8cf 100644
--- a/net/Radicale/PLIST
+++ b/net/Radicale/PLIST
@@ -1,70 +1,70 @@
-@comment $NetBSD: PLIST,v 1.8 2017/07/01 05:31:59 darcy Exp $
+@comment $NetBSD: PLIST,v 1.9 2022/01/09 15:37:47 wiz Exp $
 bin/radicale
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/radicale/__init__.py
-${PYSITELIB}/radicale/__main__.py
-${PYSITELIB}/radicale/__init__.pyo
 ${PYSITELIB}/radicale/__init__.pyc
-${PYSITELIB}/radicale/__main__.pyo
+${PYSITELIB}/radicale/__init__.pyo
+${PYSITELIB}/radicale/__main__.py
 ${PYSITELIB}/radicale/__main__.pyc
-${PYSITELIB}/radicale/config.pyo
-${PYSITELIB}/radicale/config.pyc
-${PYSITELIB}/radicale/ical.pyo
-${PYSITELIB}/radicale/ical.pyc
-${PYSITELIB}/radicale/log.pyo
-${PYSITELIB}/radicale/log.pyc
-${PYSITELIB}/radicale/pathutils.pyo
-${PYSITELIB}/radicale/pathutils.pyc
-${PYSITELIB}/radicale/xmlutils.pyo
-${PYSITELIB}/radicale/xmlutils.pyc
+${PYSITELIB}/radicale/__main__.pyo
 ${PYSITELIB}/radicale/auth/IMAP.py
-${PYSITELIB}/radicale/auth/LDAP.py
-${PYSITELIB}/radicale/auth/PAM.py
-${PYSITELIB}/radicale/auth/__init__.py
-${PYSITELIB}/radicale/auth/IMAP.pyo
 ${PYSITELIB}/radicale/auth/IMAP.pyc
-${PYSITELIB}/radicale/auth/LDAP.pyo
+${PYSITELIB}/radicale/auth/IMAP.pyo
+${PYSITELIB}/radicale/auth/LDAP.py
 ${PYSITELIB}/radicale/auth/LDAP.pyc
-${PYSITELIB}/radicale/auth/PAM.pyo
+${PYSITELIB}/radicale/auth/LDAP.pyo
+${PYSITELIB}/radicale/auth/PAM.py
 ${PYSITELIB}/radicale/auth/PAM.pyc
-${PYSITELIB}/radicale/auth/__init__.pyo
+${PYSITELIB}/radicale/auth/PAM.pyo
+${PYSITELIB}/radicale/auth/__init__.py
 ${PYSITELIB}/radicale/auth/__init__.pyc
-${PYSITELIB}/radicale/auth/courier.pyo
-${PYSITELIB}/radicale/auth/courier.pyc
-${PYSITELIB}/radicale/auth/htpasswd.pyo
-${PYSITELIB}/radicale/auth/htpasswd.pyc
-${PYSITELIB}/radicale/auth/http.pyo
-${PYSITELIB}/radicale/auth/http.pyc
-${PYSITELIB}/radicale/auth/remote_user.pyo
-${PYSITELIB}/radicale/auth/remote_user.pyc
+${PYSITELIB}/radicale/auth/__init__.pyo
 ${PYSITELIB}/radicale/auth/courier.py
+${PYSITELIB}/radicale/auth/courier.pyc
+${PYSITELIB}/radicale/auth/courier.pyo
 ${PYSITELIB}/radicale/auth/htpasswd.py
+${PYSITELIB}/radicale/auth/htpasswd.pyc
+${PYSITELIB}/radicale/auth/htpasswd.pyo
 ${PYSITELIB}/radicale/auth/http.py
+${PYSITELIB}/radicale/auth/http.pyc
+${PYSITELIB}/radicale/auth/http.pyo
 ${PYSITELIB}/radicale/auth/remote_user.py
+${PYSITELIB}/radicale/auth/remote_user.pyc
+${PYSITELIB}/radicale/auth/remote_user.pyo
 ${PYSITELIB}/radicale/config.py
+${PYSITELIB}/radicale/config.pyc
+${PYSITELIB}/radicale/config.pyo
 ${PYSITELIB}/radicale/ical.py
+${PYSITELIB}/radicale/ical.pyc
+${PYSITELIB}/radicale/ical.pyo
 ${PYSITELIB}/radicale/log.py
+${PYSITELIB}/radicale/log.pyc
+${PYSITELIB}/radicale/log.pyo
 ${PYSITELIB}/radicale/pathutils.py
+${PYSITELIB}/radicale/pathutils.pyc
+${PYSITELIB}/radicale/pathutils.pyo
 ${PYSITELIB}/radicale/rights/__init__.py
-${PYSITELIB}/radicale/rights/__init__.pyo
 ${PYSITELIB}/radicale/rights/__init__.pyc
-${PYSITELIB}/radicale/rights/regex.pyo
-${PYSITELIB}/radicale/rights/regex.pyc
+${PYSITELIB}/radicale/rights/__init__.pyo
 ${PYSITELIB}/radicale/rights/regex.py
+${PYSITELIB}/radicale/rights/regex.pyc
+${PYSITELIB}/radicale/rights/regex.pyo
 ${PYSITELIB}/radicale/storage/__init__.py
-${PYSITELIB}/radicale/storage/__init__.pyo
 ${PYSITELIB}/radicale/storage/__init__.pyc
-${PYSITELIB}/radicale/storage/database.pyo
-${PYSITELIB}/radicale/storage/database.pyc
-${PYSITELIB}/radicale/storage/filesystem.pyo
-${PYSITELIB}/radicale/storage/filesystem.pyc
-${PYSITELIB}/radicale/storage/multifilesystem.pyo
-${PYSITELIB}/radicale/storage/multifilesystem.pyc
+${PYSITELIB}/radicale/storage/__init__.pyo
 ${PYSITELIB}/radicale/storage/database.py
+${PYSITELIB}/radicale/storage/database.pyc
+${PYSITELIB}/radicale/storage/database.pyo
 ${PYSITELIB}/radicale/storage/filesystem.py
+${PYSITELIB}/radicale/storage/filesystem.pyc
+${PYSITELIB}/radicale/storage/filesystem.pyo
 ${PYSITELIB}/radicale/storage/multifilesystem.py
+${PYSITELIB}/radicale/storage/multifilesystem.pyc
+${PYSITELIB}/radicale/storage/multifilesystem.pyo
 ${PYSITELIB}/radicale/xmlutils.py
+${PYSITELIB}/radicale/xmlutils.pyc
+${PYSITELIB}/radicale/xmlutils.pyo
 share/examples/radicale/config