Update to version 2.16

3 files changed, 36 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f4703f5703c..2eddf3a188b8 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = calculix
 	pkgdesc = CalculiX: 3D finite element solver and post-processor (executables)
-	pkgver = 2.15
-	pkgrel = 5
+	pkgver = 2.16
+	pkgrel = 1
 	url = http://www.calculix.de/
 	arch = i686
 	arch = x86_64
@@ -19,14 +19,14 @@ pkgbase = calculix
 	optdepends = calculix-doc: documentation and examples
 	options = !makeflags
 	options = !buildflags
-	source = http://www.dhondt.de/ccx_2.15.src.tar.bz2
-	source = http://www.dhondt.de/ccx_2.15.test.tar.bz2
-	source = http://www.dhondt.de/cgx_2.15.all.tar.bz2
-	source = calculix_2.15_archlinux.patch
-	sha256sums = bc7dba721935af51b60c1b5aa1529a420476fc6432a7bec5254f8dfabaeb8a34
-	sha256sums = ee17e477aeae944c35853a663ac245c33b405c3750308c5d77e5ee9a4e609dd5
-	sha256sums = 86f65e111811939e0dff9cdc2b17d0d1720e34100ae099845f0deaf4761fcb98
-	sha256sums = 7cd1b478aab2886b2a2eb590a165f25d6ddade1076ebbe0d3d5f8c4acc120a22
+	source = http://www.dhondt.de/ccx_2.16.src.tar.bz2
+	source = http://www.dhondt.de/ccx_2.16.test.tar.bz2
+	source = http://www.dhondt.de/cgx_2.16.all.tar.bz2
+	source = calculix_2.16_archlinux.patch
+	sha256sums = ebd95a0e4d52a3a8fb969eefc85417c82f649f25526bb6d83d69868ab44d47b7
+	sha256sums = fcbeb4d03a960ec26b5027fd729f6a13b607ab5fece4c5673c16fa740592f687
+	sha256sums = 8389dbe31aa2d371f45f921743f39e91979e8bebb6cf43d5e645331c2f036ca1
+	sha256sums = e4017aae611a87b3c82357d9ee8794a38cf714d36a8da83d8c0ad546dfaad8f4
 
 pkgname = calculix
 
diff --git a/PKGBUILD b/PKGBUILD
index b9060dc61ce5..9924b9d7c0a5 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 #       may fail if make uses more than one job.
 
 pkgname=calculix
-pkgver=2.15
-pkgrel=5
+pkgver=2.16
+pkgrel=1
 pkgdesc="CalculiX: 3D finite element solver and post-processor (executables)"
 arch=('i686' 'x86_64')
 options=(!makeflags !buildflags)
@@ -26,10 +26,10 @@ source=("http://www.dhondt.de/ccx_${pkgver}.src.tar.bz2"
       	"http://www.dhondt.de/cgx_${pkgver}.all.tar.bz2"
         "calculix_${pkgver}_archlinux.patch")
 
