Changes 0.7.18:

* cidr_merge() algorithm is now O(n) and much faster.
* nmap target specification now fully supported including IPv4 CIDR
  prefixes and IPv6 addresses.

4 files changed, 27 insertions, 21 deletions

diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile
index d08249b17bf..4d2e72e9ea0 100644
--- a/net/py-netaddr/Makefile
+++ b/net/py-netaddr/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/09/02 13:48:13 he Exp $
+# $NetBSD: Makefile,v 1.2 2016/03/06 15:07:07 adam Exp $
 
-DISTNAME=	netaddr-0.7.12
+DISTNAME=	netaddr-0.7.18
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	https://pypi.python.org/packages/source/n/netaddr/
+MASTER_SITES=	${MASTER_SITE_PYPI:=n/netaddr/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/netaddr/
@@ -12,9 +12,9 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
-REPLACE_PYTHON+= netaddr/eui/ieee.py
-REPLACE_PYTHON+= netaddr/ip/iana.py
-REPLACE_PYTHON+= netaddr/tests/__init__.py
+REPLACE_PYTHON+=	netaddr/eui/ieee.py
+REPLACE_PYTHON+=	netaddr/ip/iana.py
+REPLACE_PYTHON+=	netaddr/tools/netaddr
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/net/py-netaddr/PLIST b/net/py-netaddr/PLIST
index ed3fd6226b4..b40040eabe5 100644
--- a/net/py-netaddr/PLIST
+++ b/net/py-netaddr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/09/02 13:48:13 he Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/03/06 15:07:07 adam Exp $
 bin/netaddr
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -37,6 +37,7 @@ ${PYSITELIB}/netaddr/ip/iana.pyc
 ${PYSITELIB}/netaddr/ip/iana.pyo
 ${PYSITELIB}/netaddr/ip/ipv4-address-space.xml
 ${PYSITELIB}/netaddr/ip/ipv6-address-space.xml
+${PYSITELIB}/netaddr/ip/ipv6-unicast-address-assignments.xml
 ${PYSITELIB}/netaddr/ip/multicast-addresses.xml
 ${PYSITELIB}/netaddr/ip/nmap.py
 ${PYSITELIB}/netaddr/ip/nmap.pyc
@@ -62,6 +63,3 @@ ${PYSITELIB}/netaddr/strategy/ipv4.pyo
 ${PYSITELIB}/netaddr/strategy/ipv6.py
 ${PYSITELIB}/netaddr/strategy/ipv6.pyc
 ${PYSITELIB}/netaddr/strategy/ipv6.pyo
-${PYSITELIB}/netaddr/tests/__init__.py
-${PYSITELIB}/netaddr/tests/__init__.pyc
-${PYSITELIB}/netaddr/tests/__init__.pyo
diff --git a/net/py-netaddr/distinfo b/net/py-netaddr/distinfo
index 662066d4ac6..751a33ed658 100644
--- a/net/py-netaddr/distinfo
+++ b/net/py-netaddr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 00:35:31 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/03/06 15:07:07 adam Exp $
 
-SHA1 (netaddr-0.7.12.tar.gz) = a0211025513cfddb1b256cc2595bf2f210fa8050
-RMD160 (netaddr-0.7.12.tar.gz) = 8a90e7d7be11b5c27d701f4353d9b643cc45337f
-SHA512 (netaddr-0.7.12.tar.gz) = d7783ecc697045d381d2d028d02c1773effd1331f15f2fb6423a06ed7915700e42862130d2ceb16c73ed0443a5055d101ce7ea3d10474f9af40cde83d2251e55
-Size (netaddr-0.7.12.tar.gz) = 1504096 bytes
-SHA1 (patch-setup.py) = bd31fc79b644a3b7c42ba947d1c66e98cb950fc0
+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
diff --git a/net/py-netaddr/patches/patch-setup.py b/net/py-netaddr/patches/patch-setup.py
index 3f7fa802d85..19e314f2753 100644
--- a/net/py-netaddr/patches/patch-setup.py
+++ b/net/py-netaddr/patches/patch-setup.py
@@ -1,19 +1,27 @@
-$NetBSD: patch-setup.py,v 1.1 2014/09/02 13:48:13 he Exp $
+$NetBSD: patch-setup.py,v 1.2 2016/03/06 15:07:07 adam Exp $
 
 Prefer setup from setuptools, the older one may not
 support install_requires or setup_requires
 
---- setup.py.orig	2014-07-06 05:19:54.000000000 +0000
+--- setup.py.orig	2015-08-25 21:54:04.000000000 +0000
 +++ setup.py
 @@ -8,7 +8,10 @@ A distutils Python setup file. For setup
  import os
  import sys
  
--from distutils.core import setup
+-from distutils.core import setup, Command
 +try:
-+    from setuptools import setup
++    from setuptools import setup, Command
 +except ImportError:
-+    from distutils.core import setup
++    from distutils.core import setup, Command
  
  if os.path.exists('MANIFEST'):
      os.remove('MANIFEST')
+@@ -64,7 +67,6 @@ def main():
+         version          = release.version,
+         options = {
+             'build_scripts': {
+-                'executable': '/usr/bin/env python',
+             },
+         },
+     )