Initial pkgbuild and srcinfo for 2.5.1

3 files changed, 50 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d96ba0499610..a581d964e7ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dune-core
 	pkgdesc = Core modules of the DUNE framework
-	pkgver = 2.4.1
+	pkgver = 2.5.1
 	pkgrel = 3
 	url = http://www.dune-project.org
 	arch = i686
@@ -18,17 +18,18 @@ pkgbase = dune-core
 	makedepends = parmetis
 	makedepends = alberta=3.0.1
 	makedepends = psurface
-	makedepends = ug=3.11.0
-	source = http://www.dune-project.org/download/2.4.1/dune-common-2.4.1.tar.gz
-	source = http://www.dune-project.org/download/2.4.1/dune-geometry-2.4.1.tar.gz
-	source = http://www.dune-project.org/download/2.4.1/dune-localfunctions-2.4.1.tar.gz
-	source = http://www.dune-project.org/download/2.4.1/dune-grid-2.4.1.tar.gz
-	source = http://www.dune-project.org/download/2.4.1/dune-istl-2.4.1.tar.gz
-	md5sums = 4dd80f7b1a4fc9c447f83625961ea64b
-	md5sums = d8fba0d67a22f7d17642adf9e2820b2c
-	md5sums = f71510efa886369f21868f3f49451026
-	md5sums = 4281815782bc01f532c11f678f81cb78
-	md5sums = 601a7111369c6f0f269022f12ab5eb89
+	source = http://www.dune-project.org/download/2.5.1/dune-common-2.5.1.tar.gz
+	source = http://www.dune-project.org/download/2.5.1/dune-geometry-2.5.1.tar.gz
+	source = http://www.dune-project.org/download/2.5.1/dune-localfunctions-2.5.1.tar.gz
+	source = http://www.dune-project.org/download/2.5.1/dune-istl-2.5.1.tar.gz
+	source = http://www.dune-project.org/download/2.5.1/dune-grid-2.5.1.tar.gz
+	source = http://www.dune-project.org/download/2.5.1/dune-uggrid-2.5.1.tar.gz
+	md5sums = 71676b07bd489321d9f67b2d77d9f2d6
+	md5sums = 3d0ea46cad71c5087f304f462ccc5068
+	md5sums = a4a6d31714d9a46ac8be2ad8303e4531
+	md5sums = b16be825d8f0c2acdfdebde91894c6ef
+	md5sums = 8394d8aa7811f4a548df6449b448796a
+	md5sums = 4ce8cf2291fe12454695c3d94e195310
 
 pkgname = dune-common
 	pkgdesc = Basic classes used by all DUNE modules
@@ -42,10 +43,15 @@ pkgname = dune-localfunctions
 	pkgdesc = Shape functions, interpolation operators on DUNE reference elemements
 	arch = any
 
+pkgname = dune-istl
+	pkgdesc = Iterative solver template library
+	arch = any
+
 pkgname = dune-grid
 	pkgdesc = Nonconforming, hierarchically nested, multi-element-type, parallel grids
+	arch = any
 
-pkgname = dune-istl
-	pkgdesc = Iterative solver template library
+pkgname = dune-uggrid
+	pkgdesc = UG grid manager
 	arch = any
 
diff --git a/PKGBUILD b/PKGBUILD
index be033c16bbbc..44beb1870bff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Lukas Böger <dev___AT___lboeger___DOT___de>
 
 pkgbase=dune-core
-pkgname=('dune-common' 'dune-geometry' 'dune-localfunctions' 'dune-grid' 'dune-istl')
+pkgname=('dune-common' 'dune-geometry' 'dune-localfunctions' 'dune-istl' 'dune-grid' 'dune-uggrid' )
 
-pkgver=2.4.1
+pkgver=2.5.1
 pkgrel=3
 
 pkgdesc='Core modules of the DUNE framework'
