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

Modified Files:
        apbs.info apbs.patch 
Log Message:
fixes for apbs -- I hope

Index: apbs.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/apbs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apbs.patch  19 May 2009 23:09:04 -0000      1.2
+++ apbs.patch  1 Aug 2009 22:29:53 -0000       1.3
@@ -35,7 +35,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
++sitepk...@install_dir@${prefix}/lib/python${PY_VERSION}/site-packages
  
  sed -e 's...@sitepkgs@%'${SITEPKGS}'%' \
      -e 's...@package_version@%'${PACKAGE_VERSION}'%' \

Index: apbs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/apbs.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- apbs.info   19 May 2009 23:09:04 -0000      1.16
+++ apbs.info   1 Aug 2009 22:29:53 -0000       1.17
@@ -1,6 +1,6 @@
 Package: apbs
 Version: 1.1.0
-Revision: 2
+Revision: 3
 Source: mirror:sourceforge:%n/%n-%v-source.tar.gz
 #SourceRename: %n-%v.tar.gz
 Source-MD5: 8b844ba848cf853da712bbbf9f2e1553
@@ -13,7 +13,7 @@
 SetCFLAGS: -O3 
 Description: Adaptive Poisson-Boltzmann Solver
 PatchFile: %n.patch
-PatchFile-MD5: 7d25f1ff3ef00f7be12fc61e7bf2b0f7 
+PatchFile-MD5: 96981c2967896e12f3cf3e396ec14463 
 PatchScript: <<
 sed 's|@INSTALL_DIR@|%d|g' < %{PatchFile} | patch -p1
 <<
@@ -22,28 +22,48 @@
 
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"
-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
+perl -pi -e 's|\${prefix}/share|%i/share/%n|g' Makefile
 perl -pi -e 's|\$\(DESTDIR\)\$\(libdir\)|share/apbs/lib|g'  
contrib/blas/Makefile
 make
 <<
 InstallScript: <<
 #!/bin/zsh -efv
-make install DESTDIR=%d
 rm -Rf **/CVS     # fink validate complains if this junk is left behind.
-# rm -Rf **/.svn  # fink validate complains if this junk is left behind.
-mkdir -p %i/share/%n
-mkdir -p %i/lib
-perl -pi -e 's|/usr/bin/env python|/usr/bin/python|g' examples/**/*.py
-perl -pi -e 's|/usr/bin/env python|/usr/bin/python|g' tools/**/*.py
-mv examples %i/share/%n
-mv tools %i/share/%n
-mv doc %i/share/%n
-rm -Rf %i/src
+perl -pi -e 's|/usr/bin/env python|%p/bin/python|g' examples/**/*.py
+perl -pi -e 's|/usr/bin/env python|%p/bin/python|g' tools/**/*.py
 rm -f **/*.o
+# 
+#   make install DESTDIR=%d
+# install it ourselves:
+       mkdir -p %i/bin
+       cp bin/apbs bin/ApbsClient.py %i/bin/.
+       echo '#!%p/bin/python2.6'                          >|  %i/bin/wsdl2py
+       echo "from ZSI.generate.commands import wsdl2py"   >>  %i/bin/wsdl2py
+       echo "wsdl2py()"                                   >>  %i/bin/wsdl2py
+       chmod a+x                                          %i/bin/wsdl2py       
+       #
+       mkdir -p %i/share/%n
+       cp -r   examples %i/share/%n/.
+       cp -r   tools %i/share/%n/.
+       cp -r   doc %i/share/%n/.
+       #
+       mkdir -p %i/share/doc
+       ln -s   %p/share/%n/doc %i/share/doc/%n
+       #
+       mkdir -p %i/lib/python2.6/site-packages/ZSI
+       cp -r   contrib/opal/ZSI/ZSI/*  %i/lib/python2.6/site-packages/ZSI/.
+       #
+       mkdir -p %i/include/apbs
+       cp      **/*.h  %i/include/apbs/.
+       #
+       mkdir -p %i/lib
+    /bin/rm -rf contrib
+       cp **/.*/*.a  %i/lib/.
+       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
+# /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
@@ -68,10 +88,8 @@
        Description: apbs headers, static libraries and libtool files
        Files:<<
                include/apbs
-               lib/libapbs.a
-               lib/libapbsmainroutines.a
-               lib/libapbs.la
-               lib/libapbsmainroutines.la
+               lib/*.a
+        lib/*.la
        <<
 <<
 
################################################################################


------------------------------------------------------------------------------
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