Updated build

2 files changed, 14 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93d249803551..2698caf23a81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
 pkgbase = madagascar
 	pkgdesc = Multidimensional data analysis and reproducible computational experiments.
-	pkgver = r14562.4883d27e8
-	pkgrel = 2
-	epoch = 1
-	url = http://ahay.org/
+	pkgver = r15659.d72996857
+	pkgrel = 1
+	url = https://www.reproducibility.org/wiki/Main_Page
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = python2-scons
 	makedepends = libtirpc
-	makedepends = libtirpc-compat
+	makedepends = libtirpc
 	makedepends = scons
 	depends = libtirpc
 	depends = ffmpeg
@@ -22,11 +20,9 @@ pkgbase = madagascar
 	depends = glu
 	depends = freeglut
 	depends = suitesparse
-	depends = python2
 	noextract = madagascar.tar.gz
 	options = strip
 	source = madagascar::git+https://github.com/ahay/src
 	md5sums = SKIP
 
 pkgname = madagascar
-
diff --git a/PKGBUILD b/PKGBUILD
index ff2fb0e87035..fa70a94ce794 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
-# Maintainer: anon at sansorgan.es
+# Contributor: anon at sansorgan.es
+
 pkgname=madagascar
-pkgver=r14562.4883d27e8
-pkgrel=2
-epoch=1
+pkgver=r15659.d72996857
+pkgrel=1
 pkgdesc="Multidimensional data analysis and reproducible computational experiments."
-url=http://ahay.org/
+url="https://www.reproducibility.org/wiki/Main_Page"
 license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('libtirpc' 'ffmpeg' 'libxaw' 'cairo' 'fftw' 'netpbm' 'gd'
-'openmpi' 'glu' 'freeglut' 'suitesparse' 'python2') 
-makedepends=('python2-scons' 'libtirpc' 'libtirpc-compat' 'scons')
+	 'openmpi' 'glu' 'freeglut' 'suitesparse') 
+makedepends=('libtirpc' 'libtirpc' 'scons')
 options=('strip')
-#source=("$pkgname.tar.gz::https://sourceforge.net/projects/rsf/files/madagascar/madagascar-3.0/madagascar-3.0.1.tar.gz/download")
 source=($pkgname::git+https://github.com/ahay/src)
+md5sums=('SKIP')
 noextract=("$pkgname.tar.gz")
 
 pkgver(){
@@ -20,31 +20,18 @@ pkgver(){
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-
 build() {
   cd ${srcdir}/${pkgname}
-  # Investigate additional bindings
-  #export LINKFLAGS="-ltirpc"
-  # Fake python2 env
+
   mkdir -p ${srcdir}/bin/
-  ln -f -s /usr/bin/python2 ${srcdir}/bin/python
-  ln -f -s /usr/bin/python2-config ${srcdir}/bin/python-config
   export PATH=${srcdir}/bin:$PATH
 
-
   export LINKFLAGS="-llapack -lblas -ltirpc -pthread -fopenmp"
-  #sed -i '1s/python/python2/' framework/setenv.py
   ./configure --prefix=${pkgdir}/usr/
 
   echo "Fixing paths in files..."
 
-#  for f in config.py env.sh env.csh ; do
-#    sed -i "s|${pkgdir}||g" "$f"
-#    sed -i "s|${srcdir}|/usr/src/|g" "$f"
-#  done
-
   sed -i "s/^LINKFLAGS.*/LINKFLAGS = ['-llapack', '-lblas', '-pthread', '-fopenmp', '-ltirpc']/g" config.py
-#  sed -i "s/^CXXFLAGS.*/CXXFLAGS = \'-O2 -std=c++11 -U__STRICT_ANSI__ -Wall -pedantic -fopenmp ${CXXFLAGS}\'/g" config.py
   make "${MAKEFLAGS}"
 }
 
@@ -54,7 +41,7 @@ package() {
     mkdir -p "${pkgdir}/usr/src/${pkgname}"
     cp -r ${srcdir}/${pkgname}/* ${pkgdir}/usr/src/${pkgname}
     arr[0]="usr/share/madagascar/etc/config.py"
-    arr[1]="usr/lib/python2.7/site-packages/rsf/prog.py"
+    arr[1]="usr/lib/python3.11/site-packages/rsf/prog.py"
     arr[2]="usr/share/madagascar/etc/env.sh"
     arr[3]="usr/src/madagascar/config.py"
     echo ${pkgdir}
@@ -63,6 +50,4 @@ package() {
       sed -i "s|${pkgdir}||g" "${pkgdir}/$f"
       sed -i "s|${srcdir}|/usr/src/|g" "${pkgdir}/$f"
     done
-    #rm ${pkgdir}/usr/src/${pkgname}/madagascar.tar.gz
 }
-md5sums=('SKIP')