pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/url2pkg/files pkgtools/url2pkg: rename local ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8fa74baf6496
branches:  trunk
changeset: 338065:8fa74baf6496
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Aug 18 05:47:53 2019 +0000

description:
pkgtools/url2pkg: rename local variables to match pkgsrc counterparts

diffstat:

 pkgtools/url2pkg/files/url2pkg.pl |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (60 lines):

diff -r c3b447db81c0 -r 8fa74baf6496 pkgtools/url2pkg/files/url2pkg.pl
--- a/pkgtools/url2pkg/files/url2pkg.pl Sun Aug 18 05:43:28 2019 +0000
+++ b/pkgtools/url2pkg/files/url2pkg.pl Sun Aug 18 05:47:53 2019 +0000
@@ -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 @@
        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 @@
        }
 
        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],
        ]);
 



Home | Main Index | Thread Index | Old Index