Wed Feb 27 00:03:48 PST 2013

1 files changed, 17 insertions, 12 deletions

diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index e07e9a946..5e29706a8 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,33 +1,38 @@
-# $Id: PKGBUILD 144089 2011-12-03 12:24:56Z ibiru $
+# $Id: PKGBUILD 178764 2013-02-26 18:56:25Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.82
+pkgver=0.83
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz
+        mtr-glib2.patch)
 url="http://www.bitwizard.nl/mtr/"
-md5sums=('10601ea543fda3e51545c4bce195b64c')
+md5sums=('2e3a40f2da47748ad0053a5d678b9b4a'
+         '6bce08e1de7c6835bdda893847981bc8')
 
 build() {
-    install -d  "$srcdir/"{mtr-cli,mtr-gtk}
-    cd "$srcdir/mtr-cli"
-    ../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk
+    patch -Np0 -i mtr-glib2.patch
+    cp -r  $pkgbase-$pkgver $pkgbase-cli
+    cd mtr-cli
+    ./bootstrap.sh
+    ./configure --prefix=/usr --without-gtk
     make
 
-    cd "$srcdir/mtr-gtk"
-    ../$pkgbase-$pkgver/configure --prefix=/usr
+    cd "$srcdir/$pkgbase-$pkgver"
+    ./bootstrap.sh
+    ./configure --prefix=/usr
     make
 }
 
 package_mtr() {
     pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)"
-    depends=('ncurses')
-    cd "$srcdir/mtr-cli"
+    depends=('ncurses' 'glib2')
+    cd mtr-cli
     make DESTDIR="$pkgdir" install
 }
 
@@ -37,6 +42,6 @@ package_mtr-gtk() {
     conflicts=("mtr")
     provides=("mtr=$pkgver")
 
-    cd "$srcdir/mtr-gtk"
+    cd $pkgbase-$pkgver
     make DESTDIR="$pkgdir" install
 }