(much needed) Upgrade to 980831, it's a shame that ARIN and RIPE don't

have the same whois output.

Reviewed by:	Dan Nelson <dnelson@emsphone.com>, billf

4 files changed, 35 insertions, 51 deletions

diff --git a/net/traceroute/Makefile b/net/traceroute/Makefile
index 38a49da79af8..cc2defe3a8cc 100644
--- a/net/traceroute/Makefile
+++ b/net/traceroute/Makefile
@@ -1,20 +1,26 @@
 # New ports collection makefile for:	traceroute
-# Version required:	961230
+# Version required:	980831
 # Date created:		20 February 1997
 # Whom:			chris@vader.org
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/05/17 16:21:11 max Exp $
 #
 
-DISTNAME=	traceroute_961230
-PKGNAME=	traceroute-961230
+DISTNAME=	traceroute_${RELEASEDATE}
+PKGNAME=	traceroute-${RELEASEDATE}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.nikhef.nl/pub/network/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	chris@vader.org
 
+RELEASEDATE=	980831
 NO_WRKSUBDIR=	yes
 MAN8=		traceroute.8
 
+do-install:
+
+	${INSTALL} -m 4755 -o root -g bin ${WRKSRC}/traceroute ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/traceroute.8 ${PREFIX}/man/man8
+
 .include <bsd.port.mk>
diff --git a/net/traceroute/distinfo b/net/traceroute/distinfo
index ddf3f123c9f0..f1ce94b616d2 100644
--- a/net/traceroute/distinfo
+++ b/net/traceroute/distinfo
@@ -1 +1 @@
-MD5 (traceroute_961230.tar.Z) = a65d6fc4c24e41aaf5062eae49c464e1
+MD5 (traceroute_980831.tar.Z) = 7a9cf04247a00ad7b1ec54332df50de1
diff --git a/net/traceroute/files/patch-aa b/net/traceroute/files/patch-aa
index f4d0c8090c9f..4507ac71e4e0 100644
--- a/net/traceroute/files/patch-aa
+++ b/net/traceroute/files/patch-aa
@@ -1,23 +1,6 @@
---- Makefile.orig	Mon Dec 30 22:36:56 1996
-+++ Makefile	Sun May 18 01:08:46 1997
-@@ -4,11 +4,14 @@
- # Adapt the installation directories to your local standards.
- # ----------------------------------------------------------------------
- 
-+# Installation prefix:
-+PREFIX ?= /usr/local
-+
- # This is where the traceroute executable will go.
--DESTBIN = /usr/local/etc
-+DESTBIN = ${PREFIX}/sbin
- 
- # This is where the traceroute manual page will go.
--DESTMAN = /usr/local/man
-+DESTMAN = ${PREFIX}/man
- 
- BINDIR = $(DESTBIN)
- MANDIR = $(DESTMAN)/man8
-@@ -49,13 +52,13 @@
+--- Makefile.old	Fri Aug 28 04:40:36 1998
++++ Makefile	Fri Dec  4 16:32:45 1998
+@@ -61,13 +61,13 @@
  # were used to build the resolver library you are linking with.
  # ----------------------------------------------------------------------
  
@@ -34,56 +17,51 @@
  INCLUDES =
  
  # ----------------------------------------------------------------------
-@@ -64,15 +67,15 @@
- 
- DEFS = $(CONFIGDEFS) $(SYSDEFS) $(INCLUDES)
- 
--COPTS =
-+#COPTS =
+@@ -79,13 +79,14 @@
+ COPTS =
  COPTS = -O
  
- CFLAGS = $(COPTS) $(DEFS)
+-CFLAGS = $(COPTS) $(DEFS)
++#CFLAGS = $(COPTS) $(DEFS)
  
  # Select your favorite compiler.
 -CC = /usr/ucb/cc			#if defined(solaris) && BSD
 -CC = /bin/cc -arch m68k -arch i386	#if defined(next)
 -CC = /bin/cc
+-CC = cc
 +#CC = /usr/ucb/cc			#if defined(solaris) && BSD
 +#CC = /bin/cc -arch m68k -arch i386	#if defined(next)
 +#CC = /bin/cc
- CC = cc
++#CC = cc
++cc = ${CC}
  
  # ----------------------------------------------------------------------
-@@ -89,16 +92,16 @@
+ # Linking definitions.
+@@ -101,17 +102,17 @@
  # With BIND 4.9.3 the getnet...() calls are in the resolver library.
  # ----------------------------------------------------------------------
  
 -RES = -lsocket				#if defined(SCO) && default
-+#RES = -lsocket				#if defined(SCO) && default
- RES =
+-RES =
 -RES = ../res/libresolv.a
 -RES = -lresolv
-+#RES = ../res/libresolv.a
-+#RES = -lresolv
- 
+-
 -COMPLIB = ../compat/lib/lib44bsd.a
 -COMPLIB = -lnet
+-COMPLIB =
++#RES = -lsocket				#if defined(SCO) && default
++#RES =
++#RES = ../res/libresolv.a
++#RES = -lresolv
++
 +#COMPLIB = ../compat/lib/lib44bsd.a
 +#COMPLIB = -lnet
- COMPLIB =
++#COMPLIB =
  
 -LIBS = -lsocket -lnsl			#if defined(solaris) && not BSD
+-LIBS =
 +#LIBS = -lsocket -lnsl			#if defined(solaris) && not BSD
- LIBS =
++#LIBS =
  
  LIBRARIES = $(RES) $(COMPLIB) $(LIBS)
-@@ -152,7 +155,8 @@
- 	$(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBRARIES)
- 
- install: $(PROG)
--	$(INSTALL) -m 4755 -o root -g network -s $(PROG) $(BINDIR)
-+	$(INSTALL) -m 4555 -o root -g bin -s $(PROG) $(BINDIR)
-+	$(INSTALL) -m 444 traceroute.8 $(MANDIR)
  
- man: $(MANS)
- 	$(INSTALL) -m 444 traceroute.8 $(MANDIR)
diff --git a/net/traceroute/pkg-comment b/net/traceroute/pkg-comment
index 509d5254300d..3a9c1d34bfe3 100644
--- a/net/traceroute/pkg-comment
+++ b/net/traceroute/pkg-comment
@@ -1 +1 @@
-A version of 'traceroute' that shows the AS network number of each hop.
+version of 'traceroute' that shows the AS network number of each hop