[75130] trunk/dports/science/apbs/files/apbs.diff

[snc at macports.org]

Revision: 75130
          http://trac.macports.org/changeset/75130
Author:   snc at macports.org
Date:     2011-01-15 17:46:11 -0800 (Sat, 15 Jan 2011)
Log Message:
-----------
apbs: patchfile for update to 1.3.0, #27906

Modified Paths:
--------------
    trunk/dports/science/apbs/files/apbs.diff

Modified: trunk/dports/science/apbs/files/apbs.diff
===================================================================
--- trunk/dports/science/apbs/files/apbs.diff	2011-01-16 01:45:20 UTC (rev 75129)
+++ trunk/dports/science/apbs/files/apbs.diff	2011-01-16 01:46:11 UTC (rev 75130)
@@ -1,39 +1,20 @@
---- configure.orig	2009-04-13 11:47:41.000000000 -0700
-+++ configure	2009-08-01 16:49:08.000000000 -0700
-@@ -22359,7 +22359,7 @@
+--- configure.orig	2010-10-21 11:17:07.000000000 -0400
++++ configure	2011-01-09 14:55:35.000000000 -0500
+@@ -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
 +SITEPKGS=@PYTHON_PKGD@
  
- sed -e 's%@SITEPKGS@%'${SITEPKGS}'%' \
-     -e 's%@PACKAGE_VERSION@%'${PACKAGE_VERSION}'%' \
---- tools/python/Makefile.in.orig	2009-04-13 11:47:40.000000000 -0700
-+++ tools/python/Makefile.in	2009-08-01 16:18:40.000000000 -0700
-@@ -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)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)/src/aaa_inc at am__isrc@
- depcomp =
-@@ -235,7 +234,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)
- all: all-recursive
  
- .SUFFIXES:
---- bin/Makefile.in.orig	2009-09-17 22:56:30.000000000 -0400
-+++ bin/Makefile.in	2009-09-17 22:57:21.000000000 -0400
-@@ -563,10 +563,10 @@
- 	uninstall-includeHEADERS uninstall-libLTLIBRARIES
+ # Check whether --with-maxmem was given.
+--- bin/Makefile.in.orig	2010-05-19 13:24:24.000000000 -0400
++++ bin/Makefile.in	2011-01-09 14:55:35.000000000 -0500
+@@ -590,10 +590,10 @@
+ rm.apbs: Makefile
+ 	-rm -f apbs
  
- 
 -install-data-local:
 -	-cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
 -	-chmod 755 ${prefix}/bin/ApbsClient.py
@@ -45,4 +26,22 @@
  # 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:
+--- tools/python/Makefile.in.orig	2011-01-09 14:54:37.000000000 -0500
++++ tools/python/Makefile.in	2011-01-09 14:55:35.000000000 -0500
+@@ -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)
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)/src/aaa_inc at am__isrc@
+ depcomp =
+@@ -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) ${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:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110115/14b3a43e/attachment.html>