diff options
Diffstat (limited to 'math/vtk')
| -rw-r--r-- | math/vtk/Makefile | 4 | ||||
| -rw-r--r-- | math/vtk/files/patch-aa | 12 | ||||
| -rw-r--r-- | math/vtk/files/patch-ab | 47 |
3 files changed, 9 insertions, 54 deletions
diff --git a/math/vtk/Makefile b/math/vtk/Makefile index 77191d851530..157de5d1f8a0 100644 --- a/math/vtk/Makefile +++ b/math/vtk/Makefile @@ -35,7 +35,9 @@ PLIST= ${PKGDIR}/pkg-plist.with_patented .endif post-patch: - ${PERL} -pi -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \ + ${PERL} -pi -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g; \ + s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g; \ + s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ ${WRKSRC}/user.make post-install: diff --git a/math/vtk/files/patch-aa b/math/vtk/files/patch-aa index d7e8dc97e37c..6aee97f9413e 100644 --- a/math/vtk/files/patch-aa +++ b/math/vtk/files/patch-aa @@ -7,17 +7,17 @@ -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.3/generic -+TCL_LIB=${PREFIX}/lib/libtcl83.so ++TCL_LIB=-L${PREFIX}/lib -ltcl83 -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.3/generic -+TK_LIB=${PREFIX}/lib/libtk83.so ++TK_LIB=-L${PREFIX}/lib -ltk83 -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 ++MESA_LIB=-L${X11BASE} -lGL # for python you must set this -PYTHON_INCLUDES=-I/home/schroede/montnaro/Python-1.4/Include @@ -27,9 +27,9 @@ # 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 ++USER_CFLAGS = -O2 -D__NO_MATH_INLINES %%PTHREAD_CFLAGS%% ++USER_CXXFLAGS = -O2 -D__NO_MATH_INLINES %%PTHREAD_CFLAGS%% ++X_EXTRA_LIBS = -lstdc++ -lgcc %%PTHREAD_LIBS%% # if you want to try the java support you'll need to set the following # variables to match your environment and uncomment them diff --git a/math/vtk/files/patch-ab b/math/vtk/files/patch-ab index bc1145d31355..a9a85e49c762 100644 --- a/math/vtk/files/patch-ab +++ b/math/vtk/files/patch-ab @@ -13,50 +13,3 @@ else SHLIB_CFLAGS="" SHLIB_LD_LIBS="" -@@ -3393,6 +3393,46 @@ - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - THREAD_LIBS="-lpthread" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -+echo "configure:3191: checking for pthread_create in -lc_r" >&5 -+ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lc_r $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 3199 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char pthread_create(); -+ -+int main() { -+pthread_create() -+; return 0; } -+EOF -+if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ THREAD_LIBS="-lc_r" - else - echo "$ac_t""no" 1>&6 - fi |