6 files changed, 23 insertions, 50 deletions

diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index a718d3737ae2..777f77c1a1e8 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	xtraceroute
-PORTVERSION=	0.8.14
+PORTVERSION=	0.9.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.dtek.chalmers.se/~d3august/xt/dl/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
+BUILD_DEPENDS=	host:${PORTSDIR}/net/host
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+RUN_DEPENDS=	host:${PORTSDIR}/net/host
 
 USE_X_PREFIX=	yes
 USE_MESA=	yes
diff --git a/net/xtraceroute/distinfo b/net/xtraceroute/distinfo
index 0d08cc7ae762..cf71e3d49701 100644
--- a/net/xtraceroute/distinfo
+++ b/net/xtraceroute/distinfo
@@ -1,2 +1,2 @@
-MD5 (xtraceroute-0.8.14.tar.gz) = c4f16fecae49b8bfa2a9bc9b036aa442
+MD5 (xtraceroute-0.9.0.tar.gz) = f201a563948e3debe214dc17f762dab7
 MD5 (ndg_files.tar.gz) = 0e2d6ab6a780b49acbd8f706840380d9
diff --git a/net/xtraceroute/files/patch-aa b/net/xtraceroute/files/patch-aa
index 44c46cb32017..01493bfd1074 100644
--- a/net/xtraceroute/files/patch-aa
+++ b/net/xtraceroute/files/patch-aa
@@ -1,6 +1,9 @@
---- configure.orig	Sun Feb 28 06:56:14 1999
-+++ configure	Tue Aug 22 12:29:47 2000
-@@ -2505,7 +2505,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Wed Apr 18 17:26:37 2001
++++ configure	Thu Jun 28 23:54:08 2001
+@@ -2547,7 +2547,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -9,12 +12,3 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -3620,7 +3620,7 @@
- if test "x$have_libgtkgl" = "x" ; then
- 	{ echo "configure: error: Missing gtkgl library" 1>&2; exit 1; }
- else
--	LIBS="$LIBS -lgtkgl"
-+	LIBS="-lgtkgl $LIBS"
- fi
- 
- echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
diff --git a/net/xtraceroute/files/patch-ab b/net/xtraceroute/files/patch-ab
index 3609787e142c..88fd40a8b756 100644
--- a/net/xtraceroute/files/patch-ab
+++ b/net/xtraceroute/files/patch-ab
@@ -1,13 +1,16 @@
---- glstuff.c.orig	Thu Feb 17 13:03:21 2000
-+++ glstuff.c	Thu Feb 17 13:07:17 2000
-@@ -17,7 +17,10 @@
+
+$FreeBSD$
+
+--- glstuff.c.orig	Thu Jun 28 02:19:31 2001
++++ glstuff.c	Thu Jun 28 23:56:03 2001
+@@ -16,7 +16,10 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
  
- #include "xt.h"
 +#include <sys/types.h>
 +#include <sys/socket.h>
  #include <netinet/in.h>
 +#include <arpa/inet.h>
- 
- extern void sphere(int level);
- 
+ #include <stdlib.h>
+ #include <gtkgl/gtkglarea.h>
+ #include <GL/gl.h>
diff --git a/net/xtraceroute/files/patch-util.c b/net/xtraceroute/files/patch-util.c
deleted file mode 100644
index ecf92fab3ea9..000000000000
--- a/net/xtraceroute/files/patch-util.c
+++ /dev/null
@@ -1,27 +0,0 @@
-Workaround for a sscanf(3) bug in the FreeBSD 5-CURRENT.
-
-$FreeBSD$
-
---- util.c	2001/06/02 10:41:42	1.1
-+++ util.c	2001/06/02 11:14:20
-@@ -36,10 +36,19 @@
-   double loc = 0;
-   float sub;
-   int i = 0;
-+  int len;
-+  char *tmp;
-+
-+  len = strlen(str);
-+  if (str[len - 1] == 'e') {
-+      tmp = alloca(len);
-+      strlcpy(tmp, str, len);
-+  } else
-+      tmp = str;
- 
-   while(1)
-     {
--      sscanf(&str[i], "%f", &sub);
-+      sscanf(&tmp[i], "%f", &sub);
-       loc += sub*factor;
- 
-       // Skip all spaces and tabs
diff --git a/net/xtraceroute/pkg-plist b/net/xtraceroute/pkg-plist
index 459b03b78fc0..39d9bd7e87ee 100644
--- a/net/xtraceroute/pkg-plist
+++ b/net/xtraceroute/pkg-plist
@@ -2,7 +2,8 @@ bin/xtraceroute
 share/locale/es/LC_MESSAGES/xtraceroute.mo
 share/locale/fr/LC_MESSAGES/xtraceroute.mo
 share/locale/ja/LC_MESSAGES/xtraceroute.mo
-share/xtraceroute/earth.tif
+share/locale/sv/LC_MESSAGES/xtraceroute.mo
+share/xtraceroute/earth.png
 share/xtraceroute/hosts.cache
 share/xtraceroute/networks.cache
 @dirrm share/xtraceroute