Move humonguous, duplicated patches to mirrors.

(Portage version: 2.2_rc41/cvs/Linux x86_64)

5 files changed, 14 insertions, 1009 deletions

diff --git a/sci-libs/openfoam-src/ChangeLog b/sci-libs/openfoam-src/ChangeLog
index 3e7415c400ad..bf866e190976 100644
--- a/sci-libs/openfoam-src/ChangeLog
+++ b/sci-libs/openfoam-src/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/openfoam-src
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-src/ChangeLog,v 1.3 2009/09/18 09:12:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-src/ChangeLog,v 1.4 2009/09/25 09:30:00 flameeyes Exp $
+
+  25 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  openfoam-src-1.5_p20090311.ebuild, -files/OpenFOAM-1.5-compile.patch,
+  openfoam-src-1.6.ebuild, -files/OpenFOAM-1.6-compile.patch:
+  Move humonguous, duplicated patches to mirrors.
 
 *openfoam-src-1.6 (18 Sep 2009)
 
diff --git a/sci-libs/openfoam-src/files/OpenFOAM-1.5-compile.patch b/sci-libs/openfoam-src/files/OpenFOAM-1.5-compile.patch
deleted file mode 100644
index f95bf462f09c..000000000000
--- a/sci-libs/openfoam-src/files/OpenFOAM-1.5-compile.patch
+++ /dev/null
@@ -1,397 +0,0 @@
---- OpenFOAM-1.5-src/etc/bashrc	2008-07-09 19:08:57.000000000 +0200
-+++ OpenFOAM-1.5/etc/bashrc	2008-07-21 23:07:48.000000000 +0200
-@@ -42,9 +42,9 @@
- #
- # Location of FOAM installation
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--foamInstall=$HOME/$WM_PROJECT
-+# foamInstall=$HOME/$WM_PROJECT
- # foamInstall=~$WM_PROJECT
--# foamInstall=/usr/local/$WM_PROJECT
-+foamInstall=/usr/lib/$WM_PROJECT
- # foamInstall=/opt/$WM_PROJECT
- 
- : ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR
-@@ -59,7 +59,7 @@
- 
- # Location of third-party software
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
-+# export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
- 
- 
- # Operating System/Platform from Unix or MSWindows
-@@ -192,15 +192,15 @@
- 
- 
- _foamSource $WM_PROJECT_DIR/etc/settings.sh
--_foamSource $WM_PROJECT_DIR/etc/aliases.sh
-+# _foamSource $WM_PROJECT_DIR/etc/aliases.sh
- 
- 
- # Source user setup files for optional packages
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
--_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
-+# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
- # _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/bashrc
--_foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
-+# _foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
- 
- 
- # Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)
---- OpenFOAM-1.5-src/etc/settings.sh	2008-06-27 13:19:25.000000000 +0200
-+++ OpenFOAM-1.5/etc/settings.sh	2008-07-21 00:50:00.000000000 +0200
-@@ -56,30 +56,30 @@
- export PATH=$WM_PROJECT_DIR/bin:$FOAM_INST_DIR/$WM_ARCH/bin:$PATH
- 
- #- Location of the jobControl directory
--export FOAM_JOB_DIR=$FOAM_INST_DIR/jobControl
-+export FOAM_JOB_DIR=$HOME/$WM_PROJECT/jobControl
- 
- export WM_DIR=$WM_PROJECT_DIR/wmake
- export WM_LINK_LANGUAGE=c++
--export WM_OPTIONS=$WM_ARCH${WM_COMPILER}$WM_PRECISION_OPTION$WM_COMPILE_OPTION
-+export WM_OPTIONS=$WM_ARCH${WM_COMPILER}
- export PATH=$WM_DIR:$PATH
- 
- export FOAM_SRC=$WM_PROJECT_DIR/src
- export FOAM_LIB=$WM_PROJECT_DIR/lib
--export FOAM_LIBBIN=$FOAM_LIB/$WM_OPTIONS
-+export FOAM_LIBBIN=$FOAM_LIB
- _foamAddLib $FOAM_LIBBIN
- 
- export FOAM_APP=$WM_PROJECT_DIR/applications
--export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
-+export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin
- _foamAddPath $FOAM_APPBIN
- 
- export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
- export FOAM_UTILITIES=$FOAM_APP/utilities
- export FOAM_SOLVERS=$FOAM_APP/solvers
- 
--export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
-+export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib
- _foamAddLib $FOAM_USER_LIBBIN
- 
--export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
-+export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin
- _foamAddPath $FOAM_USER_APPBIN
- 
- export FOAM_RUN=$WM_PROJECT_USER_DIR/run
-@@ -93,7 +93,7 @@
- # Select compiler installation
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- # WM_COMPILER_INST = OpenFOAM | System
--WM_COMPILER_INST=OpenFOAM
-+WM_COMPILER_INST=System
- 
- case "$WM_COMPILER_INST" in
- OpenFOAM)
-@@ -136,45 +136,47 @@
- 
- case "$WM_MPLIB" in
- OPENMPI)
--    mpi_version=openmpi-1.2.6
--    export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
--    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
--
-+    MPI_VERSION=openmpi
-+#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
-+#     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
-+    export MPI_ARCH_PATH=/usr
-     # Tell OpenMPI where to find its install directory
-     export OPAL_PREFIX=$MPI_ARCH_PATH
- 
--    _foamAddLib  $MPI_ARCH_PATH/lib
--    _foamAddPath $MPI_ARCH_PATH/bin
-+#     _foamAddLib  $MPI_ARCH_PATH/lib
-+#     _foamAddPath $MPI_ARCH_PATH/bin
- 
--    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
--    unset mpi_version
-+    export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
-+#     unset mpi_version
-     ;;
- 
- LAM)
--    mpi_version=lam-7.1.4
--    export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
--    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
--    export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version
-+    MPI_VERSION=lam
-+#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
-+#     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
-+    export MPI_ARCH_PATH=/usr
-+#     export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version
-     # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
- 
--    _foamAddLib  $MPI_ARCH_PATH/lib
--    _foamAddPath $MPI_ARCH_PATH/bin
-+#     _foamAddLib  $MPI_ARCH_PATH/lib
-+#     _foamAddPath $MPI_ARCH_PATH/bin
- 
--    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
--    unset mpi_version
-+    export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
-+#     unset mpi_version
-     ;;
- 
- MPICH)
--    mpi_version=mpich-1.2.4
--    export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
--    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
-+    MPI_VERSION=mpich
-+#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
-+#     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
-+    export MPI_ARCH_PATH=/usr
-     export MPICH_ROOT=$MPI_ARCH_PATH
- 
--    _foamAddLib  $MPI_ARCH_PATH/lib
--    _foamAddPath $MPI_ARCH_PATH/bin
-+#     _foamAddLib  $MPI_ARCH_PATH/lib
-+#     _foamAddPath $MPI_ARCH_PATH/bin
- 
--    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
--    unset mpi_version
-+    export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
-+#     unset mpi_version
-     ;;
- 
- MPICH-GM)
---- OpenFOAM-1.5-src/etc/cshrc	2008-07-09 19:09:28.000000000 +0200
-+++ OpenFOAM-1.5/etc/cshrc	2008-07-20 22:31:22.000000000 +0200
-@@ -58,7 +58,7 @@
- 
- # Location of third-party software
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
-+# setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
- 
- 
- # Operating System/Platform from Unix or MSWindows
-@@ -188,12 +188,12 @@
- alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Executing: \!*"; source \!*'
- 
- _foamSource $WM_PROJECT_DIR/etc/settings.csh
--_foamSource $WM_PROJECT_DIR/etc/aliases.csh
-+# _foamSource $WM_PROJECT_DIR/etc/aliases.csh
- 
- # Source user setup files for optional packages
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
--_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
-+# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
- # _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/cshrc
- 
- 
---- OpenFOAM-1.5-src/etc/settings.csh	2008-06-27 13:19:25.000000000 +0200
-+++ OpenFOAM-1.5/etc/settings.csh	2008-07-20 23:14:59.000000000 +0200
-@@ -39,30 +39,30 @@
- set path=($WM_PROJECT_DIR/bin $FOAM_INST_DIR/$WM_ARCH/bin $path)
- 
- #- Location of the jobControl directory
--setenv FOAM_JOB_DIR $FOAM_INST_DIR/jobControl
-+setenv FOAM_JOB_DIR $HOME/$WM_PROJECT/jobControl
- 
- setenv WM_DIR $WM_PROJECT_DIR/wmake
- setenv WM_LINK_LANGUAGE c++
--setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
-+setenv WM_OPTIONS $WM_ARCH$WM_COMPILER
- set path=($WM_DIR $path)
- 
- setenv FOAM_SRC $WM_PROJECT_DIR/src
- setenv FOAM_LIB $WM_PROJECT_DIR/lib
--setenv FOAM_LIBBIN $FOAM_LIB/$WM_OPTIONS
-+setenv FOAM_LIBBIN $FOAM_LIB
- _foamAddLib $FOAM_LIBBIN
- 
- setenv FOAM_APP $WM_PROJECT_DIR/applications
--setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
-+setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin
- _foamAddPath $FOAM_APPBIN
- 
- setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
- setenv FOAM_UTILITIES $FOAM_APP/utilities
- setenv FOAM_SOLVERS $FOAM_APP/solvers
- 
--setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
-+setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib
- _foamAddLib $FOAM_USER_LIBBIN
- 
--setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
-+setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin
- _foamAddPath $FOAM_USER_APPBIN
- 
- setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
-@@ -76,7 +76,7 @@
- # Select compiler installation
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- # WM_COMPILER_INST = OpenFOAM | System
--set WM_COMPILER_INST=OpenFOAM
-+set WM_COMPILER_INST=System
- 
- switch ("$WM_COMPILER_INST")
- case OpenFOAM:
-@@ -125,45 +125,48 @@
- 
- switch ("$WM_MPLIB")
- case OPENMPI:
--    set mpi_version=openmpi-1.2.6
--    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
--    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
-+#     set mpi_version=openmpi-1.2.6
-+#     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
-+#     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
-+    setenv MPI_ARCH_PATH /usr
- 
-     # Tell OpenMPI where to find its install directory
-     setenv OPAL_PREFIX $MPI_ARCH_PATH
- 
--    _foamAddLib  $MPI_ARCH_PATH/lib
--    _foamAddPath $MPI_ARCH_PATH/bin
-+#     _foamAddLib  $MPI_ARCH_PATH/lib
-+#     _foamAddPath $MPI_ARCH_PATH/bin
- 
--    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
--    unset mpi_version
-+    setenv FOAM_MPI_LIBBIN $FOAM_LIB/openmpi
-+#     unset mpi_version
-     breaksw
- 
- case LAM:
--    set mpi_version=lam-7.1.4
--    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
--    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
--    setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version
-+#     set mpi_version=lam-7.1.4
-+#     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
-+#     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
-+    setenv MPI_ARCH_PATH /usr
-+#     setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version
-     # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
- 
--    _foamAddLib  $MPI_ARCH_PATH/lib
--    _foamAddPath $MPI_ARCH_PATH/bin
-+#     _foamAddLib  $MPI_ARCH_PATH/lib
-+#     _foamAddPath $MPI_ARCH_PATH/bin
- 
--    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
--    unset mpi_version
-+    setenv FOAM_MPI_LIBBIN $FOAM_LIB/lam
-+#     unset mpi_version
-     breaksw
- 
- case MPICH:
--    set mpi_version=mpich-1.2.4
--    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
--    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
-+#     set mpi_version=mpich-1.2.4
-+#     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
-+#     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
-+    setenv MPI_ARCH_PATH /usr
-     setenv MPICH_ROOT $MPI_ARCH_PATH
- 
--    _foamAddLib  $MPI_ARCH_PATH/lib
--    _foamAddPath $MPI_ARCH_PATH/bin
-+#     _foamAddLib  $MPI_ARCH_PATH/lib
-+#     _foamAddPath $MPI_ARCH_PATH/bin
- 
--    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
--    unset mpi_version
-+    setenv FOAM_MPI_LIBBIN $FOAM_LIB/mpich
-+#     unset mpi_version
-     breaksw
- 
- case MPICH-GM:
---- OpenFOAM-1.5-src/wmake/rules/General/flex++	2008-05-01 16:16:40.000000000 +0200
-+++ OpenFOAM-1.5/wmake/rules/General/flex++	2008-07-22 16:18:41.000000000 +0200
-@@ -1,6 +1,6 @@
- .SUFFIXES: .L
- 
--Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
-+Ltoo = flex --c++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
- 
- .L.dep:
- 	$(MAKE_DEP)
---- OpenFOAM-1.5-src/wmake/Makefile	2008-06-27 13:19:31.000000000 +0200
-+++ OpenFOAM-1.5/wmake/Makefile	2008-07-20 23:06:27.000000000 +0200
-@@ -56,7 +56,7 @@
- 
- LIB_SRC            = $(WM_PROJECT_DIR)/src
- LIB_DIR            = $(WM_PROJECT_DIR)/lib
--LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS)
-+LIB_WM_OPTIONS_DIR = $(LIB_DIR)
- OBJECTS_DIR        = $(MAKE_DIR)/$(WM_OPTIONS)
- CLASSES_DIR        = $(MAKE_DIR)/classes
- 
---- OpenFOAM-1.5-src/bin/paraFoam	2008-07-03 18:14:43.000000000 +0200
-+++ OpenFOAM-1.5/bin/paraFoam	2008-07-22 15:23:24.000000000 +0200
-@@ -77,8 +77,8 @@
-    [ -s "$parentDir/$check" ] || usage "file does not exist:  '$parentDir/$check'"
- done
- 
--#caseFile="$caseName.foam"
--caseFile="$caseName.OpenFOAM"
-+caseFile="$caseName.foam"
-+# caseFile="$caseName.OpenFOAM"
- 
- case "$ParaView_VERSION" in
- 2*)
-@@ -96,7 +96,7 @@
- *)
-    # Clean up on termination and on Ctrl-C
-    trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT
--   touch $caseFile
-+   ln system/controlDict $caseFile
-    paraview --data=$caseFile
-    ;;
- 
---- OpenFOAM-1.5-src/src/decompositionAgglomeration/decompositionMethods/Make/options	2008-06-09 16:22:09.000000000 +0200
-+++ OpenFOAM-1.5/src/decompositionAgglomeration/decompositionMethods/Make/options	2008-07-20 22:19:30.000000000 +0200
-@@ -1,6 +1,5 @@
- EXE_INC = \
--    -I$(WM_THIRD_PARTY_DIR)/metis-5.0pre2/include
-+    -I/usr/include/metis
- 
- LIB_LIBS = \
--    -lmetis \
--    -lGKlib
-+    -lmetis
---- OpenFOAM-1.5-src/src/decompositionAgglomeration/parMetisDecomp/Make/options	2008-06-09 16:23:55.000000000 +0200
-+++ OpenFOAM-1.5/src/decompositionAgglomeration/parMetisDecomp/Make/options	2008-07-20 22:24:04.000000000 +0200
-@@ -2,11 +2,11 @@
- 
- EXE_INC = \
-     $(PFLAGS) $(PINC) \
--    -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1/ParMETISLib \
--    -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1 \
-+    -I/usr/include/parmetis \
-+    -I/usr/include/metis \
-     -I../decompositionMethods/lnInclude
- 
- LIB_LIBS = \
-     -L$(FOAM_MPI_LIBBIN) \
--    -lmetis-parmetis \
-+    -lmetis \
-     -lparmetis
---- OpenFOAM-1.5-src/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options	2008-06-09 16:22:37.000000000 +0200
-+++ OpenFOAM-1.5/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options	2008-07-21 20:45:42.000000000 +0200
-@@ -1,5 +1,3 @@
--ParMGridGen = $(WM_THIRD_PARTY_DIR)/ParMGridGen-1.0
--
- TYPE_REAL=
- #if defined(SP)
- TYPE_REAL=-DTYPE_REAL
-@@ -7,9 +5,9 @@
- 
- EXE_INC = \
-     -I$(LIB_SRC)/finiteVolume/lnInclude \
--    -I$(ParMGridGen)/MGridGen/Lib/lnInclude \
--    -I$(ParMGridGen)/MGridGen/IMlib/lnInclude \
-+    -I/usr/include/mgridgen \
-     $(TYPE_REAL)
- 
- LIB_LIBS = \
-+    -lIMlib \
-     -lMGridGen
diff --git a/sci-libs/openfoam-src/files/OpenFOAM-1.6-compile.patch b/sci-libs/openfoam-src/files/OpenFOAM-1.6-compile.patch
deleted file mode 100644
index 79c1b7e66b52..000000000000
--- a/sci-libs/openfoam-src/files/OpenFOAM-1.6-compile.patch
+++ /dev/null
@@ -1,605 +0,0 @@
-diff -urN OpenFOAM-1.6-src/bin/paraFoam OpenFOAM-1.6/bin/paraFoam
---- OpenFOAM-1.6-src/bin/paraFoam	2009-01-08 21:19:14.000000000 +0100
-+++ OpenFOAM-1.6/bin/paraFoam	2009-08-06 10:54:38.000000000 +0200
-@@ -1,133 +1,148 @@
- #!/bin/sh
--#------------------------------------------------------------------------------
--# =========                 |
--# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
--#  \\    /   O peration     |
--#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
--#    \\/     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 2 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, write to the Free Software Foundation,
--#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+#
-+# Copyright (c) 2008-2009 Takuya OSHIMA <oshima@eng.niigata-u.ac.jp>.
-+# All rights reserved.
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions are
-+# met:
-+#
-+#  * Redistributions of source code must retain the above copyright
-+#    notice, this list of conditions and the following disclaimer.
-+#
-+#  * Redistributions in binary form must reproduce the above copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the
-+#    distribution.
-+#
-+#  * Neither the name of the author nor the names of any contributors
-+#    may be used to endorse or promote products derived from this
-+#    software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
-+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
- # Script
--#     paraFoam
-+#     pvFoam
- #
- # Description
--#     start paraview with the OpenFOAM libraries
--#
--#------------------------------------------------------------------------------
--usage() {
--    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
--    cat<<USAGE
--
--usage: ${0##*/} [OPTION]
--options:
--  -case   dir    specify alternative case directory
--  -region name   specify mesh region name
--  -touch         only create the .OpenFOAM file
--
--* start paraview $ParaView_VERSION with the OpenFOAM libraries
-+#     ParaView interface script for use with vtkPOpenFOAMReader.
- 
--USAGE
-+# Adjust as necessary.
-+# You might also want to set LD_LIBRARY_PATH or DYLD_LIBRARY_PATH.
-+paraviewPath="`which paraview`"
-+# or in full path like paraviewPath=/opt/ParaView3/bin/paraview
-+
-+if [ ! -x "${paraviewPath}" -o -d "${paraviewPath}" ]; then
-+    # not using LINENO which is not supported by dash (yet)
-+    echo "ParaView not found; set paraviewPath at line" `awk '/paraviewPath/{print FNR;exit 0}' $0` "of $0."
-     exit 1
--}
-+fi
- 
--unset regionName touchOnly
-+ext=foam
-+casePath=.
-+script=${0##*/}
-+background=yes
-+trapCommand=trap
- 
--# parse options
--while [ "$#" -gt 0 ]
-+while [ $# -gt 0 ]
- do
-     case "$1" in
--    -h | -help)
--        usage
--        ;;
--    -case)
--        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
--        cd "$2" 2>/dev/null || usage "directory does not exist:  '$2'"
--        shift 2
--        ;;
--    -region)
--        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
--        regionName=$2
--        shift 2
--        ;;
--    -touch)
--        touchOnly=true
--        shift
--        ;;
--    *)
--        usage "unknown option/argument: '$*'"
--        ;;
-+	-case)
-+	    if [ $# -lt 2 ]; then
-+		echo "-case requires path specification"
-+		exit 1
-+	    fi
-+	    shift
-+	    casePath="$1"
-+	    ;;
-+	-clientServer|-cs)
-+	    if [ $# -lt 2 ]; then
-+		echo "-clientServer or -cs requires specification of the server resource name"
-+		exit 1
-+	    fi
-+	    shift
-+	    csResourceName="$1"
-+	    ;;
-+	-foreground|-fg)
-+	    background=no
-+	    ;;
-+	-keepStub|-ks)
-+	    trapCommand=:
-+	    ;;
-+	-help)
-+	    echo "Usage: ${script} [-case <dir>] [-clientServer|-cs <server resource name>] [-foreground|-fg] [-keepStub|-ks] [-help]"
-+	    exit 0
-+	    ;;
-     esac
-+    shift
- done
- 
--# get a sensible caseName
--caseName=${PWD##*/}
--caseFile="$caseName.OpenFOAM"
--fvControls="system"
--
--if [ -n "$regionName" ]
--then
--    caseFile="$caseName{$regionName}.OpenFOAM"
--    fvControls="$fvControls/$regionName"
--fi
--
--if [ -n "$touchOnly" ]
--then
--    touch "$caseFile"
--    echo "created '$caseFile'"
--    exit 0
-+# cd to the case directory
-+if ! cd "${casePath}" > /dev/null 2>&1; then
-+    echo "Cannot change directory to \"${casePath}\"; exiting"
-+    exit 1
- fi
- 
--# parent directory for normal or parallel results
--case "$caseName" in
--    processor*) parentDir=".." ;;
--    *)          parentDir="."  ;;
--esac
--
--# check existence of essential files
--for check in system/controlDict $fvControls/fvSchemes $fvControls/fvSolution
--do
--    [ -s "$parentDir/$check" ] || usage "file does not exist:  '$parentDir/$check'"
--done
-+caseName="${PWD##*/}"
- 
-+# see if caseName starts with controlDict or the case is in the root directory.
-+if [ "${caseName#controlDict}" != "${caseName}" -o ! "${caseName}" ]; then
-+    # Use case.foam as file name given to ParaView
-+    caseName="case"
-+fi
- 
--case "$ParaView_VERSION" in
--2*)
--    trap "rm -f paraFoam.pvs $caseFile 2>/dev/null; exit 0" EXIT TERM INT
--    touch "$caseFile"
--
--    # since we are now in the cwd, %CASE% is '$PWD/$caseFile'
--    sed -e s@%CASE%@$PWD/$caseFile@g \
--        $WM_PROJECT_DIR/bin/tools/paraFoam.pvs > paraFoam.pvs
--
--    paraview paraFoam.pvs
--    ;;
--
--*)
--    # only create/remove caseFile if it didn't already exist
--    [ -e $caseFile ] || {
--        trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT
--        touch "$caseFile"
--        echo "created temporary '$caseFile'"
--    }
-+fileName="${caseName}.${ext}"
-+if [ -e "${fileName}" ]; then
-+    if [ ! -r "${fileName}" ]; then
-+	echo "Stub ${fileName} exists but not readable; exiting"
-+	exit 1
-+    fi
-+    trapCommand=:
-+else
-+    if ! touch "${fileName}" > /dev/null 2>&1; then
-+	echo "Cannot create stub ${fileName}; exiting"
-+	exit 1
-+    fi
-+fi
- 
--    paraview --data="$caseFile"
--    ;;
-+# set the locale where ParaView is run under to "C" so that the
-+# interpretation of decimal points by the system routines are not
-+# affected
-+export LANG=C
-+export LC_ALL=C
-+
-+# specify fileName with full path so that it can easily be accessed
-+# later with File->Recent Files
-+if [ "${background}" = "yes" ]; then
-+    (
-+	${trapCommand} "rm -f \"${fileName}\" ; exit 0" \
-+	    EXIT HUP INT PIPE ALRM TERM USR1 USR2 ;
-+	if [ "${csResourceName}" ]; then
-+	    "${paraviewPath}" --data="${PWD}/${fileName}" \
-+		--server="${csResourceName}"
-+	else
-+	    "${paraviewPath}" --data="${PWD}/${fileName}"
-+	fi
-+    ) &
-+else
-+    ${trapCommand} "rm -f \"${fileName}\" ; exit 0" \
-+	EXIT HUP INT PIPE ALRM TERM USR1 USR2
-+    if [ "${csResourceName}" ]; then
-+	"${paraviewPath}" --data="${PWD}/${fileName}" \
-+	    --server="${csResourceName}"
-+    else
-+	"${paraviewPath}" --data="${PWD}/${fileName}"
-+    fi
-+fi
- 
--esac
- #------------------------------------------------------------------------------
-diff -urN OpenFOAM-1.6-src/etc/bashrc OpenFOAM-1.6/etc/bashrc
---- OpenFOAM-1.6-src/etc/bashrc	2009-07-15 13:48:16.000000000 +0200
-+++ OpenFOAM-1.6/etc/bashrc	2009-08-06 10:32:47.000000000 +0200
-@@ -43,9 +43,9 @@
- #
- # Location of FOAM installation
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--foamInstall=$HOME/$WM_PROJECT
-+# foamInstall=$HOME/$WM_PROJECT
- # foamInstall=~$WM_PROJECT
--# foamInstall=/usr/local/$WM_PROJECT
-+foamInstall=/usr/lib/$WM_PROJECT
- # foamInstall=/opt/$WM_PROJECT
- #
- # END OF (NORMAL) USER EDITABLE PART
-@@ -73,7 +73,7 @@
- 
- # Location of third-party software
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
-+# export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
- 
- 
- # Operating System/Platform
-@@ -232,14 +232,14 @@
- 
- 
- _foamSource $WM_PROJECT_DIR/etc/settings.sh
--_foamSource $WM_PROJECT_DIR/etc/aliases.sh
-+# _foamSource $WM_PROJECT_DIR/etc/aliases.sh
- 
- 
- # Source user setup files for optional packages
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
--_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
--_foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
-+# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
-+# _foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
- 
- 
- # Clean environment paths again. Only remove duplicates
-diff -urN OpenFOAM-1.6-src/etc/cshrc OpenFOAM-1.6/etc/cshrc
---- OpenFOAM-1.6-src/etc/cshrc	2009-07-15 13:48:16.000000000 +0200
-+++ OpenFOAM-1.6/etc/cshrc	2009-08-06 10:42:58.000000000 +0200
-@@ -42,9 +42,9 @@
- #
- # Location of FOAM installation
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--set foamInstall = $HOME/$WM_PROJECT
-+# set foamInstall = $HOME/$WM_PROJECT
- # set foamInstall = ~$WM_PROJECT
--# set foamInstall = /usr/local/$WM_PROJECT
-+set foamInstall = /usr/lib/$WM_PROJECT
- # set foamInstall = /opt/$WM_PROJECT
- #
- # END OF (NORMAL) USER EDITABLE PART
-@@ -67,7 +67,7 @@
- 
- # Location of third-party software
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
-+# setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
- 
- 
- # Operating System/Platform
-@@ -230,12 +230,12 @@
- alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Executing: \!*"; source \!*'
- 
- _foamSource $WM_PROJECT_DIR/etc/settings.csh
--_foamSource $WM_PROJECT_DIR/etc/aliases.csh
-+# _foamSource $WM_PROJECT_DIR/etc/aliases.csh
- 
- # Source user setup files for optional packages
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
--_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
-+# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
- # _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
- 
- 
-diff -urN OpenFOAM-1.6-src/etc/settings.csh OpenFOAM-1.6/etc/settings.csh
---- OpenFOAM-1.6-src/etc/settings.csh	2009-07-23 18:31:28.000000000 +0200
-+++ OpenFOAM-1.6/etc/settings.csh	2009-08-06 10:46:06.000000000 +0200
-@@ -37,27 +37,27 @@
- alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
- 
- # location of the jobControl directory
--setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
-+setenv FOAM_JOB_DIR $HOME/$WM_PROJECT/jobControl
- 
- # wmake configuration
- setenv WM_DIR $WM_PROJECT_DIR/wmake
- setenv WM_LINK_LANGUAGE c++
--setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
-+setenv WM_OPTIONS $WM_ARCH$WM_COMPILER
- 
- # base configuration
- setenv FOAM_APP $WM_PROJECT_DIR/applications
--setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
-+setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin
- setenv FOAM_LIB $WM_PROJECT_DIR/lib
--setenv FOAM_LIBBIN $WM_PROJECT_DIR/lib/$WM_OPTIONS
-+setenv FOAM_LIBBIN $WM_PROJECT_DIR/lib
- setenv FOAM_SRC $WM_PROJECT_DIR/src
- 
- # shared site configuration - similar naming convention as ~OpenFOAM expansion
--setenv FOAM_SITE_APPBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS
--setenv FOAM_SITE_LIBBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS
-+setenv FOAM_SITE_APPBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin
-+setenv FOAM_SITE_LIBBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib
- 
- # user configuration
--setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
--setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
-+setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin
-+setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib
- 
- # convenience
- setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
-@@ -79,7 +79,7 @@
- # Select compiler installation
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- # compilerInstall = OpenFOAM | System
--set compilerInstall=OpenFOAM
-+set compilerInstall=System
- 
- switch ("$compilerInstall")
- case OpenFOAM:
-@@ -124,30 +124,30 @@
- 
- switch ("$WM_MPLIB")
- case OPENMPI:
--    set mpi_version=openmpi-1.3.3
--    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
--    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
-+    set mpi_version=openmpi
-+#     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
-+    setenv MPI_ARCH_PATH /usr
- 
-     # Tell OpenMPI where to find its install directory
-     setenv OPAL_PREFIX $MPI_ARCH_PATH
- 
--    _foamAddPath $MPI_ARCH_PATH/bin
--    _foamAddLib  $MPI_ARCH_PATH/lib
-+#     _foamAddPath $MPI_ARCH_PATH/bin
-+#     _foamAddLib  $MPI_ARCH_PATH/lib
- 
--    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
-+    setenv FOAM_MPI_LIBBIN $FOAM_LIB/$mpi_version
-     unset mpi_version
-     breaksw
- 
- case MPICH:
--    set mpi_version=mpich-1.2.4
--    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
--    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
-+    set mpi_version=mpich
-+#     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
-+    setenv MPI_ARCH_PATH /usr
-     setenv MPICH_ROOT $MPI_ARCH_PATH
- 
--    _foamAddPath $MPI_ARCH_PATH/bin
--    _foamAddLib  $MPI_ARCH_PATH/lib
-+#     _foamAddPath $MPI_ARCH_PATH/bin
-+#     _foamAddLib  $MPI_ARCH_PATH/lib
- 
--    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
-+    setenv FOAM_MPI_LIBBIN $FOAM_LIB/$mpi_version
-     unset mpi_version
-     breaksw
- 
-diff -urN OpenFOAM-1.6-src/etc/settings.sh OpenFOAM-1.6/etc/settings.sh
---- OpenFOAM-1.6-src/etc/settings.sh	2009-07-23 18:31:28.000000000 +0200
-+++ OpenFOAM-1.6/etc/settings.sh	2009-08-06 10:38:07.000000000 +0200
-@@ -53,27 +53,27 @@
- 
- 
- # location of the jobControl directory
--export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl
-+export FOAM_JOB_DIR=$HOME/$WM_PROJECT/jobControl
- 
- # wmake configuration
- export WM_DIR=$WM_PROJECT_DIR/wmake
- export WM_LINK_LANGUAGE=c++
--export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
-+export WM_OPTIONS=$WM_ARCH$WM_COMPILER
- 
- # base configuration
- export FOAM_APP=$WM_PROJECT_DIR/applications
--export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
-+export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin
- export FOAM_LIB=$WM_PROJECT_DIR/lib
--export FOAM_LIBBIN=$WM_PROJECT_DIR/lib/$WM_OPTIONS
-+export FOAM_LIBBIN=$WM_PROJECT_DIR/lib
- export FOAM_SRC=$WM_PROJECT_DIR/src
- 
- # shared site configuration - similar naming convention as ~OpenFOAM expansion
--export FOAM_SITE_APPBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS
--export FOAM_SITE_LIBBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS
-+export FOAM_SITE_APPBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin
-+export FOAM_SITE_LIBBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib
- 
- # user configuration
--export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
--export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
-+export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin
-+export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib
- 
- # convenience
- export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
-@@ -95,7 +95,7 @@
- # Select compiler installation
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- # compilerInstall = OpenFOAM | System
--compilerInstall=OpenFOAM
-+compilerInstall=System
- 
- case "${compilerInstall:-OpenFOAM}" in
- OpenFOAM)
-@@ -146,30 +146,30 @@
- 
- case "$WM_MPLIB" in
- OPENMPI)
--    mpi_version=openmpi-1.3.3
--    export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
--    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
-+    mpi_version=openmpi
-+#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
-+    export MPI_ARCH_PATH=/usr
- 
-     # Tell OpenMPI where to find its install directory
-     export OPAL_PREFIX=$MPI_ARCH_PATH
- 
--    _foamAddPath $MPI_ARCH_PATH/bin
--    _foamAddLib  $MPI_ARCH_PATH/lib
-+#     _foamAddPath $MPI_ARCH_PATH/bin
-+#     _foamAddLib  $MPI_ARCH_PATH/lib
- 
--    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
-+    export FOAM_MPI_LIBBIN=$FOAM_LIB/$mpi_version
-     unset mpi_version
-     ;;
- 
- MPICH)
--    mpi_version=mpich-1.2.4
--    export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
--    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
-+    mpi_version=mpich
-+#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
-+    export MPI_ARCH_PATH=/usr
-     export MPICH_ROOT=$MPI_ARCH_PATH
- 
--    _foamAddPath $MPI_ARCH_PATH/bin
--    _foamAddLib  $MPI_ARCH_PATH/lib
-+#     _foamAddPath $MPI_ARCH_PATH/bin
-+#     _foamAddLib  $MPI_ARCH_PATH/lib
- 
--    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
-+    export FOAM_MPI_LIBBIN=$FOAM_LIB/$mpi_version
-     unset mpi_version
-     ;;
- 
-diff -urN OpenFOAM-1.6-src/src/decompositionMethods/decompositionMethods/Make/options OpenFOAM-1.6/src/decompositionMethods/decompositionMethods/Make/options
---- OpenFOAM-1.6-src/src/decompositionMethods/decompositionMethods/Make/options	2009-04-24 08:56:28.000000000 +0200
-+++ OpenFOAM-1.6/src/decompositionMethods/decompositionMethods/Make/options	2009-08-06 13:50:29.000000000 +0200
-@@ -1,8 +1,7 @@
- EXE_INC = \
--    -I$(WM_THIRD_PARTY_DIR)/scotch_5.1/src/libscotch/lnInclude \
--    -I$(WM_THIRD_PARTY_DIR)/metis-5.0pre2/include
-+    -I/usr/include/scotch \
-+    -I/usr/include/metis
- 
- LIB_LIBS = \
-     -lscotch \
--    -lmetis \
--    -lGKlib
-+    -lmetis
-diff -urN OpenFOAM-1.6-src/src/decompositionMethods/parMetisDecomp/Make/options OpenFOAM-1.6/src/decompositionMethods/parMetisDecomp/Make/options
---- OpenFOAM-1.6-src/src/decompositionMethods/parMetisDecomp/Make/options	2009-04-02 15:00:31.000000000 +0200
-+++ OpenFOAM-1.6/src/decompositionMethods/parMetisDecomp/Make/options	2009-08-06 11:00:53.000000000 +0200
-@@ -2,11 +2,11 @@
- 
- EXE_INC = \
-     $(PFLAGS) $(PINC) \
--    -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1/ParMETISLib \
--    -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1 \
-+    -I/usr/include/parmetis \
-+    -I/usr/include/metis \
-     -I../decompositionMethods/lnInclude
- 
- LIB_LIBS = \
-     -L$(FOAM_MPI_LIBBIN) \
--    -lmetis-parmetis \
-+    -lmetis \
-     -lparmetis
-diff -urN OpenFOAM-1.6-src/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options OpenFOAM-1.6/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
---- OpenFOAM-1.6-src/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options	2009-07-03 11:54:30.000000000 +0200
-+++ OpenFOAM-1.6/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options	2009-08-06 11:02:21.000000000 +0200
-@@ -1,5 +1,3 @@
--ParMGridGen = $(WM_THIRD_PARTY_DIR)/ParMGridGen-1.0
--
- TYPE_REAL=
- #if defined(WM_SP)
- TYPE_REAL=-DTYPE_REAL
-@@ -7,9 +5,9 @@
- 
- EXE_INC = \
-     -I$(LIB_SRC)/finiteVolume/lnInclude \
--    -I$(ParMGridGen)/MGridGen/Lib/lnInclude \
--    -I$(ParMGridGen)/MGridGen/IMlib/lnInclude \
-+    -I/usr/include/mgridgen \
-     $(TYPE_REAL)
- 
- LIB_LIBS = \
-+    -lIMlib \
-     -lMGridGen
-diff -urN OpenFOAM-1.6-src/wmake/Makefile OpenFOAM-1.6/wmake/Makefile
---- OpenFOAM-1.6-src/wmake/Makefile	2009-07-21 20:06:59.000000000 +0200
-+++ OpenFOAM-1.6/wmake/Makefile	2009-08-06 10:47:17.000000000 +0200
-@@ -58,7 +58,7 @@
- 
- LIB_SRC            = $(WM_PROJECT_DIR)/src
- LIB_DIR            = $(WM_PROJECT_DIR)/lib
--LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS)
-+LIB_WM_OPTIONS_DIR = $(LIB_DIR)
- OBJECTS_DIR        = $(MAKE_DIR)/$(WM_OPTIONS)
- CLASSES_DIR        = $(MAKE_DIR)/classes
- 
-diff -urN OpenFOAM-1.6-src/bin/foamInstallationTest OpenFOAM-1.6/bin/foamInstallationTest
---- OpenFOAM-1.6-src/bin/foamInstallationTest	2009-07-27 13:31:34.000000000 +0200
-+++ OpenFOAM-1.6/bin/foamInstallationTest	2009-08-06 18:19:44.000000000 +0200
-@@ -383,7 +383,7 @@
- 
- 
- checkOpenFOAMEnvironment() {
--    [ -d "$WM_PROJECT_INST_DIR" ] && [ -d "$WM_THIRD_PARTY_DIR" ] || {
-+    [ -d "$WM_PROJECT_INST_DIR" ] || {
-         echo ""
-         echo "FATAL ERROR: OpenFOAM environment not configured."
-         echo ""
diff --git a/sci-libs/openfoam-src/openfoam-src-1.5_p20090311.ebuild b/sci-libs/openfoam-src/openfoam-src-1.5_p20090311.ebuild
index 55336707974e..05689e602128 100644
--- a/sci-libs/openfoam-src/openfoam-src-1.5_p20090311.ebuild
+++ b/sci-libs/openfoam-src/openfoam-src-1.5_p20090311.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-src/openfoam-src-1.5_p20090311.ebuild,v 1.1 2009/04/25 16:26:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-src/openfoam-src-1.5_p20090311.ebuild,v 1.2 2009/09/25 09:30:00 flameeyes Exp $
 
 EAPI="2"
 
@@ -14,7 +14,8 @@ DESCRIPTION="OpenFOAM - sources"
 HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
 SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz -> ${MY_P}.General.tgz
 	http://omploader.org/vMWRlMQ/${MY_PN}-git-${PVR}.patch
-	http://omploader.org/vMWRlMA/${MY_P}-svn.patch"
+	http://omploader.org/vMWRlMA/${MY_P}-svn.patch
+	mirror://gentoo/${MY_P}-compile-2.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.5"
@@ -28,7 +29,7 @@ S=${WORKDIR}/${MY_P}
 INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${MY_P}-compile.patch
+	epatch "${DISTDIR}"/${MY_P}-compile-2.patch.bz2
 	epatch "${DISTDIR}"/${MY_P}-svn.patch
 	epatch "${DISTDIR}"/${MY_PN}-git-${PVR}.patch
 	epatch "${FILESDIR}"/${MY_P}-ggi.patch
diff --git a/sci-libs/openfoam-src/openfoam-src-1.6.ebuild b/sci-libs/openfoam-src/openfoam-src-1.6.ebuild
index 9dc854bdd1bb..69443e2224c4 100644
--- a/sci-libs/openfoam-src/openfoam-src-1.6.ebuild
+++ b/sci-libs/openfoam-src/openfoam-src-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-src/openfoam-src-1.6.ebuild,v 1.1 2009/09/18 09:12:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-src/openfoam-src-1.6.ebuild,v 1.2 2009/09/25 09:30:00 flameeyes Exp $
 
 EAPI="2"
 
@@ -12,7 +12,8 @@ MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="OpenFOAM - sources"
 HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
-SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz -> ${MY_P}.General.tgz"
+SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz -> ${MY_P}.General.tgz
+	mirror://gentoo/${MY_P}-compile.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.6"
@@ -26,7 +27,7 @@ S=${WORKDIR}/${MY_P}
 INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${MY_P}-compile.patch
+	epatch "${DISTDIR}"/${MY_P}-compile.patch.bz2
 }
 
 src_install() {