 @@ -1,15 +1,15 @@
 #! @PERL@
-# $NetBSD: url2pkg.pl,v 1.41 2019/08/17 13:12:00 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.42 2019/08/17 13:21:42 rillig Exp $
+#
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Roland Illig.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 @@ -290,70 +290,66 @@ sub generate_initial_package($) {
 					} elsif ($master_site eq "MASTER_SITE_GNU") {
 						$homepage = "http://www.gnu.org/software/${subdir}/";
 					} else {
 						$homepage = substr($url, 0, -length($distfile));
+					}
 				} else {
 					$master_sites = "\${${master_site}}";
+				}
+			}
+		}
+	}
 	close(SITES) or die;
-	if (true) {
+	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;
-			my $pkgbase = $1;
+		$distfile = $2;
 			$distfile = $2;
 		$master_sites = "\${MASTER_SITE_SOURCEFORGE:=${pkgbase}/}";
-			$master_sites = "\${MASTER_SITE_SOURCEFORGE:=${pkgbase}/}";
+		$homepage = "http://${pkgbase}.sourceforge.net/";
-			$homepage = "http://${pkgbase}.sourceforge.net/";
+		$found = true;
+	}
 	if ($url =~ qr"^https?://github\.com/") {
 		if ($url =~ qr"^https?://github\.com/(.*)/(.*)/archive/(.*)(\.tar\.gz|\.zip)$") {
 			$master_sites = "\${MASTER_SITE_GITHUB:=$1/}";
 			$homepage = "https://github.com/$1/$2/";
 			$gh_project = $2;
 			$gh_tag = $3;
 			if (index($gh_tag, $gh_project) == -1 ) {
 				$pkgname = '${GITHUB_PROJECT}-${DISTNAME}';
 				$dist_subdir = '${GITHUB_PROJECT}';
+			}
 			$distfile = "$3$4";
 			$found = true;
 		} elsif ($url =~ qr"^https?://github\.com/(.*)/(.*)/releases/download/(.*)/(.*)(\.tar\.gz|\.zip)$") {
 			$master_sites = "\${MASTER_SITE_GITHUB:=$1/}";
 			$homepage = "https://github.com/$1/$2/";
-	if (true) {
+			if (index($4, $2) == -1) {
 		if ($url =~ qr"^https?://github\.com/") {
 			if ($url =~ qr"^https?://github\.com/(.*)/(.*)/archive/(.*)(\.tar\.gz|\.zip)$") {
 				$master_sites = "\${MASTER_SITE_GITHUB:=$1/}";
 				$homepage = "https://github.com/$1/$2/";
 				$gh_project = $2;
-				$gh_tag = $3;
+				$dist_subdir = '${GITHUB_PROJECT}';
 				if (index($gh_tag, $gh_project) == -1 ) {
-					$pkgname = '${GITHUB_PROJECT}-${DISTNAME}';
+			if ($3 eq $4) {
-					$dist_subdir = '${GITHUB_PROJECT}';
+				$gh_release = '${DISTNAME}';
 				$distfile = "$3$4";
 				$found = true;
 			} elsif ($url =~ qr"^https?://github\.com/(.*)/(.*)/releases/download/(.*)/(.*)(\.tar\.gz|\.zip)$") {
 				$master_sites = "\${MASTER_SITE_GITHUB:=$1/}";
 				$homepage = "https://github.com/$1/$2/";
 				if (index($4, $2) == -1) {
 					$gh_project = $2;
 					$dist_subdir = '${GITHUB_PROJECT}';
 				if ($3 eq $4) {
 					$gh_release = '${DISTNAME}';
 				} else {
 					$gh_release = $3;
 				$distfile = "$4$5";
 				$found = true;
 			} else {
-				print("$0: ERROR: Invalid GitHub URL: ${url}, handling as normal URL\n");
+				$gh_release = $3;
+			}
 			$distfile = "$4$5";
 			$found = true;
 		} else {
-			$gh_project = ""; $gh_release = ""; $dist_subdir = "";
+			print("$0: ERROR: Invalid GitHub URL: ${url}, handling as normal URL\n");
+		}
 	} else {
 		$gh_project = ""; $gh_release = ""; $dist_subdir = "";
+	}
 	if (!$found) {
 		if ($url =~ qr"^(.*/)(.*)$") {
 			($master_sites, $distfile) = ($1, $2);
 			$homepage = $master_sites;
 		} else {
 			die("$0: ERROR: Invalid URL: ${url}\n");
+		}
+	}
 	if ($distfile =~ qr"^(.*)(\.tgz|\.tar\.Z|\.tar\.gz|\.tar\.bz2|\.tar\.xz|\.tar\.7z)$") {
 		($distname, $dist_sufx) = ($1, $2);