From 93452d824a208b971bd975b7fe2a0fa971c020f5 Mon Sep 17 00:00:00 2001 From: tg Date: Thu, 30 Mar 2000 08:25:16 +0000 Subject: Upgrade to 3.1. PR: 17604 Submitted by: Randall Hopper --- math/vtk/files/patch-aa | 114 ++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 67 deletions(-) (limited to 'math/vtk/files') diff --git a/math/vtk/files/patch-aa b/math/vtk/files/patch-aa index d8d92edba13..d1d961a650f 100644 --- a/math/vtk/files/patch-aa +++ b/math/vtk/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 + + -- cgit