+++ /dev/null
-diff -ur OpenFOAM-1.4.1-src/src/Allwmake OpenFOAM-1.4.1/src/Allwmake
---- OpenFOAM-1.4.1-src/src/Allwmake 2007-07-27 17:54:28.000000000 +0200
-+++ OpenFOAM-1.4.1/src/Allwmake 2007-10-18 21:04:12.000000000 +0200
-@@ -3,103 +3,103 @@
-
- (cd $FOAM_SRC/OpenFOAM ; wmakeLnInclude . )
-
--wmake libso zlib-1.2.1
--
--if [ "$WM_MPLIB" = "OPENMPI" -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.a -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.so ]
--then
--
-- cd $OPENMPI_HOME
--
-- gmake distclean
-- rm -rf $OPENMPI_ARCH_PATH
--
-- ./configure \
-- --prefix=$OPENMPI_ARCH_PATH \
-- --disable-mpirun-prefix-by-default \
-- --disable-orterun-prefix-by-default \
-- --enable-shared --disable-static \
-- --disable-mpi-f77 --disable-mpi-f90 --disable-mpi-cxx \
-- --disable-mpi-profile
--
-- gmake
-- gmake install
-- gmake distclean
--
-- cd $FOAM_SRC
--fi
--
--if [ "$WM_MPLIB" = "LAM" -a ! -r $LAM_ARCH_PATH/lib/libmpi.a -a ! -r $LAM_ARCH_PATH/lib/libmpi.so ]
--then
--
-- cd $LAMHOME
--
-- gmake distclean
-- rm -rf $LAM_ARCH_PATH
--
-- ./configure \
-- --prefix=$LAM_ARCH_PATH \
-- --enable-shared \
-- --disable-static \
-- --without-romio \
-- --without-mpi2cpp \
-- --without-profiling \
-- --without-fc
--
-- gmake
-- gmake install
-- gmake distclean
--
-- cd $FOAM_SRC
--fi
--
--if [ "$WM_MPLIB" = "MPICH" -a ! -r $MPICH_ARCH_PATH/lib/libmpich.a -a ! -r $MPICH_ARCH_PATH/lib/libmpich.so ]
--then
--
-- cd $MPICH_PATH
--
-- make distclean
-- rm -rf $MPICH_ARCH_PATH
-- rm util/machines/machines.*
--
-- ./configure \
-- --without-mpe \
-- --disable-f77 \
-- --disable-f90 \
-- --disable-f90modules \
-- --disable-c++ \
-- --disable-mpedbg \
-- --disable-devdebug \
-- --disable-debug \
-- --enable-sharedlib=$MPICH_ARCH_PATH/lib \
-- --with-device=ch_p4 \
-- -prefix=$MPICH_ARCH_PATH
-- make
-- make install
-- make distclean
--
-- if [ -r $MPICH_ARCH_PATH ]
-- then
-- cd $MPICH_ARCH_PATH/bin
-- for file in *
-- do
-- sed s%$MPICH_ARCH_PATH%'$MPICH_ARCH_PATH'%g $file > temp.$$
-- mv temp.$$ $file
-- chmod ugo+rx $file
-- done
--
-- cd $MPICH_ARCH_PATH/lib
--
-- if [ -r libmpich.so.1.0 ]
-- then
-- rm *.so
-- ln -s libmpich.so.1.0 libmpich.so
-- fi
--
-- cd $MPICH_ARCH_PATH
-- fi
--
-- cd $FOAM_SRC
--fi
-+# wmake libso zlib-1.2.1
-+#
-+# if [ "$WM_MPLIB" = "OPENMPI" -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.a -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.so ]
-+# then
-+#
-+# cd $OPENMPI_HOME
-+#
-+# gmake distclean
-+# rm -rf $OPENMPI_ARCH_PATH
-+#
-+# ./configure \
-+# --prefix=$OPENMPI_ARCH_PATH \
-+# --disable-mpirun-prefix-by-default \
-+# --disable-orterun-prefix-by-default \
-+# --enable-shared --disable-static \
-+# --disable-mpi-f77 --disable-mpi-f90 --disable-mpi-cxx \
-+# --disable-mpi-profile
-+#
-+# gmake
-+# gmake install
-+# gmake distclean
-+#
-+# cd $FOAM_SRC
-+# fi
-+#
-+# if [ "$WM_MPLIB" = "LAM" -a ! -r $LAM_ARCH_PATH/lib/libmpi.a -a ! -r $LAM_ARCH_PATH/lib/libmpi.so ]
-+# then
-+#
-+# cd $LAMHOME
-+#
-+# gmake distclean
-+# rm -rf $LAM_ARCH_PATH
-+#
-+# ./configure \
-+# --prefix=$LAM_ARCH_PATH \
-+# --enable-shared \
-+# --disable-static \
-+# --without-romio \
-+# --without-mpi2cpp \
-+# --without-profiling \
-+# --without-fc
-+#
-+# gmake
-+# gmake install
-+# gmake distclean
-+#
-+# cd $FOAM_SRC
-+# fi
-+#
-+# if [ "$WM_MPLIB" = "MPICH" -a ! -r $MPICH_ARCH_PATH/lib/libmpich.a -a ! -r $MPICH_ARCH_PATH/lib/libmpich.so ]
-+# then
-+#
-+# cd $MPICH_PATH
-+#
-+# make distclean
-+# rm -rf $MPICH_ARCH_PATH
-+# rm util/machines/machines.*
-+#
-+# ./configure \
-+# --without-mpe \
-+# --disable-f77 \
-+# --disable-f90 \
-+# --disable-f90modules \
-+# --disable-c++ \
-+# --disable-mpedbg \
-+# --disable-devdebug \
-+# --disable-debug \
-+# --enable-sharedlib=$MPICH_ARCH_PATH/lib \
-+# --with-device=ch_p4 \
-+# -prefix=$MPICH_ARCH_PATH
-+# make
-+# make install
-+# make distclean
-+#
-+# if [ -r $MPICH_ARCH_PATH ]
-+# then
-+# cd $MPICH_ARCH_PATH/bin
-+# for file in *
-+# do
-+# sed s%$MPICH_ARCH_PATH%'$MPICH_ARCH_PATH'%g $file > temp.$$
-+# mv temp.$$ $file
-+# chmod ugo+rx $file
-+# done
-+#
-+# cd $MPICH_ARCH_PATH/lib
-+#
-+# if [ -r libmpich.so.1.0 ]
-+# then
-+# rm *.so
-+# ln -s libmpich.so.1.0 libmpich.so
-+# fi
-+#
-+# cd $MPICH_ARCH_PATH
-+# fi
-+#
-+# cd $FOAM_SRC
-+# fi
-
- (cd Pstream ; ./Allwmake)
- wmake libso OpenFOAM
-diff -ur OpenFOAM-1.4.1-src/wmake/rules/General/flex++ OpenFOAM-1.4.1/wmake/rules/General/flex++
---- OpenFOAM-1.4.1-src/wmake/rules/General/flex++ 2006-08-18 17:35:12.000000000 +0200
-+++ OpenFOAM-1.4.1/wmake/rules/General/flex++ 2007-10-28 17:38:46.000000000 +0100
-@@ -1,6 +1,6 @@
- .SUFFIXES: .L
-
--Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
-+Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
-
- .L.dep:
- $(MAKE_DEP)
-diff -ur OpenFOAM-1.4.1-src/wmake/rules/General/flex++.test OpenFOAM-1.4.1/wmake/rules/General/flex++.test
---- OpenFOAM-1.4.1-src/wmake/rules/General/flex++.test 2007-03-13 17:27:58.000000000 +0100
-+++ OpenFOAM-1.4.1/wmake/rules/General/flex++.test 2007-10-28 17:39:09.000000000 +0100
-@@ -1,6 +1,6 @@
- .SUFFIXES: .L
-
--Ltoo = flex++ $$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)
-diff -ur OpenFOAM-1.4.1-src/src/Allwmake OpenFOAM-1.4.1/src/Allwmake
---- OpenFOAM-1.4.1-src/src/Allwmake 2007-07-27 17:54:28.000000000 +0200
-+++ OpenFOAM-1.4.1/src/Allwmake 2007-10-18 21:04:12.000000000 +0200
-@@ -141,13 +141,13 @@
-
- (cd malloc ; ./Allwmake)
-
--if [ ! -r $MICO_ARCH_PATH/lib/libmico${MICO_VERSION}.a ]
--then
-- cd $MICO_PATH
-- gmake distclean
-- ./configure --prefix=$MICO_ARCH_PATH --disable-shared --without-x
-- gmake
-- gmake install
-- gmake distclean
-- cd ..
--fi
-+# if [ ! -r $MICO_ARCH_PATH/lib/libmico${MICO_VERSION}.a ]
-+# then
-+# cd $MICO_PATH
-+# gmake distclean
-+# ./configure --prefix=$MICO_ARCH_PATH --disable-shared --without-x
-+# gmake
-+# gmake install
-+# gmake distclean
-+# cd ..
-+# fi
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils java-pkg-2 versionator multilib toolchain-funcs
-
-MY_PN="OpenFOAM"
-MY_PV=$(get_version_component_range 1-3 ${PV})
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
-HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
-SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz
- x86? ( mirror://sourceforge/foam/${MY_P}.linuxGccDPOpt.gtgz )
- amd64? ( mirror://sourceforge/foam/${MY_P}.linux64GccDPOpt.gtgz )
- http://dev.gentooexperimental.org/~jokey/sunrise-dist/${P}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="examples lam mpich"
-
-DEPEND="!=sci-libs/openfoam-${MY_PV}*
- !=sci-libs/openfoam-kernel-${MY_PV}*
- !=sci-libs/openfoam-meta-${MY_PV}*
- !=sci-libs/openfoam-solvers-${MY_PV}*
- !=sci-libs/openfoam-utilities-${MY_PV}*
- !=sci-libs/openfoam-wmake-${MY_PV}*
- =dev-java/sun-java3d-bin-1.4*
- net-misc/mico
- <virtual/jdk-1.5
- || ( >sci-visualization/paraview-3.0 sci-visualization/opendx )
- !mpich? ( !lam? ( sys-cluster/openmpi ) )
- lam? ( sys-cluster/lam-mpi )
- mpich? ( sys-cluster/mpich2 )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use lam && use mpich ; then
- die "Please choose only one MPI implementation as default."
- fi
-
- if ! version_is_at_least 4.2 $(gcc-version) ; then
- die "${MY_P} requires >=sys-devel/gcc-4.2 for execution."
- fi
-
- if use amd64 ; then
- elog
- elog "In order to use OpenFOAM you should add the following lines to ~/.bashrc :"
- elog 'WM_64="on"'
- elog "source /usr/$(get_libdir)/OpenFOAM/bashrc"
- else
- elog
- elog "In order to use OpenFOAM you should add the following line to ~/.bashrc :"
- elog "source /usr/$(get_libdir)/OpenFOAM/bashrc"
- fi
-
- elog
- elog "In order to get FoamX running, you have to do the following: "
- elog "mkdir -p ~/.${MY_P}/apps "
- elog "cp -r /usr/$(get_libdir)/${MY_PN}/${MY_P}/.${MY_P}/apps/FoamX ~/.${MY_P}/apps "
- elog
-
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- ln -s "${DISTDIR}"/${MY_P}.General.gtgz ${MY_P}.General.tgz
- unpack ./${MY_P}.General.tgz
-
- use x86 && ln -s "${DISTDIR}"/${MY_P}.linuxGccDPOpt.gtgz ${MY_P}.binary.tgz
- use amd64 && ln -s "${DISTDIR}"/${MY_P}.linux64GccDPOpt.gtgz ${MY_P}.binary.tgz
- unpack ./${MY_P}.binary.tgz
-
- cd "${S}"
- epatch "${DISTDIR}"/${P}.patch.bz2
- epatch "${FILESDIR}"/compile-${MY_PV}.patch
-}
-
-src_compile() {
- use amd64 && export WM_64="on"
-
- if use lam ; then
- export WM_MPLIB=LAM
- elif use mpich ; then
- export WM_MPLIB=MPICH
- else
- export WM_MPLIB=OPENMPI
- fi
-
- sed -i -e "s|WM_PROJECT_VERSION=|WM_PROJECT_VERSION=${MY_PV} #|" \
- -e "s|export WM_PROJECT_INST_DIR=\$HOME/\$WM_PROJECT|# export WM_PROJECT_INST_DIR=\$HOME/\$WM_PROJECT|" \
- -e "s|#export WM_PROJECT_INST_DIR=/usr/local/\$WM_PROJECT|export WM_PROJECT_INST_DIR=/usr/$(get_libdir)/\$WM_PROJECT|" \
- -e "s|[^#]export WM_MPLIB=| #export WM_MPLIB=|" \
- -e "s|#export WM_MPLIB=$|export WM_MPLIB="${WM_MPLIB}"|" \
- -e "s|SOURCE \$WM_PROJECT_DIR/\$FOAM_DOT_DIR/apps|#SOURCE \$WM_PROJECT_DIR/\$FOAM_DOT_DIR/apps|" \
- "${S}"/.${MY_P}/bashrc
-
- sed -i -e "s|WM_PROJECT_VERSION |WM_PROJECT_VERSION ${MY_PV} #|" \
- -e "s|setenv WM_PROJECT_INST_DIR \$HOME/\$WM_PROJECT|# setenv WM_PROJECT_INST_DIR \$HOME/\$WM_PROJECT|" \
- -e "s|#setenv WM_PROJECT_INST_DIR /usr/local/\$WM_PROJECT|setenv WM_PROJECT_INST_DIR /usr/$(get_libdir)/\$WM_PROJECT|" \
- -e "s|[^#]setenv WM_MPLIB | #setenv WM_MPLIB |" \
- -e "s|#setenv WM_MPLIB OPENMPI|setenv WM_MPLIB "${WM_MPLIB}"|" \
- -e "s|SOURCE \$WM_PROJECT_DIR/\$FOAM_DOT_DIR/apps|#SOURCE \$WM_PROJECT_DIR/\$FOAM_DOT_DIR/apps|" \
- "${S}"/.${MY_P}/cshrc
-
- sed -i -e "s|FOAM_JOB_DIR=\$WM_PROJECT_INST_DIR/jobControl|FOAM_JOB_DIR=\$HOME/\$WM_PROJECT/jobControl|" \
- -e "s|WM_COMPILER_DIR=|WM_COMPILER_DIR=/usr # |" \
- -e 's|JAVA_HOME=|JAVA_HOME=${JAVA_HOME} # |' \
- -e 's|[^#]export OPENMPI_HOME=|# export OPENMPI_HOME=|' \
- -e 's|OPENMPI_ARCH_PATH=|OPENMPI_ARCH_PATH=/usr # |' \
- -e 's|[^#]export LAMHOME=|# export LAMHOME=|' \
- -e 's|LAM_ARCH_PATH=|LAM_ARCH_PATH=/usr # |' \
- -e 's|[^#]export MPICH_PATH=$FOAM_SRC|# export MPICH_PATH=$FOAM_SRC|' \
- -e 's|MPICH_ARCH_PATH=|MPICH_ARCH_PATH=/usr # |' \
- -e 's|AddLib $OPENMPI_ARCH_PATH|# AddLib $OPENMPI_ARCH_PATH|' \
- -e 's|AddPath $OPENMPI_ARCH_PATH|# AddPath $OPENMPI_ARCH_PATH|' \
- -e 's|AddLib $LAM_ARCH_PATH|# AddLib $LAM_ARCH_PATH|' \
- -e 's|AddPath $LAM_ARCH_PATH|# AddPath $LAM_ARCH_PATH|' \
- -e 's|AddLib $MPICH_ARCH_PATH|# AddLib $MPICH_ARCH_PATH|' \
- -e 's|AddPath $MPICH_ARCH_PATH|# AddPath $MPICH_ARCH_PATH|' \
- -e 's|MICO_VERSION=|MICO_VERSION=`/usr/bin/mico-config --version` # |' \
- -e "s|[^#]export MICO_PATH=|# export MICO_PATH=|" \
- -e "s|MICO_ARCH_PATH=|MICO_ARCH_PATH=/usr # |" \
- "${S}"/.bashrc
-
- sed -i -e "s|FOAM_JOB_DIR \$WM_PROJECT_INST_DIR/jobControl|FOAM_JOB_DIR \$HOME/\$WM_PROJECT/jobControl|" \
- -e "s|WM_COMPILER_DIR |WM_COMPILER_DIR /usr # |" \
- -e 's|JAVA_HOME |JAVA_HOME ${JAVA_HOME} # |' \
- -e 's|[^#]setenv OPENMPI_HOME|# setenv OPENMPI_HOME|' \
- -e 's|OPENMPI_ARCH_PATH |OPENMPI_ARCH_PATH /usr # |' \
- -e 's|[^#]setenv LAMHOME|# setenv LAMHOME|' \
- -e 's|LAM_ARCH_PATH |LAM_ARCH_PATH /usr # |' \
- -e 's|[^#]setenv MPICH_PATH $FOAM_SRC|# setenv MPICH_PATH $FOAM_SRC|' \
- -e 's|MPICH_ARCH_PATH |MPICH_ARCH_PATH /usr # |' \
- -e 's|AddLib $OPENMPI_ARCH_PATH|# AddLib $OPENMPI_ARCH_PATH|' \
- -e 's|AddPath $OPENMPI_ARCH_PATH|# AddPath $OPENMPI_ARCH_PATH|' \
- -e 's|AddLib $LAM_ARCH_PATH|# AddLib $LAM_ARCH_PATH|' \
- -e 's|AddPath $LAM_ARCH_PATH|# AddPath $LAM_ARCH_PATH|' \
- -e 's|AddLib $MPICH_ARCH_PATH|# AddLib $MPICH_ARCH_PATH|' \
- -e 's|AddPath $MPICH_ARCH_PATH|# AddPath $MPICH_ARCH_PATH|' \
- -e 's|MICO_VERSION |MICO_VERSION `/usr/bin/mico-config --version` # |' \
- -e "s|[^#]setenv MICO_PATH |# setenv MICO_PATH |" \
- -e "s|MICO_ARCH_PATH |MICO_ARCH_PATH /usr # |" \
- "${S}"/.cshrc
-
- sed -i -e "s|/lib/j3d-org.jar|/lib/j3d-org.jar:/usr/share/sun-java3d-bin/lib/vecmath.jar:/usr/share/sun-java3d-bin/lib/j3dutils.jar:/usr/share/sun-java3d-bin/lib/j3dcore.jar|" \
- "${S}"/applications/utilities/mesh/manipulation/patchTool/Java/Allwmake
-
- sed -i -e "s|:../lib/j3d-org.jar|:../lib/j3d-org.jar:/usr/share/sun-java3d-bin/lib/vecmath.jar:/usr/share/sun-java3d-bin/lib/j3dutils.jar:/usr/share/sun-java3d-bin/lib/j3dcore.jar|" \
- "${S}"/applications/utilities/mesh/manipulation/patchTool/Java/Make/options
-
- cp "${S}"/.${MY_P}/bashrc "${S}"/.${MY_P}/bashrc.bak
-
- sed -i -e "s|WM_PROJECT_INST_DIR=/usr/lib/\$WM_PROJECT|WM_PROJECT_INST_DIR="${WORKDIR}"|" \
- -e "s|WM_PROJECT_DIR=\$WM_PROJECT_INST_DIR/\$WM_PROJECT-\$WM_PROJECT_VERSION|WM_PROJECT_DIR="${S}"|" \
- "${S}"/.${MY_P}/bashrc.bak \
- || die "could not replace source options"
-
- find "${S}"/wmake -name dirToString | xargs rm -rf
- find "${S}"/wmake -name wmkdep | xargs rm -rf
-
- source "${S}"/.${MY_P}/bashrc.bak
- rm "${S}"/.${MY_P}/bashrc.bak
-
- rm "${S}"/bin/paraFoam*
-
- sed -i -e "s|/\$WM_OPTIONS||" "${S}"/.bashrc || die "could not delete \$WM_OPTIONS in .bashrc"
- sed -i -e "s|/\$WM_OPTIONS||" "${S}"/.cshrc || die "could not delete \$WM_OPTIONS in .cshrc"
- rm "${S}"/applications/utilities/mesh/conversion/ccm26ToFoam/libccmio/config/{irix64_6.5-mips4,irix_6.5-mips3,sunos64_5.8-ultra,linux64_2.6-pwr4-glibc_2.3.3}/qmake
-}
-
-src_test() {
- cd "${S}"/bin
- ./foamInstallationTest
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/"${MY_PN}"/${MY_P}
- doins -r .bashrc .cshrc .${MY_P}
-
- use examples && doins -r tutorials
-
- insopts -m0755
- doins -r bin
-
- insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/applications/bin
- doins -r applications/bin/${WM_OPTIONS}/*
-
- insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/lib
- doins -r lib/${WM_OPTIONS}/*
-
- insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/wmake
- doins -r wmake/*
-
- insopts -m0644
- find "${S}"/applications -type d \( -name "${WM_OPTIONS}" -o -name linuxDebug -o -name linuxOpt \) | xargs rm -rf
-
- insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/applications
- doins -r applications/solvers applications/test applications/utilities
-
- insinto /usr/share/${MY_PN}/${MY_P}/doc
- doins -r README doc/Guides-a4 doc/Guides-usletter
-
- dosym /usr/$(get_libdir)/${MY_PN}/${MY_P}/.${MY_P}/bashrc /usr/$(get_libdir)/${MY_PN}/bashrc
- dosym /usr/$(get_libdir)/${MY_PN}/${MY_P}/.${MY_P}/cshrc /usr/$(get_libdir)/${MY_PN}/cshrc
-}
projects / ~andy / sunrise / commitdiff