-sha256sums=('bc7dba721935af51b60c1b5aa1529a420476fc6432a7bec5254f8dfabaeb8a34'
-            'ee17e477aeae944c35853a663ac245c33b405c3750308c5d77e5ee9a4e609dd5'
-            '86f65e111811939e0dff9cdc2b17d0d1720e34100ae099845f0deaf4761fcb98'
-            '7cd1b478aab2886b2a2eb590a165f25d6ddade1076ebbe0d3d5f8c4acc120a22')
+sha256sums=('ebd95a0e4d52a3a8fb969eefc85417c82f649f25526bb6d83d69868ab44d47b7'
+            'fcbeb4d03a960ec26b5027fd729f6a13b607ab5fece4c5673c16fa740592f687'
+            '8389dbe31aa2d371f45f921743f39e91979e8bebb6cf43d5e645331c2f036ca1'
+            'e4017aae611a87b3c82357d9ee8794a38cf714d36a8da83d8c0ad546dfaad8f4')
 
 prepare()
 {
diff --git a/calculix_2.15_archlinux.patch b/calculix_2.16_archlinux.patch
index 41239bb8280d..5279f95f1831 100755
--- a/calculix_2.15_archlinux.patch
+++ b/calculix_2.16_archlinux.patch
@@ -1,10 +1,10 @@
-diff -ur CalculiX_orig/ccx_2.15/src/Makefile CalculiX/ccx_2.15/src/Makefile
---- CalculiX_orig/ccx_2.15/src/Makefile
-+++ CalculiX/ccx_2.15/src/Makefile
+diff -ur CalculiX_orig/ccx_2.16/src/Makefile CalculiX/ccx_2.16/src/Makefile
+--- CalculiX_orig/ccx_2.16/src/Makefile
++++ CalculiX/ccx_2.16/src/Makefile
 @@ -2,2 +2,2 @@ 
--CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
-+CFLAGS = -Wall -O3 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
- FFLAGS = -Wall -O3 -fopenmp
+-CFLAGS = -Wall -O2 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
++CFLAGS = -Wall -O2 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
+ FFLAGS = -Wall -O2
 @@ -21,6 +21,1 @@
 -DIR=../../../SPOOLES.2.2
 -
@@ -12,10 +12,10 @@ diff -ur CalculiX_orig/ccx_2.15/src/Makefile CalculiX/ccx_2.15/src/Makefile
 -       $(DIR)/spooles.a \
 -	../../../ARPACK/libarpack_INTEL.a \
 -       -lpthread -lm -lc
-+LIBS = -lpthread -lm -lc -lspooles -larpack -lblas
-diff -ur CalculiX_orig/cgx_2.15/src/Makefile CalculiX/cgx_2.15/src/Makefile
---- CalculiX_orig/cgx_2.15/src/Makefile
-+++ CalculiX/cgx_2.15/src/Makefile
++LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack
+diff -ur CalculiX_orig/cgx_2.16/src/Makefile CalculiX/cgx_2.16/src/Makefile
+--- CalculiX_orig/cgx_2.16/src/Makefile
++++ CalculiX/cgx_2.16/src/Makefile
 @@ -1,14 +1,8 @@
  CFLAGS = -O3 -Wall \
    -I./ \
@@ -37,26 +37,26 @@ diff -ur CalculiX_orig/cgx_2.15/src/Makefile CalculiX/cgx_2.15/src/Makefile
 @@ -59,1 +53,1 @@
 - ../../libSNL/src/*.cpp
 +# ../../libSNL/src/*.cpp
-diff -ur CalculiX_orig/cgx_2.15/src/cgx.h CalculiX/cgx_2.15/src/cgx.h
---- CalculiX_orig/cgx_2.15/src/cgx.h
-+++ CalculiX/cgx_2.15/src/cgx.h
+diff -ur CalculiX_orig/cgx_2.16/src/cgx.h CalculiX/cgx_2.16/src/cgx.h
+--- CalculiX_orig/cgx_2.16/src/cgx.h
++++ CalculiX/cgx_2.16/src/cgx.h
 @@ -81,8 +81,8 @@
  #elif defined AFLIB
--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.15/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.15/doc/ccx/ccx.html",\
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.16/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html",\
 -    "/usr/local/CalculiX/cgx_2.8/doc/aflib/aflib.pdf"}
 +  #define     HELPFILE        {"/usr/share/doc/cgx/cgx.html",\
 +    "/usr/share/doc/doc/ccx/ccx.html",\
 +    "/usr/share/doc/doc/aflib/aflib.pdf"}
  #else
--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.15/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.15/doc/ccx/ccx.html"}
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.16/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html"}
 +  #define     HELPFILE        {"/usr/share/doc/cgx/cgx.html",\
 +    "/usr/share/doc/ccx/ccx.html"}
  #endif
-diff -ur CalculiX_orig/cgx_2.15/src/uselibSNL.h CalculiX/cgx_2.15/src/uselibSNL.h
---- CalculiX_orig/cgx_2.15/src/uselibSNL.h
-+++ CalculiX/cgx_2.15/src/uselibSNL.h
+diff -ur CalculiX_orig/cgx_2.16/src/uselibSNL.h CalculiX/cgx_2.16/src/uselibSNL.h
+--- CalculiX_orig/cgx_2.16/src/uselibSNL.h
++++ CalculiX/cgx_2.16/src/uselibSNL.h
 @@ -8,1 +8,3 @@
  #include <cgx.h>
 +#undef max