change back to release version, and repackaged to /opt/madagascar. The git version is now named madagascar-git.

2 files changed, 63 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2698caf23a81..fe55be2afb5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
 pkgbase = madagascar
 	pkgdesc = Multidimensional data analysis and reproducible computational experiments.
-	pkgver = r15659.d72996857
+	pkgver = 4.0
 	pkgrel = 1
 	url = https://www.reproducibility.org/wiki/Main_Page
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = libtirpc
-	makedepends = libtirpc
 	makedepends = scons
 	depends = libtirpc
 	depends = ffmpeg
@@ -20,9 +18,13 @@ pkgbase = madagascar
 	depends = glu
 	depends = freeglut
 	depends = suitesparse
+	depends = python
+	depends = swig
+	optdepends = cuda: GPU acceleration, but not compatible with cuda 12
+	optdepends = plplot: scientific plot
 	noextract = madagascar.tar.gz
 	options = strip
-	source = madagascar::git+https://github.com/ahay/src
+	source = madagascar.tar.gz::https://sourceforge.net/projects/rsf/files/madagascar/madagascar-4.0/madagascar-4.0.1.tar.gz/download
 	md5sums = SKIP
 
 pkgname = madagascar
diff --git a/PKGBUILD b/PKGBUILD
index fa70a94ce794..79d16e3539dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,85 @@
 # Contributor: anon at sansorgan.es
 
 pkgname=madagascar
-pkgver=r15659.d72996857
+pkgver=4.0
 pkgrel=1
 pkgdesc="Multidimensional data analysis and reproducible computational experiments."
 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') 
-makedepends=('libtirpc' 'libtirpc' 'scons')
+	 'openmpi' 'glu' 'freeglut' 'suitesparse' 'python' 'swig')
+optdepends=('cuda: GPU acceleration, but not compatible with cuda 12' 'plplot: scientific plot')
+makedepends=('scons')
 options=('strip')
-source=($pkgname::git+https://github.com/ahay/src)
+source=("$pkgname.tar.gz::https://sourceforge.net/projects/rsf/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.$pkgrel.tar.gz/download")
 md5sums=('SKIP')
 noextract=("$pkgname.tar.gz")
 
-pkgver(){
-  cd "$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+prepare() {
+    cd "$srcdir"
+    mkdir -p ${srcdir}/${pkgname}
+    bsdtar -xf $pkgname.tar.gz --strip-components=1 -C ${srcdir}/${pkgname}
 }
 
 build() {
+  mkdir -p ${srcdir}/${pkgname}
   cd ${srcdir}/${pkgname}
+  export RSFROOT=${pkgdir}/opt/${pkgname}
 
-  mkdir -p ${srcdir}/bin/
-  export PATH=${srcdir}/bin:$PATH
-
-  export LINKFLAGS="-llapack -lblas -ltirpc -pthread -fopenmp"
-  ./configure --prefix=${pkgdir}/usr/
-
-  echo "Fixing paths in files..."
-
-  sed -i "s/^LINKFLAGS.*/LINKFLAGS = ['-llapack', '-lblas', '-pthread', '-fopenmp', '-ltirpc']/g" config.py
-  make "${MAKEFLAGS}"
+# fix paths for tirpc in framework/configure.py
+  sed -i '430,433c\
+    (plat['\''distro'\''\] == '\''centos'\'' and int(plat['\''version'\''\][0]) >= 8) or \\\
+    plat['\''distro'\''\] == '\''fedora'\'' or \\\
+    plat['\''distro'\''\] == '\''arch'\'' or \\\
+    (plat['\''distro'\''\] == '\''ubuntu'\'' and int(plat['\''version'\''\][:2]) >= 20): \ \
+        context.env['\''CPPPATH'\''\] = path_get(context,'\''CPPPATH'\'','\''/usr/include/tirpc'\'')' framework/configure.py
+    # export LINKFLAGS="-llapack -lblas -ltirpc -pthread -fopenmp"
+  ./configure
+    # sed -i "s/^LINKFLAGS.*/LINKFLAGS = ['-llapack', '-lblas', '-pthread', '-fopenmp', '-ltirpc']/g" config.py
+    # make "${MAKEFLAGS}"
+  make 
 }
 
 package() {
+    export RSFROOT=${pkgdir}/opt/${pkgname}
+    mkdir -p ${RSFROOT}/bin/
+    export PATH=${RSFROOT}/bin:$PATH
     cd ${srcdir}/${pkgname}
     make install
-    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/python3.11/site-packages/rsf/prog.py"
-    arr[2]="usr/share/madagascar/etc/env.sh"
-    arr[3]="usr/src/madagascar/config.py"
+
+    cp -r ${srcdir}/${pkgname} ${pkgdir}/opt/${pkgname}/src
+
+    # add a symlink to rsfcodes in /opt, so that it can be compiled by user
+    ln -s ${srcdir}/${pkgname} ${pkgdir}/opt/${pkgname}/rsfcodes
+    chmod 755 ${pkgdir}/opt/${pkgname}/rsfcodes
+# fix paths in in files
+    arr[0]="/share/madagascar/etc/config.py"
+    arr[1]="/share/madagascar/etc/env.sh"
+    arr[2]="/share/madagascar/etc/env.csh"
+    python_version=$(ls $RSFROOT/lib | grep python)
+    arr[3]="/lib/${python_version}/site-packages/rsf/prog.py"
+    arr[4]="/src/config.py"
+    arr[5]="/src/env.sh"
+    arr[6]="/src/env.csh"
+    
     echo ${pkgdir}
     echo ${srcdir}
     for f in ${arr[@]} ; do
-      sed -i "s|${pkgdir}||g" "${pkgdir}/$f"
-      sed -i "s|${srcdir}|/usr/src/|g" "${pkgdir}/$f"
+      sed -i "s|${pkgdir}||g" "${RSFROOT}/$f"
+      sed -i "s|${srcdir}|/opt/${pkgname}/src|g" "${RSFROOT}/$f"
     done
+
+    install install -dm755 "$pkgdir/usr/share/licenses/$pkgname" 
+    install -m644 COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING.txt"
+    install -dm755 "$pkgdir/etc/profile.d"
+    cat > "$pkgdir/etc/profile.d/${pkgname}.sh" << EOF
+#!/bin/sh
+source /opt/${pkgname}/src/etc/env.sh
+EOF
+    cat > "$pkgdir/etc/profile.d/${pkgname}.csh" << EOF
+#!/bin/csh
+source /opt/${pkgname}/src/etc/env.csh
+EOF
+    chmod 755 "$pkgdir/etc/profile.d/${pkgname}"{.sh,.csh}
 }