just install everything

2 files changed, 17 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8bec8cce477a..ab9e696cb496 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,7 @@
 pkgbase = heasoft
+	pkgdesc = NASA high energy astrophysics library
 	pkgver = 6.21
-	pkgrel = 1
+	pkgrel = 2
 	url = https://heasarc.gsfc.nasa.gov/docs/software/lheasoft/
 	arch = x86_64
 	license = NASA
@@ -13,19 +14,11 @@ pkgbase = heasoft
 	depends = libtinfo
 	depends = readline
 	depends = libxpm
+	optdepends = lynx
 	source = http://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/release/heasoft-6.21src_no_xspec_modeldata.tar.gz
 	source = heasoft-6.21_nolynx.patch
 	sha1sums = 3c55645feae3ddffc86d6c1b3c1b989e8a7d5d1b
 	sha1sums = c1d4940d1aa599bf3b8b61b3471ebf057869b517
 
-pkgname = heasoft-base
-	pkgdesc = Base libraries for heasoft software
-
-pkgname = xspec
-	pkgdesc = An Xray spectral fitting software
-	depends = heasoft-base
-
-pkgname = ftools
-	pkgdesc = A General Package of Software to Manipulate FITS Files
-	depends = heasoft-base
+pkgname = heasoft
 
diff --git a/PKGBUILD b/PKGBUILD
index 091ac224a204..6816dd776446 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,24 @@
 # Maintainer:  Yigit Dallilar <yigit.dallilar@gmail.com>
 
-pkgbase=heasoft
-_mainpkg=heasoft
-_mainver=6.21
-_crntpkg=''
-pkgname=('heasoft-base' 'xspec' 'ftools')
+pkgname=heasoft
 pkgver=6.21
-pkgrel=1
+pkgrel=2
+pkgdesc="NASA high energy astrophysics library"
 makedepends=("gcc" "glibc" "gcc-fortran" "perl")
 depends=("ncurses" "libtinfo" "readline" "libxpm" )
+optdepends=("lynx")
 url="https://heasarc.gsfc.nasa.gov/docs/software/lheasoft/"
 arch=('x86_64')
 license=('NASA' 'GPL')
-source=(http://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/release/${pkgbase}-${pkgver}src_no_xspec_modeldata.tar.gz ${pkgbase}-${pkgver}_nolynx.patch)
+source=(http://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/release/${pkgname}-${pkgver}src_no_xspec_modeldata.tar.gz ${pkgname}-${pkgver}_nolynx.patch)
 sha1sums=('3c55645feae3ddffc86d6c1b3c1b989e8a7d5d1b'
 	'c1d4940d1aa599bf3b8b61b3471ebf057869b517')
 
 prepare() {
   # lynx conflict with ncurses and openssl. For now left it out.
-  cd $srcdir/${pkgbase}-${pkgver}
-  patch -Np1 -i ../${pkgbase}-${pkgver}_nolynx.patch 
+  # lynx can be installed from official repo.
+  cd $srcdir/${pkgname}-${pkgver}
+  patch -Np1 -i ../${pkgname}-${pkgver}_nolynx.patch 
 }
 
 
@@ -30,67 +29,17 @@ build() {
   export FC=/usr/bin/gfortran
   export PERL=/usr/bin/perl
 
-  cd $srcdir/${_mainpkg}-${pkgver}/BUILD_DIR
-  ./configure --prefix=$pkgdir/opt/$pkgbase-$pkgver
+  cd $srcdir/${pkgname}-${pkgver}/BUILD_DIR
+  ./configure --prefix=${pkgdir}/opt/${pkgname}-${pkgver}
   
   make 
 
 }
 
-package_heasoft-base(){
+package(){
 
-  _crntpkg='heasoft-base'
-  pkgdesc='Base libraries for heasoft software'
-
-  cd $srcdir/$pkgbase-${_mainver}/BUILD_DIR
-  ./configure --prefix=$pkgdir/opt/$pkgbase-${_mainver}
-  make "HD_SELECTED=heacore tcltk heatool heagen attitude" install
-
-}
-
-# Remove common files
-_clean_conflict () {
-
-  export _glibcver=$(ldd --version | head -n1 | cut -d' ' -f4)
-
-  echo $pkgdir/opt/${_mainpkg}-$pkgver/x86_64-unknown-linux-gnu-libc${_glibcver}/BUILD_DIR/
-
-  rm -rf $pkgdir/opt/${_mainpkg}-$pkgver/x86_64-unknown-linux-gnu-libc${_glibcver}/BUILD_DIR/
-  rm -rf $pkgdir/opt/${_mainpkg}-$pkgver/x86_64-unknown-linux-gnu-libc${_glibcver}/bin/hd_install
-  rm -rf $pkgdir/opt/${_mainpkg}-$pkgver/x86_64-unknown-linux-gnu-libc${_glibcver}/bin/hd_scanenv
-  rm -rf $pkgdir/opt/${_mainpkg}-$pkgver/x86_64-unknown-linux-gnu-libc${_glibcver}/bin/hmake
-  rm -rf $pkgdir/opt/${_mainpkg}-$pkgver/x86_64-unknown-linux-gnu-libc${_glibcver}/bin/lhea-fixperl
-  rm -rf $pkgdir/opt/${_mainpkg}-$pkgver/x86_64-unknown-linux-gnu-libc${_glibcver}/headas-init.csh
-  rm -rf $pkgdir/opt/${_mainpkg}-$pkgver/x86_64-unknown-linux-gnu-libc${_glibcver}/headas-init.sh
-
-}
-
-package_xspec(){
-
-  _crntpkg='xspec'
-  _pkgver=12.9.1
-  pkgdesc="An Xray spectral fitting software ${_pkgver}"
-  depends=('heasoft-base')
-
-  cd $srcdir/$pkgbase-${_mainver}/BUILD_DIR
-  ./configure --prefix=$pkgdir/opt/$pkgbase-${_mainver} 
-  make "HD_SELECTED=Xspec" install
-
-  _clean_conflict
-
-}
-
-package_ftools(){
-
-  _crntpkg='ftools'
-  pkgdesc='A General Package of Software to Manipulate FITS Files'
-  depends=('heasoft-base')
-
-  cd $srcdir/$pkgbase-${_mainver}/BUILD_DIR
-  ./configure --prefix=$pkgdir/opt/$pkgbase-${_mainver} 
-  make "HD_SELECTED=ftools" install
-
-  _clean_conflict
+  cd $srcdir/${pkgname}-${pkgdir}/BUILD_DIR
+  make install
 
 }