Update from project CVS

2 files changed, 133 insertions, 18 deletions

diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index a25ffeb0c781..3322addf1683 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=    2.03p3
-PORTREVISION=   3
+PORTREVISION=   4
 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 218215194c5b..801e46f51e73 100644
--- a/www/WebMagick/files/patch-aa
+++ b/www/WebMagick/files/patch-aa
@@ -2,19 +2,121 @@ Index: webmagick.in
 ===================================================================
 RCS file: /cvsroot/webmagick/WebMagick/webmagick.in,v
 retrieving revision 1.117
-retrieving revision 1.123
-diff -u -r1.117 -r1.123
+retrieving revision 1.124
+diff -u -r1.117 -r1.124
 --- webmagick.in	23 Oct 2002 16:14:47 -0000	1.117
-+++ webmagick.in	30 Jan 2003 12:22:14 -0000	1.123
++++ webmagick.in	2 Jun 2003 09:35:07 -0000	1.124
 @@ -1,6 +1,6 @@
  #! @PERL@ 
  #
 -# $Id: webmagick.in,v 1.117 2002/10/23 16:14:47 clindell Exp $
-+# $Id: webmagick.in,v 1.123 2003/01/30 12:22:14 ache Exp $
++# $Id: webmagick.in,v 1.124 2003/06/02 09:35:07 ache Exp $
  #
  # You are looking at the main PERL script for WebMagick, a package to
  # intelligently create HTML and JavaScript index files and imagemaps
