pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Removed py-dnspython and py-dnspython3

Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Fri Oct 27 18:02:05 2017 +0200
Changeset:	a94af1cf011e832808ffaa3cb72e7e4e888600aa

Modified Files:
	Makefile
	py-wpull/Makefile
	py-wpull/distinfo
Added Files:
	py-wpull/patches/patch-requires.txt
	py-wpull/patches/patch-setup.py
Removed Files:
	py-dnspython/DESCR
	py-dnspython/Makefile
	py-dnspython/PLIST
	py-dnspython/distinfo
	py-dnspython/patches/patch-tests_test__zone.py
	py-dnspython3/DESCR
	py-dnspython3/Makefile
	py-dnspython3/PLIST
	py-dnspython3/distinfo

Log Message:
Removed py-dnspython and py-dnspython3

py-dnspython is already in net/py-dns
py-dnspython3 has been superseded by the regular dnspython

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

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

diffstat:
 Makefile                                       |   2 -
 py-dnspython/DESCR                             |  12 --
 py-dnspython/Makefile                          |  15 --
 py-dnspython/PLIST                             | 284 -------------------------
 py-dnspython/distinfo                          |   7 -
 py-dnspython/patches/patch-tests_test__zone.py |  19 --
 py-dnspython3/DESCR                            |   1 -
 py-dnspython3/Makefile                         |  19 --
 py-dnspython3/PLIST                            |   6 -
 py-dnspython3/distinfo                         |   6 -
 py-wpull/Makefile                              |  34 +--
 py-wpull/distinfo                              |  10 +-
 py-wpull/patches/patch-requires.txt            |  13 ++
 py-wpull/patches/patch-setup.py                |  15 ++
 14 files changed, 54 insertions(+), 389 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 3b3493ba1b..426332da56 100644
--- a/Makefile
+++ b/Makefile
@@ -3030,8 +3030,6 @@ SUBDIR+=	py-djangopypi2
 SUBDIR+=	py-djvulibre
 SUBDIR+=	py-djvusmooth
 SUBDIR+=	py-dns-clientsubnetoption
-SUBDIR+=	py-dnspython
-SUBDIR+=	py-dnspython3
 SUBDIR+=	py-dolo
 SUBDIR+=	py-downhill
 SUBDIR+=	py-drawille
