CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 10 23:46:49 UTC 2022

Modified Files:
        pkgsrc/databases/py-sqlite3: Makefile
        pkgsrc/devel/py-libmc: Makefile PLIST
        pkgsrc/graphics/py-biggles: Makefile
        pkgsrc/graphics/py-gnuplot: Makefile
        pkgsrc/inputmethod/tegaki-pygtk: Makefile PLIST
        pkgsrc/inputmethod/tegaki-recognize: Makefile PLIST
        pkgsrc/inputmethod/tegaki-tools: Makefile PLIST
        pkgsrc/inputmethod/tegaki-train: Makefile PLIST
        pkgsrc/inputmethod/tegaki-wagomu: Makefile PLIST
        pkgsrc/lang/py-python-lua: Makefile
        pkgsrc/math/py-Scientific: Makefile
        pkgsrc/math/py-astroquery: Makefile
        pkgsrc/net/ndiff: Makefile
        pkgsrc/sysutils/virtinst: Makefile PLIST
        pkgsrc/textproc/py-libxslt: Makefile

Log Message:
*: convert to egg.mk


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/databases/py-sqlite3/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-libmc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-libmc/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/py-biggles/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/py-gnuplot/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/inputmethod/tegaki-pygtk/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/tegaki-pygtk/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/inputmethod/tegaki-recognize/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/tegaki-recognize/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/inputmethod/tegaki-tools/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/tegaki-tools/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/inputmethod/tegaki-train/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/tegaki-train/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/inputmethod/tegaki-wagomu/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/tegaki-wagomu/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/py-python-lua/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/math/py-Scientific/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/py-astroquery/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ndiff/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/virtinst/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/virtinst/PLIST
cvs rdiff -u -r1.60 -r1.61 pkgsrc/textproc/py-libxslt/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/py-sqlite3/Makefile
diff -u pkgsrc/databases/py-sqlite3/Makefile:1.41 pkgsrc/databases/py-sqlite3/Makefile:1.42
--- pkgsrc/databases/py-sqlite3/Makefile:1.41   Wed Dec  8 16:03:49 2021
+++ pkgsrc/databases/py-sqlite3/Makefile        Mon Jan 10 23:46:48 2022
@@ -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@localhost
@@ -10,7 +10,7 @@ COMMENT=      Built-in sqlite support for Pyt
 
 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

Index: pkgsrc/devel/py-libmc/Makefile
diff -u pkgsrc/devel/py-libmc/Makefile:1.9 pkgsrc/devel/py-libmc/Makefile:1.10
--- pkgsrc/devel/py-libmc/Makefile:1.9  Fri Sep  6 13:45:36 2019
+++ pkgsrc/devel/py-libmc/Makefile      Mon Jan 10 23:46:48 2022
@@ -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"

Index: pkgsrc/devel/py-libmc/PLIST
diff -u pkgsrc/devel/py-libmc/PLIST:1.4 pkgsrc/devel/py-libmc/PLIST:1.5
--- pkgsrc/devel/py-libmc/PLIST:1.4     Wed Dec  5 16:20:45 2018
+++ pkgsrc/devel/py-libmc/PLIST Mon Jan 10 23:46:48 2022
@@ -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

Index: pkgsrc/graphics/py-biggles/Makefile
diff -u pkgsrc/graphics/py-biggles/Makefile:1.30 pkgsrc/graphics/py-biggles/Makefile:1.31
--- pkgsrc/graphics/py-biggles/Makefile:1.30    Mon Oct 12 21:52:00 2020
+++ pkgsrc/graphics/py-biggles/Makefile Mon Jan 10 23:46:48 2022
@@ -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 s
 
 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"

Index: pkgsrc/graphics/py-gnuplot/Makefile
diff -u pkgsrc/graphics/py-gnuplot/Makefile:1.29 pkgsrc/graphics/py-gnuplot/Makefile:1.30
--- pkgsrc/graphics/py-gnuplot/Makefile:1.29    Mon Oct 12 21:52:01 2020
+++ pkgsrc/graphics/py-gnuplot/Makefile Mon Jan 10 23:46:48 2022
@@ -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"