-@@ -2173,17 +2173,14 @@
+@@ -492,7 +492,7 @@
+ $opt_framemarginwidth	= 1;		# Pixels allocated to frame margin in horizontal direction
+ $opt_framemarginheight	= 1;		# Pixels allocated to frame margin in vertical direction
+ $opt_framebordersize	= 3 ;		# Pixels allocated to frame border
+-$opt_frameborder	= 'YES';	# Enable (YES) or disable (NO) decorative frame borders
++$opt_frameborder        = 1;            # Enable (1) or disable (0) decorative frame borders
+ $opt_framestyle		= 1;		# Frame style to use (out of those available)
+ 
+ #
+@@ -596,12 +596,11 @@
+ # |  |          |
+ #  -------------
+ $opt_framefmt{1}=
+-'<FRAMESET COLS=\"132,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize}>
++'<FRAMESET COLS=\"132,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
+  <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\"
+    MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+  <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_imageview}\"
+-   MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+-</FRAMESET>';
++   MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>';
+ $opt_framefmt_frames{1}=2;	# Number of frames expressed by this frame format
+ 
+ # Three frame screen with directories listed in top-left frame,
+@@ -616,16 +615,15 @@
+ # |  |          |
+ #  -------------
+ $opt_framefmt{2}=
+-'<FRAMESET COLS=\"145,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize}>
+- <FRAMESET ROWS=\"20%,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize}>
++'<FRAMESET COLS=\"145,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
++ <FRAMESET ROWS=\"20%,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
+   <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\"
+     MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+   <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_thumbview}\"
+     MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+  </FRAMESET>
+  <FRAME SRC=\"${imageFrameLink}\" NAME=\"${opt_frame_name_imageview}\"
+-   MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+-</FRAMESET>';
++   MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>';
+ $opt_framefmt_frames{2}=3;	# Number of frames expressed by this frame format
+ 
+ # Three frame screen with directories listed in left frame,
+@@ -640,16 +638,15 @@
+ # |  |          |
+ #  -------------
+ $opt_framefmt{3}=
+-'<FRAMESET COLS=\"132,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize}>
++'<FRAMESET COLS=\"132,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
+  <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\"
+    MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+- <FRAMESET ROWS=\"150,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize}>
++ <FRAMESET ROWS=\"150,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
+    <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_thumbview}\"
+      MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+    <FRAME SRC=\"${imageFrameLink}\" NAME=\"${opt_frame_name_imageview}\"
+      MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+- </FRAMESET>
+-</FRAMESET>';
++ </FRAMESET>';
+ $opt_framefmt_frames{3}=3;	# Number of frames expressed by this frame format
+ 
+ # Three frame screen with directories listed in lower-left frame,
+@@ -664,16 +661,15 @@
+ # |  |          |
+ #  -------------
+ $opt_framefmt{4}=
+-'<FRAMESET ROWS=\"172,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize}>
++'<FRAMESET ROWS=\"172,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
+  <FRAME SRC=\"${pageframelink}\" NAME=\"${opt_frame_name_thumbview}\"
+    MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+- <FRAMESET COLS=\"132,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize}>
++ <FRAMESET COLS=\"132,*\" FRAMEBORDER=${opt_frameborder} BORDER=${opt_framebordersize} FRAMESPACING=${opt_framebordersize}>
+    <FRAME SRC=\"${dirframelink}\" NAME=\"${opt_frame_name_dirview}\"
+      MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+    <FRAME SRC=\"${imageFrameLink}\" NAME=\"${opt_frame_name_imageview}\"
+      MARGINWIDTH=${opt_framemarginwidth} MARGINHEIGHT=${opt_framemarginheight}>
+- </FRAMESET>
+-</FRAMESET>';
++ </FRAMESET>';
+ $opt_framefmt_frames{4}=3;	# Number of frames expressed by this frame format
+ 
+ #
+@@ -793,7 +789,7 @@
+ 		'framemarginwidth=i'	=> \$opt_framemarginwidth,
+ 		'framemarginheight=i'	=> \$opt_framemarginheight,
+ 		'framebordersize=i'	=> \$opt_framebordersize,
+-		'frameborder=s'		=> \$opt_frameborder,
++		'frameborder=i'         => \$opt_frameborder,
+ 		'frames!'               => \$opt_frames,
+ 		'framestyle=i'		=> \$opt_framestyle,
+ 		'header=s'		=> \$opt_header,
+@@ -1619,7 +1615,7 @@
+ 	 'framemarginwidth'     => !$opt_frames ? 0 : $opt_framemarginwidth,
+ 	 'framemarginheight'    => !$opt_frames ? 0 : $opt_framemarginheight,
+ 	 'framebordersize'      => !$opt_frames ? 0 : $opt_framebordersize,
+-	 'frameborder'          => !$opt_frames ? "" : $opt_frameborder,
++	 'frameborder'          => !$opt_frames ? 0 : $opt_frameborder,
+ 	 'frames'               => $opt_frames,
+ 	 'framestyle'           => !$opt_frames ? 1 : $opt_framestyle,
+ 	 'header'		=> $opt_header,
+@@ -2173,20 +2169,17 @@
      print( INDEX $framespechtml );
      print( INDEX "<NOFRAMES>\n" );
      print( INDEX "<BODY\n" );
@@ -39,8 +141,12 @@ diff -u -r1.117 -r1.123
 +    print( INDEX "  ALINK=\"${opt_coloralink}\"");
      print( INDEX ">\n" );
      print( INDEX $indexhtml );
-     print( INDEX "</BODY>\n</NOFRAMES>\n</HTML>" );
-@@ -2242,17 +2239,14 @@
+-    print( INDEX "</BODY>\n</NOFRAMES>\n</HTML>" );
++    print( INDEX "</BODY>\n</NOFRAMES>\n</FRAMESET>\n</HTML>" );
+     close( INDEX );
+ 
+ 
+@@ -2242,17 +2235,14 @@
      
      print( INDEX "</HEAD>\n" );
      print( INDEX "<BODY\n" );
@@ -66,7 +172,7 @@ diff -u -r1.117 -r1.123
      print( INDEX ">\n");
      print( INDEX $pagedirhtml );
      print( INDEX "</BODY></HTML>\n" );
-@@ -2379,16 +2373,13 @@
+@@ -2379,16 +2369,13 @@
  
      print( INDEX "</HEAD>\n" );
      print( INDEX "<BODY\n" );
@@ -90,7 +196,7 @@ diff -u -r1.117 -r1.123
      print( INDEX ">\n");
  
      print( INDEX "${opt_header}\n" ) if ("$opt_header" ne '');
