From eb1f6670bf763ad766e3c11f0d406fb8406ed96c Mon Sep 17 00:00:00 2001
From: Lorenzo Trevisan <lorenzo.trevisan@gmail.com>
Date: Mon, 16 Jul 2018 19:39:40 +0100
Subject: academic/OpenFOAM: Updated for version 6.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 academic/OpenFOAM/OpenFOAM.SlackBuild | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'academic/OpenFOAM/OpenFOAM.SlackBuild')

diff --git a/academic/OpenFOAM/OpenFOAM.SlackBuild b/academic/OpenFOAM/OpenFOAM.SlackBuild
index d4b76a6237a9..edf0a4763e62 100644
--- a/academic/OpenFOAM/OpenFOAM.SlackBuild
+++ b/academic/OpenFOAM/OpenFOAM.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OpenFOAM
 
-# Copyright 2017 Lorenzo Trevisan, Caorle, Venice, Italy
+# Copyright 2017, 2018 Lorenzo Trevisan, Caorle, Venice, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=OpenFOAM
-VERSION=${VERSION:-5.0}
+VERSION=${VERSION:-6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-XVER=${VERSION%%.*}.x
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -49,10 +47,10 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
 mkdir -p opt/$PRGNAM
 cd $PKG/opt/$PRGNAM
-tar xvf $CWD/$PRGNAM-$XVER-version-$VERSION.tar.gz
-mv $PRGNAM-$XVER-version-$VERSION $PRGNAM-$VERSION
-tar xvf $CWD/ThirdParty-$XVER-version-$VERSION.tar.gz
-mv ThirdParty-$XVER-version-$VERSION ThirdParty-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-version-$VERSION.tar.gz
+mv $PRGNAM-$VERSION-version-$VERSION $PRGNAM-$VERSION
+tar xvf $CWD/ThirdParty-$VERSION-version-$VERSION.tar.gz
+mv ThirdParty-$VERSION-version-$VERSION ThirdParty-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -62,10 +60,7 @@ find -L . \
 
 cd $PRGNAM-$VERSION
 
-sed -i -e '16s=-lreadline=-lreadline -lncurses=' ./applications/utilities/mesh/manipulation/setSet/Allwmake
 sed -i -e '47s=$HOME=/opt=' ./etc/bashrc
-# Fix bash_completion for posixly-incorrect identifier
-sed -i -e 's/rm~all/rmAll/g' etc/config.sh/bash_completion
 
 # "Allwmake" below doesn't accept MAKEFLAGS. If MAKEFLAGS contains a -j option,
 # extract the number of jobs and export it for "Allwmake". (Thanks to Chris Willing)
@@ -78,7 +73,9 @@ jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true
   ./Allwmake
   # check for graphviz
   if [ -x /usr/bin/dot ]; then
-    wmake all doc
+    cd $WM_PROJECT_DIR/doc/Doxygen
+    ./Allwmake
+    cd $WM_PROJECT_DIR
   fi
 )
 
-- 
cgit v1.2.3