*: convert to egg.mk

NetBSD · Jan 10, 2022 · 4dbe70f · 4dbe70f
1 parent 0726b83
commit 4dbe70f
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 55 deletions.
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2021/12/08 16:03:49 adam Exp $
+# $NetBSD: Makefile,v 1.42 2022/01/10 23:46:48 wiz Exp $
 
 PKGNAME=	${PYPKGPREFIX}-sqlite3-${PY_DISTVERSION}
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	databases python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -10,7 +10,7 @@ COMMENT=	Built-in sqlite support for Python 2.5 and up
 
 USE_GCC_RUNTIME=	yes
 
-# part of python itself; using distutils.mk will install a useless egg
+# part of python itself; using egg.mk will install a useless egg
 PYDISTUTILSPKG=		yes
 PY_SETUP_SUBST+=	SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload

diff --git a/devel/py-libmc/Makefile b/devel/py-libmc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2019/09/06 13:45:36 adam Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/10 23:46:48 wiz Exp $
 
 DISTNAME=	pylibmc-1.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pylibmc/}
 
@@ -12,5 +13,5 @@ LICENSE=	modified-bsd
 
 .include "../../devel/libmemcached/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-libmc/PLIST b/devel/py-libmc/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2018/12/05 16:20:45 adam Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.5 2022/01/10 23:46:48 wiz Exp $
 ${PYSITELIB}/_pylibmc.so
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pylibmc/__init__.py
 ${PYSITELIB}/pylibmc/__init__.pyc
 ${PYSITELIB}/pylibmc/__init__.pyo

diff --git a/graphics/py-biggles/Makefile b/graphics/py-biggles/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2020/10/12 21:52:00 bacon Exp $
+# $NetBSD: Makefile,v 1.31 2022/01/10 23:46:48 wiz Exp $
 
 DISTNAME=	python2-biggles-1.6.6
 PKGNAME=	${PYPKGPREFIX}${DISTNAME:S/python2//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=biggles/}
 
@@ -12,7 +12,7 @@ COMMENT=	Python module for creating 2D scientific plots
 
 PYTHON_VERSIONS_ACCEPTED=	27 # not ported yet as of 1.6.6
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../graphics/plotutils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-gnuplot/Makefile b/graphics/py-gnuplot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2020/10/12 21:52:01 bacon Exp $
+# $NetBSD: Makefile,v 1.30 2022/01/10 23:46:48 wiz Exp $
 
 DISTNAME=	gnuplot-py-1.8
 PKGNAME=	${PYPKGPREFIX}-gnuplot-1.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot-py/}
 
@@ -15,6 +15,6 @@ USE_LANGUAGES=	# empty
 
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 1.8
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/tegaki-pygtk/Makefile b/inputmethod/tegaki-pygtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2020/12/04 20:45:25 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/01/10 23:46:48 wiz Exp $
 
 DISTNAME=	tegaki-pygtk-0.3.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://www.tegaki.org/releases/${PKGVERSION_NOREV}/
 
@@ -17,5 +17,5 @@ USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_ACCEPTED=	27 # py-gtk2
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/tegaki-pygtk/PLIST b/inputmethod/tegaki-pygtk/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/08 20:21:49 wiz Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.3 2022/01/10 23:46:48 wiz Exp $
 ${PYSITELIB}/tegakigtk/__init__.py
 ${PYSITELIB}/tegakigtk/__init__.pyc
 ${PYSITELIB}/tegakigtk/__init__.pyo

diff --git a/inputmethod/tegaki-recognize/Makefile b/inputmethod/tegaki-recognize/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2020/12/04 20:45:25 nia Exp $
+# $NetBSD: Makefile,v 1.18 2022/01/10 23:46:48 wiz Exp $
 
 DISTNAME=	tegaki-recognize-0.3.1.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://www.tegaki.org/releases/0.3.1/
 
@@ -17,7 +17,7 @@ USE_LANGUAGES=	# none
 REPLACE_PYTHON=	bin/tegaki-recognize
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 0.3.1.2
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/tegaki-recognize/PLIST b/inputmethod/tegaki-recognize/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/08 20:21:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/01/10 23:46:48 wiz Exp $
 bin/tegaki-recognize
-${PYSITELIB}/${EGG_FILE}
 share/applications/tegaki-recognize.desktop
 share/menu/tegaki-recognize
 share/pixmaps/tegaki-recognize.svg
diff --git a/inputmethod/tegaki-tools/Makefile b/inputmethod/tegaki-tools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2020/12/04 20:45:25 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/01/10 23:46:48 wiz Exp $
 
 DISTNAME=	tegaki-tools-0.3.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://www.tegaki.org/releases/${PKGVERSION_NOREV}/
 
@@ -18,5 +18,5 @@ USE_LANGUAGES=	c c++
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 0.3.1
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/tegaki-tools/PLIST b/inputmethod/tegaki-tools/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/08 20:21:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/01/10 23:46:48 wiz Exp $
 bin/tegaki-bootstrap
 bin/tegaki-build
 bin/tegaki-convert
 bin/tegaki-eval
 bin/tegaki-render
 bin/tegaki-stats
