Update to version 2.11

4 files changed, 85 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3116dcfd3fc7..8920e2859cae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Mar 27 18:17:07 UTC 2016
+# Mon Aug  8 09:21:51 UTC 2016
 pkgbase = calculix
 	pkgdesc = CalculiX: 3D finite element solver and post-processor (executables)
-	pkgver = 2.10
-	pkgrel = 2
+	pkgver = 2.11
+	pkgrel = 1
 	url = http://www.calculix.de/
 	arch = i686
 	arch = x86_64
@@ -20,12 +20,12 @@ pkgbase = calculix
 	optdepends = calculix-doc: documentation and examples
 	options = !makeflags
 	options = !buildflags
-	source = http://www.dhondt.de/ccx_2.10.src.tar.bz2
-	source = http://www.dhondt.de/cgx_2.10.all.tar.bz2
-	source = calculix_2.10_archlinux.patch
-	sha256sums = 693497d19d8dd2a5376e64e038d5c248d87f0e2df46d409a83bf976596b319f5
-	sha256sums = 64810dab1c22152c7946282fac5763cc36b9e31e309f962c23b8bf8238537c7e
-	sha256sums = f171dd982aca9204b24defc3b0a674747b17b5fdb675caf5eff11a5c794cd757
+	source = http://www.dhondt.de/ccx_2.11.src.tar.bz2
+	source = http://www.dhondt.de/cgx_2.11.all.tar.bz2
+	source = calculix_2.11_archlinux.patch
+	sha256sums = 11588c7a2836cadbc4c6f2b866b0daa67512eebe755887094a76a997e6dc2493
+	sha256sums = 11c6ab303121708463320dbf85ed300caddad02d2388b2920b8b960c5b4c1942
+	sha256sums = d22826c4e7c5b1e579d49ff2166a0497f67c0a8640ae9376c174a3a8d20bea7f
 
 pkgname = calculix
 
diff --git a/PKGBUILD b/PKGBUILD
index 414e532fec71..b2d610765166 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 #       may fail if make uses more than one job.
 
 pkgname=calculix
-pkgver=2.10
-pkgrel=2
+pkgver=2.11
+pkgrel=1
 pkgdesc="CalculiX: 3D finite element solver and post-processor (executables)"
 arch=('i686' 'x86_64')
 options=(!makeflags !buildflags)
@@ -26,9 +26,9 @@ source=("http://www.dhondt.de/ccx_${_ccxver}.src.tar.bz2"
       	"http://www.dhondt.de/cgx_${_cgxver}.all.tar.bz2"
         "calculix_${_mainver}_archlinux.patch")
 
