 @@ -1,15 +1,15 @@
 #! @PERL@
-# $NetBSD: url2pkg.pl,v 1.54 2019/08/18 07:47:58 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.55 2019/08/18 07:51:40 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.
 @@ -296,113 +296,111 @@ sub adjust_use_languages() {
 sub generate_initial_package_Makefile_lines($) {
 	my ($url) = @_;
 	my $master_site = "";
 	my $master_sites = "";
 	my $distfile = "";
 	my $homepage = "";
 	my $extract_sufx = "";
 	my $categories = "";
 	my $github_project = "";
 	my $github_release = "";
 	my $dist_subdir = "";
 	my $found = false;
 	open(SITES, "<", "../../mk/fetch/sites.mk") or die;
 	while (defined(my $line = <SITES>)) {
 		chomp($line);
 		if ($line =~ qr"^(MASTER_SITE_.*)\+=") {
 			$master_site = $1;
 		} elsif ($line =~ qr"^\t(.*?)(?:\s+\\)?$") {
 			my ($site) = ($1);
 			if (index($url, $site) == 0) {
 				$found = true;
 				if ($url =~ qr"^\Q${site}\E(.+)/([^/]+)$") {
 					my $subdir = $1;
 					$distfile = $2;
 					$master_sites = "\${${master_site}:=${subdir}/}";
 					if ($master_site eq "MASTER_SITE_SOURCEFORGE") {
 						$homepage = "http://${subdir}.sourceforge.net/";
 					} 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 ($url =~ qr"^https://downloads\.sourceforge\.net/project/([^/?]+)/[^?]+/([^/?]+)(?:[?].*)?$") {
 		my ($project, $filename) = ($1, $2);
 		$master_sites = "\${MASTER_SITE_SOURCEFORGE:=${project}/}";
 		$homepage = "https://${project}.sourceforge.net/";
 		$distfile = $filename;
 		$found = true;
+	}
 	if ($url =~ qr"^https://github\.com/") {
 		if ($url =~ qr"^https://github\.com/(.*)/(.*)/archive/(.*)(\.tar\.gz|\.zip)$") {
 			my ($org, $proj, $tag, $ext) = ($1, $2, $3, $4);
 			$master_sites = "\${MASTER_SITE_GITHUB:=$org/}";
 			$homepage = "https://github.com/$org/$proj/";
 			$github_project = $proj;
 			if (index($tag, $github_project) == -1) {
 				$pkgname = '${GITHUB_PROJECT}-${DISTNAME}';
 				$dist_subdir = '${GITHUB_PROJECT}';
+			}
 			$distfile = "$tag$ext";
 			$found = true;
 		} elsif ($url =~ qr"^https://github\.com/(.*)/(.*)/releases/download/(.*)/(.*)(\.tar\.gz|\.zip)$") {
 			my ($org, $proj, $tag, $base, $ext) = ($1, $2, $3, $4, $5);
 			$master_sites = "\${MASTER_SITE_GITHUB:=$org/}";
 			$homepage = "https://github.com/$org/$proj/";
 			if (index($base, $proj) == -1) {
 				$github_project = $proj;
 				$dist_subdir = '${GITHUB_PROJECT}';
+			}
 			$github_release = $tag eq $base ? '${DISTNAME}' : $tag;
 			$distfile = "$base$ext";
 			$found = true;
 		} else {
 			print("$0: ERROR: Invalid GitHub URL: ${url}, handling as normal URL\n");
+		}
+	}
-	if (!$found) {
+	if ($master_sites eq "") {
 		if ($url =~ qr"^(.*/)(.*)$") {
-			($master_sites, $distfile) = ($1, $2);
+			$master_sites = $1;
 			$distfile = $2;
 			$homepage = $master_sites;
 		} else {
 			die("$0: ERROR: Invalid URL: ${url}\n");
+		}
+	}
 	if ($distfile =~ qr"^(.*?)((?:\.tar)?\.\w+)$") {
-		($distname, $extract_sufx) = ($1, $2);
+		$distname = $1;
 		$extract_sufx = $2;
 	} else {
-		($distname, $extract_sufx) = ($distfile, "# none");
+		$distname = $distfile;
 		$extract_sufx = "# none";
+	}
 	rename("Makefile", "Makefile-url2pkg.bak") or do {};
 	`pwd` =~ qr".*/([^/]+)/[^/]+$" or die;
 	$categories = $1;
 	if ($extract_sufx eq ".tar.gz" || $extract_sufx eq ".gem") {
 		$extract_sufx = "";
+	}
 	my @lines;
 	push(@lines, "# \$" . "NetBSD\$");