Removed duplicates: py-absl-py, py-argh, py-cairocffi, py-jsonpickle, py-jsonschema, py-pdfrw, py-pickleshare, py-psutil, py-scikit-image, py-sparqlwrapper, py-xopen

2018-12-23 13:21:19 +01:00 · 2018-12-23 13:21:19 +01:00 · 40f21dda20
parent dbf933f2f0
commit 40f21dda20
60 changed files with 7 additions and 2603 deletions
--- a/11
+++ b/11
@ -2996,7 +2996,6 @@ SUBDIR+=	py-Robinhood
 SUBDIR+=	py-SQLObject
 SUBDIR+=	py-Soya
 SUBDIR+=	py-Xlib
-SUBDIR+=	py-absl-py
 SUBDIR+=	py-achemkit
 SUBDIR+=	py-acq4
 SUBDIR+=	py-adb
@ -3028,7 +3027,6 @@ SUBDIR+=	py-aopython
 SUBDIR+=	py-applpy
 SUBDIR+=	py-aqopa
 SUBDIR+=	py-arabic
-SUBDIR+=	py-argh
 SUBDIR+=	py-ars
 SUBDIR+=	py-arxiv2bib
 SUBDIR+=	py-arxvier
@ -3083,7 +3081,6 @@ SUBDIR+=	py-bruce
 SUBDIR+=	py-bsddb
 SUBDIR+=	py-bxa
 SUBDIR+=	py-bytecodeassembler
-SUBDIR+=	py-cairocffi
 SUBDIR+=	py-calphad
 SUBDIR+=	py-calverter
 SUBDIR+=	py-cameo
@ -3430,9 +3427,7 @@ SUBDIR+=	py-jewish
 SUBDIR+=	py-jitcode
 SUBDIR+=	py-jokosher
 SUBDIR+=	py-jsonpath
-SUBDIR+=	py-jsonpickle
 SUBDIR+=	py-jsonrequester
-SUBDIR+=	py-jsonschema
 SUBDIR+=	py-jswebkit
 SUBDIR+=	py-jtextfsm
 SUBDIR+=	py-julio
@ -3647,7 +3642,6 @@ SUBDIR+=	py-pbfalcon
 SUBDIR+=	py-pcapy
 SUBDIR+=	py-pdef
 SUBDIR+=	py-pdfposter
-SUBDIR+=	py-pdfrw
 SUBDIR+=	py-peak-rules
 SUBDIR+=	py-pebl
 SUBDIR+=	py-peng
@ -3658,7 +3652,6 @@ SUBDIR+=	py-peru
 SUBDIR+=	py-pet
 SUBDIR+=	py-petname
 SUBDIR+=	py-pgmpy
-SUBDIR+=	py-pickleshare
 SUBDIR+=	py-picture-to-gds
 SUBDIR+=	py-pint
 SUBDIR+=	py-piquant
@ -3690,7 +3683,6 @@ SUBDIR+=	py-propyte
 SUBDIR+=	py-psamm
 SUBDIR+=	py-pseudopy
 SUBDIR+=	py-pseudorandom
-SUBDIR+=	py-psutil
 SUBDIR+=	py-psychopy
 SUBDIR+=	py-ptrace
 SUBDIR+=	py-pulp
@ -3816,7 +3808,6 @@ SUBDIR+=	py-sasa
 SUBDIR+=	py-scalpy
 SUBDIR+=	py-scanless
 SUBDIR+=	py-scikit-aero
-SUBDIR+=	py-scikit-image
 SUBDIR+=	py-scikit-monaco
 SUBDIR+=	py-scikit-nano
 SUBDIR+=	py-scikits-bvp_solver
@ -3880,7 +3871,6 @@ SUBDIR+=	py-spambayes
 SUBDIR+=	py-spams
 SUBDIR+=	py-sparce
 SUBDIR+=	py-spark
-SUBDIR+=	py-sparqlwrapper
 SUBDIR+=	py-spatialdata
 SUBDIR+=	py-spatious
 SUBDIR+=	py-spectral
@ -4043,7 +4033,6 @@ SUBDIR+=	py-xcffib
 SUBDIR+=	py-xdgapp
 SUBDIR+=	py-xdress
 SUBDIR+=	py-xlutils
-SUBDIR+=	py-xopen
 SUBDIR+=	py-xpra
 SUBDIR+=	py-yams
 SUBDIR+=	py-yapf