-@@ -2397,8 +2388,12 @@
+@@ -2397,8 +2384,12 @@
      if( $numimages > 0 ) {
  	# Total HACK!!!
  	if( !$opt_frames || $opt_framestyle == 1 ) {
@@ -105,7 +211,7 @@ diff -u -r1.117 -r1.123
  	}
  	print( INDEX "$indexbar<BR>\n" );
  
-@@ -2433,22 +2428,30 @@
+@@ -2433,22 +2424,30 @@
  	
  	    my $pic = $imageNames[$pageNumber - 1][$imageNum];
  	    my $pichtml;
@@ -138,7 +244,7 @@ diff -u -r1.117 -r1.123
  
  			# Meta tags
  			print( PICHTML "  <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" );
-@@ -2469,28 +2472,19 @@
+@@ -2469,28 +2468,19 @@
  
  			print( PICHTML "</HEAD>\n" );
  			print( PICHTML "<BODY\n" );
@@ -175,7 +281,7 @@ diff -u -r1.117 -r1.123
  			}
  
  			if ($opt_pichtmlnav) {
-@@ -2526,9 +2520,9 @@
+@@ -2526,9 +2516,9 @@
  				} else {
  					print ( PICHTML "<A${target} HREF=\"");
  					if ($imageNum == 0 && $pageNumber != 1) {
@@ -187,7 +293,7 @@ diff -u -r1.117 -r1.123
  					}
  					print ( PICHTML $opt_pichtmlext);
  					print ( PICHTML "\"><IMG SRC=\"$iconImageUrls{'prev'}\"",
-@@ -2543,9 +2537,9 @@
+@@ -2543,9 +2533,9 @@
  				} else {
  					print ( PICHTML "<A${target} HREF=\"");
  					if (($imageNum == $#{$imageNames[$pageNumber - 1]}) && $pageNumber != $numPages) {
@@ -199,7 +305,7 @@ diff -u -r1.117 -r1.123
  					}
  					print ( PICHTML $opt_pichtmlext);
  					print ( PICHTML "\"><IMG SRC=\"$iconImageUrls{'next'}\"",
-@@ -2556,10 +2550,10 @@
+@@ -2556,10 +2546,10 @@
  				print ( PICHTML "</NOBR><BR>");
  			}
  
@@ -213,7 +319,7 @@ diff -u -r1.117 -r1.123
  			}
  
  			print( PICHTML "$opt_pichtmlbottom\n") if ("$opt_pichtmlbottom" ne '');
-@@ -2601,12 +2595,16 @@
+@@ -2601,12 +2591,16 @@
  			# TODO: make sure the thumbnails are created, and get some image sizes
  			# TODO: save the labels in a new array, maybe same with sizes
  			if ( $thumbImageSizes{$pic}) {
@@ -233,7 +339,16 @@ diff -u -r1.117 -r1.123
  						
  			if ($imageNum%$opt_columns == ($opt_columns - 1))
  			{
-@@ -4296,6 +4294,7 @@
+@@ -4174,7 +4168,7 @@
+   --framemarginwidth Pixels allocated to frame margin in horizontal direction
+   --framemarginheight Pixels allocated to frame margin in vertical direction
+   --framebordersize  Pixels allocated to frame border
+-  --frameborder      Enable (YES) or disable (NO) decorative frame borders
++  --frameborder      Enable (1) or disable (0) decorative frame borders
+   --framestyle       Frame style to use (out of those available)
+   --[no]allowconfig  Allow user to configure framestyle, columns and rows (requires javascript and tables) (default off)
+ 
+@@ -4296,6 +4290,7 @@
      s/&/&amp;/g;
      s/>/&gt;/g;
      s/</&lt;/g;
@@ -241,7 +356,7 @@ diff -u -r1.117 -r1.123
      return( $_ );
  }
  
-@@ -4324,22 +4323,10 @@
+@@ -4324,22 +4319,10 @@
  # Escape unsafe characters in URLs
  #		
  sub escapeurl {