change pkg folder and update new git version

2 files changed, 29 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef51da2088a6..f021b25285dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = madagascar-git
 	pkgdesc = Multidimensional data analysis and reproducible computational experiments.
-	pkgver = r15659.d72996857
-	pkgrel = 2
+	pkgver = r15660.e9eaa7b64
+	pkgrel = 1
 	url = https://www.reproducibility.org/wiki/Main_Page
 	arch = i686
 	arch = x86_64
@@ -23,8 +23,10 @@ pkgbase = madagascar-git
 	depends = scons
 	depends = plplot
 	optdepends = cuda: for nvcc, but not compatible with cuda12
+	provides = madagascar
+	conflicts = madagascar
 	options = strip
-	source = madagascar-git::git+https://github.com/ahay/src
+	source = madagascar::git+https://github.com/ahay/src
 	md5sums = SKIP
 
 pkgname = madagascar-git
diff --git a/PKGBUILD b/PKGBUILD
index 799065586664..68e04f236973 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Contributor: anon at sansorgan.es
 # Contributor: Yingchang Liu
 pkgname=madagascar-git
-pkgver=r15659.d72996857
-pkgrel=2
+pkgver=r15660.e9eaa7b64
+pkgrel=1
 pkgdesc="Multidimensional data analysis and reproducible computational experiments."
 url="https://www.reproducibility.org/wiki/Main_Page"
 license=('GPL2')
@@ -11,38 +11,42 @@ depends=('libtirpc' 'ffmpeg' 'libxaw' 'cairo' 'fftw' 'netpbm' 'gd' 'swig' 'pytho
 	 'openmpi' 'glu' 'freeglut' 'suitesparse' 'cblas' 'scons' 'plplot') 
 optdepends=('cuda: for nvcc, but not compatible with cuda12')
 options=('strip')
-source=($pkgname::git+https://github.com/ahay/src)
+_pkgname=${pkgname%-git}
+source=($_pkgname::git+https://github.com/ahay/src)
+# source=($pkgname::git+https://github.com/ahay/src)
 md5sums=('SKIP')
+provides=('madagascar')
+conflicts=('madagascar')
 
 pkgver() {
-    cd ${pkgname}
+    cd ${_pkgname}
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  mkdir -p ${srcdir}/${pkgname}
-  cd ${srcdir}/${pkgname}
-  export RSFROOT=${pkgdir}/opt/${pkgname}
+  mkdir -p ${srcdir}/${_pkgname}
+  cd ${srcdir}/${_pkgname}
+  export RSFROOT=${pkgdir}/opt/${_pkgname}
   # hide hwang's src which can not be compiled.
   mv ./user/hwang ./user/.hwang
   
-  ./configure API=c++,f90
+  ./configure API=c++,f90 --prefix=${RSFROOT}
   make
 }
 
 package() {
-    export RSFROOT=${pkgdir}/opt/${pkgname}
+    export RSFROOT=${pkgdir}/opt/${_pkgname}
     mkdir -p ${RSFROOT}/bin/
     export PATH=${RSFROOT}/bin:$PATH
-    cd ${srcdir}/${pkgname}
+    cd ${srcdir}/${_pkgname}
     make install
     
-    cp -r ${srcdir}/${pkgname} ${RSFROOT}/src
+    cp -r ${srcdir}/${_pkgname} ${RSFROOT}/src
     rm -r ${RSFROOT}/src/.git 
    
     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} ${RSFROOT}/rsfcodes
+    # ln -s ${srcdir}/${_pkgname} ${RSFROOT}/rsfcodes
     # chmod -R 755 ${RSFROOT}/rsfcodes
     
     # fix paths in in files
@@ -59,19 +63,19 @@ package() {
     echo ${srcdir}
     for f in ${arr[@]} ; do
       sed -i "s|${pkgdir}||g" "${RSFROOT}/$f"
-      sed -i "s|${srcdir}/${pkgname}|/opt/${pkgname}/src|g" "${RSFROOT}/$f"
+      sed -i "s|${srcdir}/${_pkgname}|/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 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
+    cat > "$pkgdir/etc/profile.d/${_pkgname}.sh" << EOF
 #!/bin/sh
-source /opt/${pkgname}/share/madagascar/etc/env.sh
+source /opt/${_pkgname}/share/madagascar/etc/env.sh
 EOF
-    cat > "$pkgdir/etc/profile.d/${pkgname}.csh" << EOF
+    cat > "$pkgdir/etc/profile.d/${_pkgname}.csh" << EOF
 #!/bin/csh
-source /opt/${pkgname}/share/madagascar/etc/env.csh
+source /opt/${_pkgname}/share/madagascar/etc/env.csh
 EOF
-    chmod 755 "$pkgdir/etc/profile.d/${pkgname}"{.sh,.csh}
+    chmod 644 "$pkgdir/etc/profile.d/${_pkgname}"{.sh,.csh}
 }