pkgsrc-WIP-changes archive

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

cloc: avoid "defined @"



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%ir.bbn.com@localhost>
Pushed By:	gdt
Date:		Wed Apr 20 12:02:39 2016 -0400
Changeset:	f081ef7748415379951935df5106d67dfd7ccbc9

Modified Files:
	cloc/Makefile
	cloc/distinfo
Added Files:
	cloc/patches/patch-cloc-1.56.pl

Log Message:
cloc: avoid "defined @"

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f081ef7748415379951935df5106d67dfd7ccbc9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cloc/Makefile                   |  1 +
 cloc/distinfo                   |  2 ++
 cloc/patches/patch-cloc-1.56.pl | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diffs:
diff --git a/cloc/Makefile b/cloc/Makefile
index 71534b6e88..b9e9a21073 100644
--- a/cloc/Makefile
+++ b/cloc/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.8 2013/12/01 09:01:55 thomasklausner Exp $
 
 DISTNAME=	cloc-1.56
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cloc/}
 EXTRACT_SUFX=	.pl
diff --git a/cloc/distinfo b/cloc/distinfo
index 81d7c5d29e..4209178e39 100644
--- a/cloc/distinfo
+++ b/cloc/distinfo
@@ -2,4 +2,6 @@ $NetBSD: distinfo,v 1.2 2013/01/29 11:16:34 jihbed Exp $
 
 SHA1 (cloc-1.56.pl) = 238ea26eccfc574c27aa90ee17741f363959be3f
 RMD160 (cloc-1.56.pl) = f5d969bb4cfcd9d2806a63741f8abcdabcad2795
+SHA512 (cloc-1.56.pl) = 6bbd74c79bc6c905bc20be1d5d4b75efdb01d5b395e5f163e0ea1358b5da2b41ae7c7f27fc0487a37c3144fd3ac81d7242e31245994e257bd09e313837f50979
 Size (cloc-1.56.pl) = 320786 bytes
+SHA1 (patch-cloc-1.56.pl) = 29aea7c6a2ca1338bc1b892bc5d686f7da197df8
diff --git a/cloc/patches/patch-cloc-1.56.pl b/cloc/patches/patch-cloc-1.56.pl
new file mode 100644
index 0000000000..f9961767da
--- /dev/null
+++ b/cloc/patches/patch-cloc-1.56.pl
@@ -0,0 +1,33 @@
+$NetBSD$
+
+--- cloc-1.56.pl.orig	2016-04-20 15:59:30.000000000 +0000
++++ cloc-1.56.pl
+@@ -1051,8 +1051,8 @@ foreach (my $F = 0; $F < scalar @fh - 1;
+             $Ignored{$file_R} = "--exclude-lang=$Lang_R}";
+             next;
+         }
+-        if (!defined @{$Filters_by_Language{$Lang_L} } or
+-            !defined @{$Filters_by_Language{$Lang_R} }
++        if (!defined {$Filters_by_Language{$Lang_L} } or
++            !defined {$Filters_by_Language{$Lang_R} }
+            ) {
+             if (($Lang_L eq "(unknown)") or ($Lang_R eq "(unknown)")) {
+                 $Ignored{$fh[$F  ]}{$file_L} = "language unknown (#1)";
+@@ -1376,7 +1376,7 @@ foreach my $file (sort keys %unique_sour
+         $Ignored{$file} = "--exclude-lang=$Language{$file}";
+         next;
+     }
+-    if (!defined @{$Filters_by_Language{$Language{$file}} }) {
++    if (!defined {$Filters_by_Language{$Language{$file}} }) {
+         if ($Language{$file} eq "(unknown)") {
+             $Ignored{$file} = "language unknown (#1)";
+         } else {
+@@ -1507,7 +1507,7 @@ sub combine_results {                   
+                    )?
+                    $}x) {
+                 if ($report_type eq "by language") {
+-                    next unless defined @{$rhaa_Filters_by_Language->{$1}};
++                    next unless defined {$rhaa_Filters_by_Language->{$1}};
+                     # above test necessary to avoid trying to sum reports
+                     # of reports (which have no language breakdown).
+                     $found_language = 1;


Home | Main Index | Thread Index | Old Index