2 files changed, 26 insertions, 16 deletions
diff --git a/pcr/octave-control/PKGBUILD b/pcr/octave-control/PKGBUILD
index 4ea2c6496..ad28841c8 100644
--- a/pcr/octave-control/PKGBUILD
+++ b/pcr/octave-control/PKGBUILD
@@ -9,7 +9,7 @@
 
 _pack=control
 pkgname=octave-$_pack
-pkgver=2.8.0
+pkgver=2.8.1
 pkgrel=1
 pkgdesc="Computer-Aided Control System Design (CACSD) Tools for GNU Octave, based on the proven SLICOT Library"
 arch=(any)
@@ -25,16 +25,31 @@ install=$pkgname.install
 _archive=$_pack-$pkgver.tar.gz
 source=("http://downloads.sourceforge.net/octave/$_archive")
 noextract=("$_archive")
-md5sums=('0a2f043b8a80323ab58c1d9641cf411a')
+md5sums=('0b6141a0937c9be83cabb49256d0f3c8')
+
+_install_dir() {
+	src=$1
+	dst=$2
+	mkdir -p "$(dirname "$dst")"
+	cp -rT "$src" "$dst"
+}
 
 build() {
-  cd "$srcdir"
-  mkdir -p builddir
-  octave -q -f --eval "pkg build -verbose -nodeps builddir $_archive"
+	_prefix="$srcdir"/install_prefix
+	_archprefix="$srcdir"/install_archprefix
+	mkdir -p "$_prefix" "$_archprefix"
+	cd "$srcdir"
+	octave -q -f --eval "$(cat <<-EOF
+		pkg local_list octave_packages;
+		pkg prefix $_prefix $_archprefix;
+		pkg install -verbose -nodeps $_archive;
+		EOF
+		)"
 }
 
 package() {
-  mkdir -p "$pkgdir/usr/share/octave/packages"
-  mkdir -p "$pkgdir/usr/lib/octave/packages"
-  cp "$srcdir/builddir/$_archive" "$pkgdir/usr/share/octave/$_pack.tar.gz"
+	prefix=$pkgdir/usr/share/octave/packages
+	archprefix=$pkgdir/usr/lib/octave/packages
+	_install_dir "$srcdir"/install_prefix "$prefix"
+	_install_dir "$srcdir"/install_archprefix "$archprefix"
 }
diff --git a/pcr/octave-control/octave-control.install b/pcr/octave-control/octave-control.install
index 36e195ce7..be6e3265f 100644
--- a/pcr/octave-control/octave-control.install
+++ b/pcr/octave-control/octave-control.install
@@ -1,18 +1,13 @@
 _pack=control
 
-## arg 1:  the new package version
 post_install() {
-  octave -q -f --eval "pkg install -verbose -global /usr/share/octave/$_pack.tar.gz"
+	octave -q -f --eval "pkg rebuild -global $_pack"
 }
 
-## arg 1:  the new package version
-## arg 2:  the old package version
 post_upgrade() {
-  post_remove
-  post_install
+	post_install
 }
 
-## arg 1:  the old package version
 post_remove() {
-  octave -q -f --eval "pkg uninstall $_pack; pkg rebuild -global"
+	octave -q -f --eval "pkg rebuild -global"
 }