-${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/tegakitools/__init__.py
 ${PYSITELIB}/tegakitools/__init__.pyc
 ${PYSITELIB}/tegakitools/__init__.pyo

diff --git a/inputmethod/tegaki-train/Makefile b/inputmethod/tegaki-train/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2020/12/04 20:45:25 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/01/10 23:46:48 wiz Exp $
 
 DISTNAME=	tegaki-train-0.3.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://www.tegaki.org/releases/${PKGVERSION_NOREV}/
 
@@ -17,5 +17,5 @@ USE_LANGUAGES=	# none
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 0.3.1
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/tegaki-train/PLIST b/inputmethod/tegaki-train/PLIST
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/08 20:21:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/01/10 23:46:48 wiz Exp $
 bin/tegaki-train
-${PYSITELIB}/${EGG_FILE}
diff --git a/inputmethod/tegaki-wagomu/Makefile b/inputmethod/tegaki-wagomu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2021/12/08 16:05:19 adam Exp $
+# $NetBSD: Makefile,v 1.29 2022/01/10 23:46:49 wiz Exp $
 
 DISTNAME=	tegaki-wagomu-0.3.1
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://www.tegaki.org/releases/${PKGVERSION_NOREV}/
 MASTER_SITES+=	http://www.tegaki.org/releases/0.3/
@@ -32,5 +32,5 @@ SUBST_SED.fixver=	-e 's|0\.3|${PKGVERSION_NOREV}|'
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 0.3.1
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/tegaki-wagomu/PLIST b/inputmethod/tegaki-wagomu/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/08 20:21:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/01/10 23:46:49 wiz Exp $
 ${PYSITELIB}/_wagomu.so
-${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/wagomu.py
 ${PYSITELIB}/wagomu.pyc
 ${PYSITELIB}/wagomu.pyo

diff --git a/lang/py-python-lua/Makefile b/lang/py-python-lua/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2020/08/31 23:07:03 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/10 23:46:49 wiz Exp $
 
 DISTNAME=		python-lua
 PKGNAME=		${PYPKGPREFIX}-python-lua-20170109
+PKGREVISION=		1
 CATEGORIES=		lang converters
 MASTER_SITES=		${MASTER_SITE_GITHUB:=NeonMercury/}
 DIST_SUBDIR=		${DISTNAME}
@@ -29,6 +30,6 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pythonlua/luainit.lua ${DESTDIR}${PREFIX}/${PYSITELIB}/pythonlua
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2021/12/08 16:05:35 adam Exp $
+# $NetBSD: Makefile,v 1.72 2022/01/10 23:46:49 wiz Exp $
 
 DISTNAME=	ScientificPython-2.8.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Python//}
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	math python
 MASTER_SITES=	http://sourcesup.cru.fr/frs/download.php/4411/
 
@@ -33,7 +33,7 @@ post-install:
 		${DESTDIR}${PREFIX}/bin/mpipython${PYVERSSUFFIX}
 
 .include "../../devel/netcdf/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/mpi.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

diff --git a/math/py-astroquery/Makefile b/math/py-astroquery/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2021/12/30 13:05:36 adam Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/10 23:46:49 wiz Exp $
 
 DISTNAME=	astroquery-0.3.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GITHUB:=astropy/}
 GITHUB_PROJECT=	astroquery
@@ -20,5 +21,5 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.15.0:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-astropy>=4.2:../../math/py-astropy
 DEPENDS+=	${PYPKGPREFIX}-pyvo>=1.0:../../math/py-pyvo
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ndiff/Makefile b/net/ndiff/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2019/08/28 13:55:44 adam Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/10 23:46:49 wiz Exp $
 
+PKGREVISION= 1
 .include "../../net/nmap/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/nmap/ndiff/}
@@ -19,5 +20,5 @@ SUBST_FILES.setup=	setup.py
 SUBST_SED.setup=	-e 's,share/man,${PKGMANDIR},g'
 SUBST_SED.setup+=	-e 's,\(self.create_uninstaller\),\#\1,g'
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/virtinst/Makefile b/sysutils/virtinst/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2020/12/04 20:45:43 nia Exp $
+# $NetBSD: Makefile,v 1.18 2022/01/10 23:46:49 wiz Exp $
 
 DISTNAME=	virtinst-0.600.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://virt-manager.org/download/sources/virtinst/
 
@@ -22,5 +22,5 @@ SUBST_FILES.man=	setup.py
 SUBST_SED.man=		-e 's,@@PKGMANDIR@@,${PKGMANDIR},'
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/virtinst/PLIST b/sysutils/virtinst/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/01/23 19:18:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/01/10 23:46:49 wiz Exp $
 bin/virt-clone
 bin/virt-convert
 bin/virt-image
@@ -33,7 +33,6 @@ ${PYSITELIB}/virtconv/parsers/vmx.pyo
 ${PYSITELIB}/virtconv/vmcfg.py
 ${PYSITELIB}/virtconv/vmcfg.pyc
 ${PYSITELIB}/virtconv/vmcfg.pyo
-${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/virtinst/Boot.py
 ${PYSITELIB}/virtinst/Boot.pyc
 ${PYSITELIB}/virtinst/Boot.pyo

diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2021/12/08 16:06:46 adam Exp $
+# $NetBSD: Makefile,v 1.61 2022/01/10 23:46:49 wiz Exp $
 
-PKGREVISION= 4
+PKGREVISION= 5
 .include "../../textproc/libxslt/Makefile.common"
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -44,6 +44,6 @@ setuppy:
 BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=${PKGVERSION_NOREV}
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"