summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcr/octave-general/PKGBUILD36
-rw-r--r--pcr/octave-general/octave-general.install13
2 files changed, 29 insertions, 20 deletions
diff --git a/pcr/octave-general/PKGBUILD b/pcr/octave-general/PKGBUILD
index 9a4790fea..fb720bb27 100644
--- a/pcr/octave-general/PKGBUILD
+++ b/pcr/octave-general/PKGBUILD
@@ -1,6 +1,6 @@
#
-# Contributor : Clemens Buchacher <drizzd@aon.at>
-# Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+# Maintainer (Arch): Clemens Buchacher <drizzd@aon.at>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
#
# You can use the newpkg script from
# https://github.com/drizzd/octave-forge-archlinux to automatically generate
@@ -10,13 +10,13 @@
_pack=general
pkgname=octave-$_pack
pkgver=1.3.4
-pkgrel=1
+pkgrel=2
pkgdesc="General tools for Octave."
arch=(any)
url="http://octave.sourceforge.net/$_pack/"
license=('custom')
groups=('octave-forge')
-depends=('octave>=3.8.0')
+depends=('octave>=3.4.3')
makedepends=()
optdepends=()
backup=()
@@ -25,15 +25,31 @@ install=$pkgname.install
_archive=$_pack-$pkgver.tar.gz
source=("http://downloads.sourceforge.net/octave/$_archive")
noextract=("$_archive")
+md5sums=('f94fffe8bc7bfe83d525528ddd04c3c8')
+
+_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-general/octave-general.install b/pcr/octave-general/octave-general.install
index 1a0a2df71..25d38ea9e 100644
--- a/pcr/octave-general/octave-general.install
+++ b/pcr/octave-general/octave-general.install
@@ -1,20 +1,13 @@
_pack=general
-_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"
}