Index: pkgsrc/inputmethod/tegaki-pygtk/Makefile
diff -u pkgsrc/inputmethod/tegaki-pygtk/Makefile:1.16 pkgsrc/inputmethod/tegaki-pygtk/Makefile:1.17
--- pkgsrc/inputmethod/tegaki-pygtk/Makefile:1.16       Fri Dec  4 20:45:25 2020
+++ pkgsrc/inputmethod/tegaki-pygtk/Makefile    Mon Jan 10 23:46:48 2022
@@ -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"

Index: pkgsrc/inputmethod/tegaki-pygtk/PLIST
diff -u pkgsrc/inputmethod/tegaki-pygtk/PLIST:1.2 pkgsrc/inputmethod/tegaki-pygtk/PLIST:1.3
--- pkgsrc/inputmethod/tegaki-pygtk/PLIST:1.2   Sun Apr  8 20:21:49 2012
+++ pkgsrc/inputmethod/tegaki-pygtk/PLIST       Mon Jan 10 23:46:48 2022
@@ -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

Index: pkgsrc/inputmethod/tegaki-recognize/Makefile
diff -u pkgsrc/inputmethod/tegaki-recognize/Makefile:1.17 pkgsrc/inputmethod/tegaki-recognize/Makefile:1.18
--- pkgsrc/inputmethod/tegaki-recognize/Makefile:1.17   Fri Dec  4 20:45:25 2020
+++ pkgsrc/inputmethod/tegaki-recognize/Makefile        Mon Jan 10 23:46:48 2022
@@ -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"

Index: pkgsrc/inputmethod/tegaki-recognize/PLIST
diff -u pkgsrc/inputmethod/tegaki-recognize/PLIST:1.2 pkgsrc/inputmethod/tegaki-recognize/PLIST:1.3
--- pkgsrc/inputmethod/tegaki-recognize/PLIST:1.2       Sun Apr  8 20:21:50 2012
+++ pkgsrc/inputmethod/tegaki-recognize/PLIST   Mon Jan 10 23:46:48 2022
@@ -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

Index: pkgsrc/inputmethod/tegaki-tools/Makefile
diff -u pkgsrc/inputmethod/tegaki-tools/Makefile:1.16 pkgsrc/inputmethod/tegaki-tools/Makefile:1.17
--- pkgsrc/inputmethod/tegaki-tools/Makefile:1.16       Fri Dec  4 20:45:25 2020
+++ pkgsrc/inputmethod/tegaki-tools/Makefile    Mon Jan 10 23:46:48 2022
@@ -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"

Index: pkgsrc/inputmethod/tegaki-tools/PLIST
diff -u pkgsrc/inputmethod/tegaki-tools/PLIST:1.2 pkgsrc/inputmethod/tegaki-tools/PLIST:1.3
--- pkgsrc/inputmethod/tegaki-tools/PLIST:1.2   Sun Apr  8 20:21:50 2012
+++ pkgsrc/inputmethod/tegaki-tools/PLIST       Mon Jan 10 23:46:48 2022
@@ -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

Index: pkgsrc/inputmethod/tegaki-train/Makefile
diff -u pkgsrc/inputmethod/tegaki-train/Makefile:1.16 pkgsrc/inputmethod/tegaki-train/Makefile:1.17
--- pkgsrc/inputmethod/tegaki-train/Makefile:1.16       Fri Dec  4 20:45:25 2020
+++ pkgsrc/inputmethod/tegaki-train/Makefile    Mon Jan 10 23:46:48 2022
@@ -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"

Index: pkgsrc/inputmethod/tegaki-train/PLIST
diff -u pkgsrc/inputmethod/tegaki-train/PLIST:1.2 pkgsrc/inputmethod/tegaki-train/PLIST:1.3
--- pkgsrc/inputmethod/tegaki-train/PLIST:1.2   Sun Apr  8 20:21:50 2012
+++ pkgsrc/inputmethod/tegaki-train/PLIST       Mon Jan 10 23:46:48 2022
@@ -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}

