NetBSDify.

7 files changed, 42 insertions, 31 deletions

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index bde25cdef1a..a5a2609e5ee 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,3 +1,5 @@
+# $NetBSD: Makefile,v 1.2 1999/12/04 16:50:10 sommerfeld Exp $
+#
 # New ports collection makefile for:   mtr
 # Version required:    0.41
 # Date created:        12 August 1998
@@ -11,24 +13,31 @@ CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://www.giovannelli.it/~gmarco/files/
 
-MAINTAINER=	billf@FreeBSD.org
+MAINTAINER=	sommerfeld@netbsd.org
+HOMEPAGE=	http://www.bitwizard.nl/mtr/
+
+# not needed in current as of some time before 1999/12/1, but 
+# needed for 1.4.x, so just use ncurses..
+DEPENDS+=	ncurses-4.2:../../devel/ncurses
 
-HAS_CONFIGURE=	yes
+#.if defined(USE_GTK)
+#USE_XLIB=	yes
+#LIB_DEPENDS=    gtk12.2:../../x11-toolkits/gtk12
+#CONFIGURE_ENV+=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+#.endif
 
+GNU_CONFIGURE=	yes
 MAN8=	mtr.8
+CONFIGURE_ENV+= CPPFLAGS=-I${PREFIX}/include
 
-pre-patch:
-.if !defined(USE_GTK)
-	@${ECHO} ""
-	@${ECHO} "If you want to compile with GTK support,"
-	@${ECHO} "hit Ctrl-C right now and use \"make USE_GTK=yes\" "
-	@${ECHO} ""
-CONFIGURE_ARGS=--with-gtk-prefix=/nopath
-.else
-USE_XLIB=	yes
-LIB_DEPENDS=    gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
-.endif
+#pre-patch:
+#.if !defined(USE_GTK)
+#	@${ECHO} ""
+#	@${ECHO} "If you want to compile with GTK support,"
+#	@${ECHO} "hit Ctrl-C right now and use \"make USE_GTK=yes\" "
+#	@${ECHO} ""
+#CONFIGURE_ARGS+=--with-gtk-prefix=/nopath
+#.endif
 
 do-install:
 	${INSTALL} -c -s -m 4755 -o root -g wheel ${WRKSRC}/mtr ${PREFIX}/sbin
@@ -42,4 +51,4 @@ post-install:
 	@${ECHO} "in file ${WRKSRC}/SECURITY (not installed)"
 	@${ECHO} ""
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/mtr/files/md5 b/net/mtr/files/md5
index 6186e1ce0d6..67161a5a744 100644
--- a/net/mtr/files/md5
+++ b/net/mtr/files/md5
@@ -1 +1,3 @@
+$NetBSD: md5,v 1.2 1999/12/04 16:50:11 sommerfeld Exp $
+
 MD5 (mtr-0.41.tar.gz) = fd081c7c27fedfcf9de0dc04e632475b
diff --git a/net/mtr/files/patch-sum b/net/mtr/files/patch-sum
new file mode 100644
index 00000000000..1593d0f3af5
--- /dev/null
+++ b/net/mtr/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1 1999/12/04 16:50:11 sommerfeld Exp $
+
+MD5 (patch-01) = 9d521132e8f45df887fb35e829cdc492
+MD5 (patch-02) = 739da4139f7a4385318710dadf201403
diff --git a/net/mtr/patches/patch-01 b/net/mtr/patches/patch-01
index ca716124094..c8a9491b005 100644
--- a/net/mtr/patches/patch-01
+++ b/net/mtr/patches/patch-01
@@ -1,11 +1,14 @@
---- net.c.orig Wed Jun  9 11:06:27 1999
-+++ net.c      Wed Jul 14 02:03:23 1999
-@@ -213,7 +213,7 @@
+$NetBSD: patch-01,v 1.2 1999/12/04 16:50:11 sommerfeld Exp $
+
+--- net.c.orig	Fri Aug 13 18:46:49 1999
++++ net.c	Sat Dec  4 11:44:33 1999
+@@ -213,7 +213,9 @@
      rv = sendto(sendsock, packet, packetsize, 0, 
  		(struct sockaddr *)&remoteaddress, sizeof(remoteaddress));
      if (rv >= 0) {
--      fprintf (stderr, "You've got a broken (FreeBSD?) system\n");
-+/*      fprintf (stderr, "You've got a broken (FreeBSD?) system\n"); */
++#if 0
+       fprintf (stderr, "You've got a broken (FreeBSD?) system\n");
++#endif
        BSDfix = 1;
      }
    }
diff --git a/net/mtr/patches/patch-02 b/net/mtr/patches/patch-02
index bcb4216cdfc..85f0840e8d8 100644
--- a/net/mtr/patches/patch-02
+++ b/net/mtr/patches/patch-02
@@ -1,3 +1,5 @@
+$NetBSD: patch-02,v 1.2 1999/12/04 16:50:11 sommerfeld Exp $
+
 --- dns.c.orig Wed Jun  9 11:09:20 1999
 +++ dns.c      Tue Aug 10 01:21:12 1999
 @@ -751,7 +751,7 @@
diff --git a/net/mtr/patches/patch-03 b/net/mtr/patches/patch-03
deleted file mode 100644
index 58efa5fde67..00000000000
--- a/net/mtr/patches/patch-03
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old	Wed Oct 27 16:49:03 1999
-+++ Makefile.in	Wed Oct 27 16:49:22 1999
-@@ -210,7 +210,7 @@
- 
- mtr: $(mtr_OBJECTS) $(mtr_DEPENDENCIES)
- 	@rm -f mtr
--	$(LINK) $(mtr_LDFLAGS) $(mtr_OBJECTS) $(mtr_LDADD) $(LIBS)
-+	$(LINK) $(mtr_LDFLAGS) $(mtr_OBJECTS) $(mtr_LDADD) -lmytinfo $(LIBS)
- 
- install-man8:
- 	$(mkinstalldirs) $(DESTDIR)$(man8dir)
diff --git a/net/mtr/pkg/PLIST b/net/mtr/pkg/PLIST
index e51c7880c1e..0f60f7d3440 100644
--- a/net/mtr/pkg/PLIST
+++ b/net/mtr/pkg/PLIST
@@ -1 +1,3 @@
+@comment $NetBSD: PLIST,v 1.2 1999/12/04 16:50:12 sommerfeld Exp $
 sbin/mtr
+man/man8/mtr.8