Update to 1.6.6:

1.6.6 (27 Nov 2008)
--------------------

* Fixed issue that caused all images to be 570x570 on some systems, due to a
  change in the python2.5 C API.

* Improved setup.py and Makefiles.

* Contours can now be used with PlotKey.

* Added Labels component. Similar to Points, but with text labels instead
  of symbols.

1.6.5 (20 Mar 2007)
-------------------

* Replaced Numeric with numpy.

1.6.4 (08 Mar 2004)
-------------------

* Phil Kromer contributed the new ColoredPoints and Density components.
  See example9.py for details.

* Todd Fox contributed Makefiles for building with MS Visual C++.

* Can now specify the width/height of postscript output, by passing (e.g.)
  width="5in" or height="10in" to the functions which produce postscript
  output. Default values are in the [postscript] section of config.ini.
  The old [printer]/paper option is now [postscript]/paper.

* Added UpperLimits, LowerLimits components. These produce symbols
  with half-arrows indicating the true value is below/above the
  point.

* Added TeX codes \`,\',\^,\",\~ for character accents.

5 files changed, 39 insertions, 22 deletions

diff --git a/graphics/py-biggles/Makefile b/graphics/py-biggles/Makefile
index 8e8d5e969d8..97d9c80cca2 100644
--- a/graphics/py-biggles/Makefile
+++ b/graphics/py-biggles/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2013/02/16 11:22:23 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.18 2014/01/19 13:43:39 wiz Exp $
 
-DISTNAME=	python-biggles-1.6.3
-PKGNAME=	${PYPKGPREFIX}${DISTNAME:S/python//}
-PKGREVISION=	6
+DISTNAME=	python2-biggles-1.6.6
+PKGNAME=	${PYPKGPREFIX}${DISTNAME:S/python2//}
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=biggles/}
 
@@ -11,9 +9,10 @@ MAINTAINER=	Kai.Puolamaki@iki.fi
 HOMEPAGE=	http://biggles.sourceforge.net/
 COMMENT=	Python module for creating 2D scientific plots
 
-PYDISTUTILSPKG= yes
+EGG_NAME=	${DISTNAME:S/-/_/}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not ported yet as of 1.6.6
 
-.include "../../lang/python/extension.mk"
-.include "../../math/py-Numeric/buildlink3.mk"
+.include "../../lang/python/distutils.mk"
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../graphics/plotutils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-biggles/PLIST b/graphics/py-biggles/PLIST
index 75a6557dfce..8c3da97cec8 100644
--- a/graphics/py-biggles/PLIST
+++ b/graphics/py-biggles/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/01/19 13:43:39 wiz Exp $
 ${PYSITELIB}/biggles/__init__.py
 ${PYSITELIB}/biggles/__init__.pyc
 ${PYSITELIB}/biggles/__init__.pyo
@@ -38,3 +38,4 @@ ${PYSITELIB}/biggles/libplot/tex2libplot.pyo
 ${PYSITELIB}/biggles/matlab.py
 ${PYSITELIB}/biggles/matlab.pyc
 ${PYSITELIB}/biggles/matlab.pyo
+${PYSITELIB}/${EGG_FILE}
diff --git a/graphics/py-biggles/distinfo b/graphics/py-biggles/distinfo
index bbe0cbaa62e..f15c9123142 100644
--- a/graphics/py-biggles/distinfo
+++ b/graphics/py-biggles/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/02/16 16:49:16 joerg Exp $
+$NetBSD: distinfo,v 1.4 2014/01/19 13:43:39 wiz Exp $
 
-SHA1 (python-biggles-1.6.3.tar.gz) = ada51bb368f504151c3e65d776b0314dd6f534df
-RMD160 (python-biggles-1.6.3.tar.gz) = a5723e0ca332bac741079e5ccabff10459ef1be6
-Size (python-biggles-1.6.3.tar.gz) = 107760 bytes
-SHA1 (patch-aa) = 53e927eb559d145e247173e1ad4b125e5374cbcc
+SHA1 (python2-biggles-1.6.6.tar.gz) = d2bcd0141845657189ef5834516e50e6cb777702
+RMD160 (python2-biggles-1.6.6.tar.gz) = a6b16ddfba224402693eca086666fbd6b51ce413
+Size (python2-biggles-1.6.6.tar.gz) = 104256 bytes
+SHA1 (patch-setup.py) = fca5fd24f027acee2ae0d853dcda5da9a175b82b
diff --git a/graphics/py-biggles/patches/patch-aa b/graphics/py-biggles/patches/patch-aa
deleted file mode 100644
index 4ce2e8c0ea3..00000000000
--- a/graphics/py-biggles/patches/patch-aa
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/02/16 16:49:16 joerg Exp $
-
---- setup.py.orig	2009-02-16 17:43:32.000000000 +0100
-+++ setup.py
-@@ -1,2 +1,3 @@
- #!/usr/bin/env python

-+# -*- coding: latin-1
- #

diff --git a/graphics/py-biggles/patches/patch-setup.py b/graphics/py-biggles/patches/patch-setup.py
new file mode 100644
index 00000000000..c0e6e8162b7
--- /dev/null
+++ b/graphics/py-biggles/patches/patch-setup.py
@@ -0,0 +1,25 @@
+$NetBSD: patch-setup.py,v 1.1 2014/01/19 13:43:39 wiz Exp $
+
+Code inexplicably fails to detect numpy; remove try/except and it
+works.
+
+--- setup.py.orig	2010-04-09 21:28:15.000000000 +0000
++++ setup.py
+@@ -77,13 +77,10 @@ if sys.platform == "win32":
+ 	libplot_module_libs = ["plot.dll"]

+ 

+ else:

+-	try:

+-		import numpy

+-		numpy_inc_dir = numpy.get_include()

+-		_biggles_module_inc_dirs.append( numpy_inc_dir )

+-		libplot_module_inc_dirs.append( numpy_inc_dir )

+-	except:

+-		print "numpy module not found; add /path/to/numpy to PYTHONPATH"

++	import numpy

++	numpy_inc_dir = numpy.get_include()

++	_biggles_module_inc_dirs.append( numpy_inc_dir )

++	libplot_module_inc_dirs.append( numpy_inc_dir )

+ 

+ 	candidate_dirs = [

+ 		'/usr',