useful commit message

2 files changed, 42 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 835a60e11099..00f42426e077 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Jan 19 20:17:32 UTC 2016
 pkgbase = openfoam
 	pkgdesc = The open source CFD toolbox
-	pkgver = 3.0.1
-	pkgrel = 2
+	pkgver = 3.0.x
+	pkgrel = 3
 	url = http://www.openfoam.org
 	install = openfoam.install
 	arch = any
@@ -15,26 +13,8 @@ pkgbase = openfoam
 	depends = boost
 	depends = flex
 	depends = cgal
-	source = http://downloads.sourceforge.net/foam/OpenFOAM-3.0.1.tgz
-	source = paraFoam.patch
-	source = readSTLASCII_L.patch
-	source = ansysToFoam_L.patch
-	source = STLsurfaceFormatASCII_L.patch
-	source = renumberMesh_options.patch
-	source = decomposePar_options.patch
-	source = gambitToFoam_L.patch
-	source = fluent3DMeshToFoam_L.patch
-	source = fluentMeshToFoam_L.patch
-	md5sums = 304e6a14b9e69c20989527f5fb1ed724
-	md5sums = 352b06d5c1f42eceff784b9130bfe444
-	md5sums = 1f1850ac3d005baa6039b5dca5780e55
-	md5sums = 23dc21fb55ffc6cfbc8dd5dca903ab22
-	md5sums = 285cdc4cd6039da598156fa405e31d29
-	md5sums = 815ba1f4df3c40b298e31c57738acd93
-	md5sums = 029a20598e565da2638441aa0c39ff74
-	md5sums = be0952767725ff63115f73064a594b35
-	md5sums = a3f8054fe234e18bc2f831d6c23f9abd
-	md5sums = 7ab2085baeb8393d4bf7b418658612a9
+	source = git+git://github.com/OpenFOAM/OpenFOAM-3.0.x.git
+	md5sums = SKIP
 
 pkgname = openfoam
 
diff --git a/PKGBUILD b/PKGBUILD
index e333d06f81d5..20d576e84994 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,37 +7,41 @@ pkgname=openfoam
 # The distributors package name
 _distpkgname=OpenFOAM
 
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.x
+pkgrel=3
 pkgdesc="The open source CFD toolbox"
 arch=("any")
 url="http://www.openfoam.org"
 license=("GPL")
 depends=('bzip2' 'paraview' 'parmetis' 'scotch' 'boost' 'flex' 'cgal')
-source=("http://downloads.sourceforge.net/foam/${_distpkgname}-${pkgver}.tgz"
-        "paraFoam.patch"
-        "readSTLASCII_L.patch"
-        "ansysToFoam_L.patch"
-        "STLsurfaceFormatASCII_L.patch"
-        "renumberMesh_options.patch"
-        "decomposePar_options.patch"
-        "gambitToFoam_L.patch"
-        "fluent3DMeshToFoam_L.patch"
-        "fluentMeshToFoam_L.patch")
+
+#source=("http://downloads.sourceforge.net/foam/${_distpkgname}-${pkgver}.tgz"
+#        "paraFoam.patch"
+#        "readSTLASCII_L.patch"
+#        "ansysToFoam_L.patch"
+#        "STLsurfaceFormatASCII_L.patch"
+#        "renumberMesh_options.patch"
+#        "decomposePar_options.patch"
+#        "gambitToFoam_L.patch"
+#        "fluent3DMeshToFoam_L.patch"
+#        "fluentMeshToFoam_L.patch")
+        
+source=("git+git://github.com/OpenFOAM/OpenFOAM-3.0.x.git")        
 
 install="${pkgname}.install"
         
-md5sums=('304e6a14b9e69c20989527f5fb1ed724'
-         '352b06d5c1f42eceff784b9130bfe444'
-         '1f1850ac3d005baa6039b5dca5780e55'
-         '23dc21fb55ffc6cfbc8dd5dca903ab22'
-         '285cdc4cd6039da598156fa405e31d29'
-         '815ba1f4df3c40b298e31c57738acd93'
-         '029a20598e565da2638441aa0c39ff74'
-         'be0952767725ff63115f73064a594b35'
-         'a3f8054fe234e18bc2f831d6c23f9abd'
-         '7ab2085baeb8393d4bf7b418658612a9')  
-      
+#md5sums=('304e6a14b9e69c20989527f5fb1ed724'
+#         '352b06d5c1f42eceff784b9130bfe444'
+#         '1f1850ac3d005baa6039b5dca5780e55'
+#         '23dc21fb55ffc6cfbc8dd5dca903ab22'
+#         '285cdc4cd6039da598156fa405e31d29'
+#         '815ba1f4df3c40b298e31c57738acd93'
+#         '029a20598e565da2638441aa0c39ff74'
+#         'be0952767725ff63115f73064a594b35'
+#         'a3f8054fe234e18bc2f831d6c23f9abd'
+#         '7ab2085baeb8393d4bf7b418658612a9')  
+
+md5sums=('SKIP')      
 
 prepare() {
   # Extract the current version and major of paraview and of scotch for use in the system preferences
@@ -50,6 +54,7 @@ prepare() {
   echo "export WM_MPLIB=SYSTEMOPENMPI" >> ${srcdir}/prefs.sh
   echo "export ParaView_VERSION=${_pversion}" >> ${srcdir}/prefs.sh
   echo "export ParaView_MAJOR=${_pmajor}" >> ${srcdir}/prefs.sh
+#  mv ${srcdir}/${_distpkgname}-3.0.x ${srcdir}/${_distpkgname}-${pkgver}
   cp ${srcdir}/prefs.sh ${srcdir}/${_distpkgname}-${pkgver}/etc #|| return 1
 
   # Generate the scotch.sh file for arch
@@ -58,17 +63,16 @@ 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}/readSTLASCII_L.patch
-  patch -p1 < ${srcdir}/ansysToFoam_L.patch
-  patch -p1 < ${srcdir}/STLsurfaceFormatASCII_L.patch
-  patch -p1 < ${srcdir}/renumberMesh_options.patch
-  patch -p1 < ${srcdir}/decomposePar_options.patch
-  patch -p1 < ${srcdir}/gambitToFoam_L.patch
-  patch -p1 < ${srcdir}/fluent3DMeshToFoam_L.patch
-  patch -p1 < ${srcdir}/fluentMeshToFoam_L.patch
+
+#  patch -p1 < ${srcdir}/paraFoam.patch
+#  patch -p1 < ${srcdir}/readSTLASCII_L.patch
+#  patch -p1 < ${srcdir}/ansysToFoam_L.patch
+#  patch -p1 < ${srcdir}/STLsurfaceFormatASCII_L.patch
+#  patch -p1 < ${srcdir}/renumberMesh_options.patch
+#  patch -p1 < ${srcdir}/decomposePar_options.patch
+#  patch -p1 < ${srcdir}/gambitToFoam_L.patch
+#  patch -p1 < ${srcdir}/fluent3DMeshToFoam_L.patch
+#  patch -p1 < ${srcdir}/fluentMeshToFoam_L.patch
 }
 
 build() {