octave-image-2.2.2-2: rebuild

2 files changed, 25 insertions, 17 deletions

diff --git a/pcr/octave-image/PKGBUILD b/pcr/octave-image/PKGBUILD
index 4978b5bf6..208c509b1 100644
--- a/pcr/octave-image/PKGBUILD
+++ b/pcr/octave-image/PKGBUILD
@@ -12,7 +12,7 @@
 _pack=image
 pkgname=octave-$_pack
 pkgver=2.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Octave-forge Image package provides functions for processing images. The package also provides functions for feature extraction, image statistics, spatial and geometric transformations, morphological operations, linear filtering, and much more."
 arch=(any)
 url="http://octave.sourceforge.net/$_pack/"
@@ -29,14 +29,29 @@ source=("http://downloads.sourceforge.net/octave/$_archive")
 noextract=("$_archive")
 md5sums=('c02a05ba37ffb38ad2b59906a56c7807')
 
+_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-image/octave-image.install b/pcr/octave-image/octave-image.install
index 5e4edf2da..7c9ea5667 100644
--- a/pcr/octave-image/octave-image.install
+++ b/pcr/octave-image/octave-image.install
@@ -1,20 +1,13 @@
 _pack=image
-_prefix=/usr/share/octave/packages
-_libdir=/usr/lib/octave/packages
 
-## arg 1:  the new package version
 post_install() {
-  octave -q -f --eval "pkg prefix $prefix $libdir; 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 prefix $prefix $libdir; pkg uninstall $_pack; pkg rebuild -global"
+	octave -q -f --eval "pkg rebuild -global"
 }