Received: by mail.netbsd.org (Postfix, from userid 605) id A9A3584D4D; Sun, 18 Aug 2019 05:47:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 30A1584D33 for ; Sun, 18 Aug 2019 05:47:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id lTkPF8XG-g-h for ; Sun, 18 Aug 2019 05:47:53 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A682884CCF for ; Sun, 18 Aug 2019 05:47:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 996F5FBF4; Sun, 18 Aug 2019 05:47:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156610727328020" MIME-Version: 1.0 Date: Sun, 18 Aug 2019 05:47:53 +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: <20190818054753.996F5FBF4@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. --_----------=_156610727328020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sun Aug 18 05:47:53 UTC 2019 Modified Files: pkgsrc/pkgtools/url2pkg/files: url2pkg.pl Log Message: pkgtools/url2pkg: rename local variables to match pkgsrc counterparts To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 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. --_----------=_156610727328020 Content-Disposition: inline Content-Length: 1881 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.47 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.48 --- pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.47 Sun Aug 18 05:43:28 2019 +++ pkgsrc/pkgtools/url2pkg/files/url2pkg.pl Sun Aug 18 05:47:53 2019 @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: url2pkg.pl,v 1.47 2019/08/18 05:43:28 rillig Exp $ +# $NetBSD: url2pkg.pl,v 1.48 2019/08/18 05:47:53 rillig Exp $ # # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -271,8 +271,8 @@ sub generate_initial_package_Makefile($) my $master_sites = ""; my $distfile = ""; my $homepage = ""; - my $dist_sufx = ""; - my $category = ""; + my $extract_sufx = ""; + my $categories = ""; my $github_project = ""; my $github_release = ""; my $dist_subdir = ""; @@ -361,31 +361,31 @@ sub generate_initial_package_Makefile($) } if ($distfile =~ qr"^(.*?)((?:\.tar)?\.\w+)$") { - ($distname, $dist_sufx) = ($1, $2); + ($distname, $extract_sufx) = ($1, $2); } else { - ($distname, $dist_sufx) = ($distfile, "# none"); + ($distname, $extract_sufx) = ($distfile, "# none"); } rename("Makefile", "Makefile-url2pkg.bak") or do {}; `pwd` =~ qr".*/([^/]+)/[^/]+$" or die; - $category = $1; + $categories = $1; open(MF, ">", "Makefile") or die; print MF ("# \$" . "NetBSD\$\n"); print MF ("\n"); - if ($dist_sufx eq ".tar.gz" || $dist_sufx eq ".gem") { - $dist_sufx = ""; + if ($extract_sufx eq ".tar.gz" || $extract_sufx eq ".gem") { + $extract_sufx = ""; } print_section(*MF, [ ["GITHUB_PROJECT", $github_project], ["DISTNAME", $distname], - ["CATEGORIES", $category], + ["CATEGORIES", $categories], ["MASTER_SITES", $master_sites], ["GITHUB_RELEASE", $github_release], - ["EXTRACT_SUFX", $dist_sufx], + ["EXTRACT_SUFX", $extract_sufx], ["DIST_SUBDIR", $dist_subdir], ]); --_----------=_156610727328020--