Index: pkgsrc/inputmethod/tegaki-wagomu/Makefile
diff -u pkgsrc/inputmethod/tegaki-wagomu/Makefile:1.28 pkgsrc/inputmethod/tegaki-wagomu/Makefile:1.29
--- pkgsrc/inputmethod/tegaki-wagomu/Makefile:1.28      Wed Dec  8 16:05:19 2021
+++ pkgsrc/inputmethod/tegaki-wagomu/Makefile   Mon Jan 10 23:46:49 2022
@@ -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|${PKGVERSIO
 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"

Index: pkgsrc/inputmethod/tegaki-wagomu/PLIST
diff -u pkgsrc/inputmethod/tegaki-wagomu/PLIST:1.2 pkgsrc/inputmethod/tegaki-wagomu/PLIST:1.3
--- pkgsrc/inputmethod/tegaki-wagomu/PLIST:1.2  Sun Apr  8 20:21:50 2012
+++ pkgsrc/inputmethod/tegaki-wagomu/PLIST      Mon Jan 10 23:46:49 2022
@@ -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

Index: pkgsrc/lang/py-python-lua/Makefile
diff -u pkgsrc/lang/py-python-lua/Makefile:1.4 pkgsrc/lang/py-python-lua/Makefile:1.5
--- pkgsrc/lang/py-python-lua/Makefile:1.4      Mon Aug 31 23:07:03 2020
+++ pkgsrc/lang/py-python-lua/Makefile  Mon Jan 10 23:46:49 2022
@@ -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"

Index: pkgsrc/math/py-Scientific/Makefile
diff -u pkgsrc/math/py-Scientific/Makefile:1.71 pkgsrc/math/py-Scientific/Makefile:1.72
--- pkgsrc/math/py-Scientific/Makefile:1.71     Wed Dec  8 16:05:35 2021
+++ pkgsrc/math/py-Scientific/Makefile  Mon Jan 10 23:46:49 2022
@@ -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"

Index: pkgsrc/math/py-astroquery/Makefile
diff -u pkgsrc/math/py-astroquery/Makefile:1.3 pkgsrc/math/py-astroquery/Makefile:1.4
--- pkgsrc/math/py-astroquery/Makefile:1.3      Thu Dec 30 13:05:36 2021
+++ pkgsrc/math/py-astroquery/Makefile  Mon Jan 10 23:46:49 2022
@@ -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:../
 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"

Index: pkgsrc/net/ndiff/Makefile
diff -u pkgsrc/net/ndiff/Makefile:1.4 pkgsrc/net/ndiff/Makefile:1.5
--- pkgsrc/net/ndiff/Makefile:1.4       Wed Aug 28 13:55:44 2019
+++ pkgsrc/net/ndiff/Makefile   Mon Jan 10 23:46:49 2022
@@ -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"

Index: pkgsrc/sysutils/virtinst/Makefile
diff -u pkgsrc/sysutils/virtinst/Makefile:1.17 pkgsrc/sysutils/virtinst/Makefile:1.18
--- pkgsrc/sysutils/virtinst/Makefile:1.17      Fri Dec  4 20:45:43 2020
+++ pkgsrc/sysutils/virtinst/Makefile   Mon Jan 10 23:46:49 2022
@@ -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"

Index: pkgsrc/sysutils/virtinst/PLIST
diff -u pkgsrc/sysutils/virtinst/PLIST:1.2 pkgsrc/sysutils/virtinst/PLIST:1.3
--- pkgsrc/sysutils/virtinst/PLIST:1.2  Thu Jan 23 19:18:07 2014
+++ pkgsrc/sysutils/virtinst/PLIST      Mon Jan 10 23:46:49 2022
@@ -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

Index: pkgsrc/textproc/py-libxslt/Makefile
diff -u pkgsrc/textproc/py-libxslt/Makefile:1.60 pkgsrc/textproc/py-libxslt/Makefile:1.61
--- pkgsrc/textproc/py-libxslt/Makefile:1.60    Wed Dec  8 16:06:46 2021
+++ pkgsrc/textproc/py-libxslt/Makefile Mon Jan 10 23:46:49 2022
@@ -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"