[pkgsrc/trunk]: pkgsrc/pkgtools/url2pkg 1.30:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8af9c031fbdc
branches:  trunk
changeset: 500193:8af9c031fbdc
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Oct 03 19:54:10 2005 +0000

description:
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.

diffstat:

 pkgtools/url2pkg/Makefile      |  4 ++--
 pkgtools/url2pkg/files/url2pkg |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 97f5bb547e77 -r 8af9c031fbdc pkgtools/url2pkg/Makefile
--- a/pkgtools/url2pkg/Makefile Mon Oct 03 19:52:03 2005 +0000
+++ b/pkgtools/url2pkg/Makefile Mon Oct 03 19:54:10 2005 +0000
@@ -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 -r 97f5bb547e77 -r 8af9c031fbdc pkgtools/url2pkg/files/url2pkg
--- a/pkgtools/url2pkg/files/url2pkg    Mon Oct 03 19:52:03 2005 +0000
+++ b/pkgtools/url2pkg/files/url2pkg    Mon Oct 03 19:54:10 2005 +0000
@@ -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@localhost>
@@ -49,7 +49,7 @@
                        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/"; ; ;;