py-irclib: convert to egg.mk

Bump PKGREVISION.

2 files changed, 29 insertions, 30 deletions

diff --git a/net/py-irclib/Makefile b/net/py-irclib/Makefile
index 3d691dfadea..f89fb7658cf 100644
--- a/net/py-irclib/Makefile
+++ b/net/py-irclib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2021/02/24 01:17:24 gutteridge Exp $
+# $NetBSD: Makefile,v 1.18 2022/01/04 19:23:01 wiz Exp $
 
-PYIRCVERS=		11.1.1
-DISTNAME=		irc-${PYIRCVERS}
-PKGNAME=		${PYPKGPREFIX}-irclib-${PYIRCVERS}
+DISTNAME=		irc-11.1.1
+PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/irc/irclib/}
+PKGREVISION=		1
 CATEGORIES=		net python
 MASTER_SITES=		${MASTER_SITE_PYPI:=i/irc/}
 EXTRACT_SUFX=		.zip
@@ -17,11 +17,10 @@ USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-jaraco_util>=10.0.2:../../devel/py-jaraco_util
-
 BUILD_DEPENDS+=	${PYPKGPREFIX}-hgtools>=5:../../devel/py-hgtools
 
 post-extract:
 	cd ${WRKSRC} && ${CHMOD} ${SHAREMODE} irc.egg-info/*
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-irclib/PLIST b/net/py-irclib/PLIST
index ae5f74c11ad..60f8050beb8 100644
--- a/net/py-irclib/PLIST
+++ b/net/py-irclib/PLIST
@@ -1,66 +1,66 @@
-@comment $NetBSD: PLIST,v 1.6 2015/03/02 15:54:17 imil Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+@comment $NetBSD: PLIST,v 1.7 2022/01/04 19:23:01 wiz Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/irc/__init__.py
 ${PYSITELIB}/irc/__init__.pyc
 ${PYSITELIB}/irc/__init__.pyo
+${PYSITELIB}/irc/bot.py
 ${PYSITELIB}/irc/bot.pyc
 ${PYSITELIB}/irc/bot.pyo
+${PYSITELIB}/irc/buffer.py
 ${PYSITELIB}/irc/buffer.pyc
 ${PYSITELIB}/irc/buffer.pyo
+${PYSITELIB}/irc/client.py
 ${PYSITELIB}/irc/client.pyc
 ${PYSITELIB}/irc/client.pyo
+${PYSITELIB}/irc/connection.py
 ${PYSITELIB}/irc/connection.pyc
 ${PYSITELIB}/irc/connection.pyo
+${PYSITELIB}/irc/ctcp.py
 ${PYSITELIB}/irc/ctcp.pyc
 ${PYSITELIB}/irc/ctcp.pyo
+${PYSITELIB}/irc/dict.py
 ${PYSITELIB}/irc/dict.pyc
 ${PYSITELIB}/irc/dict.pyo
+${PYSITELIB}/irc/events.py
 ${PYSITELIB}/irc/events.pyc
 ${PYSITELIB}/irc/events.pyo
+${PYSITELIB}/irc/features.py
 ${PYSITELIB}/irc/features.pyc
 ${PYSITELIB}/irc/features.pyo
+${PYSITELIB}/irc/functools.py
 ${PYSITELIB}/irc/functools.pyc
 ${PYSITELIB}/irc/functools.pyo
+${PYSITELIB}/irc/logging.py
 ${PYSITELIB}/irc/logging.pyc
 ${PYSITELIB}/irc/logging.pyo
+${PYSITELIB}/irc/modes.py
 ${PYSITELIB}/irc/modes.pyc
 ${PYSITELIB}/irc/modes.pyo
+${PYSITELIB}/irc/rfc.py
 ${PYSITELIB}/irc/rfc.pyc
 ${PYSITELIB}/irc/rfc.pyo
+${PYSITELIB}/irc/schedule.py
 ${PYSITELIB}/irc/schedule.pyc
 ${PYSITELIB}/irc/schedule.pyo
+${PYSITELIB}/irc/server.py
 ${PYSITELIB}/irc/server.pyc
 ${PYSITELIB}/irc/server.pyo
+${PYSITELIB}/irc/strings.py
 ${PYSITELIB}/irc/strings.pyc
 ${PYSITELIB}/irc/strings.pyo
-${PYSITELIB}/irc/bot.py
-${PYSITELIB}/irc/buffer.py
-${PYSITELIB}/irc/client.py
-${PYSITELIB}/irc/connection.py
-${PYSITELIB}/irc/ctcp.py
-${PYSITELIB}/irc/dict.py
-${PYSITELIB}/irc/events.py
-${PYSITELIB}/irc/features.py
-${PYSITELIB}/irc/functools.py
-${PYSITELIB}/irc/logging.py
-${PYSITELIB}/irc/modes.py
-${PYSITELIB}/irc/rfc.py
-${PYSITELIB}/irc/schedule.py
-${PYSITELIB}/irc/server.py
-${PYSITELIB}/irc/strings.py
 ${PYSITELIB}/irc/tests/__init__.py
 ${PYSITELIB}/irc/tests/__init__.pyc
 ${PYSITELIB}/irc/tests/__init__.pyo
+${PYSITELIB}/irc/tests/test_bot.py
 ${PYSITELIB}/irc/tests/test_bot.pyc
 ${PYSITELIB}/irc/tests/test_bot.pyo
+${PYSITELIB}/irc/tests/test_client.py
 ${PYSITELIB}/irc/tests/test_client.pyc
 ${PYSITELIB}/irc/tests/test_client.pyo
+${PYSITELIB}/irc/tests/test_schedule.py
 ${PYSITELIB}/irc/tests/test_schedule.pyc
 ${PYSITELIB}/irc/tests/test_schedule.pyo
-${PYSITELIB}/irc/tests/test_bot.py
-${PYSITELIB}/irc/tests/test_client.py
-${PYSITELIB}/irc/tests/test_schedule.py