rebuild for octave 4.2.0

3 files changed, 16 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec0098fcbe9a..23b932570882 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Thu Dec 29 06:09:32 UTC 2016
 pkgbase = octave-plot
 	pkgdesc = Additional ploting tools for Octave.
 	pkgver = 1.1.0
-	pkgrel = 2
+	pkgrel = 5
 	url = http://octave.sourceforge.net/plot/
 	install = octave-plot.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 63f1513598dc..250ff39c7ed8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 _pack=plot
 pkgname=octave-$_pack
 pkgver=1.1.0
-pkgrel=2
+pkgrel=5
 pkgdesc="Additional ploting tools for Octave."
 arch=(any)
 url="http://octave.sourceforge.net/$_pack/"
@@ -26,6 +26,10 @@ source=("http://downloads.sourceforge.net/octave/$_archive")
 noextract=("$_archive")
 md5sums=('2e75d4c9d880bf82e851963218bee96d')
 
+_octave_run() {
+	octave --no-history --no-init-file --no-window-system -q -f --eval "$*"
+}
+
 _install_dir() {
 	src=$1
 	dst=$2
@@ -38,10 +42,10 @@ build() {
 	_archprefix="$srcdir"/install_archprefix
 	mkdir -p "$_prefix" "$_archprefix"
 	cd "$srcdir"
-	octave -q -f --eval "$(cat <<-EOF
+	_octave_run "$(cat <<-EOF
 		pkg local_list octave_packages;
 		pkg prefix $_prefix $_archprefix;
-		pkg install -verbose -nodeps $_archive;
+		pkg install -verbose -nodeps -noauto $_archive;
 		EOF
 		)"
 }
diff --git a/octave-plot.install b/octave-plot.install
index 2b1d57202f08..701a58358fab 100644
--- a/octave-plot.install
+++ b/octave-plot.install
@@ -1,7 +1,11 @@
 _pack=plot
 
+_octave_run() {
+	octave --no-history --no-init-file --no-window-system -q -f --eval "$*"
+}
+
 post_install() {
-	octave -q -f --eval "pkg rebuild -global $_pack"
+	_octave_run "pkg rebuild -global $_pack"
 }
 
 post_upgrade() {
@@ -9,5 +13,5 @@ post_upgrade() {
 }
 
 post_remove() {
-	octave -q -f --eval "pkg rebuild -global"
+	_octave_run "pkg rebuild -global"
 }