add c++ and fortran api, and give users write permission to share/madagascar for repeatable test

2 files changed, 10 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f731d785cf98..c0a34941e3fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = madagascar
 	pkgdesc = Multidimensional data analysis and reproducible computational experiments.
 	pkgver = 4.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.reproducibility.org/wiki/Main_Page
 	arch = i686
 	arch = x86_64
@@ -23,8 +23,8 @@ pkgbase = madagascar
 	depends = python-numpy
 	depends = swig
 	depends = cblas
+	depends = plplot
 	optdepends = cuda: GPU acceleration, but not compatible with cuda 12
-	optdepends = plplot: scientific plot
 	noextract = madagascar-4.0.1.tar.gz
 	options = strip
 	source = madagascar-4.0.1.tar.gz::https://sourceforge.net/projects/rsf/files/madagascar/madagascar-4.0/madagascar-4.0.1.tar.gz/download
diff --git a/PKGBUILD b/PKGBUILD
index 7571192186b3..a642a62c810e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname=madagascar
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 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' 'scons'
-	 'openmpi' 'glu' 'freeglut' 'suitesparse' 'python-numpy' 'swig' 'cblas')
-optdepends=('cuda: GPU acceleration, but not compatible with cuda 12' 'plplot: scientific plot ')
+	 'openmpi' 'glu' 'freeglut' 'suitesparse' 'python-numpy' 'swig' 'cblas' 'plplot')
+optdepends=('cuda: GPU acceleration, but not compatible with cuda 12')
 makedepends=('scons' 'python')
 options=('strip')
 source=("$pkgname-$pkgver.tar.gz::https://sourceforge.net/projects/rsf/files/$pkgname/$pkgname-4.0/$pkgname-$pkgver.tar.gz/download")
@@ -35,7 +35,7 @@ build() {
     (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
+  ./configure API=c++,f90
     # sed -i "s/^LINKFLAGS.*/LINKFLAGS = ['-llapack', '-lblas', '-pthread', '-fopenmp', '-ltirpc']/g" config.py
     # make "${MAKEFLAGS}"
   make 
@@ -48,11 +48,11 @@ package() {
     cd ${srcdir}/${pkgname}
     make install
 
-    cp -r ${srcdir}/${pkgname} ${pkgdir}/opt/${pkgname}/src
-
+    cp -r ${srcdir}/${pkgname} ${RSFROOT}/src
+    chmod a+w ${RSFROOT}/share/madagascar
     # 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
+    # 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"