Updated to 3.0.0

6 files changed, 27 insertions, 128 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d27dba7d263..782ed512af10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Dec 13 00:28:56 UTC 2015
 pkgbase = openfoam
 	pkgdesc = The open source CFD toolbox
-	pkgver = 2.4.0
+	pkgver = 3.0.0
 	pkgrel = 2
 	url = http://www.openfoam.com
 	install = openfoam.install
@@ -13,16 +15,8 @@ pkgbase = openfoam
 	depends = boost
 	depends = flex
 	depends = cgal
-	source = http://downloads.sourceforge.net/foam/OpenFOAM-2.4.0.tgz
-	source = decomp-options.patch
-	source = paraFoam.patch
-	source = scotch-options.patch
-	source = settings.patch
-	sha256sums = aac4c9e2cc1b54724292add3e182ebf923a0929978e3b5ba524c97ce75477706
-	sha256sums = 3faef066228df77bad5b329bf251fc057dc5dac3b749d5bcd292438f89a546b7
-	sha256sums = cdd8c599f34cc967e6fb75b7da5f337aa7b56b19cf0871ebf608af6507abe07c
-	sha256sums = bbf370e411dc7fd95c3d823dac3534d4312fe90c0365b596aa2a3ed016463819
-	sha256sums = 9f36415505d71d86a7f18624f8ed9888f8fa7af09833b0dd215477ddca57302f
+	source = http://downloads.sourceforge.net/foam/OpenFOAM-3.0.0.tgz
+	md5sums = fefa399a5c0cbe33fbabb65be17ea617
 
 pkgname = openfoam
 
diff --git a/PKGBUILD b/PKGBUILD
index 60ffb8d2c822..cb1838236d87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: George Eleftheriou <eleftg>
+# Maintainer: Xwang <xwaang1976@gmail.com>
+# Contributor: George Eleftheriou <eleftg>
 # Contributor: Andrew Fischer <andrew_at_apastron.co>
 
 pkgname=openfoam
@@ -6,24 +7,30 @@ pkgname=openfoam
 # The distributors package name
 _distpkgname=OpenFOAM
 
-pkgver=2.4.0
+pkgver=3.0.0
 pkgrel=2
 pkgdesc="The open source CFD toolbox"
 arch=("any")
 url="http://www.openfoam.com"
 license=("GPL")
 depends=('bzip2' 'paraview' 'parmetis' 'scotch' 'boost' 'flex' 'cgal')
-source=("http://downloads.sourceforge.net/foam/${_distpkgname}-${pkgver}.tgz"
-        "decomp-options.patch"
-        "paraFoam.patch"
-        "scotch-options.patch"
-        "settings.patch")
+source=("http://downloads.sourceforge.net/foam/${_distpkgname}-${pkgver}.tgz")
+#        "decomp-options.patch"
+#        "paraFoam.patch"
+#        "scotch-options.patch"
+#        "settings.patch")
 install="${pkgname}.install"
