diff options
| author | rh <rh@pkgsrc.org> | 2005-10-18 21:10:28 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2005-10-18 21:10:28 +0000 |
| commit | 4c68c92c17533259941f4ea4823c3584d5d6a9d4 (patch) | |
| tree | ff352c42c71d7f281f3455dd0e8f58ca28b4740a /pkgtools | |
| parent | 4707433ac2ac883cb42da99c8a7f53c936edebb8 (diff) | |
| download | pkgsrc-4c68c92c17533259941f4ea4823c3584d5d6a9d4.tar.gz | |
Update url2pkg to 1.31. This reinstates correct handling of
"prdownloads.sourceforge.net" URLs.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/url2pkg/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/url2pkg/files/url2pkg | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index fc282eb578f..9b58ff78730 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -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 --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg index 2f74c865a73..c4218e7e850 100755 --- a/pkgtools/url2pkg/files/url2pkg +++ b/pkgtools/url2pkg/files/url2pkg @@ -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> @@ -63,6 +63,17 @@ if [ ! -f w*/.extract_done ]; then 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 |