Update mtr packages to 0.49. Changes since 0.42:

v0.49 Fix compilation problems on several platforms.
v0.48 Draw names in red (GTK) or bold (Curses) if host doesn't
      respond.
v0.47 Fixed a (believed-) non-exploitable bufferoverflow.
      Thanks Damian.
v0.46 Included patch to be able to specify outgoing interface
      address.
v0.45 People are pressuring me to release new versions with their
      changes. That's fine. Now this version just adds dynamic
      switching between numeric / dns names, and some minor
      stuff I forgot. This release serves as a code-sycn-release.
      new version with even more new stuff in about two weeks!
      I'm afraid I don't know how to fix the MaxOS-X compilation
      problems in the source. Help wanted...
v0.44 David Stone adds the "last" column to the gtk version.
v0.43 Compile fixes.

10 files changed, 29 insertions, 647 deletions

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 1e1dc916d2a..0deb78bd3d9 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2001/12/05 15:00:48 agc Exp $
+# $NetBSD: Makefile,v 1.24 2002/03/13 02:16:11 wiz Exp $
 #
 
-DISTNAME=	mtr-0.42
-PKGREVISION=	1
+DISTNAME=	mtr-0.49
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://www.giovannelli.it/~gmarco/files/
@@ -14,6 +13,7 @@ COMMENT=	Traceroute and ping in a single graphical network diagnostic tool
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 USE_BUILDLINK_ONLY=	YES
+CONFIGURE_ARGS+=	--without-gtk
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 5579660c711..f3d156c8f68 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/11/04 14:09:31 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/03/13 02:16:12 wiz Exp $
 
-SHA1 (mtr-0.42.tar.gz) = 7bcb6c317911139355cabe5b21e1c7efc5cb5694
-Size (mtr-0.42.tar.gz) = 84767 bytes
-SHA1 (patch-aa) = c098f19f68220fa6c37d3e43edc2d6c49cba8118
-SHA1 (patch-ab) = 6bb67583986d71e0986e65d61e96b3c41b40d4b4
-SHA1 (patch-ac) = 6f7d40fc957ba61f4e5a4a29993aa963d627906d
-SHA1 (patch-ad) = a019773eddeb53fb45afa8de2b1a6b03b436e803
-SHA1 (patch-ae) = 66a05d1edb1f300c6573a480d4c4357a94c29f6f
-SHA1 (patch-af) = 1332f16f4087f62d9ab72334c96be0347244e6e2
-SHA1 (patch-ag) = 31badfcf76485e713bd2d51e669629c538c987af
-SHA1 (patch-ah) = 27c987b5033e1c737588e8b5f1bc6d26ece2f2e1
+SHA1 (mtr-0.49.tar.gz) = b7cb6e3691c9a8abfdd66ba0d22745caf2374024
+Size (mtr-0.49.tar.gz) = 87205 bytes
+SHA1 (patch-aa) = ad39c45462c65f132ad1060fb560b311bf9bad3f
+SHA1 (patch-ab) = f590ed61219e246387dfa81c7f8a839efcd91663
+SHA1 (patch-ad) = 53af9e506b14d58fc13a96d900859bb228d720b9
+SHA1 (patch-ae) = 7826b208419fbccd1eed5e5e84826f1d2d6e7baa
diff --git a/net/mtr/patches/patch-aa b/net/mtr/patches/patch-aa
index 3cc012b45db..01ce5ec9bb6 100644
--- a/net/mtr/patches/patch-aa
+++ b/net/mtr/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2001/04/05 15:18:09 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2002/03/13 02:16:12 wiz Exp $
 