-sha256sums=('aac4c9e2cc1b54724292add3e182ebf923a0929978e3b5ba524c97ce75477706'
-            '3faef066228df77bad5b329bf251fc057dc5dac3b749d5bcd292438f89a546b7'
-            'cdd8c599f34cc967e6fb75b7da5f337aa7b56b19cf0871ebf608af6507abe07c'
-            'bbf370e411dc7fd95c3d823dac3534d4312fe90c0365b596aa2a3ed016463819'
-            '9f36415505d71d86a7f18624f8ed9888f8fa7af09833b0dd215477ddca57302f')
+#sha256sums=('SKIP'
+#            '3faef066228df77bad5b329bf251fc057dc5dac3b749d5bcd292438f89a546b7'
+#            'cdd8c599f34cc967e6fb75b7da5f337aa7b56b19cf0871ebf608af6507abe07c'
+#            'bbf370e411dc7fd95c3d823dac3534d4312fe90c0365b596aa2a3ed016463819'
+#            '9f36415505d71d86a7f18624f8ed9888f8fa7af09833b0dd215477ddca57302f')
+            
+md5sums=('fefa399a5c0cbe33fbabb65be17ea617')
+#         'SKIP'
+#         'SKIP'
+#         'SKIP'
+#         'SKIP')            
 
 prepare() {
   # Extract the current version and major of paraview and of scotch for use in the system preferences
@@ -44,9 +51,9 @@ prepare() {
   cp ${srcdir}/scotch.sh ${srcdir}/${_distpkgname}-${pkgver}/etc/config || return 1
 
   # Patch for archlinux parmetis, paraview and openmpi paths, and scotch link lines
-  patch -p1 < ${srcdir}/decomp-options.patch
-  patch -p1 < ${srcdir}/paraFoam.patch
-  patch -p1 < ${srcdir}/scotch-options.patch
+  #patch -p1 < ${srcdir}/decomp-options.patch
+  #patch -p1 < ${srcdir}/paraFoam.patch
+  #patch -p1 < ${srcdir}/scotch-options.patch
 }
 
 build() {
diff --git a/decomp-options.patch b/decomp-options.patch
deleted file mode 100644
index 34777a67d123..000000000000
--- a/decomp-options.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/OpenFOAM-2.4.0/src/parallel/decompose/metisDecomp/Make/options
-+++ src/OpenFOAM-2.4.0/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/paraFoam.patch b/paraFoam.patch
deleted file mode 100644
index cad4755e499e..000000000000
--- a/paraFoam.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/OpenFOAM-2.4.0/bin/paraFoam
-+++ src/OpenFOAM-2.4.0/bin/paraFoam
-@@ -68,7 +68,7 @@
- export LC_ALL=C
- 
- # reader extension
--extension=OpenFOAM
-+extension=foam
- 
- requirePV=1
- 
-@@ -124,21 +124,22 @@
- # 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
--
--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
--
--BUILDREADER
--    exit 1
--fi
-+# 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
-+#
-+#Please build the reader module before continuing:
-+#cd \$FOAM_UTILITIES/postProcessing/graphics/PV${version}Readers
-+#./Allwclean
-+#./Allwmake
-+#
-+#BUILDREADER
-+#    exit 1
-+#fi
- 
- # check for --data=... argument
- hasDataArg()
diff --git a/scotch-options.patch b/scotch-options.patch
deleted file mode 100644
index 382e9df4aef7..000000000000
--- a/scotch-options.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/OpenFOAM-2.4.0/src/parallel/decompose/ptscotchDecomp/Make/options
-+++ src/OpenFOAM-2.4.0/src/parallel/decompose/ptscotchDecomp/Make/options
-@@ -9,4 +9,4 @@
-     -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 -lbz2 -lscotch -lptscotcherrexit -lscotcherrexit ${LINK_FLAGS} -lrt
---- src/OpenFOAM-2.4.0/applications/utilities/parallelProcessing/decomposePar/Make/options
-+++ src/OpenFOAM-2.4.0/applications/utilities/parallelProcessing/decomposePar/Make/options
-@@ -13,4 +13,5 @@ EXE_LIBS = \
-     -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp \
-     -llagrangian \
-     -lmeshTools \
-+    -lbz2 \
-     -lregionModels
---- src/OpenFOAM-2.4.0/applications/utilities/mesh/manipulation/renumberMesh/Make/options
-+++ src/OpenFOAM-2.4.0/applications/utilities/mesh/manipulation/renumberMesh/Make/options
-@@ -14,5 +14,6 @@ EXE_LIBS = \
-     -lfiniteVolume \
-     -lgenericPatchFields \
-     -lrenumberMethods \
-+    -lbz2 \
-     $(LINK_FLAGS) \
-     -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp
diff --git a/settings.patch b/settings.patch
deleted file mode 100644
index 1c829ef662b1..000000000000
--- a/settings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/OpenFOAM-2.3.1/etc/config/settings.sh
-+++ src/OpenFOAM-2.3.1/etc/config/settings.sh
-@@ -406,9 +406,12 @@
- 
-     # Bit of a hack: strip off 'lib' and hope this is the path to openmpi
-     # include files and libraries.
--    export MPI_ARCH_PATH="${libDir%/*}"
-+    # More of a hack: On arch we need to strip off the openmpi library subdir first, so do it twice
-+    tmplibDir="${libDir%/*}"
-+    export MPI_ARCH_PATH="${tmplibDir%/*}"
- 
-     _foamAddLib     $libDir
-+    unset tmplibDir
-     unset libDir
-     ;;
-