update mtr to 0.82. x11 support is broken (and was before this update),

so rename the current no_x11 flavour to the default (with @pkgpath to
allow updates to work), rename what was the default flavour to gtk and
mark that broken.  maintainer timeout.

net/mtr/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.48 2011/09/16 11:13:38 espie Exp $
+# $OpenBSD: Makefile,v 1.49 2012/05/29 23:43:47 sthen Exp $
 
-COMMENT=	Matt's traceroute - network diagnostic tool
+COMMENT=	Matt's traceroute - network diagnostic tool #'
 
-DISTNAME=	mtr-0.80
-REVISION=	2
+DISTNAME=	mtr-0.82
 CATEGORIES=	net
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
@@ -21,24 +20,22 @@ WANTLIB=		c m termcap
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/
 
 CONFIGURE_STYLE=gnu
-USE_GROFF =	Yes
 
-FLAVORS=	no_x11
+FLAVORS=	gtk
 
 FLAVOR?=
-.if ${FLAVOR:L} == "no_x11"
-CONFIGURE_ARGS+=	--without-gtk
-.else
-MODULES +=		devel/gettext
+.if ${FLAVOR:L} == "gtk"
+BROKEN= fails at runtime with "No nameservers defined"
+MODULES+=		devel/gettext
 CONFIGURE_ARGS+=	--with-gtk-prefix=${LOCALBASE}
 LIB_DEPENDS+=		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 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-render-util
-WANTLIB += z gtk-x11-2.0
+WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 cairo expat fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
+WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm z
+.else
+CONFIGURE_ARGS+=	--without-gtk
 .endif
 
 .include <bsd.port.mk>

net/mtr/distinfo

@@ -1,5 +1,5 @@
-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
+MD5 (mtr-0.82.tar.gz) = EGAepUP9o+UVRcS84ZW2TA==
+RMD160 (mtr-0.82.tar.gz) = 3WCJYQcOF+s7TReuxMZn0LR06RM=
+SHA1 (mtr-0.82.tar.gz) = 8TGd4nMk2FiYqd8KKTpDi7qqErU=
+SHA256 (mtr-0.82.tar.gz) = 87RXyWI64DVlaIp//UnUhDpeJQXMrzuo2fvYbjzptqA=
+SIZE (mtr-0.82.tar.gz) = 270245

net/mtr/patches/patch-configure

@@ -1,27 +1,18 @@
---- 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.  */
+--- configure.orig	Fri Dec  2 13:21:30 2011
++++ configure	Mon May  7 22:20:59 2012
+@@ -5325,6 +5325,7 @@ _ACEOF
  
+ 
+ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
 +#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.  */
+@@ -5342,6 +5343,7 @@ fi
  
+ 
+ ac_fn_c_check_type "$LINENO" "struct in_addr" "ac_cv_type_struct_in_addr" "
 +#include <sys/types.h>
  #include <netinet/in.h>
  
- 
-@@ -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
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+ "

net/mtr/pkg/PFRAG.no-gtk

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.no-gtk,v 1.1 2012/05/29 23:43:47 sthen Exp $
+@pkgpath net/mtr,no_x11

net/mtr/pkg/PLIST

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.7 2010/08/19 16:56:45 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.8 2012/05/29 23:43:47 sthen Exp $
+!%%gtk%%
 @man man/man8/mtr.8
 @mode 4555
 @bin sbin/mtr