diff --git a/py-dnspython/DESCR b/py-dnspython/DESCR
deleted file mode 100644
index cf959a843f..0000000000
--- a/py-dnspython/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-dnspython is a DNS toolkit for Python. It supports almost all record types. It
-can be used for queries, zone transfers, and dynamic updates. It supports TSIG
-authenticated messages and EDNS0.
-
-dnspython provides both high and low level access to DNS. The high level
-classes perform queries for data of a given name, type, and class, and return
-an answer set. The low level classes allow direct manipulation of DNS zones,
-messages, names, and records.
-
-dnspython originated at Nominum where it was developed to facilitate the
-testing of DNS software. Nominum has generously allowed it to be open
-sourced under a BSD-style license.
diff --git a/py-dnspython/Makefile b/py-dnspython/Makefile
deleted file mode 100644
index 983a29aa88..0000000000
--- a/py-dnspython/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	dnspython-1.15.0
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_PYPI:=d/dnspython/}
-EXTRACT_SUFX=	.zip
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.dnspython.org/
-COMMENT=	DNS toolkit for Python
-#LICENSE=	# TODO: (see mk/license.mk) # distinct, similar to isc
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-dnspython/PLIST b/py-dnspython/PLIST
deleted file mode 100644
index 2d0a366534..0000000000
--- a/py-dnspython/PLIST
+++ /dev/null
@@ -1,284 +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}/dns/__init__.py
-${PYSITELIB}/dns/__init__.pyc
-${PYSITELIB}/dns/__init__.pyo
-${PYSITELIB}/dns/_compat.py
-${PYSITELIB}/dns/_compat.pyc
-${PYSITELIB}/dns/_compat.pyo
-${PYSITELIB}/dns/dnssec.py
-${PYSITELIB}/dns/dnssec.pyc
-${PYSITELIB}/dns/dnssec.pyo
-${PYSITELIB}/dns/e164.py
-${PYSITELIB}/dns/e164.pyc
-${PYSITELIB}/dns/e164.pyo
-${PYSITELIB}/dns/edns.py
-${PYSITELIB}/dns/edns.pyc
-${PYSITELIB}/dns/edns.pyo
-${PYSITELIB}/dns/entropy.py
-${PYSITELIB}/dns/entropy.pyc
-${PYSITELIB}/dns/entropy.pyo
-${PYSITELIB}/dns/exception.py
-${PYSITELIB}/dns/exception.pyc
-${PYSITELIB}/dns/exception.pyo
-${PYSITELIB}/dns/flags.py
-${PYSITELIB}/dns/flags.pyc
-${PYSITELIB}/dns/flags.pyo
-${PYSITELIB}/dns/grange.py
-${PYSITELIB}/dns/grange.pyc
-${PYSITELIB}/dns/grange.pyo
-${PYSITELIB}/dns/hash.py
-${PYSITELIB}/dns/hash.pyc
-${PYSITELIB}/dns/hash.pyo
-${PYSITELIB}/dns/inet.py
-${PYSITELIB}/dns/inet.pyc
-${PYSITELIB}/dns/inet.pyo
-${PYSITELIB}/dns/ipv4.py
-${PYSITELIB}/dns/ipv4.pyc
-${PYSITELIB}/dns/ipv4.pyo
-${PYSITELIB}/dns/ipv6.py
-${PYSITELIB}/dns/ipv6.pyc
-${PYSITELIB}/dns/ipv6.pyo
-${PYSITELIB}/dns/message.py
-${PYSITELIB}/dns/message.pyc
-${PYSITELIB}/dns/message.pyo
-${PYSITELIB}/dns/name.py
-${PYSITELIB}/dns/name.pyc
-${PYSITELIB}/dns/name.pyo
-${PYSITELIB}/dns/namedict.py
-${PYSITELIB}/dns/namedict.pyc
-${PYSITELIB}/dns/namedict.pyo
-${PYSITELIB}/dns/node.py
-${PYSITELIB}/dns/node.pyc
-${PYSITELIB}/dns/node.pyo
-${PYSITELIB}/dns/opcode.py
-${PYSITELIB}/dns/opcode.pyc
-${PYSITELIB}/dns/opcode.pyo
-${PYSITELIB}/dns/query.py
-${PYSITELIB}/dns/query.pyc
-${PYSITELIB}/dns/query.pyo
-${PYSITELIB}/dns/rcode.py
-${PYSITELIB}/dns/rcode.pyc
-${PYSITELIB}/dns/rcode.pyo
-${PYSITELIB}/dns/rdata.py
-${PYSITELIB}/dns/rdata.pyc
-${PYSITELIB}/dns/rdata.pyo
-${PYSITELIB}/dns/rdataclass.py
-${PYSITELIB}/dns/rdataclass.pyc
-${PYSITELIB}/dns/rdataclass.pyo
-${PYSITELIB}/dns/rdataset.py
-${PYSITELIB}/dns/rdataset.pyc
-${PYSITELIB}/dns/rdataset.pyo
-${PYSITELIB}/dns/rdatatype.py
-${PYSITELIB}/dns/rdatatype.pyc
-${PYSITELIB}/dns/rdatatype.pyo
-${PYSITELIB}/dns/rdtypes/ANY/AFSDB.py
-${PYSITELIB}/dns/rdtypes/ANY/AFSDB.pyc
-${PYSITELIB}/dns/rdtypes/ANY/AFSDB.pyo
-${PYSITELIB}/dns/rdtypes/ANY/AVC.py
-${PYSITELIB}/dns/rdtypes/ANY/AVC.pyc
-${PYSITELIB}/dns/rdtypes/ANY/AVC.pyo
-${PYSITELIB}/dns/rdtypes/ANY/CAA.py
-${PYSITELIB}/dns/rdtypes/ANY/CAA.pyc
-${PYSITELIB}/dns/rdtypes/ANY/CAA.pyo
-${PYSITELIB}/dns/rdtypes/ANY/CDNSKEY.py
-${PYSITELIB}/dns/rdtypes/ANY/CDNSKEY.pyc
-${PYSITELIB}/dns/rdtypes/ANY/CDNSKEY.pyo
-${PYSITELIB}/dns/rdtypes/ANY/CDS.py
-${PYSITELIB}/dns/rdtypes/ANY/CDS.pyc
-${PYSITELIB}/dns/rdtypes/ANY/CDS.pyo
-${PYSITELIB}/dns/rdtypes/ANY/CERT.py
-${PYSITELIB}/dns/rdtypes/ANY/CERT.pyc
-${PYSITELIB}/dns/rdtypes/ANY/CERT.pyo
-${PYSITELIB}/dns/rdtypes/ANY/CNAME.py
-${PYSITELIB}/dns/rdtypes/ANY/CNAME.pyc
-${PYSITELIB}/dns/rdtypes/ANY/CNAME.pyo
-${PYSITELIB}/dns/rdtypes/ANY/CSYNC.py
-${PYSITELIB}/dns/rdtypes/ANY/CSYNC.pyc
-${PYSITELIB}/dns/rdtypes/ANY/CSYNC.pyo
-${PYSITELIB}/dns/rdtypes/ANY/DLV.py
-${PYSITELIB}/dns/rdtypes/ANY/DLV.pyc
-${PYSITELIB}/dns/rdtypes/ANY/DLV.pyo
-${PYSITELIB}/dns/rdtypes/ANY/DNAME.py
-${PYSITELIB}/dns/rdtypes/ANY/DNAME.pyc
-${PYSITELIB}/dns/rdtypes/ANY/DNAME.pyo
-${PYSITELIB}/dns/rdtypes/ANY/DNSKEY.py
-${PYSITELIB}/dns/rdtypes/ANY/DNSKEY.pyc
-${PYSITELIB}/dns/rdtypes/ANY/DNSKEY.pyo
-${PYSITELIB}/dns/rdtypes/ANY/DS.py
-${PYSITELIB}/dns/rdtypes/ANY/DS.pyc
-${PYSITELIB}/dns/rdtypes/ANY/DS.pyo
-${PYSITELIB}/dns/rdtypes/ANY/EUI48.py
-${PYSITELIB}/dns/rdtypes/ANY/EUI48.pyc
-${PYSITELIB}/dns/rdtypes/ANY/EUI48.pyo
-${PYSITELIB}/dns/rdtypes/ANY/EUI64.py
-${PYSITELIB}/dns/rdtypes/ANY/EUI64.pyc
-${PYSITELIB}/dns/rdtypes/ANY/EUI64.pyo
-${PYSITELIB}/dns/rdtypes/ANY/GPOS.py
-${PYSITELIB}/dns/rdtypes/ANY/GPOS.pyc
-${PYSITELIB}/dns/rdtypes/ANY/GPOS.pyo
-${PYSITELIB}/dns/rdtypes/ANY/HINFO.py
-${PYSITELIB}/dns/rdtypes/ANY/HINFO.pyc
-${PYSITELIB}/dns/rdtypes/ANY/HINFO.pyo
-${PYSITELIB}/dns/rdtypes/ANY/HIP.py
-${PYSITELIB}/dns/rdtypes/ANY/HIP.pyc
-${PYSITELIB}/dns/rdtypes/ANY/HIP.pyo
-${PYSITELIB}/dns/rdtypes/ANY/ISDN.py
-${PYSITELIB}/dns/rdtypes/ANY/ISDN.pyc
-${PYSITELIB}/dns/rdtypes/ANY/ISDN.pyo
-${PYSITELIB}/dns/rdtypes/ANY/LOC.py
-${PYSITELIB}/dns/rdtypes/ANY/LOC.pyc
-${PYSITELIB}/dns/rdtypes/ANY/LOC.pyo
-${PYSITELIB}/dns/rdtypes/ANY/MX.py
-${PYSITELIB}/dns/rdtypes/ANY/MX.pyc
-${PYSITELIB}/dns/rdtypes/ANY/MX.pyo
-${PYSITELIB}/dns/rdtypes/ANY/NS.py
-${PYSITELIB}/dns/rdtypes/ANY/NS.pyc
-${PYSITELIB}/dns/rdtypes/ANY/NS.pyo
-${PYSITELIB}/dns/rdtypes/ANY/NSEC.py
-${PYSITELIB}/dns/rdtypes/ANY/NSEC.pyc
-${PYSITELIB}/dns/rdtypes/ANY/NSEC.pyo
-${PYSITELIB}/dns/rdtypes/ANY/NSEC3.py
-${PYSITELIB}/dns/rdtypes/ANY/NSEC3.pyc
-${PYSITELIB}/dns/rdtypes/ANY/NSEC3.pyo
-${PYSITELIB}/dns/rdtypes/ANY/NSEC3PARAM.py
-${PYSITELIB}/dns/rdtypes/ANY/NSEC3PARAM.pyc
-${PYSITELIB}/dns/rdtypes/ANY/NSEC3PARAM.pyo
-${PYSITELIB}/dns/rdtypes/ANY/PTR.py
-${PYSITELIB}/dns/rdtypes/ANY/PTR.pyc
-${PYSITELIB}/dns/rdtypes/ANY/PTR.pyo
-${PYSITELIB}/dns/rdtypes/ANY/RP.py
-${PYSITELIB}/dns/rdtypes/ANY/RP.pyc
-${PYSITELIB}/dns/rdtypes/ANY/RP.pyo
-${PYSITELIB}/dns/rdtypes/ANY/RRSIG.py
-${PYSITELIB}/dns/rdtypes/ANY/RRSIG.pyc
-${PYSITELIB}/dns/rdtypes/ANY/RRSIG.pyo
-${PYSITELIB}/dns/rdtypes/ANY/RT.py
-${PYSITELIB}/dns/rdtypes/ANY/RT.pyc
-${PYSITELIB}/dns/rdtypes/ANY/RT.pyo
-${PYSITELIB}/dns/rdtypes/ANY/SOA.py
-${PYSITELIB}/dns/rdtypes/ANY/SOA.pyc
-${PYSITELIB}/dns/rdtypes/ANY/SOA.pyo
-${PYSITELIB}/dns/rdtypes/ANY/SPF.py
-${PYSITELIB}/dns/rdtypes/ANY/SPF.pyc
-${PYSITELIB}/dns/rdtypes/ANY/SPF.pyo
-${PYSITELIB}/dns/rdtypes/ANY/SSHFP.py
-${PYSITELIB}/dns/rdtypes/ANY/SSHFP.pyc
-${PYSITELIB}/dns/rdtypes/ANY/SSHFP.pyo
-${PYSITELIB}/dns/rdtypes/ANY/TLSA.py
-${PYSITELIB}/dns/rdtypes/ANY/TLSA.pyc
-${PYSITELIB}/dns/rdtypes/ANY/TLSA.pyo
-${PYSITELIB}/dns/rdtypes/ANY/TXT.py
-${PYSITELIB}/dns/rdtypes/ANY/TXT.pyc
-${PYSITELIB}/dns/rdtypes/ANY/TXT.pyo
-${PYSITELIB}/dns/rdtypes/ANY/URI.py
-${PYSITELIB}/dns/rdtypes/ANY/URI.pyc
-${PYSITELIB}/dns/rdtypes/ANY/URI.pyo
-${PYSITELIB}/dns/rdtypes/ANY/X25.py
-${PYSITELIB}/dns/rdtypes/ANY/X25.pyc
-${PYSITELIB}/dns/rdtypes/ANY/X25.pyo
-${PYSITELIB}/dns/rdtypes/ANY/__init__.py
-${PYSITELIB}/dns/rdtypes/ANY/__init__.pyc
-${PYSITELIB}/dns/rdtypes/ANY/__init__.pyo
-${PYSITELIB}/dns/rdtypes/IN/A.py
-${PYSITELIB}/dns/rdtypes/IN/A.pyc
-${PYSITELIB}/dns/rdtypes/IN/A.pyo
-${PYSITELIB}/dns/rdtypes/IN/AAAA.py
-${PYSITELIB}/dns/rdtypes/IN/AAAA.pyc
-${PYSITELIB}/dns/rdtypes/IN/AAAA.pyo
-${PYSITELIB}/dns/rdtypes/IN/APL.py
-${PYSITELIB}/dns/rdtypes/IN/APL.pyc
-${PYSITELIB}/dns/rdtypes/IN/APL.pyo
-${PYSITELIB}/dns/rdtypes/IN/DHCID.py
-${PYSITELIB}/dns/rdtypes/IN/DHCID.pyc
-${PYSITELIB}/dns/rdtypes/IN/DHCID.pyo
-${PYSITELIB}/dns/rdtypes/IN/IPSECKEY.py
-${PYSITELIB}/dns/rdtypes/IN/IPSECKEY.pyc
-${PYSITELIB}/dns/rdtypes/IN/IPSECKEY.pyo
-${PYSITELIB}/dns/rdtypes/IN/KX.py
-${PYSITELIB}/dns/rdtypes/IN/KX.pyc
-${PYSITELIB}/dns/rdtypes/IN/KX.pyo
-${PYSITELIB}/dns/rdtypes/IN/NAPTR.py
-${PYSITELIB}/dns/rdtypes/IN/NAPTR.pyc
-${PYSITELIB}/dns/rdtypes/IN/NAPTR.pyo
-${PYSITELIB}/dns/rdtypes/IN/NSAP.py
-${PYSITELIB}/dns/rdtypes/IN/NSAP.pyc
-${PYSITELIB}/dns/rdtypes/IN/NSAP.pyo
-${PYSITELIB}/dns/rdtypes/IN/NSAP_PTR.py
-${PYSITELIB}/dns/rdtypes/IN/NSAP_PTR.pyc
-${PYSITELIB}/dns/rdtypes/IN/NSAP_PTR.pyo
-${PYSITELIB}/dns/rdtypes/IN/PX.py
-${PYSITELIB}/dns/rdtypes/IN/PX.pyc
-${PYSITELIB}/dns/rdtypes/IN/PX.pyo
-${PYSITELIB}/dns/rdtypes/IN/SRV.py
-${PYSITELIB}/dns/rdtypes/IN/SRV.pyc
-${PYSITELIB}/dns/rdtypes/IN/SRV.pyo
-${PYSITELIB}/dns/rdtypes/IN/WKS.py
-${PYSITELIB}/dns/rdtypes/IN/WKS.pyc
-${PYSITELIB}/dns/rdtypes/IN/WKS.pyo
-${PYSITELIB}/dns/rdtypes/IN/__init__.py
-${PYSITELIB}/dns/rdtypes/IN/__init__.pyc
-${PYSITELIB}/dns/rdtypes/IN/__init__.pyo
-${PYSITELIB}/dns/rdtypes/__init__.py
-${PYSITELIB}/dns/rdtypes/__init__.pyc
-${PYSITELIB}/dns/rdtypes/__init__.pyo
-${PYSITELIB}/dns/rdtypes/dnskeybase.py
-${PYSITELIB}/dns/rdtypes/dnskeybase.pyc
-${PYSITELIB}/dns/rdtypes/dnskeybase.pyo
-${PYSITELIB}/dns/rdtypes/dsbase.py
-${PYSITELIB}/dns/rdtypes/dsbase.pyc
-${PYSITELIB}/dns/rdtypes/dsbase.pyo
-${PYSITELIB}/dns/rdtypes/euibase.py
-${PYSITELIB}/dns/rdtypes/euibase.pyc
-${PYSITELIB}/dns/rdtypes/euibase.pyo
-${PYSITELIB}/dns/rdtypes/mxbase.py
-${PYSITELIB}/dns/rdtypes/mxbase.pyc
-${PYSITELIB}/dns/rdtypes/mxbase.pyo
-${PYSITELIB}/dns/rdtypes/nsbase.py
-${PYSITELIB}/dns/rdtypes/nsbase.pyc
-${PYSITELIB}/dns/rdtypes/nsbase.pyo
-${PYSITELIB}/dns/rdtypes/txtbase.py
-${PYSITELIB}/dns/rdtypes/txtbase.pyc
-${PYSITELIB}/dns/rdtypes/txtbase.pyo
-${PYSITELIB}/dns/renderer.py
-${PYSITELIB}/dns/renderer.pyc
-${PYSITELIB}/dns/renderer.pyo
-${PYSITELIB}/dns/resolver.py
-${PYSITELIB}/dns/resolver.pyc
-${PYSITELIB}/dns/resolver.pyo
-${PYSITELIB}/dns/reversename.py
-${PYSITELIB}/dns/reversename.pyc
-${PYSITELIB}/dns/reversename.pyo
-${PYSITELIB}/dns/rrset.py
-${PYSITELIB}/dns/rrset.pyc
-${PYSITELIB}/dns/rrset.pyo
-${PYSITELIB}/dns/set.py
-${PYSITELIB}/dns/set.pyc
-${PYSITELIB}/dns/set.pyo
-${PYSITELIB}/dns/tokenizer.py
-${PYSITELIB}/dns/tokenizer.pyc
-${PYSITELIB}/dns/tokenizer.pyo
-${PYSITELIB}/dns/tsig.py
-${PYSITELIB}/dns/tsig.pyc
-${PYSITELIB}/dns/tsig.pyo
-${PYSITELIB}/dns/tsigkeyring.py
-${PYSITELIB}/dns/tsigkeyring.pyc
-${PYSITELIB}/dns/tsigkeyring.pyo
-${PYSITELIB}/dns/ttl.py
-${PYSITELIB}/dns/ttl.pyc
-${PYSITELIB}/dns/ttl.pyo
-${PYSITELIB}/dns/update.py
-${PYSITELIB}/dns/update.pyc
-${PYSITELIB}/dns/update.pyo
-${PYSITELIB}/dns/version.py
-${PYSITELIB}/dns/version.pyc
-${PYSITELIB}/dns/version.pyo
-${PYSITELIB}/dns/wiredata.py
-${PYSITELIB}/dns/wiredata.pyc
-${PYSITELIB}/dns/wiredata.pyo
-${PYSITELIB}/dns/zone.py
-${PYSITELIB}/dns/zone.pyc
-${PYSITELIB}/dns/zone.pyo
diff --git a/py-dnspython/distinfo b/py-dnspython/distinfo
deleted file mode 100644
index 1e99d70f92..0000000000
--- a/py-dnspython/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (dnspython-1.15.0.zip) = 2a3ffd70c0dbcac5ab60b582b5c53d202a938570
-RMD160 (dnspython-1.15.0.zip) = 891ac558c723e12deab5445dbf0545731df7ca9f
-SHA512 (dnspython-1.15.0.zip) = 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
-Size (dnspython-1.15.0.zip) = 252157 bytes
-SHA1 (patch-tests_test__zone.py) = 724f4eba20ad996abb02fd317c8ac8269d89ead7
diff --git a/py-dnspython/patches/patch-tests_test__zone.py b/py-dnspython/patches/patch-tests_test__zone.py
deleted file mode 100644
index 693d90d715..0000000000
--- a/py-dnspython/patches/patch-tests_test__zone.py
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Test creates file in wrong location
-
-test_zone.ZoneTestCase.testToFileFilename fails with OSError: [Errno 2] No such file or directory
-
-https://github.com/rthalley/dnspython/pull/210/commits/0add1649c91b4f56b32e73c3a6327519c6eb532e
-
---- tests/test_zone.py.orig	2016-09-20 09:24:02.000000000 +0000
-+++ tests/test_zone.py
-@@ -177,7 +177,7 @@ class ZoneTestCase(unittest.TestCase):
-     def testToFileFilename(self):
-         z = dns.zone.from_file(here('example'), 'example')
-         try:
--            z.to_file('example3-filename.out')
-+            z.to_file(here('example3-filename.out'))
-             ok = filecmp.cmp(here('example3-filename.out'),
-                              here('example3.good'))
-         finally:
diff --git a/py-dnspython3/DESCR b/py-dnspython3/DESCR
deleted file mode 100644
index 1e5287389b..0000000000
--- a/py-dnspython3/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-A DNS toolkit for Python 3.x.
diff --git a/py-dnspython3/Makefile b/py-dnspython3/Makefile
deleted file mode 100644
index 0683ba7e84..0000000000
--- a/py-dnspython3/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	dnspython3-1.15.0
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_PYPI:=d/dnspython3/}
-EXTRACT_SUFX=	.zip
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.dnspython.org/
-COMMENT=	DNS toolkit for Python 3.x
-#LICENSE=	# TODO: (see mk/license.mk) # distinct, similar to isc
-
-PYTHON_VERSIONS_INCOMPATIBLE=	27
-
-DEPENDS+=	${PYPKGPREFIX}-dnspython-[0-9]*:../../wip/py-dnspython
-
-.include "../../lang/python/egg.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-dnspython3/PLIST b/py-dnspython3/PLIST
deleted file mode 100644
index 5ac3c4e3c5..0000000000
--- a/py-dnspython3/PLIST
+++ /dev/null
@@ -1,6 +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
diff --git a/py-dnspython3/distinfo b/py-dnspython3/distinfo
deleted file mode 100644
index a127ce417c..0000000000
--- a/py-dnspython3/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (dnspython3-1.15.0.zip) = c268493ce87586cfe8b60cf74d1c73a8a485f06e
-RMD160 (dnspython3-1.15.0.zip) = 847a27d90974f99dd5c675bdca895a11173b5a54
-SHA512 (dnspython3-1.15.0.zip) = 0d952197c4f2b35e6ec174bcebd5e0bea5684c5142c9fa5def3dfd5e756112d8dc78cdff391cc3de01e1edab6ae6b5f73a2a956cb2649424e236e0da190965dc
-Size (dnspython3-1.15.0.zip) = 3374 bytes
diff --git a/py-wpull/Makefile b/py-wpull/Makefile
index 7a2b354ff4..079661eba7 100644
--- a/py-wpull/Makefile
+++ b/py-wpull/Makefile
@@ -1,30 +1,36 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	wpull
 DISTNAME=	wpull-2.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GITHUB:=chfoo/}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+CATEGORIES=	net python
