+++ /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 -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 --exclude=CVS Python-2.4.4/configure.in Python-2.4.4-patched/configure.in
+--- Python-2.4.4/configure.in 2006-10-17 20:03:36.000000000 +0400
++++ Python-2.4.4-patched/configure.in 2007-04-23 19:31:52.000000000 +0400
+@@ -494,6 +494,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)
+diff -Naur --exclude=CVS Python-2.4.4/Include/pythonrun.h Python-2.4.4-patched/Include/pythonrun.h
+--- Python-2.4.4/Include/pythonrun.h 2004-10-07 07:58:07.000000000 +0400
++++ Python-2.4.4-patched/Include/pythonrun.h 2007-04-23 19:10:18.000000000 +0400
+@@ -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);
+diff -Naur --exclude=CVS Python-2.4.4/Lib/distutils/command/install.py Python-2.4.4-patched/Lib/distutils/command/install.py
+--- Python-2.4.4/Lib/distutils/command/install.py 2005-01-20 22:15:39.000000000 +0300
++++ Python-2.4.4-patched/Lib/distutils/command/install.py 2007-04-23 19:12:27.000000000 +0400
+@@ -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',
+diff -Naur --exclude=CVS Python-2.4.4/Lib/distutils/sysconfig.py Python-2.4.4-patched/Lib/distutils/sysconfig.py
+--- Python-2.4.4/Lib/distutils/sysconfig.py 2006-10-08 21:41:25.000000000 +0400
++++ Python-2.4.4-patched/Lib/distutils/sysconfig.py 2007-04-23 19:21:19.000000000 +0400
+@@ -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:
+diff -Naur --exclude=CVS Python-2.4.4/Lib/distutils/tests/test_install.py Python-2.4.4-patched/Lib/distutils/tests/test_install.py
+--- Python-2.4.4/Lib/distutils/tests/test_install.py 2004-06-26 03:02:59.000000000 +0400
++++ Python-2.4.4-patched/Lib/distutils/tests/test_install.py 2007-04-23 19:20:24.000000000 +0400
+@@ -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)
+diff -Naur --exclude=CVS Python-2.4.4/Lib/site.py Python-2.4.4-patched/Lib/site.py
+--- Python-2.4.4/Lib/site.py 2004-07-20 06:28:28.000000000 +0400
++++ Python-2.4.4-patched/Lib/site.py 2007-04-23 19:23:19.000000000 +0400
+@@ -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
+diff -Naur --exclude=CVS Python-2.4.4/Makefile.pre.in Python-2.4.4-patched/Makefile.pre.in
+--- Python-2.4.4/Makefile.pre.in 2006-10-08 21:41:25.000000000 +0400
++++ Python-2.4.4-patched/Makefile.pre.in 2007-04-23 19:34:43.000000000 +0400
+@@ -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)
+@@ -471,7 +473,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
+diff -Naur --exclude=CVS Python-2.4.4/Modules/getpath.c Python-2.4.4-patched/Modules/getpath.c
+--- Python-2.4.4/Modules/getpath.c 2006-02-20 20:37:39.000000000 +0300
++++ Python-2.4.4-patched/Modules/getpath.c 2007-04-23 19:25:34.000000000 +0400
+@@ -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)
+diff -Naur --exclude=CVS Python-2.4.4/Python/getplatform.c Python-2.4.4-patched/Python/getplatform.c
+--- Python-2.4.4/Python/getplatform.c 2000-09-02 03:29:29.000000000 +0400
++++ Python-2.4.4-patched/Python/getplatform.c 2007-04-23 19:27:19.000000000 +0400
+@@ -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;
++}
+diff -Naur --exclude=CVS Python-2.4.4/Python/sysmodule.c Python-2.4.4-patched/Python/sysmodule.c
+--- Python-2.4.4/Python/sysmodule.c 2006-10-05 22:08:58.000000000 +0400
++++ Python-2.4.4-patched/Python/sysmodule.c 2007-04-23 19:29:43.000000000 +0400
+@@ -1035,6 +1035,10 @@
+ PyString_FromString(Py_GetCopyright()));
+ SET_SYS_FROM_STRING("platform",
+ PyString_FromString(Py_GetPlatform()));
++ SET_SYS_FROM_STRING("arch",
++ PyString_FromString(Py_GetArch()));
++ SET_SYS_FROM_STRING("lib",
++ PyString_FromString(Py_GetLib()));
+ SET_SYS_FROM_STRING("executable",
+ PyString_FromString(Py_GetProgramFullPath()));
+ SET_SYS_FROM_STRING("prefix",
+diff -Naur --exclude=CVS Python-2.4.4/setup.py Python-2.4.4-patched/setup.py
+--- Python-2.4.4/setup.py 2006-10-08 21:41:25.000000000 +0400
++++ Python-2.4.4-patched/setup.py 2007-04-23 19:38:02.000000000 +0400
+@@ -263,12 +263,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 = []
+@@ -450,7 +450,7 @@
+ 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')
+
+@@ -465,7 +465,7 @@
+ readline_extra_link_args = ()
+
+ exts.append( Extension('readline', ['readline.c'],
+- library_dirs=['/usr/lib/termcap'],
++ library_dirs=['/usr/'+libname+'/termcap'],
+ extra_link_args=readline_extra_link_args,
+ libraries=readline_libs) )
+ if platform not in ['mac']:
+@@ -1069,8 +1069,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 qt-3.3.3-original/src/opengl/qgl_x11.cpp qt-3.3.3-patched/src/opengl/qgl_x11.cpp
---- qt-3.3.3-original/src/opengl/qgl_x11.cpp 2004-08-05 18:42:12.000000000 +0400
-+++ qt-3.3.3-patched/src/opengl/qgl_x11.cpp 2006-12-14 16:26:33.000000000 +0300
-@@ -125,7 +125,7 @@
- if (gl_syms_resolved)
- return TRUE;
-
-- QLibrary gl("GL");
-+ QLibrary gl("libGL.so.1");
- gl.setAutoUnload(FALSE);
-
- qt_glCallLists = (_glCallLists) gl.resolve("glCallLists");
-diff -Naur qt-3.3.3-original/src/tools/qlibrary.cpp qt-3.3.3-patched/src/tools/qlibrary.cpp
---- qt-3.3.3-original/src/tools/qlibrary.cpp 2004-08-05 18:41:55.000000000 +0400
-+++ qt-3.3.3-patched/src/tools/qlibrary.cpp 2006-12-14 16:29:26.000000000 +0300
-@@ -39,6 +39,7 @@
- #include "qplatformdefs.h"
- #include <private/qlibrary_p.h>
- #include <qstringlist.h>
-+#include <qregexp.h>
- #include <qfile.h>
-
- #ifndef QT_NO_LIBRARY
-@@ -393,6 +394,8 @@
- return libfile;
-
- QString filename = libfile;
-+ if (QFile::exists(filename))
-+ return filename;
-
- #if defined(Q_WS_WIN)
- if ( filename.findRev( '.' ) <= filename.findRev( '/' ) )
-@@ -422,10 +425,11 @@
- QString path = tmpfilename.left( x + 1 );
- QString file = tmpfilename.right( tmpfilename.length() - x - 1 );
- tmpfilename = QString( "%1lib%2" ).arg( path ).arg( file );
-- } else {
-+ } else if (tmpfilename.left(3) != QString("lib")) {
- tmpfilename = QString( "lib%1" ).arg( filename );
- }
-- tmpfilename += filter;
-+ if (!tmpfilename.contains(QRegExp(filter + "((\\.[0-9]+)+)?$")))
-+ tmpfilename += filter;
- if(QFile::exists(tmpfilename) || it == filters.end()) {
- filename = tmpfilename;
- break;
+++ /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 VTK-4.2.6-original/Wrapping/Python/vtk/__helper.py VTK-4.2.6-patched/Wrapping/Python/vtk/__helper.py
---- VTK-4.2.6-original/Wrapping/Python/vtk/__helper.py 2001-10-31 23:30:50.000000000 +0300
-+++ VTK-4.2.6-patched/Wrapping/Python/vtk/__helper.py 2007-01-15 12:23:15.631470353 +0300
-@@ -9,7 +9,8 @@
- """ Checks to see if the ImportError was because the library
- itself was not there or because there was a link error. If there
- was a link error it raises a LinkError if not it does nothing."""
-- del sys.modules['vtk.%s'%mod_name]
-+ if sys.modules.has_key('vtk.%s'%mod_name):
-+ del sys.modules['vtk.%s'%mod_name]
- mod = 'vtk' + string.upper(mod_name[0]) + mod_name[1:] +'Python'
- if string.find(str(exc), mod) == -1:
- raise LinkError, str(exc)
