8 files changed, 82 insertions, 27 deletions

diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile
index 1fdacddf18c5..91b4c698abdf 100644
--- a/graphics/py-visual/Makefile
+++ b/graphics/py-visual/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	visual
-PORTVERSION=	3.2.9
-PORTREVISION=	1
+PORTVERSION=	4.b14
 CATEGORIES=	graphics python
-MASTER_SITES=	http://www.vpython.org/download/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	visualpython
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A python module that offers real 3D visual output
 
-BUILD_DEPENDS=	${PYNUMERIC} \
+BUILD_DEPENDS=	${PYNUMPY} \
 		bjam:${PORTSDIR}/devel/boost-python
-LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
-RUN_DEPENDS=	${PYNUMERIC}
+LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
+		gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm \
+		glademm-2.4.1:${PORTSDIR}/devel/libglademm24
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
@@ -33,24 +33,17 @@ OPTIONS=	EXAMPLES "install example files" on
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR}
-CONFIGURE_ENV=	PYTHONPATH=${PYTHON_LIBDIR}
+CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} --disable-dependency-tracking
 .if defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--disable-docs
 .endif
+CONFIGURE_ENV=	PYTHONPATH=${PYTHON_LIBDIR}
+MAKE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTREAD_LIBS}"
 
 VPYTHON_SCRIPT=	bin/vpython.in
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
-
-.if ${ARCH} == amd64
-IGNORE=		loops infinitely during build
-.endif
-
 .if !defined(WITH_EXAMPLES)
 CONFIGURE_ARGS+=	--disable-examples
 PLIST_SUB+=	PORTEXAMPLES="@comment "
@@ -62,7 +55,7 @@ PLIST_SUB+=	PORTEXAMPLES=""
 post-patch:
 	@cd ${WRKSRC}; \
 	${REINPLACE_CMD} -e 's|%%PYTHONBASE%%|${PYTHONBASE}|g' \
-		-e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION:S/python//g}|g' \
+		-e 's|%%PYTHON_VERSION%%|${PYTHON_VER}|g' \
 		${VPYTHON_SCRIPT}
 
 .include <bsd.port.post.mk>
