diff options
author | Oliver Borm (oli) <oli.borm@web.de> | 2008-07-22 22:24:32 +0000 |
---|---|---|
committer | Oliver Borm (oli) <oli.borm@web.de> | 2008-07-22 22:24:32 +0000 |
commit | 6d2713d0c4e354119763e474ce9b1ff7f5c563b2 (patch) | |
tree | 7a2ef814d3858b757f9ee845974c2273123d7a7a | |
parent | sci-libs/openfoam-solvers: Version bump to 1.5 (diff) | |
download | sunrise-6d2713d0c4e354119763e474ce9b1ff7f5c563b2.tar.gz sunrise-6d2713d0c4e354119763e474ce9b1ff7f5c563b2.tar.bz2 sunrise-6d2713d0c4e354119763e474ce9b1ff7f5c563b2.zip |
sci-libs/openfoam-utilities: Version bump to 1.5
svn path=/sunrise/; revision=6552
-rw-r--r-- | sci-libs/openfoam-utilities/ChangeLog | 4 | ||||
-rw-r--r-- | sci-libs/openfoam-utilities/Manifest | 5 | ||||
-rw-r--r-- | sci-libs/openfoam-utilities/files/OpenFOAM-1.5-compile.patch | 436 | ||||
-rw-r--r-- | sci-libs/openfoam-utilities/openfoam-utilities-1.5.ebuild | 73 |
4 files changed, 517 insertions, 1 deletions
diff --git a/sci-libs/openfoam-utilities/ChangeLog b/sci-libs/openfoam-utilities/ChangeLog index b01934313..9d1c21a0d 100644 --- a/sci-libs/openfoam-utilities/ChangeLog +++ b/sci-libs/openfoam-utilities/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Jul 2008; Oliver Borm (boroli) <oli.borm@web.de> + +openfoam-utilities-1.5.ebuild, +files/OpenFOAM-1.5-compile.patch: + Version bump to 1.5 + 22 Apr 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> openfoam-utilities-1.4.1_p20080328.ebuild: Fix dep diff --git a/sci-libs/openfoam-utilities/Manifest b/sci-libs/openfoam-utilities/Manifest index 2d062a41d..8806940b9 100644 --- a/sci-libs/openfoam-utilities/Manifest +++ b/sci-libs/openfoam-utilities/Manifest @@ -1,6 +1,9 @@ +AUX OpenFOAM-1.5-compile.patch 15006 RMD160 ba8423526b5244e3c30d9d38830a2fe79e3c2a1a SHA1 7d275039cea1fe8a3c28fafeda1fef3665360f83 SHA256 6cb940b6c559a846ec65184db8f7c7966d1bef105d5bdad6ca4afd3f1b4d5b89 AUX openfoam-utilities-1.4.1_p20080328.patch 6357 RMD160 4022b04557ba6d7da87a7c44e26f300a77a922b2 SHA1 98c40c041ce5c04c1f3df1a5f07f85d91cb69ef4 SHA256 a4187c759e84a166b9fccbda4dcdad6f25c7b29da01a34209b4771394a4be11f AUX openfoam-utilities-compile-1.4.1_p20080328.patch 996 RMD160 0debfeb112bed547317d8d61a3fbdae1490050ba SHA1 87c9b4ace94e4eb7b0c16a39e041ec72fca7877e SHA256 1e6062ff63e4367067c229cc8348f5bbd5e6e96f2b9f109bbacb73f3f16310d5 DIST OpenFOAM-1.4.1.General.gtgz 148526808 RMD160 e25d8bdfa63f15eeeb7b9f1cef09cc26fb7bef74 SHA1 56bbbf5b33c49d08cda35088a65b24d7dc59014f SHA256 c765b36639b42c737bc9ba1ac13c0f66efe20ee4a9f71a6ef987e86ebd50da28 +DIST OpenFOAM-1.5.General.gtgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31 EBUILD openfoam-utilities-1.4.1_p20080328.ebuild 4309 RMD160 96f6a2f718165dad1e0fad0256dd957e60c503dc SHA1 66c1d32b662048e1e0112a3c3fadfa943fd84991 SHA256 6754bf31cc700a26834469955882ed76d6b7e343bac8e1ba104e50a364752715 -MISC ChangeLog 1150 RMD160 d021f1feaaa028e0a02b974f761797f2e6f18e83 SHA1 9e648ccfe6325ad639d6da63d99338c3678dd354 SHA256 ad97589c8171c46d9d39b1af9211ef5a5e0fd7745de5bf79477e72b726ccb185 +EBUILD openfoam-utilities-1.5.ebuild 2134 RMD160 e68d036f4100a40e8119d28ee1e75e0918304e3e SHA1 409152f16d6c1960d020e2d14def20b629516ec3 SHA256 39f99e7d2a6147e7925936f99c121e793c291f941b5209b40b8d2b215f684f1f +MISC ChangeLog 1296 RMD160 9e68fa412c615dcc9e7b6f9530f68cdb9cc19835 SHA1 3f328c5d4332727cfd9fd419b2956a5f0c82b554 SHA256 76a6cf3244cfa9f54cadb6d6e0bedb67614fe2128fcb99ed1ed0a41e3848fecd MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/sci-libs/openfoam-utilities/files/OpenFOAM-1.5-compile.patch b/sci-libs/openfoam-utilities/files/OpenFOAM-1.5-compile.patch new file mode 100644 index 000000000..4479cb384 --- /dev/null +++ b/sci-libs/openfoam-utilities/files/OpenFOAM-1.5-compile.patch @@ -0,0 +1,436 @@ +--- 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 +--- OpenFOAM-1.5-src/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C 2008-07-09 10:43:41.000000000 +0200 ++++ OpenFOAM-1.5/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C 2008-07-21 22:02:55.000000000 +0200 +@@ -240,6 +240,7 @@ + // ~~~~~~~~~~~~~~~~~~~~~~~~~ + // Only look at surface intersections (minLevel and surface curvature), + // do not do internal refinement (refinementShells) ++PtrList<featureEdgeMesh> dummy(0); + + labelList candidateCells + ( +@@ -248,7 +249,8 @@ + refineParams.keepPoints()[0], + refineParams.curvature(), + +- PtrList<featureEdgeMesh>(0), // dummy featureMeshes; ++// PtrList<featureEdgeMesh>(0), // dummy featureMeshes; ++dummy, //dummy featureMeshes; + labelList(0), // dummy featureLevels; + + false, // featureRefinement +@@ -382,6 +384,8 @@ + << "----------------------------" << nl + << endl; + ++PtrList<featureEdgeMesh> dummy(0); ++ + labelList candidateCells + ( + meshRefiner_.refineCandidates +@@ -389,7 +393,8 @@ + refineParams.keepPoints()[0], + refineParams.curvature(), + +- PtrList<featureEdgeMesh>(0), // dummy featureMeshes; ++// PtrList<featureEdgeMesh>(0), // dummy featureMeshes; ++dummy, // dummy featureMeshes; + labelList(0), // dummy featureLevels; + + false, // featureRefinement diff --git a/sci-libs/openfoam-utilities/openfoam-utilities-1.5.ebuild b/sci-libs/openfoam-utilities/openfoam-utilities-1.5.ebuild new file mode 100644 index 000000000..d2fa3ad16 --- /dev/null +++ b/sci-libs/openfoam-utilities/openfoam-utilities-1.5.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils versionator multilib toolchain-funcs + +MY_PN="OpenFOAM" +MY_PV=$(get_version_component_range 1-2) +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="OpenFOAM - utilities" +HOMEPAGE="http://www.opencfd.co.uk/openfoam/" +SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz" + +LICENSE="GPL-2" +SLOT="1.5" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="!sci-libs/openfoam + !sci-libs/openfoam-bin + >=sci-libs/openfoam-solvers-${MY_PV}" + +S="${WORKDIR}"/${MY_P} +INSDIR=/usr/$(get_libdir)/${MY_PN}/${MY_P} + +pkg_setup() { + if ! version_is_at_least 4.1 $(gcc-version) ; then + die "${PN} requires >=sys-devel/gcc-4.1 to compile." + fi +} + +src_unpack() { + ln -s "${DISTDIR}"/${MY_P}.General.gtgz ${MY_P}.General.tgz + unpack ./${MY_P}.General.tgz + + cd "${S}" + epatch "${FILESDIR}"/${MY_P}-compile.patch +} + +src_compile() { + cp -a ${INSDIR}/etc/{bashrc,settings.sh} "${S}"/etc/. || die "cannot copy bashrc" + + # This is a hack, due to the meta ebuild: + sed -i -e "s|FOAM_LIB=\$WM_PROJECT_DIR/lib|FOAM_LIB=${INSDIR}/lib|" \ + -e "s|FOAM_LIBBIN=\$FOAM_LIB|FOAM_LIBBIN=\$WM_PROJECT_DIR/lib|" \ + -e "s|_foamAddLib \$FOAM_USER_LIBBIN|_foamAddLib \$FOAM_LIB|" \ + etc/settings.sh || die "could not replace paths" + + sed -i -e "s|-L\$(LIB_WM_OPTIONS_DIR)|-L\$(LIB_WM_OPTIONS_DIR) -L${INSDIR}/lib|" \ + wmake/Makefile || die "could not replace search paths" + + sed -i -e "s|(FOAM_LIBBIN)|(FOAM_LIB)|" applications/utilities/postProcessing/velocityField/{flowType,Pe,uprime,vorticity,enstrophy,Q,Co,Lambda2,Mach}/Make/options || die "cannot change LIB dir" + sed -i -e "s|(FOAM_LIBBIN)|(FOAM_LIB)|" applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options || die "cannot change LIB dir" + + export FOAM_INST_DIR="${WORKDIR}" + source etc/bashrc + + cd wmake/src + make + + cd applications/utilities + wmake all || die "could not build OpenFOAM utilities" +} + +src_install() { + insopts -m0755 + insinto ${INSDIR}/applications/bin + doins -r applications/bin/* + + insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/lib + doins -r lib/* +} |