Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11001
Modified Files:
apbs-mpi.info apbs.info apbs.patch
Log Message:
updates for apbs thanks to Jack Howarth
Index: apbs.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/apbs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apbs.patch 13 Apr 2009 22:57:33 -0000 1.1
+++ apbs.patch 19 May 2009 23:09:04 -0000 1.2
@@ -28,3 +28,25 @@
PY_LDFLAGS="-Wl,-framework -Wl,Accelerate"
;;
mingw*)
+--- apbs-1.1.0-source/configure.org 2009-05-09 16:22:51.000000000 -0400
++++ apbs-1.1.0-source/configure 2009-05-09 16:25:46.000000000 -0400
+@@ -22359,7 +22359,7 @@
+
+ SERVICEURL='http://ws.nbcr.net/opal/services/APBS_1.1.0'
+ PARALLELSERVICEURL='http://ws.nbcr.net/opal/services/APBS_Parallel_1.1.0'
+-SITEPKGS=${prefix}/lib/python${PY_VERSION}/site-packages
++sitepk...@install_dir$${prefix}/lib/python${PY_VERSION}/site-packages
+
+ sed -e 's...@sitepkgs@%'${SITEPKGS}'%' \
+ -e 's...@package_version@%'${PACKAGE_VERSION}'%' \
+--- apbs-1.1.0-source/contrib/opal/ZSI/Makefile.in.org 2009-05-09
16:50:42.000000000 -0400
++++ apbs-1.1.0-source/contrib/opal/ZSI/Makefile.in 2009-05-09
16:51:12.000000000 -0400
+@@ -529,7 +529,7 @@
+
+ install-data-local:
+ -mkdir -p ${SITEPKGS}
+- ${py_path} setup.py install --prefix=${prefix}
++ ${py_path} setup.py install --pref...@install_dir@${prefix}
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: apbs-mpi.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/apbs-mpi.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- apbs-mpi.info 13 Apr 2009 03:40:58 -0000 1.11
+++ apbs-mpi.info 19 May 2009 23:09:04 -0000 1.12
@@ -1,25 +1,30 @@
Info2: <<
Package: apbs-mpi-%type_pkg[handler]
Version: 1.1.0
-Revision: 1
+Revision: 2
Type: handler (lammpi openmpi)
Conflicts: apbs, apbs-mpi-lammpi, apbs-mpi-openmpi
Replaces: apbs, apbs-mpi-lammpi, apbs-mpi-openmpi
Source: http://switch.dl.sourceforge.net/sourceforge/apbs/apbs-%v-source.tar.gz
Source-MD5: 8b844ba848cf853da712bbbf9f2e1553
SourceDirectory: apbs-%v-source
-Depends: (%type_pkg[handler] = lammpi) lammpi (>= 7.1.2-1000),
(%type_pkg[handler] = openmpi) openmpi (>= 1.2.5-1000), readline-shlibs (>=
4.3-1028), gnuplot (>=4.2.0) | gnuplot-nox | gnuplot-nogtk, (%m != x86_64)
gcc43-shlibs, (%m = x86_64) gcc44-shlibs
-BuildDepends: (%m != x86_64) gcc43, (%m = x86_64) gcc44, (%type_pkg[handler] =
lammpi) lammpi-dev (>= 7.1.2-1000), (%type_pkg[handler] = openmpi) openmpi-dev
(>= 1.2.5-1000)
+Depends: (%type_pkg[handler] = lammpi) lammpi (>= 7.1.2-1000),
(%type_pkg[handler] = openmpi) openmpi (>= 1.2.5-1000), readline-shlibs (>=
4.3-1028), gnuplot (>=4.2.0) | gnuplot-nox | gnuplot-nogtk, gcc44-shlibs,
python26
+BuildDepends: gcc44, (%type_pkg[handler] = lammpi) lammpi-dev (>= 7.1.2-1000),
(%type_pkg[handler] = openmpi) openmpi-dev (>= 1.2.5-1000), python26, fink (>=
0.24.12)
Description: Adaptive Poisson-Boltzmann Solver
+PatchFile: apbs.patch
+PatchFile-MD5: 7d25f1ff3ef00f7be12fc61e7bf2b0f7
+PatchScript: <<
+sed 's|@INSTALL_DIR@|%d|g' < %{PatchFile} | patch -p1
+<<
SetCC: %p/bin/mpicc
SetCXX: %p/bin/mpic++
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
-PATH=/usr/bin:$PATH
-BLAS_DIR='/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A'
py_path=/usr/bin/python
-F77=%p/bin/mpif77 ./configure %c --disable-blas --with-blas="-L${BLAS_DIR}
-lblas -Wl,-framework -Wl,vecLib -Wl,-undefined -Wl,dynamic_lookup" FFLAGS="-O3"
+BLAS_DIR='/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A'
+py_path=%p/bin/python2.6 F77=%p/bin/mpif77 ./configure %c --enable-python
--with-python=%p/bin/python2.6 --disable-blas \
+--with-blas="-L${BLAS_DIR} -lblas -Wl,-framework -Wl,vecLib -Wl,-undefined
-Wl,dynamic_lookup" FFLAGS="-O3"
perl -pi -e 's|cp -Rf tools \${prefix}||g' Makefile
perl -pi -e 's|cp -Rf examples \${prefix}||g' Makefile
perl -pi -e 's|cp -Rf doc \${prefix}||g' Makefile
@@ -40,8 +45,14 @@
mv doc %i/share/%n
rm -Rf %i/src
rm -f **/*.o
+# don't package .pyc files generated in the buildroot
+/usr/bin/find %i/lib/python2.6/site-packages/ZSI -name '*.pyc' -delete
+<<
+PreRmScript: <<
+/usr/bin/find %p/lib/python2.6/site-packages/ZSI -name '*.pyo' -delete
<<
PostInstScript: <<
+%p/bin/python2.6 -O %p/lib/python2.6/compileall.py -q
%p/lib/python2.6/site-packages/ZSI
# per request of software's author
echo ""
echo
"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
Index: apbs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/apbs.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- apbs.info 13 Apr 2009 22:58:09 -0000 1.15
+++ apbs.info 19 May 2009 23:09:04 -0000 1.16
@@ -1,29 +1,27 @@
Package: apbs
Version: 1.1.0
-Revision: 1
+Revision: 2
Source: mirror:sourceforge:%n/%n-%v-source.tar.gz
#SourceRename: %n-%v.tar.gz
Source-MD5: 8b844ba848cf853da712bbbf9f2e1553
#SourceDirectory: %n-%v
-Depends: readline-shlibs (>= 4.3-1028), gnuplot (>=4.2.0) | gnuplot-nox |
gnuplot-nogtk, pdb2pqr, (%m != x86_64) gcc43-shlibs, (%m = x86_64) gcc44
-BuildDepends: (%m != x86_64) gcc43, (%m = x86_64) gcc44, fink (>= 0.24.12)
-Conflicts: apbs-mpi, maloc, maloc-mpi-lammpi, maloc-mpi-openmpi
-Replaces: apbs-mpi, maloc, maloc-mpi-lammpi, maloc-mpi-openmpi
-ConfigureParams: py_path=/usr/bin/python --build=%m-apple-darwin`uname -r|cut
-f1 -d.` --host=%m-apple-darwin`uname -r|cut -f1 -d.`
-SetCFLAGS: -O3
+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
+ConfigureParams: --build=%m-apple-darwin`uname -r|cut -f1 -d.`
--host=%m-apple-darwin`uname -r|cut -f1 -d.`
+SetCFLAGS: -O3
Description: Adaptive Poisson-Boltzmann Solver
PatchFile: %n.patch
-PatchFile-MD5: 77a1c42600dfb830a74e64ae03c497e9
+PatchFile-MD5: 7d25f1ff3ef00f7be12fc61e7bf2b0f7
+PatchScript: <<
+sed 's|@INSTALL_DIR@|%d|g' < %{PatchFile} | patch -p1
+<<
CompileScript: <<
#!/bin/zsh -efv
-PATH=/usr/bin:$PATH
BLAS_DIR='/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A'
-if [[ $(sw_vers -productVersion) < 10.5 ]]; then
- F77=gfortran ./configure %c --with-blas="-L${BLAS_DIR} -lblas
-Wl,-framework -Wl,vecLib -Wl,-undefined -Wl,dynamic_lookup" FFLAGS="-O3"
-else
- py_path=/usr/bin/python F77=gfortran ./configure %c --enable-python \
- --with-blas="-L${BLAS_DIR} -lblas -Wl,-framework -Wl,vecLib -Wl,-undefined
-Wl,dynamic_lookup" FFLAGS="-O3"
-fi
+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"
perl -pi -e 's|cp -Rf tools \${prefix}||g' Makefile
perl -pi -e 's|cp -Rf examples \${prefix}||g' Makefile
perl -pi -e 's|cp -Rf doc \${prefix}||g' Makefile
@@ -44,8 +42,14 @@
mv doc %i/share/%n
rm -Rf %i/src
rm -f **/*.o
+# don't package .pyc files generated in the buildroot
+/usr/bin/find %i/lib/python2.6/site-packages/ZSI -name '*.pyc' -delete
+<<
+PreRmScript: <<
+/usr/bin/find %p/lib/python2.6/site-packages/ZSI -name '*.pyo' -delete
<<
PostInstScript: <<
+%p/bin/python2.6 -O %p/lib/python2.6/compileall.py -q
%p/lib/python2.6/site-packages/ZSI
# per request of software's author
echo ""
echo
"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
