Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27713
Modified Files: apbs.info apbs.patch Log Message: apbs version update Index: apbs.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/apbs.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- apbs.patch 13 Nov 2009 22:18:06 -0000 1.5 +++ apbs.patch 24 Nov 2010 05:00:10 -0000 1.6 @@ -1,28 +1,19 @@ -diff -ruN apbs-1.2-source-orig/configure apbs-1.2-source/configure ---- apbs-1.2-source-orig/configure 2009-10-14 10:20:48.000000000 -0700 -+++ apbs-1.2-source/configure 2009-11-11 07:27:51.000000000 -0800 -@@ -20861,7 +20861,7 @@ - if test "${F77}" == "g95"; then - PY_SHARED="-dynamiclib" - fi -- PY_LINKFLAGS="-Wl,-framework -Wl,Python" -+ PY_LINKFLAGS="-Wl,-framework -Wl,Python" - PY_LDFLAGS="-Wl,-framework -Wl,Accelerate" - ;; - mingw*) -@@ -21147,7 +21147,7 @@ +diff -ruN apbs-1.3-source/configure apbs-1.3-source-orig/configure +--- apbs-1.3-source/configure 2010-10-21 08:17:07.000000000 -0700 ++++ apbs-1.3-source-orig/configure 2010-11-23 20:07:40.000000000 -0800 +@@ -22371,7 +22371,7 @@ - SERVICEURL='http://sccne.wustl.edu:8082/opal2/services/apbs-1.2' - PARALLELSERVICEURL='http://sccne.wustl.edu:8082/opal2/services/apbs-parallel-1.2' + SERVICEURL='http://kryptonite.nbcr.net/opal2/services/apbs_1.3' + PARALLELSERVICEURL='http://oolite.calit2.optiputer.net/opal2/services/apbs-parallel-1.3' -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}'%' \ -diff -ruN apbs-1.2-source-orig/contrib/opal/ZSI/Makefile.in apbs-1.2-source/contrib/opal/ZSI/Makefile.in ---- apbs-1.2-source-orig/contrib/opal/ZSI/Makefile.in 2009-10-14 10:20:49.000000000 -0700 -+++ apbs-1.2-source/contrib/opal/ZSI/Makefile.in 2009-11-11 07:29:19.000000000 -0800 -@@ -540,7 +540,7 @@ + + # Check whether --with-maxmem was given. +diff -ruN apbs-1.3-source/contrib/opal/ZSI/Makefile.in apbs-1.3-source-orig/contrib/opal/ZSI/Makefile.in +--- apbs-1.3-source/contrib/opal/ZSI/Makefile.in 2010-05-19 10:24:24.000000000 -0700 ++++ apbs-1.3-source-orig/contrib/opal/ZSI/Makefile.in 2010-11-23 20:09:12.000000000 -0800 +@@ -542,7 +542,7 @@ install-data-local: -mkdir -p ${SITEPKGS} @@ -31,23 +22,23 @@ # 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: -diff -ruN apbs-1.2-source-orig/tools/python/Makefile.in apbs-1.2-source/tools/python/Makefile.in ---- apbs-1.2-source-orig/tools/python/Makefile.in 2009-10-14 10:20:57.000000000 -0700 -+++ apbs-1.2-source/tools/python/Makefile.in 2009-11-11 07:35:37.000000000 -0800 +diff -ruN apbs-1.3-source/tools/python/Makefile.in apbs-1.3-source-orig/tools/python/Makefile.in +--- apbs-1.3-source/tools/python/Makefile.in 2010-05-19 10:24:24.000000000 -0700 ++++ apbs-1.3-source-orig/tools/python/Makefile.in 2010-11-23 20:11:08.000000000 -0800 @@ -52,7 +52,6 @@ ${top_builddir}/bin/.libs/libapbsmainroutines.a \ ${top_builddir}/src/aaa_lib/.libs/libapbs.a \ ${top_builddir}/contrib/lib/libmaloc.a \ - ${top_builddir}/contrib/blas/.libs/libapbsblas.a \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(top_builddir)/src/aaa_...@am__isrc@ depcomp = -@@ -246,7 +245,7 @@ +@@ -248,7 +247,7 @@ SUBDIRS = vgrid _apbslib_so_SOURCES = apbslib.c _apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) --_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS) -+_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a $(PY_LDFLAGS) +-_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS) ${z_lib} ++_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a $(PY_LDFLAGS) ${z_lib} all: all-recursive .SUFFIXES: Index: apbs.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/apbs.info,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- apbs.info 13 Nov 2009 22:19:40 -0000 1.24 +++ apbs.info 24 Nov 2010 05:00:09 -0000 1.25 @@ -1,12 +1,10 @@ Package: apbs -Version: 1.2.0 +Version: 1.3.0 Revision: 1 -Source: http://downloads.sourceforge.net/project/%n/%n/%n-%v/%n-1.2-source.tar.gz -Source-MD5: ba32bb323b25307204436eaac1ff877b -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 +Source: http://downloads.sourceforge.net/project/%n/%n/%n-%v/%n-1.3-source.tar.gz +Source-MD5: f99a505365f07f6853979cfe2ef23365 +Depends: readline-shlibs (>= 4.3-1028), gnuplot (>=4.2.0) | gnuplot-nox | gnuplot-nogtk, pdb2pqr, gcc44-shlibs, python27 +BuildDepends: gcc44, python27, fink (>= 0.24.12) BuildConflicts: g77, g95, fort77 Conflicts: maloc, maloc-mpi-lammpi, maloc-mpi-openmpi Replaces: maloc, maloc-mpi-lammpi, maloc-mpi-openmpi @@ -14,7 +12,7 @@ SetCFLAGS: -O3 Description: Adaptive Poisson-Boltzmann Solver PatchFile: %n.patch -PatchFile-MD5: 4b8b0f73317d1f50ec21c75a45f88d94 +PatchFile-MD5: 2662144e3e3508a944902c0a5e29eaf1 PatchScript: << sed 's|@INSTALL_DIR@|%d|g' < %{PatchFile} | patch -p1 << @@ -23,7 +21,7 @@ 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 \ +py_path=%p/bin/python2.7 F77=gfortran ./configure %c --enable-python --with-python=%p/bin/python2.7 \ --disable-openmp --with-blas="-L${BLAS_DIR} -lblas -Wl,-framework -Wl,vecLib -Wl,-undefined -Wl,dynamic_lookup" FFLAGS="-O3" perl -pi -e 's|\${prefix}/share|%i/share/%n|g' Makefile perl -pi -e 's|\$\(DESTDIR\)\$\(libdir\)|share/apbs/lib|g' contrib/blas/Makefile @@ -40,7 +38,7 @@ # install it ourselves: mkdir -p %i/bin /bin/cp bin/apbs bin/ApbsClient.py %i/bin/. - echo '#!%p/bin/python2.6' >| %i/bin/wsdl2py + echo '#!%p/bin/python2.7' >| %i/bin/wsdl2py echo "from ZSI.generate.commands import wsdl2py" >> %i/bin/wsdl2py echo "wsdl2py()" >> %i/bin/wsdl2py chmod a+x %i/bin/wsdl2py @@ -53,8 +51,8 @@ mkdir -p %i/share/doc ln -s %p/share/%n/doc %i/share/doc/%n # - mkdir -p %i/lib/python2.6/site-packages/ZSI - /bin/cp -r contrib/opal/ZSI/ZSI/* %i/lib/python2.6/site-packages/ZSI/. + mkdir -p %i/lib/python2.7/site-packages/ZSI + /bin/cp -r contrib/opal/ZSI/ZSI/* %i/lib/python2.7/site-packages/ZSI/. # mkdir -p %i/include/apbs /bin/cp **/*.h %i/include/apbs/. @@ -65,14 +63,12 @@ /bin/cp **/*.la %i/lib/. ranlib %i/lib/*.a # -# 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 +/usr/bin/find %p/lib/python2.7/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 +%p/bin/python2.7 -O %p/lib/python2.7/compileall.py -q %p/lib/python2.7/site-packages/ZSI # per request of software's author echo "" echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" ------------------------------------------------------------------------------ Increase Visibility of Your 3D Game App & Earn a Chance To Win $500! Tap into the largest installed PC base & get more eyes on your game by optimizing for Intel(R) Graphics Technology. Get started today with the Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs. http://p.sf.net/sfu/intelisp-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs