[pkgsrc/trunk]: pkgsrc/pkgtools/url2pkg Update url2pkg to 1.31. This reinsta...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/59b1a1d82651
branches:  trunk
changeset: 501209:59b1a1d82651
user:      rh <rh%pkgsrc.org@localhost>
date:      Tue Oct 18 21:10:28 2005 +0000

description:
Update url2pkg to 1.31.  This reinstates correct handling of
"prdownloads.sourceforge.net" URLs.

diffstat:

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

diffs (42 lines):

diff -r b02acc690269 -r 59b1a1d82651 pkgtools/url2pkg/Makefile
--- a/pkgtools/url2pkg/Makefile Tue Oct 18 20:22:49 2005 +0000
+++ b/pkgtools/url2pkg/Makefile Tue Oct 18 21:10:28 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2005/10/03 19:54:10 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2005/10/18 21:10:28 rh Exp $
 #
 
-DISTNAME=      url2pkg-1.30
+DISTNAME=      url2pkg-1.31
 CATEGORIES=    pkgtools sysutils
 MASTER_SITES=  # Nothing
 DISTFILES=     # Nothing
diff -r b02acc690269 -r 59b1a1d82651 pkgtools/url2pkg/files/url2pkg
--- a/pkgtools/url2pkg/files/url2pkg    Tue Oct 18 20:22:49 2005 +0000
+++ b/pkgtools/url2pkg/files/url2pkg    Tue Oct 18 21:10:28 2005 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: url2pkg,v 1.32 2005/10/03 19:54:10 wiz Exp $
+# $NetBSD: url2pkg,v 1.33 2005/10/18 21:10:28 rh Exp $
 #
 # url2pkg
 # (c) 1999-2002 Hubert Feyrer <hubert%feyrer.de@localhost>
@@ -63,6 +63,17 @@
        done
 
        if [ $found = 0 ]; then
+               prdownloads="http://prdownloads.sourceforge.net/";
+               if [ `expr "$url" : "$prdownloads.*"` -gt 0 ]; then
+                       DISTNAME=`expr "$url" : '.*/\([^/?]*\)'`
+                       sfname=`expr "$url" : "${prdownloads}\(.*\)/[^/]*\$"`
+                       MASTER_SITES='${MASTER_SITE_SOURCEFORGE:='"$sfname"'/}'
+                       HOMEPAGE="http://$sfname.sourceforge.net/";
+                       found=1
+               fi
+       fi
+
+       if [ $found = 0 ]; then
                DISTNAME=`expr "$url" : '.*/\([^/]*\)$'`
                MASTER_SITES=`expr "$url" : '\(.*/\)[^/]*$'`
                HOMEPAGE=$MASTER_SITES