Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv22252/sci
Added Files:
pymol-py.info pymol-py.patch pymol-scipy.patch
suitesparse.info suitesparse.patch
Log Message:
Move pymol and deps to 10.7 according to jackhowarth.
--- NEW FILE: pymol-py.patch ---
diff -uNr pymol-py26-1.4-1/eMovie.py pymol-py26-1.4-1.patched/eMovie.py
--- pymol-py26-1.4-1/eMovie.py 2011-04-23 16:24:37.000000000 -0400
+++ pymol-py26-1.4-1.patched/eMovie.py 2011-04-23 16:06:47.000000000 -0400
@@ -188,7 +188,7 @@
cmd.extend('mvSet',mv_set) # adjust parameter over frame range
# KR: finally, call open_eMovie:
- open_eMovie()
+# open_eMovie()
def open_eMovie():
diff -uNr pymol-py26-1.4-1/pymol-1.4/Makefile.delsci
pymol-py26-1.4-1.patched/pymol-1.4/Makefile.delsci
--- pymol-py26-1.4-1/pymol-1.4/Makefile.delsci 2010-06-13 20:46:59.000000000
-0400
+++ pymol-py26-1.4-1.patched/pymol-1.4/Makefile.delsci 2011-04-23
16:06:47.000000000 -0400
@@ -61,15 +61,15 @@
/bin/rm -f .update .includes
cd contrib;$(MAKE) -f Makefile.delsci
cd contrib/uiuc/plugins/molfile_plugin/src;$(MAKE) -f Makefile.delsci
- cd modules/cealign/src; g++ -c ccealignmodule.cpp -o ccealignmodule.o
-Itnt -I. $(PYTHON_INC_DIR) -I$(PYMOL_PATH)/layer0 -I$(PYMOL_PATH)/ov/src
- $(CC) $(BUILD) $(DEST) */*.o ov/src/*.o
contrib/uiuc/plugins/molfile_plugin/src/*.o $(CFLAGS) $(LIB_DIRS) $(LIBS)
+ cd modules/cealign/src; g++ -c ccealignmodule.cpp -o ccealignmodule.o
-Itnt -I. $(PYTHON_INC_DIR) -I../../../layer0 -I../../../ov/src
+ $(CC) $(BUILD) $(DEST) */*.o ov/src/*.o
contrib/uiuc/plugins/molfile_plugin/src/*.o modules/cealign/src/*.o $(CFLAGS)
$(LIB_DIRS) $(LIBS)
semistatic: .includes .depends .update
/bin/rm -f .update .includes
cd contrib;$(MAKE) -f Makefile.delsci static
cd contrib/uiuc/plugins/molfile_plugin/src;$(MAKE) -f Makefile.delsci
- cd modules/cealign/src; g++ -c ccealignmodule.cpp -o ccealignmodule.o
-Itnt -I. $(PYTHON_INC_DIR) -I$(PYMOL_PATH)/layer0 -I$(PYMOL_PATH)/ov/src
- g++ $(BUILD) $(DEST) */*.o ov/src/*.o
contrib/uiuc/plugins/molfile_plugin/src/*.o $(CFLAGS) $(LIB_DIRS) $(LIBS)
+ cd modules/cealign/src; g++ -c ccealignmodule.cpp -o ccealignmodule.o
-Itnt -I. $(PYTHON_INC_DIR) -I../../../layer0 -I../../../ov/src
+ g++ $(BUILD) $(DEST) */*.o ov/src/*.o
contrib/uiuc/plugins/molfile_plugin/src/*.o modules/cealign/src/*.o $(CFLAGS)
$(LIB_DIRS) $(LIBS)
free:
/bin/rm -rf freemol
diff -uNr pymol-py26-1.4-1/pymol-1.4/contrib/modules/Makefile.pre.in.src
pymol-py26-1.4-1.patched/pymol-1.4/contrib/modules/Makefile.pre.in.src
--- pymol-py26-1.4-1/pymol-1.4/contrib/modules/Makefile.pre.in.src
2009-02-24 22:30:40.000000000 -0500
+++ pymol-py26-1.4-1.patched/pymol-1.4/contrib/modules/Makefile.pre.in.src
2011-04-23 16:06:47.000000000 -0400
@@ -88,10 +88,10 @@
# === Variables that you may want to customize (rarely) ===
# (Static) build target
-TARGET= python
+TARGET= python2.X
# Installed python binary (used only by boot target)
-#PYTHON=
+PYTHON= python2.X
# Add more -I and -D options here
CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
@@ -126,12 +126,13 @@
MACHDEP= @MACHDEP@
SO= @SO@
LDSHARED= @LDSHARED@
+BLDSHARED= @LDSHARED@
CCSHARED= @CCSHARED@
LINKFORSHARED= @LINKFORSHARED@
#@SET_CCC@
# Install prefix for architecture-independent files
-prefix= /usr/local
+prefix= @FINKPREFIX@
# Install prefix for architecture-dependent files
exec_prefix= $(prefix)
@@ -168,7 +169,7 @@
MAKEFILE= $(LIBPL)/Makefile
CONFIGC= $(LIBPL)/config.c
CONFIGCIN= $(LIBPL)/config.c.in
-SETUP= $(LIBPL)/Setup.thread $(LIBPL)/Setup.local $(LIBPL)/Setup
+SETUP= $(LIBPL)/Setup.config $(LIBPL)/Setup.local $(LIBPL)/Setup
SYSLIBS= $(LIBM) $(LIBC)
diff -uNr pymol-py26-1.4-1/pymol-1.4/layer3/Makefile.delsci
pymol-py26-1.4-1.patched/pymol-1.4/layer3/Makefile.delsci
--- pymol-py26-1.4-1/pymol-1.4/layer3/Makefile.delsci 2009-02-24
22:30:34.000000000 -0500
+++ pymol-py26-1.4-1.patched/pymol-1.4/layer3/Makefile.delsci 2011-04-23
16:14:56.000000000 -0400
@@ -3,7 +3,7 @@
include ../Rules.delsci
-CFLAGS = $(PYMOL_INC_DIRS) $(C_FLAGS) -I../ov/src
+CFLAGS = $(PYMOL_INC_DIRS) $(C_FLAGS) -I../ov/src -I../modules/cealign/src
all: layer
diff -uNr pymol-py26-1.4-1/pymol-1.4/layer4/Makefile.delsci
pymol-py26-1.4-1.patched/pymol-1.4/layer4/Makefile.delsci
--- pymol-py26-1.4-1/pymol-1.4/layer4/Makefile.delsci 2010-06-13
20:47:00.000000000 -0400
+++ pymol-py26-1.4-1.patched/pymol-1.4/layer4/Makefile.delsci 2011-04-23
16:06:47.000000000 -0400
@@ -3,7 +3,7 @@
include ../Rules.delsci
-CFLAGS = $(PYMOL_INC_DIRS) $(C_FLAGS) -I../ov/src
+CFLAGS = $(PYMOL_INC_DIRS) $(C_FLAGS) -I../ov/src -I../modules/cealign/src
all: layer
diff -uNr pymol-py26-1.4-1/pymol-1.4/modules/pmg_tk/startup/apbs_tools.py
pymol-py26-1.4-1.patched/pymol-1.4/modules/pmg_tk/startup/apbs_tools.py
--- pymol-py26-1.4-1/pymol-1.4/modules/pmg_tk/startup/apbs_tools.py
2011-04-21 07:40:48.000000000 -0400
+++ pymol-py26-1.4-1.patched/pymol-1.4/modules/pmg_tk/startup/apbs_tools.py
2011-04-23 16:06:47.000000000 -0400
@@ -220,6 +220,12 @@
# correctly. /sw/bin/pdb2pqr just calls through to this.
searchDirs.append(os.path.join("/sw", "share", "pdb2pqr"))
+ # This must come before @FINKPREFIX@/bin (which may also be in PATH) in
+ # order for our pdb2pqr importing to work
+ # correctly. @FINKPREFIX@/bin/pdb2pqr just calls through to this.
+ searchDirs.append(os.path.join("@FINKPREFIX@", "share", "pdb2pqr"))
+ searchDirs.append(os.path.join("@FINKPREFIX@", "share", "apbs", "tools",
"manip"))
+
searchDirs.extend(string.split(os.environ["PATH"], ":"))
searchDirs.append(os.path.join("/usr", "local", "bin"))
searchDirs.append(os.path.join("/opt", "local", "bin"))
diff -uNr pymol-py26-1.4-1/pymol-1.4/setup/Rules.osx-fink
pymol-py26-1.4-1.patched/pymol-1.4/setup/Rules.osx-fink
--- pymol-py26-1.4-1/pymol-1.4/setup/Rules.osx-fink 2009-02-24
22:30:35.000000000 -0500
+++ pymol-py26-1.4-1.patched/pymol-1.4/setup/Rules.osx-fink 2011-04-23
16:24:00.000000000 -0400
@@ -6,7 +6,7 @@
#
#- Building ----------------------------------------------------------
#--- Tell "make" how to get to PyMOL
-PYMOL_PATH = /Users/delwarl/fink/pymol
+PYMOL_PATH = @FINKPREFIX@/lib/pymol
#---------------------------------------------------------------------
#
#- Dependencies ------------------------------------------------------
@@ -14,29 +14,29 @@
XLIB_DIR = -L/usr/X11R6/lib
XINC_DIR = -I/usr/X11R6/include
#--- Python
-PYTHON_EXE = /sw/bin/python2.3
+PYTHON_EXE = python2.X
PYTHON_LIB =
PYTHON_LIB_DIR =
-PYTHON_INC_DIR = -I/sw/include/python2.3 \
- -I/sw/include/python2.3/Numeric
+PYTHON_INC_DIR = -I@FINKPREFIX@/include/python2.X \
+ -I@FINKPREFIX@/include/python2.X/Numeric
#--- Other external dependencies
-EXT_INC_DIR = -I/sw/include
-EXT_LIB_DIR = -L/sw/lib
+EXT_INC_DIR = -I@FINKPREFIX@/include
+EXT_LIB_DIR = -L@FINKPREFIX@/lib
#---------------------------------------------------------------------
#
#- Build for LINUX as an importable module ---------------------------
#--- System libraries
-LIBS = $(PYTHON_LIB) -lglut -lGL -lGLU -lpng $(ZLIB) -lm -lX11 -lXext
+LIBS = $(PYTHON_LIB) -lglut -lGL -lGLU -lGLEW -lpng $(ZLIB) -lm -lX11 -lXext
#--- PyMOL configuration
-DEFS = -D_PYMOL_MODULE -D_PYMOL_NUMPY -D_PYMOL_FINK
+DEFS = -D_PYMOL_MODULE -D_PYMOL_NUMPY -D_PYMOL_FINK -D_PYMOL_INLINE
-D_PYMOL_OPENGL_SHADERS -DNO_MMLIBS
#--- How we build shared libraries
-BUILD = -bundle -bundle_loader /sw/bin/python2.3 -flat_namespace -undefined
suppress
+BUILD = -bundle -bundle_loader @FINKPREFIX@/bin/python2.X -flat_namespace
-undefined suppress
#--- What are we trying to build?
DEST = -o modules/pymol/_cmd.so
#--- Gcc Options for Linux
CCOPT1 = -no-cpp-precomp -Wmissing-prototypes -Wno-long-double
#--- libraries for PyOpenGL
-PYOGL_LIB = -lglut -lGL -lGLU -lXmu -lXi
+PYOGL_LIB = -lglut -lGL -lGLU -lGLEW -lXmu -lXi
#---------------------------------------------------------------------
#
#- Choose One --------------------------------------------------------
diff -uNr pymol-py26-1.4-1/pymol-1.4/setup/pymol.com.osx-fink
pymol-py26-1.4-1.patched/pymol-1.4/setup/pymol.com.osx-fink
--- pymol-py26-1.4-1/pymol-1.4/setup/pymol.com.osx-fink 2009-02-24
22:30:35.000000000 -0500
+++ pymol-py26-1.4-1.patched/pymol-1.4/setup/pymol.com.osx-fink 2011-04-23
16:06:47.000000000 -0400
@@ -5,7 +5,7 @@
# ==============================================================
# Set PYMOL_PATH to point at the correct location on your system
#
-PYMOL_PATH=/Users/delwarl/pymol
+PYMOL_PATH=@FINKPREFIX@/lib/pymol-py2X
export PYMOL_PATH
#
# ==============================================================
@@ -20,5 +20,8 @@
fi
export PYTHONPATH
#
-exec /sw/bin/python $PYMOL_PATH/modules/pymol/__init__.py "$@"
+APBS_PSIZE=@FINKPREFIX@/share/apbs/tools/manip/psize.py
+export APBS_PSIZE
+#
+exec @FINKPREFIX@/bin/python2.X $PYMOL_PATH/modules/pymol/__init__.py -d "_
set stereo_double_pump_mono,quiet=1" "$@"
diff -uNr pymol-py26-1.4-1/pynmr_0.37f_src/pmg_tk/startup/pynmr/Crmsd.i
pymol-py26-1.4-1.patched/pynmr_0.37f_src/pmg_tk/startup/pynmr/Crmsd.i
--- pymol-py26-1.4-1/pynmr_0.37f_src/pmg_tk/startup/pynmr/Crmsd.i
2006-04-06 08:47:42.000000000 -0400
+++ pymol-py26-1.4-1.patched/pynmr_0.37f_src/pmg_tk/startup/pynmr/Crmsd.i
2011-04-23 16:06:47.000000000 -0400
@@ -4,6 +4,7 @@
%array_functions(char *, charArray);
%array_functions(int, intArray);
%{
+extern char * C_do_best_range(char*, char*, char*, char*, char*, double);
%}
extern char * C_do_best_range(char*, char*, char*, char*, char*, double);
diff -uNr pymol-py26-1.4-1/pynmr_0.37f_src/pmg_tk/startup/pynmr/run.macos
pymol-py26-1.4-1.patched/pynmr_0.37f_src/pmg_tk/startup/pynmr/run.macos
--- pymol-py26-1.4-1/pynmr_0.37f_src/pmg_tk/startup/pynmr/run.macos
2006-04-06 10:10:45.000000000 -0400
+++ pymol-py26-1.4-1.patched/pynmr_0.37f_src/pmg_tk/startup/pynmr/run.macos
2011-04-23 16:06:47.000000000 -0400
@@ -1,4 +1,4 @@
-/Users/leigh/pynmr/swig/swig -python -I/Users/leigh/pynmr/swig/Lib/
-I/Users/leigh/pynmr/swig/Lib/python Crmsd.i
+@FINKPREFIX@/bin/swig -python Crmsd.i
# now fix the error that swig produces...
sed -e '/SWIG_init/s/init_/init/' -e '/SWIG_name/s/_Crmsd/Crmsd/ '
Crmsd_wrap.c > Crmsd_wrap2.c
@@ -8,8 +8,8 @@
#gcc -c Crmsd.c Crmsd_wrap.c -I../../../meschach -I/usr/include/python2.3 -lm
#gcc -shared Crmsd.o Crmsd_wrap.o meschach.a -o Crmsd.so
-gcc -fno-common -c Crmsd.c Crmsd_wrap.c -I/Users/leigh/pynmr/meschach
-I/usr/include/python2.3 -D_POSIX_C_SOURCE
-gcc -bundle -flat_namespace -L/usr/include/python2.3 Crmsd.o Crmsd_wrap.o
/Users/leigh/pynmr/meschach/meschach.a -lPython -o Crmsd.so
+gcc -O3 -fno-common -c Crmsd.c Crmsd_wrap.c -I@FINKPREFIX@/include/meschach
-I@FINKPREFIX@/include/python2.X -D_POSIX_C_SOURCE
+gcc -O3 -bundle -bundle_loader @FINKPREFIX@/bin/python2.X -flat_namespace
-undefined suppress Crmsd.o Crmsd_wrap.o -L@FINKPREFIX@/lib -lmeschach -o
Crmsd.so
diff -uNr
pymol-py26-1.4-1/pynmr_0.37f_src/pmg_tk/startup/pynmr/test_data/test.script
pymol-py26-1.4-1.patched/pynmr_0.37f_src/pmg_tk/startup/pynmr/test_data/test.script
--- pymol-py26-1.4-1/pynmr_0.37f_src/pmg_tk/startup/pynmr/test_data/test.script
2006-04-06 08:47:49.000000000 -0400
+++
pymol-py26-1.4-1.patched/pynmr_0.37f_src/pmg_tk/startup/pynmr/test_data/test.script
2011-04-23 16:06:47.000000000 -0400
@@ -6,5 +6,5 @@
pairfit=0)
nmr_cmd.C_do_best_range('test_1', 'C N CA', \
"test_1 test_2 test_3", "all", \
- "/home2/leigh/Proj/pynmr/pmg_tk/startup/pynmr/test_data/", 1.0)
+ "@FINKPREFIX@/lib/pymol-py2X/modules/pmg_tk/startup/pynmr/test_data",
1.0)
--- NEW FILE: pymol-py.info ---
Info2: <<
Package: pymol-py%type_pkg[python]
Version: 1.4
Revision: 7
Maintainer: W. G. Scott <[email protected]>
Type: python (2.6 2.7)
# r3959
#Source: mirror:sourceforge:fink/pymol-%v-src.tar.bz2
Source: http://diablo.ucsc.edu/~wgscott/pymol/pymol-%v-src.tar.bz2
Source-MD5: c520de57b1b3ad7fbc891057a4e32c3e
Source2: http://www.weizmann.ac.il/ISPC/eMovie.py
Source2-MD5: 832252d4cee1ba88d50a35681b5ecd4b
Source3: http://www.weizmann.ac.il/ISPC/eMovie_rigimol.inp
Source3-MD5: 7f61fc224103aa24a92f1a03f985ce49
Source4: http://diablo.ucsc.edu/~wgscott/pymol/pynmr_0.37f_src.tar.bz2
Source4-MD5: cb4a3906766681ce9230ef5515e1aa1c
PatchFile: pymol-py.patch
PatchFile-MD5: ee777e18ad893e1be061f0bd3abe05c3
PatchFile2: pymol-scipy.patch
PatchFile2-MD5: 09a486091a5cfe8c7e299a9f18446239
SourceDirectory: pymol-%v
Depends: python%type_pkg[python], libpng15-shlibs, scipy-py%type_pkg[python],
tcltk, pmw-py%type_pkg[python] (>= 1.3.2-1000), freeglut-shlibs, glew-shlibs,
blt-shlibs, meschach-shlibs
BuildDepends: libpng15, freeglut, glew, readline5, gdbm3, tcltk-dev, blt,
x11-dev, swig, meschach, fink (>= 0.30.0)
Conflicts: pymol, pymol-py22, pymol-py23, pymol-py24, pymol-py25, pymol-py26,
pymol-py27
Replaces: pymol, pymol-py22, pymol-py23, pymol-py24, pymol-py25, pymol-py26,
pymol-py27
PatchScript: <<
#! /bin/sh -ex
cd ..
sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | sed
's|python2.X|python%type_raw[python]|g' | sed
's|pymol-py2X|pymol-py%type_pkg[python]|g' | patch -p1
cd pymol-%v
patch -p1 < %{PatchFile2}
perl -pi -e 's|self.dialog.activate|\#self.dialog.activate|g'
modules/pmg_tk/startup/apbs_tools.py
<<
CompileScript: <<
#! /bin/sh -ex
(cd setup; cp Rules.osx-fink %b/Rules.delsci) || exit 1
case `uname -r` in
10.*|11.*) perl -pi -e "s,-Wno-long-double,," ./Rules.delsci ;;
esac
make -f Makefile.delsci
cd %b/../pynmr_0.37f_src/pmg_tk/startup/pynmr
perl -pi -e 's|Numeric import|numpy.oldnumeric import|g' *.py
perl -pi -e 's|LinearAlgebra import|numpy.oldnumeric.linear_algebra import|g'
*.py
perl -pi -e 's|import MLab|import numpy.oldnumeric.mlab as MLab|g' *.py
./run.macos
<<
InstallScript: <<
#! /bin/sh -ex
mkdir -p %i/lib/%n/bin
(cd setup; cp pymol.com.osx-fink %i/lib/%n/bin/pymol) || exit 1
cp -r data modules examples test scripts %i/lib/%n
ln -s %p/share/doc/%n/LICENSE %i/lib/%n/LICENSE.txt
cp ../eMovie.py
%i/lib/pymol-py%type_pkg[python]/modules/pmg_tk/startup/eMovie.py
cp ../eMovie_rigimol.inp %i/lib/pymol-py%type_pkg[python]/eMovie_rigimol.inp
mkdir %i/lib/pymol-py%type_pkg[python]/modules/pmg_tk/startup/pynmr
cd ../pynmr_0.37f_src/pmg_tk/startup
cp plug_nmr.py %i/lib/pymol-py%type_pkg[python]/modules/pmg_tk/startup
cd pynmr
cp -r Crmsd.so *.py BIOPYTHON_LICENSE LICENSE README help images test_data
%i/lib/pymol-py%type_pkg[python]/modules/pmg_tk/startup/pynmr
rm
%i/lib/pymol-py%type_pkg[python]/modules/pmg_tk/startup/pynmr/test_data/.noe.tbl.swp
# precompile python scripts
%p/bin/python%type_raw[python] -O %p/lib/python%type_raw[python]/compileall.py
-f -d %p/lib/%n/modules %i/lib/%n/modules
<<
DocFiles: DEVELOPERS LICENSE README
PostInstScript: <<
update-alternatives --install %p/bin/pymol pymol
%p/lib/pymol-py%type_pkg[python]/bin/pymol %type_pkg[python]
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
update-alternatives --remove pymol %p/lib/pymol-py%type_pkg[python]/bin/pymol
fi
<<
Description: Molecular graphics system
DescDetail: <<
PyMOL is a molecular graphics system with an embedded Python interpreter
designed for real-time visualization and rapid generation of high-quality
molecular graphics images and animations.
<<
DescPort: <<
Versions prior to 0.97-1 were ported and maintained by Matt Stephenson
<[email protected]>
<<
DescPackaging: <<
The tarball used for this version was created in accordance to the BSD
license of pymol using the following instructions...
svn -r3959 co https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
pymol-1.4
tar --exclude=.svn -jcvf pymol-1.4-src.tar.bz2 pymol-1.4
Added eMovie.py plug-in manually. Commented out line that opens the window for
eMovie by
default every time pymol is started as this is annoying behavior. eMovie is
activated via
the plugin menu.
Added -d "_ set stereo_double_pump_mono,quiet=1" to exec on pymol to limit
video
artifacts on drivers that do not properly support hardware stereo yet such as
those for the
HD 2600 XT.
Added pynmr plugin.
<<
DescUsage: Just type 'pymol' at the command prompt inside an X environment.
License: OSI-Approved
Homepage: http://pymol.sourceforge.net
<<
--- NEW FILE: suitesparse.info ---
Package: suitesparse
Version: 3.1.0
Revision: 1
Source:
http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-%v.tar.gz
Source-MD5: 58d90444feef92fc7c265cbd11a757c6
SourceDirectory: SuiteSparse
BuildDepends: fink (>= 0.24.12)
PatchFile: %n.patch
PatchFile-MD5: 1eb2eb73cb1abef598fb7bb51a8a26b3
PatchScript: <<
%{default_script}
sed -i.bak -e 's,^CFLAGS = -O,&3 -fstrict-aliasing,'
C{,X}Sparse/Lib/Makefile
<<
CompileScript: <<
#! /bin/sh -ev
# Compile SuiteSparse without METIS.
export METIS_PREFIX=
export CHOLMOD_CONFIG='-DNPARTITION'
echo **** Start: Message from SuiteSparse CompileScript ****
echo Compiling SuiteSparse WITHOUT METIS
echo METIS_PREFIX = $METIS_PREFIX
echo CHOLMOD_CONFIG = $CHOLMOD_CONFIG
echo **** Stop: Message from SuiteSparse CompileScript ****
make default
<<
InstallScript: <<
#! /bin/sh -ev
install -d %i/lib
find . -name 'lib*.a' -exec install -m 644 \{\} %i/lib \;
rm %i/lib/libcsparse.a
ranlib %i/lib/lib*.a
install -d %i/include/%N
install -p -m 644 \
`find . -name '*.h'|egrep -v
'^\./(CSparse/|CXSparse_n|UMFPACK/Source/)|/(MATLAB|Demo|Tcov)/|_(internal|version)\.h$'`
\
%i/include/%N
for f in `ls -1 {,*/,CHOLMOD/*/}*.txt|egrep -v '_newfiles|MATLAB'|sed -e
's,^,./,' -e 's,/[^/]*$,,'|sort -u`
do install -d %i/share/doc/%n/$f; install -p -m 644 $f/*.txt
%i/share/doc/%n/$f; done
for f in `ls -1d */Doc|fgrep -v _newfiles|sed -e 's,/[^/]*$,,'`
do install -d %i/share/doc/%n/$f; install -p -m 644 $f/Doc/*
%i/share/doc/%n/$f; done
cd %i/share/doc/%n
# replace duplicates by symlinks
for n in lesser gpl; do
l=`ls -1 {,*/}*/$n.txt`
target=`tail -n1<<<"$l"`
list=`sed -e '$d'<<<"$l"`
for f in $list; do g=`sed -e 's,[^/]\+,..,g' -e 's,\.\.$,,' <<<"$f"`;
ln -fs $g$target $f; done
done
# clean up
find . \( -name Makefile \
-o -name '*.bib' -o -name '*.tex' -o -name '*.stex' -o -name '*.sed*'
-o -name '*.awk' -o -name '*diff' -o -name '*proto' \
\) -exec rm \{\} \;
cd -
<<
Description: Suite of Sparse matrix packages
License: GPL/LGPL
Maintainer: Ben Abbott <[email protected]>
Homepage: http://www.cise.ufl.edu/research/sparse/SuiteSparse/
--- NEW FILE: pymol-scipy.patch ---
diff -uNr pymol-1.4/contrib/pyopengl/_glumodule.c
pymol-1.4.scipy/contrib/pyopengl/_glumodule.c
--- pymol-1.4/contrib/pyopengl/_glumodule.c 2009-02-24 22:30:40.000000000
-0500
+++ pymol-1.4.scipy/contrib/pyopengl/_glumodule.c 2011-07-22
22:02:17.000000000 -0400
@@ -652,7 +652,7 @@
#elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
#include "Extensions/arrayobject.h"
#elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
-#include "Numeric/arrayobject.h"
+#include "numpy/oldnumeric.h"
#elif defined(HAVE_NUMERICAL_ARRAYOBJECT_H)
#include "numerical/arrayobject.h"
#else
diff -uNr pymol-1.4/contrib/pyopengl/_openglmodule.c
pymol-1.4.scipy/contrib/pyopengl/_openglmodule.c
--- pymol-1.4/contrib/pyopengl/_openglmodule.c 2009-02-24 22:30:40.000000000
-0500
+++ pymol-1.4.scipy/contrib/pyopengl/_openglmodule.c 2011-07-22
22:02:17.000000000 -0400
@@ -93,7 +93,7 @@
#elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
#include "Extensions/arrayobject.h"
#elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
-#include "Numeric/arrayobject.h"
+#include "numpy/oldnumeric.h"
#elif defined(HAVE_NUMERICAL_ARRAYOBJECT_H)
#include "numerical/arrayobject.h"
#else
diff -uNr pymol-1.4/contrib/pyopengl/openglutil.h
pymol-1.4.scipy/contrib/pyopengl/openglutil.h
--- pymol-1.4/contrib/pyopengl/openglutil.h 2009-02-24 22:30:40.000000000
-0500
+++ pymol-1.4.scipy/contrib/pyopengl/openglutil.h 2011-07-22
22:02:17.000000000 -0400
@@ -14,7 +14,7 @@
#elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
#include "Extensions/arrayobject.h"
#elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
-#include "Numeric/arrayobject.h"
+#include "numpy/oldnumeric.h"
#elif defined(HAVE_NUMERICAL_ARRAYOBJECT_H)
#include "numerical/arrayobject.h"
#else
diff -uNr pymol-1.4/modules/pymol/opengl/__init__.py
pymol-1.4.scipy/modules/pymol/opengl/__init__.py
--- pymol-1.4/modules/pymol/opengl/__init__.py 2009-02-24 22:29:21.000000000
-0500
+++ pymol-1.4.scipy/modules/pymol/opengl/__init__.py 2011-07-22
22:02:17.000000000 -0400
@@ -1,7 +1,9 @@
+## Automatically adapted for numpy.oldnumeric Jul 09, 2010 by -c
+
# PyOpenGL: modified for usage inside of PyMOL
try:
- import multiarray
+ import numpy.oldnumeric as multiarray
_numeric = 1
except ImportError:
_numeric = 0
diff -uNr pymol-1.4/modules/pymol/opengl/gl/__init__.py
pymol-1.4.scipy/modules/pymol/opengl/gl/__init__.py
--- pymol-1.4/modules/pymol/opengl/gl/__init__.py 2009-02-24
22:29:21.000000000 -0500
+++ pymol-1.4.scipy/modules/pymol/opengl/gl/__init__.py 2011-07-22
22:02:17.000000000 -0400
@@ -1,3 +1,5 @@
+## Automatically adapted for numpy.oldnumeric Jul 09, 2010 by -c
+
import sys
from pymol import opengl
@@ -13,7 +15,7 @@
"""
if opengl._numeric:
- from Numeric import ArrayType
+ from numpy.oldnumeric import ArrayType
try:
import _opengl_num
_opengl = _opengl_num
diff -uNr pymol-1.4/modules/pymol/opengl/glu/__init__.py
pymol-1.4.scipy/modules/pymol/opengl/glu/__init__.py
--- pymol-1.4/modules/pymol/opengl/glu/__init__.py 2009-02-24
22:29:21.000000000 -0500
+++ pymol-1.4.scipy/modules/pymol/opengl/glu/__init__.py 2011-07-22
22:02:17.000000000 -0400
@@ -1,9 +1,11 @@
+## Automatically adapted for numpy.oldnumeric Jul 09, 2010 by -c
+
# $Id: __init__.py 336 2001-02-24 12:11:45Z wdelano $
import sys
from pymol import opengl
if opengl._numeric:
- from Numeric import ArrayType
+ from numpy.oldnumeric import ArrayType
try:
import _glu_num
_glu = _glu_num
--- NEW FILE: suitesparse.patch ---
diff -urN -x .DS_Store originals/SuiteSparse/AMD/Makefile
SuiteSparse/AMD/Makefile
--- originals/SuiteSparse/AMD/Makefile 2007-05-05 13:23:47.000000000 -0400
+++ SuiteSparse/AMD/Makefile 2008-03-22 20:19:59.000000000 -0400
@@ -8,7 +8,7 @@
# Compile all C code, including the C-callable routines.
# Do not compile the FORTRAN versions, or MATLAB interface.
-demo:
+demo: Makefile
( cd Lib ; $(MAKE) )
( cd Demo ; $(MAKE) )
diff -urN -x .DS_Store originals/SuiteSparse/KLU/Include/klu_internal.h
SuiteSparse/KLU/Include/klu_internal.h
--- originals/SuiteSparse/KLU/Include/klu_internal.h 2007-05-04
17:00:06.000000000 -0400
+++ SuiteSparse/KLU/Include/klu_internal.h 2008-03-22 20:19:59.000000000
-0400
@@ -9,7 +9,7 @@
#include "klu.h"
#include "btf.h"
-#include "klu_version.h"
+/*#include "klu_version.h"*/
/* ==========================================================================
*/
/* make sure debugging and printing is turned off */
@@ -36,6 +36,8 @@
#include <limits.h>
#include <stdlib.h>
#include <math.h>
+/* moved klu_version.h after math.h to circumvent compile error on ppc */
+#include "klu_version.h"
#undef ASSERT
#ifndef NDEBUG
diff -urN -x .DS_Store originals/SuiteSparse/LDL/Makefile
SuiteSparse/LDL/Makefile
--- originals/SuiteSparse/LDL/Makefile 2007-05-05 13:24:14.000000000 -0400
+++ SuiteSparse/LDL/Makefile 2008-03-22 20:19:59.000000000 -0400
@@ -7,7 +7,7 @@
include ../UFconfig/UFconfig.mk
# Compile all C code, including the C-callable routine.
-demo:
+demo: Makefile
( cd Lib ; $(MAKE) )
( cd Demo ; $(MAKE) )
diff -urN -x .DS_Store originals/SuiteSparse/UFconfig/UFconfig.mk
SuiteSparse/UFconfig/UFconfig.mk
--- originals/SuiteSparse/UFconfig/UFconfig.mk 2007-10-24 09:55:44.000000000
-0400
+++ SuiteSparse/UFconfig/UFconfig.mk 2008-03-22 20:19:59.000000000 -0400
@@ -32,8 +32,8 @@
# C compiler and compiler flags: These will normally not give you optimal
# performance. You should select the optimization parameters that are best
# for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example.
-CC = cc
-CFLAGS = -O
+#CC = cc
+# CFLAGS = -O
# ranlib, and ar, for generating libraries
RANLIB = ranlib
@@ -49,7 +49,7 @@
F77LIB =
# C and Fortran libraries
-LIB = -lm
+# LIB = -lm
# For compiling MATLAB mexFunctions (MATLAB 7.5)
MEX = mex -O -largeArrayDims -lmwlapack -lmwblas
@@ -85,8 +85,8 @@
# BLAS = -lgoto -lgfortran -lgfortranbegin
# This is probably slow ... it might connect to the Standard Reference BLAS:
-BLAS = -lblas -lgfortran -lgfortranbegin
-LAPACK = -llapack
+# BLAS = -lblas -lgfortran -lgfortranbegin
+# LAPACK = -llapack
# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
@@ -114,13 +114,13 @@
# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB,
etc.
# You may wish to use an absolute path. METIS is optional. Compile
# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
-METIS_PATH = ../../metis-4.0
-METIS = ../../metis-4.0/libmetis.a
+# METIS_PATH = ../../metis-4.0
+# METIS = ../../metis-4.0/libmetis.a
# If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
# options:
-# METIS_PATH =
-# METIS =
+METIS_PATH =
+METIS =
#------------------------------------------------------------------------------
# UMFPACK configuration:
@@ -176,15 +176,15 @@
# -DNSUNPERF for Solaris only. If defined, do not use the Sun
# Performance Library
-CHOLMOD_CONFIG =
+CHOLMOD_CONFIG = -DNPARTITION
#------------------------------------------------------------------------------
# Linux
#------------------------------------------------------------------------------
# Using default compilers:
-# CC = gcc
-CFLAGS = -O3
+CC = gcc
+# CFLAGS = -O3
# alternatives:
# CFLAGS = -g -fexceptions \
@@ -252,11 +252,11 @@
# Macintosh
#------------------------------------------------------------------------------
-# CC = gcc
-# CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
-# LIB = -lstdc++
-# BLAS = -framework Accelerate
-# LAPACK = -framework Accelerate
+CC = gcc
+CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
+LIB = -lstdc++
+BLAS = -framework Accelerate
+LAPACK = -framework Accelerate
#------------------------------------------------------------------------------
# IBM RS 6000
------------------------------------------------------------------------------
Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs