From dcc5cb3c97b95dce5d2c4e0537e7370476bc43d4 Mon Sep 17 00:00:00 2001
From: rh <rh>
Date: Tue, 18 Oct 2005 21:10:28 +0000
Subject: Update url2pkg to 1.31.  This reinstates correct handling of
 "prdownloads.sourceforge.net" URLs.

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

(limited to 'pkgtools/url2pkg')

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>
@@ -62,6 +62,17 @@ if [ ! -f w*/.extract_done ]; then
 		fi
 	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" : '\(.*/\)[^/]*$'`
-- 
cgit v1.2.3