5 files changed, 12 insertions, 49 deletions

diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 2bde1996fcec..0ffe921e7da6 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xtraceroute
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.dtek.chalmers.se/~d3august/xt/dl/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
@@ -15,19 +15,19 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D graphical version of the traceroute program
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/host:${PORTSDIR}/dns/host
+RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
-RUN_DEPENDS=	${LOCALBASE}/bin/host:${PORTSDIR}/dns/host
 
 USE_X_PREFIX=	yes
-USE_MESA=	yes
 USE_GNOME=	gdkpixbuf
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-GL-prefix=${X11BASE}/lib \
 		--with-lib-GL \
 		--with-host=${LOCALBASE}/bin/host
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-MAKE_ENV=	OLD_PO_FILE_INPUT=1
+MAKE_ENV+=	OLD_PO_FILE_INPUT=1
 
 DATAFILES=	ndg_files.tar.gz
 
diff --git a/net/xtraceroute/distinfo b/net/xtraceroute/distinfo
index cf71e3d49701..813a61876528 100644
--- a/net/xtraceroute/distinfo
+++ b/net/xtraceroute/distinfo
@@ -1,2 +1,2 @@
-MD5 (xtraceroute-0.9.0.tar.gz) = f201a563948e3debe214dc17f762dab7
+MD5 (xtraceroute-0.9.1.tar.gz) = ac212fed3ac9dc06851e5ffbe95901c0
 MD5 (ndg_files.tar.gz) = 0e2d6ab6a780b49acbd8f706840380d9
diff --git a/net/xtraceroute/files/patch-aa b/net/xtraceroute/files/patch-aa
deleted file mode 100644
index 4c93a0ee9a1d..000000000000
--- a/net/xtraceroute/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Wed Apr 18 17:26:37 2001
-+++ configure	Mon Jul  2 09:22:57 2001
-@@ -2547,7 +2547,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -3108,7 +3108,7 @@
- if eval "test x$enable_debug = xyes"; then
- CFLAGS="-g -Wall -DXT_DEBUG "
- else
--	CFLAGS="-O6 $CFLAGS"
-+#	CFLAGS="-O6 $CFLAGS"
- fi
- 
- xtraceroutedatadir=${datadir}/xtraceroute
diff --git a/net/xtraceroute/files/patch-ab b/net/xtraceroute/files/patch-ab
deleted file mode 100644
index 88fd40a8b756..000000000000
--- a/net/xtraceroute/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$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 <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <stdlib.h>
- #include <gtkgl/gtkglarea.h>
- #include <GL/gl.h>
diff --git a/net/xtraceroute/pkg-plist b/net/xtraceroute/pkg-plist
index 39d9bd7e87ee..4196487c9a93 100644
--- a/net/xtraceroute/pkg-plist
+++ b/net/xtraceroute/pkg-plist
@@ -3,7 +3,9 @@ share/locale/es/LC_MESSAGES/xtraceroute.mo
 share/locale/fr/LC_MESSAGES/xtraceroute.mo
 share/locale/ja/LC_MESSAGES/xtraceroute.mo
 share/locale/sv/LC_MESSAGES/xtraceroute.mo
-share/xtraceroute/earth.png
-share/xtraceroute/hosts.cache
-share/xtraceroute/networks.cache
-@dirrm share/xtraceroute
+%%DATADIR%%/earth.png
+%%DATADIR%%/hosts.cache
+%%DATADIR%%/networks.cache
+%%DATADIR%%/night.png
+%%DATADIR%%/xtraceroute-resolve-location.sh
+@dirrm %%DATADIR%%