Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3218
Modified Files:
pymol-py.info pymol-py.patch
Log Message:
pymol update
Index: pymol-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pymol-py.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- pymol-py.info 9 May 2008 16:04:08 -0000 1.18
+++ pymol-py.info 25 Jun 2008 18:03:39 -0000 1.19
@@ -1,13 +1,13 @@
Info2: <<
Package: pymol-py%type_pkg[python]
-Version: 1.0r2
-Revision: 1002
+Version: 1.1r1
+Revision: 1000
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
Maintainer: Jack Howarth <[EMAIL PROTECTED]>
Type: python (2.3 2.4 2.5)
#Source: mirror:sourceforge:fink/pymol-%v-src.tgz
Source: http://diablo.ucsc.edu/~wgscott/pymol/pymol-%v-src.tgz
-Source-MD5: c63120579e9d6e81c6b7e208d5f44f3f
+Source-MD5: a67e7b7d9481060b12d1f017b88f73c0
SourceDirectory: pymol-%v
# Source2: http://www.weizmann.ac.il/ISPC/eMovie.py
# Source2-MD5: 0d2236e26f00d944223f6c17049c2b97
@@ -24,6 +24,7 @@
mkdir -p %i/lib/%n/bin
(cd setup; cp pymol.com.osx-fink %i/lib/%n/bin/pymol)
cp -r data modules examples test scripts %i/lib/%n
+ln -s %p/share/doc/%n/LICENSE %i/lib/%n/LICENSE.txt
mkdir -p %i/etc/profile.d
echo "append_path PATH %p/lib/%n/bin" > %i/etc/profile.d/%n.csh
echo "append_path PATH %p/lib/%n/bin" > %i/etc/profile.d/%n.sh
@@ -53,8 +54,8 @@
DescPackaging: <<
The tarball used for this version was created in accordance to the BSD
license of pymol using the following instructions...
- svn export https://pymol.svn.sourceforge.net/svnroot/pymol/tags/1.0r2/pymol
pymol-1.0r2
- tar --exclude=.svn -zcvf pymol-1.0r2-src.tgz pymol-1.0r2
+ svn export -r 3395
https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.1r1
+ tar --exclude=.svn -zcvf pymol-1.1r1-src.tgz pymol-1.1r1
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.
Index: pymol-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pymol-py.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pymol-py.patch 9 May 2008 16:05:04 -0000 1.6
+++ pymol-py.patch 25 Jun 2008 18:03:39 -0000 1.7
@@ -1,5 +1,5 @@
---- pymol-1.0r2/contrib/modules/Makefile.pre.in.src.org 2008-05-09
11:35:01.000000000 -0400
-+++ pymol-1.0r2/contrib/modules/Makefile.pre.in.src 2008-05-09
11:35:39.000000000 -0400
+--- pymol-1.1b3/contrib/modules/Makefile.pre.in.src.org 2008-05-09
19:09:50.000000000 -0400
++++ pymol-1.1b3/contrib/modules/Makefile.pre.in.src 2008-05-09
19:11:25.000000000 -0400
@@ -88,10 +88,10 @@
# === Variables that you may want to customize (rarely) ===
@@ -54,7 +54,7 @@
XINC_DIR = -I/usr/X11R6/include
#--- Python
-PYTHON_EXE = /sw/bin/python2.3
-+PYTHON_EXE = @FINKPREFIX@/bin/python2.X
++PYTHON_EXE = python2.X
PYTHON_LIB =
PYTHON_LIB_DIR =
-PYTHON_INC_DIR = -I/sw/include/python2.3 \
@@ -99,15 +99,3 @@
---- pymol-1.0r2.org/modules/pymol/__init__.py 2007-12-08 15:23:50.000000000
-0500
-+++ pymol-1.0r2/modules/pymol/__init__.py 2007-12-08 16:50:22.000000000
-0500
-@@ -385,7 +385,8 @@
- pymol_launch = 0 # never do this again : )
- if (sys.platform=='darwin') and (invocation.options.external_gui==1):
- import os
-- os.system("/usr/bin/open -a X11") # launch X11 if we're going to
need it
-+ if os.system("/usr/X11R6/bin/xdpyinfo >& /dev/null"):
-+ os.system("/usr/bin/open -a X11") # launch X11 if we're going
to need it
-
- def start_pymol(block_input_hook=0):
- prime_pymol()
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
