diff options
| author | rillig <rillig@pkgsrc.org> | 2019-08-18 05:47:53 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-08-18 05:47:53 +0000 |
| commit | edd04e5afd0e30cbac2e62239b49e47056eba132 (patch) | |
| tree | d19625a8147cb0682f8083e57296fe26ca6b9b7e /pkgtools/url2pkg/files | |
| parent | 9f525c3c593b4e6dc1240fc53369e05895a82251 (diff) | |
| download | pkgsrc-edd04e5afd0e30cbac2e62239b49e47056eba132.tar.gz | |
pkgtools/url2pkg: rename local variables to match pkgsrc counterparts
Diffstat (limited to 'pkgtools/url2pkg/files')
| -rw-r--r-- | pkgtools/url2pkg/files/url2pkg.pl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgtools/url2pkg/files/url2pkg.pl b/pkgtools/url2pkg/files/url2pkg.pl index 201441ee00a..a73358a79ab 100644 --- a/pkgtools/url2pkg/files/url2pkg.pl +++ b/pkgtools/url2pkg/files/url2pkg.pl @@ -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], ]); |