Update to the latest variant from the project CVS

2 files changed, 72 insertions, 6 deletions

diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 5cc2e8f3fb47..51b75f028f09 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=    2.03p3
-PORTREVISION=   1
+PORTREVISION=   2
 PORTEPOCH=      1
 CATEGORIES=	www graphics
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
diff --git a/www/WebMagick/files/patch-aa b/www/WebMagick/files/patch-aa
index 4d03b2230060..e080809651ae 100644
--- a/www/WebMagick/files/patch-aa
+++ b/www/WebMagick/files/patch-aa
@@ -2,15 +2,15 @@ Index: webmagick.in
 ===================================================================
 RCS file: /cvsroot/webmagick/WebMagick/webmagick.in,v
 retrieving revision 1.117
-retrieving revision 1.118
-diff -u -r1.117 -r1.118
+retrieving revision 1.119
+diff -u -r1.117 -r1.119
 --- webmagick.in	23 Oct 2002 16:14:47 -0000	1.117
-+++ webmagick.in	29 Jan 2003 23:52:55 -0000	1.118
++++ webmagick.in	30 Jan 2003 04:19:33 -0000	1.119
 @@ -1,6 +1,6 @@
  #! @PERL@ 
  #
 -# $Id: webmagick.in,v 1.117 2002/10/23 16:14:47 clindell Exp $
-+# $Id: webmagick.in,v 1.118 2003/01/29 23:52:55 ache Exp $
++# $Id: webmagick.in,v 1.119 2003/01/30 04:19:33 ache Exp $
  #
  # You are looking at the main PERL script for WebMagick, a package to
  # intelligently create HTML and JavaScript index files and imagemaps
@@ -90,7 +90,39 @@ diff -u -r1.117 -r1.118
      print( INDEX ">\n");
  
      print( INDEX "${opt_header}\n" ) if ("$opt_header" ne '');
-@@ -2469,16 +2460,13 @@
+@@ -2433,7 +2424,9 @@
+ 	
+ 	    my $pic = $imageNames[$pageNumber - 1][$imageNum];
+ 	    my $pichtml;
++	    my $altlabel;
+ 	    my $target = '';
++
+ 	    if ($opt_pichtml && $opt_frames && "$opt_pichtmltarget" ne '') {
+ 		$target = " TARGET=\"${opt_pichtmltarget}\"";
+ 	    }
+@@ -2441,6 +2434,12 @@
+ 	    if ( $opt_pichtml ) {
+ 			
+ 			$pichtml = $pic . $opt_pichtmlext;
++			if (defined($imageLabels{$pic})) {
++			    $altlabel = $imageLabels{$pic};
++			} else {
++			    ($altlabel = $pic) =~ s/(.*)\.\w+$/$1/i;
++			    $altlabel =~ y/_/ /; # Usual space replacement in file name
++			}
+ 
+ 			open( PICHTML, ">$pichtml")
+ 			    || die("$0: Failed to open file $pichtml for output\n$@\n");
+@@ -2448,7 +2447,7 @@
+ 			# Charset is better before title
+ 			print( PICHTML "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
+ 			    if( "$opt_metacharset" ne '' );
+-			print( PICHTML "  <TITLE>$pic</TITLE>\n" );
++			print( PICHTML "  <TITLE>", escapehtml($altlabel), "</TITLE>\n" );
+ 
+ 			# Meta tags
+ 			print( PICHTML "  <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" );
+@@ -2469,27 +2468,20 @@
  
  			print( PICHTML "</HEAD>\n" );
  			print( PICHTML "<BODY\n" );
@@ -114,3 +146,37 @@ diff -u -r1.117 -r1.118
  			print( PICHTML ">\n" );
  
  			print( PICHTML "$opt_pichtmltop") if ("$opt_pichtmltop" ne '');
+ 
+ 			if ($opt_pichtmlputtitle) {
+ 			    print ( PICHTML "${opt_pichtmltitlestart}");
+-			    if (defined( $imageLabels{$pic})) {
+-				print( PICHTML "$imageLabels{$pic}");
+-			    } else {
+-				print( PICHTML "$pic");
+-			    }
++			    print ( PICHTML escapehtml($altlabel));
+ 			    print ( PICHTML "${opt_pichtmltitleend}");
+ 			}
+ 
+@@ -2556,10 +2548,10 @@
+ 				print ( PICHTML "</NOBR><BR>");
+ 			}
+ 
+-			if ( $pic =~ /\.(jpg|jpeg?|gif|xbm|png)$/i ) {
+-			    print( PICHTML "<IMG SRC=\"$pic\" ALT=\"\">" );
++			if ($pic =~ /\.(jpg|jpeg?|gif|xbm|png)$/i) {
++			    print( PICHTML "<IMG SRC=\"", escapeurl($pic), "\" ALT=\"", escapehtml($altlabel), "\">" );
+ 			} else {
+-			    print( PICHTML "<A HREF=\"", escapeurl($pic), "\"><BIG><B>$pic</B></A> ", fsize($pic), "</BIG>" );
++			    print( PICHTML "<A HREF=\"", escapeurl($pic), "\"><BIG><B>", escapehtml($pic), "</B></A> ", fsize($pic), "</BIG>" );
+ 			}
+ 
+ 			print( PICHTML "$opt_pichtmlbottom\n") if ("$opt_pichtmlbottom" ne '');
+@@ -4296,6 +4288,7 @@
+     s/&/&amp;/g;
+     s/>/&gt;/g;
+     s/</&lt;/g;
++    s/\"/&quot;/g;  # because we use "xxx" form sometimes
+     return( $_ );
+ }
+