[pkgsrc/trunk]: pkgsrc Update url2pkg to 1.29. Change:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/feeb27102902
branches:  trunk
changeset: 498870:feeb27102902
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Sun Sep 04 20:02:55 2005 +0000

description:
Update url2pkg to 1.29. Change:

Patch by pancake <pancake%phreaker.net@localhost> that permits url2pkg to scan
bsd.sites.mk and recreate the MASTER_SITE string. He has tested a bit
against GNU, GNOME, SOURCEFORGE master sites, and seems to do the things
fine.

diffstat:

 doc/CHANGES                    |   3 ++-
 pkgtools/url2pkg/Makefile      |   4 ++--
 pkgtools/url2pkg/files/url2pkg |  35 ++++++++++++++++++++++++++---------
 3 files changed, 30 insertions(+), 12 deletions(-)

diffs (82 lines):

diff -r 4f8f317e958a -r feeb27102902 doc/CHANGES
--- a/doc/CHANGES       Sun Sep 04 20:00:09 2005 +0000
+++ b/doc/CHANGES       Sun Sep 04 20:02:55 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11025 2005/09/04 17:37:13 hubertf Exp $
+$NetBSD: CHANGES,v 1.11026 2005/09/04 20:02:55 hubertf Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -3907,3 +3907,4 @@
        Updated mail/ruby-actionmailer to 1.0.1 [taca 2005-09-04]
        Updated www/ruby-actionwebservice to 0.8.1 [taca 2005-09-04]
        Updated devel/bmake to 20050901 [sjg 2005-09-04]
+       Updated pkgtools/url2pkg to 1.29 [hubertf 2005-09-04]
diff -r 4f8f317e958a -r feeb27102902 pkgtools/url2pkg/Makefile
--- a/pkgtools/url2pkg/Makefile Sun Sep 04 20:00:09 2005 +0000
+++ b/pkgtools/url2pkg/Makefile Sun Sep 04 20:02:55 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/09/04 20:03:10 hubertf Exp $
 #
 
-DISTNAME=      url2pkg-1.28
+DISTNAME=      url2pkg-1.29
 CATEGORIES=    pkgtools sysutils
 MASTER_SITES=  # Nothing
 DISTFILES=     # Nothing
diff -r 4f8f317e958a -r feeb27102902 pkgtools/url2pkg/files/url2pkg
--- a/pkgtools/url2pkg/files/url2pkg    Sun Sep 04 20:00:09 2005 +0000
+++ b/pkgtools/url2pkg/files/url2pkg    Sun Sep 04 20:02:55 2005 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: url2pkg,v 1.30 2005/05/07 22:14:32 wiz Exp $
+# $NetBSD: url2pkg,v 1.31 2005/09/04 20:03:10 hubertf Exp $
 #
 # url2pkg
 # (c) 1999-2002 Hubert Feyrer <hubert%feyrer.de@localhost>
@@ -39,18 +39,35 @@
                url="$1"
        fi
 
-       sourceforge="http://prdownloads.sourceforge.net/";
-       if [ `expr "$url" : "$sourceforge.*"` -gt 0 ]; then
-               DISTNAME=`expr "$url" : '.*/\([^/?]*\)'`
-               sfname=`expr "$url" : "${sourceforge}\(.*\)/[^/]*\$"`
-               MASTER_SITES='${MASTER_SITE_SOURCEFORGE:='"$sfname"'/}'
-               HOMEPAGE="http://$sfname.sourceforge.net/";
-       else
+       found=0
+       for A in `cat ../../mk/bsd.sites.mk`; do
+               if [ "`expr "$A" : ".*+="`" -gt 0 ]; then
+                       master_site="`echo $A|cut -f1 -d +`"
+               fi
+               if [ ! "${A}" = "\\" ]; then
+               if [ `expr "$url" : "$A"` -gt 0 ]; then
+                       found=1
+                       DISTNAME=`expr "$url" : '.*/\([^/?]*\)'`
+                       name=`expr "$url" : "${A}\(.*\)/[^/]*\$"`
+                       MASTER_SITES="\${${master_site}:=${name}}"
+                       case "${master_site}" in
+                       "MASTER_SITE_SOURCEFORGE")
+                               HOMEPAGE="http://$name.sourceforge.net/"; ; ;;
+                       "MASTER_SITE_GNU")
+                               HOMEPAGE="http://www.gnu.org/software/$name/"; ; ;;
+                       esac
+                       HOMEPAGE=`expr "$url" : '\(.*/\)[^/]*$'`
+                       break
+               fi
+               fi
+       done
+
+       if [ $found = 0 ]; then
                DISTNAME=`expr "$url" : '.*/\([^/]*\)$'`
                MASTER_SITES=`expr "$url" : '\(.*/\)[^/]*$'`
                HOMEPAGE=$MASTER_SITES
        fi
-       
+
        case "$DISTNAME" in
        *.tgz)          EXTRACT_SUFX=".tgz" 
                        DISTNAME=`expr ${DISTNAME} : '\(.*\)\.[^.]*'`