6 files changed, 196 insertions, 77 deletions

diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index 272dc20a6ddc..12cc8dd0d064 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -1,27 +1,48 @@
 # New ports collection makefile for:    vtk
-# Version required:     2.3
+# Version required:     3.1
 # Date created:         24 Nov 1997
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       vtk23unix
-PKGNAME=	vtk-2.3
+DISTNAME=	vtk31Unix
+PKGNAME=	vtk-3.1
 CATEGORIES=	math
-MASTER_SITES=	ftp://vtk.scorec.rpi.edu/pub/
+MASTER_SITES=	ftp://public.kitware.com/pub/vtk/
 
 MAINTAINER=	ports@FreeBSD.org
 
+BUILD_DEPENDS=
 LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3	\
-		tk80.1:${PORTSDIR}/x11-toolkits/tk80
+		tk82.1:${PORTSDIR}/x11-toolkits/tk82
+RUN_DEPENDS=
 
-WRKSRC=		$(WRKDIR)/vtk
+WRKSRC=		$(WRKDIR)/vtk31
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-mesa --with-shared --with-tcl --with-bsdmake
+CONFIGURE_ARGS+=	--with-contrib --with-tkwidget
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}"
 
+# Support for Python is compiled in by default.
+WITH_PYTHON?=	yes
+.if defined(WITH_PYTHON) && $(WITH_PYTHON) == yes
+CONFIGURE_ARGS+=	--with-python
+BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python
+RUN_DEPENDS+=	python:${PORTSDIR}/lang/python
+.endif
+
+WITH_PATENTED?=	no
+.if defined(WITH_PATENTED) && $(WITH_PATENTED) == yes
+CONFIGURE_ARGS+=	--with-patented
+PLIST=		${PKGDIR}/PLIST.with_patented
+.endif
+
 post-install:
