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

Modified Files:
        pymol-py.info pymol-py.patch 
Log Message:
grr...c++ symbol mess


Index: pymol-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/pymol-py.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pymol-py.info       23 Jul 2007 01:35:31 -0000      1.6
+++ pymol-py.info       23 Jul 2007 01:42:08 -0000      1.7
@@ -1,22 +1,20 @@
 Info2: <<
 Package: pymol-py%type_pkg[python]
-Version: 1.0
-Revision: 1
-Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
+Version: 0.99
+Revision: 4
 Maintainer: Jack Howarth <[EMAIL PROTECTED]>
 Type: python (2.2 2.3 2.4)
-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
+Source: mirror:sourceforge:fink/pymol-0_99rev8-src.tgz
+Source-MD5: c8b2cb030dd9aea97c875061fb7ba35a
+SourceDirectory: pymol-%vrev8
 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|db43, readline (>= 4.3-5), 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
+Conflicts: pymol, pymol-py22, pymol-py23, pymol-py24
+Replaces: pymol, pymol-py22, pymol-py23, pymol-py24
 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.delsci)
-make -f Makefile.delsci
+(cd setup; cp Rules.osx-fink %b/Rules.make)
+make
 <<
 InstallScript: <<
 mkdir -p %i/lib/%n/bin
@@ -27,16 +25,7 @@
 echo "append_path PATH %p/lib/%n/bin" >  %i/etc/profile.d/%n.sh
 chmod 755 %i/etc/profile.d/%n.*
 <<
-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
-<<
+DocFiles: CHANGES DEVELOPERS LICENSE README
 Description: Molecular graphics system
 DescDetail: <<
 PyMOL is a molecular graphics system with an embedded Python interpreter
@@ -50,8 +39,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://svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.0
-   tar --exclude=.svn -zcvf pymol-1.0-src.tgz pymol-1.0
+   svn export -r 2805 
https://svn.sourceforge.net/svnroot/pymol/branches/b099/pymol pymol-0.99rev8
+   tar --exclude=.svn -zcvf pymol-0_99rev8-src.tgz pymol-0.99rev8
 <<
 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.3/unstable/main/finkinfo/sci/pymol-py.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pymol-py.patch      23 Jul 2007 01:35:31 -0000      1.3
+++ pymol-py.patch      23 Jul 2007 01:42:08 -0000      1.4
@@ -1,14 +1,3 @@
---- 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
@@ -100,7 +89,7 @@
  fi
  export PYTHONPATH
  #
--exec /sw/bin/python $PYMOL_PATH/modules/pymol/__init__.py "$@"
-+exec @FINKPREFIX@/bin/python2.X $PYMOL_PATH/modules/pymol/__init__.py "$@"
+-/sw/bin/python $PYMOL_PATH/modules/pymol/__init__.py "$@"
[EMAIL PROTECTED]@/bin/python2.X $PYMOL_PATH/modules/pymol/__init__.py "$@"
  
  


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to