Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22847

Modified Files:
        pdb2pqr.info apbs.info apbs-mpi.info 
Log Message:
fixed for 10.6 32-bit

Index: apbs-mpi.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/apbs-mpi.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- apbs-mpi.info       26 Aug 2009 16:20:26 -0000      1.16
+++ apbs-mpi.info       7 Sep 2009 18:29:32 -0000       1.17
@@ -1,10 +1,11 @@
 Info2: <<
 Package: apbs-mpi-%type_pkg[handler]
 Version: 1.1.0
-Revision: 6
+Revision: 7
 Type: handler (lammpi openmpi)
 #Conflicts: apbs, apbs-mpi-lammpi, apbs-mpi-openmpi
 #Replaces: apbs, apbs-mpi-lammpi, apbs-mpi-openmpi
+BuildConflicts: g77, g95, fort77
 Source: http://switch.dl.sourceforge.net/sourceforge/apbs/apbs-%v-source.tar.gz
 Source-MD5: ca31ba09714e4fc9acce91e7961569cd
 SourceDirectory: apbs-%v-source
@@ -21,7 +22,10 @@
 SetCFLAGS: -O3
 ConfigureParams: --build=%m-apple-darwin`uname -r|cut -f1 -d.` 
--host=%m-apple-darwin`uname -r|cut -f1 -d.`
 CompileScript: <<
-#!/bin/zsh -efv
+#!/bin/bash -efv
+PATH=%p/bin:%p/sbin:${PATH} ; export PATH
+source %p/bin/init.sh
+#
 
BLAS_DIR='/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A'
 if [[ %type_pkg[handler] == "openmpi" ]]; then
 F77=%p/bin/mpif77 ./configure %c  --disable-blas \

Index: apbs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/apbs.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- apbs.info   26 Aug 2009 16:20:26 -0000      1.20
+++ apbs.info   7 Sep 2009 18:29:32 -0000       1.21
@@ -1,12 +1,13 @@
 Package: apbs
 Version: 1.1.0
-Revision: 6
+Revision: 7
 Source: mirror:sourceforge:%n/%n-%v-source.tar.gz
 Source-MD5: ca31ba09714e4fc9acce91e7961569cd
 Depends: readline-shlibs (>= 4.3-1028), gnuplot (>=4.2.0) | gnuplot-nox | 
gnuplot-nogtk, pdb2pqr, gcc44-shlibs, python26
 BuildDepends: gcc44, python26, fink (>= 0.24.12)
 #Conflicts: apbs-mpi, maloc, maloc-mpi-lammpi,  maloc-mpi-openmpi, 
apbs-mpi-openmpi, apbs-mpi-lammpi
 #Replaces:  apbs-mpi, maloc, maloc-mpi-lammpi,  maloc-mpi-openmpi, 
apbs-mpi-openmpi, apbs-mpi-lammpi
+BuildConflicts: g77, g95, fort77
 Conflicts: maloc, maloc-mpi-lammpi,  maloc-mpi-openmpi
 Replaces:  maloc, maloc-mpi-lammpi,  maloc-mpi-openmpi
 ConfigureParams: --build=%m-apple-darwin`uname -r|cut -f1 -d.` 
--host=%m-apple-darwin`uname -r|cut -f1 -d.`
@@ -18,7 +19,9 @@
 sed 's|@INSTALL_DIR@|%d|g' < %{PatchFile} | patch -p1
 <<
 CompileScript: <<
-#!/bin/zsh -efv
+#!/bin/bash -efv
+PATH=%p/bin:%p/sbin:${PATH} ; export PATH
+source %p/bin/init.sh
 
BLAS_DIR='/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A'
 py_path=%p/bin/python2.6 F77=gfortran ./configure %c --enable-python 
--with-python=%p/bin/python2.6 \
 --with-blas="-L${BLAS_DIR} -lblas -Wl,-framework -Wl,vecLib -Wl,-undefined 
-Wl,dynamic_lookup" FFLAGS="-O3"

Index: pdb2pqr.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pdb2pqr.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pdb2pqr.info        9 May 2009 17:42:53 -0000       1.13
+++ pdb2pqr.info        7 Sep 2009 18:29:32 -0000       1.14
@@ -1,6 +1,6 @@
 Package: pdb2pqr
 Version: 1.4.0 
-Revision: 2
+Revision: 3
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
 Source-MD5: 2ff9907c06b5420cf52e73717fb01a9d
 SourceDirectory: %n-%v
@@ -11,18 +11,34 @@
 NoSetLDFLAGS: true
 CompileScript: <<
 #!/bin/zsh -efv
-perl -pi -e 's|fort xlf95 lf95 g95|fort xlf95 lf95 g95 gfortran|g' 
./propka/configure
+PATH=%p/bin:%p/sbin:${PATH} ; export PATH
+source %p/bin/init.sh
+#
+if [[ "%m" != "x86_64" ]]; then
+    export CCPFLAGS="-m32"
+    export LDFLAGS="-m32"
+       perl -pi -e 's|-Wl,-framework -Wl,Python 
-bundle|%p/lib/python2.6/config/libpython2.6.dylib -m32 -bundle|g' ./configure
+       perl -pi -e 's|-Wl,-framework -Wl,Python 
-bundle|%p/lib/python2.6/config/libpython2.6.dylib  -m32 -bundle|g' 
./propka/configure
+else
+       perl -pi -e 's|-Wl,-framework -Wl,Python 
-bundle|%p/lib/python2.6/config/libpython2.6.dylib  -bundle|g' ./configure
+       perl -pi -e 's|-Wl,-framework -Wl,Python 
-bundle|%p/lib/python2.6/config/libpython2.6.dylib  -bundle|g' 
./propka/configure
+fi
+perl -pi -e 's|fort xlf95 lf95 g95|gfortran|g' ./propka/configure
 perl -pi -e 's|/usr/bin/python|%p/bin/python2.6|g' ./pdb2pka/pka.py
 perl -pi -e 's|/usr/bin/python|%p/bin/python2.6|g' ./src/psize.py
-perl -pi -e 's|-Wl,-framework -Wl,Python 
-bundle|%p/lib/python2.6/config/libpython2.6.dylib -bundle|g' ./configure
-perl -pi -e 's|-Wl,-framework -Wl,Python 
-bundle|%p/lib/python2.6/config/libpython2.6.dylib -bundle|g' ./propka/configure
 rm -fr contrib
 ./configure --with-max-atoms="1000000"    --without-url  
--with-python=%p/bin/python2.6 --with-f77=gfortran 
+if [[ "%m" != "x86_64" ]]; then
+    perl -pi -e 's|-DPACKAGE|-m32 -DPACKAGE|g' **/Makefile
+fi
 make
 rm -f **/*.o
 <<
 InstallScript: <<
 #!/bin/zsh -efv
+source %p/bin/init.sh
+PATH=%p/bin:%p/sbin:${PATH} ; export PATH
+
 mkdir -p %i/share/pdb2pqr
 cp -R * %i/share/pdb2pqr
 #


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to