summaryrefslogtreecommitdiff
path: root/pkgtools/url2pkg
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-03-19 01:38:56 +0000
committerrillig <rillig@pkgsrc.org>2007-03-19 01:38:56 +0000
commitf533745503bb2ee33a138d4a5d29a00195b0ab82 (patch)
tree8cdafd5ad97cbe0371dd90d6934cda02d3a0f117 /pkgtools/url2pkg
parent2366662d9d63504d3ef3b57f7c0ada9b7b52021a (diff)
downloadpkgsrc-f533745503bb2ee33a138d4a5d29a00195b0ab82.tar.gz
Updated url2pkg to 2.6.
Changes since 2.5: - Fixed the regular expression that splits up the SourceForge URL.
Diffstat (limited to 'pkgtools/url2pkg')
-rw-r--r--pkgtools/url2pkg/Makefile4
-rw-r--r--pkgtools/url2pkg/files/url2pkg.pl4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index 51488c2a1bf..fbdced1e32c 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2007/03/15 12:17:56 rillig Exp $
+# $NetBSD: Makefile,v 1.50 2007/03/19 01:38:56 rillig Exp $
#
-DISTNAME= url2pkg-2.5
+DISTNAME= url2pkg-2.6
CATEGORIES= pkgtools
MASTER_SITES= # none
DISTFILES= # none
diff --git a/pkgtools/url2pkg/files/url2pkg.pl b/pkgtools/url2pkg/files/url2pkg.pl
index 2b95e03a1eb..7a4af95219b 100644
--- a/pkgtools/url2pkg/files/url2pkg.pl
+++ b/pkgtools/url2pkg/files/url2pkg.pl
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: url2pkg.pl,v 1.7 2007/03/15 12:17:56 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.8 2007/03/19 01:38:56 rillig Exp $
#
use strict;
@@ -238,7 +238,7 @@ sub generate_initial_package($) {
}
if (!$found) {
- if ($url =~ qr"^http://(?:pr)?downloads\.sourceforge\.net/([^/]*)/([^/]+)(?:\?(?:download|use_mirror=.*))?$") {
+ if ($url =~ qr"^http://(?:pr)?downloads\.sourceforge\.net/([^/]*)/([^/?]+)(?:\?(?:download|use_mirror=.*))?$") {
my $pkgbase = $1;
$distfile = $2;