diff options
| author | root <root@rshg054.dnsready.net> | 2013-09-30 03:05:25 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-09-30 03:05:25 -0700 |
| commit | a1ba981700ea6943bedc5d7bb769b1f893088c7f (patch) | |
| tree | deb2c7698ce6657abf503fedca9ad6d519a56b8b /extra/time | |
| parent | 5a54e0a093cd01d4787eaf200ba14cfda3bc4b7a (diff) | |
Mon Sep 30 02:50:34 PDT 2013
Diffstat (limited to 'extra/time')
| -rw-r--r-- | extra/time/PKGBUILD | 36 | ||||
| -rw-r--r-- | extra/time/time.install | 16 |
2 files changed, 31 insertions, 21 deletions
diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD index 3bd8b4197..bfb999c58 100644 --- a/extra/time/PKGBUILD +++ b/extra/time/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 147242 2012-01-25 01:42:55Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.us> +# $Id: PKGBUILD 195266 2013-09-29 16:39:25Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.us> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: damir <damir@archlinux.org> pkgname=time pkgver=1.7 -pkgrel=6 +pkgrel=7 pkgdesc="Utility for monitoring a program's use of system resources" arch=('i686' 'x86_64') url="http://www.gnu.org/directory/time.html" @@ -19,22 +20,29 @@ sha1sums=('dde0c28c7426960736933f3e763320680356cc6a' 'fff80e05dd41f0a59bb1f49d1c6e581d5e8e92e5' 'b2a909e1d92f7af1bc99a4524ad84d467ed79a06') +prepare() { + cd "$pkgname-$pkgver" -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # cf https://bugzilla.redhat.com/show_bug.cgi?id=527276 - patch -Np1 -i ../time-1.7-Recompute-CPU-usage-at-microsecond-level.patch + # cf https://bugzilla.redhat.com/show_bug.cgi?id=527276 + patch -Np1 < "$srcdir"/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch + + # cf https://bugzilla.redhat.com/show_bug.cgi?id=702826 + patch -Np1 < "$srcdir"/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch - # cf https://bugzilla.redhat.com/show_bug.cgi?id=702826 - patch -Np1 -i ../time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch + # rebuild the ancient autoconf setup to fix a variety of build issues + # surrounding missing/incorrect includes. + autoreconf -fisv +} + +build() { + cd "$pkgname-$pkgver" - ./configure --prefix=/usr --infodir=/usr/share/info - make + ./configure --prefix=/usr --infodir=/usr/share/info + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" - make exec_prefix="${pkgdir}/usr" infodir="${pkgdir}/usr/share/info" install + make exec_prefix="$pkgdir/usr" infodir="$pkgdir/usr/share/info" install } diff --git a/extra/time/time.install b/extra/time/time.install index 011597c00..ceaf8e6fb 100644 --- a/extra/time/time.install +++ b/extra/time/time.install @@ -1,20 +1,22 @@ +#!/bin/bash + infodir=/usr/share/info filelist=(time.info.gz) post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info "$infodir/$file" "$infodir/dir" 2>/dev/null done } post_upgrade() { - post_install $1 + post_install "$1" } pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info --delete "$infodir/$file" "$infodir/dir" 2>/dev/null done } |