From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 4 Feb 2012 20:09:16 +0000 (+0000)
Subject: [packages_10.03.2] mtr: merge r28398, r29737
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a869fafc78b0a37de006c29017b49f77025cf6bf;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.2] mtr: merge r28398, r29737

SVN-Revision: 30106
---

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 3e7c8c0a44..d6aedec804 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtr
-PKG_VERSION:=0.80
+PKG_VERSION:=0.82
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr
-PKG_MD5SUM:=fa68528eaec1757f52bacf9fea8c68a9
+PKG_MD5SUM:=10601ea543fda3e51545c4bce195b64c
 
 PKG_INSTALL:=1
 
diff --git a/net/mtr/patches/520-libresolv_fix.patch b/net/mtr/patches/520-libresolv_fix.patch
index e507553a6e..b8f6aac6b9 100644
--- a/net/mtr/patches/520-libresolv_fix.patch
+++ b/net/mtr/patches/520-libresolv_fix.patch
@@ -8,8 +8,8 @@
 -  AC_CHECK_LIB(bind, res_mkquery, , 
 -   AC_CHECK_LIB(resolv, res_mkquery, ,
 -     AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))
-+#AC_CHECK_FUNC(res_mkquery, , 
-+#  AC_CHECK_LIB(bind, res_mkquery, , 
++#AC_CHECK_FUNC(res_mkquery, ,
++#  AC_CHECK_LIB(bind, res_mkquery, ,
 +#   AC_CHECK_LIB(resolv, res_mkquery, ,
 +#     AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))
  # This next line would override the just detected-or-not -lresolv. 
diff --git a/net/mtr/patches/521-gtk_fix.patch b/net/mtr/patches/521-gtk_fix.patch
index 5dbcbeda04..4314573e89 100644
--- a/net/mtr/patches/521-gtk_fix.patch
+++ b/net/mtr/patches/521-gtk_fix.patch
@@ -11,9 +11,6 @@
 -                   AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
 -                           GTK_OBJ="")
 -else
--	AC_DEFINE(NO_GTK)
--	GTK_OBJ=""
--fi
 +#if test "x$WANTS_GTK" = "xyes"; then
 +#        AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
 +#                           LIBS="$LIBS $GTK_LIBS -lm",
@@ -21,8 +18,9 @@
 +#                   AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
 +#                           GTK_OBJ="")
 +#else
-+	AC_DEFINE(NO_GTK)
-+	GTK_OBJ=""
+ 	AC_DEFINE(NO_GTK)
+ 	GTK_OBJ=""
+-fi
 +#fi
  
  AC_CHECK_FUNC(socket, ,