Thu Apr 24 03:25:33 UTC 2014

1 files changed, 11 insertions, 21 deletions

diff --git a/community/xdiskusage/PKGBUILD b/community/xdiskusage/PKGBUILD
index 71491ef78..8d946eab7 100644
--- a/community/xdiskusage/PKGBUILD
+++ b/community/xdiskusage/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65246 2012-02-20 12:32:09Z spupykin $
+# $Id: PKGBUILD 110070 2014-04-23 17:10:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=xdiskusage
 pkgver=1.48
-pkgrel=7
+pkgrel=8
 pkgdesc="xdiskusage is a user-friendly program to show you what is using up all your disk space"
 arch=('i686' 'x86_64')
 depends=('fltk')
@@ -14,34 +14,24 @@ license=('GPL')
 url="http://xdiskusage.sourceforge.net"
 options=(!emptydirs)
 source=(http://xdiskusage.sourceforge.net/$pkgname-$pkgver.tgz
-	'stdin-is-null.patch')
+	'build-fix.patch')
 md5sums=('a902aa9d73761ade98256c3cd5c1f533'
-         '0181b66b44e382e44c91602d8de9a7b6')
+         '570eb00cb0999231620b67889325a81f')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/-lGL -lGLU/-lXft/' makeinclude.in
-
-  patch -Np1 -i "$srcdir/stdin-is-null.patch"
-
-  [ $CARCH == "x86_64" ] && patch xdiskusage.C <<EOF
-991c991
-<   switch ((int)v) {
----
->   switch ((long long)v) {
-1004c1004
-<   int n = (int)v;
----
->   int n = (long long)v;
-EOF
+  patch -Np1 -i "$srcdir/build-fix.patch"
+}
 
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
-  install -d "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
-  LDFLAGS=-lXi make
+  make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
+  install -d "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
   make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install
   chmod 0644 $pkgdir/usr/share/man/man1/*
 }