summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorjlam <jlam>2001-10-26 22:05:31 +0000
committerjlam <jlam>2001-10-26 22:05:31 +0000
commit1023b980c2fa5080b41c98a8250afcd61af47d05 (patch)
treeffb21a8e1453388e0ec5d3b153dd69c932ba1140 /net
parent871c484e4da9aaef3458c7e25286e73d300b821d (diff)
downloadpkgsrc-1023b980c2fa5080b41c98a8250afcd61af47d05.tar.gz
Don't require autoconf/automake.
Diffstat (limited to 'net')
-rw-r--r--net/mtr/Makefile19
-rw-r--r--net/mtr/distinfo5
-rw-r--r--net/mtr/patches/patch-af326
-rw-r--r--net/mtr/patches/patch-ag171
-rw-r--r--net/mtr/patches/patch-ah53
5 files changed, 559 insertions, 15 deletions
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 3ad7a38577f..2b6fee0ea62 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/10/25 16:13:06 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/10/26 22:05:31 jlam Exp $
#
DISTNAME= mtr-0.42
@@ -10,19 +10,10 @@ MAINTAINER= sommerfeld@netbsd.org
HOMEPAGE= http://www.bitwizard.nl/mtr/
COMMENT= Traceroute and ping in a single graphical network diagnostic tool
-BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf
-BUILD_DEPENDS+= automake>=1.4:../../devel/automake
-
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_BUILDLINK_ONLY= yes
-
-pre-configure:
- cd ${WRKSRC}; \
- ${LOCALBASE}/bin/aclocal; \
- ${LOCALBASE}/bin/automake -a --foreign -i; \
- ${LOCALBASE}/bin/autoreconf --force; \
- ${LOCALBASE}/bin/autoheader
+AUTOMAKE_OVERRIDE= YES
+GNU_CONFIGURE= YES
+USE_GMAKE= YES
+USE_BUILDLINK_ONLY= YES
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 109ae86a20d..407530f2561 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/10/16 15:08:55 agc Exp $
+$NetBSD: distinfo,v 1.4 2001/10/26 22:05:31 jlam Exp $
SHA1 (mtr-0.42.tar.gz) = 7bcb6c317911139355cabe5b21e1c7efc5cb5694
Size (mtr-0.42.tar.gz) = 84767 bytes
@@ -7,3 +7,6 @@ SHA1 (patch-ab) = 9ba3ea130f737864e673e60ce656b96556d3c1cc
SHA1 (patch-ac) = 6f7d40fc957ba61f4e5a4a29993aa963d627906d
SHA1 (patch-ad) = a019773eddeb53fb45afa8de2b1a6b03b436e803
SHA1 (patch-ae) = 66a05d1edb1f300c6573a480d4c4357a94c29f6f
+SHA1 (patch-af) = 1332f16f4087f62d9ab72334c96be0347244e6e2
+SHA1 (patch-ag) = 31badfcf76485e713bd2d51e669629c538c987af
+SHA1 (patch-ah) = 27c987b5033e1c737588e8b5f1bc6d26ece2f2e1
diff --git a/net/mtr/patches/patch-af b/net/mtr/patches/patch-af
new file mode 100644
index 00000000000..2327d6eab6a
--- /dev/null
+++ b/net/mtr/patches/patch-af
@@ -0,0 +1,326 @@
+$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
new file mode 100644
index 00000000000..c0ad7177cba
--- /dev/null
+++ b/net/mtr/patches/patch-ag
@@ -0,0 +1,171 @@
+$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
new file mode 100644
index 00000000000..0a6ff81376d
--- /dev/null
+++ b/net/mtr/patches/patch-ah
@@ -0,0 +1,53 @@
+$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 \