--- a/mat/Makefile
+++ b/mat/Makefile
@ -18,7 +18,7 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-distutils-extra-[0-9]*:../../wip/py-distutils-ext
 DEPENDS+=	${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
 DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 DEPENDS+=	${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
-DEPENDS+=	${PYPKGPREFIX}-pdfrw-[0-9]*:../../wip/py-pdfrw
+DEPENDS+=	${PYPKGPREFIX}-pdfrw-[0-9]*:../../textproc/py-pdfrw

 SUBST_CLASSES+=		setup
 SUBST_STAGE.setup=	pre-patch
--- a/printrun/Makefile
+++ b/printrun/Makefile
@ -22,7 +22,7 @@ DEPENDS+=	${PYPKGPREFIX}-pyglet>=1.1:../../wip/py-pyglet
 DEPENDS+=	${PYPKGPREFIX}-cairo>=1.8.8:../../graphics/py-cairo
 DEPENDS+=	${PYPKGPREFIX}-cairosvg>=1.0.9:../../converters/py27-cairosvg
 #Meh linux sleep thing same with the dbus req.
-#DEPENDS+=	${PYPKGPREFIX}-psutil>=5.2.2:../../sysutil/py-psutil
+#DEPENDS+=	${PYPKGPREFIX}-psutil>=5.2.2:../../sysutils/py-psutil
 DEPENDS+=	${PYPKGPREFIX}-gobject>=2.14.0:../../devel/py-gobject
 DEPENDS+=	${PYPKGPREFIX}-libxml2>=2.9.1:../../textproc/py-libxml2

--- a/py-absl-py/DESCR
+++ b/py-absl-py/DESCR
@ -1 +0,0 @@
-Abseil Python Common Libraries
--- a/py-absl-py/Makefile
+++ b/py-absl-py/Makefile
@ -1,19 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	absl-py-0.1.13
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_PYPI:=a/absl-py/}
-
-MAINTAINER=	kethzer.dr@gmail.com
-HOMEPAGE=	https://github.com/abseil/abseil-py
-COMMENT=	Abseil Python Common Libraries
-LICENSE=	apache-2.0
-
-DEPENDS+=	${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
-
-.include "../../lang/python/egg.mk"
-WRKSRC=		${WRKDIR}/absl-py-${PKGVERSION_NOREV}
-USE_LANGUAGES=	# none
-
-.include "../../mk/bsd.pkg.mk"
--- a/py-absl-py/PLIST
+++ b/py-absl-py/PLIST
@ -1,63 +0,0 @@
-@comment $NetBSD$
-${PYSITELIB}/absl/__init__.py
-${PYSITELIB}/absl/__init__.pyo
-${PYSITELIB}/absl/__init__.pyc
-${PYSITELIB}/absl/app.pyo
-${PYSITELIB}/absl/app.pyc
-${PYSITELIB}/absl/command_name.pyo
-${PYSITELIB}/absl/command_name.pyc
-${PYSITELIB}/absl/app.py
-${PYSITELIB}/absl/command_name.py
-${PYSITELIB}/absl/flags/__init__.py
-${PYSITELIB}/absl/flags/__init__.pyo
-${PYSITELIB}/absl/flags/__init__.pyc
-${PYSITELIB}/absl/flags/_argument_parser.pyo
-${PYSITELIB}/absl/flags/_argument_parser.pyc
-${PYSITELIB}/absl/flags/_defines.pyo
-${PYSITELIB}/absl/flags/_defines.pyc
-${PYSITELIB}/absl/flags/_exceptions.pyo
-${PYSITELIB}/absl/flags/_exceptions.pyc
-${PYSITELIB}/absl/flags/_flag.pyo
-${PYSITELIB}/absl/flags/_flag.pyc
-${PYSITELIB}/absl/flags/_flagvalues.pyo
-${PYSITELIB}/absl/flags/_flagvalues.pyc
-${PYSITELIB}/absl/flags/_helpers.pyo
-${PYSITELIB}/absl/flags/_helpers.pyc
-${PYSITELIB}/absl/flags/_validators.pyo
-${PYSITELIB}/absl/flags/_validators.pyc
-${PYSITELIB}/absl/flags/_argument_parser.py
-${PYSITELIB}/absl/flags/_defines.py
-${PYSITELIB}/absl/flags/_exceptions.py
-${PYSITELIB}/absl/flags/_flag.py
-${PYSITELIB}/absl/flags/_flagvalues.py
-${PYSITELIB}/absl/flags/_helpers.py
-${PYSITELIB}/absl/flags/_validators.py
-${PYSITELIB}/absl/logging/__init__.py
-${PYSITELIB}/absl/logging/__init__.pyo
-${PYSITELIB}/absl/logging/__init__.pyc
-${PYSITELIB}/absl/logging/converter.pyo
-${PYSITELIB}/absl/logging/converter.pyc
-${PYSITELIB}/absl/logging/converter.py
-${PYSITELIB}/absl/testing/__init__.py
-${PYSITELIB}/absl/testing/__init__.pyo
-${PYSITELIB}/absl/testing/__init__.pyc
-${PYSITELIB}/absl/testing/_bazelize_command.pyo
-${PYSITELIB}/absl/testing/_bazelize_command.pyc
-${PYSITELIB}/absl/testing/absltest.pyo
-${PYSITELIB}/absl/testing/absltest.pyc
-${PYSITELIB}/absl/testing/flagsaver.pyo
-${PYSITELIB}/absl/testing/flagsaver.pyc
-${PYSITELIB}/absl/testing/parameterized.pyo
-${PYSITELIB}/absl/testing/parameterized.pyc
-${PYSITELIB}/absl/testing/xml_reporter.pyo
-${PYSITELIB}/absl/testing/xml_reporter.pyc
-${PYSITELIB}/absl/testing/_bazelize_command.py
-${PYSITELIB}/absl/testing/absltest.py
-${PYSITELIB}/absl/testing/flagsaver.py
-${PYSITELIB}/absl/testing/parameterized.py
-${PYSITELIB}/absl/testing/xml_reporter.py
-${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
--- a/py-absl-py/distinfo
+++ b/py-absl-py/distinfo
@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (absl-py-0.1.13.tar.gz) = ee42a8c4c6ddadfdbd97636a109486a9a3f20140
-RMD160 (absl-py-0.1.13.tar.gz) = 333ddc2e7f5de6dc48636f74f050802ec2d75751
-SHA512 (absl-py-0.1.13.tar.gz) = 1bc9a0f1701fccd2d9f9609ed7e07bb9d0085ba36e7b8146e083439b628c1648765dfe8d8d93cdf8de53aaf006b82a001d9cc36fa993ce7fe51843cb0269aedb
-Size (absl-py-0.1.13.tar.gz) = 80243 bytes
--- a/py-argh/DESCR
+++ b/py-argh/DESCR
@ -1 +0,0 @@
-An unobtrusive argparse wrapper with natural syntax
--- a/py-argh/Makefile
+++ b/py-argh/Makefile
@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2014/06/01 12:49:38 thomasklausner Exp $
-
-DISTNAME=	argh-0.24.1
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_PYPI:=a/argh/}
-
-MAINTAINER=	kamelderouiche@yahoo.com
-HOMEPAGE=	https://github.com/neithere/argh/
-COMMENT=	Unobtrusive argparse wrapper with natural syntax
-LICENSE=	gnu-lgpl-v3
-
-USE_LANGUAGES=	# none
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/py-argh/PLIST
+++ b/py-argh/PLIST
@ -1,41 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/02/07 22:12:38 jihbed Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/argh/__init__.py
-${PYSITELIB}/argh/__init__.pyc
-${PYSITELIB}/argh/__init__.pyo
-${PYSITELIB}/argh/assembling.py
-${PYSITELIB}/argh/assembling.pyc
-${PYSITELIB}/argh/assembling.pyo
-${PYSITELIB}/argh/compat.py
-${PYSITELIB}/argh/compat.pyc
-${PYSITELIB}/argh/compat.pyo
-${PYSITELIB}/argh/completion.py
-${PYSITELIB}/argh/completion.pyc
-${PYSITELIB}/argh/completion.pyo
-${PYSITELIB}/argh/constants.py
-${PYSITELIB}/argh/constants.pyc
-${PYSITELIB}/argh/constants.pyo
-${PYSITELIB}/argh/decorators.py
-${PYSITELIB}/argh/decorators.pyc
-${PYSITELIB}/argh/decorators.pyo
-${PYSITELIB}/argh/dispatching.py
-${PYSITELIB}/argh/dispatching.pyc
-${PYSITELIB}/argh/dispatching.pyo
-${PYSITELIB}/argh/exceptions.py
-${PYSITELIB}/argh/exceptions.pyc
-${PYSITELIB}/argh/exceptions.pyo
-${PYSITELIB}/argh/helpers.py
-${PYSITELIB}/argh/helpers.pyc
-${PYSITELIB}/argh/helpers.pyo
-${PYSITELIB}/argh/interaction.py
-${PYSITELIB}/argh/interaction.pyc
-${PYSITELIB}/argh/interaction.pyo
-${PYSITELIB}/argh/io.py
-${PYSITELIB}/argh/io.pyc
-${PYSITELIB}/argh/io.pyo
-${PYSITELIB}/argh/utils.py
-${PYSITELIB}/argh/utils.pyc
-${PYSITELIB}/argh/utils.pyo
--- a/py-argh/distinfo
+++ b/py-argh/distinfo
@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2014/02/07 22:12:38 jihbed Exp $
-
-SHA1 (argh-0.24.1.tar.gz) = 17f63efed15d4fbf42ac2fff23e474f6f1709e36
-RMD160 (argh-0.24.1.tar.gz) = 272d128abc9ec5e331c03a6086e307210b5e5ddc
-Size (argh-0.24.1.tar.gz) = 28376 bytes
--- a/py-cairocffi/DESCR
+++ b/py-cairocffi/DESCR
@ -1,7 +0,0 @@
-cairocffi is a CFFI-based drop-in replacement for Pycairo, a set of Python
-bindings and object-oriented API for Cairo. Cairo is a 2D vector graphics
-library with support for multiple backends including image buffers, PNG,
-PostScript, PDF, and SVG file output.
-
-Additionally, the cairocffi.pixbuf module uses GDK-PixBuf to decode various
-image formats for use in Cairo.
--- a/py-cairocffi/Makefile
+++ b/py-cairocffi/Makefile
@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2018/03/12 11:16:48 wiz Exp $
-
-DISTNAME=	cairocffi-0.8.0
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
-CATEGORIES=	graphics python
-MASTER_SITES=	${MASTER_SITE_PYPI:=c/cairocffi/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/SimonSapin/cairocffi
-COMMENT=	CFFI-based Cairo bindings for Python
-LICENSE=	modified-bsd
-
-DEPENDS+=	${PYPKGPREFIX}-cffi>=0.6:../../devel/py-cffi
-DEPENDS+=	${PYPKGPREFIX}-xcffib-[0-9]*:../../wip/py-xcffib # XXX
-
-USE_LANGUAGES=	# none
-
-.include "../../mk/bsd.prefs.mk"
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
-SOEXT=		dylib
-.else
-SOEXT=		so
-.endif
-
-SUBST_CLASSES+=		dllpath
-SUBST_STAGE.dllpath=	pre-configure
-SUBST_MESSAGE.dllpath=	Fix libcairo path.
-SUBST_FILES.dllpath=	cairocffi/__init__.py
-SUBST_VARS.dllpath=	PREFIX SOEXT
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/py-cairocffi/PLIST
+++ b/py-cairocffi/PLIST
@ -1,54 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2017/07/16 09:29:58 adam 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}/cairocffi/__init__.py
-${PYSITELIB}/cairocffi/__init__.pyc
-${PYSITELIB}/cairocffi/__init__.pyo
-${PYSITELIB}/cairocffi/_ffi.py
-${PYSITELIB}/cairocffi/_ffi.pyc
-${PYSITELIB}/cairocffi/_ffi.pyo
-${PYSITELIB}/cairocffi/_ffi_pixbuf.py
-${PYSITELIB}/cairocffi/_ffi_pixbuf.pyc
-${PYSITELIB}/cairocffi/_ffi_pixbuf.pyo
-${PYSITELIB}/cairocffi/compat.py
-${PYSITELIB}/cairocffi/compat.pyc
-${PYSITELIB}/cairocffi/compat.pyo
-${PYSITELIB}/cairocffi/constants.py
-${PYSITELIB}/cairocffi/constants.pyc
-${PYSITELIB}/cairocffi/constants.pyo
-${PYSITELIB}/cairocffi/context.py
-${PYSITELIB}/cairocffi/context.pyc
-${PYSITELIB}/cairocffi/context.pyo
-${PYSITELIB}/cairocffi/ffi_build.py
-${PYSITELIB}/cairocffi/ffi_build.pyc
-${PYSITELIB}/cairocffi/ffi_build.pyo
-${PYSITELIB}/cairocffi/fonts.py
-${PYSITELIB}/cairocffi/fonts.pyc
-${PYSITELIB}/cairocffi/fonts.pyo
-${PYSITELIB}/cairocffi/matrix.py
-${PYSITELIB}/cairocffi/matrix.pyc
-${PYSITELIB}/cairocffi/matrix.pyo
-${PYSITELIB}/cairocffi/patterns.py
-${PYSITELIB}/cairocffi/patterns.pyc
-${PYSITELIB}/cairocffi/patterns.pyo
-${PYSITELIB}/cairocffi/pixbuf.py
-${PYSITELIB}/cairocffi/pixbuf.pyc
-${PYSITELIB}/cairocffi/pixbuf.pyo
-${PYSITELIB}/cairocffi/surfaces.py
-${PYSITELIB}/cairocffi/surfaces.pyc
-${PYSITELIB}/cairocffi/surfaces.pyo
-${PYSITELIB}/cairocffi/test_cairo.py
-${PYSITELIB}/cairocffi/test_cairo.pyc
-${PYSITELIB}/cairocffi/test_cairo.pyo
-${PYSITELIB}/cairocffi/test_pixbuf.py
-${PYSITELIB}/cairocffi/test_pixbuf.pyc
-${PYSITELIB}/cairocffi/test_pixbuf.pyo
-${PYSITELIB}/cairocffi/test_xcb.py
-${PYSITELIB}/cairocffi/test_xcb.pyc
-${PYSITELIB}/cairocffi/test_xcb.pyo
-${PYSITELIB}/cairocffi/xcb.py
-${PYSITELIB}/cairocffi/xcb.pyc
-${PYSITELIB}/cairocffi/xcb.pyo
--- a/py-cairocffi/distinfo
+++ b/py-cairocffi/distinfo
@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.5 2017/07/16 09:29:58 adam Exp $
-
-SHA1 (cairocffi-0.8.0.tar.gz) = 5d2a983b3a60dfd974c5c736338cd0ffacaae8cb
-RMD160 (cairocffi-0.8.0.tar.gz) = ef591d28ca183e829b446b77bcd79069e3b00554
-SHA512 (cairocffi-0.8.0.tar.gz) = 70179e05ca4a4efeaa39ade1ee1a96d280d198ecff5ae8c8fc634c24d8922ea6a3e1eb6cf5f55c5fc9d3f5b2fc3131a53051690eb86712762d8b6400df8a630a
-Size (cairocffi-0.8.0.tar.gz) = 79217 bytes
-SHA1 (patch-cairocffi_____init____.py) = 6a9c75106a1041c9f81b73ec0d2e9062382130a2
--- a/py-cutadapt/Makefile
+++ b/py-cutadapt/Makefile
@ -14,7 +14,7 @@ MAINTAINER=	bacon@NetBSD.org
 COMMENT=	Finds and removes adapter sequences, primers, poly-A tails, etc
 LICENSE=	mit

-DEPENDS+=	${PYPKGPREFIX}-xopen>=0:../../wip/py-xopen
+DEPENDS+=	${PYPKGPREFIX}-xopen>=0:../../devel/py-xopen

 USE_LANGUAGES=	c
 PYDISTUTILSPKG=	yes
--- a/py-exocode/Makefile
+++ b/py-exocode/Makefile
@ -12,7 +12,7 @@ LICENSE=	mit

 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
-DEPENDS+=	${PYPKGPREFIX}-scikit-image>=0.11.3:../../wip/py-scikit-image
+DEPENDS+=	${PYPKGPREFIX}-scikit-image>=0.11.3:../../math/py-scikit-image

 USE_LANGUAGES=	# none

--- a/py-jsonpickle/DESCR
+++ b/py-jsonpickle/DESCR
@ -1 +0,0 @@
-jsonpickle converts complex Python objects to and from JSON
--- a/py-jsonpickle/Makefile
+++ b/py-jsonpickle/Makefile
@ -1,16 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	jsonpickle-0.9.4
-PKGNAME= 	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	textproc
-MASTER_SITES=	https://pypi.python.org/packages/cc/5e/6ecbd1d27524fcafeed4f6156f47a2a79e31e4bfa383e329e9ba93c7f3ee/
-
-MAINTAINER=	kamelderouiche@yahoo.com
-HOMEPAGE=	http://jsonpickle.github.io/
-COMMENT=	Serializing any arbitrary object graph into JSON
-LICENSE=	modified-bsd
-
-USE_LANGUAGES=	# none
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/py-jsonpickle/PLIST
+++ b/py-jsonpickle/PLIST
@ -1,38 +0,0 @@
-@comment $NetBSD$
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/jsonpickle/__init__.py
-${PYSITELIB}/jsonpickle/__init__.pyc
-${PYSITELIB}/jsonpickle/__init__.pyo
-${PYSITELIB}/jsonpickle/backend.py
-${PYSITELIB}/jsonpickle/backend.pyc
-${PYSITELIB}/jsonpickle/backend.pyo
-${PYSITELIB}/jsonpickle/compat.py
-${PYSITELIB}/jsonpickle/compat.pyc
-${PYSITELIB}/jsonpickle/compat.pyo
-${PYSITELIB}/jsonpickle/ext/__init__.py
-${PYSITELIB}/jsonpickle/ext/__init__.pyc
-${PYSITELIB}/jsonpickle/ext/__init__.pyo
-${PYSITELIB}/jsonpickle/ext/numpy.py
-${PYSITELIB}/jsonpickle/ext/numpy.pyc
-${PYSITELIB}/jsonpickle/ext/numpy.pyo
-${PYSITELIB}/jsonpickle/handlers.py
-${PYSITELIB}/jsonpickle/handlers.pyc
-${PYSITELIB}/jsonpickle/handlers.pyo
-${PYSITELIB}/jsonpickle/pickler.py
-${PYSITELIB}/jsonpickle/pickler.pyc
-${PYSITELIB}/jsonpickle/pickler.pyo
-${PYSITELIB}/jsonpickle/tags.py
-${PYSITELIB}/jsonpickle/tags.pyc
-${PYSITELIB}/jsonpickle/tags.pyo
-${PYSITELIB}/jsonpickle/unpickler.py
-${PYSITELIB}/jsonpickle/unpickler.pyc
-${PYSITELIB}/jsonpickle/unpickler.pyo
-${PYSITELIB}/jsonpickle/util.py
-${PYSITELIB}/jsonpickle/util.pyc
-${PYSITELIB}/jsonpickle/util.pyo
-${PYSITELIB}/jsonpickle/version.py
-${PYSITELIB}/jsonpickle/version.pyc
-${PYSITELIB}/jsonpickle/version.pyo
--- a/py-jsonpickle/distinfo
+++ b/py-jsonpickle/distinfo
@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (jsonpickle-0.9.4.tar.gz) = c6d5cc22c86b434db388c8faad0b5a6aff46bbea
-RMD160 (jsonpickle-0.9.4.tar.gz) = 36923da3c1d620a14f0b01af6dd067e85ac4a991
-SHA512 (jsonpickle-0.9.4.tar.gz) = d04078318a819d6a923c3e70ba232604f4271738088bd9e1ac407a6d502c5552c242473aab86e83c4b1420a0886b34790dadebe634ef8f568a8f1a359f7fc700
-Size (jsonpickle-0.9.4.tar.gz) = 65522 bytes
--- a/py-jsonschema/DESCR
+++ b/py-jsonschema/DESCR
@ -1 +0,0 @@
-Implementation of JSON Schema validation for Python
--- a/py-jsonschema/Makefile
+++ b/py-jsonschema/Makefile
@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2014/06/01 12:49:42 thomasklausner Exp $
-
-DISTNAME=	jsonschema-2.3.0
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_PYPI:=j/jsonschema/}
-EXTRACT_SUFX=	.zip
-
-MAINTAINER=	kamelderouiche@yahoo.com
-HOMEPAGE=	https://github.com/Julian/jsonschema
-COMMENT=	Implementation of JSON Schema validation for Python
-LICENSE=	mit
-
-USE_LANGUAGES=	# none
-
-PYDISTUTILSPKG=	yes
-
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/py-jsonschema/PLIST
+++ b/py-jsonschema/PLIST
@ -1,42 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/02/05 20:38:43 jihbed Exp $
-${PYSITELIB}/jsonschema/__init__.py
-${PYSITELIB}/jsonschema/__init__.pyc
-${PYSITELIB}/jsonschema/__init__.pyo
-${PYSITELIB}/jsonschema/_format.py
-${PYSITELIB}/jsonschema/_format.pyc
-${PYSITELIB}/jsonschema/_format.pyo
-${PYSITELIB}/jsonschema/_utils.py
-${PYSITELIB}/jsonschema/_utils.pyc
-${PYSITELIB}/jsonschema/_utils.pyo
-${PYSITELIB}/jsonschema/_validators.py
-${PYSITELIB}/jsonschema/_validators.pyc
-${PYSITELIB}/jsonschema/_validators.pyo
-${PYSITELIB}/jsonschema/compat.py
-${PYSITELIB}/jsonschema/compat.pyc
-${PYSITELIB}/jsonschema/compat.pyo
-${PYSITELIB}/jsonschema/exceptions.py
-${PYSITELIB}/jsonschema/exceptions.pyc
-${PYSITELIB}/jsonschema/exceptions.pyo
-${PYSITELIB}/jsonschema/schemas/draft3.json
-${PYSITELIB}/jsonschema/schemas/draft4.json
-${PYSITELIB}/jsonschema/tests/__init__.py
-${PYSITELIB}/jsonschema/tests/__init__.pyc
-${PYSITELIB}/jsonschema/tests/__init__.pyo
-${PYSITELIB}/jsonschema/tests/compat.py
-${PYSITELIB}/jsonschema/tests/compat.pyc
-${PYSITELIB}/jsonschema/tests/compat.pyo
-${PYSITELIB}/jsonschema/tests/test_exceptions.py
-${PYSITELIB}/jsonschema/tests/test_exceptions.pyc
-${PYSITELIB}/jsonschema/tests/test_exceptions.pyo
-${PYSITELIB}/jsonschema/tests/test_format.py
-${PYSITELIB}/jsonschema/tests/test_format.pyc
-${PYSITELIB}/jsonschema/tests/test_format.pyo
-${PYSITELIB}/jsonschema/tests/test_jsonschema_test_suite.py
-${PYSITELIB}/jsonschema/tests/test_jsonschema_test_suite.pyc
-${PYSITELIB}/jsonschema/tests/test_jsonschema_test_suite.pyo
-${PYSITELIB}/jsonschema/tests/test_validators.py
-${PYSITELIB}/jsonschema/tests/test_validators.pyc
-${PYSITELIB}/jsonschema/tests/test_validators.pyo
-${PYSITELIB}/jsonschema/validators.py
-${PYSITELIB}/jsonschema/validators.pyc
-${PYSITELIB}/jsonschema/validators.pyo
--- a/py-jsonschema/distinfo
+++ b/py-jsonschema/distinfo
@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2014/02/05 20:38:43 jihbed Exp $
-
-SHA1 (jsonschema-2.3.0.zip) = c5ed5e4580c86e3ccf2d882a4f3e6d233ec92b9c
-RMD160 (jsonschema-2.3.0.zip) = 3108099951261bec1d2e6581127fd378ccd95ae7
-Size (jsonschema-2.3.0.zip) = 68796 bytes
--- a/py-pdfrw/DESCR
+++ b/py-pdfrw/DESCR
@ -1,17 +0,0 @@
-pdfrw is a Python library and utility that reads and writes PDF files:
-
-  * Version 0.2 is tested and works on Python 2.6, 2.7, 3.3, and 3.4.
-  * Operations include subsetting, merging, rotating, modifying metadata, etc.
-  * The fastest pure Python PDF parser available
-  * Has been used for years by a printer in pre-press production
-  * Can be used with rst2pdf to faithfully reproduce vector images
-  * Can be used either standalone, or in conjunction with reportlab to reuse
-    existing PDFs in new ones
-  * Permissively licensed
-
-pdfrw will faithfully reproduce vector formats without rasterization, so the
-rst2pdf package has used pdfrw for PDF and SVG images by default since March
-2010.
-
-pdfrw can also be used in conjunction with reportlab, in order to re-use
-portions of existing PDFs in new PDFs created with reportlab.
--- a/py-pdfrw/Makefile
+++ b/py-pdfrw/Makefile
@ -1,18 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	pdfrw-0.2
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_PYPI:=p/pdfrw/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/pmaupin/pdfrw
-COMMENT=	PDF file reader/writer pure Python library
-LICENSE=	mit
-
-USE_LANGUAGES=	# none
-
-PYTHON_VERSIONS_INCOMPATIBLE=	35
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/py-pdfrw/PLIST
+++ b/py-pdfrw/PLIST
@ -1,62 +0,0 @@
-@comment $NetBSD$
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/pdfrw/__init__.py
-${PYSITELIB}/pdfrw/__init__.pyc
-${PYSITELIB}/pdfrw/__init__.pyo
-${PYSITELIB}/pdfrw/buildxobj.py
-${PYSITELIB}/pdfrw/buildxobj.pyc
-${PYSITELIB}/pdfrw/buildxobj.pyo
-${PYSITELIB}/pdfrw/compress.py
-${PYSITELIB}/pdfrw/compress.pyc
-${PYSITELIB}/pdfrw/compress.pyo
-${PYSITELIB}/pdfrw/errors.py
-${PYSITELIB}/pdfrw/errors.pyc
-${PYSITELIB}/pdfrw/errors.pyo
-${PYSITELIB}/pdfrw/findobjs.py
-${PYSITELIB}/pdfrw/findobjs.pyc
-${PYSITELIB}/pdfrw/findobjs.pyo
-${PYSITELIB}/pdfrw/objects/__init__.py
-${PYSITELIB}/pdfrw/objects/__init__.pyc
-${PYSITELIB}/pdfrw/objects/__init__.pyo
-${PYSITELIB}/pdfrw/objects/pdfarray.py
-${PYSITELIB}/pdfrw/objects/pdfarray.pyc
-${PYSITELIB}/pdfrw/objects/pdfarray.pyo
-${PYSITELIB}/pdfrw/objects/pdfdict.py
-${PYSITELIB}/pdfrw/objects/pdfdict.pyc
-${PYSITELIB}/pdfrw/objects/pdfdict.pyo
-${PYSITELIB}/pdfrw/objects/pdfindirect.py
-${PYSITELIB}/pdfrw/objects/pdfindirect.pyc
-${PYSITELIB}/pdfrw/objects/pdfindirect.pyo
-${PYSITELIB}/pdfrw/objects/pdfname.py
-${PYSITELIB}/pdfrw/objects/pdfname.pyc
-${PYSITELIB}/pdfrw/objects/pdfname.pyo
-${PYSITELIB}/pdfrw/objects/pdfobject.py
-${PYSITELIB}/pdfrw/objects/pdfobject.pyc
-${PYSITELIB}/pdfrw/objects/pdfobject.pyo
-${PYSITELIB}/pdfrw/objects/pdfstring.py
-${PYSITELIB}/pdfrw/objects/pdfstring.pyc
-${PYSITELIB}/pdfrw/objects/pdfstring.pyo
-${PYSITELIB}/pdfrw/pagemerge.py
-${PYSITELIB}/pdfrw/pagemerge.pyc
-${PYSITELIB}/pdfrw/pagemerge.pyo
-${PYSITELIB}/pdfrw/pdfreader.py
-${PYSITELIB}/pdfrw/pdfreader.pyc
-${PYSITELIB}/pdfrw/pdfreader.pyo
-${PYSITELIB}/pdfrw/pdfwriter.py
-${PYSITELIB}/pdfrw/pdfwriter.pyc
-${PYSITELIB}/pdfrw/pdfwriter.pyo
-${PYSITELIB}/pdfrw/py23_diffs.py
-${PYSITELIB}/pdfrw/py23_diffs.pyc
-${PYSITELIB}/pdfrw/py23_diffs.pyo
-${PYSITELIB}/pdfrw/tokens.py
-${PYSITELIB}/pdfrw/tokens.pyc
-${PYSITELIB}/pdfrw/tokens.pyo
-${PYSITELIB}/pdfrw/toreportlab.py
-${PYSITELIB}/pdfrw/toreportlab.pyc
-${PYSITELIB}/pdfrw/toreportlab.pyo
-${PYSITELIB}/pdfrw/uncompress.py
-${PYSITELIB}/pdfrw/uncompress.pyc
-${PYSITELIB}/pdfrw/uncompress.pyo
--- a/py-pdfrw/distinfo
+++ b/py-pdfrw/distinfo
@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (pdfrw-0.2.tar.gz) = 67a64bfdd1c543efe847f13a9a1e521337873e69
-RMD160 (pdfrw-0.2.tar.gz) = 9e46bcdaf58ee4eb0d47f0d36757d4c228c3d215
-SHA512 (pdfrw-0.2.tar.gz) = 4f1ed3b7ddb42969110291b31e02e15e1f98316ede25eaa4d63cdbc443497a278267309769351e04cff52651cdbc44c93771e521cb953ba08d57152f81ee516f
-Size (pdfrw-0.2.tar.gz) = 69177 bytes
--- a/py-pickleshare/DESCR
+++ b/py-pickleshare/DESCR
@ -1,5 +0,0 @@
-PickleShare - a small shelve like datastore with concurrency support
-Like shelve, a PickleShareDB object acts like a normal dictionary
-Unlike shelve, many processes can access the database simultaneously
-Changing a value in database is immediately visible to other processes
-accessing the same database
--- a/py-pickleshare/Makefile
+++ b/py-pickleshare/Makefile
@ -1,20 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	pickleshare-0.7.3
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	databases devel
-MASTER_SITES=	${MASTER_SITE_PYPI:=p/pickleshare/}
-
-MAINTAINER=	kamelderouiche@yahoo.com
-HOMEPAGE=	https://github.com/pickleshare/pickleshare
-COMMENT=	Tiny shelve-like database with concurrency support
-LICENSE=	mit
-
-DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-
-WRKSRC=		${WRKDIR}/pickleshare-0.7.3
-
-USE_LANGUAGES=	# none
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/py-pickleshare/PLIST
+++ b/py-pickleshare/PLIST
@ -1,9 +0,0 @@
-@comment $NetBSD$
-${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}/pickleshare.py
-${PYSITELIB}/pickleshare.pyc
-${PYSITELIB}/pickleshare.pyo
--- a/py-pickleshare/distinfo
+++ b/py-pickleshare/distinfo
@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (pickleshare-0.7.3.tar.gz) = 41ffa69d5ed6b7d330eb79110e91d2a696a0a99d
-RMD160 (pickleshare-0.7.3.tar.gz) = e9db2ac7b55399081ecf3a6b8ab434d3cf68a9a7
-SHA512 (pickleshare-0.7.3.tar.gz) = c49f41b2778783c0de69838db0c916bbfe88eb651134959bf43a18233a4f1747599e51bdbe4b0cc7f7b13c92fc202c2159a0cdd2331b099034afbfe0df61c19d
-Size (pickleshare-0.7.3.tar.gz) = 5930 bytes
--- a/py-psutil/DESCR
+++ b/py-psutil/DESCR
@ -1,6 +0,0 @@
-util is a module providing an interface for retrieving information,
-on all running processes and system utilization (CPU, memory, disks,
-network, users) in a portable way by using Python, implementing
-many functionalities offered by command line tools such as ps, top,
-df, netstat, who, kill, uptime, free, lsof, ifconfig, nice, ionice,
-iostat, iotop, pidof, tty, taskset, or pmap.
--- a/py-psutil/Makefile
+++ b/py-psutil/Makefile
@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2017/05/29 16:02:40 adam Exp $
-
-DISTNAME=	psutil-5.4.3
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_PYPI:=p/psutil/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/giampaolo/psutil
-COMMENT=	Cross-platform process and system utilities module for Python
-LICENSE=	modified-bsd
-
-USE_LANGUAGES=		c
-
-.include "../../lang/python/pyversion.mk"
-
-.if "${PYPKGPREFIX}" == "py27"
-BUILD_DEPENDS+=	${PYPKGPREFIX}-ipaddress-[0-9]*:../../net/py-ipaddress
-.endif
-BUILD_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-BUILD_DEPENDS+=	${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2
-
-REPLACE_PYTHON=	psutil/*py
-
-.include "../../mk/bsd.prefs.mk"
-
-# facilitate PLIST processing
-.if ${OPSYS} == "Darwin"
-PLIST_SUBST+=	SYSTEM=osx
-.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
-PLIST_SUBST+=	SYSTEM=bsd
-.else
-PLIST_SUBST+=	SYSTEM=${OPSYS:tl}
-.endif
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/py-psutil/PLIST
+++ b/py-psutil/PLIST
@ -1,90 +0,0 @@
-@comment $NetBSD$
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/psutil/__init__.py
-${PYSITELIB}/psutil/__init__.pyc
-${PYSITELIB}/psutil/__init__.pyo
-${PYSITELIB}/psutil/_common.py
-${PYSITELIB}/psutil/_common.pyc
-${PYSITELIB}/psutil/_common.pyo
-${PYSITELIB}/psutil/_compat.py
-${PYSITELIB}/psutil/_compat.pyc
-${PYSITELIB}/psutil/_compat.pyo
-${PYSITELIB}/psutil/_exceptions.py
-${PYSITELIB}/psutil/_exceptions.pyc
-${PYSITELIB}/psutil/_exceptions.pyo
-${PYSITELIB}/psutil/_psaix.py
-${PYSITELIB}/psutil/_psaix.pyc
-${PYSITELIB}/psutil/_psaix.pyo
-${PYSITELIB}/psutil/_psbsd.py
-${PYSITELIB}/psutil/_psbsd.pyc
-${PYSITELIB}/psutil/_psbsd.pyo
-${PYSITELIB}/psutil/_pslinux.py
-${PYSITELIB}/psutil/_pslinux.pyc
-${PYSITELIB}/psutil/_pslinux.pyo
-${PYSITELIB}/psutil/_psosx.py
-${PYSITELIB}/psutil/_psosx.pyc
-${PYSITELIB}/psutil/_psosx.pyo
-${PYSITELIB}/psutil/_psposix.py
-${PYSITELIB}/psutil/_psposix.pyc
-${PYSITELIB}/psutil/_psposix.pyo
-${PYSITELIB}/psutil/_pssunos.py
-${PYSITELIB}/psutil/_pssunos.pyc
-${PYSITELIB}/psutil/_pssunos.pyo
-${PYSITELIB}/psutil/_psutil_${SYSTEM}.so
-${PYSITELIB}/psutil/_psutil_posix.so
-${PYSITELIB}/psutil/_pswindows.py
-${PYSITELIB}/psutil/_pswindows.pyc
-${PYSITELIB}/psutil/_pswindows.pyo
-${PYSITELIB}/psutil/tests/__init__.py
-${PYSITELIB}/psutil/tests/__init__.pyc
-${PYSITELIB}/psutil/tests/__init__.pyo
-${PYSITELIB}/psutil/tests/__main__.py
-${PYSITELIB}/psutil/tests/__main__.pyc
-${PYSITELIB}/psutil/tests/__main__.pyo
-${PYSITELIB}/psutil/tests/test_aix.py
-${PYSITELIB}/psutil/tests/test_aix.pyc
-${PYSITELIB}/psutil/tests/test_aix.pyo
-${PYSITELIB}/psutil/tests/test_bsd.py
-${PYSITELIB}/psutil/tests/test_bsd.pyc
-${PYSITELIB}/psutil/tests/test_bsd.pyo
-${PYSITELIB}/psutil/tests/test_connections.py
-${PYSITELIB}/psutil/tests/test_connections.pyc
-${PYSITELIB}/psutil/tests/test_connections.pyo
-${PYSITELIB}/psutil/tests/test_contracts.py
-${PYSITELIB}/psutil/tests/test_contracts.pyc
-${PYSITELIB}/psutil/tests/test_contracts.pyo
-${PYSITELIB}/psutil/tests/test_linux.py
-${PYSITELIB}/psutil/tests/test_linux.pyc
-${PYSITELIB}/psutil/tests/test_linux.pyo
-${PYSITELIB}/psutil/tests/test_memory_leaks.py
-${PYSITELIB}/psutil/tests/test_memory_leaks.pyc
-${PYSITELIB}/psutil/tests/test_memory_leaks.pyo
-${PYSITELIB}/psutil/tests/test_misc.py
-${PYSITELIB}/psutil/tests/test_misc.pyc
-${PYSITELIB}/psutil/tests/test_misc.pyo
-${PYSITELIB}/psutil/tests/test_osx.py
-${PYSITELIB}/psutil/tests/test_osx.pyc
-${PYSITELIB}/psutil/tests/test_osx.pyo
-${PYSITELIB}/psutil/tests/test_posix.py
-${PYSITELIB}/psutil/tests/test_posix.pyc
-${PYSITELIB}/psutil/tests/test_posix.pyo
-${PYSITELIB}/psutil/tests/test_process.py
-${PYSITELIB}/psutil/tests/test_process.pyc
-${PYSITELIB}/psutil/tests/test_process.pyo
-${PYSITELIB}/psutil/tests/test_sunos.py
-${PYSITELIB}/psutil/tests/test_sunos.pyc
-${PYSITELIB}/psutil/tests/test_sunos.pyo
-${PYSITELIB}/psutil/tests/test_system.py
-${PYSITELIB}/psutil/tests/test_system.pyc
-${PYSITELIB}/psutil/tests/test_system.pyo
-${PYSITELIB}/psutil/tests/test_unicode.py
-${PYSITELIB}/psutil/tests/test_unicode.pyc
-${PYSITELIB}/psutil/tests/test_unicode.pyo
-${PYSITELIB}/psutil/tests/test_windows.py
-${PYSITELIB}/psutil/tests/test_windows.pyc
-${PYSITELIB}/psutil/tests/test_windows.pyo
--- a/py-psutil/distinfo
+++ b/py-psutil/distinfo
@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.20 2017/06/24 08:03:35 adam Exp $
-
-SHA1 (psutil-5.4.3.tar.gz) = 51ce815e89073bcbcd73c2a5e0e852d18f3a7b6d
-RMD160 (psutil-5.4.3.tar.gz) = 5e213c1ed1ed454bf41996069d0602dff629acf2
-SHA512 (psutil-5.4.3.tar.gz) = f2a0f3089c3436df52d509576795e1de14c4127918fbe63b8f116f7c097ba4d67e3b55a8da167a88c6ffd340bb443109d4887c03371810997ced4478b295f960
-Size (psutil-5.4.3.tar.gz) = 412550 bytes
-SHA1 (patch-psutil_____init____.py) = 5adb9779e4bbefef3e5cbb67c86cc1c3b0d09a7b
-SHA1 (patch-psutil___common.py) = e3835f65f14aa28f8b8c9ad72a54cc77432b4d1e
-SHA1 (patch-psutil___psbsd.py) = 6d30e3b2a2e8f34e65fcbc34dc7b497849b1d7f7
-SHA1 (patch-psutil___psutil__bsd.c) = 205abeddb453cbcf4e23cba41fbacfbc97815aea
-SHA1 (patch-psutil_arch_bsd_dragonfly.c) = e7b55b6097e3c4ba84d59e5ff9e9f0fe16853df1
-SHA1 (patch-psutil_arch_bsd_dragonfly.h) = b39e28cfcbc1ed5b121ea1c1c8efdb306361254f
-SHA1 (patch-setup.py) = d2e4bf22a733889f74c3959894bda10e478bc186
--- a/py-psutil/patches/patch-psutil_init.py
+++ b/py-psutil/patches/patch-psutil_init.py
@ -1,21 +0,0 @@
-$NetBSD$
-
--- psutil/__init__.py.orig	2017-12-09 11:29:06.000000000 +0000
-+++ psutil/__init__.py
-@@ -81,6 +81,7 @@ from ._common import FREEBSD  # NOQA
- from ._common import LINUX
- from ._common import NETBSD  # NOQA
- from ._common import OPENBSD  # NOQA
-+from ._common import DRAGONFLY # NOQA
- from ._common import OSX
- from ._common import POSIX  # NOQA
- from ._common import SUNOS
-@@ -201,7 +202,7 @@ __all__ = [
-     "POWER_TIME_UNKNOWN", "POWER_TIME_UNLIMITED",
- 
-     "BSD", "FREEBSD", "LINUX", "NETBSD", "OPENBSD", "OSX", "POSIX", "SUNOS",
-    "WINDOWS", "AIX",
-+    "WINDOWS", "AIX", "DRAGONFLY"
- 
-     # classes
-     "Process", "Popen",
--- a/py-psutil/patches/patch-psutil___common.py
+++ b/py-psutil/patches/patch-psutil___common.py
@ -1,23 +0,0 @@
-$NetBSD$
-
--- psutil/_common.py.orig	2017-12-07 10:02:52.000000000 +0000
-+++ psutil/_common.py
-@@ -43,7 +43,7 @@ PY3 = sys.version_info[0] == 3
- __all__ = [
-     # constants
-     'FREEBSD', 'BSD', 'LINUX', 'NETBSD', 'OPENBSD', 'OSX', 'POSIX', 'SUNOS',
-    'WINDOWS',
-+    'WINDOWS', 'DRAGONFLY',
-     'ENCODING', 'ENCODING_ERRS', 'AF_INET6',
-     # connection constants
-     'CONN_CLOSE', 'CONN_CLOSE_WAIT', 'CONN_CLOSING', 'CONN_ESTABLISHED',
-@@ -79,7 +79,8 @@ OSX = sys.platform.startswith("darwin")
- FREEBSD = sys.platform.startswith("freebsd")
- OPENBSD = sys.platform.startswith("openbsd")
- NETBSD = sys.platform.startswith("netbsd")
-BSD = FREEBSD or OPENBSD or NETBSD
-+DRAGONFLY = sys.platform.startswith("dragonfly")
-+BSD = FREEBSD or OPENBSD or NETBSD or DRAGONFLY
- SUNOS = sys.platform.startswith("sunos") or sys.platform.startswith("solaris")
- AIX = sys.platform.startswith("aix")
- 
--- a/py-psutil/patches/patch-psutil___psbsd.py
+++ b/py-psutil/patches/patch-psutil___psbsd.py
@ -1,12 +0,0 @@
-$NetBSD$
-
--- psutil/_psbsd.py.orig	2017-11-12 23:27:06.000000000 +0000
-+++ psutil/_psbsd.py
-@@ -23,6 +23,7 @@ from ._common import memoize
- from ._common import memoize_when_activated
- from ._common import NETBSD
- from ._common import OPENBSD
-+from ._common import DRAGONFLY
- from ._common import sockfam_to_enum
- from ._common import socktype_to_enum
- from ._common import usage_percent
--- a/py-psutil/patches/patch-psutil_psutilbsd.c
+++ b/py-psutil/patches/patch-psutil_psutilbsd.c
@ -1,62 +0,0 @@
-$NetBSD$
-
--- psutil/_psutil_bsd.c.orig	2017-11-14 22:49:09.000000000 +0000
-+++ psutil/_psutil_bsd.c
-@@ -19,6 +19,7 @@
-     #define _KMEMUSER
- #endif
- 
-+#include <netinet/in.h>
- #include <Python.h>
- #include <assert.h>
- #include <errno.h>
-@@ -39,7 +40,6 @@
- #include <sys/un.h>
- #include <sys/unpcb.h>
- // for xinpcb struct
-#include <netinet/in.h>
- #include <netinet/in_systm.h>
- #include <netinet/ip.h>
- #include <netinet/in_pcb.h>
-@@ -94,6 +94,11 @@
-     #ifndef DTYPE_VNODE
-         #define DTYPE_VNODE 1
-     #endif
-+#elif PSUTIL_DRAGONFLY
-+    #include "arch/bsd/dragonfly.h"
-+    #include <sys/resource.h>
-+
-+    #include <utmpx.h>
- #endif
- 
- 
-@@ -231,6 +236,12 @@ psutil_proc_oneshot_info(PyObject *self,
-     memtext = (long)kp.ki_tsize * pagesize;
-     memdata = (long)kp.ki_dsize * pagesize;
-     memstack = (long)kp.ki_ssize * pagesize;
-+#elif PSUTIL_DRAGONFLY
-+    rss = (long)kp.kp_vm_rssize * pagesize;
-+    vms = (long)kp.kp_vm_map_size;
-+    memtext = (long)kp.kp_vm_tsize * pagesize;
-+    memdata = (long)kp.kp_vm_dsize * pagesize;
-+    memstack = (long)kp.kp_vm_ssize * pagesize;
- #else
-     rss = (long)kp.p_vm_rssize * pagesize;
-     #ifdef PSUTIL_OPENBSD
-@@ -425,7 +436,7 @@ psutil_cpu_times(PyObject *self, PyObjec
-     size_t size = sizeof(cpu_time);
-     int ret;
- 
-#if defined(PSUTIL_FREEBSD) || defined(PSUTIL_NETBSD)
-+#if defined(PSUTIL_FREEBSD) || defined(PSUTIL_NETBSD) || defined(PSUTIL_DRAGONFLY)
-     ret = sysctlbyname("kern.cp_time", &cpu_time, &size, NULL, 0);
- #elif PSUTIL_OPENBSD
-     int mib[] = {CTL_KERN, KERN_CPTIME};
-@@ -433,6 +444,7 @@ psutil_cpu_times(PyObject *self, PyObjec
- #endif
-     if (ret == -1)
-         return PyErr_SetFromErrno(PyExc_OSError);
-+
-     return Py_BuildValue("(ddddd)",
-                          (double)cpu_time[CP_USER] / CLOCKS_PER_SEC,
-                          (double)cpu_time[CP_NICE] / CLOCKS_PER_SEC,
--- a/py-psutil/patches/patch-psutil_arch_bsd_dragonfly.c
+++ b/py-psutil/patches/patch-psutil_arch_bsd_dragonfly.c
@ -1,567 +0,0 @@
-$NetBSD$
-
--- psutil/arch/bsd/dragonfly.c.orig	2018-02-09 16:11:41.557735000 +0000
-+++ psutil/arch/bsd/dragonfly.c
-@@ -0,0 +1,562 @@
-+/*
-+ * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
-+ * Use of this source code is governed by a BSD-style license that can be
-+ * found in the LICENSE file.
-+ *
-+ * Platform-specific module methods for DragonFly BSD.
-+ */
-+
-+#include <Python.h>
-+#include <assert.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <sys/param.h>
-+#include <sys/user.h>
-+#include <sys/proc.h>
-+#include <signal.h>
-+#include <fcntl.h>
-+#include <sys/vmmeter.h>  // needed for vmtotal struct
-+#include <devstat.h>  // for swap mem
-+#include <libutil.h>  // process open files, shared libs (kinfo_getvmmap), cwd
-+#include <kvm.h>
-+
-+#include "../../_psutil_common.h"
-+#include "../../_psutil_posix.h"
-+
-+#define PSUTIL_TV2DOUBLE(t)    ((t).tv_sec + (t).tv_usec / 1000000.0)
-+#define PSUTIL_BT2MSEC(bt) (bt.sec * 1000 + (((uint64_t) 1000000000 * (uint32_t) \
-+        (bt.frac >> 32) ) >> 32 ) / 1000000)
-+#ifndef _PATH_DEVNULL
-+#define _PATH_DEVNULL "/dev/null"
-+#endif
-+
-+
-+// ============================================================================
-+// Utility functions
-+// ============================================================================
-+
-+
-+int
-+psutil_kinfo_proc(const pid_t pid, struct kinfo_proc *proc) {
-+    // Fills a kinfo_proc struct based on process pid.
-+    int mib[4];
-+    size_t size;
-+    mib[0] = CTL_KERN;
-+    mib[1] = KERN_PROC;
-+    mib[2] = KERN_PROC_PID;
-+    mib[3] = pid;
-+
-+    size = sizeof(struct kinfo_proc);
-+    if (sysctl((int *)mib, 4, proc, &size, NULL, 0) == -1) {
-+        PyErr_SetFromErrno(PyExc_OSError);
-+        return -1;
-+    }
-+
-+    // sysctl stores 0 in the size if we can't find the process information.
-+    if (size == 0) {
-+        NoSuchProcess("");
-+        return -1;
-+    }
-+    return 0;
-+}
-+
-+
-+// remove spaces from string
-+static void psutil_remove_spaces(char *str) {
-+    char *p1 = str;
-+    char *p2 = str;
-+    do
-+        while (*p2 == ' ')
-+            p2++;
-+    while ((*p1++ = *p2++));
-+}
-+
-+
-+// ============================================================================
-+// APIS
-+// ============================================================================
-+
-+int
-+psutil_get_proc_list(struct kinfo_proc **procList, size_t *procCount) {
-+    // Returns a list of all BSD processes on the system.  This routine
-+    // allocates the list and puts it in *procList and a count of the
-+    // number of entries in *procCount.  You are responsible for freeing
-+    // this list (use "free" from System framework).
-+    // On success, the function returns 0.
-+    // On error, the function returns a BSD errno value.
-+
-+    /* XXX: not implemented */
-+
-+    *procList = NULL;
-+    *procCount = 0;
-+
-+    return 0;
-+}
-+
-+
-+/*
-+ * XXX no longer used; it probably makese sense to remove it.
-+ * Borrowed from psi Python System Information project
-+ *
-+ * Get command arguments and environment variables.
-+ *
-+ * Based on code from ps.
-+ *
-+ * Returns:
-+ *      0 for success;
-+ *      -1 for failure (Exception raised);
-+ *      1 for insufficient privileges.
-+ */
-+static char
-+*psutil_get_cmd_args(long pid, size_t *argsize) {
-+    int mib[4], argmax;
-+    size_t size = sizeof(argmax);
-+    char *procargs = NULL;
-+
-+    // Get the maximum process arguments size.
-+    mib[0] = CTL_KERN;
-+    mib[1] = KERN_ARGMAX;
-+
-+    size = sizeof(argmax);
-+    if (sysctl(mib, 2, &argmax, &size, NULL, 0) == -1)
-+        return NULL;
-+
-+    // Allocate space for the arguments.
-+    procargs = (char *)malloc(argmax);
-+    if (procargs == NULL) {
-+        PyErr_NoMemory();
-+        return NULL;
-+    }
-+
-+    /*
-+     * Make a sysctl() call to get the raw argument space of the process.
-+     */
-+    mib[0] = CTL_KERN;
-+    mib[1] = KERN_PROC;
-+    mib[2] = KERN_PROC_ARGS;
-+    mib[3] = pid;
-+
-+    size = argmax;
-+    if (sysctl(mib, 4, procargs, &size, NULL, 0) == -1) {
-+        free(procargs);
-+        return NULL;       // Insufficient privileges
-+    }
-+
-+    // return string and set the length of arguments
-+    *argsize = size;
-+    return procargs;
-+}
-+
-+
-+// returns the command line as a python list object
-+PyObject *
-+psutil_get_cmdline(long pid) {
-+    char *argstr = NULL;
-+    int pos = 0;
-+    size_t argsize = 0;
-+    PyObject *py_retlist = Py_BuildValue("[]");
-+    PyObject *py_arg = NULL;
-+
-+    if (pid < 0)
-+        return py_retlist;
-+    argstr = psutil_get_cmd_args(pid, &argsize);
-+    if (argstr == NULL)
-+        goto error;
-+
-+    // args are returned as a flattened string with \0 separators between
-+    // arguments add each string to the list then step forward to the next
-+    // separator
-+    if (argsize > 0) {
-+        while (pos < argsize) {
-+#if PY_MAJOR_VERSION >= 3
-+            py_arg = PyUnicode_DecodeFSDefault(&argstr[pos]);
-+#else
-+            py_arg = Py_BuildValue("s", &argstr[pos]);
-+#endif
-+            if (!py_arg)
-+                goto error;
-+            if (PyList_Append(py_retlist, py_arg))
-+                goto error;
-+            Py_DECREF(py_arg);
-+            pos = pos + strlen(&argstr[pos]) + 1;
-+        }
-+    }
-+
-+    free(argstr);
-+    return py_retlist;
-+
-+error:
-+    Py_XDECREF(py_arg);
-+    Py_DECREF(py_retlist);
-+    if (argstr != NULL)
-+        free(argstr);
-+    return NULL;
-+}
-+
-+
-+/*
-+ * Return process pathname executable.
-+ * Thanks to Robert N. M. Watson:
-+ * http://fxr.googlebit.com/source/usr.bin/procstat/procstat_bin.c?v=8-CURRENT
-+ */
-+PyObject *
-+psutil_proc_exe(PyObject *self, PyObject *args) {
-+    long pid;
-+    char pathname[PATH_MAX];
-+    int error;
-+    int mib[4];
-+    int ret;
-+    size_t size;
-+    const char *encoding_errs;
-+
-+    if (! PyArg_ParseTuple(args, "l", &pid))
-+        return NULL;
-+
-+    mib[0] = CTL_KERN;
-+    mib[1] = KERN_PROC;
-+    mib[2] = KERN_PROC_PATHNAME;
-+    mib[3] = pid;
-+
-+    size = sizeof(pathname);
-+    error = sysctl(mib, 4, pathname, &size, NULL, 0);
-+    if (error == -1) {
-+        if (errno == ENOENT) {
-+            // see: https://github.com/giampaolo/psutil/issues/907
-+            return Py_BuildValue("s", "");
-+        }
-+        else {
-+            PyErr_SetFromErrno(PyExc_OSError);
-+            return NULL;
-+        }
-+    }
-+    if (size == 0 || strlen(pathname) == 0) {
-+        ret = psutil_pid_exists(pid);
-+        if (ret == -1)
-+            return NULL;
-+        else if (ret == 0)
-+            return NoSuchProcess("");
-+        else
-+            strcpy(pathname, "");
-+    }
-+
-+#if PY_MAJOR_VERSION >= 3
-+    return PyUnicode_DecodeFSDefault(pathname);
-+#else
-+    return Py_BuildValue("s", pathname);
-+#endif
-+
-+}
-+
-+
-+PyObject *
-+psutil_proc_num_threads(PyObject *self, PyObject *args) {
-+    // Return number of threads used by process as a Python integer.
-+    long pid;
-+    struct kinfo_proc kp;
-+    if (! PyArg_ParseTuple(args, "l", &pid))
-+        return NULL;
-+    if (psutil_kinfo_proc(pid, &kp) == -1)
-+        return NULL;
-+    return Py_BuildValue("l", (long)kp.kp_nthreads);
-+}
-+
-+PyObject *
-+psutil_proc_connections(PyObject *self, PyObject *args) {
-+    /* XXX: not implemented */
-+
-+    return NULL;
-+}
-+
-+PyObject *
-+psutil_proc_threads(PyObject *self, PyObject *args) {
-+    // Retrieves all threads used by process returning a list of tuples
-+    // including thread id, user time and system time.
-+
-+    /* XXX: not implemented */
-+    return NULL;
-+}
-+
-+
-+PyObject *
-+psutil_cpu_count_phys(PyObject *self, PyObject *args) {
-+    // Return an XML string from which we'll determine the number of
-+    // physical CPU cores in the system.
-+
-+    /* XXX: not implemented */
-+    return NULL;
-+}
-+
-+
-+/*
-+ * Return virtual memory usage statistics.
-+ */
-+PyObject *
-+psutil_virtual_mem(PyObject *self, PyObject *args) {
-+    unsigned long  total;
-+    unsigned int   active, inactive, wired, cached, free;
-+    size_t         size = sizeof(total);
-+    struct vmtotal vm;
-+    long           pagesize = getpagesize();
-+    long buffers;
-+    size_t buffers_size = sizeof(buffers);
-+
-+    if (sysctlbyname("hw.physmem", &total, &size, NULL, 0))
-+        goto error;
-+    if (sysctlbyname("vm.stats.vm.v_active_count", &active, &size, NULL, 0))
-+        goto error;
-+    if (sysctlbyname("vm.stats.vm.v_inactive_count",
-+                     &inactive, &size, NULL, 0))
-+        goto error;
-+    if (sysctlbyname("vm.stats.vm.v_wire_count", &wired, &size, NULL, 0))
-+        goto error;
-+    // https://github.com/giampaolo/psutil/issues/997
-+    if (sysctlbyname("vm.stats.vm.v_cache_count", &cached, &size, NULL, 0))
-+        cached = 0;
-+    if (sysctlbyname("vm.stats.vm.v_free_count", &free, &size, NULL, 0))
-+        goto error;
-+    if (sysctlbyname("vfs.bufspace", &buffers, &buffers_size, NULL, 0))
-+        goto error;
-+
-+    size = sizeof(vm);
-+    if (sysctlbyname("vm.vmtotal", &vm, &size, NULL, 0))
-+        goto error;
-+
-+    return Py_BuildValue("KKKKKKKK",
-+        (unsigned long long) total,
-+        (unsigned long long) free     * pagesize,
-+        (unsigned long long) active   * pagesize,
-+        (unsigned long long) inactive * pagesize,
-+        (unsigned long long) wired    * pagesize,
-+        (unsigned long long) cached   * pagesize,
-+        (unsigned long long) buffers,
-+        (unsigned long long) (vm.t_vmshr + vm.t_rmshr) * pagesize  // shared
-+    );
-+
-+error:
-+    PyErr_SetFromErrno(PyExc_OSError);
-+    return NULL;
-+}
-+
-+
-+PyObject *
-+psutil_swap_mem(PyObject *self, PyObject *args) {
-+    // Return swap memory stats (see 'swapinfo' cmdline tool)
-+    kvm_t *kd;
-+    struct kvm_swap kvmsw[1];
-+    unsigned int swapin, swapout, nodein, nodeout;
-+    size_t size = sizeof(unsigned int);
-+
-+    kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open failed");
-+    if (kd == NULL) {
-+        PyErr_SetString(PyExc_RuntimeError, "kvm_open() syscall failed");
-+        return NULL;
-+    }
-+
-+    if (kvm_getswapinfo(kd, kvmsw, 1, 0) < 0) {
-+        kvm_close(kd);
-+        PyErr_SetString(PyExc_RuntimeError,
-+                        "kvm_getswapinfo() syscall failed");
-+        return NULL;
-+    }
-+
-+    kvm_close(kd);
-+
-+    if (sysctlbyname("vm.stats.vm.v_swapin", &swapin, &size, NULL, 0) == -1)
-+        goto sbn_error;
-+    if (sysctlbyname("vm.stats.vm.v_swapout", &swapout, &size, NULL, 0) == -1)
-+        goto sbn_error;
-+    if (sysctlbyname("vm.stats.vm.v_vnodein", &nodein, &size, NULL, 0) == -1)
-+        goto sbn_error;
-+    if (sysctlbyname("vm.stats.vm.v_vnodeout", &nodeout, &size, NULL, 0) == -1)
-+        goto sbn_error;
-+
-+    return Py_BuildValue("(iiiII)",
-+                         kvmsw[0].ksw_total,                     // total
-+                         kvmsw[0].ksw_used,                      // used
-+                         kvmsw[0].ksw_total - kvmsw[0].ksw_used, // free
-+                         swapin + swapout,                       // swap in
-+                         nodein + nodeout);                      // swap out
-+
-+sbn_error:
-+    PyErr_SetFromErrno(PyExc_OSError);
-+    return NULL;
-+}
-+
-+
-+PyObject *
-+psutil_proc_cwd(PyObject *self, PyObject *args) {
-+    /* XXX: not implemented */
-+
-+    return NULL;
-+}
-+
-+PyObject *
-+psutil_proc_num_fds(PyObject *self, PyObject *args) {
-+    /* XXX: not implemented */
-+
-+    return NULL;
-+}
-+
-+PyObject *
-+psutil_per_cpu_times(PyObject *self, PyObject *args) {
-+    static int maxcpus;
-+    int mib[2];
-+    int ncpu;
-+    size_t len;
-+    size_t size;
-+    int i;
-+    PyObject *py_retlist = PyList_New(0);
-+    PyObject *py_cputime = NULL;
-+
-+    if (py_retlist == NULL)
-+        return NULL;
-+
-+    // retrieve maxcpus value
-+    size = sizeof(maxcpus);
-+    if (sysctlbyname("hw.ncpu", &maxcpus, &size, NULL, 0) < 0) {
-+        Py_DECREF(py_retlist);
-+        PyErr_SetFromErrno(PyExc_OSError);
-+        return NULL;
-+    }
-+    long cpu_time[maxcpus][CPUSTATES];
-+
-+    // retrieve the number of cpus
-+    mib[0] = CTL_HW;
-+    mib[1] = HW_NCPU;
-+    len = sizeof(ncpu);
-+    if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == -1) {
-+        PyErr_SetFromErrno(PyExc_OSError);
-+        goto error;
-+    }
-+
-+    // per-cpu info
-+    size = sizeof(cpu_time);
-+    if (sysctlbyname("kern.cp_times", &cpu_time, &size, NULL, 0) == -1) {
-+        PyErr_SetFromErrno(PyExc_OSError);
-+        goto error;
-+    }
-+
-+    for (i = 0; i < ncpu; i++) {
-+        py_cputime = Py_BuildValue(
-+            "(ddddd)",
-+            (double)cpu_time[i][CP_USER] / CLOCKS_PER_SEC,
-+            (double)cpu_time[i][CP_NICE] / CLOCKS_PER_SEC,
-+            (double)cpu_time[i][CP_SYS] / CLOCKS_PER_SEC,
-+            (double)cpu_time[i][CP_IDLE] / CLOCKS_PER_SEC,
-+            (double)cpu_time[i][CP_INTR] / CLOCKS_PER_SEC);
-+        if (!py_cputime)
-+            goto error;
-+        if (PyList_Append(py_retlist, py_cputime))
-+            goto error;
-+        Py_DECREF(py_cputime);
-+    }
-+
-+    return py_retlist;
-+
-+error:
-+    Py_XDECREF(py_cputime);
-+    Py_DECREF(py_retlist);
-+    return NULL;
-+}
-+
-+
-+PyObject *
-+psutil_disk_io_counters(PyObject *self, PyObject *args) {
-+    /* XXX: not implemented */
-+    return NULL;
-+}
-+
-+
-+PyObject *
-+psutil_proc_memory_maps(PyObject *self, PyObject *args) {
-+    // Return a list of tuples for every process memory maps.
-+    //'procstat' cmdline utility has been used as an example.
-+
-+    /* XXX: not implemented */
-+    return NULL;
-+}
-+
-+
-+PyObject*
-+psutil_proc_cpu_affinity_get(PyObject* self, PyObject* args) {
-+    // Get process CPU affinity.
-+    // Reference:
-+    // http://sources.freebsd.org/RELENG_9/src/usr.bin/cpuset/cpuset.c
-+
-+    /* XXX: not implemented */
-+    return NULL;
-+}
-+
-+
-+PyObject *
-+psutil_proc_cpu_affinity_set(PyObject *self, PyObject *args) {
-+    // Set process CPU affinity.
-+    // Reference:
-+    // http://sources.freebsd.org/RELENG_9/src/usr.bin/cpuset/cpuset.c
-+
-+    /* XXX: not implemented */
-+    return NULL;
-+}
-+
-+
-+PyObject *
-+psutil_cpu_stats(PyObject *self, PyObject *args) {
-+    unsigned int v_soft;
-+    unsigned int v_intr;
-+    unsigned int v_syscall;
-+    unsigned int v_trap;
-+    unsigned int v_swtch;
-+    size_t size = sizeof(v_soft);
-+
-+    if (sysctlbyname("vm.stats.sys.v_soft", &v_soft, &size, NULL, 0))
-+        goto error;
-+    if (sysctlbyname("vm.stats.sys.v_intr", &v_intr, &size, NULL, 0))
-+        goto error;
-+    if (sysctlbyname("vm.stats.sys.v_syscall", &v_syscall, &size, NULL, 0))
-+        goto error;
-+    if (sysctlbyname("vm.stats.sys.v_trap", &v_trap, &size, NULL, 0))
-+        goto error;
-+    if (sysctlbyname("vm.stats.sys.v_swtch", &v_swtch, &size, NULL, 0))
-+        goto error;
-+
-+    return Py_BuildValue(
-+        "IIIII",
-+        v_swtch,  // ctx switches
-+        v_intr,  // interrupts
-+        v_soft,  // software interrupts
-+        v_syscall,  // syscalls
-+        v_trap  // traps
-+    );
-+
-+error:
-+    PyErr_SetFromErrno(PyExc_OSError);
-+    return NULL;
-+}
-+
-+
-+/*
-+ * Return battery information.
-+ */
-+PyObject *
-+psutil_sensors_battery(PyObject *self, PyObject *args) {
-+    int percent;
-+    int minsleft;
-+    int power_plugged;
-+    size_t size = sizeof(percent);
-+
-+    if (sysctlbyname("hw.acpi.battery.life", &percent, &size, NULL, 0))
-+        goto error;
-+    if (sysctlbyname("hw.acpi.battery.time", &minsleft, &size, NULL, 0))
-+        goto error;
-+    if (sysctlbyname("hw.acpi.acline", &power_plugged, &size, NULL, 0))
-+        goto error;
-+    return Py_BuildValue("iii", percent, minsleft, power_plugged);
-+
-+error:
-+    PyErr_SetFromErrno(PyExc_OSError);
-+    return NULL;
-+}
--- a/py-psutil/patches/patch-psutil_arch_bsd_dragonfly.h
+++ b/py-psutil/patches/patch-psutil_arch_bsd_dragonfly.h
@ -1,32 +0,0 @@
-$NetBSD$
-
--- psutil/arch/bsd/dragonfly.h.orig	2018-02-09 16:11:41.567735000 +0000
-+++ psutil/arch/bsd/dragonfly.h
-@@ -0,0 +1,27 @@
-+/*
-+ * Copyright (c) 2009, Giampaolo Rodola', Landry Breuil.
-+ * All rights reserved.
-+ * Use of this source code is governed by a BSD-style license that can be
-+ * found in the LICENSE file.
-+ */
-+
-+#include <Python.h>
-+
-+typedef struct kinfo_proc kinfo_proc;
-+
-+int psutil_kinfo_proc(pid_t pid, struct kinfo_proc *proc);
-+struct kinfo_file * kinfo_getfile(long pid, int* cnt);
-+int psutil_get_proc_list(struct kinfo_proc **procList, size_t *procCount);
-+char **_psutil_get_argv(long pid);
-+PyObject * psutil_get_cmdline(long pid);
-+
-+//
-+PyObject *psutil_proc_threads(PyObject *self, PyObject *args);
-+PyObject *psutil_virtual_mem(PyObject *self, PyObject *args);
-+PyObject *psutil_swap_mem(PyObject *self, PyObject *args);
-+PyObject *psutil_proc_num_fds(PyObject *self, PyObject *args);
-+PyObject *psutil_proc_cwd(PyObject *self, PyObject *args);
-+PyObject *psutil_proc_connections(PyObject *self, PyObject *args);
-+PyObject *psutil_per_cpu_times(PyObject *self, PyObject *args);
-+PyObject* psutil_disk_io_counters(PyObject* self, PyObject* args);
-+PyObject* psutil_cpu_stats(PyObject* self, PyObject* args);
--- a/py-psutil/patches/patch-setup.py
+++ b/py-psutil/patches/patch-setup.py
@ -1,30 +0,0 @@
-$NetBSD$
-
--- setup.py.orig	2017-11-08 11:29:08.000000000 +0000
-+++ setup.py
-@@ -33,6 +33,7 @@ from _common import FREEBSD  # NOQA
- from _common import LINUX  # NOQA
- from _common import NETBSD  # NOQA
- from _common import OPENBSD  # NOQA
-+from _common import DRAGONFLY  # NOQA
- from _common import OSX  # NOQA
- from _common import POSIX  # NOQA
- from _common import SUNOS  # NOQA
-@@ -194,6 +195,17 @@ elif NETBSD:
-         ],
-         define_macros=macros,
-         libraries=["kvm"])
-+
-+elif DRAGONFLY:
-+    macros.append(("PSUTIL_DRAGONFLY", 1))
-+    ext = Extension(
-+        'psutil._psutil_bsd',
-+        sources=sources + [
-+            'psutil/_psutil_bsd.c',
-+            'psutil/arch/bsd/dragonfly.c',
-+        ],
-+        define_macros=macros,
-+        libraries=["kvm"])
- 
- elif LINUX:
-     def get_ethtool_macro():
--- a/py-rdflib340/Makefile
+++ b/py-rdflib340/Makefile
@ -17,7 +17,7 @@ LICENSE=	modified-bsd

 DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.1:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-html5lib>=0:../../textproc/py-html5lib
-DEPENDS+=	${PYPKGPREFIX}-sparqlwrapper:../../wip/py-sparqlwrapper
+DEPENDS+=	${PYPKGPREFIX}-sparqlwrapper:../../www/py-sparqlwrapper
 DEPENDS+=	${PYPKGPREFIX}-isodate:../../time/py-isodate

 PORTVERSION=	3.4.0
--- a/py-scikit-image/DESCR
+++ b/py-scikit-image/DESCR
@ -1,2 +0,0 @@
-Image processing algorithms for SciPy, including IO, morphology, filtering,
-warping, color manipulation, object detection, etc
--- a/py-scikit-image/Makefile
+++ b/py-scikit-image/Makefile
@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/08/11 21:43:24 jihbed Exp $
-
-DISTNAME=	scikit-image-0.11.3
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	graphics python
-MASTER_SITES=	${MASTER_SITE_PYPI:=s/scikit-image/}
-
-MAINTAINER=	jihbed.research@gmail.com
-HOMEPAGE=	http://scikit-image.org
-COMMENT=	Image processing routines for SciPy
-LICENSE=	modified-bsd
-
-DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.9.0:../../graphics/py-Pillow
-DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
-DEPENDS+=	${PYPKGPREFIX}-networkx>=1.9:../../math/py-networkx
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
-DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
-
-.include "../../devel/py-cython/buildlink3.mk"
-.include "../../lang/python/egg.mk"
-.include "../../math/py-numpy/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/py-scikit-image/PLIST
+++ b/py-scikit-image/PLIST
--- a/py-scikit-image/distinfo
+++ b/py-scikit-image/distinfo
@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2015/08/11 21:43:24 jihbed Exp $
-
-SHA1 (scikit-image-0.11.3.tar.gz) = aeeb7b0a3d559ec6bf9fe85e10f8b91e5933078b
-RMD160 (scikit-image-0.11.3.tar.gz) = cc7afd2c65daabde4a4ff699b477e10cb9dd6e68
-Size (scikit-image-0.11.3.tar.gz) = 18589296 bytes
--- a/py-sparqlwrapper/DESCR
+++ b/py-sparqlwrapper/DESCR
@ -1,2 +0,0 @@
-This is a wrapper around a SPARQL service. It helps in creating the query URI
-and, possibly, convert the result into a more manageable format.
--- a/py-sparqlwrapper/Makefile
+++ b/py-sparqlwrapper/Makefile
@ -1,20 +0,0 @@
-# $NetBSD$
-
-###########################################################
-#               Generated by fbsd2pkg                     #
-###########################################################
-
-DISTNAME=	SPARQLWrapper-${PORTVERSION}
-PKGNAME=	${PYPKGPREFIX}-sparqlwrapper-${PORTVERSION}
-CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_PYPI:=S/SPARQLWrapper/}
-MAINTAINER=	bacon@NetBSD.org
-
-HOMEPAGE=	https://rdflib.github.io/sparqlwrapper/
-COMMENT=	SPARQL endpoint interface to Python
-LICENSE=	w3c
-
-PORTVERSION=	1.6.2
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/py-sparqlwrapper/PLIST
+++ b/py-sparqlwrapper/PLIST
@ -1,27 +0,0 @@
-@comment $NetBSD$
-${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}/SPARQLWrapper/KeyCaseInsensitiveDict.py
-${PYSITELIB}/SPARQLWrapper/KeyCaseInsensitiveDict.pyc
-${PYSITELIB}/SPARQLWrapper/KeyCaseInsensitiveDict.pyo
-${PYSITELIB}/SPARQLWrapper/SPARQLExceptions.py
-${PYSITELIB}/SPARQLWrapper/SPARQLExceptions.pyc
-${PYSITELIB}/SPARQLWrapper/SPARQLExceptions.pyo
-${PYSITELIB}/SPARQLWrapper/SPARQLUtils.py
-${PYSITELIB}/SPARQLWrapper/SPARQLUtils.pyc
-${PYSITELIB}/SPARQLWrapper/SPARQLUtils.pyo
-${PYSITELIB}/SPARQLWrapper/SmartWrapper.py
-${PYSITELIB}/SPARQLWrapper/SmartWrapper.pyc
-${PYSITELIB}/SPARQLWrapper/SmartWrapper.pyo
-${PYSITELIB}/SPARQLWrapper/Wrapper.py
-${PYSITELIB}/SPARQLWrapper/Wrapper.pyc
-${PYSITELIB}/SPARQLWrapper/Wrapper.pyo
-${PYSITELIB}/SPARQLWrapper/__init__.py
-${PYSITELIB}/SPARQLWrapper/__init__.pyc
-${PYSITELIB}/SPARQLWrapper/__init__.pyo
-${PYSITELIB}/SPARQLWrapper/jsonlayer.py
-${PYSITELIB}/SPARQLWrapper/jsonlayer.pyc
-${PYSITELIB}/SPARQLWrapper/jsonlayer.pyo
--- a/py-sparqlwrapper/TODO
+++ b/py-sparqlwrapper/TODO
@ -1 +0,0 @@
-Clean up and test
--- a/py-sparqlwrapper/distinfo
+++ b/py-sparqlwrapper/distinfo
@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (SPARQLWrapper-1.6.2.tar.gz) = 69074904b57f2c1eb4acd59afa3fb1308597cbe9
-RMD160 (SPARQLWrapper-1.6.2.tar.gz) = dbe14b814cda004706b8d18e42cb8705f53bddb3
-SHA512 (SPARQLWrapper-1.6.2.tar.gz) = a75cb881b34fd8963c35b9fb7bb3fb1662257c9a36a03d22227968fc8f23c7813b73d29d3bdc26f362023a871960ce6326d70f8fdfb911ceec88212ed3737831
-Size (SPARQLWrapper-1.6.2.tar.gz) = 25939 bytes
--- a/py-tmux/Makefile
+++ b/py-tmux/Makefile
@ -11,7 +11,7 @@ COMMENT=	Simple wrapper for tmux
 LICENSE=	apache-2.0

 DEPENDS+=	${PYPKGPREFIX}-docopt>=0.6.1:../../devel/py-docopt
-DEPENDS+=	${PYPKGPREFIX}-jsonschema>=1.1.0:../../wip/py-jsonschema
+DEPENDS+=	${PYPKGPREFIX}-jsonschema>=1.1.0:../../textproc/py-jsonschema

 USE_LANGUAGES=	# none

--- a/py-xopen/DESCR
+++ b/py-xopen/DESCR
@ -1,4 +0,0 @@
-This small Python module provides an xopen function that works like the
-built-in open function, but can also deal with compressed files. Supported
-compression formats are gzip, bzip2 and xz. They are automatically recognized
-by their file extensions .gz, .bz2 or .xz.
--- a/py-xopen/Makefile
+++ b/py-xopen/Makefile
@ -1,14 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	xopen-0.3.2
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_PYPI:=x/xopen/}
-
-MAINTAINER=	bacon@NetBSD.org
-HOMEPAGE=	https://pypi.python.org/pypi/xopen
-COMMENT=	Open compressed files transparently
-LICENSE=	mit
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
--- a/py-xopen/PLIST
+++ b/py-xopen/PLIST
@ -1,9 +0,0 @@
-@comment $NetBSD$
-${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}/xopen.py
-${PYSITELIB}/xopen.pyc
-${PYSITELIB}/xopen.pyo
--- a/py-xopen/distinfo
+++ b/py-xopen/distinfo
@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (xopen-0.3.2.tar.gz) = d9fad7acc894acc73fe4c9c4f4999a9adde92921
-RMD160 (xopen-0.3.2.tar.gz) = 770ec07acbf3e6349af1a024febcc0007ec6af13
-SHA512 (xopen-0.3.2.tar.gz) = 06e3e8ac9e3b96d393649bef91ab8ea9c01d03b4ad0d4e59760262d6fd5ea5a751267841de8a5f51ab0317f0d5426a0d99704201a14fd5834f6e26b6e0059bcf
-Size (xopen-0.3.2.tar.gz) = 4666 bytes
--- a/qtile/Makefile
+++ b/qtile/Makefile
@ -16,7 +16,7 @@ USE_LANGUAGES=	# none

 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-cffi-[0-9]*:../../devel/py-cffi
-DEPENDS+=	${PYPKGPREFIX}-cairocffi-[0-9]*:../../wip/py-cairocffi
+DEPENDS+=	${PYPKGPREFIX}-cairocffi-[0-9]*:../../graphics/py-cairocffi
 DEPENDS+=	${PYPKGPREFIX}-xcffib-[0-9]*:../../wip/py-xcffib # XXX
 .if ${PYVERSSUFFIX} == 2.7
 DEPENDS+=	${PYPKGPREFIX}-futures-[0-9]*:../../devel/py-futures
				`@ -1 +0,0 @@`
				`An unobtrusive argparse wrapper with natural syntax`
				`@ -1 +0,0 @@`
				`jsonpickle converts complex Python objects to and from JSON`
				`@ -1 +0,0 @@`
				`Implementation of JSON Schema validation for Python`