---- net.c.orig	Fri Aug 13 18:46:49 1999
-+++ net.c	Sat Dec  4 11:44:33 1999
-@@ -213,7 +213,9 @@
+--- net.c.orig	Wed Mar  6 12:27:37 2002
++++ net.c
+@@ -219,7 +219,9 @@
      rv = sendto(sendsock, packet, packetsize, 0, 
  		(struct sockaddr *)&remoteaddress, sizeof(remoteaddress));
      if (rv >= 0) {
diff --git a/net/mtr/patches/patch-ab b/net/mtr/patches/patch-ab
index 7901e477261..15cbc2c0201 100644
--- a/net/mtr/patches/patch-ab
+++ b/net/mtr/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2001/11/04 14:09:31 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2002/03/13 02:16:12 wiz Exp $
 
---- dns.c.orig	Sat Mar  4 02:46:55 2000
-+++ dns.c	Fri Nov  2 14:16:56 2001
-@@ -751,7 +751,7 @@
+--- dns.c.orig	Wed Mar  6 12:27:37 2002
++++ dns.c
+@@ -752,7 +752,7 @@
  void dorequest(char *s,int type,word id){
     packetheader *hp;
     int r,i;
@@ -11,31 +11,3 @@ $NetBSD: patch-ab,v 1.2 2001/11/04 14:09:31 wiz Exp $
     r = res_mkquery(QUERY,s,C_IN,type,NULL,0,NULL,buf,MaxPacketsize);
     if (r == -1){
        restell("Resolver error: Query too large.");
-@@ -981,7 +981,7 @@
-                   restell("Resolver error: Specified rdata length exceeds packet size.");
-                   return;
-                }
--               if (datatype == qdatatype){
-+               if (datatype == qdatatype || datatype == T_CNAME){
-                   if (debug){
-                      sprintf(tempstring,"Resolver: TTL: %s",strtdiff(sendstring,ttl));
-                      restell(tempstring);
-@@ -1013,6 +1013,7 @@
-                            }
-                            break;
-                         case T_PTR:
-+                        case T_CNAME:
-                            *namestring = '\0';
-                            r = dn_expand(s,s + l,c,namestring,MAXDNAME);
-                            if (r == -1){
-@@ -1027,6 +1028,10 @@
-                               restell("Resolver error: Domain name too long.");
-                               failrp(rp);
-                               return;
-+                           }
-+                           if (datatype == T_CNAME){
-+                              strcpy(stackstring,namestring);
-+                              break;
-                            }
-                            if (!rp->hostname){
-                               rp->hostname = (char *)statmalloc(strlen(namestring) + 1);
diff --git a/net/mtr/patches/patch-ac b/net/mtr/patches/patch-ac
deleted file mode 100644
index 5baae140e29..00000000000
--- a/net/mtr/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/10/16 15:08:56 agc Exp $
-
-Rip out any mention of GTK from the configure.in script so that mtr
-can build happily without it.
-
---- configure.in	2001/10/16 11:19:57	1.1
-+++ configure.in	2001/10/16 11:20:48
-@@ -1,10 +1,8 @@
- AC_INIT(mtr.c)
- AM_INIT_AUTOMAKE(mtr, 0.42)
- 
--AC_SUBST(GTK_OBJ)
- AC_SUBST(CURSES_OBJ)
- 
--GTK_OBJ=gtk.o
- CURSES_OBJ=curses.o
- 
- AC_PROG_CC
-@@ -39,11 +37,7 @@
- 
- AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found))
- 
--AM_PATH_GTK(1.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
--		   LIBS="$LIBS $GTK_LIBS",
--		   AC_MSG_WARN(Building without GTK+ display support)
--		   AC_DEFINE(NO_GTK)
--		   GTK_OBJ=)
-+AC_DEFINE(NO_GTK)
- 
- AC_CHECK_FUNC(socket, , 
-   AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))
diff --git a/net/mtr/patches/patch-ad b/net/mtr/patches/patch-ad
index d966b1bb22b..cff43f0e0b6 100644
--- a/net/mtr/patches/patch-ad
+++ b/net/mtr/patches/patch-ad
@@ -1,10 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2001/10/16 15:08:56 agc Exp $
+$NetBSD: patch-ad,v 1.2 2002/03/13 02:16:12 wiz Exp $
 
-Remove the gtk related options since we're not using gtk.
-
---- mtr.c	2001/10/16 11:22:10	1.1
-+++ mtr.c	2001/10/16 11:23:02
-@@ -56,7 +56,6 @@
+--- mtr.c.orig	Thu Mar  7 08:48:27 2002
++++ mtr.c
+@@ -59,7 +59,6 @@
      { "report", 0, 0, 'r' },
      { "report-cycles", 1, 0, 'c' },
      { "curses", 0, 0, 't' },
@@ -12,7 +10,7 @@ Remove the gtk related options since we're not using gtk.
      { "interval", 1, 0, 'i' },
      { "psize", 1, 0, 'p' },
      { "no-dns", 0, 0, 'n' },
-@@ -182,8 +181,8 @@
+@@ -192,8 +191,8 @@
    }
  
    if(PrintHelp) {
@@ -20,6 +18,6 @@ Remove the gtk related options since we're not using gtk.
 -	   "\t\t[--report-cycles=COUNT] [--curses] [--gtk]\n"
 +    printf("usage: %s [-hvrctlsni] [--help] [--version] [--report]\n"
 +	   "\t\t[--report-cycles=COUNT] [--curses]\n"
-            "\t\t[--raw] [--split] [--no-dns]\n"      /* BL */
+            "\t\t[--raw] [--split] [--no-dns] [--address interface]\n" /* BL */
             "\t\t[--psize=bytes/-p=bytes]\n"            /* ok */
  	   "\t\t[--interval=SECONDS] HOSTNAME [PACKETSIZE]\n", argv[0]);
diff --git a/net/mtr/patches/patch-ae b/net/mtr/patches/patch-ae
index 586423e0d94..e5637b0c164 100644
--- a/net/mtr/patches/patch-ae
+++ b/net/mtr/patches/patch-ae
@@ -1,10 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2001/10/16 15:08:56 agc Exp $
+$NetBSD: patch-ae,v 1.2 2002/03/13 02:16:12 wiz Exp $
 
-Remove the instruction on how to get to the gtk interface since
-we don't have one.
-
---- mtr.8	2001/10/16 11:24:00	1.1
-+++ mtr.8	2001/10/16 11:24:58
+--- mtr.8.orig	Wed Mar  6 12:27:37 2002
++++ mtr.8
 @@ -8,7 +8,7 @@
  .SH SYNOPSIS
  .B mtr 
@@ -21,10 +18,10 @@ we don't have one.
 -.B \-\-gtk\c
 -]
 -[\c
- .B \-\-interval\ SECONDS\c
+ .B \-\-address\ IP.ADD.RE.SS\c
  ]
  [\c
-@@ -147,20 +144,6 @@
+@@ -150,20 +147,6 @@
  .B mtr 
  to display numeric IP numbers and not try to resolve the
  host names. 
diff --git a/net/mtr/patches/patch-af b/net/mtr/patches/patch-af
deleted file mode 100644
index 2327d6eab6a..00000000000
--- a/net/mtr/patches/patch-af
+++ /dev/null
@@ -1,326 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/10/26 22:05:32 jlam Exp $
-
---- configure.orig	Sat Mar  4 03:07:39 2000
-+++ configure	Thu Oct 25 15:15:51 2001
-@@ -11,12 +11,6 @@
- ac_help=
- ac_default_prefix=/usr/local
- # Any additions from configure.in:
--ac_help="$ac_help
--  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
--ac_help="$ac_help
--  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
--ac_help="$ac_help
--  --disable-gtktest       Do not try to compile and run a test GTK program"
- 
- # Initialize some variables set by options.
- # The variables have the same names as the options, with
-@@ -782,8 +776,6 @@
- 
- 
- 
--
--GTK_OBJ=gtk.o
- CURSES_OBJ=curses.o
- 
- # Extract the first word of "gcc", so it can be a program name with args.
-@@ -1684,283 +1676,13 @@
- fi
- 
- 
--# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
--if test "${with_gtk_prefix+set}" = set; then
--  withval="$with_gtk_prefix"
--  gtk_config_prefix="$withval"
--else
--  gtk_config_prefix=""
--fi
--
--# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
--if test "${with_gtk_exec_prefix+set}" = set; then
--  withval="$with_gtk_exec_prefix"
--  gtk_config_exec_prefix="$withval"
--else
--  gtk_config_exec_prefix=""
--fi
--
--# Check whether --enable-gtktest or --disable-gtktest was given.
--if test "${enable_gtktest+set}" = set; then
--  enableval="$enable_gtktest"
--  :
--else
--  enable_gtktest=yes
--fi
--
--
--  for module in . 
--  do
--      case "$module" in
--         gthread) 
--             gtk_config_args="$gtk_config_args gthread"
--         ;;
--      esac
--  done
--
--  if test x$gtk_config_exec_prefix != x ; then
--     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
--     if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
--     fi
--  fi
--  if test x$gtk_config_prefix != x ; then
--     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
--     if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
--     fi
--  fi
--
--  # Extract the first word of "gtk-config", so it can be a program name with args.
--set dummy gtk-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1738: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  case "$GTK_CONFIG" in
--  /*)
--  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
--  ;;
--  ?:/*)			 
--  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path.
--  ;;
--  *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do 
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
--  ;;
--esac
--fi
--GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
--if test -n "$GTK_CONFIG"; then
--  echo "$ac_t""$GTK_CONFIG" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--  min_gtk_version=1.0.0
--  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
--echo "configure:1773: checking for GTK - version >= $min_gtk_version" >&5
--  no_gtk=""
--  if test "$GTK_CONFIG" = "no" ; then
--    no_gtk=yes
--  else
--    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
--    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
--    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--    if test "x$enable_gtktest" = "xyes" ; then
--      ac_save_CFLAGS="$CFLAGS"
--      ac_save_LIBS="$LIBS"
--      CFLAGS="$CFLAGS $GTK_CFLAGS"
--      LIBS="$GTK_LIBS $LIBS"
--      rm -f conf.gtktest
--      if test "$cross_compiling" = yes; then
--  echo $ac_n "cross compiling; assumed OK... $ac_c"
--else
--  cat > conftest.$ac_ext <<EOF
--#line 1796 "configure"
--#include "confdefs.h"
--
--#include <gtk/gtk.h>
--#include <stdio.h>
--#include <stdlib.h>
--
--int 
--main ()
--{
--  int major, minor, micro;
--  char *tmp_version;
--
--  system ("touch conf.gtktest");
--
--  /* HP/UX 9 (%@#!) writes to sscanf strings */
--  tmp_version = g_strdup("$min_gtk_version");
--  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
--     printf("%s, bad version string\n", "$min_gtk_version");
--     exit(1);
--   }
--
--  if ((gtk_major_version != $gtk_config_major_version) ||
--      (gtk_minor_version != $gtk_config_minor_version) ||
--      (gtk_micro_version != $gtk_config_micro_version))
--    {
--      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
--             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
--             gtk_major_version, gtk_minor_version, gtk_micro_version);
--      printf ("*** was found! If gtk-config was correct, then it is best\n");
--      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
--      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
--      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
--      printf("*** required on your system.\n");
--      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
--      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
--      printf("*** before re-running configure\n");
--    } 
--#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
--  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
--	   (gtk_minor_version != GTK_MINOR_VERSION) ||
--           (gtk_micro_version != GTK_MICRO_VERSION))
--    {
--      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
--	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
--      printf("*** library (version %d.%d.%d)\n",
--	     gtk_major_version, gtk_minor_version, gtk_micro_version);
--    }
--#endif /* defined (GTK_MAJOR_VERSION) ... */
--  else
--    {
--      if ((gtk_major_version > major) ||
--        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
--        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
--      {
--        return 0;
--       }
--     else
--      {
--        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
--               gtk_major_version, gtk_minor_version, gtk_micro_version);
--        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
--	       major, minor, micro);
--        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
--        printf("***\n");
--        printf("*** If you have already installed a sufficiently new version, this error\n");
--        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
--        printf("*** being found. The easiest way to fix this is to remove the old version\n");
--        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
--        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
--        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
--        printf("*** so that the correct libraries are found at run-time))\n");
--      }
--    }
--  return 1;
--}
--
--EOF
--if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
--  :
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
--  no_gtk=yes
--fi
--rm -fr conftest*
--fi
--
--       CFLAGS="$ac_save_CFLAGS"
--       LIBS="$ac_save_LIBS"
--     fi
--  fi
--  if test "x$no_gtk" = x ; then
--     echo "$ac_t""yes" 1>&6
--     CFLAGS="$CFLAGS $GTK_CFLAGS"
--		   LIBS="$LIBS $GTK_LIBS"     
--  else
--     echo "$ac_t""no" 1>&6
--     if test "$GTK_CONFIG" = "no" ; then
--       echo "*** The gtk-config script installed by GTK could not be found"
--       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
--       echo "*** your path, or set the GTK_CONFIG environment variable to the"
--       echo "*** full path to gtk-config."
--     else
--       if test -f conf.gtktest ; then
--        :
--       else
--          echo "*** Could not run GTK test program, checking why..."
--          CFLAGS="$CFLAGS $GTK_CFLAGS"
--          LIBS="$LIBS $GTK_LIBS"
--          cat > conftest.$ac_ext <<EOF
--#line 1909 "configure"
--#include "confdefs.h"
--
--#include <gtk/gtk.h>
--#include <stdio.h>
--
--int main() {
-- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
--; return 0; }
--EOF
--if { (eval echo configure:1919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--   echo "*** The test program compiled, but did not run. This usually means"
--          echo "*** that the run-time linker is not finding GTK or finding the wrong"
--          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
--          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
--          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
--          echo "*** is required on your system"
--	  echo "***"
--          echo "*** If you have an old version installed, it is best to remove it, although"
--          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
--          echo "***"
--          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
--          echo "*** came with the system with the command"
--          echo "***"
--          echo "***    rpm --erase --nodeps gtk gtk-devel" 
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--   echo "*** The test program failed to compile or link. See the file config.log for the"
--          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
--          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
--          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" 
--fi
--rm -f conftest*
--          CFLAGS="$ac_save_CFLAGS"
--          LIBS="$ac_save_LIBS"
--       fi
--     fi
--     GTK_CFLAGS=""
--     GTK_LIBS=""
--     echo "configure: warning: Building without GTK+ display support" 1>&2
--		   cat >> confdefs.h <<\EOF
-+cat >> confdefs.h <<\EOF
- #define NO_GTK 1
- EOF
- 
--		   GTK_OBJ=
--  fi
--  
--  
--  rm -f conf.gtktest
--
- 
- echo $ac_n "checking for socket""... $ac_c" 1>&6
--echo "configure:1964: checking for socket" >&5
-+echo "configure:1686: checking for socket" >&5
- if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2750,13 +2472,9 @@
- s%@AUTOHEADER@%$AUTOHEADER%g
- s%@MAKEINFO@%$MAKEINFO%g
- s%@SET_MAKE@%$SET_MAKE%g
--s%@GTK_OBJ@%$GTK_OBJ%g
- s%@CURSES_OBJ@%$CURSES_OBJ%g
- s%@CC@%$CC%g
- s%@CPP@%$CPP%g
--s%@GTK_CONFIG@%$GTK_CONFIG%g
--s%@GTK_CFLAGS@%$GTK_CFLAGS%g
--s%@GTK_LIBS@%$GTK_LIBS%g
- 
- CEOF
- EOF
diff --git a/net/mtr/patches/patch-ag b/net/mtr/patches/patch-ag
deleted file mode 100644
index c0ad7177cba..00000000000
--- a/net/mtr/patches/patch-ag
+++ /dev/null
@@ -1,171 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/10/26 22:05:32 jlam Exp $
-
---- Makefile.in.orig	Sat Mar  4 03:07:39 2000
-+++ Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
- 
--# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -59,10 +59,6 @@
- POST_UNINSTALL = :
- CC = @CC@
- CURSES_OBJ = @CURSES_OBJ@
--GTK_CFLAGS = @GTK_CFLAGS@
--GTK_CONFIG = @GTK_CONFIG@
--GTK_LIBS = @GTK_LIBS@
--GTK_OBJ = @GTK_OBJ@
- MAKEINFO = @MAKEINFO@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
-@@ -113,6 +109,9 @@
- 
- TAR = tar
- GZIP_ENV = --best
-+DEP_FILES =  .deps/curses.P .deps/display.P .deps/dns.P .deps/getopt.P \
-+.deps/getopt1.P .deps/gtk.P .deps/mtr.P .deps/net.P .deps/raw.P \
-+.deps/report.P .deps/select.P .deps/split.P
- SOURCES = $(mtr_SOURCES) $(EXTRA_mtr_SOURCES)
- OBJECTS = $(mtr_OBJECTS)
- 
-@@ -120,9 +119,9 @@
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -187,9 +186,6 @@
- 	  rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- 	done
- 
--.c.o:
--	$(COMPILE) -c $<
--
- .s.o:
- 	$(COMPILE) -c $<
- 
-@@ -285,7 +281,7 @@
- 	dot_seen=no; \
- 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  rev="$$subdir $$rev"; \
--	  test "$$subdir" = "." && dot_seen=yes; \
-+	  test "$$subdir" != "." || dot_seen=yes; \
- 	done; \
- 	test "$$dot_seen" = "no" && rev=". $$rev"; \
- 	target=`echo $@ | sed s/-recursive//`; \
-@@ -376,10 +372,15 @@
- 	-rm -rf $(distdir)
- 	mkdir $(distdir)
- 	-chmod 777 $(distdir)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$/$$file $(distdir)/$$file; \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-@@ -396,6 +397,38 @@
- 	      || exit 1; \
- 	  fi; \
- 	done
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
- info-am:
- info: info-recursive
- dvi-am:
-@@ -438,26 +471,27 @@
- 
- maintainer-clean-generic:
- mostlyclean-am:  mostlyclean-hdr mostlyclean-sbinPROGRAMS \
--		mostlyclean-compile mostlyclean-tags \
-+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
- 		mostlyclean-generic
- 
- mostlyclean: mostlyclean-recursive
- 
- clean-am:  clean-hdr clean-sbinPROGRAMS clean-compile clean-tags \
--		clean-generic mostlyclean-am
-+		clean-depend clean-generic mostlyclean-am
- 
- clean: clean-recursive
- 
- distclean-am:  distclean-hdr distclean-sbinPROGRAMS distclean-compile \
--		distclean-tags distclean-generic clean-am \
--		distclean-local
-+		distclean-tags distclean-depend distclean-generic \
-+		clean-am distclean-local
- 
- distclean: distclean-recursive
- 	-rm -f config.status
- 
- maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-sbinPROGRAMS \
- 		maintainer-clean-compile maintainer-clean-tags \
--		maintainer-clean-generic distclean-am
-+		maintainer-clean-depend maintainer-clean-generic \
-+		distclean-am
- 	@echo "This command is intended for maintainers to use;"
- 	@echo "it deletes files that may require special tools to rebuild."
- 
-@@ -475,10 +509,12 @@
- all-recursive check-recursive installcheck-recursive info-recursive \
- dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
- maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
--dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
--install-exec-am install-exec install-data-am install-data install-am \
--install uninstall-am uninstall all-redirect all-am all installdirs-am \
-+distclean-tags clean-tags maintainer-clean-tags distdir \
-+mostlyclean-depend distclean-depend clean-depend \
-+maintainer-clean-depend info-am info dvi-am dvi check check-am \
-+installcheck-am installcheck all-recursive-am install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs-am \
- installdirs mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
diff --git a/net/mtr/patches/patch-ah b/net/mtr/patches/patch-ah
deleted file mode 100644
index 0a6ff81376d..00000000000
--- a/net/mtr/patches/patch-ah
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2001/10/26 22:05:32 jlam Exp $
-
---- img/Makefile.in.orig	Sat Mar  4 03:20:52 2000
-+++ img/Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
- 
--# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -59,10 +59,6 @@
- POST_UNINSTALL = :
- CC = @CC@
- CURSES_OBJ = @CURSES_OBJ@
--GTK_CFLAGS = @GTK_CFLAGS@
--GTK_CONFIG = @GTK_CONFIG@
--GTK_LIBS = @GTK_LIBS@
--GTK_OBJ = @GTK_OBJ@
- MAKEINFO = @MAKEINFO@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
-@@ -81,9 +77,9 @@
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps img/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu img/Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -96,10 +92,15 @@
- subdir = img
- 
- distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu img/Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$/$$file $(distdir)/$$file; \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \