py-sparqlwrapper: Clean up

[Jason Bacon <bacon4000%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Fri Mar 31 10:20:45 2017 -0500
Changeset:	fbc244a33f5c6db2a9c6d638b01313c89d7b162e

Modified Files:
	py-isodate/Makefile
	py-rdflib340/DESCR
	py-rdflib340/Makefile
	py-rdflib340/PLIST
	py-sparqlwrapper/Makefile
Removed Files:
	py-rdflib340/buildlink3.mk

Log Message:
py-sparqlwrapper: Clean up

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fbc244a33f5c6db2a9c6d638b01313c89d7b162e

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

diffstat:
 py-isodate/Makefile        |  2 +-
 py-rdflib340/DESCR         |  4 ----
 py-rdflib340/Makefile      | 26 ++++++++------------------
 py-rdflib340/PLIST         | 10 +++++-----
 py-rdflib340/buildlink3.mk | 22 ----------------------
 py-sparqlwrapper/Makefile  |  9 +--------
 6 files changed, 15 insertions(+), 58 deletions(-)

diffs:
diff --git a/py-isodate/Makefile b/py-isodate/Makefile
index b8e45d2b79..6069fc34e2 100644
--- a/py-isodate/Makefile
+++ b/py-isodate/Makefile
@@ -6,7 +6,7 @@
 
 DISTNAME=	isodate-${PORTVERSION}
 PKGNAME=	${PYPKGPREFIX}-isodate-${PORTVERSION}
-CATEGORIES=	devel
+CATEGORIES=	time
 MASTER_SITES=	${CHEESESHOP}
 
 MAINTAINER=	bacon4000%gmail.com@localhost
diff --git a/py-rdflib340/DESCR b/py-rdflib340/DESCR
index d08a4464b3..73043a0f0c 100644
--- a/py-rdflib340/DESCR
+++ b/py-rdflib340/DESCR
@@ -1,6 +1,2 @@
 RDFLib is a python library containing an RDF triple store and RDF/XML
 parser/serializer.
-
-Git repository: https://github.com/RDFLib/rdflib
-
-WWW: https://pypi.python.org/pypi/rdflib/
diff --git a/py-rdflib340/Makefile b/py-rdflib340/Makefile
index ec7526e9eb..448881e93f 100644
--- a/py-rdflib340/Makefile
+++ b/py-rdflib340/Makefile
@@ -7,32 +7,22 @@
 DISTNAME=	rdflib-${PORTVERSION}
 PKGNAME=	${PYPKGPREFIX}-rdflib-${PORTVERSION}
 CATEGORIES=	textproc
-MASTER_SITES=	${CHEESESHOP}
+# Why isn't this working?
+#MASTER_SITES=	${MASTER_SITE_PYPI:=/R/rdflib/}
+MASTER_SITES=	http://pypi.python.org/packages/source/r/rdflib/
 
+HOMEPAGE=	https://pypi.python.org/pypi/rdflib/
 MAINTAINER=	bacon4000%gmail.com@localhost
 
 COMMENT=	Python library for RDF manipulation
-# Double-check this
 LICENSE=	modified-bsd
 
-# Pessimistic assumption.  Test and change if possible.
-MAKE_JOBS_SAFE=	no
-
-# Just assuming C and C++: Adjust this!
-USE_LANGUAGES=	c c++
-PYDISTUTILSPKG=	yes
-
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.1:../../devel/py-pyparsing \
-		${PYPKGPREFIX}-html5lib>=0:../../textproc/py-html5lib
+DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.1:../../devel/py-pyparsing
+DEPENDS+=	${PYPKGPREFIX}-html5lib>=0:../../textproc/py-html5lib
+DEPENDS+=	${PYPKGPREFIX}-sparqlwrapper:../../wip/py-sparqlwrapper
 
 PORTVERSION=	3.4.0
-DATADIR=	${PREFIX}/share/rdflib
-DOCSDIR=	${PREFIX}/share/doc/rdflib
-CHEESESHOP=	http://pypi.python.org/packages/source/r/rdflib/
-
-#AUTO_MKDIRS=	yes
 
-.include "../../lang/python/distutils.mk"
-.include "../../wip/py-sparqlwrapper/buildlink3.mk"
+.include "../../lang/python/egg.mk"
 .include "../../wip/py-isodate/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-rdflib340/PLIST b/py-rdflib340/PLIST
index eb6cf249e7..931874a577 100644
--- a/py-rdflib340/PLIST
+++ b/py-rdflib340/PLIST
@@ -1,9 +1,9 @@
 @comment $NetBSD$
-${PYSITELIB}/rdflib-${PKGVERSION}-py2.7.egg-info/PKG-INFO
-${PYSITELIB}/rdflib-${PKGVERSION}-py2.7.egg-info/SOURCES.txt
-${PYSITELIB}/rdflib-${PKGVERSION}-py2.7.egg-info/dependency_links.txt
-${PYSITELIB}/rdflib-${PKGVERSION}-py2.7.egg-info/requires.txt
-${PYSITELIB}/rdflib-${PKGVERSION}-py2.7.egg-info/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/rdflib/__init__.py
 ${PYSITELIB}/rdflib/__init__.pyc
 ${PYSITELIB}/rdflib/__init__.pyo
diff --git a/py-rdflib340/buildlink3.mk b/py-rdflib340/buildlink3.mk
deleted file mode 100644
index ae86232fff..0000000000
--- a/py-rdflib340/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD$
-# XXX
-# XXX This file was created automatically using createbuildlink-3.16.
-# XXX After this file has been verified as correct, the comment lines
-# XXX beginning with "XXX" should be removed.  Please do not commit
-# XXX unverified buildlink3.mk files.
-# XXX
-# XXX Packages that only install static libraries or headers should
-# XXX include the following line:
-# XXX
-# XXX	BUILDLINK_DEPMETHOD.py27-rdflib?=	build
-
-BUILDLINK_TREE+=	py27-rdflib
-
-.if !defined(PY27_RDFLIB_BUILDLINK3_MK)
-PY27_RDFLIB_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.py27-rdflib+=	py27-rdflib>=3.4.0
-BUILDLINK_PKGSRCDIR.py27-rdflib?=	../../wip/py-rdflib340
-.endif	# PY27_RDFLIB_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-py27-rdflib
diff --git a/py-sparqlwrapper/Makefile b/py-sparqlwrapper/Makefile
index 09a5ed0a0a..db3237a36c 100644
--- a/py-sparqlwrapper/Makefile
+++ b/py-sparqlwrapper/Makefile
@@ -7,20 +7,13 @@
 DISTNAME=	SPARQLWrapper-${PORTVERSION}
 PKGNAME=	${PYPKGPREFIX}-sparqlwrapper-${PORTVERSION}
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_PYPI:=/S/SPARQLWrapper/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=S/SPARQLWrapper/}
 MAINTAINER=	bacon4000%gmail.com@localhost
 
 HOMEPAGE=	http://rdflib.github.io/sparqlwrapper/
 COMMENT=	SPARQL endpoint interface to Python
 LICENSE=	w3c
 
-# Pessimistic assumption.  Test and change if possible.
-# MAKE_JOBS_SAFE=	no
-
-# Just assuming C and C++: Adjust this!
-# USE_LANGUAGES=	c c++
-PYDISTUTILSPKG=	yes
-
 PORTVERSION=	1.6.2
 
 .include "../../lang/python/egg.mk"