+++ /dev/null
---- Python-2.4.1/Include/pythonrun.h.lib64 2005-08-25 14:19:42.000000000 +0200
-+++ Python-2.4.1/Include/pythonrun.h 2005-08-25 14:19:39.000000000 +0200
-@@ -93,6 +93,8 @@
- /* In their own files */
- PyAPI_FUNC(const char *) Py_GetVersion(void);
- PyAPI_FUNC(const char *) Py_GetPlatform(void);
-+PyAPI_FUNC(const char *) Py_GetArch(void);
-+PyAPI_FUNC(const char *) Py_GetLib(void);
- PyAPI_FUNC(const char *) Py_GetCopyright(void);
- PyAPI_FUNC(const char *) Py_GetCompiler(void);
- PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
---- Python-2.4.1/Lib/distutils/command/install.py.lib64 2005-08-25 14:20:10.000000000 +0200
-+++ Python-2.4.1/Lib/distutils/command/install.py 2005-08-25 14:20:09.000000000 +0200
-@@ -19,6 +19,8 @@
- from distutils.errors import DistutilsOptionError
- from glob import glob
-
-+libname = sys.lib
-+
- if sys.version < "2.2":
- WINDOWS_SCHEME = {
- 'purelib': '$base',
-@@ -38,15 +40,15 @@
-
- INSTALL_SCHEMES = {
- 'unix_prefix': {
-- 'purelib': '$base/lib/python$py_version_short/site-packages',
-- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+ 'purelib': '$base/'+libname+'/python$py_version_short/site-packages',
-+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
- 'headers': '$base/include/python$py_version_short/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
- },
- 'unix_home': {
-- 'purelib': '$base/lib/python',
-- 'platlib': '$base/lib/python',
-+ 'purelib': '$base/'+libname+'/python',
-+ 'platlib': '$base/'+libname+'/python',
- 'headers': '$base/include/python/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
---- Python-2.4.1/Lib/distutils/tests/test_install.py.lib64 2005-08-25 14:20:13.000000000 +0200
-+++ Python-2.4.1/Lib/distutils/tests/test_install.py 2005-08-25 14:20:13.000000000 +0200
-@@ -1,6 +1,7 @@
- """Tests for distutils.command.install."""
-
- import os
-+import sys
- import unittest
-
- from distutils.command.install import install
-@@ -38,7 +39,7 @@
- expected = os.path.normpath(expected)
- self.assertEqual(got, expected)
-
-- libdir = os.path.join(destination, "lib", "python")
-+ libdir = os.path.join(destination, sys.lib, "python")
- check_path(cmd.install_lib, libdir)
- check_path(cmd.install_platlib, libdir)
- check_path(cmd.install_purelib, libdir)
---- Python-2.4.1/Lib/distutils/sysconfig.py.lib64 2005-08-25 14:20:13.000000000 +0200
-+++ Python-2.4.1/Lib/distutils/sysconfig.py 2005-08-25 14:20:12.000000000 +0200
-@@ -100,7 +100,7 @@
-
- if os.name == "posix":
- libpython = os.path.join(prefix,
-- "lib", "python" + get_python_version())
-+ sys.lib, "python" + get_python_version())
- if standard_lib:
- return libpython
- else:
---- Python-2.4.1/Lib/site.py.lib64 2005-08-25 14:21:50.000000000 +0200
-+++ Python-2.4.1/Lib/site.py 2005-08-25 14:55:33.000000000 +0200
-@@ -179,12 +179,18 @@
- sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
- elif os.sep == '/':
- sitedirs = [os.path.join(prefix,
-- "lib",
-+ sys.lib,
- "python" + sys.version[:3],
- "site-packages"),
-- os.path.join(prefix, "lib", "site-python")]
-+ os.path.join(prefix, sys.lib, "site-python")]
-+ if sys.lib != 'lib':
-+ sitedirs.append(os.path.join(prefix,
-+ 'lib',
-+ "python" + sys.version[:3],
-+ "site-packages"))
-+ sitedirs.append(os.path.join(prefix, 'lib', "site-python"))
- else:
-- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
-+ sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")]
- if sys.platform == 'darwin':
- # for framework builds *only* we add the standard Apple
- # locations. Currently only per-user, but /Library and
---- Python-2.4.1/Modules/getpath.c.lib64 2005-08-25 14:23:20.000000000 +0200
-+++ Python-2.4.1/Modules/getpath.c 2005-08-25 14:23:06.000000000 +0200
-@@ -111,9 +111,17 @@
- #define EXEC_PREFIX PREFIX
- #endif
-
-+#ifndef LIB_PYTHON
-+#if defined(__x86_64__)
-+#define LIB_PYTHON "lib64/python" VERSION
-+#else
-+#define LIB_PYTHON "lib/python" VERSION
-+#endif
-+#endif
-+
- #ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
-+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
- #endif
-
- #ifndef LANDMARK
-@@ -124,7 +132,7 @@
- static char exec_prefix[MAXPATHLEN+1];
- static char progpath[MAXPATHLEN+1];
- static char *module_search_path = NULL;
--static char lib_python[] = "lib/python" VERSION;
-+static char lib_python[] = LIB_PYTHON;
-
- static void
- reduce(char *dir)
---- Python-2.4.1/Python/getplatform.c.lib64 2005-08-25 14:23:53.000000000 +0200
-+++ Python-2.4.1/Python/getplatform.c 2005-08-25 14:23:47.000000000 +0200
-@@ -10,3 +10,23 @@
- {
- return PLATFORM;
- }
-+
-+#ifndef ARCH
-+#define ARCH "unknown"
-+#endif
-+
-+const char *
-+Py_GetArch(void)
-+{
-+ return ARCH;
-+}
-+
-+#ifndef LIB
-+#define LIB "lib"
-+#endif
-+
-+const char *
-+Py_GetLib(void)
-+{
-+ return LIB;
-+}
---- Python-2.4.1/Python/sysmodule.c.lib64 2005-08-25 14:23:53.000000000 +0200
-+++ Python-2.4.1/Python/sysmodule.c 2005-08-25 14:23:52.000000000 +0200
-@@ -1022,6 +1022,12 @@
- PyDict_SetItemString(sysdict, "platform",
- v = PyString_FromString(Py_GetPlatform()));
- Py_XDECREF(v);
-+ PyDict_SetItemString(sysdict, "arch",
-+ v = PyString_FromString(Py_GetArch()));
-+ Py_XDECREF(v);
-+ PyDict_SetItemString(sysdict, "lib",
-+ v = PyString_FromString(Py_GetLib()));
-+ Py_XDECREF(v);
- PyDict_SetItemString(sysdict, "executable",
- v = PyString_FromString(Py_GetProgramFullPath()));
- Py_XDECREF(v);
---- Python-2.4.1/configure.in.lib64 2005-08-25 14:24:33.000000000 +0200
-+++ Python-2.4.1/configure.in 2005-08-25 14:19:07.000000000 +0200
-@@ -423,6 +423,41 @@
- ;;
- esac
-
-+AC_SUBST(ARCH)
-+AC_MSG_CHECKING(ARCH)
-+ARCH=`uname -m`
-+case $ARCH in
-+i?86) ARCH=i386;;
-+esac
-+AC_MSG_RESULT($ARCH)
-+
-+AC_SUBST(LIB)
-+AC_MSG_CHECKING(LIB)
-+case $ac_sys_system in
-+Linux*)
-+ # Test if the compiler is 64bit
-+ echo 'int i;' > conftest.$ac_ext
-+ python_cv_cc_64bit_output=no
-+ if AC_TRY_EVAL(ac_compile); then
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *"ELF 64"*)
-+ python_cv_cc_64bit_output=yes
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+esac
-+
-+case $ARCH:$python_cv_cc_64bit_output in
-+powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
-+ LIB="lib64"
-+ ;;
-+*:*)
-+ LIB="lib"
-+ ;;
-+esac
-+AC_MSG_RESULT($LIB)
-
- AC_SUBST(LIBRARY)
- AC_MSG_CHECKING(LIBRARY)
---- Python-2.4.1/Makefile.pre.in.lib64 2005-08-25 14:24:35.000000000 +0200
-+++ Python-2.4.1/Makefile.pre.in 2005-08-25 14:19:06.000000000 +0200
-@@ -70,6 +70,8 @@
-
- # Machine-dependent subdirectories
- MACHDEP= @MACHDEP@
-+LIB= @LIB@
-+ARCH= @ARCH@
-
- # Install prefix for architecture-independent files
- prefix= @prefix@
-@@ -79,11 +81,11 @@
-
- # Expanded directories
- BINDIR= $(exec_prefix)/bin
--LIBDIR= $(exec_prefix)/lib
-+LIBDIR= $(exec_prefix)/$(LIB)
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/lib
-+SCRIPTDIR= $(prefix)/$(LIB)
-
- # Detailed destination directories
- BINLIBDEST= $(LIBDIR)/python$(VERSION)
-@@ -458,7 +460,7 @@
- Python/compile.o Python/symtable.o: $(GRAMMAR_H)
-
- Python/getplatform.o: $(srcdir)/Python/getplatform.c
-- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
-+ $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
-
- Python/importdl.o: $(srcdir)/Python/importdl.c
- $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
---- Python-2.4.1/setup.py.lib64 2005-08-25 14:24:35.000000000 +0200
-+++ Python-2.4.1/setup.py 2005-08-25 14:19:07.000000000 +0200
-@@ -259,12 +259,12 @@
- except NameError:
- have_unicode = 0
-
-+ libname = sys.lib
- # lib_dirs and inc_dirs are used to search for files;
- # if a file is found in one of those directories, it can
- # be assumed that no additional -I,-L directives are needed.
- lib_dirs = self.compiler.library_dirs + [
-- '/lib64', '/usr/lib64',
-- '/lib', '/usr/lib',
-+ libname, '/usr/'+libname
- ]
- inc_dirs = self.compiler.include_dirs + ['/usr/include']
- exts = []
-@@ -426,11 +426,11 @@
- elif self.compiler.find_library_file(lib_dirs, 'curses'):
- readline_libs.append('curses')
- elif self.compiler.find_library_file(lib_dirs +
-- ['/usr/lib/termcap'],
-+ ['/usr/'+libname+'/termcap'],
- 'termcap'):
- readline_libs.append('termcap')
- exts.append( Extension('readline', ['readline.c'],
-- library_dirs=['/usr/lib/termcap'],
-+ library_dirs=['/usr/'+libname+'/termcap'],
- libraries=readline_libs) )
- if platform not in ['mac']:
- # crypt module.
-@@ -1017,8 +1017,8 @@
- added_lib_dirs.append('/usr/openwin/lib')
- elif os.path.exists('/usr/X11R6/include'):
- include_dirs.append('/usr/X11R6/include')
-- added_lib_dirs.append('/usr/X11R6/lib64')
-- added_lib_dirs.append('/usr/X11R6/lib')
-+ added_lib_dirs.append('/usr/X11R6/'+sys.lib)
-+ #added_lib_dirs.append('/usr/X11R6/lib')
- elif os.path.exists('/usr/X11R5/include'):
- include_dirs.append('/usr/X11R5/include')
- added_lib_dirs.append('/usr/X11R5/lib')
makedir ${PRODUCT_DIR}
if test `uname -m` = "x86_64" ; then
-export PYTHON_ARCHIVE_PREFIX="-lib64"
-export PYTHON_LIB_PREFIX="64"
-export CFLAGS=-m64
-export CXXFLAGS=-m64
+ export PYTHON_ARCHIVE_PREFIX="-lib64"
+ export PYTHON_LIB_PREFIX="64"
+ export CFLAGS=-m64
+ export CXXFLAGS=-m64
+ PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared CFLAGS=-m64 CXXFLAGS=-m64"
else
-export PYTHON_ARCHIVE_PREFIX=""
+ export PYTHON_ARCHIVE_PREFIX=""
+ PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared"
fi
check_jb tar xfz ${SOURCE_DIR}/Python-2.4.1${PYTHON_ARCHIVE_PREFIX}.tar.gz -C ${INSTALL_WORK}
+# apply patch for 64-bit platforms
if test `uname -m` = "x86_64" ; then
-cp Python-2.4.1-lib64.patch ${PRODUCT_WORK}
-cd ${PRODUCT_WORK}
-patch -p 1 -i Python-2.4.1-lib64.patch
-rm -rf aclocal.m4
-aclocal >& /dev/null
-autoconf >& /dev/null
-aclocal >& /dev/null
-autoconf >& /dev/null
-else
-cd ${PRODUCT_WORK}
+ if [ -f patches/Python-2.4.1-lib64.patch ] ; then
+ cp patches/Python-2.4.1-lib64.patch ${PRODUCT_WORK}
+ ( cd ${PRODUCT_WORK} ; \
+ patch -p1 < Python-2.4.1-lib64.patch ; \
+ rm -rf aclocal.m4 ; \
+ aclocal >& /dev/null ; \
+ autoconf >& /dev/null ; \
+ aclocal >& /dev/null ; \
+ autoconf >& /dev/null )
+ fi
fi
-if test `uname -m` = "x86_64" ; then
-PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared CFLAGS=-m64 CXXFLAGS=-m64"
-else
-PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared"
-fi
+cd ${PRODUCT_WORK}
+
check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
./configure --prefix=${PRODUCT_DIR} $PYTHON_CONFIGURE_OPTIONS
+
# vsr: force linking to libstdc++.so
sed -e 's%\(^LIBS=.*\)%\1 -lstdc++%g' Makefile > _Makefile
mv -f _Makefile Makefile
fi
done
- if test `uname -m` = "x86_64" ; then
- cd ${PRODUCT_DIR}; ln -sf lib64 lib
- fi
+if test `uname -m` = "x86_64" ; then
+ ( cd ${PRODUCT_DIR}; ln -sf lib64 lib )
+fi
#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
makedir ${PRODUCT_DIR}
check_jb tar xfz ${SOURCE_DIR}/cmake-1.6.6.tar.gz -C ${INSTALL_WORK}
+check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_WORK}
+# apply patches for 64-bit platforms
if test `uname -m` = "x86_64" ; then
-cp cmake-1.6.6.patch ${INSTALL_WORK}/cmake-1.6.6
-cd ${INSTALL_WORK}/cmake-1.6.6
-patch -p 1 -i cmake-1.6.6.patch
-else
-cd ${INSTALL_WORK}/cmake-1.6.6
+ if [ -f patches/cmake-1.6.6-lib64.patch ] ; then
+ cp patches/cmake-1.6.6-lib64.patch ${INSTALL_WORK}/cmake-1.6.6
+ ( cd ${INSTALL_WORK}/cmake-1.6.6 ; patch -p1 < cmake-1.6.6-lib64.patch )
+ fi
+ if [ -f patches/vtk-4.2.6-lib64.patch ] ; then
+ cp patches/vtk-4.2.6-lib64.patch ${PRODUCT_WORK}
+ ( cd ${PRODUCT_WORK} ; patch -p1 < vtk-4.2.6-lib64.patch )
+ fi
fi
+cd ${INSTALL_WORK}/cmake-1.6.6
+
check_job ${PRODUCT_DIR}/CONFIGUREcmake.LOG ./configure
cat >> ${PRODUCT_DIR}/MAKEcmake.LOG <<EOF
used gcc=$GCC
EOF
check_job ${PRODUCT_DIR}/MAKEcmake.LOG make
-check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_WORK}
-
-if test `uname -m` = "x86_64" ; then
-cp ${SOURCE_DIR}/../../config_files/vtk-4.2.6.patch ${PRODUCT_WORK}
-cd ${PRODUCT_WORK}
-patch -p 1 -i vtk-4.2.6.patch
-else
cd ${PRODUCT_WORK}
-fi
# apply a small patch for VTK (needed for gcc-3.4)
sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkBMPReader.cxx > IO/vtkBMPReader.cxx.orig
+++ /dev/null
-diff -Naur cmake-1.6.6-original/Modules/FindGLUT.cmake cmake-1.6.6-changed/Modules/FindGLUT.cmake
---- cmake-1.6.6-original/Modules/FindGLUT.cmake 2002-12-03 21:44:50.000000000 +0300
-+++ cmake-1.6.6-changed/Modules/FindGLUT.cmake 2006-10-03 11:19:07.000000000 +0400
-@@ -20,10 +20,10 @@
-
- FIND_LIBRARY( GLUT_glut_LIBRARY glut32
- ${OPENGL_LIBRARY_DIR}
-- /usr/lib
-- /usr/lib/w32api
-- /usr/local/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/lib64/w32api
-+ /usr/local/lib64
-+ /usr/X11R6/lib64
- )
-
-
-@@ -59,28 +59,28 @@
- /usr/X11R6/include
- /usr/include/X11
- /opt/graphics/OpenGL/include
-- /opt/graphics/OpenGL/contrib/libglut
-+ /opt/graphics/OpenGL/contrib/lib64glut
- )
-
- FIND_LIBRARY( GLUT_glut_LIBRARY glut
-- /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
-
- FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
-- /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
-
- FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
-- /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
-
- ENDIF (APPLE)
-diff -Naur cmake-1.6.6-original/Modules/FindGTK.cmake cmake-1.6.6-changed/Modules/FindGTK.cmake
---- cmake-1.6.6-original/Modules/FindGTK.cmake 2003-03-17 18:00:49.000000000 +0300
-+++ cmake-1.6.6-changed/Modules/FindGTK.cmake 2006-10-03 11:19:43.000000000 +0400
-@@ -32,10 +32,10 @@
- /usr/local/include
- /usr/openwin/share/include
- /usr/local/include/glib12
-- /usr/lib/glib/include
-- /usr/local/lib/glib/include
-+ /usr/lib64/glib/include
-+ /usr/local/lib64/glib/include
- /opt/gnome/include
-- /opt/gnome/lib/glib/include
-+ /opt/gnome/lib64/glib/include
- )
-
- FIND_PATH( GTK_glib_INCLUDE_PATH glib.h
-@@ -44,7 +44,7 @@
- /usr/openwin/share/include
- /usr/include/gtk-1.2
- /usr/local/include/glib12
-- /usr/lib/glib/include
-+ /usr/lib64/glib/include
- /usr/include/glib-1.2
- /usr/local/include/glib-1.2
- /opt/gnome/include
-@@ -59,11 +59,11 @@
- )
-
- FIND_LIBRARY( GTK_gtkgl_LIBRARY gtkgl
-- /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /opt/gnome/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /opt/gnome/lib64
- )
-
- #
-@@ -72,38 +72,38 @@
-
- FIND_LIBRARY( GTK_gtk_LIBRARY
- NAMES gtk gtk12
-- PATHS /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /opt/gnome/lib
-+ PATHS /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /opt/gnome/lib64
- )
-
- FIND_LIBRARY( GTK_gdk_LIBRARY
- NAMES gdk gdk12
-- PATHS /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /opt/gnome/lib
-+ PATHS /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /opt/gnome/lib64
- )
-
- FIND_LIBRARY( GTK_gmodule_LIBRARY
- NAMES gmodule gmodule12
-- PATHS /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /opt/gnome/lib
-+ PATHS /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /opt/gnome/lib64
- )
-
- FIND_LIBRARY( GTK_glib_LIBRARY
- NAMES glib glib12
-- PATHS /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /opt/gnome/lib
-+ PATHS /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /opt/gnome/lib64
- )
-
- IF(GTK_gtk_INCLUDE_PATH)
-diff -Naur cmake-1.6.6-original/Modules/FindOpenGL.cmake cmake-1.6.6-changed/Modules/FindOpenGL.cmake
---- cmake-1.6.6-original/Modules/FindOpenGL.cmake 2003-01-15 23:32:14.000000000 +0300
-+++ cmake-1.6.6-changed/Modules/FindOpenGL.cmake 2006-10-03 11:19:52.000000000 +0400
-@@ -30,13 +30,13 @@
- )
-
- FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32
-- /usr/lib
-- /usr/lib/w32api
-+ /usr/lib64
-+ /usr/lib64/w32api
- )
-
- FIND_LIBRARY(OPENGL_glu_LIBRARY glu32
-- /usr/lib
-- /usr/lib/w32api
-+ /usr/lib64
-+ /usr/lib64/w32api
- )
-
- ELSE (CYGWIN)
-@@ -81,11 +81,11 @@
-
- FIND_LIBRARY(OPENGL_gl_LIBRARY
- NAMES MesaGL GL
-- PATHS /usr/lib
-- /usr/local/lib
-- /opt/graphics/OpenGL/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ PATHS /usr/lib64
-+ /usr/local/lib64
-+ /opt/graphics/OpenGL/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
-
- # On Unix OpenGL most certainly always requires X11.
-@@ -102,11 +102,11 @@
- FIND_LIBRARY(OPENGL_glu_LIBRARY
- NAMES MesaGLU GLU
- PATHS ${OPENGL_gl_LIBRARY}
-- /usr/lib
-- /usr/local/lib
-- /opt/graphics/OpenGL/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /opt/graphics/OpenGL/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
-
- ENDIF (WIN32)
-diff -Naur cmake-1.6.6-original/Modules/FindX11.cmake cmake-1.6.6-changed/Modules/FindX11.cmake
---- cmake-1.6.6-original/Modules/FindX11.cmake 2003-01-31 19:40:01.000000000 +0300
-+++ cmake-1.6.6-changed/Modules/FindX11.cmake 2006-10-03 11:20:06.000000000 +0400
-@@ -20,10 +20,10 @@
- )
-
- SET(X11_LIB_SEARCH_PATH
-- /usr/X11R6/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/lib
-+ /usr/X11R6/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/lib64
- )
-
- FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH})
-diff -Naur cmake-1.6.6-original/Modules/Platform/gcc.cmake cmake-1.6.6-changed/Modules/Platform/gcc.cmake
---- cmake-1.6.6-original/Modules/Platform/gcc.cmake 2003-01-22 23:00:08.000000000 +0300
-+++ cmake-1.6.6-changed/Modules/Platform/gcc.cmake 2006-10-12 11:48:38.000000000 +0400
-@@ -3,8 +3,10 @@
- SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os")
- SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O3")
- SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
-+SET (CMAKE_CXX_FLAGS "-m64 -fPIC")
- SET (CMAKE_C_FLAGS_INIT "")
- SET (CMAKE_C_FLAGS_DEBUG_INIT "-g")
- SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os")
- SET (CMAKE_C_FLAGS_RELEASE_INIT "-O3")
- SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
-+SET (CMAKE_C_FLAGS "-m64 -fPIC")
+++ /dev/null
-diff -Naur cmake-1.6.6-original/Modules/FindGLUT.cmake cmake-1.6.6-changed/Modules/FindGLUT.cmake
---- cmake-1.6.6-original/Modules/FindGLUT.cmake 2002-12-03 21:44:50.000000000 +0300
-+++ cmake-1.6.6-changed/Modules/FindGLUT.cmake 2006-10-03 11:19:07.000000000 +0400
-@@ -20,10 +20,10 @@
-
- FIND_LIBRARY( GLUT_glut_LIBRARY glut32
- ${OPENGL_LIBRARY_DIR}
-- /usr/lib
-- /usr/lib/w32api
-- /usr/local/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/lib64/w32api
-+ /usr/local/lib64
-+ /usr/X11R6/lib64
- )
-
-
-@@ -59,28 +59,28 @@
- /usr/X11R6/include
- /usr/include/X11
- /opt/graphics/OpenGL/include
-- /opt/graphics/OpenGL/contrib/libglut
-+ /opt/graphics/OpenGL/contrib/lib64glut
- )
-
- FIND_LIBRARY( GLUT_glut_LIBRARY glut
-- /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
-
- FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
-- /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
-
- FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
-- /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
-
- ENDIF (APPLE)
-diff -Naur cmake-1.6.6-original/Modules/FindGTK.cmake cmake-1.6.6-changed/Modules/FindGTK.cmake
---- cmake-1.6.6-original/Modules/FindGTK.cmake 2003-03-17 18:00:49.000000000 +0300
-+++ cmake-1.6.6-changed/Modules/FindGTK.cmake 2006-10-03 11:19:43.000000000 +0400
-@@ -32,10 +32,10 @@
- /usr/local/include
- /usr/openwin/share/include
- /usr/local/include/glib12
-- /usr/lib/glib/include
-- /usr/local/lib/glib/include
-+ /usr/lib64/glib/include
-+ /usr/local/lib64/glib/include
- /opt/gnome/include
-- /opt/gnome/lib/glib/include
-+ /opt/gnome/lib64/glib/include
- )
-
- FIND_PATH( GTK_glib_INCLUDE_PATH glib.h
-@@ -44,7 +44,7 @@
- /usr/openwin/share/include
- /usr/include/gtk-1.2
- /usr/local/include/glib12
-- /usr/lib/glib/include
-+ /usr/lib64/glib/include
- /usr/include/glib-1.2
- /usr/local/include/glib-1.2
- /opt/gnome/include
-@@ -59,11 +59,11 @@
- )
-
- FIND_LIBRARY( GTK_gtkgl_LIBRARY gtkgl
-- /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /opt/gnome/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /opt/gnome/lib64
- )
-
- #
-@@ -72,38 +72,38 @@
-
- FIND_LIBRARY( GTK_gtk_LIBRARY
- NAMES gtk gtk12
-- PATHS /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /opt/gnome/lib
-+ PATHS /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /opt/gnome/lib64
- )
-
- FIND_LIBRARY( GTK_gdk_LIBRARY
- NAMES gdk gdk12
-- PATHS /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /opt/gnome/lib
-+ PATHS /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /opt/gnome/lib64
- )
-
- FIND_LIBRARY( GTK_gmodule_LIBRARY
- NAMES gmodule gmodule12
-- PATHS /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /opt/gnome/lib
-+ PATHS /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /opt/gnome/lib64
- )
-
- FIND_LIBRARY( GTK_glib_LIBRARY
- NAMES glib glib12
-- PATHS /usr/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /opt/gnome/lib
-+ PATHS /usr/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /opt/gnome/lib64
- )
-
- IF(GTK_gtk_INCLUDE_PATH)
-diff -Naur cmake-1.6.6-original/Modules/FindOpenGL.cmake cmake-1.6.6-changed/Modules/FindOpenGL.cmake
---- cmake-1.6.6-original/Modules/FindOpenGL.cmake 2003-01-15 23:32:14.000000000 +0300
-+++ cmake-1.6.6-changed/Modules/FindOpenGL.cmake 2006-10-03 11:19:52.000000000 +0400
-@@ -30,13 +30,13 @@
- )
-
- FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32
-- /usr/lib
-- /usr/lib/w32api
-+ /usr/lib64
-+ /usr/lib64/w32api
- )
-
- FIND_LIBRARY(OPENGL_glu_LIBRARY glu32
-- /usr/lib
-- /usr/lib/w32api
-+ /usr/lib64
-+ /usr/lib64/w32api
- )
-
- ELSE (CYGWIN)
-@@ -81,11 +81,11 @@
-
- FIND_LIBRARY(OPENGL_gl_LIBRARY
- NAMES MesaGL GL
-- PATHS /usr/lib
-- /usr/local/lib
-- /opt/graphics/OpenGL/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ PATHS /usr/lib64
-+ /usr/local/lib64
-+ /opt/graphics/OpenGL/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
-
- # On Unix OpenGL most certainly always requires X11.
-@@ -102,11 +102,11 @@
- FIND_LIBRARY(OPENGL_glu_LIBRARY
- NAMES MesaGLU GLU
- PATHS ${OPENGL_gl_LIBRARY}
-- /usr/lib
-- /usr/local/lib
-- /opt/graphics/OpenGL/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /opt/graphics/OpenGL/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
-
- ENDIF (WIN32)
-diff -Naur cmake-1.6.6-original/Modules/FindX11.cmake cmake-1.6.6-changed/Modules/FindX11.cmake
---- cmake-1.6.6-original/Modules/FindX11.cmake 2003-01-31 19:40:01.000000000 +0300
-+++ cmake-1.6.6-changed/Modules/FindX11.cmake 2006-10-03 11:20:06.000000000 +0400
-@@ -20,10 +20,10 @@
- )
-
- SET(X11_LIB_SEARCH_PATH
-- /usr/X11R6/lib
-- /usr/local/lib
-- /usr/openwin/lib
-- /usr/lib
-+ /usr/X11R6/lib64
-+ /usr/local/lib64
-+ /usr/openwin/lib64
-+ /usr/lib64
- )
-
- FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH})
+++ /dev/null
-diff -ur netgen-4.5.old/libsrc/makefile.inc netgen-4.5.new/libsrc/makefile.inc
---- netgen-4.5/libsrc/makefile.inc 2006-04-27 13:12:54.000000000 +0400
-+++ netgen-4.5/libsrc/makefile.inc 2006-09-05 14:16:32.000000000 +0400
-@@ -14,7 +14,7 @@
- #
- include $(LIBSRC_DIR)/makefile.mach.$(MACHINE)
- #
--CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \
-+CPLUSPLUSFLAGS1 = -c -m64 -fPIC -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \
- -DOCCGEOMETRY -DOCC52 -DHAVE_IOSTREAM -DHAVE_LIMITS
- #
- ARFLAGS = r
-diff -ur netgen-4.5.old/libsrc/makefile.mach.LINUX64 netgen-4.5.new/libsrc/makefile.mach.LINUX64
---- netgen-4.5/libsrc/makefile.mach.LINUX64 2006-03-29 15:09:32.000000000 +0400
-+++ netgen-4.5/libsrc/makefile.mach.LINUX64 2006-09-07 15:48:39.000000000 +0400
-@@ -11,7 +11,7 @@
- #
- #
- CFLAGS2 =
--CPLUSPLUSFLAGS2 = -pg -march=nocona -O2 -DLINUX -DOPENGL \
-+CPLUSPLUSFLAGS2 = -pg -march=nocona -O2 -DLINUX \
- -ftemplate-depth-99 -finline-limit=100000 \
- -fforce-addr -funroll-loops \
- -DTRAFO -DNGSOLVE -DnoADDON -DnoLAPACK -DnoFAST \
-@@ -23,7 +23,7 @@
- #
- #
-
--LINKFLAGS2 = -pg -L/usr/openwin/lib64 -L/usr/X11R6/lib64 -L/usr/lib/GL3.5 -L/usr/lib64
-+LINKFLAGS2 = -fPIC -pg -L/usr/openwin/lib64 -L/usr/X11R6/lib64 -L/usr/lib/GL3.5 -L/usr/lib64
-
-
- SYSLIB2 = -lstdc++
-diff -ur netgen-4.5.old/Makefile netgen-4.5.new/Makefile
---- netgen-4.5/Makefile 2006-03-29 15:09:12.000000000 +0400
-+++ netgen-4.5/Makefile 2006-09-07 15:46:07.000000000 +0400
-@@ -72,7 +72,7 @@
- #
- #CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -DOPENGL
-
--CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -I./ngsolve/include -Ilibsrc/interface -DOPENGL -I$(METISINC)
-+CPLUSPLUSFLAGS1 = -c -m64 -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -I./ngsolve/include -Ilibsrc/interface -I$(METISINC)
-
- LINKFLAGS1 = -lGL -lGLU -lX11 -lXext -lXmu
- #
check_jb tar xfz ${SOURCE_DIR}/netgen-4.5.tar.gz -C ${INSTALL_WORK}
-if test `uname -m` = "x86_64" ; then
-cp netgen-4.5.patch ${INSTALL_WORK}
-cd ${INSTALL_WORK}
-patch -p 0 -i netgen-4.5.patch
+# apply general patch for SALOME
+if [ -f patches/netgen-4.5-for-SALOME.patch ] ; then
+ cp patches/netgen-4.5-for-SALOME.patch ${PRODUCT_WORK}
+ ( cd ${PRODUCT_WORK}; patch -p1 < netgen-4.5-for-SALOME.patch )
fi
-export MACHINE=LINUX
+# apply patch for 64-bit platforms
+if test `uname -m` = "x86_64" ; then
+ if [ -f patches/netgen-4.5-lib64.patch ] ; then
+ cp patches/netgen-4.5-lib64.patch ${PRODUCT_WORK}
+ ( cd ${PRODUCT_WORK}; patch -p1 < netgen-4.5-lib64.patch )
+ fi
+fi
-# apply general patch for SALOME
+# additional patching for SALOME
(cd ${PRODUCT_WORK}; cp ngtcltk/ngnewdelete.* libsrc/interface)
# apply patch: to make compilable on latest versions of gcc
(cd ${PRODUCT_WORK}/libsrc/meshing; echo -e '16s/^$/class Mesh;\nwq' | ed - meshtype.hpp > /dev/null)
# apply patch: to make compilable with CASCADE-6.1.1
-(cd ${PRODUCT_WORK}/libsrc; sed -e 's%\(.*\)-DHAVE_LIMITS%\1-DHAVE_LIMITS_H%g' makefile.inc > makefile.inc.new; mv makefile.inc.new makefile.inc)
+(cd ${PRODUCT_WORK}/libsrc; sed -e "s%\(.*\)-DHAVE_LIMITS\'%\1-DHAVE_LIMITS_H%g" makefile.inc > makefile.inc.new; mv makefile.inc.new makefile.inc)
+
+# set platform type variable
+if test `uname -m` = "x86_64" ; then
+ export MACHINE=LINUX64
+else
+ export MACHINE=LINUX
+fi
+# compile
for directory in csg general geom2d gprim interface linalg occ meshing opti stlgeom ; do
cd ${PRODUCT_WORK}/libsrc/${directory}
check_job ${PRODUCT_DIR}/MAKE.LOG make
done
-mkdir -p ${PRODUCT_DIR}/lib/LINUX
-cp -f ${PRODUCT_WORK}/lib/LINUX/* ${PRODUCT_DIR}/lib/LINUX
+# install
+mkdir -p ${PRODUCT_DIR}/lib
+cp -f ${PRODUCT_WORK}/lib/${MACHINE}/* ${PRODUCT_DIR}/lib
mkdir -p ${PRODUCT_DIR}/include
cp -f ${PRODUCT_WORK}/libsrc/interface/nglib.h ${PRODUCT_DIR}/include
for directory in csg general geom2d gprim linalg occ meshing opti stlgeom ; do
+++ /dev/null
-diff -Naur omniNotify-orig/include/RDIstrstream.h omniNotify/include/RDIstrstream.h
---- omniNotify/include/RDIstrstream.h 2003-10-12 22:51:15.000000000 +0400
-+++ omniNotify/include/RDIstrstream.h 2006-09-28 17:44:20.000000000 +0400
-@@ -57,8 +57,10 @@
- RDIstrstream& operator<<(const void *p);
- RDIstrstream& operator<<(int n);
- RDIstrstream& operator<<(unsigned int n);
-+#ifndef HAS_LongLong
- RDIstrstream& operator<<(long n);
- RDIstrstream& operator<<(unsigned long n);
-+#endif
- RDIstrstream& operator<<(short n) {return operator<<((int)n);}
- RDIstrstream& operator<<(unsigned short n) {return operator<<((unsigned int)n);}
- #ifdef HAS_LongLong
-diff -Naur omniNotify-orig/include/RDITimeWrappers.h omniNotify/include/RDITimeWrappers.h
---- omniNotify/include/RDITimeWrappers.h 2003-10-23 17:28:18.000000000 +0400
-+++ omniNotify/include/RDITimeWrappers.h 2006-09-28 18:10:41.000000000 +0400
-@@ -236,8 +236,11 @@
- // pretty-printing of absolute local time -- no newline
- void out_local(RDIstrstream& str) {
- CORBA::ULong ts, tn;
-- get_posixbase_secs_nanosecs(ts, tn);
-- RDI_posixbase_out_time(str, ts, tn);
-+ unsigned long ts3, tn3;
-+ get_posixbase_secs_nanosecs(ts3, tn3);
-+ RDI_posixbase_out_time(str, ts3, tn3);
-+ ts = (CORBA::ULong)ts3;
-+ tn = (CORBA::ULong)tn3;
- str << " (local time)";
- }
-
-@@ -396,8 +399,11 @@
- // pretty-printing of absolute univ time -- no newline
- void out_gmt(RDIstrstream& str) {
- CORBA::ULong ts, tn;
-- get_gmt_posixbase_secs_nanosecs(ts, tn);
-- RDI_posixbase_out_time(str, ts, tn);
-+ unsigned long ts4, tn4;
-+ get_gmt_posixbase_secs_nanosecs(ts4, tn4);
-+ RDI_posixbase_out_time(str, ts4, tn4);
-+ ts = (CORBA::ULong)ts4;
-+ tn = (CORBA::ULong)tn4;
- str << " (greenwich mean time)";
- }
- // static helpers for producing TimeBase::UtcT min and max
-diff -Naur omniNotify-orig/lib/RDIstrstream.cc omniNotify/lib/RDIstrstream.cc
---- omniNotify/lib/RDIstrstream.cc 2003-10-23 08:39:12.000000000 +0400
-+++ omniNotify/lib/RDIstrstream.cc 2006-09-28 16:56:03.000000000 +0400
-@@ -175,6 +175,7 @@
- return *this;
- }
-
-+#ifndef HAS_LongLong
- RDIstrstream&
- RDIstrstream::operator<<(long n)
- {
-@@ -194,6 +195,7 @@
- width_fill();
- return *this;
- }
-+#endif
-
- #ifdef HAS_LongLong
- RDIstrstream&
-diff -Naur omniNotify-orig/lib/RDITimeWrappers.cc omniNotify/lib/RDITimeWrappers.cc
---- omniNotify/lib/RDITimeWrappers.cc 2003-10-23 08:39:12.000000000 +0400
-+++ omniNotify/lib/RDITimeWrappers.cc 2006-09-28 16:56:09.000000000 +0400
-@@ -147,7 +147,10 @@
- #define WHATFN "RDI_TimeT::fmt_local"
- const char *RDI_TimeT::fmt_local() {
- CORBA::ULong ts, tm;
-- get_posixbase_secs_msecs(ts, tm);
-+ unsigned long ts2, tm2;
-+ get_posixbase_secs_msecs(ts2, tm2);
-+ ts = (CORBA::ULong)ts2;
-+ tm = (CORBA::ULong)tm2;
- time_t secs_as_time_t = ts;
- TW_SCOPE_LOCK(otime_lock, RDI_out_time_lock, "RDI_out_time", WHATFN);
- RDI_TimeT_fmt_local_buf_idx = (RDI_TimeT_fmt_local_buf_idx + 1) % 10;
-diff -Naur omniNotify/mk/beforeauto.mk.in omniNotify/mk/beforeauto.mk.in
---- omniNotify/mk/beforeauto.mk.in 2003-10-29 22:18:36.000000000 +0300
-+++ omniNotify/mk/beforeauto.mk.in 2006-10-13 16:58:26.000000000 +0400
-@@ -95,9 +95,9 @@
-
- CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS)
-
--CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
-+CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
-
--CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
-+CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
-
-
- #############################################################################
+++ /dev/null
-diff -Naur omniORB-4.0.7-original/mk/beforeauto.mk.in omniORB-4.0.7-changed/mk/beforeauto.mk.in
---- omniORB-4.0.7-original/mk/beforeauto.mk.in 2005-03-22 16:53:41.000000000 +0300
-+++ omniORB-4.0.7-changed/mk/beforeauto.mk.in 2006-10-13 16:26:46.000000000 +0400
-@@ -87,9 +87,9 @@
-
- CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS)
-
--CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
-+CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
-
--CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
-+CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
-
-
- #############################################################################
check_jb tar xfz ${SOURCE_DIR}/omniORBpy-2.7.tar.gz -C ${INSTALL_WORK}
check_jb tar xfz ${SOURCE_DIR}/omniNotify-2.1.tar.gz -C ${INSTALL_WORK}
+# apply patches for 64-bit platforms
if test `uname -m` = "x86_64" ; then
-cp omniORB-4.0.7.patch ${INSTALL_WORK}/omniORB-4.0.7
-cp omniORBpy-2.7.patch ${INSTALL_WORK}/omniORBpy-2.7
-cp omniNotify-2.1.patch ${INSTALL_WORK}/omniNotify
-cd ${INSTALL_WORK}/omniORB-4.0.7
-patch -p 1 -i omniORB-4.0.7.patch
-cd ${INSTALL_WORK}/omniORBpy-2.7
-patch -p 1 -i omniORBpy-2.7.patch
-cd ${INSTALL_WORK}/omniNotify
-patch -p 1 -i omniNotify-2.1.patch
+ if [ -f patches/omniORB-4.0.7-lib64.patch ] ; then
+ cp patches/omniORB-4.0.7-lib64.patch ${INSTALL_WORK}/omniORB-4.0.7
+ ( cd ${INSTALL_WORK}/omniORB-4.0.7 ; patch -p1 < omniORB-4.0.7-lib64.patch )
+ fi
+ if [ -f patches/omniORBpy-2.7-lib64.patch ] ; then
+ cp patches/omniORBpy-2.7-lib64.patch ${INSTALL_WORK}/omniORBpy-2.7
+ ( cd ${INSTALL_WORK}/omniORBpy-2.7 ; patch -p1 < omniORBpy-2.7-lib64.patch )
+ fi
+ if [ -f patches/omniNotify-2.1-lib64.patch ] ; then
+ cp patches/omniNotify-2.1-lib64.patch ${INSTALL_WORK}/omniNotify
+ ( cd ${INSTALL_WORK}/omniNotify ; patch -p1 < omniNotify-2.1-lib64.patch )
+ fi
fi
# install omniORB
+++ /dev/null
-diff -Naur omniORBpy-2.7-original/mk/beforeauto.mk.in omniORBpy-2.7-changed/mk/beforeauto.mk.in
---- omniORBpy-2.7-original/mk/beforeauto.mk.in 2006-01-09 19:26:26.000000000 +0300
-+++ omniORBpy-2.7-changed/mk/beforeauto.mk.in 2006-10-13 16:57:51.000000000 +0400
-@@ -96,9 +96,9 @@
-
- CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS)
-
--CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
-+CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
-
--CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
-+CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
-
-
- #############################################################################
--- /dev/null
+--- Python-2.4.1/Include/pythonrun.h.lib64 2005-08-25 14:19:42.000000000 +0200
++++ Python-2.4.1/Include/pythonrun.h 2005-08-25 14:19:39.000000000 +0200
+@@ -93,6 +93,8 @@
+ /* In their own files */
+ PyAPI_FUNC(const char *) Py_GetVersion(void);
+ PyAPI_FUNC(const char *) Py_GetPlatform(void);
++PyAPI_FUNC(const char *) Py_GetArch(void);
++PyAPI_FUNC(const char *) Py_GetLib(void);
+ PyAPI_FUNC(const char *) Py_GetCopyright(void);
+ PyAPI_FUNC(const char *) Py_GetCompiler(void);
+ PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
+--- Python-2.4.1/Lib/distutils/command/install.py.lib64 2005-08-25 14:20:10.000000000 +0200
++++ Python-2.4.1/Lib/distutils/command/install.py 2005-08-25 14:20:09.000000000 +0200
+@@ -19,6 +19,8 @@
+ from distutils.errors import DistutilsOptionError
+ from glob import glob
+
++libname = sys.lib
++
+ if sys.version < "2.2":
+ WINDOWS_SCHEME = {
+ 'purelib': '$base',
+@@ -38,15 +40,15 @@
+
+ INSTALL_SCHEMES = {
+ 'unix_prefix': {
+- 'purelib': '$base/lib/python$py_version_short/site-packages',
+- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
++ 'purelib': '$base/'+libname+'/python$py_version_short/site-packages',
++ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
+ 'headers': '$base/include/python$py_version_short/$dist_name',
+ 'scripts': '$base/bin',
+ 'data' : '$base',
+ },
+ 'unix_home': {
+- 'purelib': '$base/lib/python',
+- 'platlib': '$base/lib/python',
++ 'purelib': '$base/'+libname+'/python',
++ 'platlib': '$base/'+libname+'/python',
+ 'headers': '$base/include/python/$dist_name',
+ 'scripts': '$base/bin',
+ 'data' : '$base',
+--- Python-2.4.1/Lib/distutils/tests/test_install.py.lib64 2005-08-25 14:20:13.000000000 +0200
++++ Python-2.4.1/Lib/distutils/tests/test_install.py 2005-08-25 14:20:13.000000000 +0200
+@@ -1,6 +1,7 @@
+ """Tests for distutils.command.install."""
+
+ import os
++import sys
+ import unittest
+
+ from distutils.command.install import install
+@@ -38,7 +39,7 @@
+ expected = os.path.normpath(expected)
+ self.assertEqual(got, expected)
+
+- libdir = os.path.join(destination, "lib", "python")
++ libdir = os.path.join(destination, sys.lib, "python")
+ check_path(cmd.install_lib, libdir)
+ check_path(cmd.install_platlib, libdir)
+ check_path(cmd.install_purelib, libdir)
+--- Python-2.4.1/Lib/distutils/sysconfig.py.lib64 2005-08-25 14:20:13.000000000 +0200
++++ Python-2.4.1/Lib/distutils/sysconfig.py 2005-08-25 14:20:12.000000000 +0200
+@@ -100,7 +100,7 @@
+
+ if os.name == "posix":
+ libpython = os.path.join(prefix,
+- "lib", "python" + get_python_version())
++ sys.lib, "python" + get_python_version())
+ if standard_lib:
+ return libpython
+ else:
+--- Python-2.4.1/Lib/site.py.lib64 2005-08-25 14:21:50.000000000 +0200
++++ Python-2.4.1/Lib/site.py 2005-08-25 14:55:33.000000000 +0200
+@@ -179,12 +179,18 @@
+ sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
+ elif os.sep == '/':
+ sitedirs = [os.path.join(prefix,
+- "lib",
++ sys.lib,
+ "python" + sys.version[:3],
+ "site-packages"),
+- os.path.join(prefix, "lib", "site-python")]
++ os.path.join(prefix, sys.lib, "site-python")]
++ if sys.lib != 'lib':
++ sitedirs.append(os.path.join(prefix,
++ 'lib',
++ "python" + sys.version[:3],
++ "site-packages"))
++ sitedirs.append(os.path.join(prefix, 'lib', "site-python"))
+ else:
+- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
++ sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")]
+ if sys.platform == 'darwin':
+ # for framework builds *only* we add the standard Apple
+ # locations. Currently only per-user, but /Library and
+--- Python-2.4.1/Modules/getpath.c.lib64 2005-08-25 14:23:20.000000000 +0200
++++ Python-2.4.1/Modules/getpath.c 2005-08-25 14:23:06.000000000 +0200
+@@ -111,9 +111,17 @@
+ #define EXEC_PREFIX PREFIX
+ #endif
+
++#ifndef LIB_PYTHON
++#if defined(__x86_64__)
++#define LIB_PYTHON "lib64/python" VERSION
++#else
++#define LIB_PYTHON "lib/python" VERSION
++#endif
++#endif
++
+ #ifndef PYTHONPATH
+-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
+- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
++#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
++ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
+ #endif
+
+ #ifndef LANDMARK
+@@ -124,7 +132,7 @@
+ static char exec_prefix[MAXPATHLEN+1];
+ static char progpath[MAXPATHLEN+1];
+ static char *module_search_path = NULL;
+-static char lib_python[] = "lib/python" VERSION;
++static char lib_python[] = LIB_PYTHON;
+
+ static void
+ reduce(char *dir)
+--- Python-2.4.1/Python/getplatform.c.lib64 2005-08-25 14:23:53.000000000 +0200
++++ Python-2.4.1/Python/getplatform.c 2005-08-25 14:23:47.000000000 +0200
+@@ -10,3 +10,23 @@
+ {
+ return PLATFORM;
+ }
++
++#ifndef ARCH
++#define ARCH "unknown"
++#endif
++
++const char *
++Py_GetArch(void)
++{
++ return ARCH;
++}
++
++#ifndef LIB
++#define LIB "lib"
++#endif
++
++const char *
++Py_GetLib(void)
++{
++ return LIB;
++}
+--- Python-2.4.1/Python/sysmodule.c.lib64 2005-08-25 14:23:53.000000000 +0200
++++ Python-2.4.1/Python/sysmodule.c 2005-08-25 14:23:52.000000000 +0200
+@@ -1022,6 +1022,12 @@
+ PyDict_SetItemString(sysdict, "platform",
+ v = PyString_FromString(Py_GetPlatform()));
+ Py_XDECREF(v);
++ PyDict_SetItemString(sysdict, "arch",
++ v = PyString_FromString(Py_GetArch()));
++ Py_XDECREF(v);
++ PyDict_SetItemString(sysdict, "lib",
++ v = PyString_FromString(Py_GetLib()));
++ Py_XDECREF(v);
+ PyDict_SetItemString(sysdict, "executable",
+ v = PyString_FromString(Py_GetProgramFullPath()));
+ Py_XDECREF(v);
+--- Python-2.4.1/configure.in.lib64 2005-08-25 14:24:33.000000000 +0200
++++ Python-2.4.1/configure.in 2005-08-25 14:19:07.000000000 +0200
+@@ -423,6 +423,41 @@
+ ;;
+ esac
+
++AC_SUBST(ARCH)
++AC_MSG_CHECKING(ARCH)
++ARCH=`uname -m`
++case $ARCH in
++i?86) ARCH=i386;;
++esac
++AC_MSG_RESULT($ARCH)
++
++AC_SUBST(LIB)
++AC_MSG_CHECKING(LIB)
++case $ac_sys_system in
++Linux*)
++ # Test if the compiler is 64bit
++ echo 'int i;' > conftest.$ac_ext
++ python_cv_cc_64bit_output=no
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.$ac_objext` in
++ *"ELF 64"*)
++ python_cv_cc_64bit_output=yes
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
++esac
++
++case $ARCH:$python_cv_cc_64bit_output in
++powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
++ LIB="lib64"
++ ;;
++*:*)
++ LIB="lib"
++ ;;
++esac
++AC_MSG_RESULT($LIB)
+
+ AC_SUBST(LIBRARY)
+ AC_MSG_CHECKING(LIBRARY)
+--- Python-2.4.1/Makefile.pre.in.lib64 2005-08-25 14:24:35.000000000 +0200
++++ Python-2.4.1/Makefile.pre.in 2005-08-25 14:19:06.000000000 +0200
+@@ -70,6 +70,8 @@
+
+ # Machine-dependent subdirectories
+ MACHDEP= @MACHDEP@
++LIB= @LIB@
++ARCH= @ARCH@
+
+ # Install prefix for architecture-independent files
+ prefix= @prefix@
+@@ -79,11 +81,11 @@
+
+ # Expanded directories
+ BINDIR= $(exec_prefix)/bin
+-LIBDIR= $(exec_prefix)/lib
++LIBDIR= $(exec_prefix)/$(LIB)
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
+-SCRIPTDIR= $(prefix)/lib
++SCRIPTDIR= $(prefix)/$(LIB)
+
+ # Detailed destination directories
+ BINLIBDEST= $(LIBDIR)/python$(VERSION)
+@@ -458,7 +460,7 @@
+ Python/compile.o Python/symtable.o: $(GRAMMAR_H)
+
+ Python/getplatform.o: $(srcdir)/Python/getplatform.c
+- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
++ $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
+
+ Python/importdl.o: $(srcdir)/Python/importdl.c
+ $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
+--- Python-2.4.1/setup.py.lib64 2005-08-25 14:24:35.000000000 +0200
++++ Python-2.4.1/setup.py 2005-08-25 14:19:07.000000000 +0200
+@@ -259,12 +259,12 @@
+ except NameError:
+ have_unicode = 0
+
++ libname = sys.lib
+ # lib_dirs and inc_dirs are used to search for files;
+ # if a file is found in one of those directories, it can
+ # be assumed that no additional -I,-L directives are needed.
+ lib_dirs = self.compiler.library_dirs + [
+- '/lib64', '/usr/lib64',
+- '/lib', '/usr/lib',
++ libname, '/usr/'+libname
+ ]
+ inc_dirs = self.compiler.include_dirs + ['/usr/include']
+ exts = []
+@@ -426,11 +426,11 @@
+ elif self.compiler.find_library_file(lib_dirs, 'curses'):
+ readline_libs.append('curses')
+ elif self.compiler.find_library_file(lib_dirs +
+- ['/usr/lib/termcap'],
++ ['/usr/'+libname+'/termcap'],
+ 'termcap'):
+ readline_libs.append('termcap')
+ exts.append( Extension('readline', ['readline.c'],
+- library_dirs=['/usr/lib/termcap'],
++ library_dirs=['/usr/'+libname+'/termcap'],
+ libraries=readline_libs) )
+ if platform not in ['mac']:
+ # crypt module.
+@@ -1017,8 +1017,8 @@
+ added_lib_dirs.append('/usr/openwin/lib')
+ elif os.path.exists('/usr/X11R6/include'):
+ include_dirs.append('/usr/X11R6/include')
+- added_lib_dirs.append('/usr/X11R6/lib64')
+- added_lib_dirs.append('/usr/X11R6/lib')
++ added_lib_dirs.append('/usr/X11R6/'+sys.lib)
++ #added_lib_dirs.append('/usr/X11R6/lib')
+ elif os.path.exists('/usr/X11R5/include'):
+ include_dirs.append('/usr/X11R5/include')
+ added_lib_dirs.append('/usr/X11R5/lib')
--- /dev/null
+diff -Naur cmake-1.6.6-original/Modules/FindGLUT.cmake cmake-1.6.6-changed/Modules/FindGLUT.cmake
+--- cmake-1.6.6-original/Modules/FindGLUT.cmake 2002-12-03 21:44:50.000000000 +0300
++++ cmake-1.6.6-changed/Modules/FindGLUT.cmake 2006-10-03 11:19:07.000000000 +0400
+@@ -20,10 +20,10 @@
+
+ FIND_LIBRARY( GLUT_glut_LIBRARY glut32
+ ${OPENGL_LIBRARY_DIR}
+- /usr/lib
+- /usr/lib/w32api
+- /usr/local/lib
+- /usr/X11R6/lib
++ /usr/lib64
++ /usr/lib64/w32api
++ /usr/local/lib64
++ /usr/X11R6/lib64
+ )
+
+
+@@ -59,28 +59,28 @@
+ /usr/X11R6/include
+ /usr/include/X11
+ /opt/graphics/OpenGL/include
+- /opt/graphics/OpenGL/contrib/libglut
++ /opt/graphics/OpenGL/contrib/lib64glut
+ )
+
+ FIND_LIBRARY( GLUT_glut_LIBRARY glut
+- /usr/lib
+- /usr/local/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
++ /usr/lib64
++ /usr/local/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
+ )
+
+ FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
+- /usr/lib
+- /usr/local/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
++ /usr/lib64
++ /usr/local/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
+ )
+
+ FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
+- /usr/lib
+- /usr/local/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
++ /usr/lib64
++ /usr/local/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
+ )
+
+ ENDIF (APPLE)
+diff -Naur cmake-1.6.6-original/Modules/FindGTK.cmake cmake-1.6.6-changed/Modules/FindGTK.cmake
+--- cmake-1.6.6-original/Modules/FindGTK.cmake 2003-03-17 18:00:49.000000000 +0300
++++ cmake-1.6.6-changed/Modules/FindGTK.cmake 2006-10-03 11:19:43.000000000 +0400
+@@ -32,10 +32,10 @@
+ /usr/local/include
+ /usr/openwin/share/include
+ /usr/local/include/glib12
+- /usr/lib/glib/include
+- /usr/local/lib/glib/include
++ /usr/lib64/glib/include
++ /usr/local/lib64/glib/include
+ /opt/gnome/include
+- /opt/gnome/lib/glib/include
++ /opt/gnome/lib64/glib/include
+ )
+
+ FIND_PATH( GTK_glib_INCLUDE_PATH glib.h
+@@ -44,7 +44,7 @@
+ /usr/openwin/share/include
+ /usr/include/gtk-1.2
+ /usr/local/include/glib12
+- /usr/lib/glib/include
++ /usr/lib64/glib/include
+ /usr/include/glib-1.2
+ /usr/local/include/glib-1.2
+ /opt/gnome/include
+@@ -59,11 +59,11 @@
+ )
+
+ FIND_LIBRARY( GTK_gtkgl_LIBRARY gtkgl
+- /usr/lib
+- /usr/local/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
+- /opt/gnome/lib
++ /usr/lib64
++ /usr/local/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
++ /opt/gnome/lib64
+ )
+
+ #
+@@ -72,38 +72,38 @@
+
+ FIND_LIBRARY( GTK_gtk_LIBRARY
+ NAMES gtk gtk12
+- PATHS /usr/lib
+- /usr/local/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
+- /opt/gnome/lib
++ PATHS /usr/lib64
++ /usr/local/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
++ /opt/gnome/lib64
+ )
+
+ FIND_LIBRARY( GTK_gdk_LIBRARY
+ NAMES gdk gdk12
+- PATHS /usr/lib
+- /usr/local/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
+- /opt/gnome/lib
++ PATHS /usr/lib64
++ /usr/local/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
++ /opt/gnome/lib64
+ )
+
+ FIND_LIBRARY( GTK_gmodule_LIBRARY
+ NAMES gmodule gmodule12
+- PATHS /usr/lib
+- /usr/local/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
+- /opt/gnome/lib
++ PATHS /usr/lib64
++ /usr/local/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
++ /opt/gnome/lib64
+ )
+
+ FIND_LIBRARY( GTK_glib_LIBRARY
+ NAMES glib glib12
+- PATHS /usr/lib
+- /usr/local/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
+- /opt/gnome/lib
++ PATHS /usr/lib64
++ /usr/local/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
++ /opt/gnome/lib64
+ )
+
+ IF(GTK_gtk_INCLUDE_PATH)
+diff -Naur cmake-1.6.6-original/Modules/FindOpenGL.cmake cmake-1.6.6-changed/Modules/FindOpenGL.cmake
+--- cmake-1.6.6-original/Modules/FindOpenGL.cmake 2003-01-15 23:32:14.000000000 +0300
++++ cmake-1.6.6-changed/Modules/FindOpenGL.cmake 2006-10-03 11:19:52.000000000 +0400
+@@ -30,13 +30,13 @@
+ )
+
+ FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32
+- /usr/lib
+- /usr/lib/w32api
++ /usr/lib64
++ /usr/lib64/w32api
+ )
+
+ FIND_LIBRARY(OPENGL_glu_LIBRARY glu32
+- /usr/lib
+- /usr/lib/w32api
++ /usr/lib64
++ /usr/lib64/w32api
+ )
+
+ ELSE (CYGWIN)
+@@ -81,11 +81,11 @@
+
+ FIND_LIBRARY(OPENGL_gl_LIBRARY
+ NAMES MesaGL GL
+- PATHS /usr/lib
+- /usr/local/lib
+- /opt/graphics/OpenGL/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
++ PATHS /usr/lib64
++ /usr/local/lib64
++ /opt/graphics/OpenGL/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
+ )
+
+ # On Unix OpenGL most certainly always requires X11.
+@@ -102,11 +102,11 @@
+ FIND_LIBRARY(OPENGL_glu_LIBRARY
+ NAMES MesaGLU GLU
+ PATHS ${OPENGL_gl_LIBRARY}
+- /usr/lib
+- /usr/local/lib
+- /opt/graphics/OpenGL/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
++ /usr/lib64
++ /usr/local/lib64
++ /opt/graphics/OpenGL/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
+ )
+
+ ENDIF (WIN32)
+diff -Naur cmake-1.6.6-original/Modules/FindX11.cmake cmake-1.6.6-changed/Modules/FindX11.cmake
+--- cmake-1.6.6-original/Modules/FindX11.cmake 2003-01-31 19:40:01.000000000 +0300
++++ cmake-1.6.6-changed/Modules/FindX11.cmake 2006-10-03 11:20:06.000000000 +0400
+@@ -20,10 +20,10 @@
+ )
+
+ SET(X11_LIB_SEARCH_PATH
+- /usr/X11R6/lib
+- /usr/local/lib
+- /usr/openwin/lib
+- /usr/lib
++ /usr/X11R6/lib64
++ /usr/local/lib64
++ /usr/openwin/lib64
++ /usr/lib64
+ )
+
+ FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH})
+diff -Naur cmake-1.6.6-original/Modules/Platform/gcc.cmake cmake-1.6.6-changed/Modules/Platform/gcc.cmake
+--- cmake-1.6.6-original/Modules/Platform/gcc.cmake 2003-01-22 23:00:08.000000000 +0300
++++ cmake-1.6.6-changed/Modules/Platform/gcc.cmake 2006-10-12 11:48:38.000000000 +0400
+@@ -3,8 +3,10 @@
+ SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os")
+ SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O3")
+ SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
++SET (CMAKE_CXX_FLAGS "-m64 -fPIC")
+ SET (CMAKE_C_FLAGS_INIT "")
+ SET (CMAKE_C_FLAGS_DEBUG_INIT "-g")
+ SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os")
+ SET (CMAKE_C_FLAGS_RELEASE_INIT "-O3")
+ SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
++SET (CMAKE_C_FLAGS "-m64 -fPIC")
--- /dev/null
+diff -Nru netgen-4.5_orig/libsrc/csg/meshsurf.cpp netgen-4.5_patch/libsrc/csg/meshsurf.cpp
+--- netgen-4.5_orig/libsrc/csg/meshsurf.cpp 2006-02-14 10:54:35.000000000 +0300
++++ netgen-4.5_patch/libsrc/csg/meshsurf.cpp 2006-10-25 16:05:59.000000000 +0400
+@@ -77,11 +77,12 @@
+ }
+
+
+-void MeshOptimize2dSurfaces :: ProjectPoint (INDEX surfind, Point3d & p) const
++bool MeshOptimize2dSurfaces :: ProjectPoint (INDEX surfind, Point3d & p) const
+ {
+ Point<3> hp = p;
+ geometry.GetSurface(surfind)->Project (hp);
+ p = hp;
++ return true;
+ }
+
+ void MeshOptimize2dSurfaces :: ProjectPoint2 (INDEX surfind, INDEX surfind2,
+diff -Nru netgen-4.5_orig/libsrc/csg/meshsurf.hpp netgen-4.5_patch/libsrc/csg/meshsurf.hpp
+--- netgen-4.5_orig/libsrc/csg/meshsurf.hpp 2004-01-20 13:49:44.000000000 +0300
++++ netgen-4.5_patch/libsrc/csg/meshsurf.hpp 2006-10-25 16:08:05.000000000 +0400
+@@ -45,7 +45,7 @@
+ MeshOptimize2dSurfaces (const CSGeometry & ageometry);
+
+ ///
+- virtual void ProjectPoint (INDEX surfind, Point3d & p) const;
++ virtual bool ProjectPoint (INDEX surfind, Point3d & p) const;
+ ///
+ virtual void ProjectPoint2 (INDEX surfind, INDEX surfind2, Point3d & p) const;
+ ///
+diff -Nru netgen-4.5_orig/libsrc/interface/Makefile netgen-4.5_patch/libsrc/interface/Makefile
+--- netgen-4.5_orig/libsrc/interface/Makefile 2005-08-09 18:14:59.000000000 +0400
++++ netgen-4.5_patch/libsrc/interface/Makefile 2006-04-27 13:12:54.000000000 +0400
+@@ -1,4 +1,5 @@
+-src = nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp writejcm.cpp readuser.cpp importsolution.cpp
++#src = nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp writejcm.cpp readuser.cpp importsolution.cpp
++src = writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp writejcm.cpp readuser.cpp nglib.cpp ngnewdelete.cpp
+ #
+ lib = nginterface
+ libpath = libsrc/interface
+diff -Nru netgen-4.5_orig/libsrc/interface/nglib.cpp netgen-4.5_patch/libsrc/interface/nglib.cpp
+--- netgen-4.5_orig/libsrc/interface/nglib.cpp 2005-10-18 17:53:18.000000000 +0400
++++ netgen-4.5_patch/libsrc/interface/nglib.cpp 2006-04-27 13:12:54.000000000 +0400
+@@ -56,7 +56,8 @@
+
+ void Ng_Exit ()
+ {
+- ;
++ delete testout;
++ testout = NULL;
+ }
+
+
+diff -Nru netgen-4.5_orig/libsrc/makefile.inc netgen-4.5_patch/libsrc/makefile.inc
+--- netgen-4.5_orig/libsrc/makefile.inc 2005-09-02 17:17:51.000000000 +0400
++++ netgen-4.5_patch/libsrc/makefile.inc 2006-10-26 09:33:58.000000000 +0400
+@@ -8,17 +8,14 @@
+ LIBSRC_DIR=$(CPP_DIR)/libsrc
+ LIB_DIR=$(CPP_DIR)/lib/$(MACHINE)
+
+-#OCC_DIR=../../occ
+-#OCCINC_DIR=$(OCC_DIR)/inc
+-#OCCLIB_DIR=$(OCC_DIR)/lib
+-# OCC_DIR=/opt/OpenCASCADE5.2/ros
+-# OCC_DIR=/home/joachim/download/occ/Linux
+-# OCCINC_DIR=$(OCC_DIR)/inc -I$(OCC_DIR)/ros/inc
+-# OCCLIB_DIR=$(OCC_DIR)/Linux/lib
++OCC_DIR=$(CASROOT)
++OCCINC_DIR=$(OCC_DIR)/inc
++OCCLIB_DIR=$(OCC_DIR)/Linux/lib
+ #
+ include $(LIBSRC_DIR)/makefile.mach.$(MACHINE)
+ #
+-CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR)
++CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \
++ -DOCCGEOMETRY -DOCC52 -DHAVE_IOSTREAM -DHAVE_LIMITS_H
+ #
+ ARFLAGS = r
+ #
+diff -Nru netgen-4.5_orig/libsrc/makefile.mach.LINUX netgen-4.5_patch/libsrc/makefile.mach.LINUX
+--- netgen-4.5_orig/libsrc/makefile.mach.LINUX 2004-10-11 23:49:26.000000000 +0400
++++ netgen-4.5_patch/libsrc/makefile.mach.LINUX 2006-04-27 13:12:54.000000000 +0400
+@@ -16,7 +16,7 @@
+ #
+ CFLAGS2 =
+
+-CPLUSPLUSFLAGS2 = -O2 -I/usr/include/GL3.5 -DLINUX -DOPENGL \
++CPLUSPLUSFLAGS2 = -O2 -I/usr/include/GL3.5 -DLINUX \
+ -ftemplate-depth-99 -finline-limit=10000 \
+ -Wdisabled-optimization -funroll-loops -DnoNGSOLVE
+
+diff -Nru netgen-4.5_orig/libsrc/meshing/improve2.cpp netgen-4.5_patch/libsrc/meshing/improve2.cpp
+--- netgen-4.5_orig/libsrc/meshing/improve2.cpp 2006-01-11 18:08:19.000000000 +0300
++++ netgen-4.5_patch/libsrc/meshing/improve2.cpp 2006-04-27 13:12:54.000000000 +0400
+@@ -4,7 +4,7 @@
+ #include <opti.hpp>
+
+ #ifndef SMALLLIB
+-#include <visual.hpp>
++//#include <visual.hpp>
+ #endif
+
+ namespace netgen
+diff -Nru netgen-4.5_orig/libsrc/meshing/improve2.hpp netgen-4.5_patch/libsrc/meshing/improve2.hpp
+--- netgen-4.5_orig/libsrc/meshing/improve2.hpp 2004-10-12 23:22:55.000000000 +0400
++++ netgen-4.5_patch/libsrc/meshing/improve2.hpp 2006-10-25 16:09:37.000000000 +0400
+@@ -32,17 +32,16 @@
+ ///
+ virtual void SelectSurfaceOfPoint (const Point3d & p,
+ const PointGeomInfo & gi);
+- ///
+- virtual void ProjectPoint (INDEX /* surfind */, Point3d & /* p */) const { };
++
++ /// project point on surface, returns true if success
++ virtual bool ProjectPoint (INDEX /* surfind */, Point3d & /* p */) const { return false; }
++ /// fast project point on surface using point geom info of a neighboring point
++ /// if gi.trignum != 0,
++ /// returns true if success, gi is updated
++ virtual bool ProjectPoint (INDEX surfind, Point3d & p, PointGeomInfo& gi) const
++ { gi.trignum = 1; return ProjectPoint (surfind, p); }
+ ///
+ virtual void ProjectPoint2 (INDEX /* surfind */, INDEX /* surfind2 */, Point3d & /* p */) const { };
+- /// liefert zu einem 3d-Punkt die geominfo (Dreieck) und liefert 1, wenn erfolgreich,
+- /// 0, wenn nicht (Punkt ausserhalb von chart)
+- virtual int CalcPointGeomInfo(PointGeomInfo& gi, const Point3d& /*p3*/) const
+- { gi.trignum = 1; return 1;};
+-
+- virtual int CalcPointGeomInfo(int /* surfind */, PointGeomInfo& gi, const Point3d& p3) const
+- { return CalcPointGeomInfo (gi, p3); }
+
+ ///
+ virtual void GetNormalVector(INDEX surfind, const Point3d & p, PointGeomInfo & gi, Vec3d & n) const;
+diff -Nru netgen-4.5_orig/libsrc/meshing/smoothing2.cpp netgen-4.5_patch/libsrc/meshing/smoothing2.cpp
+--- netgen-4.5_orig/libsrc/meshing/smoothing2.cpp 2006-01-11 18:08:20.000000000 +0300
++++ netgen-4.5_patch/libsrc/meshing/smoothing2.cpp 2006-10-25 16:10:46.000000000 +0400
+@@ -300,7 +300,7 @@
+ double Opti2SurfaceMinFunction ::
+ FuncGrad (const Vector & x, Vector & grad) const
+ {
+- Vec3d n, vgrad;
++ Vec3d vgrad;
+ Point3d pp1;
+ double g1x, g1y;
+ double badness, hbadness;
+@@ -308,8 +308,6 @@
+ vgrad = 0;
+ badness = 0;
+
+- meshthis -> GetNormalVector (surfi, sp1, gi1, n);
+-
+ pp1 = sp1;
+ pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
+
+@@ -360,7 +358,7 @@
+ double Opti2SurfaceMinFunction ::
+ FuncDeriv (const Vector & x, const Vector & dir, double & deriv) const
+ {
+- Vec3d n, vgrad;
++ Vec3d vgrad;
+ Point3d pp1;
+ double g1x, g1y;
+ double badness, hbadness;
+@@ -368,8 +366,6 @@
+ vgrad = 0;
+ badness = 0;
+
+- meshthis -> GetNormalVector (surfi, sp1, gi1, n);
+-
+ pp1 = sp1;
+ pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
+
+@@ -520,7 +516,7 @@
+ // from 2d:
+
+ int j, k, lpi, gpi;
+- Vec3d n, vgrad;
++ Vec3d vgrad;
+ Point3d pp1;
+ Vec2d g1, vdir;
+ double badness, hbadness, hbad, hderiv;
+@@ -528,8 +524,6 @@
+ vgrad = 0;
+ badness = 0;
+
+- meshthis -> GetNormalVector (surfi, sp1, gi1, n);
+-
+ pp1 = sp1;
+ pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
+
+@@ -593,7 +587,7 @@
+ // from 2d:
+
+ int j, k, lpi, gpi;
+- Vec3d n, vgrad;
++ Vec3d vgrad;
+ Point3d pp1;
+ Vec2d g1, vdir;
+ double badness, hbadness, hbad, hderiv;
+@@ -601,8 +595,6 @@
+ vgrad = 0;
+ badness = 0;
+
+- meshthis -> GetNormalVector (surfi, sp1, gi1, n);
+-
+ pp1 = sp1;
+ pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
+
+@@ -859,19 +851,21 @@
+ locelements.SetSize(0);
+ locrots.SetSize (0);
+ lochs.SetSize (0);
++ ngi.trignum = 0;
+
+ for (j = 0; j < elementsonpoint[pi].Size(); j++)
+ {
+ sei = elementsonpoint[pi][j];
+ const Element2d & bel = mesh[sei];
+ surfi = mesh.GetFaceDescriptor(bel.GetIndex()).SurfNr();
+-
++
+ locelements.Append (sei);
+
+ for (k = 1; k <= bel.GetNP(); k++)
+ if (bel.PNum(k) == pi)
+ {
+ locrots.Append (k);
++ ngi = bel.GeomInfoPi(k);
+ break;
+ }
+
+@@ -942,7 +936,7 @@
+ }
+
+ //optimizer loop (if not whole distance is not possible, move only a bit!!!!)
+- while (loci <= 5 && !moveisok)
++ while (loci <= 5 && !moveisok)
+ {
+ loci ++;
+ mesh[pi].X() = origp.X() + (x.Get(1) * t1.X() + x.Get(2) * t2.X())*fact;
+@@ -951,11 +945,9 @@
+ fact = fact/2.;
+
+
+- ProjectPoint (surfi, mesh[pi]);
++ moveisok = ProjectPoint (surfi, mesh[pi], ngi);
+
+- moveisok = CalcPointGeomInfo(surfi, ngi, mesh[pi]);
+- // point lies on same chart in stlsurface
+-
++ // point lies on same chart in stlsurface
+ if (moveisok)
+ {
+ for (j = 0; j < locelements.Size(); j++)
+diff -Nru netgen-4.5_orig/libsrc/occ/occconstruction.cpp netgen-4.5_patch/libsrc/occ/occconstruction.cpp
+--- netgen-4.5_orig/libsrc/occ/occconstruction.cpp 2005-12-06 17:15:53.000000000 +0300
++++ netgen-4.5_patch/libsrc/occ/occconstruction.cpp 2006-04-27 13:12:54.000000000 +0400
+@@ -28,8 +28,8 @@
+ #include <BRepAlgoAPI_Common.hxx>
+ #include <BRepAlgoAPI_Fuse.hxx>
+ #include <BRepAlgoAPI_Section.hxx>
+-#include <BRepOffsetAPI_Sewing.hxx>
+-#include <BRepAlgo_Sewing.hxx>
++//#include <BRepOffsetAPI_Sewing.hxx>
++//#include <BRepAlgo_Sewing.hxx>
+ #include <BRepOffsetAPI_MakeOffsetShape.hxx>
+ #include <ShapeFix_Shape.hxx>
+ namespace netgen
+diff -Nru netgen-4.5_orig/libsrc/occ/occgenmesh.cpp netgen-4.5_patch/libsrc/occ/occgenmesh.cpp
+--- netgen-4.5_orig/libsrc/occ/occgenmesh.cpp 2006-02-07 12:12:48.000000000 +0300
++++ netgen-4.5_patch/libsrc/occ/occgenmesh.cpp 2006-10-25 16:14:48.000000000 +0400
+@@ -28,7 +28,7 @@
+ return Point<3> (p.X(), p.Y(), p.Z());
+ }
+
+- void DivideEdge (TopoDS_Edge & edge,
++ static void DivideEdge (TopoDS_Edge & edge,
+ ARRAY<MeshPoint> & ps,
+ ARRAY<double> & params,
+ Mesh & mesh)
+@@ -49,23 +49,19 @@
+ hvalue[0] = 0;
+ pnt = c->Value(s0);
+
+- double olddist = 0;
+- double dist = 0;
+-
+- for (int i = 1; i <= DIVIDEEDGESECTIONS; i++)
++ int i;
++ for (i = 1; i <= DIVIDEEDGESECTIONS; i++)
+ {
+ oldpnt = pnt;
+ pnt = c->Value(s0+(i/double(DIVIDEEDGESECTIONS))*(s1-s0));
++ double dist = pnt.Distance(oldpnt);
+ hvalue[i] = hvalue[i-1] +
+ 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*
+- pnt.Distance(oldpnt);
++ dist;
+
+ //(*testout) << "mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z())) " << mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))
+ // << " pnt.Distance(oldpnt) " << pnt.Distance(oldpnt) << endl;
+
+-
+- olddist = dist;
+- dist = pnt.Distance(oldpnt);
+ }
+
+ // nsubedges = int(ceil(hvalue[DIVIDEEDGESECTIONS]));
+@@ -74,7 +70,7 @@
+ ps.SetSize(nsubedges-1);
+ params.SetSize(nsubedges+1);
+
+- int i = 1;
++ i = 1;
+ int i1 = 0;
+ do
+ {
+@@ -112,7 +108,7 @@
+
+ static void FindEdges (OCCGeometry & geom, Mesh & mesh)
+ {
+- char * savetask = multithread.task;
++ const char * savetask = multithread.task;
+ multithread.task = "Edge meshing";
+
+ (*testout) << "edge meshing" << endl;
+@@ -124,6 +120,7 @@
+ (*testout) << "nedges = " << nedges << endl;
+
+ double eps = 1e-6 * geom.GetBoundingBox().Diam();
++ double eps2 = eps * eps;
+
+ for (int i = 1; i <= nvertices; i++)
+ {
+@@ -133,7 +130,7 @@
+ bool exists = 0;
+ if (merge_solids)
+ for (PointIndex pi = 1; pi <= mesh.GetNP(); pi++)
+- if ( Dist2 (mesh[pi], Point<3>(mp)) < eps*eps)
++ if ( Dist2 (mesh[pi], Point<3>(mp)) < eps2)
+ {
+ exists = 1;
+ break;
+@@ -276,8 +273,8 @@
+ pnums.Last() = -1;
+ for (PointIndex pi = 1; pi < first_ep; pi++)
+ {
+- if (Dist2 (mesh[pi], fp) < eps*eps) pnums[0] = pi;
+- if (Dist2 (mesh[pi], lp) < eps*eps) pnums.Last() = pi;
++ if (Dist2 (mesh[pi], fp) < eps2) pnums[0] = pi;
++ if (Dist2 (mesh[pi], lp) < eps2) pnums.Last() = pi;
+ }
+ }
+
+@@ -287,7 +284,7 @@
+ bool exists = 0;
+ int j;
+ for (j = first_ep; j <= mesh.GetNP(); j++)
+- if ((mesh.Point(j)-Point<3>(mp[i-1])).Length() < eps)
++ if (Dist2(mesh.Point(j), Point<3>(mp[i-1])) < eps2)
+ {
+ exists = 1;
+ break;
+@@ -394,7 +391,7 @@
+ int i, j, k;
+ int changed;
+
+- char * savetask = multithread.task;
++ const char * savetask = multithread.task;
+ multithread.task = "Surface meshing";
+
+ geom.facemeshstatus = 0;
+@@ -751,7 +748,7 @@
+ multithread.task = savetask;
+ }
+
+- double ComputeH (double kappa)
++ static double ComputeH (double kappa)
+ {
+ double hret;
+ kappa *= mparam.curvaturesafety;
+@@ -779,7 +776,7 @@
+ double nq = n*q;
+
+ Point<3> p = p0 + 0.5*n;
+- double lambda = (p-l.p0)*n / nq;
++ double lambda = (fabs(nq) > 1e-10 ? (p-l.p0)*n / nq : -1);
+
+ if (lambda >= 0 && lambda <= 1)
+ {
+@@ -799,55 +796,55 @@
+
+
+
+- void RestrictHTriangle (gp_Pnt2d & par0, gp_Pnt2d & par1, gp_Pnt2d & par2,
+- BRepLProp_SLProps * prop, Mesh & mesh, const double maxside, int depth, double h = 0)
++ static void RestrictHTriangle (gp_Pnt2d & par0, gp_Pnt2d & par1, gp_Pnt2d & par2,
++ BRepAdaptor_Surface& surf, Mesh & mesh, const double maxside, int depth, double h = 0)
+ {
+-
++ BRepLProp_SLProps prop(surf, 2, 1e-5);
+
+ gp_Pnt2d parmid;
+
+ parmid.SetX(0.3*(par0.X()+par1.X()+par2.X()));
+ parmid.SetY(0.3*(par0.Y()+par1.Y()+par2.Y()));
+
+- if (depth == 0)
++ //if (depth == 0)
+ {
+ double curvature = 0;
+
+- prop->SetParameters (parmid.X(), parmid.Y());
+- if (!prop->IsCurvatureDefined())
++ prop.SetParameters (parmid.X(), parmid.Y());
++ if (!prop.IsCurvatureDefined())
+ {
+ (*testout) << "curvature not defined!" << endl;
+ return;
+ }
+- curvature = max(fabs(prop->MinCurvature()),
+- fabs(prop->MaxCurvature()));
++ curvature = max(fabs(prop.MinCurvature()),
++ fabs(prop.MaxCurvature()));
+
+- prop->SetParameters (par0.X(), par0.Y());
+- if (!prop->IsCurvatureDefined())
++ prop.SetParameters (par0.X(), par0.Y());
++ if (!prop.IsCurvatureDefined())
+ {
+ (*testout) << "curvature not defined!" << endl;
+ return;
+ }
+- curvature = max(curvature,max(fabs(prop->MinCurvature()),
+- fabs(prop->MaxCurvature())));
++ curvature = max(curvature,max(fabs(prop.MinCurvature()),
++ fabs(prop.MaxCurvature())));
+
+- prop->SetParameters (par1.X(), par1.Y());
+- if (!prop->IsCurvatureDefined())
++ prop.SetParameters (par1.X(), par1.Y());
++ if (!prop.IsCurvatureDefined())
+ {
+ (*testout) << "curvature not defined!" << endl;
+ return;
+ }
+- curvature = max(curvature,max(fabs(prop->MinCurvature()),
+- fabs(prop->MaxCurvature())));
++ curvature = max(curvature,max(fabs(prop.MinCurvature()),
++ fabs(prop.MaxCurvature())));
+
+- prop->SetParameters (par2.X(), par2.Y());
+- if (!prop->IsCurvatureDefined())
++ prop.SetParameters (par2.X(), par2.Y());
++ if (!prop.IsCurvatureDefined())
+ {
+ (*testout) << "curvature not defined!" << endl;
+ return;
+ }
+- curvature = max(curvature,max(fabs(prop->MinCurvature()),
+- fabs(prop->MaxCurvature())));
++ curvature = max(curvature,max(fabs(prop.MinCurvature()),
++ fabs(prop.MaxCurvature())));
+
+ //(*testout) << "curvature " << curvature << endl;
+
+@@ -886,51 +883,47 @@
+ pm1.SetX(0.5*(par0.X()+par2.X())); pm1.SetY(0.5*(par0.Y()+par2.Y()));
+ pm2.SetX(0.5*(par1.X()+par0.X())); pm2.SetY(0.5*(par1.Y()+par0.Y()));
+
+- RestrictHTriangle (pm0, pm1, pm2, prop, mesh, 0.5*maxside, depth+1, h);
+- RestrictHTriangle (par0, pm1, pm2, prop, mesh, 0.5*maxside, depth+1, h);
+- RestrictHTriangle (par1, pm0, pm2, prop, mesh, 0.5*maxside, depth+1, h);
+- RestrictHTriangle (par2, pm1, pm0, prop, mesh, 0.5*maxside, depth+1, h);
++ RestrictHTriangle (pm0, pm1, pm2, surf, mesh, 0.5*maxside, depth+1, h);
++ RestrictHTriangle (par0, pm1, pm2, surf, mesh, 0.5*maxside, depth+1, h);
++ RestrictHTriangle (par1, pm0, pm2, surf, mesh, 0.5*maxside, depth+1, h);
++ RestrictHTriangle (par2, pm1, pm0, surf, mesh, 0.5*maxside, depth+1, h);
+ }
+ else
+ {
+ gp_Pnt pnt;
+ Point3d p3d;
+
+- prop->SetParameters (parmid.X(), parmid.Y());
+- pnt = prop->Value();
++ surf.D0(parmid.X(), parmid.Y(), pnt);
+ p3d = Point3d(pnt.X(), pnt.Y(), pnt.Z());
+ mesh.RestrictLocalH (p3d, h);
+
+
+- prop->SetParameters (par0.X(), par0.Y());
+- pnt = prop->Value();
++ surf.D0(par0.X(), par0.Y(), pnt);
+ p3d = Point3d(pnt.X(), pnt.Y(), pnt.Z());
+ mesh.RestrictLocalH (p3d, h);
+
+- prop->SetParameters (par1.X(), par1.Y());
+- pnt = prop->Value();
++ surf.D0(par1.X(), par1.Y(), pnt);
+ p3d = Point3d(pnt.X(), pnt.Y(), pnt.Z());
+ mesh.RestrictLocalH (p3d, h);
+
+- prop->SetParameters (par2.X(), par2.Y());
+- pnt = prop->Value();
++ surf.D0(par2.X(), par2.Y(), pnt);
+ p3d = Point3d(pnt.X(), pnt.Y(), pnt.Z());
+ mesh.RestrictLocalH (p3d, h);
+
+- (*testout) << "p = " << p3d << ", h = " << h << ", maxside = " << maxside << endl;
++ //(*testout) << "p = " << p3d << ", h = " << h << ", maxside = " << maxside << endl;
+ /*
+ (*testout) << pnt.X() << " " << pnt.Y() << " " << pnt.Z() << endl;
+
+- prop->SetParameters (par0.X(), par0.Y());
+- pnt = prop->Value();
++ prop.SetParameters (par0.X(), par0.Y());
++ pnt = prop.Value();
+ (*testout) << pnt.X() << " " << pnt.Y() << " " << pnt.Z() << endl;
+
+- prop->SetParameters (par1.X(), par1.Y());
+- pnt = prop->Value();
++ prop.SetParameters (par1.X(), par1.Y());
++ pnt = prop.Value();
+ (*testout) << pnt.X() << " " << pnt.Y() << " " << pnt.Z() << endl;
+
+- prop->SetParameters (par2.X(), par2.Y());
+- pnt = prop->Value();
++ prop.SetParameters (par2.X(), par2.Y());
++ pnt = prop.Value();
+ (*testout) << pnt.X() << " " << pnt.Y() << " " << pnt.Z() << endl;
+ */
+ }
+@@ -970,7 +963,7 @@
+ if (mparam.uselocalh)
+ {
+
+- char * savetask = multithread.task;
++ const char * savetask = multithread.task;
+ multithread.percent = 0;
+
+ mesh->SetLocalH (bb.PMin(), bb.PMax(), mparam.grading);
+@@ -1075,7 +1068,6 @@
+ if (triangulation.IsNull()) continue;
+
+ BRepAdaptor_Surface sf(face, Standard_True);
+- BRepLProp_SLProps prop(sf, 2, 1e-5);
+
+ int ntriangles = triangulation -> NbTriangles();
+ for (int j = 1; j <= ntriangles; j++)
+@@ -1096,7 +1088,7 @@
+ maxside = max (maxside, p[1].Distance(p[2]));
+ //cout << "\rFace " << i << " pos11 ntriangles " << ntriangles << " maxside " << maxside << flush;
+
+- RestrictHTriangle (par[0], par[1], par[2], &prop, *mesh, maxside, 0);
++ RestrictHTriangle (par[0], par[1], par[2], sf, *mesh, maxside, 0);
+ //cout << "\rFace " << i << " pos12 ntriangles " << ntriangles << flush;
+ }
+ }
+diff -Nru netgen-4.5_orig/libsrc/occ/occgeom.cpp netgen-4.5_patch/libsrc/occ/occgeom.cpp
+--- netgen-4.5_orig/libsrc/occ/occgeom.cpp 2006-01-25 15:35:50.000000000 +0300
++++ netgen-4.5_patch/libsrc/occ/occgeom.cpp 2006-10-25 16:15:24.000000000 +0400
+@@ -7,6 +7,8 @@
+ #include "ShapeAnalysis_ShapeContents.hxx"
+ #include "ShapeAnalysis_CheckSmallFace.hxx"
+ #include "ShapeAnalysis_DataMapOfShapeListOfReal.hxx"
++#include <ShapeAnalysis_Surface.hxx>
++#include <BRepTopAdaptor_FClass2d.hxx>
+ #include "BRepAlgoAPI_Fuse.hxx"
+ #include "BRepCheck_Analyzer.hxx"
+ #include "BRepLib.hxx"
+@@ -16,11 +18,19 @@
+ #include "Partition_Spliter.hxx"
+ //#include "VrmlAPI.hxx"
+ //#include "StlAPI.hxx"
++#include <TopAbs_State.hxx>
+
+
+ namespace netgen
+ {
+
++ OCCGeometry::~OCCGeometry()
++ {
++ NCollection_DataMap<int,BRepTopAdaptor_FClass2d*>::Iterator it(fclsmap);
++ for (; it.More(); it.Next())
++ delete it.Value();
++ }
++
+ void OCCGeometry :: PrintNrShapes ()
+ {
+ TopExp_Explorer e;
+@@ -947,13 +957,13 @@
+
+ void OCCGeometry :: BuildVisualizationMesh ()
+ {
+-
+- cout << "Preparing visualization (deflection = " << vispar.occdeflection << ") ... " << flush;
++ double vispar_occdeflection = 0.01;
++ cout << "Preparing visualization (deflection = " << vispar_occdeflection << ") ... " << flush;
+
+
+ BRepTools::Clean (shape);
+ //WriteOCC_STL("test.stl");
+- BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh (shape, vispar.occdeflection, true);
++ BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh (shape, vispar_occdeflection, true);
+ cout << "done" << endl;
+
+
+@@ -973,8 +983,27 @@
+
+ }
+
++ void OCCGeometry::GetFaceTools(int surfi, Handle(ShapeAnalysis_Surface)& proj,
++ BRepTopAdaptor_FClass2d*& cls) const
++ {
++ //MSV: organize caching projector in the map
++ if (fprjmap.IsBound(surfi))
++ {
++ proj = fprjmap.Find(surfi);
++ cls = fclsmap.Find(surfi);
++ }
++ else
++ {
++ const TopoDS_Face& aFace = TopoDS::Face(fmap(surfi));
++ Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace);
++ proj = new ShapeAnalysis_Surface(aSurf);
++ fprjmap.Bind(surfi, proj);
++ cls = new BRepTopAdaptor_FClass2d(aFace,Precision::Confusion());
++ fclsmap.Bind(surfi, cls);
++ }
++ }
+
+- void OCCGeometry :: Project (int surfi, Point<3> & p) const
++ bool OCCGeometry :: Project (int surfi, Point<3> & p, double& u, double& v) const
+ {
+ static int cnt = 0;
+ if (++cnt % 1000 == 0) cout << "Project cnt = " << cnt << endl;
+@@ -983,18 +1012,22 @@
+
+ //(*testout) << "before " << pnt.X() << " "<< pnt.Y() << " "<< pnt.Z() << " " << endl;
+
+- GeomAPI_ProjectPointOnSurf proj(pnt, BRep_Tool::Surface(TopoDS::Face(fmap(surfi))));
+- if (proj.NbPoints() == 0)
+- {
+- cout << "Projection fails" << endl;
+- }
+- else
+- {
+- pnt = proj.NearestPoint();
+- //(*testout) << "after " << pnt.X() << " "<< pnt.Y() << " "<< pnt.Z() << " " << endl;
++ Handle(ShapeAnalysis_Surface) proj;
++ BRepTopAdaptor_FClass2d *cls;
++ GetFaceTools(surfi, proj, cls);
+
+- p = Point<3> (pnt.X(), pnt.Y(), pnt.Z());
+- }
++ gp_Pnt2d p2d = proj->ValueOfUV(pnt, Precision::Confusion());
++ if (cls->Perform(p2d) == TopAbs_OUT)
++ {
++ //cout << "Projection fails" << endl;
++ return false;
++ }
++ pnt = proj->Value(p2d);
++ p2d.Coord(u, v);
++ //(*testout) << "after " << pnt.X() << " "<< pnt.Y() << " "<< pnt.Z() << " " << endl;
++
++ p = Point<3> (pnt.X(), pnt.Y(), pnt.Z());
++ return true;
+ }
+
+
+@@ -1002,54 +1035,20 @@
+ {
+ gp_Pnt p(ap(0), ap(1), ap(2));
+
+- Handle(Geom_Surface) surface = BRep_Tool::Surface(TopoDS::Face(fmap(surfi)));
++ Handle(ShapeAnalysis_Surface) proj;
++ BRepTopAdaptor_FClass2d *cls;
++ GetFaceTools(surfi, proj, cls);
+
+- gp_Pnt x = surface->Value (u,v);
+-
+- if (p.SquareDistance(x) <= sqr(PROJECTION_TOLERANCE)) return true;
+-
+- gp_Vec du, dv;
+-
+- surface->D1(u,v,x,du,dv);
+-
+- int count = 0;
+-
+- gp_Pnt xold;
+- gp_Vec n;
+- double det, lambda, mu;
+-
+- do {
+- count++;
+-
+- n = du^dv;
+-
+- det = Det3 (n.X(), du.X(), dv.X(),
+- n.Y(), du.Y(), dv.Y(),
+- n.Z(), du.Z(), dv.Z());
+-
+- if (det < 1e-15) return false;
+-
+- lambda = Det3 (n.X(), p.X()-x.X(), dv.X(),
+- n.Y(), p.Y()-x.Y(), dv.Y(),
+- n.Z(), p.Z()-x.Z(), dv.Z())/det;
+-
+- mu = Det3 (n.X(), du.X(), p.X()-x.X(),
+- n.Y(), du.Y(), p.Y()-x.Y(),
+- n.Z(), du.Z(), p.Z()-x.Z())/det;
+-
+- u += lambda;
+- v += mu;
+-
+- xold = x;
+- surface->D1(u,v,x,du,dv);
+-
+- } while (xold.SquareDistance(x) > sqr(PROJECTION_TOLERANCE) && count < 50);
+-
+- // (*testout) << "FastProject count: " << count << endl;
+-
+- if (count == 50) return false;
++ gp_Pnt2d p2d = proj->NextValueOfUV(gp_Pnt2d(u,v), p, Precision::Confusion());
++ if (cls->Perform(p2d) == TopAbs_OUT)
++ {
++ //cout << "Projection fails" << endl;
++ return false;
++ }
+
+- ap = Point<3> (x.X(), x.Y(), x.Z());
++ p = proj->Value(p2d);
++ p2d.Coord(u, v);
++ ap = Point<3> (p.X(), p.Y(), p.Z());
+
+ return true;
+ }
+diff -Nru netgen-4.5_orig/libsrc/occ/occgeom.hpp netgen-4.5_patch/libsrc/occ/occgeom.hpp
+--- netgen-4.5_orig/libsrc/occ/occgeom.hpp 2006-01-25 15:35:50.000000000 +0300
++++ netgen-4.5_patch/libsrc/occ/occgeom.hpp 2006-10-25 16:16:01.000000000 +0400
+@@ -15,8 +15,6 @@
+ #include "Geom_Curve.hxx"
+ #include "Geom2d_Curve.hxx"
+ #include "Geom_Surface.hxx"
+-#include "GeomAPI_ProjectPointOnSurf.hxx"
+-#include "GeomAPI_ProjectPointOnCurve.hxx"
+ #include "BRepTools.hxx"
+ #include "TopExp.hxx"
+ #include "BRepBuilderAPI_MakeVertex.hxx"
+@@ -41,8 +39,6 @@
+ #include "Geom_Curve.hxx"
+ #include "Geom2d_Curve.hxx"
+ #include "Geom_Surface.hxx"
+-#include "GeomAPI_ProjectPointOnSurf.hxx"
+-#include "GeomAPI_ProjectPointOnCurve.hxx"
+ #include "TopoDS_Wire.hxx"
+ #include "BRepTools_WireExplorer.hxx"
+ #include "BRepTools.hxx"
+@@ -69,7 +65,7 @@
+ #include "IGESToBRep_Reader.hxx"
+ #include "Interface_Static.hxx"
+ #include "GeomAPI_ExtremaCurveCurve.hxx"
+-#include "Standard_ErrorHandler.hxx"
++//#include "Standard_ErrorHandler.hxx"
+ #include "Standard_Failure.hxx"
+ #include "ShapeUpgrade_ShellSewing.hxx"
+ #include "ShapeFix_Shape.hxx"
+@@ -84,11 +80,15 @@
+ #include "STEPControl_Writer.hxx"
+ #include "StlAPI_Writer.hxx"
+ #include "STEPControl_StepModelType.hxx"
++#include <NCollection_DataMap.hxx>
++
++class Handle_ShapeAnalysis_Surface;
++class BRepTopAdaptor_FClass2d;
+
+ namespace netgen
+ {
+
+-#include "../visualization/vispar.hpp"
++ //#include "../visualization/vispar.hpp"
+ // class VisualizationParameters;
+ // extern VisualizationParameters vispar;
+
+@@ -159,6 +159,8 @@
+ class OCCGeometry
+ {
+ Point<3> center;
++ mutable NCollection_DataMap<int,Handle_ShapeAnalysis_Surface> fprjmap;
++ mutable NCollection_DataMap<int,BRepTopAdaptor_FClass2d*> fclsmap;
+
+ public:
+ TopoDS_Shape shape;
+@@ -189,6 +191,7 @@
+ vmap.Clear();
+ }
+
++ ~OCCGeometry();
+
+ void BuildFMap();
+
+@@ -204,10 +207,12 @@
+ Point<3> Center()
+ { return center; }
+
+- void Project (int surfi, Point<3> & p) const;
++ bool Project (int surfi, Point<3> & p, double& u, double& v) const;
+ bool FastProject (int surfi, Point<3> & ap, double& u, double& v) const;
+
+-
++ void GetFaceTools(int surfi, Handle(ShapeAnalysis_Surface)& proj,
++ BRepTopAdaptor_FClass2d*& cls) const;
++
+ OCCSurface GetSurface (int surfi)
+ {
+ cout << "OCCGeometry::GetSurface using PLANESPACE" << endl;
+diff -Nru netgen-4.5_orig/libsrc/occ/occmeshsurf.cpp netgen-4.5_patch/libsrc/occ/occmeshsurf.cpp
+--- netgen-4.5_orig/libsrc/occ/occmeshsurf.cpp 2006-01-25 15:36:26.000000000 +0300
++++ netgen-4.5_patch/libsrc/occ/occmeshsurf.cpp 2006-10-25 16:16:26.000000000 +0400
+@@ -5,6 +5,8 @@
+ #include <occgeom.hpp>
+ #include <meshing.hpp>
+ #include <GeomLProp_SLProps.hxx>
++#include <GeomAPI_ProjectPointOnSurf.hxx>
++#include <GeomAPI_ProjectPointOnCurve.hxx>
+
+
+ namespace netgen
+@@ -411,11 +413,16 @@
+ }
+
+
+- void MeshOptimize2dOCCSurfaces :: ProjectPoint (INDEX surfind, Point3d & p) const
++ bool MeshOptimize2dOCCSurfaces :: ProjectPoint (INDEX surfind, Point3d & p, PointGeomInfo& gi) const
+ {
+ Point<3> hp = p;
+- geometry.Project (surfind, hp);
++ bool ok;
++ if (gi.trignum > 0)
++ ok = geometry.FastProject (surfind, hp, gi.u, gi.v);
++ else
++ ok = geometry.Project (surfind, hp, gi.u, gi.v);
+ p = hp;
++ return ok;
+ }
+
+ void MeshOptimize2dOCCSurfaces :: ProjectPoint2 (INDEX surfind, INDEX surfind2,
+@@ -506,38 +513,6 @@
+ }
+
+
+- int MeshOptimize2dOCCSurfaces ::
+- CalcPointGeomInfo(int surfind, PointGeomInfo& gi, const Point3d& p) const
+- {
+- Standard_Real u,v;
+-
+- gp_Pnt pnt(p.X(), p.Y(), p.Z());
+-
+- Handle(Geom_Surface) occface;
+- occface = BRep_Tool::Surface(TopoDS::Face(geometry.fmap(surfind)));
+-
+- GeomAPI_ProjectPointOnSurf proj(pnt, occface);
+-
+- if (proj.NbPoints() < 1)
+- {
+- cout << "ERROR: OCCSurface :: GetNormalVector: GeomAPI_ProjectPointOnSurf failed!"
+- << endl;
+- cout << p << endl;
+- return 0;
+- }
+-
+- proj.LowerDistanceParameters (u, v);
+-
+- gi.u = u;
+- gi.v = v;
+- return 1;
+- }
+-
+-
+-
+-
+-
+-
+ OCCRefinementSurfaces :: OCCRefinementSurfaces (const OCCGeometry & ageometry)
+ : Refinement(), geometry(ageometry)
+ {
+@@ -627,10 +602,11 @@
+ if (!geometry.FastProject (surfi, hnewp, u, v))
+ {
+ cout << "Fast projection to surface fails! Using OCC projection" << endl;
+- geometry.Project (surfi, hnewp);
++ double u, v;
++ geometry.Project (surfi, hnewp, u, v);
+ }
+
+- newgi.trignum = 1;
++ newgi.trignum = surfi;
+ }
+
+ newp = hnewp;
+@@ -653,14 +629,17 @@
+ hnewp = Point<3> (pnt.X(), pnt.Y(), pnt.Z());
+ newp = hnewp;
+ newgi = ap1;
+- };
++ }
+
+
+ void OCCRefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi)
+ {
+ if (surfi > 0)
+- geometry.Project (surfi, p);
+- };
++ {
++ double u, v;
++ geometry.Project (surfi, p, u, v);
++ }
++ }
+
+ void OCCRefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi, PointGeomInfo & gi)
+ {
+@@ -668,9 +647,10 @@
+ if (!geometry.FastProject (surfi, p, gi.u, gi.v))
+ {
+ cout << "Fast projection to surface fails! Using OCC projection" << endl;
+- geometry.Project (surfi, p);
++ double u, v;
++ geometry.Project (surfi, p, u, v);
+ }
+- };
++ }
+
+
+
+diff -Nru netgen-4.5_orig/libsrc/occ/occmeshsurf.hpp netgen-4.5_patch/libsrc/occ/occmeshsurf.hpp
+--- netgen-4.5_orig/libsrc/occ/occmeshsurf.hpp 2005-06-09 18:51:10.000000000 +0400
++++ netgen-4.5_patch/libsrc/occ/occmeshsurf.hpp 2006-10-25 16:17:22.000000000 +0400
+@@ -151,7 +151,7 @@
+ MeshOptimize2dOCCSurfaces (const OCCGeometry & ageometry);
+
+ ///
+- virtual void ProjectPoint (INDEX surfind, Point3d & p) const;
++ virtual bool ProjectPoint (INDEX surfind, Point3d & p, PointGeomInfo& gi) const;
+ ///
+ virtual void ProjectPoint2 (INDEX surfind, INDEX surfind2, Point3d & p) const;
+ ///
+@@ -159,9 +159,6 @@
+ ///
+ virtual void GetNormalVector(INDEX surfind, const Point3d & p, PointGeomInfo & gi, Vec3d & n) const;
+
+-
+- virtual int CalcPointGeomInfo(int surfind, PointGeomInfo& gi, const Point3d& p3) const;
+-
+ };
+
+
+diff -Nru netgen-4.5_orig/libsrc/stlgeom/meshstlsurface.cpp netgen-4.5_patch/libsrc/stlgeom/meshstlsurface.cpp
+--- netgen-4.5_orig/libsrc/stlgeom/meshstlsurface.cpp 2006-01-11 18:08:20.000000000 +0300
++++ netgen-4.5_patch/libsrc/stlgeom/meshstlsurface.cpp 2006-10-25 16:17:47.000000000 +0400
+@@ -946,20 +946,23 @@
+ }
+
+
+-void MeshOptimizeSTLSurface :: ProjectPoint (INDEX surfind, Point3d & p) const
++bool MeshOptimizeSTLSurface :: ProjectPoint (INDEX surfind, Point3d & p, PointGeomInfo& gi) const
+ {
+ Point<3> hp = p;
+- if (!geom.Project (hp))
++ if (gi.trignum > 0)
++ ((STLGeometry&)geom).SelectChartOfTriangle (gi.trignum);
++ if (!(gi.trignum = geom.Project (hp)))
+ {
+ PrintMessage(7,"project failed");
+
+- if (!geom.ProjectOnWholeSurface(hp))
++ if (!(gi.trignum = geom.ProjectOnWholeSurface(hp)))
+ {
+ PrintMessage(7, "project on whole surface failed");
+ }
+ }
+ p = hp;
+ // geometry.GetSurface(surfind)->Project (p);
++ return gi.trignum > 0;
+ }
+
+ void MeshOptimizeSTLSurface :: ProjectPoint2 (INDEX surfind, INDEX surfind2, Point3d & p) const
+@@ -970,20 +973,6 @@
+ */
+ }
+
+-int MeshOptimizeSTLSurface :: CalcPointGeomInfo(PointGeomInfo& gi, const Point3d& p3) const
+-{
+- Point<3> hp = p3;
+- gi.trignum = geom.Project (hp);
+-
+- if (gi.trignum)
+- {
+- return 1;
+- }
+-
+- return 0;
+-
+-}
+-
+ void MeshOptimizeSTLSurface :: GetNormalVector(INDEX surfind, const Point3d & p, Vec3d & n) const
+ {
+ n = geom.GetChartNormalVector();
+diff -Nru netgen-4.5_orig/libsrc/stlgeom/meshstlsurface.hpp netgen-4.5_patch/libsrc/stlgeom/meshstlsurface.hpp
+--- netgen-4.5_orig/libsrc/stlgeom/meshstlsurface.hpp 2004-09-30 17:13:56.000000000 +0400
++++ netgen-4.5_patch/libsrc/stlgeom/meshstlsurface.hpp 2006-10-25 16:17:59.000000000 +0400
+@@ -79,12 +79,10 @@
+ virtual void SelectSurfaceOfPoint (const Point3d & p,
+ const PointGeomInfo & gi);
+ ///
+- virtual void ProjectPoint (INDEX surfind, Point3d & p) const;
++ virtual bool ProjectPoint (INDEX surfind, Point3d & p, PointGeomInfo& gi) const;
+ ///
+ virtual void ProjectPoint2 (INDEX surfind, INDEX surfind2, Point3d & p) const;
+ ///
+- virtual int CalcPointGeomInfo(PointGeomInfo& gi, const Point3d& p3) const;
+- ///
+ virtual void GetNormalVector(INDEX surfind, const Point3d & p, Vec3d & n) const;
+ };
+
+diff -Nru netgen-4.5_orig/makeForSalome.sh netgen-4.5_patch/makeForSalome.sh
+--- netgen-4.5_orig/makeForSalome.sh 1970-01-01 03:00:00.000000000 +0300
++++ netgen-4.5_patch/makeForSalome.sh 2006-04-27 13:12:54.000000000 +0400
+@@ -0,0 +1,31 @@
++#! /bin/sh
++cp ngtcltk/ngnewdelete.* libsrc/interface/
++
++MACHINE=LINUX
++export MACHINE
++make -C libsrc/csg
++make -C libsrc/general
++make -C libsrc/geom2d
++make -C libsrc/gprim
++make -C libsrc/interface
++make -C libsrc/linalg
++make -C libsrc/meshing
++make -C libsrc/opti
++make -C libsrc/stlgeom
++make -C libsrc/occ
++
++if [ ! -d install ] ; then
++ mkdir install
++fi
++
++cp -r lib install/
++
++if [ ! -d install/include ] ; then
++ mkdir install/include
++fi
++
++cp libsrc/interface/nglib.h libsrc/general/*.hpp libsrc/csg/*.hpp libsrc/geom2d/*.hpp \
++ libsrc/gprim/*.hpp libsrc/linalg/*.hpp libsrc/meshing/*.hpp \
++ libsrc/occ/*.hpp libsrc/opti/*.hpp libsrc/include/mydefs.hpp \
++ libsrc/stlgeom/*.hpp libsrc/include/mystdlib.h \
++ install/include
--- /dev/null
+diff -ur netgen-4.5.old/libsrc/makefile.inc netgen-4.5.new/libsrc/makefile.inc
+--- netgen-4.5/libsrc/makefile.inc 2006-04-27 13:12:54.000000000 +0400
++++ netgen-4.5/libsrc/makefile.inc 2006-09-05 14:16:32.000000000 +0400
+@@ -14,7 +14,7 @@
+ #
+ include $(LIBSRC_DIR)/makefile.mach.$(MACHINE)
+ #
+-CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \
++CPLUSPLUSFLAGS1 = -c -m64 -fPIC -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \
+ -DOCCGEOMETRY -DOCC52 -DHAVE_IOSTREAM -DHAVE_LIMITS
+ #
+ ARFLAGS = r
+diff -ur netgen-4.5.old/libsrc/makefile.mach.LINUX64 netgen-4.5.new/libsrc/makefile.mach.LINUX64
+--- netgen-4.5/libsrc/makefile.mach.LINUX64 2006-03-29 15:09:32.000000000 +0400
++++ netgen-4.5/libsrc/makefile.mach.LINUX64 2006-09-07 15:48:39.000000000 +0400
+@@ -11,7 +11,7 @@
+ #
+ #
+ CFLAGS2 =
+-CPLUSPLUSFLAGS2 = -pg -march=nocona -O2 -DLINUX -DOPENGL \
++CPLUSPLUSFLAGS2 = -pg -march=nocona -O2 -DLINUX \
+ -ftemplate-depth-99 -finline-limit=100000 \
+ -fforce-addr -funroll-loops \
+ -DTRAFO -DNGSOLVE -DnoADDON -DnoLAPACK -DnoFAST \
+@@ -23,7 +23,7 @@
+ #
+ #
+
+-LINKFLAGS2 = -pg -L/usr/openwin/lib64 -L/usr/X11R6/lib64 -L/usr/lib/GL3.5 -L/usr/lib64
++LINKFLAGS2 = -fPIC -pg -L/usr/openwin/lib64 -L/usr/X11R6/lib64 -L/usr/lib/GL3.5 -L/usr/lib64
+
+
+ SYSLIB2 = -lstdc++
+diff -ur netgen-4.5.old/Makefile netgen-4.5.new/Makefile
+--- netgen-4.5/Makefile 2006-03-29 15:09:12.000000000 +0400
++++ netgen-4.5/Makefile 2006-09-07 15:46:07.000000000 +0400
+@@ -72,7 +72,7 @@
+ #
+ #CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -DOPENGL
+
+-CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -I./ngsolve/include -Ilibsrc/interface -DOPENGL -I$(METISINC)
++CPLUSPLUSFLAGS1 = -c -m64 -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -I./ngsolve/include -Ilibsrc/interface -I$(METISINC)
+
+ LINKFLAGS1 = -lGL -lGLU -lX11 -lXext -lXmu
+ #
--- /dev/null
+diff -Naur omniNotify-orig/include/RDIstrstream.h omniNotify/include/RDIstrstream.h
+--- omniNotify/include/RDIstrstream.h 2003-10-12 22:51:15.000000000 +0400
++++ omniNotify/include/RDIstrstream.h 2006-09-28 17:44:20.000000000 +0400
+@@ -57,8 +57,10 @@
+ RDIstrstream& operator<<(const void *p);
+ RDIstrstream& operator<<(int n);
+ RDIstrstream& operator<<(unsigned int n);
++#ifndef HAS_LongLong
+ RDIstrstream& operator<<(long n);
+ RDIstrstream& operator<<(unsigned long n);
++#endif
+ RDIstrstream& operator<<(short n) {return operator<<((int)n);}
+ RDIstrstream& operator<<(unsigned short n) {return operator<<((unsigned int)n);}
+ #ifdef HAS_LongLong
+diff -Naur omniNotify-orig/include/RDITimeWrappers.h omniNotify/include/RDITimeWrappers.h
+--- omniNotify/include/RDITimeWrappers.h 2003-10-23 17:28:18.000000000 +0400
++++ omniNotify/include/RDITimeWrappers.h 2006-09-28 18:10:41.000000000 +0400
+@@ -236,8 +236,11 @@
+ // pretty-printing of absolute local time -- no newline
+ void out_local(RDIstrstream& str) {
+ CORBA::ULong ts, tn;
+- get_posixbase_secs_nanosecs(ts, tn);
+- RDI_posixbase_out_time(str, ts, tn);
++ unsigned long ts3, tn3;
++ get_posixbase_secs_nanosecs(ts3, tn3);
++ RDI_posixbase_out_time(str, ts3, tn3);
++ ts = (CORBA::ULong)ts3;
++ tn = (CORBA::ULong)tn3;
+ str << " (local time)";
+ }
+
+@@ -396,8 +399,11 @@
+ // pretty-printing of absolute univ time -- no newline
+ void out_gmt(RDIstrstream& str) {
+ CORBA::ULong ts, tn;
+- get_gmt_posixbase_secs_nanosecs(ts, tn);
+- RDI_posixbase_out_time(str, ts, tn);
++ unsigned long ts4, tn4;
++ get_gmt_posixbase_secs_nanosecs(ts4, tn4);
++ RDI_posixbase_out_time(str, ts4, tn4);
++ ts = (CORBA::ULong)ts4;
++ tn = (CORBA::ULong)tn4;
+ str << " (greenwich mean time)";
+ }
+ // static helpers for producing TimeBase::UtcT min and max
+diff -Naur omniNotify-orig/lib/RDIstrstream.cc omniNotify/lib/RDIstrstream.cc
+--- omniNotify/lib/RDIstrstream.cc 2003-10-23 08:39:12.000000000 +0400
++++ omniNotify/lib/RDIstrstream.cc 2006-09-28 16:56:03.000000000 +0400
+@@ -175,6 +175,7 @@
+ return *this;
+ }
+
++#ifndef HAS_LongLong
+ RDIstrstream&
+ RDIstrstream::operator<<(long n)
+ {
+@@ -194,6 +195,7 @@
+ width_fill();
+ return *this;
+ }
++#endif
+
+ #ifdef HAS_LongLong
+ RDIstrstream&
+diff -Naur omniNotify-orig/lib/RDITimeWrappers.cc omniNotify/lib/RDITimeWrappers.cc
+--- omniNotify/lib/RDITimeWrappers.cc 2003-10-23 08:39:12.000000000 +0400
++++ omniNotify/lib/RDITimeWrappers.cc 2006-09-28 16:56:09.000000000 +0400
+@@ -147,7 +147,10 @@
+ #define WHATFN "RDI_TimeT::fmt_local"
+ const char *RDI_TimeT::fmt_local() {
+ CORBA::ULong ts, tm;
+- get_posixbase_secs_msecs(ts, tm);
++ unsigned long ts2, tm2;
++ get_posixbase_secs_msecs(ts2, tm2);
++ ts = (CORBA::ULong)ts2;
++ tm = (CORBA::ULong)tm2;
+ time_t secs_as_time_t = ts;
+ TW_SCOPE_LOCK(otime_lock, RDI_out_time_lock, "RDI_out_time", WHATFN);
+ RDI_TimeT_fmt_local_buf_idx = (RDI_TimeT_fmt_local_buf_idx + 1) % 10;
+diff -Naur omniNotify/mk/beforeauto.mk.in omniNotify/mk/beforeauto.mk.in
+--- omniNotify/mk/beforeauto.mk.in 2003-10-29 22:18:36.000000000 +0300
++++ omniNotify/mk/beforeauto.mk.in 2006-10-13 16:58:26.000000000 +0400
+@@ -95,9 +95,9 @@
+
+ CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS)
+
+-CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
++CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
+
+-CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
++CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
+
+
+ #############################################################################
--- /dev/null
+diff -Naur omniORB-4.0.7-original/mk/beforeauto.mk.in omniORB-4.0.7-changed/mk/beforeauto.mk.in
+--- omniORB-4.0.7-original/mk/beforeauto.mk.in 2005-03-22 16:53:41.000000000 +0300
++++ omniORB-4.0.7-changed/mk/beforeauto.mk.in 2006-10-13 16:26:46.000000000 +0400
+@@ -87,9 +87,9 @@
+
+ CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS)
+
+-CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
++CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
+
+-CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
++CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
+
+
+ #############################################################################
--- /dev/null
+diff -Naur omniORBpy-2.7-original/mk/beforeauto.mk.in omniORBpy-2.7-changed/mk/beforeauto.mk.in
+--- omniORBpy-2.7-original/mk/beforeauto.mk.in 2006-01-09 19:26:26.000000000 +0300
++++ omniORBpy-2.7-changed/mk/beforeauto.mk.in 2006-10-13 16:57:51.000000000 +0400
+@@ -96,9 +96,9 @@
+
+ CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS)
+
+-CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
++CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
+
+-CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
++CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
+
+
+ #############################################################################
--- /dev/null
+diff -Naur qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf qt-3.3.4-changed/mkspecs/linux-g++-64/qmake.conf
+--- qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf 2005-01-21 20:16:44.000000000 +0300
++++ qt-3.3.4-changed/mkspecs/linux-g++-64/qmake.conf 2006-10-12 14:09:27.000000000 +0400
+@@ -17,7 +17,7 @@
+ QMAKE_LEXFLAGS =
+ QMAKE_YACC = yacc
+ QMAKE_YACCFLAGS = -d
+-QMAKE_CFLAGS = -pipe
++QMAKE_CFLAGS = -pipe -m64
+ QMAKE_CFLAGS_DEPS = -M
+ QMAKE_CFLAGS_WARN_ON = -Wall -W
+ QMAKE_CFLAGS_WARN_OFF = -w
--- /dev/null
+diff -Naur sip-original/configure.py sip-changed/configure.py
+--- sip-original/configure.py 2006-03-16 12:29:17.000000000 +0300
++++ sip-changed/configure.py 2006-10-03 18:52:25.000000000 +0400
+@@ -405,7 +405,7 @@
+ f.close()
+
+ cmd = "gcc -c /tmp/testqtlicense.cxx -I${QTDIR}/include -o /tmp/testqtlicense.o > /dev/null ; "
+- cmd += "gcc /tmp/testqtlicense.o -L${QTDIR}/lib -lqt-mt -o /tmp/testqtlicense > /dev/null ; "
++ cmd += "gcc /tmp/testqtlicense.o -L${QTDIR}/lib64 -lqt-mt -o /tmp/testqtlicense > /dev/null ; "
+ cmd += "/tmp/testqtlicense > /tmp/testqtlicense.log"
+
+ res = os.system(cmd)
+diff -Naur sip-original/specs/linux-g++-64 sip-changed/specs/linux-g++-64
+--- sip-original/specs/linux-g++-64 2005-03-06 13:30:23.000000000 +0300
++++ sip-changed/specs/linux-g++-64 2006-10-03 18:52:35.000000000 +0400
+@@ -43,7 +43,7 @@
+ QMAKE_INCDIR_X11 = /usr/X11R6/include
+ QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
+ QMAKE_INCDIR_QT = $(QTDIR)/include
+-QMAKE_LIBDIR_QT = $(QTDIR)/lib
++QMAKE_LIBDIR_QT = $(QTDIR)/lib64
+ QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
+
+diff -Naur sip-original/specs/linux-g++-64 sip-changed/specs/linux-g++-64
+--- sip-original/specs/linux-g++-64 2005-03-06 13:30:23.000000000 +0300
++++ sip-changed/specs/linux-g++-64 2006-10-16 15:54:00.000000000 +0400
+@@ -17,7 +17,7 @@
+ QMAKE_LEXFLAGS =
+ QMAKE_YACC = yacc
+ QMAKE_YACCFLAGS = -d
+-QMAKE_CFLAGS = -pipe
++QMAKE_CFLAGS = -pipe -m64
+ QMAKE_CFLAGS_DEPS = -M
+ QMAKE_CFLAGS_WARN_ON = -Wall -W
+ QMAKE_CFLAGS_WARN_OFF = -w
--- /dev/null
+diff -Naur VTK-4.2.6-original/CMake/FindOSMesa.cmake VTK-4.2.6-changed/CMake/FindOSMesa.cmake
+--- VTK-4.2.6-original/CMake/FindOSMesa.cmake 2003-02-12 02:05:20.000000000 +0300
++++ VTK-4.2.6-changed/CMake/FindOSMesa.cmake 2006-10-03 11:33:54.000000000 +0400
+@@ -19,11 +19,11 @@
+ # in the main Mesa library
+ IF (NOT OSMESA_LIBRARY)
+ FIND_LIBRARY(OSMESA_LIBRARY OSMesa
+- /usr/lib
+- /usr/local/lib
+- /opt/graphics/OpenGL/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
++ /usr/lib64
++ /usr/local/lib64
++ /opt/graphics/OpenGL/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
+ )
+ ENDIF (NOT OSMESA_LIBRARY)
+
+diff -Naur VTK-4.2.6-original/CMakeLists.txt VTK-4.2.6-changed/CMakeLists.txt
+--- VTK-4.2.6-original/CMakeLists.txt 2004-03-03 22:28:17.000000000 +0300
++++ VTK-4.2.6-changed/CMakeLists.txt 2006-10-04 14:02:56.000000000 +0400
+@@ -448,8 +448,8 @@
+ # Configure Matrox Imaging support.
+ IF(VTK_USE_MATROX_IMAGING)
+ FIND_LIBRARY(MIL_LIBRARY MIL
+- "C:/Program Files/Matrox Imaging/mil/library/winnt/msc/dll"
+- "C:/Program Files/Matrox Imaging/mil/library/windows/msc/dll"
++ "C:/Program Files/Matrox Imaging/mil/lib64rary/winnt/msc/dll"
++ "C:/Program Files/Matrox Imaging/mil/lib64rary/windows/msc/dll"
+ )
+ FIND_PATH(MIL_INCLUDE_PATH mil.h
+ "C:/Program Files/Matrox Imaging/mil/include"
+@@ -698,11 +698,11 @@
+ ENDIF(VTK_USE_PARALLEL)
+
+ # Install cmake extensions so user projects can load them.
+-INSTALL_FILES(/lib/vtk/CMake FILES
++INSTALL_FILES(/lib64/vtk/CMake FILES
+ ${VTK_SOURCE_DIR}/CMake/vtkLoadCMakeExtensions.cmake)
+ FOREACH(cmd VTK_WRAP_TCL2 VTK_WRAP_PYTHON2 VTK_WRAP_JAVA2
+ VTK_MAKE_INSTANTIATOR2 VTK_GENERATE_JAVA_DEPENDENCIES)
+- INSTALL_FILES(/lib/vtk/CMake FILES
++ INSTALL_FILES(/lib64/vtk/CMake FILES
+ "${VTK_BINARY_DIR}/CMake/${CMAKE_SHARED_MODULE_PREFIX}cm${cmd}${CMAKE_SHARED_MODULE_SUFFIX}"
+ )
+ ENDFOREACH(cmd)
+@@ -710,7 +710,7 @@
+ # Save the compiler settings so another project can import them.
+ INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
+ CMAKE_EXPORT_BUILD_SETTINGS(${VTK_BINARY_DIR}/VTKBuildSettings.cmake)
+-INSTALL_FILES(/lib/vtk .cmake VTKBuildSettings)
++INSTALL_FILES(/lib64/vtk .cmake VTKBuildSettings)
+
+ # Save library dependencies.
+ EXPORT_LIBRARY_DEPENDENCIES(${VTK_BINARY_DIR}/VTKLibraryDepends.cmake)
+@@ -720,9 +720,9 @@
+
+ # Install some files.
+ INSTALL_FILES(/include/vtk .h vtkConfigure vtkToolkits)
+-INSTALL_FILES(/lib/vtk .cmake UseVTK VTKLibraryDepends)
++INSTALL_FILES(/lib64/vtk .cmake UseVTK VTKLibraryDepends)
+ IF(VTK_WRAP_HINTS)
+- INSTALL_FILES(/lib/vtk FILES ${VTK_WRAP_HINTS})
++ INSTALL_FILES(/lib64/vtk FILES ${VTK_WRAP_HINTS})
+ ENDIF(VTK_WRAP_HINTS)
+
+ #-----------------------------------------------------------------------------
+diff -Naur VTK-4.2.6-original/Common/CMakeLists.txt VTK-4.2.6-changed/Common/CMakeLists.txt
+--- VTK-4.2.6-original/Common/CMakeLists.txt 2003-02-13 00:48:52.000000000 +0300
++++ VTK-4.2.6-changed/Common/CMakeLists.txt 2006-10-04 14:03:25.000000000 +0400
+@@ -250,7 +250,7 @@
+ VTK_WRAP_TCL2(vtkCommonTCL CommonTCL_SRCS ${Common_SRCS})
+ ADD_LIBRARY(vtkCommonTCL ${CommonTCL_SRCS} vtkTclUtil.cxx)
+ TARGET_LINK_LIBRARIES (vtkCommonTCL ${TCL_LIBRARY} vtkCommon)
+- INSTALL_TARGETS(/lib/vtk vtkCommonTCL)
++ INSTALL_TARGETS(/lib64/vtk vtkCommonTCL)
+ INSTALL_FILES(/include/vtk .h
+ vtkTclUtil
+ )
+@@ -271,7 +271,7 @@
+ ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(vtkCommonPython vtkCommon)
+
+- INSTALL_TARGETS(/lib/vtk vtkCommonPython)
++ INSTALL_TARGETS(/lib64/vtk vtkCommonPython)
+ INSTALL_FILES(/include/vtk .h
+ vtkPythonUtil
+ )
+@@ -284,13 +284,13 @@
+ VTK_WRAP_JAVA2(vtkCommonJava CommonJava_SRCS ${Common_SRCS})
+ ADD_LIBRARY(vtkCommonJava SHARED ${CommonJava_SRCS} vtkJavaUtil.cxx)
+ TARGET_LINK_LIBRARIES(vtkCommonJava vtkCommon)
+- INSTALL_TARGETS(/lib/vtk vtkCommonJava)
++ INSTALL_TARGETS(/lib64/vtk vtkCommonJava)
+ INSTALL_FILES(/include/vtk .h
+ vtkJavaUtil
+ )
+ ENDIF (VTK_WRAP_JAVA)
+
+-INSTALL_TARGETS(/lib/vtk vtkCommon)
++INSTALL_TARGETS(/lib64/vtk vtkCommon)
+ INSTALL_FILES(/include/vtk .h ${Common_SRCS}
+ vtkCellType
+ vtkSetGet
+@@ -306,7 +306,7 @@
+ vtkImageProgressIterator
+ )
+
+-INSTALL_FILES(/lib/vtk/testing FILES
++INSTALL_FILES(/lib64/vtk/testing FILES
+ ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
+ ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
+ ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl
+@@ -314,6 +314,6 @@
+ INSTALL_FILES(/include/vtk FILES
+ ${VTK_SOURCE_DIR}/Common/Testing/Cxx/vtkRegressionTestImage.h)
+ IF(VTK_USE_PARALLEL)
+- INSTALL_FILES(/lib/vtk/testing FILES
++ INSTALL_FILES(/lib64/vtk/testing FILES
+ ${VTK_SOURCE_DIR}/Common/Testing/Tcl/prtImageTest.tcl)
+ ENDIF(VTK_USE_PARALLEL)
+diff -Naur VTK-4.2.6-original/Common/Testing/Install/test.sh.in VTK-4.2.6-changed/Common/Testing/Install/test.sh.in
+--- VTK-4.2.6-original/Common/Testing/Install/test.sh.in 2006-10-04 11:09:49.000000000 +0400
++++ VTK-4.2.6-changed/Common/Testing/Install/test.sh.in 2006-10-04 11:09:24.000000000 +0400
+@@ -47,7 +47,7 @@
+ echo "Writing CMakeCache.txt"
+ (
+ cat > CMakeCache.txt <<EOF
+-VTK_DIR:FILEPATH=${CMAKE_INSTALL_PREFIX}/lib/vtk
++VTK_DIR:FILEPATH=${CMAKE_INSTALL_PREFIX}/lib64/vtk
+ EOF
+ )
+ }
+diff -Naur VTK-4.2.6-original/Filtering/CMakeLists.txt VTK-4.2.6-changed/Filtering/CMakeLists.txt
+--- VTK-4.2.6-original/Filtering/CMakeLists.txt 2003-02-13 00:48:52.000000000 +0300
++++ VTK-4.2.6-changed/Filtering/CMakeLists.txt 2006-10-04 14:03:53.000000000 +0400
+@@ -124,7 +124,7 @@
+ VTK_WRAP_TCL2(vtkFilteringTCL FilteringTCL_SRCS ${Filtering_SRCS})
+ ADD_LIBRARY(vtkFilteringTCL ${FilteringTCL_SRCS})
+ TARGET_LINK_LIBRARIES (vtkFilteringTCL vtkCommonTCL vtkFiltering ${TCL_LIBRARY})
+- INSTALL_TARGETS(/lib/vtk vtkFilteringTCL)
++ INSTALL_TARGETS(/lib64/vtk vtkFilteringTCL)
+ ENDIF (VTK_WRAP_TCL)
+
+ # if we are wrapping into Python then add the library and extra
+@@ -143,7 +143,7 @@
+ ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(vtkFilteringPython vtkFiltering)
+
+- INSTALL_TARGETS(/lib/vtk vtkFilteringPython)
++ INSTALL_TARGETS(/lib64/vtk vtkFilteringPython)
+ ENDIF (VTK_WRAP_PYTHON)
+
+ # if we are wrapping into Java then add the library and extra
+@@ -153,9 +153,9 @@
+ VTK_WRAP_JAVA2(vtkFilteringJava FilteringJava_SRCS ${Filtering_SRCS})
+ ADD_LIBRARY(vtkFilteringJava SHARED ${FilteringJava_SRCS})
+ TARGET_LINK_LIBRARIES (vtkFilteringJava vtkCommonJava vtkFiltering)
+- INSTALL_TARGETS(/lib/vtk vtkFilteringJava)
++ INSTALL_TARGETS(/lib64/vtk vtkFilteringJava)
+ ENDIF (VTK_WRAP_JAVA)
+
+
+-INSTALL_TARGETS(/lib/vtk vtkFiltering)
++INSTALL_TARGETS(/lib64/vtk vtkFiltering)
+ INSTALL_FILES(/include/vtk .h ${Filtering_SRCS})
+diff -Naur VTK-4.2.6-original/Graphics/CMakeLists.txt VTK-4.2.6-changed/Graphics/CMakeLists.txt
+--- VTK-4.2.6-original/Graphics/CMakeLists.txt 2003-11-07 19:07:10.000000000 +0300
++++ VTK-4.2.6-changed/Graphics/CMakeLists.txt 2006-10-04 14:04:03.000000000 +0400
+@@ -190,7 +190,7 @@
+ ADD_LIBRARY(vtkGraphicsTCL ${GraphicsTCL_SRCS})
+ TARGET_LINK_LIBRARIES (vtkGraphicsTCL vtkFilteringTCL vtkGraphics
+ ${TCL_LIBRARY})
+- INSTALL_TARGETS(/lib/vtk vtkGraphicsTCL)
++ INSTALL_TARGETS(/lib64/vtk vtkGraphicsTCL)
+ ENDIF (VTK_WRAP_TCL)
+
+ # if we are wrapping into Python then add the library and extra
+@@ -211,7 +211,7 @@
+ ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(vtkGraphicsPython vtkGraphics)
+
+- INSTALL_TARGETS(/lib/vtk vtkGraphicsPython)
++ INSTALL_TARGETS(/lib64/vtk vtkGraphicsPython)
+ ENDIF (VTK_WRAP_PYTHON)
+
+ # if we are wrapping into Java then add the library and extra
+@@ -222,10 +222,10 @@
+ ADD_LIBRARY(vtkGraphicsJava SHARED ${GraphicsJava_SRCS})
+ TARGET_LINK_LIBRARIES (vtkGraphicsJava vtkCommonJava vtkFilteringJava
+ vtkGraphics)
+- INSTALL_TARGETS(/lib/vtk vtkGraphicsJava)
++ INSTALL_TARGETS(/lib64/vtk vtkGraphicsJava)
+ ENDIF (VTK_WRAP_JAVA)
+
+
+-INSTALL_TARGETS(/lib/vtk vtkGraphics)
++INSTALL_TARGETS(/lib64/vtk vtkGraphics)
+ INSTALL_FILES(/include/vtk .h ${Graphics_SRCS})
+
+diff -Naur VTK-4.2.6-original/Hybrid/CMakeLists.txt VTK-4.2.6-changed/Hybrid/CMakeLists.txt
+--- VTK-4.2.6-original/Hybrid/CMakeLists.txt 2003-11-11 20:50:47.000000000 +0300
++++ VTK-4.2.6-changed/Hybrid/CMakeLists.txt 2006-10-04 14:04:13.000000000 +0400
+@@ -94,7 +94,7 @@
+ ENDIF (VTK_USE_MATROX_IMAGING)
+ ENDIF (WIN32)
+
+- INSTALL_TARGETS(/lib/vtk vtkHybridTCL)
++ INSTALL_TARGETS(/lib64/vtk vtkHybridTCL)
+ ENDIF (VTK_WRAP_TCL)
+
+ # if we are wrapping into Python then add the library and extra
+@@ -123,7 +123,7 @@
+ ENDIF (VTK_USE_MATROX_IMAGING)
+ ENDIF (WIN32)
+
+- INSTALL_TARGETS(/lib/vtk vtkHybridPython)
++ INSTALL_TARGETS(/lib64/vtk vtkHybridPython)
+ ENDIF (VTK_WRAP_PYTHON)
+
+ IF (VTK_WRAP_JAVA)
+@@ -139,7 +139,7 @@
+ ENDIF (VTK_USE_MATROX_IMAGING)
+ ENDIF (WIN32)
+
+- INSTALL_TARGETS(/lib/vtk vtkHybridJava)
++ INSTALL_TARGETS(/lib64/vtk vtkHybridJava)
+ ENDIF (VTK_WRAP_JAVA)
+
+ TARGET_LINK_LIBRARIES (vtkHybrid vtkRendering vtkIO)
+@@ -153,6 +153,6 @@
+ ENDIF (VTK_USE_MATROX_IMAGING)
+ ENDIF (WIN32)
+
+-INSTALL_TARGETS(/lib/vtk vtkHybrid)
++INSTALL_TARGETS(/lib64/vtk vtkHybrid)
+ INSTALL_FILES(/include/vtk .h ${Hybrid_SRCS})
+ INSTALL_FILES(/include/vtk .h vtk3DS)
+diff -Naur VTK-4.2.6-original/Imaging/CMakeLists.txt VTK-4.2.6-changed/Imaging/CMakeLists.txt
+--- VTK-4.2.6-original/Imaging/CMakeLists.txt 2003-11-07 19:05:44.000000000 +0300
++++ VTK-4.2.6-changed/Imaging/CMakeLists.txt 2006-10-04 14:04:31.000000000 +0400
+@@ -144,7 +144,7 @@
+ vtkFilteringTCL
+ vtkImaging
+ ${TCL_LIBRARY})
+- INSTALL_TARGETS(/lib/vtk vtkImagingTCL)
++ INSTALL_TARGETS(/lib64/vtk vtkImagingTCL)
+ ENDIF (VTK_WRAP_TCL)
+
+ # if we are wrapping into Python then add the library and extra
+@@ -165,7 +165,7 @@
+ ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(vtkImagingPython vtkImaging)
+
+- INSTALL_TARGETS(/lib/vtk vtkImagingPython)
++ INSTALL_TARGETS(/lib64/vtk vtkImagingPython)
+ ENDIF (VTK_WRAP_PYTHON)
+
+ # if we are wrapping into Java then add the library and extra
+@@ -178,8 +178,8 @@
+ vtkCommonJava
+ vtkFilteringJava
+ vtkImaging)
+- INSTALL_TARGETS(/lib/vtk vtkImagingJava)
++ INSTALL_TARGETS(/lib64/vtk vtkImagingJava)
+ ENDIF (VTK_WRAP_JAVA)
+
+-INSTALL_TARGETS(/lib/vtk vtkImaging)
++INSTALL_TARGETS(/lib64/vtk vtkImaging)
+ INSTALL_FILES(/include/vtk .h ${Imaging_SRCS})
+diff -Naur VTK-4.2.6-original/IO/CMakeLists.txt VTK-4.2.6-changed/IO/CMakeLists.txt
+--- VTK-4.2.6-original/IO/CMakeLists.txt 2003-02-13 00:48:53.000000000 +0300
++++ VTK-4.2.6-changed/IO/CMakeLists.txt 2006-10-04 14:04:22.000000000 +0400
+@@ -162,7 +162,7 @@
+ vtkFilteringTCL
+ vtkIO
+ ${TCL_LIBRARY})
+- INSTALL_TARGETS(/lib/vtk vtkIOTCL)
++ INSTALL_TARGETS(/lib64/vtk vtkIOTCL)
+ ENDIF (VTK_WRAP_TCL)
+
+ # if we are wrapping into Python then add the library and extra
+@@ -183,7 +183,7 @@
+ ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(vtkIOPython vtkIO)
+
+- INSTALL_TARGETS(/lib/vtk vtkIOPython)
++ INSTALL_TARGETS(/lib64/vtk vtkIOPython)
+ ENDIF (VTK_WRAP_PYTHON)
+
+ # if we are wrapping into Java then add the library and extra
+@@ -196,9 +196,9 @@
+ vtkCommonJava
+ vtkFilteringJava
+ vtkIO)
+- INSTALL_TARGETS(/lib/vtk vtkIOJava)
++ INSTALL_TARGETS(/lib64/vtk vtkIOJava)
+ ENDIF (VTK_WRAP_JAVA)
+
+
+-INSTALL_TARGETS(/lib/vtk vtkIO)
++INSTALL_TARGETS(/lib64/vtk vtkIO)
+ INSTALL_FILES(/include/vtk .h ${IO_SRCS})
+diff -Naur VTK-4.2.6-original/Parallel/CMakeLists.txt VTK-4.2.6-changed/Parallel/CMakeLists.txt
+--- VTK-4.2.6-original/Parallel/CMakeLists.txt 2003-02-17 23:00:36.000000000 +0300
++++ VTK-4.2.6-changed/Parallel/CMakeLists.txt 2006-10-04 14:04:41.000000000 +0400
+@@ -108,7 +108,7 @@
+ VTK_WRAP_TCL2(vtkParallelTCL ParallelTCL_SRCS ${Parallel_SRCS})
+ ADD_LIBRARY(vtkParallelTCL ${ParallelTCL_SRCS})
+ TARGET_LINK_LIBRARIES (vtkParallelTCL vtkParallel vtkIOTCL vtkRenderingTCL)
+- INSTALL_TARGETS(/lib/vtk vtkParallelTCL)
++ INSTALL_TARGETS(/lib64/vtk vtkParallelTCL)
+ ENDIF (VTK_WRAP_TCL)
+
+ # if we are wrapping into Python then add the library and extra
+@@ -129,19 +129,19 @@
+ ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(vtkParallelPython vtkParallel)
+
+- INSTALL_TARGETS(/lib/vtk vtkParallelPython)
++ INSTALL_TARGETS(/lib64/vtk vtkParallelPython)
+ ENDIF (VTK_WRAP_PYTHON)
+
+ IF (VTK_WRAP_JAVA)
+ VTK_WRAP_JAVA2(vtkParallelJava ParallelJava_SRCS ${Parallel_SRCS})
+ ADD_LIBRARY(vtkParallelJava SHARED ${ParallelJava_SRCS})
+ TARGET_LINK_LIBRARIES (vtkParallelJava vtkParallel vtkRenderingJava vtkIOJava)
+- INSTALL_TARGETS(/lib/vtk vtkParallelJava)
++ INSTALL_TARGETS(/lib64/vtk vtkParallelJava)
+ ENDIF (VTK_WRAP_JAVA)
+
+ TARGET_LINK_LIBRARIES (vtkParallel vtkRendering vtkIO)
+
+-INSTALL_TARGETS(/lib/vtk vtkParallel)
++INSTALL_TARGETS(/lib64/vtk vtkParallel)
+ INSTALL_FILES(/include/vtk .h ${Parallel_SRCS})
+ IF (VTK_USE_MPI)
+ INSTALL_FILES(/include/vtk "vtkMPI\\.h")
+diff -Naur VTK-4.2.6-original/Patented/CMakeLists.txt VTK-4.2.6-changed/Patented/CMakeLists.txt
+--- VTK-4.2.6-original/Patented/CMakeLists.txt 2003-02-13 00:48:53.000000000 +0300
++++ VTK-4.2.6-changed/Patented/CMakeLists.txt 2006-10-04 14:04:52.000000000 +0400
+@@ -39,7 +39,7 @@
+ ADD_LIBRARY(vtkPatentedTCL ${PatentedTCL_SRCS})
+ TARGET_LINK_LIBRARIES (vtkPatentedTCL vtkPatented vtkIOTCL vtkGraphicsTCL
+ vtkImagingTCL)
+- INSTALL_TARGETS(/lib/vtk vtkPatentedTCL)
++ INSTALL_TARGETS(/lib64/vtk vtkPatentedTCL)
+ ENDIF (VTK_WRAP_TCL)
+
+ # if we are wrapping into Python then add the library and extra
+@@ -60,7 +60,7 @@
+ ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(vtkPatentedPython vtkPatented)
+
+- INSTALL_TARGETS(/lib/vtk vtkPatentedPython)
++ INSTALL_TARGETS(/lib64/vtk vtkPatentedPython)
+ ENDIF (VTK_WRAP_PYTHON)
+
+ # if we are wrapping into Java then add the library and extra
+@@ -71,7 +71,7 @@
+ ADD_LIBRARY(vtkPatentedJava SHARED ${PatentedJava_SRCS})
+ TARGET_LINK_LIBRARIES (vtkPatentedJava vtkPatented vtkImagingJava
+ vtkGraphicsJava)
+- INSTALL_TARGETS(/lib/vtk vtkPatentedJava)
++ INSTALL_TARGETS(/lib64/vtk vtkPatentedJava)
+ ENDIF (VTK_WRAP_JAVA)
+
+ TARGET_LINK_LIBRARIES ( vtkPatented
+@@ -80,5 +80,5 @@
+ vtkIO
+ )
+
+-INSTALL_TARGETS(/lib/vtk vtkPatented)
++INSTALL_TARGETS(/lib64/vtk vtkPatented)
+ INSTALL_FILES(/include/vtk .h ${Patented_SRCS})
+diff -Naur VTK-4.2.6-original/Rendering/CMakeLists.txt VTK-4.2.6-changed/Rendering/CMakeLists.txt
+--- VTK-4.2.6-original/Rendering/CMakeLists.txt 2003-02-17 23:32:16.000000000 +0300
++++ VTK-4.2.6-changed/Rendering/CMakeLists.txt 2006-10-04 14:05:10.000000000 +0400
+@@ -344,7 +344,7 @@
+ IF (TK_LIBRARY)
+ TARGET_LINK_LIBRARIES (vtkRenderingTCL ${TK_LIBRARY})
+ ENDIF (TK_LIBRARY)
+- INSTALL_TARGETS(/lib/vtk vtkRenderingTCL)
++ INSTALL_TARGETS(/lib64/vtk vtkRenderingTCL)
+ ENDIF (VTK_WRAP_TCL)
+
+ # if we are wrapping into Python then add the library and extra
+@@ -368,7 +368,7 @@
+ ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(vtkRenderingPython vtkRendering)
+
+- INSTALL_TARGETS(/lib/vtk vtkRenderingPython)
++ INSTALL_TARGETS(/lib64/vtk vtkRenderingPython)
+ IF (TK_LIBRARY)
+ IF(NOT VTK_USE_COCOA)
+ SET(RenderingPythonTkWidgets_SRCS
+@@ -382,7 +382,7 @@
+ vtkRendering
+ ${TCL_LIBRARY}
+ ${TK_LIBRARY})
+- INSTALL_TARGETS(/lib/vtk vtkRenderingPythonTkWidgets)
++ INSTALL_TARGETS(/lib64/vtk vtkRenderingPythonTkWidgets)
+ ENDIF(NOT VTK_USE_COCOA)
+ ENDIF (TK_LIBRARY)
+ ENDIF (VTK_WRAP_PYTHON)
+@@ -403,7 +403,7 @@
+ TARGET_LINK_LIBRARIES (vtkRenderingJava ${JAVA_AWT_LIBRARY})
+ ENDIF (JAVA_AWT_LIBRARY)
+
+- INSTALL_TARGETS(/lib/vtk vtkRenderingJava)
++ INSTALL_TARGETS(/lib64/vtk vtkRenderingJava)
+ ENDIF (VTK_WRAP_JAVA)
+
+
+@@ -412,7 +412,7 @@
+ ADD_DEFINITIONS(${CMAKE_X_CFLAGS})
+ ENDIF(VTK_USE_X)
+
+-INSTALL_TARGETS(/lib/vtk vtkRendering)
++INSTALL_TARGETS(/lib64/vtk vtkRendering)
+ INSTALL_FILES(/include/vtk .h ${Rendering_SRCS} ${RenderingOpenGL_SRCS})
+
+ CONFIGURE_FILE(
+diff -Naur VTK-4.2.6-original/Utilities/CMakeLists.txt VTK-4.2.6-changed/Utilities/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/CMakeLists.txt 2003-02-12 02:04:12.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/CMakeLists.txt 2006-10-04 14:08:06.000000000 +0400
+@@ -12,4 +12,4 @@
+
+ # This is the installed VTKConfig.cmake file configured at the top
+ # level.
+-INSTALL_FILES(/lib/vtk .cmake VTKConfig)
++INSTALL_FILES(/lib64/vtk .cmake VTKConfig)
+diff -Naur VTK-4.2.6-original/Utilities/Doxygen/CMakeLists.txt VTK-4.2.6-changed/Utilities/Doxygen/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/Doxygen/CMakeLists.txt 2002-11-19 21:41:34.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/Doxygen/CMakeLists.txt 2006-10-04 14:08:13.000000000 +0400
+@@ -24,9 +24,9 @@
+
+ INCLUDE (${VTK_SOURCE_DIR}/Utilities/Doxygen/LocalUserOptions.cmake OPTIONAL)
+
+-INSTALL_FILES(/lib/vtk/doxygen "\\.css$")
+-INSTALL_FILES(/lib/vtk/doxygen "\\.gif$")
+-INSTALL_FILES(/lib/vtk/doxygen "\\.html$")
+-INSTALL_FILES(/lib/vtk/doxygen "\\.pl$")
+-INSTALL_FILES(/lib/vtk/doxygen "\\.stop$")
+-INSTALL_FILES(/lib/vtk/doxygen .txt authors doc_readme)
++INSTALL_FILES(/lib64/vtk/doxygen "\\.css$")
++INSTALL_FILES(/lib64/vtk/doxygen "\\.gif$")
++INSTALL_FILES(/lib64/vtk/doxygen "\\.html$")
++INSTALL_FILES(/lib64/vtk/doxygen "\\.pl$")
++INSTALL_FILES(/lib64/vtk/doxygen "\\.stop$")
++INSTALL_FILES(/lib64/vtk/doxygen .txt authors doc_readme)
+diff -Naur VTK-4.2.6-original/Utilities/expat/CMakeLists.txt VTK-4.2.6-changed/Utilities/expat/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/expat/CMakeLists.txt 2003-01-21 01:04:02.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/expat/CMakeLists.txt 2006-10-04 14:08:19.000000000 +0400
+@@ -25,5 +25,5 @@
+
+ ADD_LIBRARY(vtkexpat ${expat_SRCS})
+
+-INSTALL_TARGETS(/lib/vtk vtkexpat)
++INSTALL_TARGETS(/lib64/vtk vtkexpat)
+ INSTALL_FILES(/include/vtk .h expat expatDllConfig)
+diff -Naur VTK-4.2.6-original/Utilities/freetype/CMakeLists.txt VTK-4.2.6-changed/Utilities/freetype/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/freetype/CMakeLists.txt 2003-02-06 22:19:37.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/freetype/CMakeLists.txt 2006-10-04 14:08:25.000000000 +0400
+@@ -100,7 +100,7 @@
+ IF (APPLE)
+ TARGET_LINK_LIBRARIES(vtkfreetype "-framework AppKit")
+ ENDIF (APPLE)
+-INSTALL_TARGETS (/lib/vtk vtkfreetype)
++INSTALL_TARGETS (/lib64/vtk vtkfreetype)
+
+ #
+ # Do not cover this lib
+diff -Naur VTK-4.2.6-original/Utilities/ftgl/CMakeLists.txt VTK-4.2.6-changed/Utilities/ftgl/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/ftgl/CMakeLists.txt 2003-02-13 02:13:49.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/ftgl/CMakeLists.txt 2006-10-04 14:08:30.000000000 +0400
+@@ -146,7 +146,7 @@
+ #
+ ADD_LIBRARY (vtkftgl ${FTGL_SRCS})
+ TARGET_LINK_LIBRARIES(vtkftgl ${VTKFTGL_LIBS})
+-INSTALL_TARGETS (/lib/vtk vtkftgl)
++INSTALL_TARGETS (/lib64/vtk vtkftgl)
+
+ #
+ # Do not cover this lib
+@@ -197,12 +197,12 @@
+ IF (VTK_USE_X)
+ SET (VTKFTGL_EXAMPLES_LIBS "${VTKFTGL_EXAMPLES_LIBS};-lXt")
+ FIND_LIBRARY (XMU_LIBRARY Xmu
+- /usr/lib
+- /usr/local/lib
+- /opt/graphics/OpenGL/lib
+- /usr/openwin/lib
+- /usr/X11R6/lib
+- /usr/contrib/X11R6/lib
++ /usr/lib64
++ /usr/local/lib64
++ /opt/graphics/OpenGL/lib64
++ /usr/openwin/lib64
++ /usr/X11R6/lib64
++ /usr/contrib/X11R6/lib64
+ )
+ MARK_AS_ADVANCED (XMU_LIBRARY)
+ IF (XMU_LIBRARY)
+diff -Naur VTK-4.2.6-original/Utilities/jpeg/CMakeLists.txt VTK-4.2.6-changed/Utilities/jpeg/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/jpeg/CMakeLists.txt 2002-07-17 15:58:54.000000000 +0400
++++ VTK-4.2.6-changed/Utilities/jpeg/CMakeLists.txt 2006-10-04 14:08:36.000000000 +0400
+@@ -48,5 +48,5 @@
+
+ ADD_LIBRARY(vtkjpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
+
+-INSTALL_TARGETS(/lib/vtk vtkjpeg)
++INSTALL_TARGETS(/lib64/vtk vtkjpeg)
+
+diff -Naur VTK-4.2.6-original/Utilities/png/CMakeLists.txt VTK-4.2.6-changed/Utilities/png/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/png/CMakeLists.txt 2003-02-04 17:38:36.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/png/CMakeLists.txt 2006-10-04 14:08:42.000000000 +0400
+@@ -29,5 +29,5 @@
+ ADD_LIBRARY(vtkpng ${PNG_SRCS})
+ TARGET_LINK_LIBRARIES(vtkpng ${VTK_ZLIB_LIBRARIES})
+
+-INSTALL_TARGETS(/lib/vtk vtkpng)
++INSTALL_TARGETS(/lib64/vtk vtkpng)
+ INSTALL_FILES(/include/vtk .h png pngconf pngDllConfig)
+diff -Naur VTK-4.2.6-original/Utilities/tiff/CMakeLists.txt VTK-4.2.6-changed/Utilities/tiff/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/tiff/CMakeLists.txt 2003-02-04 17:38:36.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/tiff/CMakeLists.txt 2006-10-04 14:08:47.000000000 +0400
+@@ -64,5 +64,5 @@
+ ADD_LIBRARY(vtktiff ${common_SRCS})
+ TARGET_LINK_LIBRARIES( vtktiff ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES} )
+
+-INSTALL_TARGETS(/lib/vtk vtktiff)
++INSTALL_TARGETS(/lib64/vtk vtktiff)
+ INSTALL_FILES(/include/vtk .h tiffDllConfig tiffvers tiff tiffio tconf)
+diff -Naur VTK-4.2.6-original/Utilities/zlib/CMakeLists.txt VTK-4.2.6-changed/Utilities/zlib/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/zlib/CMakeLists.txt 2002-11-20 18:09:01.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/zlib/CMakeLists.txt 2006-10-04 14:08:53.000000000 +0400
+@@ -33,5 +33,5 @@
+
+ ADD_LIBRARY(vtkzlib ${ZLIB_SRCS})
+
+-INSTALL_TARGETS(/lib/vtk vtkzlib)
++INSTALL_TARGETS(/lib64/vtk vtkzlib)
+ INSTALL_FILES(/include/vtk .h zlib zconf zlibDllConfig)
+diff -Naur VTK-4.2.6-original/vtkGenerateVTKConfig.cmake VTK-4.2.6-changed/vtkGenerateVTKConfig.cmake
+--- VTK-4.2.6-original/vtkGenerateVTKConfig.cmake 2003-11-12 19:32:15.000000000 +0300
++++ VTK-4.2.6-changed/vtkGenerateVTKConfig.cmake 2006-10-03 17:41:55.000000000 +0400
+@@ -113,15 +113,15 @@
+ # Settings specific to the install tree.
+
+ # The "use" file.
+-SET(VTK_USE_FILE ${CMAKE_INSTALL_PREFIX}/lib/vtk/UseVTK.cmake)
++SET(VTK_USE_FILE ${CMAKE_INSTALL_PREFIX}/lib64/vtk/UseVTK.cmake)
+
+ # The build settings file.
+-SET(VTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib/vtk/VTKBuildSettings.cmake)
++SET(VTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib64/vtk/VTKBuildSettings.cmake)
+
+ # The wrapping hints file.
+ IF(VTK_WRAP_HINTS)
+ GET_FILENAME_COMPONENT(VTK_HINTS_FNAME ${VTK_WRAP_HINTS} NAME)
+- SET(VTK_WRAP_HINTS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/${VTK_HINTS_FNAME})
++ SET(VTK_WRAP_HINTS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/${VTK_HINTS_FNAME})
+ ENDIF(VTK_WRAP_HINTS)
+
+ # Include directories.
+@@ -131,7 +131,7 @@
+ )
+
+ # Link directories.
+-SET(VTK_LIBRARY_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk)
++SET(VTK_LIBRARY_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk)
+
+ # Executable locations.
+ SET(VTK_TCL_HOME_CONFIG "")
+@@ -143,7 +143,7 @@
+ SET(VTK_DOXYGEN_HOME_CONFIG "")
+ IF(VTK_WRAP_TCL)
+ SET(VTK_WRAP_TCL_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkWrapTcl)
+- SET(VTK_TCL_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/tcl)
++ SET(VTK_TCL_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/tcl)
+ ENDIF(VTK_WRAP_TCL)
+ IF(VTK_WRAP_PYTHON)
+ SET(VTK_WRAP_PYTHON_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkWrapPython)
+@@ -151,18 +151,18 @@
+ IF(VTK_WRAP_JAVA)
+ SET(VTK_PARSE_JAVA_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkParseJava)
+ SET(VTK_WRAP_JAVA_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkWrapJava)
+- SET(VTK_JAVA_JAR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/java/vtk.jar)
++ SET(VTK_JAVA_JAR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/java/vtk.jar)
+ ENDIF(VTK_WRAP_JAVA)
+
+ # VTK style script locations.
+-SET(VTK_DOXYGEN_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/doxygen)
+-SET(VTK_HEADER_TESTING_PY_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/HeaderTesting.py)
+-SET(VTK_FIND_STRING_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/FindString.tcl)
+-SET(VTK_PRINT_SELF_CHECK_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/PrintSelfCheck.tcl)
+-SET(VTK_RT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/rtImageTest.tcl)
++SET(VTK_DOXYGEN_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/doxygen)
++SET(VTK_HEADER_TESTING_PY_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/HeaderTesting.py)
++SET(VTK_FIND_STRING_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/FindString.tcl)
++SET(VTK_PRINT_SELF_CHECK_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/PrintSelfCheck.tcl)
++SET(VTK_RT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/rtImageTest.tcl)
+
+ IF(VTK_USE_PARALLEL)
+- SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/prtImageTest.tcl)
++ SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/prtImageTest.tcl)
+ ELSE(VTK_USE_PARALLEL)
+ SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG "")
+ ENDIF(VTK_USE_PARALLEL)
+@@ -191,11 +191,11 @@
+
+ # CMake extension module directory and macro file.
+ SET(VTK_LOAD_CMAKE_EXTENSIONS_MACRO_CONFIG
+- "${CMAKE_INSTALL_PREFIX}/lib/vtk/CMake/vtkLoadCMakeExtensions.cmake")
+-SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/CMake)
++ "${CMAKE_INSTALL_PREFIX}/lib64/vtk/CMake/vtkLoadCMakeExtensions.cmake")
++SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/CMake)
+
+ # Library dependencies file.
+-SET(VTK_LIBRARY_DEPENDS_FILE "${CMAKE_INSTALL_PREFIX}/lib/vtk/VTKLibraryDepends.cmake")
++SET(VTK_LIBRARY_DEPENDS_FILE "${CMAKE_INSTALL_PREFIX}/lib64/vtk/VTKLibraryDepends.cmake")
+
+ #-----------------------------------------------------------------------------
+ # Configure VTKConfig.cmake for the install tree.
+diff -Naur VTK-4.2.6-original/vtkMacros.cmake VTK-4.2.6-changed/vtkMacros.cmake
+--- VTK-4.2.6-original/vtkMacros.cmake 2003-01-27 19:15:03.000000000 +0300
++++ VTK-4.2.6-changed/vtkMacros.cmake 2006-10-03 17:42:06.000000000 +0400
+@@ -41,7 +41,7 @@
+ ENDIF (APPLE)
+ TARGET_LINK_LIBRARIES(vtk${KIT}TCL${VTK_VERSION}
+ ${DEPEND} vtk${KIT}${VTK_VERSION} ${TCL_LIBRARY})
+- INSTALL_TARGETS(/lib vtk${KIT}TCL${VTK_VERSION})
++ INSTALL_TARGETS(/lib64 vtk${KIT}TCL${VTK_VERSION})
+ ENDIF (VTK_WRAP_TCL)
+ ENDMACRO(VTK_USE_TCL)
+
+@@ -68,7 +68,7 @@
+ ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(vtk${KIT}Python${VTK_VERSION}
+ vtk${KIT}${VTK_VERSION})
+- INSTALL_TARGETS(/lib vtk${KIT}Python${VTK_VERSION})
++ INSTALL_TARGETS(/lib64 vtk${KIT}Python${VTK_VERSION})
+ ENDIF (VTK_WRAP_PYTHON)
+ ENDMACRO(VTK_USE_PYTHON)
+
+@@ -86,6 +86,6 @@
+ ADD_LIBRARY(vtk${KIT}Java${VTK_VERSION} SHARED ${${KIT}Java_SRCS})
+ TARGET_LINK_LIBRARIES (vtk${KIT}Java${VTK_VERSION}
+ ${DEPEND} vtk${KIT}${VTK_VERSION})
+- INSTALL_TARGETS(/lib vtk${KIT}Java${VTK_VERSION})
++ INSTALL_TARGETS(/lib64 vtk${KIT}Java${VTK_VERSION})
+ ENDIF (VTK_WRAP_JAVA)
+ ENDMACRO(VTK_USE_JAVA)
+diff -Naur VTK-4.2.6-original/Wrapping/Java/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Java/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Java/CMakeLists.txt 2003-07-29 21:47:09.000000000 +0400
++++ VTK-4.2.6-changed/Wrapping/Java/CMakeLists.txt 2006-10-04 14:07:46.000000000 +0400
+@@ -58,8 +58,8 @@
+
+ FOREACH(kit ${KITS})
+ IF(APPLE)
+- SET(src ${LIBRARY_OUTPUT_PATH}/libvtk${kit}Java.dylib)
+- SET(tgt ${LIBRARY_OUTPUT_PATH}/libvtk${kit}Java.jnilib)
++ SET(src ${LIBRARY_OUTPUT_PATH}/lib64vtk${kit}Java.dylib)
++ SET(tgt ${LIBRARY_OUTPUT_PATH}/lib64vtk${kit}Java.jnilib)
+ ADD_CUSTOM_COMMAND(SOURCE ${src}
+ COMMAND ln
+ ARGS -sf ${src} ${tgt}
+@@ -210,7 +210,7 @@
+ DEPENDS ${LIBRARY_OUTPUT_PATH}/vtk.jar ${JAVA_TESTS}
+ )
+
+- INSTALL_FILES(/lib/vtk/java FILES ${LIBRARY_OUTPUT_PATH}/vtk.jar)
++ INSTALL_FILES(/lib64/vtk/java FILES ${LIBRARY_OUTPUT_PATH}/vtk.jar)
+ ENDIF(JAVA_ARCHIVE)
+ ENDIF(VTK_JAVA_NEW_STYLE)
+ ENDIF(JAVA_COMPILE)
+diff -Naur VTK-4.2.6-original/Wrapping/Python/setup.py.in VTK-4.2.6-changed/Wrapping/Python/setup.py.in
+--- VTK-4.2.6-original/Wrapping/Python/setup.py.in 2003-02-18 21:54:45.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Python/setup.py.in 2006-10-03 16:00:54.000000000 +0400
+@@ -22,7 +22,7 @@
+
+ # You can change this to suit your needs. However you must make sure
+ # that under *nix the libvtk*Python*.so in the specified directory.
+-install_lib_dir = "${CMAKE_INSTALL_PREFIX}/lib/vtk"
++install_lib_dir = "${CMAKE_INSTALL_PREFIX}/lib64/vtk"
+
+
+ def get_libs():
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/CMakeLists.txt 2003-04-08 19:00:30.000000000 +0400
++++ VTK-4.2.6-changed/Wrapping/Tcl/CMakeLists.txt 2006-10-04 14:07:33.000000000 +0400
+@@ -83,8 +83,8 @@
+ # Process all packages
+ SUBDIRS(vtk vtkbase vtkcommon vtkfiltering vtkgraphics vtkimaging vtkinteraction vtkio vtktesting)
+
+-INSTALL_FILES(/lib/vtk/tcl "" README)
+-INSTALL_FILES(/lib/vtk/tcl .c vtktcl)
++INSTALL_FILES(/lib64/vtk/tcl "" README)
++INSTALL_FILES(/lib64/vtk/tcl .c vtktcl)
+
+ SET(VTK_TCL_RENDERING_CONFIG "")
+ SET(VTK_TCL_HYBRID_CONFIG "")
+@@ -142,7 +142,7 @@
+ CONFIGURE_FILE(${VTK_SOURCE_DIR}/Wrapping/Tcl/pkgIndex.tcl.in
+ ${VTK_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl
+ @ONLY IMMEDIATE)
+-INSTALL_FILES(/lib/vtk/tcl FILES
++INSTALL_FILES(/lib64/vtk/tcl FILES
+ ${VTK_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl)
+
+ # Allow the user to customize their build with some local options
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtk/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtk/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtk/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtk/CMakeLists.txt 2006-10-04 14:06:09.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtk .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtk .tcl
+ vtk
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkbase/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkbase/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkbase/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkbase/CMakeLists.txt 2006-10-04 14:06:17.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkbase .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkbase .tcl
+ vtkbase
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkcommon/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkcommon/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkcommon/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkcommon/CMakeLists.txt 2006-10-04 14:06:23.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkcommon .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkcommon .tcl
+ vtkcommon
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkfiltering/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkfiltering/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkfiltering/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkfiltering/CMakeLists.txt 2006-10-04 14:06:29.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkfiltering .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkfiltering .tcl
+ vtkfiltering
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkgraphics/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkgraphics/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkgraphics/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkgraphics/CMakeLists.txt 2006-10-04 14:06:34.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkgraphics .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkgraphics .tcl
+ vtkgraphics
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkhybrid/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkhybrid/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkhybrid/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkhybrid/CMakeLists.txt 2006-10-04 14:06:41.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkhybrid .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkhybrid .tcl
+ vtkhybrid
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkimaging/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkimaging/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkimaging/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkimaging/CMakeLists.txt 2006-10-04 14:06:47.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkimaging .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkimaging .tcl
+ vtkimaging
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkinteraction/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkinteraction/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkinteraction/CMakeLists.txt 2003-02-25 22:11:56.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkinteraction/CMakeLists.txt 2006-10-04 14:06:53.000000000 +0400
+@@ -1,4 +1,4 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkinteraction .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkinteraction .tcl
+ vtkinteraction
+ Interactor
+ bindings
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkio/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkio/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkio/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkio/CMakeLists.txt 2006-10-04 14:06:59.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkio .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkio .tcl
+ vtkio
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkparallel/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkparallel/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkparallel/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkparallel/CMakeLists.txt 2006-10-04 14:07:05.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkparallel .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkparallel .tcl
+ vtkparallel
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkpatented/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkpatented/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkpatented/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkpatented/CMakeLists.txt 2006-10-04 14:07:11.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkpatented .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkpatented .tcl
+ vtkpatented
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkrendering/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkrendering/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkrendering/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkrendering/CMakeLists.txt 2006-10-04 14:07:17.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkrendering .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkrendering .tcl
+ vtkrendering
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtktesting/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtktesting/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtktesting/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtktesting/CMakeLists.txt 2006-10-04 14:07:23.000000000 +0400
+@@ -1,4 +1,4 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtktesting .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtktesting .tcl
+ vtktesting
+ backdrop
+ grab
+++ /dev/null
-diff -Naur qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf qt-3.3.4-changed/mkspecs/linux-g++-64/qmake.conf
---- qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf 2005-01-21 20:16:44.000000000 +0300
-+++ qt-3.3.4-changed/mkspecs/linux-g++-64/qmake.conf 2006-10-12 14:09:27.000000000 +0400
-@@ -17,7 +17,7 @@
- QMAKE_LEXFLAGS =
- QMAKE_YACC = yacc
- QMAKE_YACCFLAGS = -d
--QMAKE_CFLAGS = -pipe
-+QMAKE_CFLAGS = -pipe -m64
- QMAKE_CFLAGS_DEPS = -M
- QMAKE_CFLAGS_WARN_ON = -Wall -W
- QMAKE_CFLAGS_WARN_OFF = -w
check_jb tar xfz ${SOURCE_DIR}/qt-3.3.4.tar.gz -C ${INSTALL_WORK}
+# apply patch for 64-bit platforms
if test `uname -m` = "x86_64" ; then
-cp qt-3.3.4.patch ${PRODUCT_WORK}
-cd ${PRODUCT_WORK}
-patch -p 1 -i qt-3.3.4.patch
-else
-cd ${PRODUCT_WORK}
+ if [ -f patches/qt-3.3.4-lib64.patch ] ; then
+ cp patches/qt-3.3.4-lib64.patch ${PRODUCT_WORK}
+ ( cd ${PRODUCT_WORK} ; patch -p1 < qt-3.3.4-lib64.patch )
+ fi
fi
+cd ${PRODUCT_WORK}
+
mv -f configure configure-orig
sed -e "s%read acceptance%acceptance=yes%" configure-orig > configure
chmod +x configure
+++ /dev/null
-diff -Naur sip-original/configure.py sip-changed/configure.py
---- sip-original/configure.py 2006-03-16 12:29:17.000000000 +0300
-+++ sip-changed/configure.py 2006-10-03 18:52:25.000000000 +0400
-@@ -405,7 +405,7 @@
- f.close()
-
- cmd = "gcc -c /tmp/testqtlicense.cxx -I${QTDIR}/include -o /tmp/testqtlicense.o > /dev/null ; "
-- cmd += "gcc /tmp/testqtlicense.o -L${QTDIR}/lib -lqt-mt -o /tmp/testqtlicense > /dev/null ; "
-+ cmd += "gcc /tmp/testqtlicense.o -L${QTDIR}/lib64 -lqt-mt -o /tmp/testqtlicense > /dev/null ; "
- cmd += "/tmp/testqtlicense > /tmp/testqtlicense.log"
-
- res = os.system(cmd)
-diff -Naur sip-original/specs/linux-g++-64 sip-changed/specs/linux-g++-64
---- sip-original/specs/linux-g++-64 2005-03-06 13:30:23.000000000 +0300
-+++ sip-changed/specs/linux-g++-64 2006-10-03 18:52:35.000000000 +0400
-@@ -43,7 +43,7 @@
- QMAKE_INCDIR_X11 = /usr/X11R6/include
- QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
- QMAKE_INCDIR_QT = $(QTDIR)/include
--QMAKE_LIBDIR_QT = $(QTDIR)/lib
-+QMAKE_LIBDIR_QT = $(QTDIR)/lib64
- QMAKE_INCDIR_OPENGL = /usr/X11R6/include
- QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
-
-diff -Naur sip-original/specs/linux-g++-64 sip-changed/specs/linux-g++-64
---- sip-original/specs/linux-g++-64 2005-03-06 13:30:23.000000000 +0300
-+++ sip-changed/specs/linux-g++-64 2006-10-16 15:54:00.000000000 +0400
-@@ -17,7 +17,7 @@
- QMAKE_LEXFLAGS =
- QMAKE_YACC = yacc
- QMAKE_YACCFLAGS = -d
--QMAKE_CFLAGS = -pipe
-+QMAKE_CFLAGS = -pipe -m64
- QMAKE_CFLAGS_DEPS = -M
- QMAKE_CFLAGS_WARN_ON = -Wall -W
- QMAKE_CFLAGS_WARN_OFF = -w
check_jb tar xfz ${SOURCE_DIR}/sip-4.2.1.tar.gz -C ${INSTALL_WORK}
- if test `uname -m` = "x86_64" ; then
- cp sip-4.2.1.patch ${PRODUCT_WORK}
- cd ${PRODUCT_WORK}
- patch -p 1 -i sip-4.2.1.patch
- else
- cd ${PRODUCT_WORK}
- fi
-
- if test `uname -m` = "x86_64" ; then
- SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt -p linux-g++-64"
- else
- SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt"
- fi
+# apply patch for 64-bit platforms
+if test `uname -m` = "x86_64" ; then
+ if [ -f patches/sip-4.2.1-lib64.patch ] ; then
+ cp patches/sip-4.2.1-lib64.patch ${PRODUCT_WORK}
+ ( cd ${PRODUCT_WORK} ; patch -p1 < sip-4.2.1-lib64.patch )
+ fi
+fi
+
+cd ${PRODUCT_WORK}
+
+if test `uname -m` = "x86_64" ; then
+ SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt -p linux-g++-64"
+else
+ SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt"
+fi
check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
python configure.py $SIP_CONFIGURE_OPTIONS
+++ /dev/null
-diff -Naur VTK-4.2.6-original/CMake/FindOSMesa.cmake VTK-4.2.6-changed/CMake/FindOSMesa.cmake
---- VTK-4.2.6-original/CMake/FindOSMesa.cmake 2003-02-12 02:05:20.000000000 +0300
-+++ VTK-4.2.6-changed/CMake/FindOSMesa.cmake 2006-10-03 11:33:54.000000000 +0400
-@@ -19,11 +19,11 @@
- # in the main Mesa library
- IF (NOT OSMESA_LIBRARY)
- FIND_LIBRARY(OSMESA_LIBRARY OSMesa
-- /usr/lib
-- /usr/local/lib
-- /opt/graphics/OpenGL/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /opt/graphics/OpenGL/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
- )
- ENDIF (NOT OSMESA_LIBRARY)
-
-diff -Naur VTK-4.2.6-original/CMakeLists.txt VTK-4.2.6-changed/CMakeLists.txt
---- VTK-4.2.6-original/CMakeLists.txt 2004-03-03 22:28:17.000000000 +0300
-+++ VTK-4.2.6-changed/CMakeLists.txt 2006-10-04 14:02:56.000000000 +0400
-@@ -448,8 +448,8 @@
- # Configure Matrox Imaging support.
- IF(VTK_USE_MATROX_IMAGING)
- FIND_LIBRARY(MIL_LIBRARY MIL
-- "C:/Program Files/Matrox Imaging/mil/library/winnt/msc/dll"
-- "C:/Program Files/Matrox Imaging/mil/library/windows/msc/dll"
-+ "C:/Program Files/Matrox Imaging/mil/lib64rary/winnt/msc/dll"
-+ "C:/Program Files/Matrox Imaging/mil/lib64rary/windows/msc/dll"
- )
- FIND_PATH(MIL_INCLUDE_PATH mil.h
- "C:/Program Files/Matrox Imaging/mil/include"
-@@ -698,11 +698,11 @@
- ENDIF(VTK_USE_PARALLEL)
-
- # Install cmake extensions so user projects can load them.
--INSTALL_FILES(/lib/vtk/CMake FILES
-+INSTALL_FILES(/lib64/vtk/CMake FILES
- ${VTK_SOURCE_DIR}/CMake/vtkLoadCMakeExtensions.cmake)
- FOREACH(cmd VTK_WRAP_TCL2 VTK_WRAP_PYTHON2 VTK_WRAP_JAVA2
- VTK_MAKE_INSTANTIATOR2 VTK_GENERATE_JAVA_DEPENDENCIES)
-- INSTALL_FILES(/lib/vtk/CMake FILES
-+ INSTALL_FILES(/lib64/vtk/CMake FILES
- "${VTK_BINARY_DIR}/CMake/${CMAKE_SHARED_MODULE_PREFIX}cm${cmd}${CMAKE_SHARED_MODULE_SUFFIX}"
- )
- ENDFOREACH(cmd)
-@@ -710,7 +710,7 @@
- # Save the compiler settings so another project can import them.
- INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
- CMAKE_EXPORT_BUILD_SETTINGS(${VTK_BINARY_DIR}/VTKBuildSettings.cmake)
--INSTALL_FILES(/lib/vtk .cmake VTKBuildSettings)
-+INSTALL_FILES(/lib64/vtk .cmake VTKBuildSettings)
-
- # Save library dependencies.
- EXPORT_LIBRARY_DEPENDENCIES(${VTK_BINARY_DIR}/VTKLibraryDepends.cmake)
-@@ -720,9 +720,9 @@
-
- # Install some files.
- INSTALL_FILES(/include/vtk .h vtkConfigure vtkToolkits)
--INSTALL_FILES(/lib/vtk .cmake UseVTK VTKLibraryDepends)
-+INSTALL_FILES(/lib64/vtk .cmake UseVTK VTKLibraryDepends)
- IF(VTK_WRAP_HINTS)
-- INSTALL_FILES(/lib/vtk FILES ${VTK_WRAP_HINTS})
-+ INSTALL_FILES(/lib64/vtk FILES ${VTK_WRAP_HINTS})
- ENDIF(VTK_WRAP_HINTS)
-
- #-----------------------------------------------------------------------------
-diff -Naur VTK-4.2.6-original/Common/CMakeLists.txt VTK-4.2.6-changed/Common/CMakeLists.txt
---- VTK-4.2.6-original/Common/CMakeLists.txt 2003-02-13 00:48:52.000000000 +0300
-+++ VTK-4.2.6-changed/Common/CMakeLists.txt 2006-10-04 14:03:25.000000000 +0400
-@@ -250,7 +250,7 @@
- VTK_WRAP_TCL2(vtkCommonTCL CommonTCL_SRCS ${Common_SRCS})
- ADD_LIBRARY(vtkCommonTCL ${CommonTCL_SRCS} vtkTclUtil.cxx)
- TARGET_LINK_LIBRARIES (vtkCommonTCL ${TCL_LIBRARY} vtkCommon)
-- INSTALL_TARGETS(/lib/vtk vtkCommonTCL)
-+ INSTALL_TARGETS(/lib64/vtk vtkCommonTCL)
- INSTALL_FILES(/include/vtk .h
- vtkTclUtil
- )
-@@ -271,7 +271,7 @@
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(vtkCommonPython vtkCommon)
-
-- INSTALL_TARGETS(/lib/vtk vtkCommonPython)
-+ INSTALL_TARGETS(/lib64/vtk vtkCommonPython)
- INSTALL_FILES(/include/vtk .h
- vtkPythonUtil
- )
-@@ -284,13 +284,13 @@
- VTK_WRAP_JAVA2(vtkCommonJava CommonJava_SRCS ${Common_SRCS})
- ADD_LIBRARY(vtkCommonJava SHARED ${CommonJava_SRCS} vtkJavaUtil.cxx)
- TARGET_LINK_LIBRARIES(vtkCommonJava vtkCommon)
-- INSTALL_TARGETS(/lib/vtk vtkCommonJava)
-+ INSTALL_TARGETS(/lib64/vtk vtkCommonJava)
- INSTALL_FILES(/include/vtk .h
- vtkJavaUtil
- )
- ENDIF (VTK_WRAP_JAVA)
-
--INSTALL_TARGETS(/lib/vtk vtkCommon)
-+INSTALL_TARGETS(/lib64/vtk vtkCommon)
- INSTALL_FILES(/include/vtk .h ${Common_SRCS}
- vtkCellType
- vtkSetGet
-@@ -306,7 +306,7 @@
- vtkImageProgressIterator
- )
-
--INSTALL_FILES(/lib/vtk/testing FILES
-+INSTALL_FILES(/lib64/vtk/testing FILES
- ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
- ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
- ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl
-@@ -314,6 +314,6 @@
- INSTALL_FILES(/include/vtk FILES
- ${VTK_SOURCE_DIR}/Common/Testing/Cxx/vtkRegressionTestImage.h)
- IF(VTK_USE_PARALLEL)
-- INSTALL_FILES(/lib/vtk/testing FILES
-+ INSTALL_FILES(/lib64/vtk/testing FILES
- ${VTK_SOURCE_DIR}/Common/Testing/Tcl/prtImageTest.tcl)
- ENDIF(VTK_USE_PARALLEL)
-diff -Naur VTK-4.2.6-original/Common/Testing/Install/test.sh.in VTK-4.2.6-changed/Common/Testing/Install/test.sh.in
---- VTK-4.2.6-original/Common/Testing/Install/test.sh.in 2006-10-04 11:09:49.000000000 +0400
-+++ VTK-4.2.6-changed/Common/Testing/Install/test.sh.in 2006-10-04 11:09:24.000000000 +0400
-@@ -47,7 +47,7 @@
- echo "Writing CMakeCache.txt"
- (
- cat > CMakeCache.txt <<EOF
--VTK_DIR:FILEPATH=${CMAKE_INSTALL_PREFIX}/lib/vtk
-+VTK_DIR:FILEPATH=${CMAKE_INSTALL_PREFIX}/lib64/vtk
- EOF
- )
- }
-diff -Naur VTK-4.2.6-original/Filtering/CMakeLists.txt VTK-4.2.6-changed/Filtering/CMakeLists.txt
---- VTK-4.2.6-original/Filtering/CMakeLists.txt 2003-02-13 00:48:52.000000000 +0300
-+++ VTK-4.2.6-changed/Filtering/CMakeLists.txt 2006-10-04 14:03:53.000000000 +0400
-@@ -124,7 +124,7 @@
- VTK_WRAP_TCL2(vtkFilteringTCL FilteringTCL_SRCS ${Filtering_SRCS})
- ADD_LIBRARY(vtkFilteringTCL ${FilteringTCL_SRCS})
- TARGET_LINK_LIBRARIES (vtkFilteringTCL vtkCommonTCL vtkFiltering ${TCL_LIBRARY})
-- INSTALL_TARGETS(/lib/vtk vtkFilteringTCL)
-+ INSTALL_TARGETS(/lib64/vtk vtkFilteringTCL)
- ENDIF (VTK_WRAP_TCL)
-
- # if we are wrapping into Python then add the library and extra
-@@ -143,7 +143,7 @@
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(vtkFilteringPython vtkFiltering)
-
-- INSTALL_TARGETS(/lib/vtk vtkFilteringPython)
-+ INSTALL_TARGETS(/lib64/vtk vtkFilteringPython)
- ENDIF (VTK_WRAP_PYTHON)
-
- # if we are wrapping into Java then add the library and extra
-@@ -153,9 +153,9 @@
- VTK_WRAP_JAVA2(vtkFilteringJava FilteringJava_SRCS ${Filtering_SRCS})
- ADD_LIBRARY(vtkFilteringJava SHARED ${FilteringJava_SRCS})
- TARGET_LINK_LIBRARIES (vtkFilteringJava vtkCommonJava vtkFiltering)
-- INSTALL_TARGETS(/lib/vtk vtkFilteringJava)
-+ INSTALL_TARGETS(/lib64/vtk vtkFilteringJava)
- ENDIF (VTK_WRAP_JAVA)
-
-
--INSTALL_TARGETS(/lib/vtk vtkFiltering)
-+INSTALL_TARGETS(/lib64/vtk vtkFiltering)
- INSTALL_FILES(/include/vtk .h ${Filtering_SRCS})
-diff -Naur VTK-4.2.6-original/Graphics/CMakeLists.txt VTK-4.2.6-changed/Graphics/CMakeLists.txt
---- VTK-4.2.6-original/Graphics/CMakeLists.txt 2003-11-07 19:07:10.000000000 +0300
-+++ VTK-4.2.6-changed/Graphics/CMakeLists.txt 2006-10-04 14:04:03.000000000 +0400
-@@ -190,7 +190,7 @@
- ADD_LIBRARY(vtkGraphicsTCL ${GraphicsTCL_SRCS})
- TARGET_LINK_LIBRARIES (vtkGraphicsTCL vtkFilteringTCL vtkGraphics
- ${TCL_LIBRARY})
-- INSTALL_TARGETS(/lib/vtk vtkGraphicsTCL)
-+ INSTALL_TARGETS(/lib64/vtk vtkGraphicsTCL)
- ENDIF (VTK_WRAP_TCL)
-
- # if we are wrapping into Python then add the library and extra
-@@ -211,7 +211,7 @@
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(vtkGraphicsPython vtkGraphics)
-
-- INSTALL_TARGETS(/lib/vtk vtkGraphicsPython)
-+ INSTALL_TARGETS(/lib64/vtk vtkGraphicsPython)
- ENDIF (VTK_WRAP_PYTHON)
-
- # if we are wrapping into Java then add the library and extra
-@@ -222,10 +222,10 @@
- ADD_LIBRARY(vtkGraphicsJava SHARED ${GraphicsJava_SRCS})
- TARGET_LINK_LIBRARIES (vtkGraphicsJava vtkCommonJava vtkFilteringJava
- vtkGraphics)
-- INSTALL_TARGETS(/lib/vtk vtkGraphicsJava)
-+ INSTALL_TARGETS(/lib64/vtk vtkGraphicsJava)
- ENDIF (VTK_WRAP_JAVA)
-
-
--INSTALL_TARGETS(/lib/vtk vtkGraphics)
-+INSTALL_TARGETS(/lib64/vtk vtkGraphics)
- INSTALL_FILES(/include/vtk .h ${Graphics_SRCS})
-
-diff -Naur VTK-4.2.6-original/Hybrid/CMakeLists.txt VTK-4.2.6-changed/Hybrid/CMakeLists.txt
---- VTK-4.2.6-original/Hybrid/CMakeLists.txt 2003-11-11 20:50:47.000000000 +0300
-+++ VTK-4.2.6-changed/Hybrid/CMakeLists.txt 2006-10-04 14:04:13.000000000 +0400
-@@ -94,7 +94,7 @@
- ENDIF (VTK_USE_MATROX_IMAGING)
- ENDIF (WIN32)
-
-- INSTALL_TARGETS(/lib/vtk vtkHybridTCL)
-+ INSTALL_TARGETS(/lib64/vtk vtkHybridTCL)
- ENDIF (VTK_WRAP_TCL)
-
- # if we are wrapping into Python then add the library and extra
-@@ -123,7 +123,7 @@
- ENDIF (VTK_USE_MATROX_IMAGING)
- ENDIF (WIN32)
-
-- INSTALL_TARGETS(/lib/vtk vtkHybridPython)
-+ INSTALL_TARGETS(/lib64/vtk vtkHybridPython)
- ENDIF (VTK_WRAP_PYTHON)
-
- IF (VTK_WRAP_JAVA)
-@@ -139,7 +139,7 @@
- ENDIF (VTK_USE_MATROX_IMAGING)
- ENDIF (WIN32)
-
-- INSTALL_TARGETS(/lib/vtk vtkHybridJava)
-+ INSTALL_TARGETS(/lib64/vtk vtkHybridJava)
- ENDIF (VTK_WRAP_JAVA)
-
- TARGET_LINK_LIBRARIES (vtkHybrid vtkRendering vtkIO)
-@@ -153,6 +153,6 @@
- ENDIF (VTK_USE_MATROX_IMAGING)
- ENDIF (WIN32)
-
--INSTALL_TARGETS(/lib/vtk vtkHybrid)
-+INSTALL_TARGETS(/lib64/vtk vtkHybrid)
- INSTALL_FILES(/include/vtk .h ${Hybrid_SRCS})
- INSTALL_FILES(/include/vtk .h vtk3DS)
-diff -Naur VTK-4.2.6-original/Imaging/CMakeLists.txt VTK-4.2.6-changed/Imaging/CMakeLists.txt
---- VTK-4.2.6-original/Imaging/CMakeLists.txt 2003-11-07 19:05:44.000000000 +0300
-+++ VTK-4.2.6-changed/Imaging/CMakeLists.txt 2006-10-04 14:04:31.000000000 +0400
-@@ -144,7 +144,7 @@
- vtkFilteringTCL
- vtkImaging
- ${TCL_LIBRARY})
-- INSTALL_TARGETS(/lib/vtk vtkImagingTCL)
-+ INSTALL_TARGETS(/lib64/vtk vtkImagingTCL)
- ENDIF (VTK_WRAP_TCL)
-
- # if we are wrapping into Python then add the library and extra
-@@ -165,7 +165,7 @@
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(vtkImagingPython vtkImaging)
-
-- INSTALL_TARGETS(/lib/vtk vtkImagingPython)
-+ INSTALL_TARGETS(/lib64/vtk vtkImagingPython)
- ENDIF (VTK_WRAP_PYTHON)
-
- # if we are wrapping into Java then add the library and extra
-@@ -178,8 +178,8 @@
- vtkCommonJava
- vtkFilteringJava
- vtkImaging)
-- INSTALL_TARGETS(/lib/vtk vtkImagingJava)
-+ INSTALL_TARGETS(/lib64/vtk vtkImagingJava)
- ENDIF (VTK_WRAP_JAVA)
-
--INSTALL_TARGETS(/lib/vtk vtkImaging)
-+INSTALL_TARGETS(/lib64/vtk vtkImaging)
- INSTALL_FILES(/include/vtk .h ${Imaging_SRCS})
-diff -Naur VTK-4.2.6-original/IO/CMakeLists.txt VTK-4.2.6-changed/IO/CMakeLists.txt
---- VTK-4.2.6-original/IO/CMakeLists.txt 2003-02-13 00:48:53.000000000 +0300
-+++ VTK-4.2.6-changed/IO/CMakeLists.txt 2006-10-04 14:04:22.000000000 +0400
-@@ -162,7 +162,7 @@
- vtkFilteringTCL
- vtkIO
- ${TCL_LIBRARY})
-- INSTALL_TARGETS(/lib/vtk vtkIOTCL)
-+ INSTALL_TARGETS(/lib64/vtk vtkIOTCL)
- ENDIF (VTK_WRAP_TCL)
-
- # if we are wrapping into Python then add the library and extra
-@@ -183,7 +183,7 @@
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(vtkIOPython vtkIO)
-
-- INSTALL_TARGETS(/lib/vtk vtkIOPython)
-+ INSTALL_TARGETS(/lib64/vtk vtkIOPython)
- ENDIF (VTK_WRAP_PYTHON)
-
- # if we are wrapping into Java then add the library and extra
-@@ -196,9 +196,9 @@
- vtkCommonJava
- vtkFilteringJava
- vtkIO)
-- INSTALL_TARGETS(/lib/vtk vtkIOJava)
-+ INSTALL_TARGETS(/lib64/vtk vtkIOJava)
- ENDIF (VTK_WRAP_JAVA)
-
-
--INSTALL_TARGETS(/lib/vtk vtkIO)
-+INSTALL_TARGETS(/lib64/vtk vtkIO)
- INSTALL_FILES(/include/vtk .h ${IO_SRCS})
-diff -Naur VTK-4.2.6-original/Parallel/CMakeLists.txt VTK-4.2.6-changed/Parallel/CMakeLists.txt
---- VTK-4.2.6-original/Parallel/CMakeLists.txt 2003-02-17 23:00:36.000000000 +0300
-+++ VTK-4.2.6-changed/Parallel/CMakeLists.txt 2006-10-04 14:04:41.000000000 +0400
-@@ -108,7 +108,7 @@
- VTK_WRAP_TCL2(vtkParallelTCL ParallelTCL_SRCS ${Parallel_SRCS})
- ADD_LIBRARY(vtkParallelTCL ${ParallelTCL_SRCS})
- TARGET_LINK_LIBRARIES (vtkParallelTCL vtkParallel vtkIOTCL vtkRenderingTCL)
-- INSTALL_TARGETS(/lib/vtk vtkParallelTCL)
-+ INSTALL_TARGETS(/lib64/vtk vtkParallelTCL)
- ENDIF (VTK_WRAP_TCL)
-
- # if we are wrapping into Python then add the library and extra
-@@ -129,19 +129,19 @@
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(vtkParallelPython vtkParallel)
-
-- INSTALL_TARGETS(/lib/vtk vtkParallelPython)
-+ INSTALL_TARGETS(/lib64/vtk vtkParallelPython)
- ENDIF (VTK_WRAP_PYTHON)
-
- IF (VTK_WRAP_JAVA)
- VTK_WRAP_JAVA2(vtkParallelJava ParallelJava_SRCS ${Parallel_SRCS})
- ADD_LIBRARY(vtkParallelJava SHARED ${ParallelJava_SRCS})
- TARGET_LINK_LIBRARIES (vtkParallelJava vtkParallel vtkRenderingJava vtkIOJava)
-- INSTALL_TARGETS(/lib/vtk vtkParallelJava)
-+ INSTALL_TARGETS(/lib64/vtk vtkParallelJava)
- ENDIF (VTK_WRAP_JAVA)
-
- TARGET_LINK_LIBRARIES (vtkParallel vtkRendering vtkIO)
-
--INSTALL_TARGETS(/lib/vtk vtkParallel)
-+INSTALL_TARGETS(/lib64/vtk vtkParallel)
- INSTALL_FILES(/include/vtk .h ${Parallel_SRCS})
- IF (VTK_USE_MPI)
- INSTALL_FILES(/include/vtk "vtkMPI\\.h")
-diff -Naur VTK-4.2.6-original/Patented/CMakeLists.txt VTK-4.2.6-changed/Patented/CMakeLists.txt
---- VTK-4.2.6-original/Patented/CMakeLists.txt 2003-02-13 00:48:53.000000000 +0300
-+++ VTK-4.2.6-changed/Patented/CMakeLists.txt 2006-10-04 14:04:52.000000000 +0400
-@@ -39,7 +39,7 @@
- ADD_LIBRARY(vtkPatentedTCL ${PatentedTCL_SRCS})
- TARGET_LINK_LIBRARIES (vtkPatentedTCL vtkPatented vtkIOTCL vtkGraphicsTCL
- vtkImagingTCL)
-- INSTALL_TARGETS(/lib/vtk vtkPatentedTCL)
-+ INSTALL_TARGETS(/lib64/vtk vtkPatentedTCL)
- ENDIF (VTK_WRAP_TCL)
-
- # if we are wrapping into Python then add the library and extra
-@@ -60,7 +60,7 @@
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(vtkPatentedPython vtkPatented)
-
-- INSTALL_TARGETS(/lib/vtk vtkPatentedPython)
-+ INSTALL_TARGETS(/lib64/vtk vtkPatentedPython)
- ENDIF (VTK_WRAP_PYTHON)
-
- # if we are wrapping into Java then add the library and extra
-@@ -71,7 +71,7 @@
- ADD_LIBRARY(vtkPatentedJava SHARED ${PatentedJava_SRCS})
- TARGET_LINK_LIBRARIES (vtkPatentedJava vtkPatented vtkImagingJava
- vtkGraphicsJava)
-- INSTALL_TARGETS(/lib/vtk vtkPatentedJava)
-+ INSTALL_TARGETS(/lib64/vtk vtkPatentedJava)
- ENDIF (VTK_WRAP_JAVA)
-
- TARGET_LINK_LIBRARIES ( vtkPatented
-@@ -80,5 +80,5 @@
- vtkIO
- )
-
--INSTALL_TARGETS(/lib/vtk vtkPatented)
-+INSTALL_TARGETS(/lib64/vtk vtkPatented)
- INSTALL_FILES(/include/vtk .h ${Patented_SRCS})
-diff -Naur VTK-4.2.6-original/Rendering/CMakeLists.txt VTK-4.2.6-changed/Rendering/CMakeLists.txt
---- VTK-4.2.6-original/Rendering/CMakeLists.txt 2003-02-17 23:32:16.000000000 +0300
-+++ VTK-4.2.6-changed/Rendering/CMakeLists.txt 2006-10-04 14:05:10.000000000 +0400
-@@ -344,7 +344,7 @@
- IF (TK_LIBRARY)
- TARGET_LINK_LIBRARIES (vtkRenderingTCL ${TK_LIBRARY})
- ENDIF (TK_LIBRARY)
-- INSTALL_TARGETS(/lib/vtk vtkRenderingTCL)
-+ INSTALL_TARGETS(/lib64/vtk vtkRenderingTCL)
- ENDIF (VTK_WRAP_TCL)
-
- # if we are wrapping into Python then add the library and extra
-@@ -368,7 +368,7 @@
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(vtkRenderingPython vtkRendering)
-
-- INSTALL_TARGETS(/lib/vtk vtkRenderingPython)
-+ INSTALL_TARGETS(/lib64/vtk vtkRenderingPython)
- IF (TK_LIBRARY)
- IF(NOT VTK_USE_COCOA)
- SET(RenderingPythonTkWidgets_SRCS
-@@ -382,7 +382,7 @@
- vtkRendering
- ${TCL_LIBRARY}
- ${TK_LIBRARY})
-- INSTALL_TARGETS(/lib/vtk vtkRenderingPythonTkWidgets)
-+ INSTALL_TARGETS(/lib64/vtk vtkRenderingPythonTkWidgets)
- ENDIF(NOT VTK_USE_COCOA)
- ENDIF (TK_LIBRARY)
- ENDIF (VTK_WRAP_PYTHON)
-@@ -403,7 +403,7 @@
- TARGET_LINK_LIBRARIES (vtkRenderingJava ${JAVA_AWT_LIBRARY})
- ENDIF (JAVA_AWT_LIBRARY)
-
-- INSTALL_TARGETS(/lib/vtk vtkRenderingJava)
-+ INSTALL_TARGETS(/lib64/vtk vtkRenderingJava)
- ENDIF (VTK_WRAP_JAVA)
-
-
-@@ -412,7 +412,7 @@
- ADD_DEFINITIONS(${CMAKE_X_CFLAGS})
- ENDIF(VTK_USE_X)
-
--INSTALL_TARGETS(/lib/vtk vtkRendering)
-+INSTALL_TARGETS(/lib64/vtk vtkRendering)
- INSTALL_FILES(/include/vtk .h ${Rendering_SRCS} ${RenderingOpenGL_SRCS})
-
- CONFIGURE_FILE(
-diff -Naur VTK-4.2.6-original/Utilities/CMakeLists.txt VTK-4.2.6-changed/Utilities/CMakeLists.txt
---- VTK-4.2.6-original/Utilities/CMakeLists.txt 2003-02-12 02:04:12.000000000 +0300
-+++ VTK-4.2.6-changed/Utilities/CMakeLists.txt 2006-10-04 14:08:06.000000000 +0400
-@@ -12,4 +12,4 @@
-
- # This is the installed VTKConfig.cmake file configured at the top
- # level.
--INSTALL_FILES(/lib/vtk .cmake VTKConfig)
-+INSTALL_FILES(/lib64/vtk .cmake VTKConfig)
-diff -Naur VTK-4.2.6-original/Utilities/Doxygen/CMakeLists.txt VTK-4.2.6-changed/Utilities/Doxygen/CMakeLists.txt
---- VTK-4.2.6-original/Utilities/Doxygen/CMakeLists.txt 2002-11-19 21:41:34.000000000 +0300
-+++ VTK-4.2.6-changed/Utilities/Doxygen/CMakeLists.txt 2006-10-04 14:08:13.000000000 +0400
-@@ -24,9 +24,9 @@
-
- INCLUDE (${VTK_SOURCE_DIR}/Utilities/Doxygen/LocalUserOptions.cmake OPTIONAL)
-
--INSTALL_FILES(/lib/vtk/doxygen "\\.css$")
--INSTALL_FILES(/lib/vtk/doxygen "\\.gif$")
--INSTALL_FILES(/lib/vtk/doxygen "\\.html$")
--INSTALL_FILES(/lib/vtk/doxygen "\\.pl$")
--INSTALL_FILES(/lib/vtk/doxygen "\\.stop$")
--INSTALL_FILES(/lib/vtk/doxygen .txt authors doc_readme)
-+INSTALL_FILES(/lib64/vtk/doxygen "\\.css$")
-+INSTALL_FILES(/lib64/vtk/doxygen "\\.gif$")
-+INSTALL_FILES(/lib64/vtk/doxygen "\\.html$")
-+INSTALL_FILES(/lib64/vtk/doxygen "\\.pl$")
-+INSTALL_FILES(/lib64/vtk/doxygen "\\.stop$")
-+INSTALL_FILES(/lib64/vtk/doxygen .txt authors doc_readme)
-diff -Naur VTK-4.2.6-original/Utilities/expat/CMakeLists.txt VTK-4.2.6-changed/Utilities/expat/CMakeLists.txt
---- VTK-4.2.6-original/Utilities/expat/CMakeLists.txt 2003-01-21 01:04:02.000000000 +0300
-+++ VTK-4.2.6-changed/Utilities/expat/CMakeLists.txt 2006-10-04 14:08:19.000000000 +0400
-@@ -25,5 +25,5 @@
-
- ADD_LIBRARY(vtkexpat ${expat_SRCS})
-
--INSTALL_TARGETS(/lib/vtk vtkexpat)
-+INSTALL_TARGETS(/lib64/vtk vtkexpat)
- INSTALL_FILES(/include/vtk .h expat expatDllConfig)
-diff -Naur VTK-4.2.6-original/Utilities/freetype/CMakeLists.txt VTK-4.2.6-changed/Utilities/freetype/CMakeLists.txt
---- VTK-4.2.6-original/Utilities/freetype/CMakeLists.txt 2003-02-06 22:19:37.000000000 +0300
-+++ VTK-4.2.6-changed/Utilities/freetype/CMakeLists.txt 2006-10-04 14:08:25.000000000 +0400
-@@ -100,7 +100,7 @@
- IF (APPLE)
- TARGET_LINK_LIBRARIES(vtkfreetype "-framework AppKit")
- ENDIF (APPLE)
--INSTALL_TARGETS (/lib/vtk vtkfreetype)
-+INSTALL_TARGETS (/lib64/vtk vtkfreetype)
-
- #
- # Do not cover this lib
-diff -Naur VTK-4.2.6-original/Utilities/ftgl/CMakeLists.txt VTK-4.2.6-changed/Utilities/ftgl/CMakeLists.txt
---- VTK-4.2.6-original/Utilities/ftgl/CMakeLists.txt 2003-02-13 02:13:49.000000000 +0300
-+++ VTK-4.2.6-changed/Utilities/ftgl/CMakeLists.txt 2006-10-04 14:08:30.000000000 +0400
-@@ -146,7 +146,7 @@
- #
- ADD_LIBRARY (vtkftgl ${FTGL_SRCS})
- TARGET_LINK_LIBRARIES(vtkftgl ${VTKFTGL_LIBS})
--INSTALL_TARGETS (/lib/vtk vtkftgl)
-+INSTALL_TARGETS (/lib64/vtk vtkftgl)
-
- #
- # Do not cover this lib
-@@ -197,12 +197,12 @@
- IF (VTK_USE_X)
- SET (VTKFTGL_EXAMPLES_LIBS "${VTKFTGL_EXAMPLES_LIBS};-lXt")
- FIND_LIBRARY (XMU_LIBRARY Xmu
-- /usr/lib
-- /usr/local/lib
-- /opt/graphics/OpenGL/lib
-- /usr/openwin/lib
-- /usr/X11R6/lib
-- /usr/contrib/X11R6/lib
-+ /usr/lib64
-+ /usr/local/lib64
-+ /opt/graphics/OpenGL/lib64
-+ /usr/openwin/lib64
-+ /usr/X11R6/lib64
-+ /usr/contrib/X11R6/lib64
- )
- MARK_AS_ADVANCED (XMU_LIBRARY)
- IF (XMU_LIBRARY)
-diff -Naur VTK-4.2.6-original/Utilities/jpeg/CMakeLists.txt VTK-4.2.6-changed/Utilities/jpeg/CMakeLists.txt
---- VTK-4.2.6-original/Utilities/jpeg/CMakeLists.txt 2002-07-17 15:58:54.000000000 +0400
-+++ VTK-4.2.6-changed/Utilities/jpeg/CMakeLists.txt 2006-10-04 14:08:36.000000000 +0400
-@@ -48,5 +48,5 @@
-
- ADD_LIBRARY(vtkjpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
-
--INSTALL_TARGETS(/lib/vtk vtkjpeg)
-+INSTALL_TARGETS(/lib64/vtk vtkjpeg)
-
-diff -Naur VTK-4.2.6-original/Utilities/png/CMakeLists.txt VTK-4.2.6-changed/Utilities/png/CMakeLists.txt
---- VTK-4.2.6-original/Utilities/png/CMakeLists.txt 2003-02-04 17:38:36.000000000 +0300
-+++ VTK-4.2.6-changed/Utilities/png/CMakeLists.txt 2006-10-04 14:08:42.000000000 +0400
-@@ -29,5 +29,5 @@
- ADD_LIBRARY(vtkpng ${PNG_SRCS})
- TARGET_LINK_LIBRARIES(vtkpng ${VTK_ZLIB_LIBRARIES})
-
--INSTALL_TARGETS(/lib/vtk vtkpng)
-+INSTALL_TARGETS(/lib64/vtk vtkpng)
- INSTALL_FILES(/include/vtk .h png pngconf pngDllConfig)
-diff -Naur VTK-4.2.6-original/Utilities/tiff/CMakeLists.txt VTK-4.2.6-changed/Utilities/tiff/CMakeLists.txt
---- VTK-4.2.6-original/Utilities/tiff/CMakeLists.txt 2003-02-04 17:38:36.000000000 +0300
-+++ VTK-4.2.6-changed/Utilities/tiff/CMakeLists.txt 2006-10-04 14:08:47.000000000 +0400
-@@ -64,5 +64,5 @@
- ADD_LIBRARY(vtktiff ${common_SRCS})
- TARGET_LINK_LIBRARIES( vtktiff ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES} )
-
--INSTALL_TARGETS(/lib/vtk vtktiff)
-+INSTALL_TARGETS(/lib64/vtk vtktiff)
- INSTALL_FILES(/include/vtk .h tiffDllConfig tiffvers tiff tiffio tconf)
-diff -Naur VTK-4.2.6-original/Utilities/zlib/CMakeLists.txt VTK-4.2.6-changed/Utilities/zlib/CMakeLists.txt
---- VTK-4.2.6-original/Utilities/zlib/CMakeLists.txt 2002-11-20 18:09:01.000000000 +0300
-+++ VTK-4.2.6-changed/Utilities/zlib/CMakeLists.txt 2006-10-04 14:08:53.000000000 +0400
-@@ -33,5 +33,5 @@
-
- ADD_LIBRARY(vtkzlib ${ZLIB_SRCS})
-
--INSTALL_TARGETS(/lib/vtk vtkzlib)
-+INSTALL_TARGETS(/lib64/vtk vtkzlib)
- INSTALL_FILES(/include/vtk .h zlib zconf zlibDllConfig)
-diff -Naur VTK-4.2.6-original/vtkGenerateVTKConfig.cmake VTK-4.2.6-changed/vtkGenerateVTKConfig.cmake
---- VTK-4.2.6-original/vtkGenerateVTKConfig.cmake 2003-11-12 19:32:15.000000000 +0300
-+++ VTK-4.2.6-changed/vtkGenerateVTKConfig.cmake 2006-10-03 17:41:55.000000000 +0400
-@@ -113,15 +113,15 @@
- # Settings specific to the install tree.
-
- # The "use" file.
--SET(VTK_USE_FILE ${CMAKE_INSTALL_PREFIX}/lib/vtk/UseVTK.cmake)
-+SET(VTK_USE_FILE ${CMAKE_INSTALL_PREFIX}/lib64/vtk/UseVTK.cmake)
-
- # The build settings file.
--SET(VTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib/vtk/VTKBuildSettings.cmake)
-+SET(VTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib64/vtk/VTKBuildSettings.cmake)
-
- # The wrapping hints file.
- IF(VTK_WRAP_HINTS)
- GET_FILENAME_COMPONENT(VTK_HINTS_FNAME ${VTK_WRAP_HINTS} NAME)
-- SET(VTK_WRAP_HINTS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/${VTK_HINTS_FNAME})
-+ SET(VTK_WRAP_HINTS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/${VTK_HINTS_FNAME})
- ENDIF(VTK_WRAP_HINTS)
-
- # Include directories.
-@@ -131,7 +131,7 @@
- )
-
- # Link directories.
--SET(VTK_LIBRARY_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk)
-+SET(VTK_LIBRARY_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk)
-
- # Executable locations.
- SET(VTK_TCL_HOME_CONFIG "")
-@@ -143,7 +143,7 @@
- SET(VTK_DOXYGEN_HOME_CONFIG "")
- IF(VTK_WRAP_TCL)
- SET(VTK_WRAP_TCL_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkWrapTcl)
-- SET(VTK_TCL_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/tcl)
-+ SET(VTK_TCL_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/tcl)
- ENDIF(VTK_WRAP_TCL)
- IF(VTK_WRAP_PYTHON)
- SET(VTK_WRAP_PYTHON_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkWrapPython)
-@@ -151,18 +151,18 @@
- IF(VTK_WRAP_JAVA)
- SET(VTK_PARSE_JAVA_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkParseJava)
- SET(VTK_WRAP_JAVA_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkWrapJava)
-- SET(VTK_JAVA_JAR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/java/vtk.jar)
-+ SET(VTK_JAVA_JAR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/java/vtk.jar)
- ENDIF(VTK_WRAP_JAVA)
-
- # VTK style script locations.
--SET(VTK_DOXYGEN_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/doxygen)
--SET(VTK_HEADER_TESTING_PY_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/HeaderTesting.py)
--SET(VTK_FIND_STRING_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/FindString.tcl)
--SET(VTK_PRINT_SELF_CHECK_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/PrintSelfCheck.tcl)
--SET(VTK_RT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/rtImageTest.tcl)
-+SET(VTK_DOXYGEN_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/doxygen)
-+SET(VTK_HEADER_TESTING_PY_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/HeaderTesting.py)
-+SET(VTK_FIND_STRING_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/FindString.tcl)
-+SET(VTK_PRINT_SELF_CHECK_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/PrintSelfCheck.tcl)
-+SET(VTK_RT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/rtImageTest.tcl)
-
- IF(VTK_USE_PARALLEL)
-- SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/prtImageTest.tcl)
-+ SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/prtImageTest.tcl)
- ELSE(VTK_USE_PARALLEL)
- SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG "")
- ENDIF(VTK_USE_PARALLEL)
-@@ -191,11 +191,11 @@
-
- # CMake extension module directory and macro file.
- SET(VTK_LOAD_CMAKE_EXTENSIONS_MACRO_CONFIG
-- "${CMAKE_INSTALL_PREFIX}/lib/vtk/CMake/vtkLoadCMakeExtensions.cmake")
--SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/CMake)
-+ "${CMAKE_INSTALL_PREFIX}/lib64/vtk/CMake/vtkLoadCMakeExtensions.cmake")
-+SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/CMake)
-
- # Library dependencies file.
--SET(VTK_LIBRARY_DEPENDS_FILE "${CMAKE_INSTALL_PREFIX}/lib/vtk/VTKLibraryDepends.cmake")
-+SET(VTK_LIBRARY_DEPENDS_FILE "${CMAKE_INSTALL_PREFIX}/lib64/vtk/VTKLibraryDepends.cmake")
-
- #-----------------------------------------------------------------------------
- # Configure VTKConfig.cmake for the install tree.
-diff -Naur VTK-4.2.6-original/vtkMacros.cmake VTK-4.2.6-changed/vtkMacros.cmake
---- VTK-4.2.6-original/vtkMacros.cmake 2003-01-27 19:15:03.000000000 +0300
-+++ VTK-4.2.6-changed/vtkMacros.cmake 2006-10-03 17:42:06.000000000 +0400
-@@ -41,7 +41,7 @@
- ENDIF (APPLE)
- TARGET_LINK_LIBRARIES(vtk${KIT}TCL${VTK_VERSION}
- ${DEPEND} vtk${KIT}${VTK_VERSION} ${TCL_LIBRARY})
-- INSTALL_TARGETS(/lib vtk${KIT}TCL${VTK_VERSION})
-+ INSTALL_TARGETS(/lib64 vtk${KIT}TCL${VTK_VERSION})
- ENDIF (VTK_WRAP_TCL)
- ENDMACRO(VTK_USE_TCL)
-
-@@ -68,7 +68,7 @@
- ENDIF(WIN32)
- TARGET_LINK_LIBRARIES(vtk${KIT}Python${VTK_VERSION}
- vtk${KIT}${VTK_VERSION})
-- INSTALL_TARGETS(/lib vtk${KIT}Python${VTK_VERSION})
-+ INSTALL_TARGETS(/lib64 vtk${KIT}Python${VTK_VERSION})
- ENDIF (VTK_WRAP_PYTHON)
- ENDMACRO(VTK_USE_PYTHON)
-
-@@ -86,6 +86,6 @@
- ADD_LIBRARY(vtk${KIT}Java${VTK_VERSION} SHARED ${${KIT}Java_SRCS})
- TARGET_LINK_LIBRARIES (vtk${KIT}Java${VTK_VERSION}
- ${DEPEND} vtk${KIT}${VTK_VERSION})
-- INSTALL_TARGETS(/lib vtk${KIT}Java${VTK_VERSION})
-+ INSTALL_TARGETS(/lib64 vtk${KIT}Java${VTK_VERSION})
- ENDIF (VTK_WRAP_JAVA)
- ENDMACRO(VTK_USE_JAVA)
-diff -Naur VTK-4.2.6-original/Wrapping/Java/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Java/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Java/CMakeLists.txt 2003-07-29 21:47:09.000000000 +0400
-+++ VTK-4.2.6-changed/Wrapping/Java/CMakeLists.txt 2006-10-04 14:07:46.000000000 +0400
-@@ -58,8 +58,8 @@
-
- FOREACH(kit ${KITS})
- IF(APPLE)
-- SET(src ${LIBRARY_OUTPUT_PATH}/libvtk${kit}Java.dylib)
-- SET(tgt ${LIBRARY_OUTPUT_PATH}/libvtk${kit}Java.jnilib)
-+ SET(src ${LIBRARY_OUTPUT_PATH}/lib64vtk${kit}Java.dylib)
-+ SET(tgt ${LIBRARY_OUTPUT_PATH}/lib64vtk${kit}Java.jnilib)
- ADD_CUSTOM_COMMAND(SOURCE ${src}
- COMMAND ln
- ARGS -sf ${src} ${tgt}
-@@ -210,7 +210,7 @@
- DEPENDS ${LIBRARY_OUTPUT_PATH}/vtk.jar ${JAVA_TESTS}
- )
-
-- INSTALL_FILES(/lib/vtk/java FILES ${LIBRARY_OUTPUT_PATH}/vtk.jar)
-+ INSTALL_FILES(/lib64/vtk/java FILES ${LIBRARY_OUTPUT_PATH}/vtk.jar)
- ENDIF(JAVA_ARCHIVE)
- ENDIF(VTK_JAVA_NEW_STYLE)
- ENDIF(JAVA_COMPILE)
-diff -Naur VTK-4.2.6-original/Wrapping/Python/setup.py.in VTK-4.2.6-changed/Wrapping/Python/setup.py.in
---- VTK-4.2.6-original/Wrapping/Python/setup.py.in 2003-02-18 21:54:45.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Python/setup.py.in 2006-10-03 16:00:54.000000000 +0400
-@@ -22,7 +22,7 @@
-
- # You can change this to suit your needs. However you must make sure
- # that under *nix the libvtk*Python*.so in the specified directory.
--install_lib_dir = "${CMAKE_INSTALL_PREFIX}/lib/vtk"
-+install_lib_dir = "${CMAKE_INSTALL_PREFIX}/lib64/vtk"
-
-
- def get_libs():
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/CMakeLists.txt 2003-04-08 19:00:30.000000000 +0400
-+++ VTK-4.2.6-changed/Wrapping/Tcl/CMakeLists.txt 2006-10-04 14:07:33.000000000 +0400
-@@ -83,8 +83,8 @@
- # Process all packages
- SUBDIRS(vtk vtkbase vtkcommon vtkfiltering vtkgraphics vtkimaging vtkinteraction vtkio vtktesting)
-
--INSTALL_FILES(/lib/vtk/tcl "" README)
--INSTALL_FILES(/lib/vtk/tcl .c vtktcl)
-+INSTALL_FILES(/lib64/vtk/tcl "" README)
-+INSTALL_FILES(/lib64/vtk/tcl .c vtktcl)
-
- SET(VTK_TCL_RENDERING_CONFIG "")
- SET(VTK_TCL_HYBRID_CONFIG "")
-@@ -142,7 +142,7 @@
- CONFIGURE_FILE(${VTK_SOURCE_DIR}/Wrapping/Tcl/pkgIndex.tcl.in
- ${VTK_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl
- @ONLY IMMEDIATE)
--INSTALL_FILES(/lib/vtk/tcl FILES
-+INSTALL_FILES(/lib64/vtk/tcl FILES
- ${VTK_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl)
-
- # Allow the user to customize their build with some local options
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtk/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtk/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtk/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtk/CMakeLists.txt 2006-10-04 14:06:09.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtk .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtk .tcl
- vtk
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkbase/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkbase/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkbase/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkbase/CMakeLists.txt 2006-10-04 14:06:17.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkbase .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkbase .tcl
- vtkbase
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkcommon/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkcommon/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkcommon/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkcommon/CMakeLists.txt 2006-10-04 14:06:23.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkcommon .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkcommon .tcl
- vtkcommon
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkfiltering/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkfiltering/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkfiltering/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkfiltering/CMakeLists.txt 2006-10-04 14:06:29.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkfiltering .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkfiltering .tcl
- vtkfiltering
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkgraphics/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkgraphics/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkgraphics/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkgraphics/CMakeLists.txt 2006-10-04 14:06:34.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkgraphics .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkgraphics .tcl
- vtkgraphics
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkhybrid/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkhybrid/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkhybrid/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkhybrid/CMakeLists.txt 2006-10-04 14:06:41.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkhybrid .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkhybrid .tcl
- vtkhybrid
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkimaging/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkimaging/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkimaging/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkimaging/CMakeLists.txt 2006-10-04 14:06:47.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkimaging .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkimaging .tcl
- vtkimaging
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkinteraction/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkinteraction/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkinteraction/CMakeLists.txt 2003-02-25 22:11:56.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkinteraction/CMakeLists.txt 2006-10-04 14:06:53.000000000 +0400
-@@ -1,4 +1,4 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkinteraction .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkinteraction .tcl
- vtkinteraction
- Interactor
- bindings
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkio/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkio/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkio/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkio/CMakeLists.txt 2006-10-04 14:06:59.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkio .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkio .tcl
- vtkio
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkparallel/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkparallel/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkparallel/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkparallel/CMakeLists.txt 2006-10-04 14:07:05.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkparallel .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkparallel .tcl
- vtkparallel
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkpatented/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkpatented/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkpatented/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkpatented/CMakeLists.txt 2006-10-04 14:07:11.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkpatented .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkpatented .tcl
- vtkpatented
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkrendering/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkrendering/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtkrendering/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtkrendering/CMakeLists.txt 2006-10-04 14:07:17.000000000 +0400
-@@ -1,3 +1,3 @@
--INSTALL_FILES(/lib/vtk/tcl/vtkrendering .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtkrendering .tcl
- vtkrendering
- )
-diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtktesting/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtktesting/CMakeLists.txt
---- VTK-4.2.6-original/Wrapping/Tcl/vtktesting/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
-+++ VTK-4.2.6-changed/Wrapping/Tcl/vtktesting/CMakeLists.txt 2006-10-04 14:07:23.000000000 +0400
-@@ -1,4 +1,4 @@
--INSTALL_FILES(/lib/vtk/tcl/vtktesting .tcl
-+INSTALL_FILES(/lib64/vtk/tcl/vtktesting .tcl
- vtktesting
- backdrop
- grab
