Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8860/10.4-pangocairo/unstable/main/finkinfo/sci
Modified Files:
Tag: pangocairo-branch
pymol-py.info pymol-py.patch
Log Message:
sync build-fix
Index: pymol-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pymol-py.info,v
retrieving revision 1.7.2.8
retrieving revision 1.7.2.9
diff -u -d -r1.7.2.8 -r1.7.2.9
--- pymol-py.info 11 Dec 2007 17:36:11 -0000 1.7.2.8
+++ pymol-py.info 10 May 2008 15:52:37 -0000 1.7.2.9
@@ -1,7 +1,7 @@
Info2: <<
Package: pymol-py%type_pkg[python]
Version: 1.0r2
-Revision: 1001
+Revision: 1002
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)
Index: pymol-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pymol-py.patch,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- pymol-py.patch 11 Dec 2007 17:36:11 -0000 1.2.2.3
+++ pymol-py.patch 10 May 2008 15:52:37 -0000 1.2.2.4
@@ -1,6 +1,5 @@
-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
+--- 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
@@ -88,10 +88,10 @@
# === Variables that you may want to customize (rarely) ===
@@ -14,7 +13,13 @@
# Add more -I and -D options here
CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
-@@ -131,7 +131,7 @@
+@@ -126,12 +126,13 @@
+ MACHDEP= @MACHDEP@
+ SO= @SO@
+ LDSHARED= @LDSHARED@
++BLDSHARED= @LDSHARED@
+ CCSHARED= @CCSHARED@
+ LINKFORSHARED= @LINKFORSHARED@
[EMAIL PROTECTED]@
# Install prefix for architecture-independent files
@@ -23,7 +28,7 @@
# Install prefix for architecture-dependent files
exec_prefix= $(prefix)
-@@ -168,7 +168,7 @@
+@@ -168,7 +169,7 @@
MAKEFILE= $(LIBPL)/Makefile
CONFIGC= $(LIBPL)/config.c
CONFIGCIN= $(LIBPL)/config.c.in
@@ -49,7 +54,7 @@
XINC_DIR = -I/usr/X11R6/include
#--- Python
-PYTHON_EXE = /sw/bin/python2.3
-+PYTHON_EXE = python2.X
++PYTHON_EXE = @FINKPREFIX@/bin/python2.X
PYTHON_LIB =
PYTHON_LIB_DIR =
-PYTHON_INC_DIR = -I/sw/include/python2.3 \
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
