updated download archives since original ftp servser seems to have become

unreachable/unavailable. Now using source archive from old Ubuntu archives
instead.

3 files changed, 21 insertions, 22 deletions

diff --git a/net/traceroute-nanog/Makefile b/net/traceroute-nanog/Makefile
index 0cd5e480f8a..8bb44629ecc 100644
--- a/net/traceroute-nanog/Makefile
+++ b/net/traceroute-nanog/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2011/01/22 14:48:00 schwarz Exp $
+# $NetBSD: Makefile,v 1.4 2012/05/05 22:44:19 schwarz Exp $
 
-DISTNAME=	traceroute-nanog-6.4.2
+DISTNAME=	traceroute-nanog_6.4.2.orig
+PKGNAME=	${DISTNAME:S/.orig//:S/_/-/}
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.login.com/pub/software/traceroute/
-DISTFILES=	traceroute.c
-DIST_SUBDIR=	traceroute-nanog
+MASTER_SITES=	ftp://unix.hensa.ac.uk/sites/archive.ubuntu.com/ubuntu/pool/universe/t/traceroute-nanog/ \
+		http://www.ftp.uni-erlangen.de/pub/pc/TheOpenCD/old-images/ubuntu/pool/universe/t/traceroute-nanog/ \
+		http://traceroute-nanog.sourcearchive.com/downloads/6.4.2-1/
 
 # for the man page:
-PATCH_SITES=	${MASTER_SITE_DEBIAN:=pool/main/t/traceroute-nanog/}
+PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	traceroute-nanog_6.4.2-1.diff.gz
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -15,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 COMMENT=	Traceroute implementation with extend features
 MAINTAINER=	schwarz@NetBSD.org
 
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 NO_CONFIGURE=	YES
 USE_FEATURES+=	snprintf
 
@@ -50,13 +51,11 @@ CPPFLAGS+=	-Dsocklen_t=int
 
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 
-do-extract:
-		${CP} ${DISTDIR}/${DIST_SUBDIR}/traceroute.c ${WRKSRC}
 do-build:
 		cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${LIBS}
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/traceroute-nanog ${DESTDIR}${PREFIX}/sbin
-		${INSTALL_MAN} ${WRKDIR}/traceroute-nanog-6.4.2/debian/traceroute-nanog.genuine.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/traceroute-nanog.8
+		${INSTALL_MAN} ${WRKSRC}/${PKGNAME}/debian/traceroute-nanog.genuine.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/traceroute-nanog.8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/traceroute-nanog/distinfo b/net/traceroute-nanog/distinfo
index 4477c406e6b..8c424ea97fe 100644
--- a/net/traceroute-nanog/distinfo
+++ b/net/traceroute-nanog/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2011/01/22 14:48:00 schwarz Exp $
+$NetBSD: distinfo,v 1.3 2012/05/05 22:44:19 schwarz Exp $
 
-SHA1 (traceroute-nanog/traceroute-nanog_6.4.2-1.diff.gz) = 23eb4dea45ce56a18c7366d22d3d1cb5f203d4d5
-RMD160 (traceroute-nanog/traceroute-nanog_6.4.2-1.diff.gz) = e9e21ed86dd401e5d69241b5942403d059d82c17
-Size (traceroute-nanog/traceroute-nanog_6.4.2-1.diff.gz) = 18417 bytes
-SHA1 (traceroute-nanog/traceroute.c) = f7a160f95488c2c8aa976d168944fc6d0514792b
-RMD160 (traceroute-nanog/traceroute.c) = 07d5c0b2da83d2444c337cd7a791e33e2e3d4226
-Size (traceroute-nanog/traceroute.c) = 107519 bytes
-SHA1 (patch-aa) = f400adc5be4c7f3a3fda54f65a66f02dbd61431b
+SHA1 (traceroute-nanog_6.4.2-1.diff.gz) = 23eb4dea45ce56a18c7366d22d3d1cb5f203d4d5
+RMD160 (traceroute-nanog_6.4.2-1.diff.gz) = e9e21ed86dd401e5d69241b5942403d059d82c17
+Size (traceroute-nanog_6.4.2-1.diff.gz) = 18417 bytes
+SHA1 (traceroute-nanog_6.4.2.orig.tar.gz) = 6c8ac8495ac8abfcf298209d2e9a2bc57978ccef
+RMD160 (traceroute-nanog_6.4.2.orig.tar.gz) = b265a5daebe41621b37da64b864437049fe94291
+Size (traceroute-nanog_6.4.2.orig.tar.gz) = 34429 bytes
+SHA1 (patch-aa) = 84c3d8e806609b705310006fd9a1447da143a173
diff --git a/net/traceroute-nanog/patches/patch-aa b/net/traceroute-nanog/patches/patch-aa
index b2802f222d3..934de975549 100644
--- a/net/traceroute-nanog/patches/patch-aa
+++ b/net/traceroute-nanog/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/03/14 18:19:22 pettai Exp $
+$NetBSD: patch-aa,v 1.2 2012/05/05 22:44:19 schwarz Exp $
 
---- traceroute.c.orig	2006-05-06 11:10:00.000000000 +0000
-+++ traceroute.c
-@@ -750,17 +750,6 @@ void cksum(u_int16_t *, int, volatile u_
+--- traceroute.c.orig	2012-05-06 00:38:52.000000000 +0200
++++ traceroute.c	2012-05-06 00:39:12.000000000 +0200
+@@ -758,17 +758,6 @@
  #undef IP_HDRINCL
  #endif