From 5aa2d7527764c179fd31c1c3505b572773224c94 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 10 Apr 2013 00:05:35 -0700
Subject: Wed Apr 10 00:05:35 PDT 2013

---
 extra/mtr/PKGBUILD        | 13 ++++---------
 extra/mtr/mtr-glib2.patch | 26 --------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 extra/mtr/mtr-glib2.patch

(limited to 'extra/mtr')

diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index 5e29706a8..48c359a20 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,30 +1,25 @@
-# $Id: PKGBUILD 178764 2013-02-26 18:56:25Z ioni $
+# $Id: PKGBUILD 182370 2013-04-09 18:07:19Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.83
+pkgver=0.84
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz
-        mtr-glib2.patch)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
 url="http://www.bitwizard.nl/mtr/"
-md5sums=('2e3a40f2da47748ad0053a5d678b9b4a'
-         '6bce08e1de7c6835bdda893847981bc8')
+md5sums=('df61096ae1b18b27f915feeb907ae48c')
 
 build() {
-    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/$pkgbase-$pkgver"
-    ./bootstrap.sh
     ./configure --prefix=/usr
     make
 }
diff --git a/extra/mtr/mtr-glib2.patch b/extra/mtr/mtr-glib2.patch
deleted file mode 100644
index 76a53fa6f..000000000
--- a/extra/mtr/mtr-glib2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in
---- mtr-0.83/configure.in.glib2	2013-02-18 20:10:00.767417356 +0100
-+++ mtr-0.83/configure.in	2013-02-18 20:10:53.549513018 +0100
-@@ -59,6 +59,8 @@ else
- 	GTK_OBJ=""
- fi
- 
-+PKG_CHECK_MODULES([GLIB2], [glib-2.0])
-+
- AC_CHECK_FUNC(socket, , 
-   AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))
- 
-diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am
---- mtr-0.83/Makefile.am.glib2	2013-02-18 20:13:54.635841512 +0100
-+++ mtr-0.83/Makefile.am	2013-02-18 20:16:17.877101679 +0100
-@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \
-               mtr-gtk.h
- EXTRA_mtr_SOURCES = curses.c \
-                     gtk.c
-+AM_CFLAGS = $(GLIB2_CFLAGS)
- mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ)
--mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ)
-+mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ)
- 
- EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist
- distclean-local:
-- 
cgit v1.2.3-54-g00ecf