@@ -14,26 +14,29 @@ arch=('i686' 'x86_64')
 license=('custom')
 
 makedepends=('cmake' 'gcc-fortran' 'openmpi' 'gmp' 'lapack' 'boost' 'superlu' 'suitesparse'
-    'parmetis' 'alberta=3.0.1' 'psurface' 'ug=3.11.0')
+    'parmetis' 'alberta=3.0.1' 'psurface' )
+
+
+export CFLAGS="-fPIC ${CFLAGS}"
+export CXXFLAGS="-fPIC ${CFLAGS}" 
 
 for _module in "${pkgname[@]}"; do
     source+=("http://www.dune-project.org/download/${pkgver}/${_module}-${pkgver}.tar.gz")
 done
 
-md5sums=(
-    '4dd80f7b1a4fc9c447f83625961ea64b'
-    'd8fba0d67a22f7d17642adf9e2820b2c'
-    'f71510efa886369f21868f3f49451026'
-    '4281815782bc01f532c11f678f81cb78'
-    '601a7111369c6f0f269022f12ab5eb89'
-)
+md5sums=('71676b07bd489321d9f67b2d77d9f2d6'
+         '3d0ea46cad71c5087f304f462ccc5068'
+         'a4a6d31714d9a46ac8be2ad8303e4531'
+         'b16be825d8f0c2acdfdebde91894c6ef'
+         '8394d8aa7811f4a548df6449b448796a'
+         '4ce8cf2291fe12454695c3d94e195310')
 
-_dunecontrol="./dune-common-${pkgver}/bin/dunecontrol --use-cmake"
+_dunecontrol="./dune-common-${pkgver}/bin/dunecontrol"
 
 prepare() {
     cd "dune-istl-${pkgver}"
 
-    patch -p1 -i ../../avoid-boost-fusion-1.61.patch
+#    patch -p1 -i ../../avoid-boost-fusion-1.61.patch
 }
 
 package() {
@@ -45,8 +48,8 @@ package() {
 }
 
 build() {
-    CMAKE_FLAGS='-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib' \
-        $_dunecontrol configure
+    CMAKE_FLAGS='-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -fPIC -DBUILD_SHARED_LIBS:BOOL=OFF' \
+        $_dunecontrol configure --enabled-shared
 
     $_dunecontrol make
 }
@@ -73,7 +76,13 @@ package_dune-localfunctions() {
 
 package_dune-grid() {
     pkgdesc='Nonconforming, hierarchically nested, multi-element-type, parallel grids'
+    arch=('any')
+    package
+}
 
+package_dune-uggrid() {
+    pkgdesc='UG grid manager'
+    arch=('any')
     package
 }
 
@@ -83,3 +92,10 @@ package_dune-istl() {
 
     package
 }
+
+package_dune-alugrid() {
+    pkgdesc='Unstructured simplicial and cube DUNE grids'
+    arch=('any')
+
+    package
+}
diff --git a/avoid-boost-fusion-1.61.patch b/avoid-boost-fusion-1.61.patch
deleted file mode 100644
index 868ac71406f1..000000000000
--- a/avoid-boost-fusion-1.61.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/dune/istl/tutorial/example.cc b/dune/istl/tutorial/example.cc
-index cc52ba8..46719b2 100644
---- a/dune/istl/tutorial/example.cc
-+++ b/dune/istl/tutorial/example.cc
-@@ -508,6 +508,14 @@ void test_Interface ()
- 
- 
- #ifdef HAVE_BOOST_FUSION
-+#include <boost/version.hpp>
-+#if BOOST_VERSION < 106100
-+#define HAVE_USABLE_BOOST_FUSION
-+#endif
-+#endif
-+
-+#ifdef HAVE_USABLE_BOOST_FUSION
-+
- 
- void test_MultiTypeBlockVector_MultiTypeBlockMatrix() {                           //Jacobi Solver Test MultiTypeBlockMatrix_Solver::dbjac on MultiTypeBlockMatrix<BCRSMatrix>
- 
-@@ -612,7 +620,7 @@ int main (int /*argc*/, char ** /*argv*/)
-     test_IO();
-     test_Iter();
-     test_Interface();
--#ifdef HAVE_BOOST_FUSION
-+#ifdef HAVE_USABLE_BOOST_FUSION
-     test_MultiTypeBlockVector_MultiTypeBlockMatrix();
- #endif
-   }