Skip to content

Commit

Permalink
audio/gnupod: fix deprecated use of defined(@array)
Browse files Browse the repository at this point in the history
Submitter becomes maintainer. First port to be maintained by submitter.

PR:	265018
Reported by:	steve.roome@gmail.com
MFH:	2022Q3

(cherry picked from commit 50964af)
  • Loading branch information
Stephen Roome authored and Fernando Apesteguía committed Aug 5, 2022
1 parent dd2618e commit d50ea47
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
2 changes: 1 addition & 1 deletion audio/gnupod/Makefile
Expand Up @@ -7,7 +7,7 @@ CATEGORIES= audio perl5
MASTER_SITES= SAVANNAH \
http://www.blinkenlights.ch/gnupod-dist/stable/

MAINTAINER= ports@FreeBSD.org
MAINTAINER= steve.roome@gmail.com
COMMENT= Set of Perl scripts for using an Apple iPod

LICENSE= GPLv3+
Expand Down
35 changes: 35 additions & 0 deletions audio/gnupod/files/patch-to-fix-gnupod.txt
@@ -0,0 +1,35 @@
--- src/ext/FileMagic.pm.orig 2009-07-11 00:20:05.000000000 +0100
+++ src/ext/FileMagic.pm 2022-07-03 22:22:24.750066000 +0100
@@ -362,7 +362,7 @@
foreach (keys(%{$in})) {
my $kvp = __flatten($_, $exclude); # key
next if !defined($kvp);
- my $v = __flatten(%{$in}->{$_}, $exclude); # value
+ my $v = __flatten({$in->{$_}}, $exclude); # value
$kvp .= " : ".$v if (defined($v) && ("$v" ne ""));
push @out, $kvp;
}
@@ -418,9 +418,9 @@
my $case = "check";

if (ref($options) eq "HASH") {
- $joinby = %{$options}->{joinby} if defined(%{$options}->{joinby});
- $wspace = lc(%{$options}->{wspace}) if defined(%{$options}->{wspace});
- $case = lc(%{$options}->{case}) if defined(%{$options}->{case});
+ $joinby = $options->{joinby} if $options->{joinby};
+ $wspace = lc($options->{wspace}) if $options->{wspace};
+ $case = lc($options->{case}) if $options->{case};
}
my $merged = "";

--- src/ext/XMLhelper.pm.orig 2009-07-11 00:20:05.000000000 +0100
+++ src/ext/XMLhelper.pm 2022-07-03 22:22:34.918120000 +0100
@@ -359,7 +359,7 @@
print OUT " </smartplaylist>\n";
}
elsif(my $phr = get_plpref($current_plname)) { #plprefs found..
- if (defined(@{$XDAT->{playlists}->{data}->{$current_plname}})) { #the playlist is not empty
+ if (@{$XDAT->{playlists}->{data}->{$current_plname}}) { #the playlist is not empty
print OUT "\n ".mkfile({playlist=>$phr}, {return=>1,noend=>1})."\n";
foreach(@{$XDAT->{playlists}->{data}->{$current_plname}}) {
print OUT " $_\n";

0 comments on commit d50ea47

Please sign in to comment.