From 1c772e65f98832b2d21fdaf215946247953f6b30 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 3 Oct 2005 19:54:10 +0000
Subject: 1.30: Unbreak url2pkg on sourceforge hosted packages -- the
 MASTER_SITES did not contain the trailing slash, thus breaking the download.

XXX: prdownloads.sf.net is not recognized as a sourceforge "mirror"
since the previous version of url2pkg.
---
 pkgtools/url2pkg/Makefile      | 4 ++--
 pkgtools/url2pkg/files/url2pkg | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index fd28ee6c177..fc282eb578f 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2005/09/04 20:03:10 hubertf Exp $
+# $NetBSD: Makefile,v 1.37 2005/10/03 19:54:10 wiz Exp $
 #
 
-DISTNAME=	url2pkg-1.29
+DISTNAME=	url2pkg-1.30
 CATEGORIES=	pkgtools sysutils
 MASTER_SITES=	# Nothing
 DISTFILES=	# Nothing
diff --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg
index 67bd2517c5e..2f74c865a73 100755
--- a/pkgtools/url2pkg/files/url2pkg
+++ b/pkgtools/url2pkg/files/url2pkg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: url2pkg,v 1.31 2005/09/04 20:03:10 hubertf Exp $
+# $NetBSD: url2pkg,v 1.32 2005/10/03 19:54:10 wiz Exp $
 #
 # url2pkg
 # (c) 1999-2002 Hubert Feyrer <hubert@feyrer.de>
@@ -49,7 +49,7 @@ if [ ! -f w*/.extract_done ]; then
 			found=1
 			DISTNAME=`expr "$url" : '.*/\([^/?]*\)'`
 			name=`expr "$url" : "${A}\(.*\)/[^/]*\$"`
-			MASTER_SITES="\${${master_site}:=${name}}"
+			MASTER_SITES="\${${master_site}:=${name}/}"
 			case "${master_site}" in
 			"MASTER_SITE_SOURCEFORGE")
 				HOMEPAGE="http://$name.sourceforge.net/" ; ;;
-- 
cgit v1.2.3