From b4d6d9a97b174f624ab6270dca65a05a6d3c785c Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Sun, 8 Mar 2009 18:15:45 +0000
Subject: [PATCH] - fix 64-bit issue - add license marker - regen WANTLIB and
 patch-configure while here

---
 net/mtr/Makefile                | 15 ++++++++-------
 net/mtr/patches/patch-configure | 10 +++++-----
 net/mtr/patches/patch-gtk_c     | 14 ++++++++++++++
 3 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 net/mtr/patches/patch-gtk_c

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index f161aed40d8..b6298f171ef 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.36 2008/10/01 20:52:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2009/03/08 18:15:45 jasper Exp $
 
 COMMENT=	Matt's traceroute - network diagnostic tool
 
 DISTNAME=	mtr-0.74
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	net
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
 
 HOMEPAGE=	http://www.bitwizard.nl/mtr/
 
+# GPLv2+
 PERMIT_PACKAGE_CDROM=	yes
 PERMIT_PACKAGE_FTP=	yes
 PERMIT_DISTFILES_CDROM=	yes
@@ -30,11 +31,11 @@ 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
-WANTLIB += X11 Xext Xi glib-2.0 gmodule-2.0 iconv intl
-WANTLIB += Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo expat fontconfig freetype
-WANTLIB += glitz gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pixman-1 png z
+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 z
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/mtr/patches/patch-configure b/net/mtr/patches/patch-configure
index 0c1194206ac..1efaebcb1ed 100644
--- a/net/mtr/patches/patch-configure
+++ b/net/mtr/patches/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Aug 19 14:11:50 2008
-+++ configure	Thu Aug 21 11:10:03 2008
-@@ -7833,6 +7833,7 @@
+--- 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
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8,7 +8,7 @@
  #include <netinet/in.h>
  
  
-@@ -7898,6 +7899,7 @@
+@@ -7898,6 +7899,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16,7 +16,7 @@
  #include <netinet/in.h>
  
  
-@@ -7955,7 +7957,7 @@
+@@ -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
diff --git a/net/mtr/patches/patch-gtk_c b/net/mtr/patches/patch-gtk_c
new file mode 100644
index 00000000000..1b7e859a8e8
--- /dev/null
+++ b/net/mtr/patches/patch-gtk_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-gtk_c,v 1.1 2009/03/08 18:15: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 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/types.h>