mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00
Code Issues Releases Activity

Fix new perl warning "defined(%hash) is deprecated"

Browse Source 
(from the project CVS)

Feature safe:   yes
This commit is contained in:
Andrey A. Chernov 2011-12-11 22:54:03 +00:00
parent c15eb5b2ce
commit 40808811d2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=287212
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/WebMagick/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= WebMagick
PORTVERSION= 2.03p3
PORTREVISION= 46
PORTREVISION= 47
PORTEPOCH= 1
CATEGORIES= www graphics
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}-beta/2.03pre3

19
www/WebMagick/files/patch-aa
View File

@ -2,15 +2,15 @@ Index: webmagick.in
===================================================================
RCS file: /cvsroot/webmagick/WebMagick/webmagick.in,v
retrieving revision 1.117
retrieving revision 1.169
diff -u -r1.117 -r1.169
retrieving revision 1.170
diff -u -r1.117 -r1.170
--- webmagick.in 23 Oct 2002 16:14:47 -0000 1.117
+++ webmagick.in 21 Sep 2011 05:54:43 -0000 1.169
+++ webmagick.in 11 Dec 2011 22:46:56 -0000 1.170
@@ -1,6 +1,6 @@
#! @PERL@
#
-# $Id: webmagick.in,v 1.117 2002/10/23 16:14:47 clindell Exp $
+# $Id: webmagick.in,v 1.169 2011/09/21 05:54:43 ache Exp $
+# $Id: webmagick.in,v 1.170 2011/12/11 22:46:56 ache Exp $
#
# You are looking at the main PERL script for WebMagick, a package to
# intelligently create HTML and JavaScript index files and imagemaps
@ -1551,12 +1551,21 @@ diff -u -r1.117 -r1.169
sub compareHash {
my( $hash1, $hash2) = @_;
+ if (defined(%$hash1) != defined(%$hash2)) {
+ if (!%$hash1 != !%$hash2) {
+ return( 1 );
+ }
if(scalar(keys(%$hash1)) != scalar(keys(%$hash2))) {
return( 1 ); # different length
}
@@ -3633,7 +3894,7 @@
}
}
- if( !defined(%iconImageSizes) || ( compareHash(\%iconImageSizes,\%tmp_iconImageSizes) ) ) {
+ if( !%iconImageSizes || ( compareHash(\%iconImageSizes,\%tmp_iconImageSizes) ) ) {
%iconImageSizes = %tmp_iconImageSizes;
print( STDERR "Icon sizes have changed, must re-do all HTML\n" )
if $opt_debug;
@@ -3868,7 +4129,7 @@
# Set image label
#