Update to MAD-X 5.02.11

3 files changed, 13 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d5eaa2b1089..261442a08a96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Sep 11 03:55:33 UTC 2016
+# Tue Oct 11 12:01:29 UTC 2016
 pkgbase = madx-dev
 	pkgdesc = Accelerator Optics simulation code, latest development release
-	pkgver = 5.02.10
-	pkgrel = 3
+	pkgver = 5.02.11
+	pkgrel = 1
 	url = http://cern.ch/mad
 	arch = x86_64
 	license = custom
@@ -13,10 +13,8 @@ pkgbase = madx-dev
 	depends = lapack
 	provides = madx
 	conflicts = madx-svn
-	source = http://madx.web.cern.ch/madx/releases/5.02.10/madx-src.tgz
-	source = setupGNU.cmake.patch
-	md5sums = 317ebc91175e851e35ffb9b79ef81edf
-	md5sums = b0d47db22fb4b24ff5b30d58f3d35b6f
+	source = http://madx.web.cern.ch/madx/releases/5.02.11/madx-src.tgz
+	md5sums = 5b5b71a7a296978db1ea71f4399a9ee5
 
 pkgname = madx-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index 25c1b8b01236..0eda1e0e7ef6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Thomas Gläßle <t_glaessleATgmxDOTnet>
 
 pkgname=madx-dev
-pkgver=5.02.10
-pkgrel=3
+pkgver=5.02.11
+pkgrel=1
 pkgdesc="Accelerator Optics simulation code, latest development release"
 url="http://cern.ch/mad"
 license=("custom")
@@ -14,17 +14,14 @@ arch=('x86_64')
 
 
 tarball=madx-src.tgz
-sources=madx-${pkgver}
+extract=madx-${pkgver}
 
-source=("http://madx.web.cern.ch/madx/releases/${pkgver}/${tarball}"
-        setupGNU.cmake.patch)
-md5sums=('317ebc91175e851e35ffb9b79ef81edf'
-         'b0d47db22fb4b24ff5b30d58f3d35b6f')
+source=("http://madx.web.cern.ch/madx/releases/${pkgver}/${tarball}")
+md5sums=('5b5b71a7a296978db1ea71f4399a9ee5')
 
 prepare() {
-    cd ${srcdir}/${sources}
+    cd ${srcdir}/${extract}
     find . -name '._*' -print0 | xargs -0 -r rm
-    patch -p0 <../setupGNU.cmake.patch
 
     mkdir -p ${srcdir}/build
     cd ${srcdir}/build
@@ -39,7 +36,7 @@ prepare() {
         -DBINARY_POSTFIX=_dev \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_RPATH='$ORIGIN' \
-        ${srcdir}/${sources}
+        ${srcdir}/${extract}
 }
 
 build() {
@@ -58,6 +55,6 @@ package() {
     # resolve conflict with 'ndiff' from package 'nmap':
     mv ${pkgdir}/usr/bin/n{,um}diff
 
-    cd ${srcdir}/${sources}
+    cd ${srcdir}/${extract}
     install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
 }
diff --git a/setupGNU.cmake.patch b/setupGNU.cmake.patch
deleted file mode 100644
index 7715673e249d..000000000000
--- a/setupGNU.cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/compilers/setupGNU.cmake	2013-10-14 19:19:25.000000000 +0200
-+++ cmake/compilers/setupGNU.cmake.new	2016-05-17 20:26:30.998737834 +0200
-@@ -9,7 +9,7 @@
-     # General:
-     set(CMAKE_Fortran_FLAGS " -fno-range-check -fno-f2c -cpp ") # remove -g -O2 from main list
-     execute_process(COMMAND ${CMAKE_Fortran_COMPILER} --version OUTPUT_VARIABLE CMAKE_Fortran_COMPILER_VERSION)
--    string(REGEX MATCH "[3-5].[0-9].[0-9]" CMAKE_Fortran_COMPILER_VERSION ${CMAKE_Fortran_COMPILER_VERSION})
-+    string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" CMAKE_Fortran_COMPILER_VERSION ${CMAKE_Fortran_COMPILER_VERSION})
-     if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER 4.3.9)
-         add_definitions(-D_GFORTRAN)
-     endif()