11 files changed, 118 insertions, 345 deletions
diff --git a/pcr/openfoam/PKGBUILD b/pcr/openfoam/PKGBUILD
new file mode 100644
index 000000000..65f07025a
--- /dev/null
+++ b/pcr/openfoam/PKGBUILD
@@ -0,0 +1,87 @@
+# Maintainer (AUR): Jingbei Li <i@jingbei.li>
+# Contributor (AUR): Xwang <xwaang1976@gmail.com>
+# Contributor (AUR): George Eleftheriou <eleftg>
+# Contributor (AUR): Andrew Fischer <andrew_at_apastron.co>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
+# parabola changes and rationale:
+#  - removed parametis support
+
+
+pkgname=openfoam
+_majorver=7
+_minorver=20200508 # git-tagged release version
+pkgver=${_majorver}.${_minorver}
+pkgrel=1
+pkgdesc="computational fluid dynamics (CFD) toolbox, without non-free parmetis support"
+arch=('x86_64')
+url="http://www.openfoam.org"
+license=("GPL")
+
+depends=('bzip2' 'paraview' 'scotch' 'boost' 'flex' 'cgal')
+makedepends=('bash')
+conflicts=(openfoam3.0-git)
+repalces=(openfoam3.0-git)
+
+source=(OpenFOAM-${_majorver}::https://github.com/OpenFOAM/OpenFOAM-${_majorver}/archive/${_minorver}.tar.gz)
+install=openfoam.install
+sha256sums=('54e637521a89c96ad69d53a260c908a2eb429793a74788f24d6ca87ad22db38b')
+
+
+prepare() {
+  # Extract the current version and major of paraview and of scotch for use in the system preferences
+  _pversion=$(pacman -Q $(pacman -Qqo $(which paraview)) | sed -e 's/.* //; s/-.*//g')
+  _pmajor=`echo $_pversion | cut -d '.' -f1`
+  _sversion=`pacman -Q scotch | sed -e 's/.* //; s/-.*//g'`
+
+  # Generate and install the system preferences file
+  echo "compilerInstall=system" > "${srcdir}"/prefs.sh
+  echo "export WM_MPLIB=SYSTEMOPENMPI" >> "${srcdir}"/prefs.sh
+  echo "export ParaView_VERSION=${_pversion}" >> "${srcdir}"/prefs.sh
+  echo "export ParaView_MAJOR=${_pmajor}" >> "${srcdir}"/prefs.sh
+  cp "${srcdir}"/prefs.sh "${srcdir}"/OpenFOAM-${_majorver}/etc #|| return 1
+
+  # Generate the scotch.sh file for arch
+  echo "export SCOTCH_VERSION=scotch_${_sversion}" > "${srcdir}"/scotch.sh
+  echo "export SCOTCH_ARCH_PATH=/usr" >> "${srcdir}"/scotch.sh
+  cp "${srcdir}"/scotch.sh "${srcdir}"/OpenFOAM-${_majorver}/etc/config #|| return 1
+}
+
+build() {
+  # Setup the build environment
+  export FOAM_INST_DIR="${srcdir}"
+  foamDotFile="${srcdir}"/OpenFOAM-${_majorver}/etc/bashrc
+  [ -f ${foamDotFile} ] || return 1
+
+  # Enter build directory
+  cd "${srcdir}"/OpenFOAM-${_majorver}
+
+  # Build and clean up OpenFOAM
+  bash -c "source ${foamDotFile}
+          ./Allwmake || exit 1
+          wclean all || exit 1
+          wmakeLnIncludeAll || exit 1"
+}
+
+package() {
+  cd "${srcdir}"
+
+  # Create destination directories
+  install -d "${pkgdir}"/opt/OpenFOAM "${pkgdir}"/etc/profile.d || return 1
+
+  # copy package to pkgdir
+  cp -r "${srcdir}"/OpenFOAM-${_majorver} "${pkgdir}"/opt/OpenFOAM || return 1
+
+  # Add source file
+  echo "export FOAM_INST_DIR=/opt/OpenFOAM" > "${pkgdir}"/etc/profile.d/openfoam-${_majorver}.sh || return 1
+  echo "alias ofoam=\"source \${FOAM_INST_DIR}/OpenFOAM-${_majorver}/etc/bashrc\"" >> "${pkgdir}"/etc/profile.d/openfoam-${_majorver}.sh || return 1
+  chmod 755 "${pkgdir}"/etc/profile.d/openfoam-${_majorver}.sh || return 1
+
+  # Add stub thirdparty directory to keep openfoam happy
+  install -d "${pkgdir}"/opt/OpenFOAM/ThirdParty-${_majorver} || return 1
+
+  # Permission fixes - for system-wide install and use
+  chmod -R go+r "${pkgdir}"/opt
+  chmod -R 755 "${pkgdir}"/opt/OpenFOAM/OpenFOAM-${_majorver}/bin
+  chmod -R 755 ""${pkgdir}""/opt/OpenFOAM/OpenFOAM-${_majorver}/etc
+}
diff --git a/pcr/openfoam/openfoam.install b/pcr/openfoam/openfoam.install
new file mode 100644
index 000000000..286b28312
--- /dev/null
+++ b/pcr/openfoam/openfoam.install
@@ -0,0 +1,31 @@
+# arg 1:  the new package version
+post_install() {
+  echo "NOTE:"
+  echo ""
+  echo "This install of OpenFOAM does NOT include the"
+  echo "ThirdParty libraries from openfoam's website."
+  echo "It simply creates a stub OpenFOAM/ThirdParty"
+  echo "directory to keep the OpenFOAM bashrc happy."
+  echo ""
+  echo "The most common use of ThirdParty is to get Paraview."
+  echo "Modern versions of Paraview include an OpenFOAM"
+  echo "case file viewer. Instead of installing the ThirdParty"
+  echo "build of Paraview, using the AUR paraview package is"
+  echo "advised. https://aur.archlinux.org/packages/paraview"
+  echo ""
+  echo "If you need other components of the ThirdParty bundle"
+  echo "it will have to be installed manually."
+  echo "See http://www.openfoam.com/download/source.php for details."
+  echo ""
+  echo "Don't forget to run the \"ofoam\" alias in order to"
+  echo "source the OpenFOAM environment (PATH + LD_LIBRARY_PATH)."
+  echo "This alias has been introduced in order to avoid"
+  echo "PATH clashes (e.g. other executables such as R from GNU R)"
+  echo ""
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
diff --git a/pcr/openfoam3.0-git/PKGBUILD b/pcr/openfoam3.0-git/PKGBUILD
deleted file mode 100644
index 974ba5e95..000000000
--- a/pcr/openfoam3.0-git/PKGBUILD
+++ /dev/null
@@ -1,128 +0,0 @@
-# Original Contributor (AUR): aquavitae <aquavitae69: gmail>
-# Current Maintainer (AUR): Andrew Fischer <andrew_at_ltengsoft.com>
-# Packager (AUR): Heavysink
-
-# parabola changes and rationale:
-#  - removed "open source" term from pkgdesc
-#  - removed parametis support
-
-pkgname=openfoam3.0-git
-
-# The distributors package name
-_distpkgname=OpenFOAM
-_distpkgver=3.0.x
-_gitname=$_distpkgname-$_distpkgver
-pkgver=20170710.221b8ab7
-pkgrel=4
-pkgdesc="The libre CFD toolbox"
-pkgdesc+=", without nonfree parmetis support"
-arch=('x86_64')
-url="http://www.openfoam.com"
-license=('GPL')
-groups=()
-depends=('cgal' 'paraview' 'scotch' 'boost')
-makedepends=('git' 'flex')
-optdepends=()
-replaces=()
-backup=()
-options=()
-source=(git+https://github.com/OpenFOAM/OpenFOAM-3.0.x.git
-	 'decomp-options.patch'
-	 'paraFoam.patch'
-	 'scotch-options.patch'
-	 'boost.patch'
-	 'prefs.sh'
-	 'scotch.sh'
-   'paraview.sh')
-noextract=()
-install=openfoam.install
-md5sums=('SKIP'
-         'dcb09c65c450601203f48f7d5177ced2'
-         'fb84ecc41b63304064b88ee3291513be'
-         '905fbd21aa780a57530d65818425ec6c'
-	   'e0bc9bb43c48acbe06fc834cb93ce949'
-         'SKIP'
-         'SKIP'
-         'SKIP')
-
-pkgver() {
-	cd "$srcdir/$_gitname"
-	git log -1 --date=short --format="%cd.%h" | tr -d '-'
-}
-
-
-build() {
-  # Extract the current version and major of paraview and of scotch for use in the system preferences
-  _pversion1=`pacman -Q {paraview,paraview-manta,paraview-git} | sed -e 's/.* //; s/-.*//g'`
-  _pversion=`echo $_pversion1 | grep .`
-  _pmajor=`echo $_pversion | cut -d '.' -f1`
-  _sversion=`pacman -Q scotch | sed -e 's/.* //; s/-.*//g'`
-
-  # Generate and install the system preferences file
-  echo "compilerInstall=system" > $startdir/prefs.sh
-  echo "export WM_MPLIB=SYSTEMOPENMPI" >> $startdir/prefs.sh
-  echo "export ParaView_VERSION=$_pversion" >> $startdir/prefs.sh
-  echo "export ParaView_MAJOR=$_pmajor" >> $startdir/prefs.sh
-  cp $startdir/prefs.sh $srcdir/$_gitname/etc || return 1
-
-  # Generate the scotch.sh file for parabola
-  echo "export SCOTCH_VERSION=scotch_$_sversion" > $startdir/scotch.sh
-  echo "export SCOTCH_ARCH_PATH=/usr" >> $startdir/scotch.sh
-  cp $startdir/scotch.sh $srcdir/$_gitname/etc/config || return 1
-
-  # Generate the paraview.sh file for Paraview plugin
-  sed -i -e "s|paraviewversion|ParaView_VERSION=${_pversion}|g" ${srcdir}/paraview.sh
-  sed -i -e "s|paraviewmajor|ParaView_MAJOR=${_pmajor}|g" ${srcdir}/paraview.sh
-  cp ${srcdir}/paraview.sh ${srcdir}/${_distpkgname}-3.0.x/etc/config #|| return 1
-
-  # Patch for openmpi paths, and ptscotch link lines
-  patch -p1 < $startdir/decomp-options.patch
-  patch -p1 < $startdir/paraFoam.patch
-  patch -p1 < $startdir/scotch-options.patch
-  patch -p1 < $startdir/boost.patch
-
-  # Setup the build environment
-  export FOAM_INST_DIR=$srcdir 
-  foamDotFile=$srcdir/$_gitname/etc/bashrc
-  [ -f $foamDotFile ] && . $foamDotFile || return 1
-
-  #Fix flex version
-  cd ${srcdir}/$_gitname  
-  find . -name '*.L' -print -exec sed -i -e 's|YY_FLEX_SUBMINOR_VERSION < 34|YY_FLEX_SUBMINOR_VERSION < 34 \&\& YY_FLEX_MINOR_VERSION < 6|g' {} \;
-
-  # Enter build directory
-  cd "$srcdir/$_gitname" || return 1
-
-  # Build and clean up OpenFOAM
-  ./Allwmake || return 1
-  wclean all || return 1
-  wmakeLnIncludeAll || return 1
-
-}
-package() {
-  cd "$startdir"
-
-  # Create destination directories
-  install -d "$pkgdir/opt/$_distpkgname" "$pkgdir/etc/profile.d" || return 1
-
-  # Move package to pkgdir
-  mv "$srcdir/$_gitname" "$pkgdir/opt/$_distpkgname/$_gitname" || return 1
-
-  mkdir -p "$pkgdir/usr/bin"
-
-  # Add source file
-  echo "export FOAM_INST_DIR=/opt/$_distpkgname" > "$pkgdir/usr/bin/ofoam-3.0" || return 1
-  echo ".\$FOAM_INST_DIR/$_gitname/etc/bashrc" >> "$pkgdir/usr/bin/ofoam-3.0" || return 1
-
-  # Add stub thirdparty directory to keep openfoam happy
-  install -d "$pkgdir/opt/$_distpkgname/ThirdParty-$_distpkgver" || return 1
-
-  # Permission fixes - for system-wide install and use
-  chmod -R go+r "$pkgdir/opt"
-  chmod -R 755 "$pkgdir/opt/$_distpkgname/$_gitname/bin"
-  chmod -R 755 "$pkgdir/opt/$_distpkgname/$_gitname/etc"
-  chmod -R 755 "$pkgdir/usr/bin/ofoam-3.0"
-}
-
-
-
diff --git a/pcr/openfoam3.0-git/boost.patch b/pcr/openfoam3.0-git/boost.patch
deleted file mode 100644
index 0e3e992cf..000000000
--- a/pcr/openfoam3.0-git/boost.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/OpenFOAM-3.0.x/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options	2016-04-23 10:46:06.634726444 -0400
-+++ src/OpenFOAM-3.0.x/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options	2016-04-23 10:50:35.496222009 -0400
-@@ -35,4 +35,5 @@ EXE_LIBS = \
-     -lfileFormats \
-     -ltriSurface \
-     -ldynamicMesh \
--    -lsampling
-+    -lsampling \
-+    -lboost_thread
-
---- src/OpenFOAM-3.0.x/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options	2016-04-23 10:46:06.634726444 -0400
-+++ src/OpenFOAM-3.0.x/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options	2016-04-23 10:48:25.558854579 -0400
-@@ -38,4 +38,5 @@ EXE_LIBS = \
-     -ldecompositionMethods \
-     -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
-     -lsampling \
--    -lfileFormats
-+    -lfileFormats \
-+    -lboost_thread
-
diff --git a/pcr/openfoam3.0-git/decomp-options.patch b/pcr/openfoam3.0-git/decomp-options.patch
deleted file mode 100644
index 3043c228f..000000000
--- a/pcr/openfoam3.0-git/decomp-options.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/OpenFOAM-3.0.x/src/parallel/decompose/metisDecomp/Make/options
-+++ src/OpenFOAM-3.0.x/src/parallel/decompose/metisDecomp/Make/options
-@@ -1,7 +1,7 @@
- EXE_INC = \
-     /* -DFULLDEBUG -g -O0 */ \ 
--    -I$(METIS_ARCH_PATH)/include \
-+    -I/usr/include \
-     -I../decompositionMethods/lnInclude
- 
- LIB_LIBS = \
--    -L$(METIS_ARCH_PATH)/lib -lmetis
-+    -L$(FOAM_EXT_LIBBIN) -lparmetis
diff --git a/pcr/openfoam3.0-git/openfoam.install b/pcr/openfoam3.0-git/openfoam.install
deleted file mode 100644
index 939247c8f..000000000
--- a/pcr/openfoam3.0-git/openfoam.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  echo "NOTE:"
-  echo "This install of OpenFOAM does Not include the"
-  echo "ThirdParty libraries from openfoam's website."
-  echo "It simply creates a stub OpenFOAM/ThirdParty"
-  echo "directory to keep the OpenFOAM bashrc happy."
-  echo ""
-  echo "The most common use of ThirdParty is to get Paraview."
-  echo "Modern versions of Paraview include an OpenFOAM"
-  echo "case file viewer. Instead of installing the ThirdParty"
-  echo "build of Paraview, using the standard arch Paraview"
-  echo "package is recommended."
-  echo ""
-  echo "If you need other components of the ThirdParty bundle"
-  echo "it will have to be installed manually."
-  echo "See http://www.openfoam.com/download/source.php for details."
-  echo ""
-  echo "Also, to avoid conflict with 'R' from r-project.org, please"
-  echo "type 'ofoam-3.0' to initialize the environment."
-}
diff --git a/pcr/openfoam3.0-git/paraFoam.patch b/pcr/openfoam3.0-git/paraFoam.patch
deleted file mode 100644
index 1a43d606d..000000000
--- a/pcr/openfoam3.0-git/paraFoam.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/OpenFOAM-3.0.x/bin/paraFoam
-+++ src/OpenFOAM-3.0.x/bin/paraFoam
-@@ -124,21 +124,22 @@ done
- # Get the ParaView major version to select the appropriate readers
- version=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\).*$/\1/'`
-
--# Check that reader module has been built
--if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPV${version}FoamReader_SM.so ]
--then
--    cat<< BUILDREADER
-+# NOTE: For OpenFOAM built from AUR, paraview will already be installed
-+# with the required readers. No need to perform this check.
-+#if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPV${version}FoamReader_SM.so ]
-+#then
-+#    cat<< BUILDREADER
-
--FATAL ERROR: ParaView reader module libraries do not exist
-+#FATAL ERROR: ParaView reader module libraries do not exist
-
--Please build the reader module before continuing:
--cd \$FOAM_UTILITIES/postProcessing/graphics/PV${version}Readers
--./Allwclean
--./Allwmake
-+#Please build the reader module before continuing:
-+#cd \$FOAM_UTILITIES/postProcessing/graphics/PV${version}Readers
-+#./Allwclean
-+#./Allwmake
-
--BUILDREADER
--    exit 1
--fi
-+#BUILDREADER
-+#    exit 1
-+#fi
-
- # Check for --data=... argument
- hasDataArg()
diff --git a/pcr/openfoam3.0-git/paraview.sh b/pcr/openfoam3.0-git/paraview.sh
deleted file mode 100644
index 0bc141109..000000000
--- a/pcr/openfoam3.0-git/paraview.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#----------------------------------*-sh-*--------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# File
-#     config/paraview.sh
-#
-# Description
-#     Setup file for paraview-[3-4].x
-#     Sourced from OpenFOAM-<VERSION>/etc/bashrc or from foamPV alias
-#
-# Note
-#     The env. variables 'ParaView_DIR' and 'ParaView_MAJOR'
-#     are required for building plugins
-#------------------------------------------------------------------------------
-
-# clean the PATH
-cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"` && PATH="$cleaned"
-
-# determine the cmake to be used
-unset CMAKE_HOME
-for cmake in cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 cmake-2.8.1
-do
-    cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
-    if [ -r $cmake ]
-    then
-        export CMAKE_HOME=$cmake
-        export PATH=$CMAKE_HOME/bin:$PATH
-        break
-    fi
-done
-
-
-#- ParaView version, automatically determine major version
-paraviewversion
-paraviewmajor
-
-
-# Evaluate command-line parameters for ParaView
-_foamParaviewEval()
-{
-    while [ $# -gt 0 ]
-    do
-        case "$1" in
-        ParaView*=*)
-            # name=value  -> export name=value
-            eval "export $1"
-            ;;
-        esac
-        shift
-    done
-}
-
-# Evaluate command-line parameters
-_foamParaviewEval $@
-
-export ParaView_VERSION ParaView_MAJOR
-
-paraviewInstDir=/usr
-export ParaView_DIR=/usr
-export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview
-ParaView_LIB_DIR=$ParaView_DIR/lib/paraview
-export PATH=$ParaView_DIR/bin:$PATH
-export LD_LIBRARY_PATH=$ParaView_LIB_DIR:$LD_LIBRARY_PATH
-export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview
-if [ "$FOAM_VERBOSE" -a "$PS1" ]
-then
-    echo "Using paraview"
-    echo "    ParaView_DIR         : $ParaView_DIR"
-    echo "    ParaView_LIB_DIR     : $ParaView_LIB_DIR"
-    echo "    ParaView_INCLUDE_DIR : $ParaView_INCLUDE_DIR"
-    echo "    PV_PLUGIN_PATH       : $PV_PLUGIN_PATH"
-fi
-
-    # add in python libraries if required
-if [ "$PYTHONPATH" ]
-then
-    export PYTHONPATH=$PYTHONPATH:$ParaView_LIB_DIR/site-packages/vtk:$ParaView_LIB_DIR/site-packages/paraview:$ParaView_LIB_DIR/site-packages:$ParaView_LIB_DIR
-else
-    export PYTHONPATH=$ParaView_LIB_DIR/site-packages/vtk:$ParaView_LIB_DIR/site-packages/paraview:$ParaView_LIB_DIR/site-packages:$ParaView_LIB_DIR
-fi
-
-unset _foamParaviewEval
-unset cleaned cmake paraviewInstDir paraviewPython
-
-# -----------------------------------------------------------------------------
diff --git a/pcr/openfoam3.0-git/prefs.sh b/pcr/openfoam3.0-git/prefs.sh
deleted file mode 100644
index 880455437..000000000
--- a/pcr/openfoam3.0-git/prefs.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-compilerInstall=system
-export WM_MPLIB=SYSTEMOPENMPI
-export ParaView_VERSION=5.4.1
-export ParaView_MAJOR=5
diff --git a/pcr/openfoam3.0-git/scotch-options.patch b/pcr/openfoam3.0-git/scotch-options.patch
deleted file mode 100644
index e363feb06..000000000
--- a/pcr/openfoam3.0-git/scotch-options.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/OpenFOAM-3.0.x/src/parallel/decompose/ptscotchDecomp/Make/options
-+++ src/OpenFOAM-3.0.x/src/parallel/decompose/ptscotchDecomp/Make/options
-@@ -9,4 +9,4 @@ EXE_INC = \
-     -I../decompositionMethods/lnInclude
- 
- LIB_LIBS = \
--    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt
-+    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lscotch -lptscotcherrexit -lscotcherrexit ${LINK_FLAGS} -lbz2 -lrt
---- src/OpenFOAM-3.0.x/src/parallel/decompose/scotchDecomp/Make/options
-+++ src/OpenFOAM-3.0.x/src/parallel/decompose/scotchDecomp/Make/options
-@@ -13,4 +13,4 @@ EXE_INC = \
-     -I../decompositionMethods/lnInclude
- 
- LIB_LIBS = \
--    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt
-+    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lbz2 -lrt
-
diff --git a/pcr/openfoam3.0-git/scotch.sh b/pcr/openfoam3.0-git/scotch.sh
deleted file mode 100644
index b723bd9f7..000000000
--- a/pcr/openfoam3.0-git/scotch.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export SCOTCH_VERSION=scotch_6.0.4
-export SCOTCH_ARCH_PATH=/usr