Bump to upstream version 1.8.1

2 files changed, 64 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 01664bc6fb53..10dff6a54ecb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,27 @@
 pkgbase = barriers
 	pkgdesc = Compute local minima and energy barriers of a landscape
-	pkgver = 1.8.0
+	pkgver = 1.8.1
 	pkgrel = 1
 	url = https://www.tbi.univie.ac.at/RNA/Barriers
 	arch = x86_64
 	arch = i686
 	license = Custom
+	depends = perl
 	optdepends = viennarna: Generate sets of suboptimal RNA secondary structures with RNAsubopt
 	optdepends = treekin: Compute folding dynamics using barriers generated transition rates
-	source = http://www.tbi.univie.ac.at/RNA/packages/source/Barriers-1.8.0.tar.gz
-	sha256sums = c1b16f5ac32def877677a5d8afa08d7fd16d3c4d4d1a2e683a5da09e4071feaa
+	source = http://www.tbi.univie.ac.at/RNA/packages/source/Barriers-1.8.1.tar.gz
+	sha256sums = 072c1bfdddf70bd638b068e2a651308cddccb5661478502537a55377e625cea0
 
 pkgname = barriers
+	provides = genPoHoLandscape
+	provides = crossrates.pl
+	provides = saddle2dot.pl
+	provides = saddle2gml.pl
+	provides = treeplot.pl
+
+pkgname = perl-rna-barrier
+	depends = perl
+	depends = perl-rna
+	provides = fix_bar.pl
+	provides = saddle.pl
 
diff --git a/PKGBUILD b/PKGBUILD
index b42ff183beaa..72c421956308 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,69 @@
 # Maintainer: Ronny Lorenz <ronny at tbi dot univie dot ac dot at>
 
-pkgname=barriers
-pkgver=1.8.0
+pkgbase=barriers
+pkgname=('barriers' 'perl-rna-barrier')
+pkgver=1.8.1
 pkgrel=1
 pkgdesc="Compute local minima and energy barriers of a landscape"
 arch=('x86_64' 'i686')
 license=('Custom')
 url="https://www.tbi.univie.ac.at/RNA/Barriers"
-depends=()
+depends=('perl')
 optdepends=('viennarna: Generate sets of suboptimal RNA secondary structures with RNAsubopt'
             'treekin: Compute folding dynamics using barriers generated transition rates')
-makedepends=()
-provides=()
 source=(http://www.tbi.univie.ac.at/RNA/packages/source/Barriers-${pkgver}.tar.gz)
-sha256sums=('c1b16f5ac32def877677a5d8afa08d7fd16d3c4d4d1a2e683a5da09e4071feaa')
+sha256sums=('072c1bfdddf70bd638b068e2a651308cddccb5661478502537a55377e625cea0')
 
 build() {
   cd "${srcdir}/Barriers-${pkgver}"
-  ./configure --prefix=/usr || return 1
+  ./configure --prefix=/usr INSTALLDIRS=vendor || return 1
   make || return 1
 }
 
-package() {
+check() {
+  cd "$srcdir/Barriers-${pkgver}"
+  export LC_ALL=C
+  make check
+}
+
+package_barriers() {
+  provides=('genPoHoLandscape'
+            'crossrates.pl'
+            'saddle2dot.pl'
+            'saddle2gml.pl'
+            'treeplot.pl')
+
   cd "${srcdir}/Barriers-${pkgver}"
+
+  # install executables
+  cd src/
   make DESTDIR="${pkgdir}" install || return 1
+  cd ..
+
+  # install manpages, documentation, examples, and misc files
+  cd man
+  make DESTDIR="${pkgdir}" install
+  cd ..
+
+  # install generic perl scripts
+  cd perl/
+  for perlscript in crossrates.pl saddle2dot.pl saddle2gml.pl treeplot.pl ; do
+    install -Dm755 "$perlscript" "$pkgdir/usr/bin/"
+  done
+  cd ..
 }
 
+package_perl-rna-barrier() {
+  depends=('perl' 'perl-rna')
+  provides=('fix_bar.pl'
+            'saddle.pl')
+  cd "${srcdir}/Barriers-${pkgver}"
+  cd perl
+  make DESTDIR="${pkgdir}" install
+
+  # remove any perl scripts not belonging to this package
+  for perlscript in crossrates.pl saddle2dot.pl saddle2gml.pl treeplot.pl ; do
+    rm "${pkgdir}/usr/bin/${perlscript}"
+  done
+  cd ..
+}