From 6b665bbfbd9d6f3d41927b91f19fa9fe77d3b84a Mon Sep 17 00:00:00 2001
From: rh <rh@pkgsrc.org>
Date: Wed, 23 Apr 2003 09:18:29 +0000
Subject: [PATCH] Update url2pkg to 1.23.  In this version, the SourceForge
 magic now works with or without the '?use_mirror=.*' suffix.

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

diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index 4c6501adc9d2..daf29fd24ecc 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2003/04/22 00:35:08 rh Exp $
+# $NetBSD: Makefile,v 1.26 2003/04/23 09:18:29 rh Exp $
 #
 
-DISTNAME=	url2pkg-1.22
+DISTNAME=	url2pkg-1.23
 WRKSRC=		${WRKDIR}
 CATEGORIES=	pkgtools sysutils
 MASTER_SITES=	# Nothing
diff --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg
index 34736d20cc55..ddba321431a5 100755
--- a/pkgtools/url2pkg/files/url2pkg
+++ b/pkgtools/url2pkg/files/url2pkg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: url2pkg,v 1.23 2003/04/22 00:35:09 rh Exp $
+# $NetBSD: url2pkg,v 1.24 2003/04/23 09:18:30 rh Exp $
 #
 # url2pkg
 # (c) 1999-2002 Hubert Feyrer <hubert@feyrer.de>
@@ -40,8 +40,8 @@ if [ ! -f w*/.extract_done ]; then
 	fi
 
 	sourceforge="http://prdownloads.sourceforge.net/"
-	if [ `expr "$url" : "$sourceforge"` -gt 0 ]; then
-		DISTNAME=`expr "$url" : '.*/\([^/]*\)?'`
+	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/"