diff --git a/graphics/py-visual/distinfo b/graphics/py-visual/distinfo
index ecb2a6b749e6..6e5057c2695b 100644
--- a/graphics/py-visual/distinfo
+++ b/graphics/py-visual/distinfo
@@ -1,3 +1,3 @@
-MD5 (visual-3.2.9.tar.bz2) = 58e46ecb628a4fdbb5c58540b6cbede1
-SHA256 (visual-3.2.9.tar.bz2) = 613df56208b668f7ebe9fbebc862d5684883ab27658fb8a89c8c05d5e1720f49
-SIZE (visual-3.2.9.tar.bz2) = 419962
+MD5 (visual-4.beta14.tar.bz2) = 9b1d6def88764255b6d4b6fdc2071d07
+SHA256 (visual-4.beta14.tar.bz2) = 5cc5506ddf04f3ee2f77b0be99d3a15b781c5be4cdde3d4207602887d282ca97
+SIZE (visual-4.beta14.tar.bz2) = 597800
diff --git a/graphics/py-visual/files/patch-configure b/graphics/py-visual/files/patch-configure
new file mode 100644
index 000000000000..72187d8930bb
--- /dev/null
+++ b/graphics/py-visual/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure	Sat Dec 30 20:15:57 2006
++++ configure.port	Wed Mar  7 18:11:26 2007
+@@ -20104,11 +20104,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-	if $PYTHON -c 'import numpy ; numpy.array' 1>&5 2>&5; then
+ 	  eval "py_cv_mod_$py_mod_var=yes"
+-	else
+-	  eval "py_cv_mod_$py_mod_var=no"
+-	fi
+ 
+ fi
+ 
diff --git a/graphics/py-visual/files/patch-src-gtk2-random_device.cpp b/graphics/py-visual/files/patch-src-gtk2-random_device.cpp
new file mode 100644
index 000000000000..150b1a017d07
--- /dev/null
+++ b/graphics/py-visual/files/patch-src-gtk2-random_device.cpp
@@ -0,0 +1,11 @@
+--- src/gtk2/random_device.cpp	Sat Jul 31 20:20:28 2004
++++ src/gtk2/random_device.cpp.port	Tue Mar  6 13:17:28 2007
+@@ -32,7 +32,7 @@
+ #endif
+ 
+ // Known to be supported for GNU/Linux and Apple OSX.  Probably others as well.
+-#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
++#if defined(__linux__) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__))
+ 
+ // the default is the unlimited capacity device, using some secure hash
+ // try "/dev/random" for blocking when the entropy pool has drained
diff --git a/graphics/py-visual/files/patch-src-python-cvisualmodule.cpp b/graphics/py-visual/files/patch-src-python-cvisualmodule.cpp
new file mode 100644
index 000000000000..a4a6c784e403
--- /dev/null
+++ b/graphics/py-visual/files/patch-src-python-cvisualmodule.cpp
@@ -0,0 +1,11 @@
+$FreeBSD$
+--- src/python/cvisualmodule.cpp	Tue Mar  6 11:45:52 2007
++++ src/python/cvisualmodule.cpp.port	Tue Mar  6 11:46:04 2007
+@@ -5,6 +5,7 @@
+ // See the file license.txt for complete license terms.
+ // See the file authors.txt for a complete list of contributors.
+ 
++#include <iostream>
+ #include <stdexcept>
+ #include <exception>
+ 
diff --git a/graphics/py-visual/files/patch-src-python-num_util.cpp b/graphics/py-visual/files/patch-src-python-num_util.cpp
new file mode 100644
index 000000000000..ce341aea0855
--- /dev/null
+++ b/graphics/py-visual/files/patch-src-python-num_util.cpp
@@ -0,0 +1,11 @@
+--- src/python/num_util.cpp	Thu Nov 30 07:06:03 2006
++++ src/python/num_util.cpp.port	Thu Mar  8 11:18:50 2007
+@@ -230,7 +230,7 @@
+     PyErr_SetString(PyExc_ValueError, "expected a PyArrayObject");
+     throw_error_already_set();
+   }
+-  int* dims_ptr = PyArray_DIMS(arr.ptr());
++  npy_intp* dims_ptr = PyArray_DIMS(arr.ptr());
+   int the_rank = rank(arr);
+   for (int i = 0; i < the_rank; i++){
+     out_dims.push_back(*(dims_ptr + i));
diff --git a/graphics/py-visual/files/patch-src-python-vector_array.cpp b/graphics/py-visual/files/patch-src-python-vector_array.cpp
new file mode 100644
index 000000000000..f37720a04127
--- /dev/null
+++ b/graphics/py-visual/files/patch-src-python-vector_array.cpp
@@ -0,0 +1,10 @@
+--- src/python/vector_array.cpp	Tue Mar  6 12:39:10 2007
++++ src/python/vector_array.cpp.port	Tue Mar  6 12:20:51 2007
+@@ -1,6 +1,7 @@
+ // Copyright (c) 2000, 2001, 2002, 2003 by David Scherer and others.
+ // See the file license.txt for complete license terms.
+ // See the file authors.txt for a complete list of contributors.
++#include <iostream>
+ #include "python/vector_array.hpp"
+ #include "python/scalar_array.hpp"
+ 
diff --git a/graphics/py-visual/pkg-plist b/graphics/py-visual/pkg-plist
index a02134acbac6..6c60a19e80cb 100644
--- a/graphics/py-visual/pkg-plist
+++ b/graphics/py-visual/pkg-plist
@@ -1,9 +1,8 @@
 @comment $FreeBSD$
 bin/vpython
-%%PYTHON_SITELIBDIR%%/cvisualmodule.a
 %%PYTHON_SITELIBDIR%%/cvisualmodule.la
 %%PYTHON_SITELIBDIR%%/cvisualmodule.so
-%%PYTHON_SITELIBDIR%%/cvisualmodule.so.1
+%%PYTHON_SITELIBDIR%%/cvisualmodule.so.3
 %%PYTHON_SITELIBDIR%%/visual/__init__.py
 %%PYTHON_SITELIBDIR%%/visual/__init__.pyc
 %%PYTHON_SITELIBDIR%%/visual/__init__.pyo
@@ -22,9 +21,8 @@ bin/vpython
 %%PYTHON_SITELIBDIR%%/visual/graph.py
 %%PYTHON_SITELIBDIR%%/visual/graph.pyc
 %%PYTHON_SITELIBDIR%%/visual/graph.pyo
-%%PYTHON_SITELIBDIR%%/visual/macevent.py
-%%PYTHON_SITELIBDIR%%/visual/macevent.pyc
-%%PYTHON_SITELIBDIR%%/visual/macevent.pyo
+%%PYTHON_SITELIBDIR%%/visual/logo_t.gif
+%%PYTHON_SITELIBDIR%%/visual/pan.png
 %%PYTHON_SITELIBDIR%%/visual/primitives.py
 %%PYTHON_SITELIBDIR%%/visual/primitives.pyc
 %%PYTHON_SITELIBDIR%%/visual/primitives.pyo
@@ -34,6 +32,7 @@ bin/vpython
 %%PYTHON_SITELIBDIR%%/visual/ui.py
 %%PYTHON_SITELIBDIR%%/visual/ui.pyc
 %%PYTHON_SITELIBDIR%%/visual/ui.pyo
+%%PYTHON_SITELIBDIR%%/visual/vpython.glade
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/visual/VisualIntro.css
 %%PORTDOCS%%%%DOCSDIR%%/visual/VisualIntro.html
@@ -85,6 +84,7 @@ bin/vpython
 %%PORTDOCS%%%%DOCSDIR%%/visual/rotation.html
 %%PORTDOCS%%%%DOCSDIR%%/visual/sphere.html
 %%PORTDOCS%%%%DOCSDIR%%/visual/spherebox.gif
+%%PORTDOCS%%%%DOCSDIR%%/visual/texture-opacity-lighting.html
 %%PORTDOCS%%%%DOCSDIR%%/visual/vector.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tk-Visual.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bounce.py
@@ -99,12 +99,14 @@ bin/vpython
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/drape.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/faces_cone.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/faces_heightfield.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flower128.vpt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gas.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glinfo.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphtest.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gyro.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gyro2.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hanoi.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/labels.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lathe.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lorenz.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/orbit.py
@@ -113,11 +115,14 @@ bin/vpython
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stars.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stonehenge.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/texttest.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/texture_and_lighting.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/texturetest.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tictac.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tictacdat.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/toroid.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/toroid_drag.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wave.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wood256lum.vpt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/visual/icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/visual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%