Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/canorus/PKGBUILD
	community/celt-0.7/PKGBUILD
	community/djview4/PKGBUILD
	community/erlang-sdl/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/glitz/PKGBUILD
	community/gmerlin/PKGBUILD
	community/gmic/PKGBUILD
	community/goldendict/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/highlight/PKGBUILD
	community/jack2/PKGBUILD
	community/kvirc/PKGBUILD
	community/launchy/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/mupdf/PKGBUILD
	community/projectm/PKGBUILD
	community/psimedia/PKGBUILD
	community/pyqt3/PKGBUILD
	community/qps/PKGBUILD
	community/qstardict/PKGBUILD
	community/qsynergy/PKGBUILD
	community/synergy/PKGBUILD
	community/units/PKGBUILD
	community/yagf/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/avahi/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/cairo/PKGBUILD
	extra/calligra/PKGBUILD
	extra/cmake/PKGBUILD
	extra/dssi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glu/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/hylafax/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libbluedevil/PKGBUILD
	extra/liblastfm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpng/PKGBUILD
	extra/libqzeitgeist/PKGBUILD
	extra/libx11/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mpg123/PKGBUILD
	extra/mtr/PKGBUILD
	extra/mysql/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/nspr/PKGBUILD
	extra/polkit-qt/PKGBUILD
	extra/poppler/PKGBUILD
	extra/prison/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/qimageblitz/PKGBUILD
	extra/qscintilla/PKGBUILD
	extra/qsynth/PKGBUILD
	extra/qt-assistant-compat/PKGBUILD
	extra/qt-gstreamer/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/qwt/PKGBUILD
	extra/samba/PKGBUILD
	extra/sane/PKGBUILD
	extra/smplayer/PKGBUILD
	extra/soprano/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/tomcat-native/PKGBUILD
	extra/transmission/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/lame-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD

2 files changed, 44 insertions, 13 deletions

diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index aed9ba88e..64352bd03 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
-pkgrel=1.2
+pkgver=0.83
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 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
 }
diff --git a/extra/mtr/mtr-glib2.patch b/extra/mtr/mtr-glib2.patch
new file mode 100644
index 000000000..76a53fa6f
--- /dev/null
+++ b/extra/mtr/mtr-glib2.patch
@@ -0,0 +1,26 @@
+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: