py-netaddr: update to 0.7.19

Release: 0.7.19:

* added a new SubnetSplitter class for those looking to divide up subnets.
  Thanks alanwill and RyPeck and those on (Stack Overflow discussion).

* removed bundled pytest dependency code for "python setup.py test".

* setup.py now uses setuptools only (no more distutils) and setup_egg.py removed.

* cleaned up INSTALL docs so they accurately reflect current Python packaging.

* fixed broken parsing, generating and reading of IEEE index files when switching
  between Python 2.x and 3.x.

5 files changed, 27 insertions, 30 deletions

diff --git a/net/py-netaddr/ALTERNATIVES b/net/py-netaddr/ALTERNATIVES
new file mode 100644
index 00000000000..eb9fe990d0f
--- /dev/null
+++ b/net/py-netaddr/ALTERNATIVES
@@ -0,0 +1 @@
+bin/netaddr @PREFIX@/bin/netaddr@PYVERSSUFFIX@
diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile
index 74ce6c69e08..e460ca612cf 100644
--- a/net/py-netaddr/Makefile
+++ b/net/py-netaddr/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2017/09/04 18:08:26 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/28 12:25:11 adam Exp $
 
-DISTNAME=	netaddr-0.7.18
+DISTNAME=	netaddr-0.7.19
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/netaddr/}
@@ -10,12 +10,15 @@ HOMEPAGE=	https://pypi.python.org/pypi/netaddr/
 COMMENT=	Python library for manipluating network addresses
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+USE_LANGUAGES=		# none
 
 REPLACE_PYTHON+=	netaddr/eui/ieee.py
 REPLACE_PYTHON+=	netaddr/ip/iana.py
 REPLACE_PYTHON+=	netaddr/tools/netaddr
 
+post-install:
+	cd ${DESTDIR}${PREFIX}/bin && ${MV} netaddr netaddr${PYVERSSUFFIX} || ${TRUE}
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-netaddr/PLIST b/net/py-netaddr/PLIST
index b40040eabe5..46f029ff72d 100644
--- a/net/py-netaddr/PLIST
+++ b/net/py-netaddr/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2016/03/06 15:07:07 adam Exp $
-bin/netaddr
+@comment $NetBSD: PLIST,v 1.3 2017/09/28 12:25:11 adam Exp $
+bin/netaddr${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -10,6 +10,12 @@ ${PYSITELIB}/netaddr/__init__.pyo
 ${PYSITELIB}/netaddr/compat.py
 ${PYSITELIB}/netaddr/compat.pyc
 ${PYSITELIB}/netaddr/compat.pyo
+${PYSITELIB}/netaddr/contrib/__init__.py
+${PYSITELIB}/netaddr/contrib/__init__.pyc
+${PYSITELIB}/netaddr/contrib/__init__.pyo
+${PYSITELIB}/netaddr/contrib/subnet_splitter.py
+${PYSITELIB}/netaddr/contrib/subnet_splitter.pyc
+${PYSITELIB}/netaddr/contrib/subnet_splitter.pyo
 ${PYSITELIB}/netaddr/core.py
 ${PYSITELIB}/netaddr/core.pyc
 ${PYSITELIB}/netaddr/core.pyo
diff --git a/net/py-netaddr/distinfo b/net/py-netaddr/distinfo
index 751a33ed658..3657b705cc5 100644
--- a/net/py-netaddr/distinfo
+++ b/net/py-netaddr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2016/03/06 15:07:07 adam Exp $
+$NetBSD: distinfo,v 1.4 2017/09/28 12:25:11 adam Exp $
 
-SHA1 (netaddr-0.7.18.tar.gz) = f8fab84064dfe2e7a404c602a48fde9129191e58
-RMD160 (netaddr-0.7.18.tar.gz) = 5c73d1f7c2e1e4ca9c2f6848b12179f198be514a
-SHA512 (netaddr-0.7.18.tar.gz) = f2a05d177e8e45cc42c494340a4dc65afdbc75bce16acc7d2e9cda06f4c2404df086780d10c764b6845cef32cf18cf00069f8b11c2dd0cb7fbcdde7d75b81253
-Size (netaddr-0.7.18.tar.gz) = 1715389 bytes
-SHA1 (patch-setup.py) = 34e95111cf28697758e7c68769cd87324cb41278
+SHA1 (netaddr-0.7.19.tar.gz) = 00e0ce7d7ebc1d6e7943e884aa51ccb7becdc9ea
+RMD160 (netaddr-0.7.19.tar.gz) = 726d351f5c2a2e13446322c9ffd169215deb2601
+SHA512 (netaddr-0.7.19.tar.gz) = 8440dee19d51828cd0dee403ec8c2fbc70e42d8c7c922d1a6a2a752100f9a313c521fa5e0789e024af0998f713599d50cf986e96867d3cc62a4143875e52d6bf
+Size (netaddr-0.7.19.tar.gz) = 1622835 bytes
+SHA1 (patch-setup.py) = c62ca80240f8f53e2ddf88476d9e41b5ff693b23
diff --git a/net/py-netaddr/patches/patch-setup.py b/net/py-netaddr/patches/patch-setup.py
index 19e314f2753..3cd72735453 100644
--- a/net/py-netaddr/patches/patch-setup.py
+++ b/net/py-netaddr/patches/patch-setup.py
@@ -1,25 +1,12 @@
-$NetBSD: patch-setup.py,v 1.2 2016/03/06 15:07:07 adam Exp $
+$NetBSD: patch-setup.py,v 1.3 2017/09/28 12:25:11 adam Exp $
 
-Prefer setup from setuptools, the older one may not
-support install_requires or setup_requires
+Do not overwrite script's interpreter.
 
---- setup.py.orig	2015-08-25 21:54:04.000000000 +0000
+--- setup.py.orig	2017-01-11 23:42:52.000000000 +0000
 +++ setup.py
-@@ -8,7 +8,10 @@ A distutils Python setup file. For setup
- import os
- import sys
- 
--from distutils.core import setup, Command
-+try:
-+    from setuptools import setup, Command
-+except ImportError:
-+    from distutils.core import setup, Command
- 
- if os.path.exists('MANIFEST'):
-     os.remove('MANIFEST')
-@@ -64,7 +67,6 @@ def main():
-         version          = release.version,
-         options = {
+@@ -176,7 +176,6 @@ def main():
+         version=netaddr.__version__,
+         options={
              'build_scripts': {
 -                'executable': '/usr/bin/env python',
              },