4 files changed, 9 insertions, 66 deletions

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 3cdbc5db7976..4ca722686533 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mtr
-PORTVERSION=	0.71
+PORTVERSION=	0.72
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://www.mirrors.wiretapped.net/security/network-mapping/mtr/ \
@@ -37,6 +37,9 @@ PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS=--without-gtk --with-gtk-prefix=/nonexistant
 .endif
 
+post-configure:
+	@${REINPLACE_CMD} -e 's|-lresolv||g' ${WRKSRC}/Makefile
+
 post-install:
 	@${ECHO} ""
 	@${ECHO} "${PREFIX}/sbin/mtr is setuid \"root\" "
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index dbd57eacdff0..29ba558fb072 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,3 +1,3 @@
-MD5 (mtr-0.71.tar.gz) = 8c1c9f5db2c599eea3b12bfed8b80618
-SHA256 (mtr-0.71.tar.gz) = b742c46797ba23000e149c99127580d541ed44a69b5bbc44323211665c95e02a
-SIZE (mtr-0.71.tar.gz) = 205442
+MD5 (mtr-0.72.tar.gz) = d771061f8da96b80ecca2f69a3a2d594
+SHA256 (mtr-0.72.tar.gz) = 1473b7880cd3570cff59fb9692c08c8579c334cc04d5a1df092088f1570318db
+SIZE (mtr-0.72.tar.gz) = 295845
diff --git a/net/mtr/files/patch-configure b/net/mtr/files/patch-configure
deleted file mode 100644
index 08d36b641346..000000000000
--- a/net/mtr/files/patch-configure
+++ /dev/null
@@ -1,51 +0,0 @@
---- configure.orig	Fri Mar 24 03:46:43 2006
-+++ configure	Wed May  3 19:00:36 2006
-@@ -6817,7 +6817,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6876,10 +6876,10 @@
- echo "${ECHO_T}$ac_cv_lib_resolv_res_mkquery" >&6
- if test $ac_cv_lib_resolv_res_mkquery = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRESOLV 1
-+#define HAVE_LIBRESOLV 0
- _ACEOF
- 
--  LIBS="-lresolv $LIBS"
-+  LIBS="$LIBS"
- 
- else
- 
-@@ -6889,7 +6889,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6951,7 +6951,7 @@
- #define HAVE_LIBRESOLV 1
- _ACEOF
- 
--  LIBS="-lresolv $LIBS"
-+  LIBS="$LIBS"
- 
- else
-   { { echo "$as_me:$LINENO: error: No resolver library found" >&5
-@@ -6965,7 +6965,7 @@
- 
- fi
- 
--LIBS="$LIBS -lresolv"
-+LIBS="$LIBS"
- 
- echo "$as_me:$LINENO: checking for herror" >&5
- echo $ECHO_N "checking for herror... $ECHO_C" >&6
diff --git a/net/mtr/files/patch-dns.c b/net/mtr/files/patch-dns.c
index c7ab59bcb257..c7bc30f1d9fb 100644
--- a/net/mtr/files/patch-dns.c
+++ b/net/mtr/files/patch-dns.c
@@ -1,5 +1,5 @@
---- dns.c.orig	Thu Mar 23 02:45:58 2006
-+++ dns.c	Wed May  3 18:48:01 2006
+--- dns.c.orig	Mon Oct  9 16:11:26 2006
++++ dns.c	Mon Oct  9 16:11:46 2006
 @@ -48,11 +48,13 @@
  #include "dns.h"
  #include "net.h"
@@ -14,12 +14,3 @@
  
  /*  Hmm, it seems Irix requires this  */
  extern int errno;
-@@ -1357,7 +1359,7 @@
- #ifdef ENABLE_IPV6
- /* Returns an ip6.arpa character string. */
- void addr2ip6arpa( ip_t * ip, char * buf ) {
--  char * p = (char *) ip;
-+  unsigned char * p = (unsigned char *) ip;
-   char * b = buf;
-   int i;
-