Build latest development release

2 files changed, 35 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6c62148d1ce..4ead1773db54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
-pkgbase = madx-svn
-	pkgdesc = Accelerator Optics simulation code, svn trunk version
-	pkgver = 4727
+pkgbase = madx-dev
+	pkgdesc = Accelerator Optics simulation code, latest development release
+	pkgver = 5.02.04
 	pkgrel = 1
 	url = http://cern.ch/mad
 	arch = x86_64
 	license = custom
-	makedepends = subversion
 	makedepends = cmake
 	depends = gcc-libs
 	depends = libx11
 	provides = madx
-	conflicts = madx-dev
-	source = madX::svn+http://svnweb.cern.ch/guest/madx/trunk/madX
+	conflicts = madx-svn
+	source = http://madx.web.cern.ch/madx/releases/5.02.04/madx-5.02.04.tgz
 	md5sums = SKIP
 
-pkgname = madx-svn
+pkgname = madx-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index d0e250b3c76f..2f5a18778cc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,62 +1,54 @@
 # Maintainer: Yngve Inntjore Levinsen <yngveTODlevinsenTAcernTODch>
 
-pkgname=madx-svn
-pkgver=4727
+pkgname=madx-dev
+pkgver=5.02.04
 pkgrel=1
-pkgdesc="Accelerator Optics simulation code, svn trunk version"
+pkgdesc="Accelerator Optics simulation code, latest development release"
 url="http://cern.ch/mad"
 license=("custom")
 depends=('gcc-libs' 'libx11')
-conflicts=('madx-dev')
+conflicts=('madx-svn')
 provides=('madx')
-makedepends=('subversion' 'cmake')
+makedepends=('cmake')
 arch=('x86_64')
 
-source=('madX::svn+http://svnweb.cern.ch/guest/madx/trunk/madX')
-md5sums=('SKIP')
 
-pkgver() {
-  cd "$SRCDEST/madX" &&  svnversion
-}
+tarball=madx-${pkgver}.tgz
+sources=madx-${pkgver}
 
-prepare() {
-    cd madX
-
-    msg "Patching.."
-    # when patch level is 00 we want this:
-    #patch -p0 -i ../../madx_install_header.patch
-
-    msg "Configuring.."
-    # Note, BINARY_POSTFIX forced to not conflict with package 'madx' 
-    cmake -DCMAKE_C_COMPILER=gcc \
-          -DCMAKE_Fortran_COMPILER=gfortran \
-          -DMADX_STATIC=OFF \
-          -DMADX_ONLINE=OFF \
-          -DBUILD_SHARED_LIBS=ON \
-          -DCMAKE_INSTALL_PREFIX=/usr \
-          -DBINARY_POSTFIX=_dev \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-         .
+source=("http://madx.web.cern.ch/madx/releases/${pkgver}/${tarball}")
+md5sums=('SKIP')
 
+prepare() {
+    mkdir build
+    cd build
+
+    cmake \
+        -DCMAKE_C_COMPILER=gcc \
+        -DCMAKE_Fortran_COMPILER=gfortran \
+        -DMADX_STATIC=OFF \
+        -DMADX_ONLINE=OFF \
+        -DBUILD_SHARED_LIBS=ON \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DBINARY_POSTFIX=_dev \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        ../${sources}
 }
-build() {
-    cd madX
-
-    msg "Starting make..."
 
+build() {
+    cd build
     make
 }
 
 check() {
-     cd madX
-     ctest -E LONG
+    cd build
+    # ctest -E LONG
 }
 
 package() {
-    pwd
-    cd madX
+    cd build
     make DESTDIR=${pkgdir} install
 
-    cd ${srcdir}/${_svnmod}/madX
+    cd ${srcdir}/${sources}
     install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
 }