-sha256sums=('693497d19d8dd2a5376e64e038d5c248d87f0e2df46d409a83bf976596b319f5'
-            '64810dab1c22152c7946282fac5763cc36b9e31e309f962c23b8bf8238537c7e'
-            'f171dd982aca9204b24defc3b0a674747b17b5fdb675caf5eff11a5c794cd757')
+sha256sums=('11588c7a2836cadbc4c6f2b866b0daa67512eebe755887094a76a997e6dc2493'
+            '11c6ab303121708463320dbf85ed300caddad02d2388b2920b8b960c5b4c1942'
+            'd22826c4e7c5b1e579d49ff2166a0497f67c0a8640ae9376c174a3a8d20bea7f')
 
 prepare()
 {
diff --git a/calculix_2.10_archlinux.patch b/calculix_2.10_archlinux.patch
deleted file mode 100644
index 18193cca55fb..000000000000
--- a/calculix_2.10_archlinux.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ur CalculiX_orig/ccx_2.10/src/Makefile CalculiX/ccx_2.10/src/Makefile
---- CalculiX_orig/ccx_2.19/src/Makefile
-+++ CalculiX/ccx_2.10/src/Makefile
-@@ -2,2 +2,2 @@ 
--CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
-+CFLAGS = -Wall -O3 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
- FFLAGS = -Wall -O3 -fopenmp
-@@ -21,6 +21,1 @@
--DIR=../../../SPOOLES.2.2
--
--LIBS = \
--       $(DIR)/spooles.a \
--	../../../ARPACK/libarpack_INTEL.a \
--       -lpthread -lm -lc
-+LIBS = -lpthread -lm -lc -lspooles -larpack -lblas
-diff -ur CalculiX_orig/cgx_2.10/src/Makefile CalculiX/cgx_2.10/src/Makefile
---- CalculiX_orig/cgx_2.10/src/Makefile
-+++ CalculiX/cgx_2.10/src/Makefile
-@@ -1,14 +1,8 @@
- CFLAGS = -O3 -Wall \
-   -I./ \
--  -I/usr/include \
--  -I/usr/include/GL \
--  -I../../libSNL/src \
--  -I../../glut-3.5/src \
--  -I/usr/X11/include 
-+  -I/usr/include/libSNL \
-+  -I../../glut-3.5/src
-
--LFLAGS = \
--  -L/usr/lib64 -lGL -lGLU \
--  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
--  -lm -lpthread -lrt
-+LFLAGS = -lGL -lGLU -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE -lSNL -lm -lpthread -lrt
-
-
-@@ -59,1 +53,1 @@
-- ../../libSNL/src/*.cpp
-+# ../../libSNL/src/*.cpp
-diff -ur CalculiX_orig/cgx_2.10/src/cgx.h CalculiX/cgx_2.10/src/cgx.h
---- CalculiX_orig/cgx_2.10/src/cgx.h
-+++ CalculiX/cgx_2.10/src/cgx.h
-@@ -81,8 +81,8 @@
- #elif defined AFLIB
--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html",\
--    "/usr/local/CalculiX/cgx_2.10/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.10/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html"}
-+  #define     HELPFILE        {"/usr/share/doc/cgx/cgx.html",\
-+    "/usr/share/doc/ccx/ccx.html"}
- #endif
diff --git a/calculix_2.11_archlinux.patch b/calculix_2.11_archlinux.patch
new file mode 100644
index 000000000000..0c80b9818116
--- /dev/null
+++ b/calculix_2.11_archlinux.patch
@@ -0,0 +1,71 @@
+diff -ur CalculiX_orig/ccx_2.11/src/Makefile CalculiX/ccx_2.11/src/Makefile
+--- CalculiX_orig/ccx_2.11/src/Makefile
++++ CalculiX/ccx_2.11/src/Makefile
+@@ -2,2 +2,2 @@ 
+-CFLAGS = -Wall -O3 -fopenmp -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
+@@ -21,6 +21,1 @@
+-DIR=../../../SPOOLES.2.2
+-
+-LIBS = \
+-       $(DIR)/spooles.a \
+-	../../../ARPACK/libarpack_INTEL.a \
+-       -lpthread -lm -lc
++LIBS = -lpthread -lm -lc -lspooles -larpack -lblas
+diff -ur CalculiX_orig/cgx_2.11/src/Makefile CalculiX/cgx_2.11/src/Makefile
+--- CalculiX_orig/cgx_2.11/src/Makefile
++++ CalculiX/cgx_2.11/src/Makefile
+@@ -1,14 +1,8 @@
+ CFLAGS = -O3 -Wall \
+   -I./ \
+-  -I/usr/include \
+-  -I/usr/include/GL \
+-  -I../../libSNL/src \
+-  -I../../glut-3.5/src \
+-  -I/usr/X11/include 
++  -I/usr/include/libSNL \
++  -I../../glut-3.5/src
+
+-LFLAGS = \
+-  -L/usr/lib64 -lGL -lGLU \
+-  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
+-  -lm -lpthread -lrt
++LFLAGS = -lGL -lGLU -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE -lSNL -lm -lpthread -lrt
+
+
+@@ -59,1 +53,1 @@
+- ../../libSNL/src/*.cpp
++# ../../libSNL/src/*.cpp
+diff -ur CalculiX_orig/cgx_2.11/src/cgx.h CalculiX/cgx_2.11/src/cgx.h
+--- CalculiX_orig/cgx_2.11/src/cgx.h
++++ CalculiX/cgx_2.11/src/cgx.h
+@@ -81,8 +81,8 @@
+ #elif defined AFLIB
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.11/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.11/doc/ccx/ccx.html",\
+-    "/usr/local/CalculiX/cgx_2.11/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.11/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.11/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.11/src/uselibSNL.h CalculiX/cgx_2.11/src/uselibSNL.h
+--- CalculiX_orig/cgx_2.11/src/uselibSNL.h
++++ CalculiX/cgx_2.11/src/uselibSNL.h
+@@ -8,1 +8,3 @@
+ #include <cgx.h>
++#undef max
++#undef min
+diff -ur CalculiX_orig/cgx_2.11/src/uselibSNL.cpp CalculiX/cgx_2.11/src/uselibSNL.cpp
+--- CalculiX_orig/cgx_2.11/src/uselibSNL.cpp
++++ CalculiX/cgx_2.11/src/uselibSNL.cpp
+@@ -1243,3 +1243,3 @@
+   char buffer[MAX_LINE_LENGTH];
+-  int foundPntAtPole[2]={0.,0.}, foundPntAtMeridian[2]={0.,0.};
++  int foundPntAtPole[2]={0,0}, foundPntAtMeridian[2]={0,0};
+   double umin, umax,vmin,vmax, du,dv;