* Removed buildlink on py-hgtools

* Added BUILD_DEPENDS on hgtools
* Replaced egg.mk with distutils.mk thus simplified the Makefile

2 files changed, 30 insertions, 39 deletions

diff --git a/net/py-irclib/Makefile b/net/py-irclib/Makefile
index bbdf29f0a2f..cac8a001b27 100644
--- a/net/py-irclib/Makefile
+++ b/net/py-irclib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/04/20 10:32:41 imil Exp $
+# $NetBSD: Makefile,v 1.8 2014/04/20 12:44:01 imil Exp $
 #
 
 IRCVERS=	8.5.4
 DISTNAME=	irc-${IRCVERS}
 PKGNAME=	${PYPKGPREFIX}-irclib-${IRCVERS}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	net python
 MASTER_SITES=	http://pypi.python.org/packages/source/i/irc/
 EXTRACT_SUFX=	.zip
@@ -18,7 +18,9 @@ USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
 
-.include "../../lang/python/egg.mk"
+BUILD_DEPENDS+=	${PYPKGPREFIX}-hgtools>=2.0.2:../../devel/py-hgtools
+
+.include "../../lang/python/distutils.mk"
 
 PLIST_VARS+=	requires
 .if ${PYVERSSUFFIX} == "2.5" || ${PYVERSSUFFIX} == "2.6"
@@ -28,10 +30,4 @@ PLIST.requires=	yes
 post-extract:
 	cd ${WRKSRC} && ${CHMOD} ${SHAREMODE} irc.egg-info/*
 
-# for some reason, this package does not install egg infos
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/irc.egg-info/*		\
-		${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR}
-
-.include "../../devel/py-hgtools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-irclib/PLIST b/net/py-irclib/PLIST
index 795d318d467..cabb4e834ff 100644
--- a/net/py-irclib/PLIST
+++ b/net/py-irclib/PLIST
@@ -1,71 +1,66 @@
-@comment $NetBSD: PLIST,v 1.3 2014/04/08 16:40:35 imil Exp $
-${PYSITELIB}/PKG-INFO
-${PYSITELIB}/SOURCES.txt
-${PYSITELIB}/dependency_links.txt
-${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
+@comment $NetBSD: PLIST,v 1.4 2014/04/20 12:44:01 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
 ${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/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/util.pyc
+${PYSITELIB}/irc/util.pyo
+${PYSITELIB}/irc/bot.py
+${PYSITELIB}/irc/buffer.py
+${PYSITELIB}/irc/client.py
+${PYSITELIB}/irc/connection.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
 ${PYSITELIB}/irc/util.py
-${PYSITELIB}/irc/util.pyc
-${PYSITELIB}/irc/util.pyo
-${PYSITELIB}/requires.txt
-${PYSITELIB}/top_level.txt