+.if defined(WITH_PYTHON) && $(WITH_PYTHON) == yes
+	${PREFIX}/bin/python  -c "import compileall; compileall.compile_dir( '${PREFIX}/lib/vtk/python' );"
+	${PREFIX}/bin/python -Oc "import compileall; compileall.compile_dir( '${PREFIX}/lib/vtk/python' );"
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/math/vtk5/distinfo b/math/vtk5/distinfo
index f2b79ffd35b4..8b37c66b9c5c 100644
--- a/math/vtk5/distinfo
+++ b/math/vtk5/distinfo
@@ -1 +1 @@
-MD5 (vtk23unix.tar.gz) = c7cfec42f6ad474a0d77c82fdb54d2a2
+MD5 (vtk31Unix.tar.gz) = 229a1bf323f07b7afa71a6fa911f2751
diff --git a/math/vtk5/files/patch-aa b/math/vtk5/files/patch-aa
index d8d92edba136..d1d961a650f1 100644
--- a/math/vtk5/files/patch-aa
+++ b/math/vtk5/files/patch-aa
@@ -1,67 +1,47 @@
-*** user.make.orig	Thu Nov 13 09:25:29 1997
---- user.make	Fri May 28 13:09:29 1999
-***************
-*** 2,32 ****
-  # by configure in system.make.  At a minimum you should set
-  # the following Tcl/Tk values if you are planning to use Tcl/Tk
-  
-! TCL_INCLUDE=-I/home/ausable/software/src/tcl7.6/tcl7.6/generic
-! TCL_LIB=/common/software/tcl7.6/sun4/5.4/lib/libtcl7.6.a
-  
-! TK_INCLUDE=-I/home/ausable/software/src/tcl7.6/tk4.2/generic
-! TK_LIB=/common/software/tk4.2/sun4/5.4/lib/libtk4.2.a
-  
-! MESA_INCLUDE=-I/home/martink/storage/Mesa-1.2.6/include
-! MESA_LIB=/home/martink/storage/Mesa-1.2.6/lib-sun4-solaris/libMesaGL.a
-  
-  # for python you must set this 
-! PYTHON_INCLUDES=-I/home/schroede/montnaro/Python-1.4/Include
-  
-  # Add additional CFLAGS and CXXFLAGS for compilation
-  # uncomment the following two lines to set your own flags
-! #USER_CFLAGS =  
-! #USER_CXXFLAGS = 
-  
-  # if you want to try the java support you'll need to set the following
-  # variables to match your environment and uncomment them
-  #
-! #JDKHOME=/home/calvin/content/ITL/java-packages/dev-kits/JDK/jdk1.1
-  #JAVAC=${JDKHOME}/bin/javac
-! #JAVA_CLASS_HOME=/home/martink/java
-  #JAVAH=${JDKHOME}/bin/javah
-! #JAVA_INCLUDES=-I${JDKHOME}/include -I${JDKHOME}/include/solaris
-  #JAVA_CXX_LIB=/common/software/g++-2.7.1/sun4/5.4/lib/libiberty.a /common/software/g++-2.7.1/sun4/5.4/lib/libstdc++.a /common/software/g++-2.7.1/sun4/5.4/lib/gcc-lib/sparc-sun-solaris2.4/2.7.1/libgcc.a
-  
-  
---- 2,32 ----
-  # by configure in system.make.  At a minimum you should set
-  # the following Tcl/Tk values if you are planning to use Tcl/Tk
-  
-! TCL_INCLUDE=-I${PREFIX}/include/tcl8.0/generic
-! TCL_LIB=${PREFIX}/lib/libtcl80.so
-  
-! TK_INCLUDE=-I${PREFIX}/include/tk8.0/generic
-! TK_LIB=${PREFIX}/lib/libtk80.so
-  
-! MESA_INCLUDE=-I${X11BASE}/include
-! MESA_LIB=${X11BASE}/lib/libMesaGL.so
-  
-  # for python you must set this 
-! PYTHON_INCLUDES=-I${PREFIX}/include/python1.5
-  
-  # Add additional CFLAGS and CXXFLAGS for compilation
-  # uncomment the following two lines to set your own flags
-! USER_CFLAGS =  -O2 -D__NO_MATH_INLINES
-! USER_CXXFLAGS = -O2 -D__NO_MATH_INLINES
-  
-  # if you want to try the java support you'll need to set the following
-  # variables to match your environment and uncomment them
-  #
-! #JDKHOME=$(PREFIX)/jdk1.1*
-  #JAVAC=${JDKHOME}/bin/javac
-! #JAVA_CLASS_HOME=${JDKHOME}/lib
-  #JAVAH=${JDKHOME}/bin/javah
-! #JAVA_INCLUDES=-I${JDKHOME}/include -I${JDKHOME}/include/freebsd
-  #JAVA_CXX_LIB=/common/software/g++-2.7.1/sun4/5.4/lib/libiberty.a /common/software/g++-2.7.1/sun4/5.4/lib/libstdc++.a /common/software/g++-2.7.1/sun4/5.4/lib/gcc-lib/sparc-sun-solaris2.4/2.7.1/libgcc.a
-  
-  
+--- user.make.orig	Thu Nov 13 09:25:29 1997
++++ user.make	Sat Mar 25 20:36:54 2000
+@@ -2,31 +2,32 @@
+ # by configure in system.make.  At a minimum you should set
+ # the following Tcl/Tk values if you are planning to use Tcl/Tk
+ 
+-TCL_INCLUDE=-I/home/ausable/software/src/tcl7.6/tcl7.6/generic
+-TCL_LIB=/common/software/tcl7.6/sun4/5.4/lib/libtcl7.6.a
++TCL_INCLUDE=-I${PREFIX}/include/tcl8.2/generic
++TCL_LIB=${PREFIX}/lib/libtcl82.so
+ 
+-TK_INCLUDE=-I/home/ausable/software/src/tcl7.6/tk4.2/generic
+-TK_LIB=/common/software/tk4.2/sun4/5.4/lib/libtk4.2.a
++TK_INCLUDE=-I${PREFIX}/include/tk8.2/generic
++TK_LIB=${PREFIX}/lib/libtk82.so
+ 
+-MESA_INCLUDE=-I/home/martink/storage/Mesa-1.2.6/include
+-MESA_LIB=/home/martink/storage/Mesa-1.2.6/lib-sun4-solaris/libMesaGL.a
++MESA_INCLUDE=-I${X11BASE}/include
++MESA_LIB=${X11BASE}/lib/libMesaGL.so
+ 
+ # for python you must set this 
+-PYTHON_INCLUDES=-I/home/schroede/montnaro/Python-1.4/Include
++PYTHON_INCLUDES=-I${PREFIX}/include/python1.5
+ 
+ # Add additional CFLAGS and CXXFLAGS for compilation
+ # uncomment the following two lines to set your own flags
+-#USER_CFLAGS =  
+-#USER_CXXFLAGS = 
++USER_CFLAGS =  -O2 -D__NO_MATH_INLINES
++USER_CXXFLAGS = -O2 -D__NO_MATH_INLINES
++X_EXTRA_LIBS = -lstdc++ -lgcc              # Req'd for vtkpython.so to import
+ 
+ # if you want to try the java support you'll need to set the following
+ # variables to match your environment and uncomment them
+ #
+-#JDKHOME=/home/calvin/content/ITL/java-packages/dev-kits/JDK/jdk1.1
++#JDKHOME=$(PREFIX)/jdk1.1*
+ #JAVAC=${JDKHOME}/bin/javac
+-#JAVA_CLASS_HOME=/home/martink/java
++#JAVA_CLASS_HOME=${JDKHOME}/lib
+ #JAVAH=${JDKHOME}/bin/javah
+-#JAVA_INCLUDES=-I${JDKHOME}/include -I${JDKHOME}/include/solaris
++#JAVA_INCLUDES=-I${JDKHOME}/include -I${JDKHOME}/include/freebsd
+ #JAVA_CXX_LIB=/common/software/g++-2.7.1/sun4/5.4/lib/libiberty.a /common/software/g++-2.7.1/sun4/5.4/lib/libstdc++.a /common/software/g++-2.7.1/sun4/5.4/lib/gcc-lib/sparc-sun-solaris2.4/2.7.1/libgcc.a
+ 
+ 
diff --git a/math/vtk5/pkg-descr b/math/vtk5/pkg-descr
index 60208bf1bdc8..98e535e4c54f 100644
--- a/math/vtk5/pkg-descr
+++ b/math/vtk5/pkg-descr
@@ -1,11 +1,15 @@
 The ideal way to learn about the software is from the book it is designed to
 support.  You should be able to get the book from any local bookstore or from
 our web page. The web page also contains some html reference pages for the
