| 1 |
markusle 08/04/29 22:21:20 |
| 2 |
|
| 3 |
Added: apbs-1.0.0-install-fix.patch |
| 4 |
apbs-1.0.0-libmaloc-noinstall.patch |
| 5 |
apbs-1.0.0-openmpi.patch |
| 6 |
Log: |
| 7 |
Version bump (fixes bug #219599). Changed license to BSD since it most closely matches the apbs license. |
| 8 |
(Portage version: 2.1.5_rc6) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: apbs-1.0.0-install-fix.patch |
| 17 |
=================================================================== |
| 18 |
diff -Naur apbs-1.0.0-source/Makefile.am apbs-1.0.0-source.new/Makefile.am |
| 19 |
--- apbs-1.0.0-source/Makefile.am 2008-04-17 16:44:51.000000000 -0400 |
| 20 |
+++ apbs-1.0.0-source.new/Makefile.am 2008-04-28 18:51:14.000000000 -0400 |
| 21 |
@@ -28,7 +28,10 @@ |
| 22 |
-rm -f ./bin/apbs |
| 23 |
|
| 24 |
install-data-local: |
| 25 |
- mkdir -p ${prefix}/share |
| 26 |
- -cp -rf examples ${prefix}/share |
| 27 |
- -cp -rf doc ${prefix}/share |
| 28 |
- -cp -rf tools ${prefix}/share |
| 29 |
+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/examples |
| 30 |
+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/tools |
| 31 |
+ -rm -f doc/LICENSE.txt |
| 32 |
+ -rm -f tools/manip/*.pyc |
| 33 |
+ -cp -rf doc $(DESTDIR)${prefix}/share |
| 34 |
+ -cp -rf examples $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/ |
| 35 |
+ -cp -rf tools $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/ |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.1 sci-chemistry/apbs/files/apbs-1.0.0-libmaloc-noinstall.patch |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-libmaloc-noinstall.patch?rev=1.1&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-libmaloc-noinstall.patch?rev=1.1&content-type=text/plain |
| 43 |
|
| 44 |
Index: apbs-1.0.0-libmaloc-noinstall.patch |
| 45 |
=================================================================== |
| 46 |
diff -Naur apbs-1.0.0-source/contrib/maloc/src/aaa_inc/maloc/Makefile.in apbs-1.0.0-source.new/contrib/maloc/src/aaa_inc/maloc/Makefile.in |
| 47 |
--- apbs-1.0.0-source/contrib/maloc/src/aaa_inc/maloc/Makefile.in 2008-04-17 16:40:56.000000000 -0400 |
| 48 |
+++ apbs-1.0.0-source.new/contrib/maloc/src/aaa_inc/maloc/Makefile.in 2008-04-29 13:32:58.000000000 -0400 |
| 49 |
@@ -265,12 +265,12 @@ |
| 50 |
uninstall-info-am: |
| 51 |
install-includeHEADERS: $(include_HEADERS) |
| 52 |
@$(NORMAL_INSTALL) |
| 53 |
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" |
| 54 |
+ test -z "$(includedir)" || $(mkdir_p) "$(includedir)" |
| 55 |
@list='$(include_HEADERS)'; for p in $$list; do \ |
| 56 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 57 |
f="`echo $$p | sed -e 's|^.*/||'`"; \ |
| 58 |
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ |
| 59 |
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ |
| 60 |
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(includedir)/$$f'"; \ |
| 61 |
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(includedir)/$$f"; \ |
| 62 |
done |
| 63 |
|
| 64 |
uninstall-includeHEADERS: |
| 65 |
diff -Naur apbs-1.0.0-source/contrib/maloc/src/aaa_lib/Makefile.in apbs-1.0.0-source.new/contrib/maloc/src/aaa_lib/Makefile.in |
| 66 |
--- apbs-1.0.0-source/contrib/maloc/src/aaa_lib/Makefile.in 2008-04-17 16:40:54.000000000 -0400 |
| 67 |
+++ apbs-1.0.0-source.new/contrib/maloc/src/aaa_lib/Makefile.in 2008-04-29 09:13:08.000000000 -0400 |
| 68 |
@@ -283,12 +283,12 @@ |
| 69 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
| 70 |
install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
| 71 |
@$(NORMAL_INSTALL) |
| 72 |
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" |
| 73 |
+ test -z "$(libdir)" || $(mkdir_p) "$(libdir)" |
| 74 |
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
| 75 |
if test -f $$p; then \ |
| 76 |
f="`echo $$p | sed -e 's|^.*/||'`"; \ |
| 77 |
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ |
| 78 |
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ |
| 79 |
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(libdir)/$$f'"; \ |
| 80 |
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(libdir)/$$f"; \ |
| 81 |
else :; fi; \ |
| 82 |
done |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.1 sci-chemistry/apbs/files/apbs-1.0.0-openmpi.patch |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-openmpi.patch?rev=1.1&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-openmpi.patch?rev=1.1&content-type=text/plain |
| 91 |
|
| 92 |
Index: apbs-1.0.0-openmpi.patch |
| 93 |
=================================================================== |
| 94 |
diff -Naur apbs-1.0.0-source/configure.ac apbs-1.0.0-source.new/configure.ac |
| 95 |
--- apbs-1.0.0-source/configure.ac 2008-04-17 16:44:51.000000000 -0400 |
| 96 |
+++ apbs-1.0.0-source.new/configure.ac 2008-04-28 17:51:47.000000000 -0400 |
| 97 |
@@ -521,28 +521,27 @@ |
| 98 |
fi |
| 99 |
fi |
| 100 |
|
| 101 |
-# if test -n "${USE_OPMI}"; then |
| 102 |
-# AC_CHECK_FILE(${mpi_path}/lib/libmpi.a, [HAS_MPI_LIB="yes"], []) |
| 103 |
-# AC_CHECK_FILE(${mpi_path}/lib/libmpi.so, [HAS_MPI_LIB="yes"], []) |
| 104 |
-# AC_CHECK_FILE(${mpi_path}/lib/liblam.dylib, [HAS_MPI_LIB="yes"], []) |
| 105 |
-# if test -n "${HAS_MPI_LIB}"; then |
| 106 |
-# mpi_lib="-L${mpi_path}/lib -lmpi" |
| 107 |
-# else |
| 108 |
-# AC_MSG_ERROR([Error...Could not find LAM-MPI libraries in ${mpi_path}/lib], 0) |
| 109 |
-# fi |
| 110 |
-# fi |
| 111 |
+ if test -n "${USE_OPMI}"; then |
| 112 |
+ AC_CHECK_FILE(${mpi_path}/lib/libmpi.a, [HAS_MPI_LIB="yes"], []) |
| 113 |
+ AC_CHECK_FILE(${mpi_path}/lib/libmpi.so, [HAS_MPI_LIB="yes"], []) |
| 114 |
+ if test -n "${HAS_MPI_LIB}"; then |
| 115 |
+ mpi_lib="-L${mpi_path}/lib -lmpi" |
| 116 |
+ else |
| 117 |
+ AC_MSG_ERROR([Error...Could not find OPEN-MPI libraries in ${mpi_path}/lib], 0) |
| 118 |
+ fi |
| 119 |
+ fi |
| 120 |
|
| 121 |
USE_MPI="yes" |
| 122 |
fi |
| 123 |
|
| 124 |
-if test -n "${USE_OPMI}"; then |
| 125 |
- HAS_MPI_LIB="yes" |
| 126 |
- HAS_MPI_INC="yes" |
| 127 |
- mpi_inc="" |
| 128 |
- mpi_lib="" |
| 129 |
- AC_DEFINE([HAVE_MPI_H], [], [have the MPI library]) |
| 130 |
- USE_MPI="yes" |
| 131 |
-fi |
| 132 |
+#if test -n "${USE_OPMI}"; then |
| 133 |
+# HAS_MPI_LIB="yes" |
| 134 |
+# HAS_MPI_INC="yes" |
| 135 |
+# mpi_inc="" |
| 136 |
+# mpi_lib="" |
| 137 |
+# AC_DEFINE([HAVE_MPI_H], [], [have the MPI library]) |
| 138 |
+# USE_MPI="yes" |
| 139 |
+#fi |
| 140 |
|
| 141 |
AC_SUBST(mpi_lib) |
| 142 |
AC_SUBST(mpi_inc) |
| 143 |
|
| 144 |
|
| 145 |
|
| 146 |
-- |
| 147 |
gentoo-commits@l.g.o mailing list |
Archives