- update mtr to 0.80

"go ahead" jakob@ (MAINTAINER)

net/mtr/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.40 2010/07/12 22:07:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.41 2010/08/19 16:56:45 jasper Exp $
 
 COMMENT=	Matt's traceroute - network diagnostic tool
 
-DISTNAME=	mtr-0.75
-REVISION=	0
+DISTNAME=	mtr-0.80
 CATEGORIES=	net
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
@@ -30,13 +29,14 @@ CONFIGURE_ARGS+=	--without-gtk
 .else
 USE_X11=		Yes
 CONFIGURE_ARGS+=	--with-gtk-prefix=${LOCALBASE}
-LIB_DEPENDS+=		gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 \
-			gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2
+LIB_DEPENDS+=		gtk-x11-2.0::x11/gtk+2
+
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
-WANTLIB += iconv intl pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
-WANTLIB += png pthread-stubs xcb z
+WANTLIB += gthread-2.0 iconv intl pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-render-util
+WANTLIB += z
 .endif
 
 .include <bsd.port.mk>

net/mtr/distinfo

@@ -1,5 +1,5 @@
-MD5 (mtr-0.75.tar.gz) = I7rKUtCSLC7Lp+ugUxeGjA==
-RMD160 (mtr-0.75.tar.gz) = 199BwMm0V+7/QDTJvC8BRWuPbGg=
-SHA1 (mtr-0.75.tar.gz) = 2dP4SeMt2oqlp6KXwlBT5dhQSyc=
-SHA256 (mtr-0.75.tar.gz) = HRpd5rIzKJvxeiHjv4PILbR9IrsmmvmGIpt4honh8PM=
-SIZE (mtr-0.75.tar.gz) = 179376
+MD5 (mtr-0.80.tar.gz) = +mhSjq7BdX9Sus+f6oxoqQ==
+RMD160 (mtr-0.80.tar.gz) = CcHoz2jpwU9/RBAX+AW1C3eQguA=
+SHA1 (mtr-0.80.tar.gz) = d1PGB1POhFTE83/FJ7yC5G9rtbM=
+SHA256 (mtr-0.80.tar.gz) = drvdl/rzuAWTOlCFhUnduolZEdaJHGzFHbRyVnz/DsA=
+SIZE (mtr-0.80.tar.gz) = 272750

net/mtr/patches/patch-configure

@@ -1,6 +1,14 @@
---- configure.orig	Tue Aug 19 20:11:50 2008
-+++ configure	Sun Mar  8 19:13:13 2009
-@@ -7833,6 +7833,7 @@ cat confdefs.h >>conftest.$ac_ext
+--- configure.orig	Thu Aug 19 16:17:49 2010
++++ configure	Thu Aug 19 16:18:59 2010
+@@ -7836,6 +7836,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #ifdef HAVE_SOCKET_H
+ #include <socket.h>
+@@ -7907,6 +7908,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8,20 +16,12 @@
  #include <netinet/in.h>
  
  
-@@ -7898,6 +7899,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
-+#include <sys/types.h>
- #include <netinet/in.h>
- 
- 
-@@ -7955,7 +7957,7 @@ fi
- echo $ECHO_N "checking for C flags to get more warnings... $ECHO_C" >&6; }
- ac_save_CFLAGS="$CFLAGS"
- if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then
--    warning_CFLAGS="-Wall -Wno-pointer-sign"
-+    warning_CFLAGS="-Wall"
+@@ -7993,7 +7995,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-   warning_CFLAGS="${warning_CFLAGS} -Wno-pointer-sign"
++   warning_CFLAGS="${warning_CFLAGS}"
  else
-     case "$host_os" in
-         irix*)
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5

net/mtr/patches/patch-gtk_c

@@ -1,10 +1,10 @@
-$OpenBSD: patch-gtk_c,v 1.1 2009/03/08 18:15:45 jasper Exp $
+$OpenBSD: patch-gtk_c,v 1.2 2010/08/19 16:56:45 jasper Exp $
 
 Fix 64-bit issue.
 
---- gtk.c.orig	Sun Mar  8 19:13:24 2009
-+++ gtk.c	Sun Mar  8 19:13:44 2009
-@@ -22,6 +22,7 @@
+--- gtk.c.orig	Tue Jul 13 08:25:58 2010
++++ gtk.c	Thu Aug 19 16:19:10 2010
+@@ -21,6 +21,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>

net/mtr/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/09/15 18:17:42 espie Exp $
+@comment $OpenBSD: PLIST,v 1.7 2010/08/19 16:56:45 jasper Exp $
 @man man/man8/mtr.8
 @mode 4555
-sbin/mtr
+@bin sbin/mtr