Update to the latest version from the project CVS

Feature safe: yes

3 files changed, 260 insertions, 149 deletions

diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index abfaa1a009f9..59bb2d6ed622 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p3
-PORTREVISION=	50
+PORTREVISION=	51
 PORTEPOCH=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}-beta/2.03pre3
diff --git a/www/WebMagick/files/patch-aa b/www/WebMagick/files/patch-aa
index 34612d54e593..11e56f14ac87 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.176
-diff -u -r1.117 -r1.176
+retrieving revision 1.177
+diff -u -r1.117 -r1.177
 --- webmagick.in	23 Oct 2002 16:14:47 -0000	1.117
-+++ webmagick.in	27 Feb 2012 17:59:21 -0000	1.176
++++ webmagick.in	31 Mar 2012 19:07:43 -0000	1.177
 @@ -1,6 +1,6 @@
  #! @PERL@ 
  #
 -# $Id: webmagick.in,v 1.117 2002/10/23 16:14:47 clindell Exp $
-+# $Id: webmagick.in,v 1.176 2012/02/27 17:59:21 ache Exp $
++# $Id: webmagick.in,v 1.177 2012/03/31 19:07:43 ache Exp $
  #
  # You are looking at the main PERL script for WebMagick, a package to
  # intelligently create HTML and JavaScript index files and imagemaps
@@ -79,9 +79,11 @@ diff -u -r1.117 -r1.176
      $opt_prune,
      $opt_readfailhook,
      $opt_readme,
-@@ -212,6 +220,12 @@
+@@ -211,7 +219,14 @@
+     $opt_skip,
      $opt_srcdir,
      $opt_stylesheet, 	# URL to a CSS to use
++    $opt_divs,
      $opt_tables,
 +    $opt_tablebackcolor,
 +    $opt_fancytables,
@@ -92,7 +94,7 @@ diff -u -r1.117 -r1.176
      $opt_thumbbackground,
      $opt_thumbbordercolor,
      $opt_thumbborderwidth,
-@@ -237,14 +251,21 @@
+@@ -237,14 +252,21 @@
      $opt_webmagickrc,	# Per-directory WebMagick rc file name
      $opt_zoomfilter,
      $opt_pichtml,
@@ -114,7 +116,7 @@ diff -u -r1.117 -r1.176
      $pageStatusTime,	# Time status file last modified
      $pageNumber,	# Current page number
      $pathSep,		# OS-specific path separator
-@@ -286,6 +307,7 @@
+@@ -286,6 +308,7 @@
  				# Relative path under rootpath / prefixpath
  $opt_iconbase   = '';
  				# Global icons base URL, if not empty
@@ -122,7 +124,7 @@ diff -u -r1.117 -r1.176
  $prefix = '@prefix@'; # installation directory
  
  #
-@@ -368,6 +390,7 @@
+@@ -368,6 +391,7 @@
  $opt_ignore		= 0;	# Do not webmagick this directory
  				#    but still recurse into sub-directories
  $opt_ignorefp		= 1;	# ignore _* special FrontPage directories (on)
@@ -130,7 +132,7 @@ diff -u -r1.117 -r1.176
  $opt_srcdir		= '.';	# Source directory path (current directory)
  $opt_verbose		= 0;	# Verbose flag (default off)
  $opt_forcecache		= 0;	# Force update of cached thumbnails
-@@ -376,25 +399,45 @@
+@@ -376,25 +400,46 @@
  $opt_forcemontage	= 0;	# Force montage (default off)
  $opt_forcegif		= 0;	# Force GIF imagemaps (default off)
  $opt_forcejpeg          = 0;    # Force JPEG imagemaps (default off)
@@ -149,6 +151,7 @@ diff -u -r1.117 -r1.176
  $opt_javascript         = 0;    # Enable JavaScript output
  $opt_readmevisible	= 0;	# Make README.html be first page.
  $opt_title		= '';	# Page title (blank provides default title)
++$opt_divs               = 0;    # disable divs
  $opt_tables		= 0;	# disable tables
 +$opt_tablebackcolor     = '#000000'; # table background color 
 +$opt_fancytables        = 0;    # use a fancier table for index pages
@@ -177,7 +180,7 @@ diff -u -r1.117 -r1.176
  $opt_pichtmltarget      = '';
  $opt_pichtmltitleend    = '</P>'; # End tags for picture title
  $opt_pichtmltitlestart  = '<P>';  # Start tags for picture title
-@@ -491,8 +534,7 @@
+@@ -491,8 +536,7 @@
  $opt_frames             = 1;            # Use frames
  $opt_framemarginwidth	= 1;		# Pixels allocated to frame margin in horizontal direction
  $opt_framemarginheight	= 1;		# Pixels allocated to frame margin in vertical direction
@@ -187,7 +190,7 @@ diff -u -r1.117 -r1.176
  $opt_framestyle		= 1;		# Frame style to use (out of those available)
  
  #
-@@ -539,6 +581,7 @@
+@@ -539,6 +583,7 @@
  $opt_icons{'next_gray'}		= 'gray_next.gif';	# Next (grayed out)
  $opt_icons{'up'}		= 'blue_up.gif';  	# Up
  $opt_icons{'help'}		= 'blue_readme.gif';	# Help Readme File
@@ -195,7 +198,7 @@ diff -u -r1.117 -r1.176
  # $opt_icons{'help'}		= 'blue_help.gif';	# Help Alternative (Question)
  # $opt_icons{'dir'}             = 'blue_dir.gif';       # Directory List Icon (See below)
  # $opt_icons{'ball'}		= 'blue_ball.gif';	# A ball matching other icons
-@@ -596,12 +639,11 @@
+@@ -596,12 +641,11 @@
  # |  |          |
  #  -------------
  $opt_framefmt{1}=
@@ -212,7 +215,7 @@ diff -u -r1.117 -r1.176
  $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 +658,15 @@
+@@ -616,16 +660,15 @@
  # |  |          |
  #  -------------
  $opt_framefmt{2}=
@@ -235,7 +238,7 @@ diff -u -r1.117 -r1.176
  $opt_framefmt_frames{2}=3;	# Number of frames expressed by this frame format
  
  # Three frame screen with directories listed in left frame,
-@@ -640,16 +681,15 @@
+@@ -640,16 +683,15 @@
  # |  |          |
  #  -------------
  $opt_framefmt{3}=
@@ -258,7 +261,7 @@ diff -u -r1.117 -r1.176
  $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 +704,15 @@
+@@ -664,16 +706,15 @@
  # |  |          |
  #  -------------
  $opt_framefmt{4}=
@@ -281,7 +284,7 @@ diff -u -r1.117 -r1.176
  $opt_framefmt_frames{4}=3;	# Number of frames expressed by this frame format
  
  #
-@@ -756,7 +795,9 @@
+@@ -756,7 +797,9 @@
  use Getopt::Long;
  if ( ! GetOptions(
  		'address=s'		=> \$opt_address,
@@ -291,7 +294,7 @@ diff -u -r1.117 -r1.176
  		'cache!'		=> \$opt_cache,
  		'cachedir=s'		=> \$opt_cachedir,
  		'cacheformat=s'		=> \$opt_cacheformat,
-@@ -790,20 +831,24 @@
+@@ -790,20 +833,24 @@
  		'forcehtml!'		=> \$opt_forcehtml,
  		'forcejpeg!'            => \$opt_forcejpeg,
  		'forcemontage!'		=> \$opt_forcemontage,
@@ -318,7 +321,7 @@ diff -u -r1.117 -r1.176
  		'indexname=s'		=> \$opt_indexname,
  		'javascript!'		=> \$opt_javascript,
  		'jpegquality=i'         => \$opt_jpegquality,
-@@ -828,15 +873,23 @@
+@@ -828,15 +875,23 @@
  		'msg_up=s'              => \$opt_msg_up,
  		'pageindexname=s'	=> \$opt_pageindexname,
  		'pichtml!'              => \$opt_pichtml,
@@ -342,9 +345,11 @@ diff -u -r1.117 -r1.176
  		'readme=s'		=> \$opt_readme,
  		'readmevisible!'	=> \$opt_readmevisible,
  		'recurse!'		=> \$opt_recurse,
-@@ -846,6 +899,12 @@
+@@ -845,7 +900,14 @@
+ 		'serversidemap!'        => \$opt_serversidemap,
  		'srcdir=s'		=> \$opt_srcdir,
  		'stylesheet=s'		=> \$opt_stylesheet,
++		'divs!'                 => \$opt_divs,
  		'tables!'		=> \$opt_tables,
 +		'tablebackcolor=s'      => \$opt_tablebackcolor,
 +		'fancytables!'          => \$opt_fancytables,
@@ -355,7 +360,7 @@ diff -u -r1.117 -r1.176
  		'thumbtexture=s'	=> \$opt_thumbtexture,
  		'thumbbackground=s'	=> \$opt_thumbbackground,
  		'thumbborderwidth=i'	=> \$opt_thumbborderwidth,
-@@ -1153,12 +1212,12 @@
+@@ -1153,12 +1215,12 @@
  	'|(\.eps2$)|(\.epsf$)|(\.epsi$)|(\.ept$)|(\.fax$)|(\.fig$)' .
          '|(\.fits$)|(\.fpx$)|(\.g3$)|(\.gif$)|(\.gplt$)|(\.hdf$)' .
          '|(\.hpgl$)|(\.ico$)|(\.im1$)|(\.im24$)|(\.im8$)|(\.jbg$)' .
@@ -371,7 +376,7 @@ diff -u -r1.117 -r1.176
          '|(\.ttf$)|(\.vicar$)|(\.viff$)|(\.wmf$)|(\.xbm$)|(\.xpm$)' .
          '|(\.xwd$)';
  
-@@ -1187,7 +1246,6 @@
+@@ -1187,7 +1249,6 @@
  
      evaluateRcFiles();
  
@@ -379,7 +384,7 @@ diff -u -r1.117 -r1.176
      # Decide if we want to process this directory or not based on the
      # value of $opt_ignore.  If not, then just return.
  
-@@ -1329,7 +1387,6 @@
+@@ -1329,7 +1390,6 @@
  	$pageStatusTime=fmtime($fileNames{'pageStatus'});
      }
  
@@ -387,7 +392,7 @@ diff -u -r1.117 -r1.176
      # Handle a directory name to title index file.  Store alternative
      # names in %dirTitles.
      {
-@@ -1346,34 +1403,50 @@
+@@ -1346,34 +1406,50 @@
  		    $tmp_dirTitles{$dirname} = escapehtml($dirtitle);
  		    $dirOrder{$dirname} = $pos;
  		    $pos++;
@@ -445,7 +450,7 @@ diff -u -r1.117 -r1.176
  		    $imageOrder{$imgname} = $pos;
  		    $pos++;
  		}
-@@ -1383,11 +1456,25 @@
+@@ -1383,11 +1459,25 @@
  	#
  	# This code is totally BOGUS since decision should be made on a per-page basis!!
  	#	
@@ -472,7 +477,7 @@ diff -u -r1.117 -r1.176
  	}
      }
  
-@@ -1396,6 +1483,7 @@
+@@ -1396,6 +1486,7 @@
      #
      {
  	my %tmp_iconImageUrls;
@@ -480,7 +485,7 @@ diff -u -r1.117 -r1.176
  	print( "Icon URLs:\n" )  if $opt_debug;
  	my $icon;
  	for $icon ( keys %opt_icons ) {
-@@ -1405,11 +1493,14 @@
+@@ -1405,11 +1496,14 @@
  		    if $opt_debug;
  	    }
  	}
@@ -496,7 +501,7 @@ diff -u -r1.117 -r1.176
  	}
      }
      
-@@ -1431,6 +1522,7 @@
+@@ -1431,6 +1525,7 @@
      # Build list of image files
      #
      @allImageFiles = sort( sortImages grep( /$includeRegex/io, @allFiles));
@@ -504,7 +509,7 @@ diff -u -r1.117 -r1.176
  
      # Find subdirectory names (if any) ignoring hidden directories and
      # directories without index files. Directories should have index
-@@ -1446,10 +1538,9 @@
+@@ -1446,10 +1541,9 @@
  	if ($opt_frames) {
  	    grep($tarray{$_}++, @allImageFiles);
  	    foreach $_ ( grep(! $tarray{$_},@allFiles) ) {
@@ -517,7 +522,7 @@ diff -u -r1.117 -r1.176
  			    push(@dirfiles, $_);            #  then add it to the list
  			    if ($opt_javascript) {
  				# Check which index file to use for JavaScript
-@@ -1461,6 +1552,7 @@
+@@ -1461,6 +1555,7 @@
  				    $dirJsLink{"$_"} = '';
  				}
  			    }
@@ -525,7 +530,7 @@ diff -u -r1.117 -r1.176
  		    }
  		}
  	    }
-@@ -1510,9 +1602,7 @@
+@@ -1510,9 +1605,7 @@
      if( $numimages > 0 ) {
      	$haveImages = 1;
      }
@@ -536,7 +541,7 @@ diff -u -r1.117 -r1.176
      #
      # Determine page title
      #
-@@ -1520,10 +1610,18 @@
+@@ -1520,10 +1613,18 @@
          $pageTitle = $opt_title;
      } else {
          my $dirname=basename($sourceDirectory);
@@ -557,7 +562,7 @@ diff -u -r1.117 -r1.176
      #
      # Put the PerlMagick Montage options together
      #
-@@ -1576,7 +1674,7 @@
+@@ -1576,7 +1677,7 @@
  	$tmp_montageParameters .= "mattecolor=>\'$opt_thumbframecolor\',\n "
  	    if $opt_thumbframecolor ne 'false';
  	$tmp_montageParameters .= "label=>\'$opt_thumblabel\',\n "
@@ -566,18 +571,20 @@ diff -u -r1.117 -r1.176
  	$tmp_montageParameters .= "labelwidth=>\'$opt_thumblabelwidth\',\n ";
  	$tmp_montageParameters .= "\Lzoomfilter=>\'$opt_zoomfilter\'";
  	if( !defined($montageParameters) || ($tmp_montageParameters ne $montageParameters)) {
-@@ -1595,8 +1693,10 @@
+@@ -1595,8 +1696,10 @@
  	 'address'		=> $opt_address,	 
  	 'anonymous'		=> $opt_anonymous,
  	 'backgroundimg'	=> $opt_icons{'background'},
+-	 'cachedir'             => !$opt_tables ? "" : $opt_cachedir,
+-	 'cacheformat'          => !$opt_tables ? "" : $opt_cacheformat,
 +	 'bodytagins'           => $opt_bodytagins,
- 	 'cachedir'             => !$opt_tables ? "" : $opt_cachedir,
- 	 'cacheformat'          => !$opt_tables ? "" : $opt_cacheformat,
++	 'cachedir'             => (!$opt_tables && !$opt_divs) ? "" : $opt_cachedir,
++	 'cacheformat'          => (!$opt_tables && !$opt_divs) ? "" : $opt_cacheformat,
 +	 'centerfooter'         => $opt_centerfooter,
  	 'coloralink'		=> $opt_coloralink,
  	 'colorback'		=> $opt_colorback,
  	 'colorfore'		=> $opt_colorfore,
-@@ -1615,18 +1715,22 @@
+@@ -1615,18 +1718,22 @@
  	 'dirhtmlext'           => !$opt_frames ? "" : $opt_dirhtmlext,
  	 'dirindexname'         => !$opt_frames ? "" : $opt_dirindexname,
  	 'footer'               => $opt_footer,
@@ -602,7 +609,7 @@ diff -u -r1.117 -r1.176
  	 'indexname'            => $opt_indexname,
  	 'javascript'           => $opt_javascript,
  	 'jsdirindex'           => !$opt_javascript ? "" : $fileNames{'jsDirIndex'},
-@@ -1647,8 +1751,8 @@
+@@ -1647,8 +1754,8 @@
  	 'msg_directory_navigator' => !$opt_frames ? "" : $opt_msg_directory_navigator,
  	 'msg_images'           => !$opt_frames ? "" : $opt_msg_images,
  	 'msg_index_of_directory' => $opt_msg_index_of_directory,
@@ -613,7 +620,7 @@ diff -u -r1.117 -r1.176
  	 'msg_next'             => $opt_msg_next,
  	 'msg_pause'             => $opt_msg_pause,
  	 'msg_page_navigator'   => !$opt_frames ? "" : $opt_msg_page_navigator,
-@@ -1659,15 +1763,23 @@
+@@ -1659,15 +1766,23 @@
  	 'numpages'		=> $numPages,
  	 'pageindexname'        => $opt_pageindexname,
  	 'pichtml'              => $opt_pichtml,
@@ -637,9 +644,11 @@ diff -u -r1.117 -r1.176
  	 'readme'               => !$haveReadme ? "" : $opt_readme,
  	 'readmepresent'	=> $haveReadme,
  	 'readmevisible'        => !$haveReadme ? 0 : $opt_readmevisible,
-@@ -1676,6 +1788,12 @@
+@@ -1675,7 +1790,14 @@
+ 	 'serversidemap'        => $opt_serversidemap,
  	 'stylesheet'		=> $opt_stylesheet,
  	 'subdirectories'       => !$opt_frames ? "" : join(' ',@dirNames),
++	 'divs'                 => $opt_divs,
  	 'tables'		=> $opt_tables,
 +	 'tablebackcolor'       => !$opt_tables ? "" : $opt_tablebackcolor,
 +	 'fancytables'          => !$opt_tables ? 0 : $opt_fancytables,
@@ -650,7 +659,7 @@ diff -u -r1.117 -r1.176
  	 'title'		=> $pageTitle,
  	 'version'              => $opt_anonymous ? "" : $webmagickInfo{'version'},
  	 );
-@@ -1749,7 +1867,7 @@
+@@ -1749,7 +1871,7 @@
      if ( $perlVarsVersion < $requiredPerlVarsVersion) {
      	print ( STDERR "Need to do montage, HTML and cache because",
      		" version has changed\n") if $opt_debug;
@@ -659,8 +668,12 @@ diff -u -r1.117 -r1.176
  		$opt_forcemontage = 1;
  		$opt_forcecache = 1;
  		$opt_forcelowres = 1;
-@@ -1763,7 +1881,7 @@
-             if( ! $opt_tables && (! -f $fileNames{'pageStatus'} ||
+@@ -1760,10 +1882,10 @@
+ 	# Check for missing output files
+ 	# Check for new input files
+         if( $numfiles > 0 ) {
+-            if( ! $opt_tables && (! -f $fileNames{'pageStatus'} ||
++	    if( !$opt_divs && !$opt_tables && (! -f $fileNames{'pageStatus'} ||
  	       ( ! -f $fileNames{'montageGIF'} && ! -f $fileNames{'montageJPEG'} ))) {
                  # If key file is missing then do montage
 -                print(STDERR "\nMust do montage because a required output",
@@ -668,7 +681,16 @@ diff -u -r1.117 -r1.176
  		      " file is missing\n")
  		    if $opt_debug;
                  ++$doMontage;
-@@ -1975,9 +2093,10 @@
+@@ -1905,7 +2027,7 @@
+     #
+     # Clean up cached thumbnails
+     #
+-    if( ($opt_cache || $opt_tables) && -d $opt_cachedir ) {
++    if( ($opt_cache || $opt_tables || $opt_divs) && -d $opt_cachedir ) {
+         my @extra;
+         my %tarray;
+ 
+@@ -1975,9 +2097,10 @@
      # get indexname of parent directory
      my $upindexname =
  	     get_rc_var('..', 'opt_indexname', "$opt_indexname");
@@ -681,7 +703,7 @@ diff -u -r1.117 -r1.176
  	  " <A HREF=\"../${upindexname}\">${opt_msg_up}</A><BR>\n";
      }
  
-@@ -1987,7 +2106,7 @@
+@@ -1987,7 +2110,7 @@
      my $helphtml = '';
      if( $haveReadme ) {
  	$helphtml .= "<A HREF=\"" . escapeurl(${opt_readme}) . "\" TARGET=\"$frameTargets{'readmeview'}\"><IMG\n" .
@@ -690,7 +712,7 @@ diff -u -r1.117 -r1.176
  	    " <A HREF=\"" . escapeurl(${opt_readme}) . "\" TARGET=\"$frameTargets{'readmeview'}\">${opt_msg_readme}</A><BR>\n";
      }
  
-@@ -1997,7 +2116,7 @@
+@@ -1997,7 +2120,7 @@
      my $nexthtml = '';
      if( $haveReadme && $haveImages && $opt_framefmt_frames{$opt_framestyle}<=2 ) {
  	$nexthtml .= "<A HREF=\"${opt_pageindexname}1$opt_htmlext\" TARGET=\"$frameTargets{'thumbview'}\"><IMG\n" .
@@ -699,7 +721,7 @@ diff -u -r1.117 -r1.176
  	    " <A HREF=\"${opt_pageindexname}1$opt_htmlext\" TARGET=\"$frameTargets{'thumbview'}\">${opt_msg_images}</A><BR>";
      }
  
-@@ -2023,20 +2142,19 @@
+@@ -2023,20 +2146,19 @@
  	    } else {
  		$dirtitle=$subdir;
  	    }
@@ -723,7 +745,7 @@ diff -u -r1.117 -r1.176
  	    } 
  	}
      }
-@@ -2128,25 +2246,29 @@
+@@ -2128,25 +2250,29 @@
      #
      open( INDEX, ">${opt_indexname}")
  	|| die("$0: Failed to open file ${opt_indexname} for output\n$@\n");
@@ -760,7 +782,7 @@ diff -u -r1.117 -r1.176
  	if( "$opt_metaexpires" ne '' );
      print( INDEX "  <LINK REL=\"stylesheet\" type=\"text/css\" HREF=\"${opt_stylesheet}\">\n")
  	if ("$opt_stylesheet" ne '');
-@@ -2154,7 +2276,7 @@
+@@ -2154,7 +2280,7 @@
      # If in JavaScript mode, output code to switch to JavaScript pages
      # Currently knows about certain browsers.
      if( $opt_javascript ) {
@@ -769,7 +791,7 @@ diff -u -r1.117 -r1.176
  	print( INDEX '<!--' . "\n" );
  	print( INDEX '  var browserName = navigator.appName;', "\n" );
  	print( INDEX '  var browserVersion = parseInt(navigator.appVersion);', "\n" );
-@@ -2164,7 +2286,7 @@
+@@ -2164,7 +2290,7 @@
  	print( INDEX '  } else if ( browserName == "Microsoft Internet Explorer" && browserVersion >= 3) {', "\n" );
  	print( INDEX '    location = filename;', "\n" );
  	print( INDEX '  }', "\n" );
@@ -778,7 +800,7 @@ diff -u -r1.117 -r1.176
  	print( INDEX "</SCRIPT>\n" );
      }
  
-@@ -2173,20 +2295,17 @@
+@@ -2173,20 +2299,17 @@
      print( INDEX $framespechtml );
      print( INDEX "<NOFRAMES>\n" );
      print( INDEX "<BODY\n" );
@@ -808,7 +830,7 @@ diff -u -r1.117 -r1.176
      close( INDEX );
  
  
-@@ -2195,12 +2314,14 @@
+@@ -2195,12 +2318,14 @@
      if( $opt_javascript ) {
      open( INDEX, ">$fileNames{'jsDirIndex'}")
  	|| die("$0: Failed to open file $fileNames{'jsDirIndex'} for output\n$@\n");
@@ -828,7 +850,7 @@ diff -u -r1.117 -r1.176
      print( INDEX q/document.write(returnFrameHTML());/ . "\n" );
      print( INDEX q/document.close();/ . "\n" );
      print( INDEX "</SCRIPT>\n" );
-@@ -2214,7 +2335,10 @@
+@@ -2214,7 +2339,10 @@
      open( INDEX, ">${opt_pageindexname}dir${opt_dirhtmlext}")
  	|| die("$0: Failed to open file \"${opt_pageindexname}dir${opt_dirhtmlext}\"",
                  " for output\n$@\n");
@@ -840,7 +862,7 @@ diff -u -r1.117 -r1.176
      # Charset is better before title
      print( INDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
  	if( "$opt_metacharset" ne '' );
-@@ -2224,35 +2348,37 @@
+@@ -2224,35 +2352,37 @@
      print( INDEX "  <BASE TARGET=\"$opt_frame_name_top\">\n" );
  
      # Meta tags
@@ -896,7 +918,7 @@ diff -u -r1.117 -r1.176
      print( INDEX ">\n");
      print( INDEX $pagedirhtml );
      print( INDEX "</BODY></HTML>\n" );
-@@ -2262,6 +2388,114 @@
+@@ -2262,6 +2392,114 @@
      return ( 0 );
  }
  
@@ -1011,7 +1033,7 @@ diff -u -r1.117 -r1.176
  
  #
  # Write out page index files
-@@ -2279,7 +2513,7 @@
+@@ -2279,7 +2517,7 @@
      # Calculate page index bar
      # No link for current page
      # Nothing at all when there is only one page.
@@ -1020,7 +1042,7 @@ diff -u -r1.117 -r1.176
  
      # Must be visible at each page, if no frames
      if (!$opt_frames) {
-@@ -2287,7 +2521,7 @@
+@@ -2287,7 +2525,7 @@
  	# --- readme link ---
  	if ( $haveReadme ) {
  	    $indexbar .= "<A HREF=\"${opt_readme}\"><IMG\n" .
@@ -1029,7 +1051,7 @@ diff -u -r1.117 -r1.176
  	}
  
  	# --- up link ---
-@@ -2295,7 +2529,7 @@
+@@ -2295,7 +2533,7 @@
  
  	if ( "$upindexname" ne 'NOLINK' ) {
  	    $indexbar .= "<A HREF=\"../${upindexname}\"><IMG\n" .
@@ -1038,7 +1060,7 @@ diff -u -r1.117 -r1.176
  	}
  
      }
-@@ -2312,7 +2546,7 @@
+@@ -2312,7 +2550,7 @@
  	$indexbar .= " TARGET=\"$frameTargets{'thumbview'}\""
  	    if ($opt_frames);
  	$indexbar .= "><IMG\n" .
@@ -1047,7 +1069,7 @@ diff -u -r1.117 -r1.176
      }
  
      # --- next link ---
-@@ -2322,15 +2556,13 @@
+@@ -2322,15 +2560,13 @@
  	    $indexbar .= " TARGET=\"$frameTargets{'thumbview'}\""
  		if ($opt_frames);
  	    $indexbar .= "><IMG\n" .
@@ -1064,7 +1086,7 @@ diff -u -r1.117 -r1.176
      # --- page links ---
      if( $numPages > 1 ) {
  	my $page;
-@@ -2352,7 +2584,10 @@
+@@ -2352,7 +2588,10 @@
      
      open( INDEX, ">$fileNames{'htmlCurrentIndex'}")
          || die("$0: Failed to open file $fileNames{'htmlCurrentIndex'} for output\n$@\n");
@@ -1076,7 +1098,7 @@ diff -u -r1.117 -r1.176
      # Charset is better before title
      print( INDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
  	if( "$opt_metacharset" ne '' );
-@@ -2361,50 +2596,86 @@
+@@ -2361,50 +2600,88 @@
  	if ($opt_frames);
  
      # Meta tags
@@ -1142,7 +1164,8 @@ diff -u -r1.117 -r1.176
 +	    print( STDERR "Using custom PageDescription\n") if $opt_debug;
  	}
 -	print( INDEX "$indexbar<BR>\n" );
-+
+ 
+-	if ($opt_tables)
 +	if( $imageCaptions{'pageTitle'} eq '' &&
 +	    $opt_indexinfo && (!$opt_frames || $opt_framestyle == 1) ) {
 +	    my $desc1 = '';
@@ -1166,26 +1189,28 @@ diff -u -r1.117 -r1.176
 +		   "\"</DIV>\n" );
 +	}
 +	print( INDEX "<DIV class='wm_indexbar'>$indexbar</DIV>\n" );
- 
- 	if ($opt_tables)
++
++	if ($opt_tables || $opt_divs)
  	{
 -		print INDEX "<TABLE WIDTH=\"90%\">";
-+	    if ( !$opt_fancytables ) {
-+		print INDEX "<TABLE ${opt_tables_params}>";
-+		print INDEX "${opt_tables_top}"
-+			if ($opt_tables_top ne '');
-+	    } else {
-+		#BRAD added fancy tables based entirely on the Igal program
-+		#This section prints the top of the table
-+		my $cols = $opt_columns;
-+		if ( $numimages < $cols) { $cols=$numimages; }
-+		print INDEX "<TABLE border=0 cellspacing=0 cellpadding=3 ${opt_tables_params}>\n";
-+		print INDEX "<tr><td height=$opt_fancytableheight background=\"$iconImageUrls{ft_top}\" colspan=$cols>&nbsp;</td></tr>";
-+            }
++	    if (!$opt_divs) {
++		if ( !$opt_fancytables ) {
++		    print INDEX "<TABLE ${opt_tables_params}>";
++		    print INDEX "${opt_tables_top}"
++			    if ($opt_tables_top ne '');
++		} else {
++		    #BRAD added fancy tables based entirely on the Igal program
++		    #This section prints the top of the table
++		    my $cols = $opt_columns;
++		    if ( $numimages < $cols) { $cols=$numimages; }
++		    print INDEX "<TABLE border=0 cellspacing=0 cellpadding=3 ${opt_tables_params}>\n";
++		    print INDEX "<tr><td height=$opt_fancytableheight background=\"$iconImageUrls{ft_top}\" colspan=$cols>&nbsp;</td></tr>";
++		}
++	    }
  	}
  	else
  	{
-@@ -2422,144 +2693,109 @@
+@@ -2422,144 +2699,109 @@
  		    }
  		}
  		print( INDEX
@@ -1195,7 +1220,8 @@ diff -u -r1.117 -r1.176
 +		      " USEMAP=\"#${mapname}\" BORDER=0 ISMAP ALT=\"${mapname}\">" );
  		print( INDEX "</A>" ) if ($opt_serversidemap);
  		print( INDEX "\n<MAP NAME=\"${mapname}\">\n" );
- 	} # unless ( $opt_tables )
+-	} # unless ( $opt_tables )
++	} # unless ( $opt_tables || $opt_divs )
  
  	my $imageNum;
 -	for( $imageNum = 0; $imageNum <= $#{$imageNames[$pageNumber - 1]}; ++$imageNum ) {
@@ -1391,18 +1417,24 @@ diff -u -r1.117 -r1.176
  			}
  
  			print( PICHTML "$opt_pichtmlbottom\n") if ("$opt_pichtmlbottom" ne '');
-@@ -2570,15 +2806,15 @@
+@@ -2568,30 +2810,34 @@
+ 			print( PICHTML "</HTML>\n" );
+ 			close ( PICHTML );
  
- 			unless ($opt_tables)
+-			unless ($opt_tables)
++			unless ($opt_tables || $opt_divs)
  			{				
 -				print( INDEX "  <AREA${target} HREF=\"",
 -				       escapeurl($pichtml), "\" SHAPE=RECT COORDS=", $imageThumbCoords[$pageNumber - 1][$imageNum],">\n" );
 +				print( INDEX "  <AREA${target} ALT=\"${altlabel}\" TITLE=\"${altlabel}\" HREF=\"",
 +				       escapeurl($pichtml), "\" SHAPE=RECT COORDS=\"", $imageThumbCoords[$pageNumber - 1][$imageNum],"\">\n" );
  			}
- 	    } else 
- 	    { 
- 		    unless ($opt_tables) 
+-	    } else 
+-	    { 
+-		    unless ($opt_tables) 
++	    } else
++	    {
++		    unless ($opt_tables || $opt_divs)
  		    {
 -				print( INDEX "  <AREA HREF=\"", escapeurl($pic),
 -				       "\" SHAPE=RECT COORDS=", $imageThumbCoords[$pageNumber - 1][$imageNum],">\n" );
@@ -1411,16 +1443,31 @@ diff -u -r1.117 -r1.176
  		    } 
  	    }
  	    
-@@ -2590,7 +2826,7 @@
- 				print INDEX "<TR ALIGN=CENTER VALIGN=TOP>";
+ 	    
+-	    if ($opt_tables)
++	    if ($opt_tables || $opt_divs)
+ 		{
+-			if ($imageNum%$opt_columns == 0)
+-			{
+-				print INDEX "<TR ALIGN=CENTER VALIGN=TOP>";
++			if ($opt_tables) {
++				if ($imageNum%$opt_columns == 0)
++				{
++					print INDEX "<TR ALIGN=CENTER VALIGN=TOP>";
++				}
++
++				print INDEX "<TD BGCOLOR=${opt_tablebackcolor}>";
++			} else {
++				print INDEX "<DIV class='wm_thumb'>";
  			}
- 				
+-				
 -			print INDEX "<TD>";
-+			print INDEX "<TD BGCOLOR=${opt_tablebackcolor}>";
- 			
+-			
++
  			if ($opt_pichtml) {
  				print (INDEX "<A${target} HREF=\"", escapeurl($pichtml), "\">");
-@@ -2601,17 +2837,34 @@
+ 			} else {
+@@ -2601,28 +2847,66 @@
  			# 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}) {
@@ -1435,46 +1482,72 @@ diff -u -r1.117 -r1.176
  			
 -			print (INDEX "</A><BR><FONT SIZE=\"-1\">" . $tableImageLabels{$imageNames[$pageNumber - 1][$imageNum]} . "</FONT></TD>\n");
 -						
+-			if ($imageNum%$opt_columns == ($opt_columns - 1))
+-			{
+-				print INDEX "</TR>";
 +			print (INDEX "</A>");
-+			print (INDEX "<BR><FONT SIZE=\"-1\">",
-+				$tableImageLabels{$imageNames[$pageNumber - 1][$imageNum]},
-+				"</FONT>")
-+				if ($opt_thumblabel && $opt_thumblabel ne 'false');
-+			print (INDEX "</TD>\n");
++			if ($opt_thumblabel && $opt_thumblabel ne 'false') {
++				print (INDEX "<BR>");
++				if ($opt_pichtml) {
++					print (INDEX "<A${target} CLASS='wm_label' HREF=\"", escapeurl($pichtml), "\">");
++				} else {
++					print (INDEX "<A CLASS='wm_label' HREF=\"", escapeurl($pic), "\">");
++				}
++				print (INDEX
++					$tableImageLabels{$imageNames[$pageNumber - 1][$imageNum]},
++					"</A>");
++			}
 +
- 			if ($imageNum%$opt_columns == ($opt_columns - 1))
- 			{
- 				print INDEX "</TR>";
--			}
-+				#BRAD: Middle lines in a fancy tables
-+				if ( $opt_fancytables && $imageNum != $maxNum) {
-+				    my $cols = $opt_columns;
-+				    if ( $maxNum - $imageNum < $opt_columns ) {
-+					$cols = $maxNum%$opt_columns+1;
-+				    }
-+				    print INDEX "<tr><td height=${opt_fancytableheight} background=\"$iconImageUrls{'ft_top'}\" colspan=${opt_columns}>&nbsp;</td></tr>",
-+					"<tr><td colspan=${opt_columns}=${opt_columns}>&nbsp;</td></tr>",
-+					"<tr><td height=${opt_fancytableheight} background=\"$iconImageUrls{'ft_top'}\" colspan=${cols}>&nbsp;</td></tr>"    ;
++			if ($opt_tables) {
++				print (INDEX "</TD>\n");
++
++				if ($imageNum%$opt_columns == ($opt_columns - 1))
++				{
++					print INDEX "</TR>";
++					#BRAD: Middle lines in a fancy tables
++					if ( $opt_fancytables && $imageNum != $maxNum) {
++					    my $cols = $opt_columns;
++					    if ( $maxNum - $imageNum < $opt_columns ) {
++						$cols = $maxNum%$opt_columns+1;
++					    }
++					    print INDEX "<tr><td height=${opt_fancytableheight} background=\"$iconImageUrls{'ft_top'}\" colspan=${opt_columns}>&nbsp;</td></tr>",
++						"<tr><td colspan=${opt_columns}=${opt_columns}>&nbsp;</td></tr>",
++						"<tr><td height=${opt_fancytableheight} background=\"$iconImageUrls{'ft_top'}\" colspan=${cols}>&nbsp;</td></tr>"    ;
++					}
 +				}
-+      			}
- 		} # if ($opt_tables)
++			} else {
++				print INDEX "</DIV>";
+ 			}
+-		} # if ($opt_tables)
++		} # if ($opt_tables || $opt_divs)
  	
  	} # for each picture
-@@ -2622,6 +2875,13 @@
- 		{
- 			print INDEX "</TR>";
+ 	
+-	if ($opt_tables) 
++	if ($opt_tables || $opt_divs)
+ 	{
+-		unless ($imageNum%$opt_columns == ($opt_columns - 1))
+-		{
+-			print INDEX "</TR>";
++		if ($opt_tables) {
++			unless ($imageNum%$opt_columns == ($opt_columns - 1))
++			{
++				print INDEX "</TR>";
++			}
++			#BRAD:The bottom of a fancy table
++			if ( $opt_fancytables ) {
++			    my $cols = $maxNum%$opt_columns+1;
++			    print INDEX "<tr><td height=${opt_fancytableheight} background=\"$iconImageUrls{'ft_top'}\" colspan=${cols}>&nbsp;</td></tr>";
++			}
++			print INDEX "${opt_tables_bottom}"
++				if ($opt_tables_bottom ne '');
++			print (INDEX "</TABLE>\n")
  		}
-+		#BRAD:The bottom of a fancy table
-+		if ( $opt_fancytables ) {
-+		    my $cols = $maxNum%$opt_columns+1;
-+		    print INDEX "<tr><td height=${opt_fancytableheight} background=\"$iconImageUrls{'ft_top'}\" colspan=${cols}>&nbsp;</td></tr>";
-+		}
-+		print INDEX "${opt_tables_bottom}"
-+			if ($opt_tables_bottom ne '');
- 		print (INDEX "</TABLE>\n")
+-		print (INDEX "</TABLE>\n")
  	} else {print( INDEX "</MAP>\n" );}
      }
-@@ -2630,6 +2890,9 @@
+ 
+@@ -2630,6 +2914,9 @@
  
      # Print Copyright info on non-blank pages.
      if( $numimages > 0 ) {
@@ -1484,7 +1557,7 @@ diff -u -r1.117 -r1.176
         if( "${opt_address}" ne '' ) {
  	   print( INDEX "<BR><ADDRESS>${opt_address}</ADDRESS>\n" );
         }
-@@ -2642,13 +2905,17 @@
+@@ -2642,13 +2929,17 @@
         # If anonymous, don't show copyright and address info
         if( ! $opt_anonymous ) {
  	   print( INDEX "<HR>\n${opt_msg_produced_by} " );
@@ -1504,7 +1577,7 @@ diff -u -r1.117 -r1.176
      }
  
      print( INDEX "</BODY>\n" );
-@@ -2674,13 +2941,15 @@
+@@ -2674,13 +2965,15 @@
      open( JSINDEX, ">$fileNames{'jsPageIndex'}")
          || die("$0: Failed to open file $fileNames{'jsPageIndex'} for output\n$@\n");
  
@@ -1525,7 +1598,7 @@ diff -u -r1.117 -r1.176
      print( JSINDEX "  top.drawWindows();\n");
      print( JSINDEX "</SCRIPT>\n");
      print( JSINDEX "</BODY>\n");
-@@ -2714,6 +2983,8 @@
+@@ -2714,6 +3007,8 @@
  
      # Image labels
      print( JSVARS "\n// image titles\n", jsHash( 'imageLabels', \%imageLabels ) );
@@ -1534,7 +1607,7 @@ diff -u -r1.117 -r1.176
  
  	# Image labels
      #print( JSVARS "\n// table image titles\n", jsHash( 'tableImageLabels', \%tableImageLabels ) );
-@@ -2803,6 +3074,8 @@
+@@ -2803,6 +3098,8 @@
  
      # Image labels
      print( PERLVARS "\n# image titles\n", plHash( 'imageLabels', \%imageLabels ) );
@@ -1543,7 +1616,34 @@ diff -u -r1.117 -r1.176
  
  	# Table image labels
      print( PERLVARS "\n# table image titles\n", plHash( 'tableImageLabels', \%tableImageLabels ) );
-@@ -3062,7 +3335,7 @@
+@@ -2893,7 +3190,7 @@
+     #
+     # If caching thumbnails then ensure that directory exists
+     #
+-    mkdir( $opt_cachedir, 0755 ) if ($opt_cache || $opt_tables) && ! -d $opt_cachedir;
++    mkdir( $opt_cachedir, 0755 ) if ($opt_cache || $opt_tables || $opt_divs) && ! -d $opt_cachedir;
+ 
+     #
+     # If caching low resolution images then ensure that directory exists
+@@ -2948,7 +3245,7 @@
+ 
+ 	    #then do the thumbnail
+ 	    ($rc, $filesize, $width, $height, $magick) =
+-		&createLowResolutionImage ($image, $opt_cachedir, $imagename, $opt_cache, 0, $opt_tables,
++		&createLowResolutionImage ($image, $opt_cachedir, $imagename, $opt_cache, 0, ($opt_tables || $opt_divs),
+ 					   $opt_forcecache, $opt_thumbgeometry,
+ 					   $opt_cacheformat, $opt_cachemin,
+ 					   $opt_thumbprehook, $opt_thumbposthook);
+@@ -2995,7 +3292,7 @@
+ 	    }
+         }
+ 
+-	unless ($opt_tables)
++	unless ($opt_tables || $opt_divs)
+ 	{
+ 		#
+ 		# Do the montage
+@@ -3062,7 +3359,7 @@
  		# Copy image so we can play with it without effecting original
  		print( STDERR "Copying montage to scratch ...\n" )
  		    if $opt_debug;
@@ -1552,7 +1652,16 @@ diff -u -r1.117 -r1.176
  		handleMagickError( __FILE__, __LINE__, "", $image) unless ref($image);
  		last MONTAGE unless ref($image);
  	
-@@ -3191,12 +3464,16 @@
+@@ -3122,7 +3419,7 @@
+ 			unlink($fileNames{'montageJPEG'}); # Use GIF
+ 		    }
+ 		}
+-	} # unless ($opt_tables)
++	} # unless ($opt_tables || $opt_divs)
+ 	$errorstat = 0;	# If it made it this far, then no error
+     }
+ 
+@@ -3191,12 +3488,16 @@
      }
      my $imageNum;
      for( $imageNum = 0; $imageNum <= $#{$imageNames[$pageNumber - 1]}; ++$imageNum ) {
@@ -1570,7 +1679,7 @@ diff -u -r1.117 -r1.176
  	if( $opt_maptype eq 'ncsa' ) {
  	    if ( "${opt_htimage}" ne '' ) {
  		print( IMAGEMAP "rect "
-@@ -3465,6 +3742,10 @@
+@@ -3465,6 +3766,10 @@
  sub sortDir {
      if(defined($dirOrder{$a}) && defined($dirOrder{$b})) {
  	$dirOrder{$a} <=> $dirOrder{$b}
@@ -1581,7 +1690,7 @@ diff -u -r1.117 -r1.176
      } else {
  	lc($a) cmp lc($b);
      }
-@@ -3476,7 +3757,11 @@
+@@ -3476,7 +3781,11 @@
  sub sortImages {
      if(defined($imageOrder{$a}) && defined($imageOrder{$b})) {
  	$imageOrder{$a} <=> $imageOrder{$b}
@@ -1594,7 +1703,7 @@ diff -u -r1.117 -r1.176
  	lc($a) cmp lc($b);
      }
  }
-@@ -3533,6 +3818,9 @@
+@@ -3533,6 +3842,9 @@
  sub compareHash {
      my( $hash1, $hash2) = @_;
  
@@ -1604,7 +1713,7 @@ diff -u -r1.117 -r1.176
      if(scalar(keys(%$hash1)) != scalar(keys(%$hash2))) {
  	return( 1 ); # different length
      }
-@@ -3633,7 +3921,7 @@
+@@ -3633,7 +3945,7 @@
  	}
      }
      
@@ -1613,7 +1722,7 @@ diff -u -r1.117 -r1.176
  	%iconImageSizes = %tmp_iconImageSizes;
  	print( STDERR "Icon sizes have changed, must re-do all HTML\n" )
  	    if $opt_debug;
-@@ -3868,7 +4156,7 @@
+@@ -3868,7 +4180,7 @@
  	# Set image label
  	#
  	my $label = '';
@@ -1622,7 +1731,7 @@ diff -u -r1.117 -r1.176
  	    if( defined( $imageLabels{$imagename} ) ) {
  		# Set image specific label
  		$label = $imageLabels{$imagename};
-@@ -3922,7 +4210,7 @@
+@@ -3922,7 +4234,7 @@
  
  	    # put our label into the table image hash
  
@@ -1631,7 +1740,7 @@ diff -u -r1.117 -r1.176
  	    $tableImageLabels{$imagename} =~ s/\n/<BR>/g;
  
  	    print( STDERR "Applying image label: \"${label}\"\n" )
-@@ -4073,6 +4361,7 @@
+@@ -4073,6 +4385,7 @@
    --[no]forcehtml    Force HTML files to be generated (default off)
    --[no]forcemontage Force montage (default off)
    --[no]ignorefp     Ignore directories with names like _vti (FrontPage directories) (default on)
@@ -1639,7 +1748,7 @@ diff -u -r1.117 -r1.176
    --[no]help         Display usage message (default off)
    --[no]recurse      Recurse directory tree (default off)
    --srcdir	     Image directory to process
-@@ -4082,6 +4371,7 @@
+@@ -4082,6 +4395,7 @@
  Paths:
    --iconpath	     Relative path under rootdir to webmagick icons
    --iconbase         Global base URL for webmagick icons
@@ -1647,7 +1756,7 @@ diff -u -r1.117 -r1.176
    --prefixpath       Path to prepend to generated URLs (e.g. /~username)
    --rootpath	     Absolute path to server root (NCSA DocumentRoot)
  
-@@ -4093,6 +4383,8 @@
+@@ -4093,6 +4407,8 @@
  Filenames:
    --dirindexname     Directory-name to title cross-reference file name
    --imgindexname     Image-name to thumbnail label cross-reference file name
@@ -1656,7 +1765,7 @@ diff -u -r1.117 -r1.176
    --indexname	     Name of master index files (default server index)
    --pageindexname    Base name of page-related index files
    --readme	     Name of directory info file
-@@ -4138,7 +4430,9 @@
+@@ -4138,7 +4454,9 @@
  
  HTML Colors & Appearance:
    --address          Optional user address info
@@ -1666,7 +1775,7 @@ diff -u -r1.117 -r1.176
    --coloralink	     Link (active) color
    --colorback	     Background color (also applied to JPEG montage background)
    --colorfore	     Foreground text color
-@@ -4150,31 +4444,47 @@
+@@ -4150,31 +4468,48 @@
    --dircolorlink     Link (unvisited) color (directory frame)
    --dircolorvlink    Link (visited) color (directory frame)
    --dirhtmlext       Extension for directory frame
@@ -1681,6 +1790,7 @@ diff -u -r1.117 -r1.176
 +  --prepend          Prepend to the very top of each HTML
    --[no]javascript   Enable JavaScript output (default off)
 +  --[no]readmevisible Show README.html on first page rather than just linking (default off)
++  --[no]divs         Use HTML divs instead of imagemaps for thumbnails (default off)
 +  --[no]tables       Use HTML tables instead of imagemaps for thumbnails (default off)
 +  --tables_params    Table HTML parameters
 +  --tables_top       HTML before table contents
@@ -1722,7 +1832,7 @@ diff -u -r1.117 -r1.176
    --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 +4606,7 @@
+@@ -4296,6 +4631,7 @@
      s/&/&amp;/g;
      s/>/&gt;/g;
      s/</&lt;/g;
@@ -1730,7 +1840,7 @@ diff -u -r1.117 -r1.176
      return( $_ );
  }
  
-@@ -4324,23 +4635,11 @@
+@@ -4324,23 +4660,11 @@
  # Escape unsafe characters in URLs
  #		
  sub escapeurl {
@@ -1758,7 +1868,7 @@ diff -u -r1.117 -r1.176
      return( $_ );
  }
  
-@@ -4387,7 +4686,6 @@
+@@ -4387,7 +4711,6 @@
      my $rc;
      foreach $rc (@_) {
          next if ( ! -r $rc || ! -f $rc );
@@ -1766,7 +1876,7 @@ diff -u -r1.117 -r1.176
  	eval ( get_rc($rc) );
  	if( $@ ) {
  	    print( STDERR "Bad Eval for file \"${rc}\"...\n$@\n" );
-@@ -4468,7 +4766,7 @@
+@@ -4468,7 +4791,7 @@
      my $path=$top;
      $direlem='';
      do {
diff --git a/www/WebMagick/files/patch-ab b/www/WebMagick/files/patch-ab
index f110fa60dd35..75d92b4b9231 100644
--- a/www/WebMagick/files/patch-ab
+++ b/www/WebMagick/files/patch-ab
@@ -2,10 +2,10 @@ Index: webmagickrc.in
 ===================================================================
 RCS file: /cvsroot/webmagick/WebMagick/webmagickrc.in,v
 retrieving revision 1.16
-retrieving revision 1.24
-diff -u -r1.16 -r1.24
+retrieving revision 1.25
+diff -u -r1.16 -r1.25
 --- webmagickrc.in	4 Dec 2001 19:36:57 -0000	1.16
-+++ webmagickrc.in	27 Feb 2012 17:59:21 -0000	1.24
++++ webmagickrc.in	31 Mar 2012 19:07:43 -0000	1.25
 @@ -15,6 +15,7 @@
  				# Relative path under rootpath / prefixpath
  # $opt_iconbase = '';
@@ -22,7 +22,7 @@ diff -u -r1.16 -r1.24
  # $opt_srcdir		= '.';	# Source directory path (current directory)
  # $opt_verbose		= 0;	# Verbose flag (default off)
  # $opt_forcecache		= 0;	# Force update of cached thumbnails
-@@ -90,30 +92,49 @@
+@@ -90,30 +92,50 @@
  # $opt_forcemontage	= 0;	# Force montage (default off)
  # $opt_forcegif		= 0;	# Force GIF imagemaps (default off)
  # $opt_forcejpeg          = 0;    # Force JPEG imagemaps (default off)
@@ -62,6 +62,7 @@ diff -u -r1.16 -r1.24
  # $opt_pichtmltitlestart  = '<P>';  # Start tags for picture title
  # $opt_pichtmltop         = '<CENTER>';
  
++# $opt_divs               = 0;  # use HTML divs instead of image maps
  # $opt_tables             = 0;  # use HTML tables instead of image maps
 +# $opt_tablebackcolor     = '#000000'; # table background color
 +# $opt_fancytables        = 0;    # use a fancier table for index pages
@@ -72,7 +73,7 @@ diff -u -r1.16 -r1.24
  # $opt_allowconfig	 = 0; # allow user to configure table and framestyle
  
  #				
-@@ -199,8 +220,7 @@
+@@ -199,8 +221,7 @@
  # $opt_frames           = 1;            # Use frames
  # $opt_framemarginwidth	= 1;		# Pixels allocated to frame margin in horizontal direction
  # $opt_framemarginheight	= 1;		# Pixels allocated to frame margin in vertical direction
@@ -82,7 +83,7 @@ diff -u -r1.16 -r1.24
  # $opt_framestyle		= 1;		# Frame style to use (out of those available)
  
  #
-@@ -245,6 +265,7 @@
+@@ -245,6 +266,7 @@
  # $opt_icons{'next_gray'}		= 'gray_next.gif';	# Next (grayed out)
  # $opt_icons{'up'}		= 'blue_up.gif';  	# Up
  # $opt_icons{'help'}		= 'blue_readme.gif';	# Help Readme File