ported to version 1806, using gcc 8

2 files changed, 15 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09bb86f92a8f..b7448976fa39 100644..100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = openfoam-esi
 	pkgdesc = The open source CFD toolbox (ESI-OpenCFD version)
-	pkgver = v1712
+	pkgver = v1806
 	pkgrel = 1
 	url = http://www.openfoam.com/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = gcc7
+	depends = gcc
 	depends = cgal
 	depends = cmake
 	depends = fftw
 	depends = boost
 	depends = openmpi
 	depends = paraview
-	source = https://newcontinuum.dl.sourceforge.net/project/openfoamplus/v1712/OpenFOAM-v1712.tgz
-	source = https://sourceforge.net/projects/openfoamplus/files/v1712/ThirdParty-v1712.tgz/download
+	source = https://newcontinuum.dl.sourceforge.net/project/openfoamplus/v1806/OpenFOAM-v1806.tgz
+	source = https://sourceforge.net/projects/openfoamplus/files/v1806/ThirdParty-v1806.tgz/download
 	source = http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
-	md5sums = 6ad92df051f4d52c7d0ec34f4b8eb3bc
-	md5sums = c5662a79d4e997472a78b7cc6da98edd
+	md5sums = bb244a3bde7048a03edfccffc46c763f
+	md5sums = af4ed8cf924825d608d7d622c660b0a7
 	md5sums = 5465e67079419a69e0116de24fce58fe
 
 pkgname = openfoam-esi
diff --git a/PKGBUILD b/PKGBUILD
index f8a1898e1ab0..2256d78ff51c 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: <gucong43216@gmail.com>
 
 pkgname=openfoam-esi
-pkgver=v1712
+pkgver=v1806
 _distname=OpenFOAM
 _dist=$_distname-$pkgver
 pkgrel=1
@@ -13,26 +13,19 @@ pkgdesc="The open source CFD toolbox (ESI-OpenCFD version)"
 arch=('i686' 'x86_64')
 url="http://www.openfoam.com/"
 license=('GPL')
-depends=('gcc7' 'cgal' 'cmake' 'fftw' 'boost' 'openmpi' 'paraview')
+depends=('gcc' 'cgal' 'cmake' 'fftw' 'boost' 'openmpi' 'paraview')
 
 source=("https://newcontinuum.dl.sourceforge.net/project/openfoamplus/${pkgver}/${_dist}.tgz"
-        "https://sourceforge.net/projects/openfoamplus/files/v1712/ThirdParty-v1712.tgz/download"
+        "https://sourceforge.net/projects/openfoamplus/files/${pkgver}/ThirdParty-${pkgver}.tgz/download"
         "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz")
 
-md5sums=('6ad92df051f4d52c7d0ec34f4b8eb3bc'
-         'c5662a79d4e997472a78b7cc6da98edd'
+md5sums=('bb244a3bde7048a03edfccffc46c763f'
+         'af4ed8cf924825d608d7d622c660b0a7'
          '5465e67079419a69e0116de24fce58fe')
 
 prepare() {
   cd "$srcdir/$_dist"
 
-  # gcc8 does currently not work, so use gcc7
-  sed -i 's/export WM_CC="gcc"/export WM_CC="gcc-7"/g' etc/config.sh/settings
-  sed -i 's/export WM_CXX="g++"/export WM_CXX="g++-7"/g' etc/config.sh/settings
-  sed -i 's/WM_COMPILER=Gcc/WM_COMPILER=Gcc7/g' etc/bashrc
-  [ ! -d wmake/rules/linux64Gcc7 ] && cp -r wmake/rules/linux64Gcc wmake/rules/linux64Gcc7
-  sed -i 's/g++ -std=c++11/g++-7 -std=c++11/g' wmake/rules/linux64Gcc7/c++
-
   # Generate and install the system preferences file
   echo "export compilerInstall=system" > ${srcdir}/prefs.sh
   echo "export cmake_version=cmake-system" >> ${srcdir}/prefs.sh
@@ -71,7 +64,7 @@ prepare() {
   sed -i '/ParaView_VERSION=5./d' ${srcdir}/${_distname}-${pkgver}/etc/config.sh/paraview
 
   # create link to metis
-  cd "$srcdir/ThirdParty-v1712"
+  cd "$srcdir/ThirdParty-${pkgver}"
   [[ ! -e "metis-5.1.0" ]] && ln -s ../metis-5.1.0 metis-5.1.0
   return 0
 }
@@ -79,7 +72,9 @@ prepare() {
 build() {
   export FOAM_INST_DIR=${srcdir}
   foamDotFile=${srcdir}/${_dist}/etc/bashrc
-  [ -f ${foamDotFile} ] && . ${foamDotFile}
+  [ -f ${foamDotFile} ] || return 1
+  # without && echo " ", makepkg fails
+  source ${foamDotFile} && echo " "
 
   echo " "
   echo "Give write access to cmake directory using chmod."