diff options
Diffstat (limited to 'abs')
| -rw-r--r-- | abs/extra/htop/ChangeLog | 17 | ||||
| -rw-r--r-- | abs/extra/htop/PKGBUILD | 38 | ||||
| -rw-r--r-- | abs/extra/htop/htop.c.patch | 15 |
3 files changed, 21 insertions, 49 deletions
diff --git a/abs/extra/htop/ChangeLog b/abs/extra/htop/ChangeLog deleted file mode 100644 index ea57762..0000000 --- a/abs/extra/htop/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -2011-05-17 Angel Velasquez <angvp@archlinux.org> - * Added patch to fix --sort-key (closes FS#23224) - -2009-09-21 Eric Belanger <eric@archlinux.org> - - * htop 0.8.3-1 - * Upstream update - * Built with vserver and openvz support (close FS#12755) - -2008-12-09 Alexander Fehr <pizzapunk gmail com> - - * htop-0.8.1-1: - * New upstream release - * New maintainer - * Added patch to fix FS#12235 - * Enabled Unicode support - * Added ChangeLog diff --git a/abs/extra/htop/PKGBUILD b/abs/extra/htop/PKGBUILD index 05c8826..93b4db6 100644 --- a/abs/extra/htop/PKGBUILD +++ b/abs/extra/htop/PKGBUILD @@ -1,35 +1,39 @@ -# $Id$ +# $Id: PKGBUILD 170397 2012-11-07 01:25:17Z dreisner $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=htop -pkgver=0.9 -pkgrel=2 +pkgver=1.0.2 +pkgrel=1 pkgdesc="Interactive process viewer" arch=('i686' 'x86_64') url="http://htop.sourceforge.net/" license=('GPL') depends=('ncurses') makedepends=('python2') +optdepends=('lsof: show files opened by a process' + 'strace: attach to a running process') options=('!emptydirs') -changelog=ChangeLog -source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz - htop.c.patch) -md5sums=('7c5507f35f363f3f40183a2ba3c561f8' - '750e8ad8476c5d9738da2a2bc7a7c2b6') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('0d01cca8df3349c74569cefebbd9919e') build() { - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure - sed -i 's|python|python2|' scripts/MakeHeader.py - patch -Np0 -i $srcdir/htop.c.patch - ./configure --prefix=/usr --enable-unicode --enable-openvz \ - --enable-vserver - make + cd "$pkgname-$pkgver" + + sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure + sed -i 's|python|python2|' scripts/MakeHeader.py + + ./configure \ + --prefix=/usr \ + --enable-unicode \ + --enable-openvz \ + --enable-vserver \ + --enable-cgroup + + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install } diff --git a/abs/extra/htop/htop.c.patch b/abs/extra/htop/htop.c.patch deleted file mode 100644 index 41a2dd3..0000000 --- a/abs/extra/htop/htop.c.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Roman Kosenko <madkite@gmail.com> -Date: Thu, 10 Mar 2011 16:23:53 +0200 -Subject: [PATCH] Fix stupid bug with --sort-key - ---- htop.c.old 2010-11-24 20:45:38.000000000 +0200 -+++ htop.c 2011-03-10 16:32:18.473716667 +0200 -@@ -282,7 +282,7 @@ - printVersionFlag(); - break; - case 's': -- if (strcmp(optarg, "help")) { -+ if (!strcmp(optarg, "help")) { - for (int j = 1; j < LAST_PROCESSFIELD; j++) - printf ("%s\n", Process_fieldNames[j]); - exit(0); |