-objects in vtk as well as a FAQ.
+objects in VTK as well as a FAQ.
+
+  The VTK User's Guide
+  by Will Schroeder, Ken Martin
+  Kitware (see VTK web page)
 
   The Visualization Toolkit, An Object-Oriented Approach to 3D Graphics
   by Will Schroeder, Ken Martin and Bill Lorensen.
   Prentice Hall, ISBN 013199837-4
 
 For more information and a FAQ see our web page at
-http://www.kitware.com/~martink/
+http://www.kitware.com/vtk.html
diff --git a/math/vtk5/pkg-plist b/math/vtk5/pkg-plist
index 4b86f5a6e2f0..3384793ac4b2 100644
--- a/math/vtk5/pkg-plist
+++ b/math/vtk5/pkg-plist
@@ -1,9 +1,60 @@
 bin/vtk
 lib/libVTKCommon.so
 lib/libVTKCommonTcl.so
+lib/libVTKCommonPython.so
 lib/libVTKGraphics.so
 lib/libVTKGraphicsTcl.so
+lib/libVTKGraphicsPython.so
 lib/libVTKImaging.so
 lib/libVTKImagingTcl.so
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+lib/libVTKImagingPython.so
+lib/libVTKContrib.so
+lib/libVTKContribTcl.so
+lib/libVTKContribPython.so
+lib/vtk/python/VTK.py
+lib/vtk/python/VTK.pyc
+lib/vtk/python/VTK.pyo
+lib/vtk/python/libVTKCommonPython.py
+lib/vtk/python/libVTKCommonPython.pyc
+lib/vtk/python/libVTKCommonPython.pyo
+lib/vtk/python/libVTKContribPython.py
+lib/vtk/python/libVTKContribPython.pyc
+lib/vtk/python/libVTKContribPython.pyo
+lib/vtk/python/libVTKGraphicsPython.py
+lib/vtk/python/libVTKGraphicsPython.pyc
+lib/vtk/python/libVTKGraphicsPython.pyo
+lib/vtk/python/libVTKImagingPython.py
+lib/vtk/python/libVTKImagingPython.pyc
+lib/vtk/python/libVTKImagingPython.pyo
+lib/vtk/python/libVTKLocalPython.py
+lib/vtk/python/libVTKLocalPython.pyc
+lib/vtk/python/libVTKLocalPython.pyo
+lib/vtk/python/libVTKPatentedPython.py
+lib/vtk/python/libVTKPatentedPython.pyc
+lib/vtk/python/libVTKPatentedPython.pyo
+lib/vtk/python/vtkConstants.py
+lib/vtk/python/vtkConstants.pyc
+lib/vtk/python/vtkConstants.pyo
+lib/vtk/python/vtkImageExportToArray.py
+lib/vtk/python/vtkImageExportToArray.pyc
+lib/vtk/python/vtkImageExportToArray.pyo
+lib/vtk/python/vtkImageImportFromArray.py
+lib/vtk/python/vtkImageImportFromArray.pyc
+lib/vtk/python/vtkImageImportFromArray.pyo
+lib/vtk/python/vtkImageViewerWidget.py
+lib/vtk/python/vtkImageViewerWidget.pyc
+lib/vtk/python/vtkImageViewerWidget.pyo
+lib/vtk/python/vtkImageWindowWidget.py
+lib/vtk/python/vtkImageWindowWidget.pyc
+lib/vtk/python/vtkImageWindowWidget.pyo
+lib/vtk/python/vtkRenderWidget.py
+lib/vtk/python/vtkRenderWidget.pyc
+lib/vtk/python/vtkRenderWidget.pyo
+lib/vtk/python/vtkpython.so                          
+lib/vtk/python/vtkTkImageViewerWidget                
+lib/vtk/python/vtkTkImageWindowWidget                
+lib/vtk/python/vtkTkRenderWidget                     
+@dirrm lib/vtk/python
+@dirrm lib/vtk
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/math/vtk5/pkg-plist.with_patented b/math/vtk5/pkg-plist.with_patented
new file mode 100644
index 000000000000..94b778e84996
--- /dev/null
+++ b/math/vtk5/pkg-plist.with_patented
@@ -0,0 +1,63 @@
+bin/vtk
+lib/libVTKCommon.so
+lib/libVTKCommonTcl.so
+lib/libVTKCommonPython.so
+lib/libVTKGraphics.so
+lib/libVTKGraphicsTcl.so
+lib/libVTKGraphicsPython.so
+lib/libVTKImaging.so
+lib/libVTKImagingTcl.so
+lib/libVTKImagingPython.so
+lib/libVTKPatented.so
+lib/libVTKPatentedTcl.so
+lib/libVTKPatentedPython.so
+lib/libVTKContrib.so
+lib/libVTKContribTcl.so
+lib/libVTKContribPython.so
+lib/vtk/python/VTK.py
+lib/vtk/python/VTK.pyc
+lib/vtk/python/VTK.pyo
+lib/vtk/python/libVTKCommonPython.py
+lib/vtk/python/libVTKCommonPython.pyc
+lib/vtk/python/libVTKCommonPython.pyo
+lib/vtk/python/libVTKContribPython.py
+lib/vtk/python/libVTKContribPython.pyc
+lib/vtk/python/libVTKContribPython.pyo
+lib/vtk/python/libVTKGraphicsPython.py
+lib/vtk/python/libVTKGraphicsPython.pyc
+lib/vtk/python/libVTKGraphicsPython.pyo
+lib/vtk/python/libVTKImagingPython.py
+lib/vtk/python/libVTKImagingPython.pyc
+lib/vtk/python/libVTKImagingPython.pyo
+lib/vtk/python/libVTKLocalPython.py
+lib/vtk/python/libVTKLocalPython.pyc
+lib/vtk/python/libVTKLocalPython.pyo
+lib/vtk/python/libVTKPatentedPython.py
+lib/vtk/python/libVTKPatentedPython.pyc
+lib/vtk/python/libVTKPatentedPython.pyo
+lib/vtk/python/vtkConstants.py
+lib/vtk/python/vtkConstants.pyc
+lib/vtk/python/vtkConstants.pyo
+lib/vtk/python/vtkImageExportToArray.py
+lib/vtk/python/vtkImageExportToArray.pyc
+lib/vtk/python/vtkImageExportToArray.pyo
+lib/vtk/python/vtkImageImportFromArray.py
+lib/vtk/python/vtkImageImportFromArray.pyc
+lib/vtk/python/vtkImageImportFromArray.pyo
+lib/vtk/python/vtkImageViewerWidget.py
+lib/vtk/python/vtkImageViewerWidget.pyc
+lib/vtk/python/vtkImageViewerWidget.pyo
+lib/vtk/python/vtkImageWindowWidget.py
+lib/vtk/python/vtkImageWindowWidget.pyc
+lib/vtk/python/vtkImageWindowWidget.pyo
+lib/vtk/python/vtkRenderWidget.py
+lib/vtk/python/vtkRenderWidget.pyc
+lib/vtk/python/vtkRenderWidget.pyo
+lib/vtk/python/vtkpython.so                          
+lib/vtk/python/vtkTkImageViewerWidget                
+lib/vtk/python/vtkTkImageWindowWidget                
+lib/vtk/python/vtkTkRenderWidget                     
+@dirrm lib/vtk/python
+@dirrm lib/vtk
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R