Update to 2.6.1.

Prompted by beta.repology.org.

Changes from 2.6.0 to 2.6.1

     * Fixed a performance regression in some situations as consequence of
       increasing too much the BLOCK_SIZE1 constant. After more careful
       benchmarks (both in VML and non-VML modes), the value has been set
       again to 1024 (down from 8192). The benchmarks have been made with
       a relatively new processor (Intel Xeon E3-1245 v5 @ 3.50GHz), so
       they should work well for a good range of processors again.
     * Added NetBSD support to CPU detection. Thanks to Thomas Klausner.

3 files changed, 7 insertions, 57 deletions

diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile
index 0c13c1220d3..1335d21cfb3 100644
--- a/math/py-numexpr/Makefile
+++ b/math/py-numexpr/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2016/07/15 07:18:45 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/11/17 07:26:47 alnsn Exp $
 
-DISTNAME=	numexpr-2.6.0
+DISTNAME=	numexpr-2.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pydata/}
diff --git a/math/py-numexpr/distinfo b/math/py-numexpr/distinfo
index c618d41eb64..e96ee3dfb34 100644
--- a/math/py-numexpr/distinfo
+++ b/math/py-numexpr/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2016/07/15 07:21:36 wiz Exp $
+$NetBSD: distinfo,v 1.7 2016/11/17 07:26:47 alnsn Exp $
 
-SHA1 (numexpr-2.6.0.tar.gz) = 02b80e27878853e65ccc8884f1d83d9fdc017abf
-RMD160 (numexpr-2.6.0.tar.gz) = 0b02d07304e38b06ae83cc43cbacd1a99910c1c2
-SHA512 (numexpr-2.6.0.tar.gz) = 6712901e3be20a44d4f40e57fc09bcae17ab0a6af1caf5bc63dd66ca751875b74af71e0f016386b7e68d52ef34a2bab226e3a79871eea35754ddbfe143b5a68e
-Size (numexpr-2.6.0.tar.gz) = 99103 bytes
-SHA1 (patch-ab) = cb007f2e1bf6d52cd5363c2194a905c77f3e911f
+SHA1 (numexpr-2.6.1.tar.gz) = 483a2d21acf8f367d127c299d9ec4a8a5161d850
+RMD160 (numexpr-2.6.1.tar.gz) = e8abf4720ff9820365e4c3bb225ad496de6bc0ab
+SHA512 (numexpr-2.6.1.tar.gz) = 8cf14b9a32676ef24359b8ee04f673139470fb58a711b23b4df25e9f1d2779483b0520c53592ebb591f27abb1c8c34868e660b1149f96985706d9db21c74cd12
+Size (numexpr-2.6.1.tar.gz) = 99331 bytes
diff --git a/math/py-numexpr/patches/patch-ab b/math/py-numexpr/patches/patch-ab
deleted file mode 100644
index 9e5b329bdbc..00000000000
--- a/math/py-numexpr/patches/patch-ab
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2016/07/15 07:21:36 wiz Exp $
-
-Add NetBSD support in CPU detection.
-https://github.com/pydata/numexpr/pull/223
-
---- numexpr/cpuinfo.py.orig	2016-06-01 11:55:58.000000000 +0000
-+++ numexpr/cpuinfo.py
-@@ -498,6 +498,32 @@ class DarwinCPUInfo(CPUInfoBase):
- 
-     def _is_ppc860(self): return self.__machine(860)
- 
-+class NetBSDCPUInfo(CPUInfoBase):
-+	info = None
-+
-+	def __init__(self):
-+		if self.info is not None:
-+			return
-+		info = {}
-+		info['sysctl_hw'] = key_value_from_command(['sysctl', 'hw'], sep='=')
-+		info['arch'] = info['sysctl_hw'].get('hw.machine_arch', 1)
-+		info['machine'] = info['sysctl_hw'].get('hw.machine', 1)
-+		self.__class__.info = info
-+
-+	def _not_impl(self): pass
-+
-+	def _getNCPUs(self):
-+		return int(self.info['sysctl_hw'].get('hw.ncpu', 1))
-+
-+	def _is_Intel(self):
-+		if self.info['sysctl_hw'].get('hw.model', "")[0:5] == 'Intel':
-+			return True
-+		return False
-+
-+	def _is_AMD(self):
-+		if self.info['sysctl_hw'].get('hw.model', "")[0:3] == 'AMD':
-+			return True
-+		return False
- 
- class SunOSCPUInfo(CPUInfoBase):
-     info = None
-@@ -781,6 +807,8 @@ elif sys.platform.startswith('irix'):
-     cpuinfo = IRIXCPUInfo
- elif sys.platform == 'darwin':
-     cpuinfo = DarwinCPUInfo
-+elif sys.platform[0:6] == 'netbsd':
-+    cpuinfo = NetBSDCPUInfo
- elif sys.platform.startswith('sunos'):
-     cpuinfo = SunOSCPUInfo
- elif sys.platform.startswith('win32'):