packages: adapter.awk - new sf urls

[glen]

Author: glen                         Date: Sat Aug 29 18:50:22 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new sf urls

---- Files affected:
packages:
   adapter.awk (1.424 -> 1.425) 

---- Diffs:

================================================================
Index: packages/adapter.awk
diff -u packages/adapter.awk:1.424 packages/adapter.awk:1.425
--- packages/adapter.awk:1.424	Fri Aug 28 11:00:23 2009
+++ packages/adapter.awk	Sat Aug 29 20:50:16 2009
@@ -1581,19 +1581,25 @@
 
 	# sourceforge urls
 	# Docs about sourceforge mirror system: http://sourceforge.net/docs/B05/
-	sub("[?&]big_mirror=.*$", "", url);
-	sub("[?&]modtime=.*$", "", url);
-	sub("[?]use_mirror=.*$", "", url);
-	sub("[?]download$", "", url);
-
 	sub("^http://prdownloads\.sourceforge\.net/", "http://dl.sourceforge.net/", url)
 	sub("^http://download\.sf\.net/", "http://dl.sourceforge.net/", url)
 	sub("^http://download\.sourceforge\.net/", "http://dl.sourceforge.net/", url)
 	sub("^http://downloads\.sourceforge\.net/", "http://dl.sourceforge.net/", url)
-
 	sub("^http://.*\.dl\.sourceforge\.net/", "http://dl.sourceforge.net/", url)
 	sub("^http://dl\.sourceforge\.net/sourceforge/", "http://dl.sourceforge.net/", url)
 	sub("^http://dl\.sf\.net/", "http://dl.sourceforge.net/", url)
+	# new style urls, strip "files/" between and prepend dl.
+	if (match(url, "^http://sourceforge.net/projects/[^/]+/files/")) {
+		url = substr(url, 1, RLENGTH - length("files/")) substr(url, RSTART + RLENGTH);
+		sub("^http://sourceforge.net/projects/", "http://dl.sourceforge.net/project/", url);
+	}
+	if (url ~ /sourceforge.net/) {
+		sub("[?&]big_mirror=.*$", "", url);
+		sub("[?&]modtime=.*$", "", url);
+		sub("[?]use_mirror=.*$", "", url);
+		sub("[?]download$", "", url);
+		sub("/download$", "", url);
+	}
 
 	sub("^ftp://ftp\.gnome\.org/", "http://ftp.gnome.org/", url)
 	sub("^http://ftp\.gnome\.org/pub/gnome/", "http://ftp.gnome.org/pub/GNOME/", url)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter.awk?r1=1.424&r2=1.425&f=u