+MASTER_SITES=	${MASTER_SITE_PYPI:=w/wpull/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/chfoo/wpull/
 COMMENT=	Wget-compatible web downloader and crawler
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
+DEPENDS+=	${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
+DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
+DEPENDS+=	${PYPKGPREFIX}-namedlist-[0-9]*:../../wip/py-namedlist
+DEPENDS+=	${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
+DEPENDS+=	${PYPKGPREFIX}-sqlalchemy-[0-9]*:../../databases/py-sqlalchemy
+DEPENDS+=	${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
+DEPENDS+=	${PYPKGPREFIX}-yapsy-[0-9]*:../../wip/py-yapsy
+
+.include "../../lang/python/distutils.mk"
+
+.if ${PYVERSSUFFIX} == "3.4" || ${PYVERSSUFFIX} == "3.5"
+DEPENDS+=	${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
+.endif
+
+PYTHON_SELF_CONFLICT=		yes
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 USE_LANGUAGES=	# none
 
-DEPENDS+=	${PYPKGPREFIX}-yapsy-[0-9]*:../../wip/py-yapsy
-DEPENDS+=	${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
-DEPENDS+=	${PYPKGPREFIX}-sqlalchemy-[0-9]*:../../databases/py-sqlalchemy
-DEPENDS+=	${PYPKGPREFIX}-namedlist-[0-9]*:../../wip/py-namedlist
-DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
-DEPENDS+=	${PYPKGPREFIX}-dnspython3-[0-9]*:../../wip/py-dnspython3
-DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
-DEPENDS+=	${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
-DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+post-patch:
+	${RM} ${WRKSRC}/wpull.egg-info/requires.txt.orig
 
-.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-wpull/distinfo b/py-wpull/distinfo
index 375717877d..8dbfd521bb 100644
--- a/py-wpull/distinfo
+++ b/py-wpull/distinfo
@@ -1,6 +1,8 @@
 $NetBSD$
 
-SHA1 (wpull-2.0.1.tar.gz) = 9dd512af1a80b9e8b8d52ddbf1d92974c81b4212
-RMD160 (wpull-2.0.1.tar.gz) = d936a310e28f66691cf874ede7880a549a883988
-SHA512 (wpull-2.0.1.tar.gz) = 2b4350f726b54936e09cc67f44c9f4295b94ead12eeee8ee434936ada20a102db9cdae3efad680bd4bb0ce3c8638ebd3584d6466bae478c127a116c7feed6231
-Size (wpull-2.0.1.tar.gz) = 675784 bytes
+SHA1 (wpull-2.0.1.tar.gz) = 0cc9d923c6ec3c69b7ff3d1848e20df16e4b1ed8
+RMD160 (wpull-2.0.1.tar.gz) = bac73edc70a525165f36a83f2eec6877e43e93d6
+SHA512 (wpull-2.0.1.tar.gz) = 1894bc23c28777706467857dc6132fbf05683a01e95516c4dfc4cb840f456a011295766968814f53632a1cb69c79209aee8de724b3b1f41e6cda882e414ef493
+Size (wpull-2.0.1.tar.gz) = 666789 bytes
+SHA1 (patch-requires.txt) = 068c22da420d52dcc5c9bca201ed56b92d5d07db
+SHA1 (patch-setup.py) = 97efacec033124a04bb8ffeb022f5c3ad1ad7313
diff --git a/py-wpull/patches/patch-requires.txt b/py-wpull/patches/patch-requires.txt
new file mode 100644
index 0000000000..8287eac1fd
--- /dev/null
+++ b/py-wpull/patches/patch-requires.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+dnspython3 has been superseded by the regular dnspython
+
+--- wpull.egg-info/requires.txt.orig	2017-10-27 15:52:51.000000000 +0000
++++ wpull.egg-info/requires.txt
+@@ -1,5 +1,5 @@
+ chardet
+-dnspython3
++dnspython
+ html5lib
+ namedlist
+ sqlalchemy
diff --git a/py-wpull/patches/patch-setup.py b/py-wpull/patches/patch-setup.py
new file mode 100644
index 0000000000..1db7c5a6d0
--- /dev/null
+++ b/py-wpull/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD$
+
+dnspython3 has been superseded by the regular dnspython
+
+--- setup.py.orig	2017-10-27 15:51:42.000000000 +0000
++++ setup.py
+@@ -100,7 +100,7 @@ setup_kwargs = dict(
+ # See also requirements.txt
+ setup_kwargs['install_requires'] = [
+     'chardet',
+-    'dnspython3',
++    'dnspython',
+     'html5lib',
+     'namedlist',
+     'sqlalchemy',
Home | Main Index | Thread Index | Old Index