/opt to standard /usr

4 files changed, 8 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 861db78787ae..275e3490d5ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freefem
 	pkgdesc = A PDE oriented language using the finite element method
 	pkgver = 4.8.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://freefem.org/index.html
 	arch = x86_64
 	license = LGPL
@@ -39,11 +39,7 @@ pkgbase = freefem
 	conflicts = freefem-ext-dl
 	conflicts = freefem-git
 	source = freefem-4.8.0.tar.gz::https://github.com/FreeFem/FreeFem-sources/archive/v4.8.tar.gz
-	source = freefem.sh
-	source = freefem.csh
 	sha256sums = 499b1ca24d45088226a238412ea1492d9cc3eb6088866904145511469780180d
-	sha256sums = 8dfad023deccc20044bac7fb1c4c73221026c8a8f52ed2d7727065c71d87e488
-	sha256sums = 56eea801f08cc0f790af79a49c680d54f763fee196ce7d65af470c732c3d1043
 
 pkgname = freefem
 
diff --git a/PKGBUILD b/PKGBUILD
index b3a177cecb8a..3face420c995 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=freefem
 pkgver=4.8.0
 _pkgver=4.8
-pkgrel=1
+pkgrel=2
 pkgdesc='A PDE oriented language using the finite element method'
 arch=('x86_64')
 url="https://freefem.org/index.html"
@@ -15,25 +15,22 @@ makedepends=('bison' 'flex' 'texlive-core' 'gcc-fortran' 'unzip' 'autoconf' 'pyt
 optdepends=( 'cblas' 'fftw' 'nlopt' 'coin-or-ipopt' 'scotch' 'mumps' 'scalapack' 'lapack' 'superlu' 'mmg3d' 'petsc' 'slepc' 'boost' 'metis' 'tetgen')
 conflicts=('freefem-ext-dl' 'freefem-git')
 provides=('freefem')
-source=($pkgname-$pkgver.tar.gz::https://github.com/FreeFem/FreeFem-sources/archive/v${_pkgver}.tar.gz
-        freefem.sh
-        freefem.csh)
-sha256sums=('499b1ca24d45088226a238412ea1492d9cc3eb6088866904145511469780180d'
-            '8dfad023deccc20044bac7fb1c4c73221026c8a8f52ed2d7727065c71d87e488'
-            '56eea801f08cc0f790af79a49c680d54f763fee196ce7d65af470c732c3d1043')
+source=($pkgname-$pkgver.tar.gz::https://github.com/FreeFem/FreeFem-sources/archive/v${_pkgver}.tar.gz)
+sha256sums=('499b1ca24d45088226a238412ea1492d9cc3eb6088866904145511469780180d')
+
 prepare() {
   cd FreeFem-sources-${_pkgver}
 
   autoreconf -i
   # Use system/AUR packages for 3rdparty.
   # MUMPS, HPDDM provided by petsc.
-  ./configure --prefix=/opt/freefem \
+  ./configure --prefix=/usr \
               --enable-summary \
               --with-petsc=${PETSC_DIR}/lib/petsc/conf/petscvariables \
               --with-slepc=${SLEPC_DIR}/lib/slepc/conf/slepcvariables \
               --disable-superlu \
-	      --disable-mumps_seq \
-              --with-ipodpt-include 
+	      --disable-mumps_seq
+              #--with-ipopt-include 
               #--with-superlu-include=/usr/include/superlu \
   ./reconfigure
 }
@@ -51,7 +48,4 @@ check() {
 package() {
   cd FreeFem-sources-${_pkgver}
   make -d DESTDIR="${pkgdir}" install || true
-  cd ${srcdir}
-  install -Dm 644 ${pkgname}.sh ${pkgdir}/etc/profile.d/${pkgname}.sh
-  install -Dm 644 ${pkgname}.sh ${pkgdir}/etc/profile.d/${pkgname}.csh
 }
diff --git a/freefem.csh b/freefem.csh
deleted file mode 100644
index c5d54c4f1c97..000000000000
--- a/freefem.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv PATH /opt/freefem/bin:${PATH}
diff --git a/freefem.sh b/freefem.sh
deleted file mode 100644
index 8751bed4d67d..000000000000
--- a/freefem.sh
+++ /dev/null
@@ -1 +0,0 @@
-export PATH=/opt/freefem/bin:${PATH}