Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv22717

Modified Files:
        pymol-py.info pymol-py.patch 
Log Message:
pymol version update

Index: pymol-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pymol-py.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pymol-py.info       16 Jun 2007 22:30:55 -0000      1.13
+++ pymol-py.info       29 Jun 2007 21:56:50 -0000      1.14
@@ -1,22 +1,22 @@
 Info2: <<
 Package: pymol-py%type_pkg[python]
-Version: 0.99
-Revision: 1005
+Version: 1.0
+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-0_99rev10-src.tgz
-# Source: http://diablo.ucsc.edu/~wgscott/pymol/pymol-0_99rev10-src.tgz
-Source-MD5: 0aeba9d0c3b372f182bae07a0a161b5a
-SourceDirectory: pymol-%vrev10
+#Source: mirror:sourceforge:fink/pymol-%v-src.tgz
+Source: http://diablo.ucsc.edu/~wgscott/pymol/pymol-%v-src.tgz
+Source-MD5: ad18e6f508fab70b51c59740c78eb94c
+SourceDirectory: pymol-%v
 Depends: python%type_pkg[python], libpng3-shlibs, numeric-py%type_pkg[python], 
tcltk, pmw-py%type_pkg[python] (>= 1.2-1), freeglut-shlibs, blt-shlibs
 BuildDepends: libpng3, freeglut, db43-ssl (>= 4.3.29-1001)|db43 (>= 
4.3.29-1001), readline (>= 4.3-1028), gdbm3, expat, tcltk-dev, blt, x11-dev
 Conflicts: pymol, pymol-py22, pymol-py23, pymol-py24, pymol-py25
 Replaces: pymol, pymol-py22, pymol-py23, pymol-py24, pymol-py25
 PatchScript: sed 's|@FINKPREFIX@|%p|g' <%a/pymol-py.patch | sed 
's|python2.X|python%type_raw[python]|g' | sed 
's|pymol-py2X|pymol-py%type_pkg[python]|g' | patch -p1
 CompileScript: <<
-(cd setup; cp Rules.osx-fink %b/Rules.make)
-make
+(cd setup; cp Rules.osx-fink %b/Rules.delsci)
+make -f Makefile.delsci
 <<
 InstallScript: <<
 mkdir -p %i/lib/%n/bin
@@ -27,7 +27,16 @@
 echo "append_path PATH %p/lib/%n/bin" >  %i/etc/profile.d/%n.sh
 chmod 755 %i/etc/profile.d/%n.*
 <<
-DocFiles: CHANGES DEVELOPERS LICENSE README
+DocFiles: DEVELOPERS LICENSE README
+PostInstScript: <<
+%p/bin/python%type_raw[python] -O %p/lib/python%type_raw[python]/compileall.py 
-q %p/lib/%n/modules
+<<
+PreRmScript: <<
+PACKAGE=%N
+dpkg --listfiles $PACKAGE |
+        /usr/bin/awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
+        xargs rm -f >&2
+<<
 Description: Molecular graphics system
 DescDetail: <<
 PyMOL is a molecular graphics system with an embedded Python interpreter
@@ -41,8 +50,8 @@
 DescPackaging: <<
 The tarball used for this version was created in accordance to the BSD
 license of pymol using the following instructions...
-   svn export -r 2974  
https://svn.sourceforge.net/svnroot/pymol/branches/b099/pymol pymol-0.99rev10
-   tar --exclude=.svn -zcvf pymol-0_99rev10-src.tgz pymol-0.99rev10
+   svn export https://svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.0
+   tar --exclude=.svn -zcvf pymol-1.0-src.tgz pymol-1.0
 <<
 DescUsage: Just type 'pymol' at the command prompt inside an X environment.
 License: OSI-Approved

Index: pymol-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pymol-py.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pymol-py.patch      25 Feb 2006 16:59:12 -0000      1.2
+++ pymol-py.patch      29 Jun 2007 21:56:50 -0000      1.3
@@ -1,3 +1,14 @@
+--- pymol-1.0/Makefile.delsci.org      2007-06-27 22:42:30.000000000 -0400
++++ pymol-1.0/Makefile.delsci  2007-06-27 22:46:28.000000000 -0400
+@@ -72,6 +72,8 @@
+ 
+ unix: .includes .depends .update 
+       /bin/rm -f .update .includes
++      cd contrib;$(MAKE) -f Makefile.delsci
++      cd contrib/uiuc/plugins/molfile_plugin/src;$(MAKE) -f Makefile.delsci
+       $(CC) $(BUILD) $(DEST) */*.o ov/src/*.o 
contrib/uiuc/plugins/molfile_plugin/src/*.o $(CFLAGS)  $(LIB_DIRS) $(LIBS)      
+ 
+ semistatic: .includes .depends .update
 diff -uNr pymol-0.95.org/contrib/modules/Makefile.pre.in.src 
pymol-0.95/contrib/modules/Makefile.pre.in.src
 --- pymol-0.95.org/contrib/modules/Makefile.pre.in.src Thu Aug 14 16:59:06 2003
 +++ pymol-0.95/contrib/modules/Makefile.pre.in.src     Mon Apr  5 18:08:14 2004
@@ -89,7 +100,7 @@
  fi
  export PYTHONPATH
  #
--/sw/bin/python $PYMOL_PATH/modules/pymol/__init__.py "$@"
[EMAIL PROTECTED]@/bin/python2.X $PYMOL_PATH/modules/pymol/__init__.py "$@"
+-exec /sw/bin/python $PYMOL_PATH/modules/pymol/__init__.py "$@"
++exec @FINKPREFIX@/bin/python2.X $PYMOL_PATH/modules/pymol/__init__.py "$@"
  
  


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to