Received: by mail.netbsd.org (Postfix, from userid 605) id 0B6FE84D51; Sat, 17 Aug 2019 13:23:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 876DF84D2C for ; Sat, 17 Aug 2019 13:23:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id dK4nnoS7EFZ2 for ; Sat, 17 Aug 2019 13:23:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DFFC084CDF for ; Sat, 17 Aug 2019 13:23:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D9B30FBF4; Sat, 17 Aug 2019 13:23:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1566048215291700" MIME-Version: 1.0 Date: Sat, 17 Aug 2019 13:23:35 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/pkgtools/url2pkg/files To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20190817132335.D9B30FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1566048215291700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sat Aug 17 13:23:35 UTC 2019 Modified Files: pkgsrc/pkgtools/url2pkg/files: url2pkg.pl Log Message: pkgtools/url2pkg: initialize dist_subdir early To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1566048215291700 Content-Disposition: inline Content-Length: 1067 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.pl diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.42 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.43 --- pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.42 Sat Aug 17 13:21:42 2019 +++ pkgsrc/pkgtools/url2pkg/files/url2pkg.pl Sat Aug 17 13:23:35 2019 @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: url2pkg.pl,v 1.42 2019/08/17 13:21:42 rillig Exp $ +# $NetBSD: url2pkg.pl,v 1.43 2019/08/17 13:23:35 rillig Exp $ # # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -121,7 +121,7 @@ my ($distname, $abs_wrkdir, $abs_wrksrc) my (@wrksrc_files, @wrksrc_dirs); my (@depends, @build_depends, @includes, @build_vars, @extra_vars, @todo); my ($pkgname); -my ($dist_subdir); +my $dist_subdir = ""; # # And now to the real magic_* subroutines. @@ -339,7 +339,7 @@ sub generate_initial_package($) { print("$0: ERROR: Invalid GitHub URL: ${url}, handling as normal URL\n"); } } else { - $gh_project = ""; $gh_release = ""; $dist_subdir = ""; + $gh_project = ""; $gh_release = ""; } if (!$found) { --_----------=_1566048215291700--