3 files changed, 157 insertions, 97 deletions

diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 719b89953fb6..cef4f352f27c 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p3
-PORTREVISION=	39
+PORTREVISION=	40
 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 ee5a8a94b6c7..d08e5aebed0b 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.161
-diff -u -r1.117 -r1.161
+retrieving revision 1.162
+diff -u -r1.117 -r1.162
 --- webmagick.in	23 Oct 2002 16:14:47 -0000	1.117
-+++ webmagick.in	15 Sep 2010 05:07:23 -0000	1.161
++++ webmagick.in	4 Apr 2011 00:06:12 -0000	1.162
 @@ -1,6 +1,6 @@
  #! @PERL@ 
  #
 -# $Id: webmagick.in,v 1.117 2002/10/23 16:14:47 clindell Exp $
-+# $Id: webmagick.in,v 1.161 2010/09/15 05:07:23 ache Exp $
++# $Id: webmagick.in,v 1.162 2011/04/04 00:06:12 ache Exp $
  #
  # You are looking at the main PERL script for WebMagick, a package to
  # intelligently create HTML and JavaScript index files and imagemaps
@@ -24,7 +24,13 @@ diff -u -r1.117 -r1.161
      %imageOrder,	# Order that images occur in imgindex file
      $inChild,		# Set to true if this process is a child
      $currentDate,
-@@ -117,6 +118,7 @@
+@@ -112,11 +113,13 @@
+     $opt_address,
+     $opt_allowconfig,
+     $opt_anonymous,
++    $opt_bodytagins,
+     $opt_cache,
+     $opt_cachedir,
      $opt_cacheformat,
      $opt_cachegeom,
      $opt_cachemin,
@@ -32,7 +38,7 @@ diff -u -r1.117 -r1.161
      $opt_lowres,
      $opt_lowresdir,
      $opt_lowresformat,
-@@ -144,12 +146,13 @@
+@@ -144,12 +147,13 @@
      $opt_forcejpeg,
      $opt_forcehtml,
      $opt_forcemontage,
@@ -47,7 +53,15 @@ diff -u -r1.117 -r1.161
      $opt_frameddirfmt,
      %opt_framefmt,
      %opt_framefmt_frames,
-@@ -167,6 +170,7 @@
+@@ -159,6 +163,7 @@
+     $opt_framestyle,
+     $opt_htmlext,
+     $opt_header,
++    $opt_headins,
+     $opt_footer,
+     $opt_help,
+     $opt_htimage,
+@@ -167,6 +172,7 @@
      %opt_icons,
      $opt_ignore,
      $opt_ignorefp,
@@ -55,7 +69,7 @@ diff -u -r1.117 -r1.161
      $opt_imgindexname,
      $opt_indexname,
      $opt_javascript,
-@@ -212,6 +216,12 @@
+@@ -212,6 +218,12 @@
      $opt_srcdir,
      $opt_stylesheet, 	# URL to a CSS to use
      $opt_tables,
@@ -68,7 +82,7 @@ diff -u -r1.117 -r1.161
      $opt_thumbbackground,
      $opt_thumbbordercolor,
      $opt_thumbborderwidth,
-@@ -237,14 +247,21 @@
+@@ -237,14 +249,21 @@
      $opt_webmagickrc,	# Per-directory WebMagick rc file name
      $opt_zoomfilter,
      $opt_pichtml,
@@ -90,7 +104,7 @@ diff -u -r1.117 -r1.161
      $pageStatusTime,	# Time status file last modified
      $pageNumber,	# Current page number
      $pathSep,		# OS-specific path separator
-@@ -368,6 +385,7 @@
+@@ -368,6 +387,7 @@
  $opt_ignore		= 0;	# Do not webmagick this directory
  				#    but still recurse into sub-directories
  $opt_ignorefp		= 1;	# ignore _* special FrontPage directories (on)
@@ -98,7 +112,7 @@ diff -u -r1.117 -r1.161
  $opt_srcdir		= '.';	# Source directory path (current directory)
  $opt_verbose		= 0;	# Verbose flag (default off)
  $opt_forcecache		= 0;	# Force update of cached thumbnails
-@@ -376,6 +394,9 @@
+@@ -376,25 +396,44 @@
  $opt_forcemontage	= 0;	# Force montage (default off)
  $opt_forcegif		= 0;	# Force GIF imagemaps (default off)
  $opt_forcejpeg          = 0;    # Force JPEG imagemaps (default off)
@@ -108,7 +122,12 @@ diff -u -r1.117 -r1.161
  $opt_jpegquality        = 70;   # Quality for JPEG imagemaps
  $opt_help		= 0;	# Display usage message
  $opt_version		= 0;	# Display version info
-@@ -386,15 +407,29 @@
+ $opt_htmlext            = '.html'; # Use .shtml for SSI
++$opt_bodytagins         = '';   # Insert something into <BODY> tag
+ $opt_header             = '<CENTER>';   # Imagemap extra page header (HTML)
+ $opt_footer             = '</CENTER>';   # Imagemap extra page footer (HTML)
++$opt_headins            = '';   # Insert something into <HEAD> section
+ $opt_javascript         = 0;    # Enable JavaScript output
  $opt_readmevisible	= 0;	# Make README.html be first page.
  $opt_title		= '';	# Page title (blank provides default title)
  $opt_tables		= 0;	# disable tables
@@ -139,7 +158,7 @@ diff -u -r1.117 -r1.161
  $opt_pichtmltarget      = '';
  $opt_pichtmltitleend    = '</P>'; # End tags for picture title
  $opt_pichtmltitlestart  = '<P>';  # Start tags for picture title
-@@ -491,8 +526,7 @@
+@@ -491,8 +530,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
@@ -149,7 +168,7 @@ diff -u -r1.117 -r1.161
  $opt_framestyle		= 1;		# Frame style to use (out of those available)
  
  #
-@@ -539,6 +573,7 @@
+@@ -539,6 +577,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
@@ -157,7 +176,7 @@ diff -u -r1.117 -r1.161
  # $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 +631,11 @@
+@@ -596,12 +635,11 @@
  # |  |          |
  #  -------------
  $opt_framefmt{1}=
@@ -174,7 +193,7 @@ diff -u -r1.117 -r1.161
  $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 +650,15 @@
+@@ -616,16 +654,15 @@
  # |  |          |
  #  -------------
  $opt_framefmt{2}=
@@ -197,7 +216,7 @@ diff -u -r1.117 -r1.161
  $opt_framefmt_frames{2}=3;	# Number of frames expressed by this frame format
  
  # Three frame screen with directories listed in left frame,
-@@ -640,16 +673,15 @@
+@@ -640,16 +677,15 @@
  # |  |          |
  #  -------------
  $opt_framefmt{3}=
@@ -220,7 +239,7 @@ diff -u -r1.117 -r1.161
  $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 +696,15 @@
+@@ -664,16 +700,15 @@
  # |  |          |
  #  -------------
  $opt_framefmt{4}=
@@ -243,15 +262,17 @@ diff -u -r1.117 -r1.161
  $opt_framefmt_frames{4}=3;	# Number of frames expressed by this frame format
  
  #
-@@ -756,6 +787,7 @@
+@@ -756,7 +791,9 @@
  use Getopt::Long;
  if ( ! GetOptions(
  		'address=s'		=> \$opt_address,
 +		'centerfooter!'         => \$opt_centerfooter,
  		'anonymous!'		=> \$opt_anonymous,
++		'bodytagins=s'          => \$opt_bodytagins,
  		'cache!'		=> \$opt_cache,
  		'cachedir=s'		=> \$opt_cachedir,
-@@ -790,10 +822,11 @@
+ 		'cacheformat=s'		=> \$opt_cacheformat,
+@@ -790,19 +827,22 @@
  		'forcehtml!'		=> \$opt_forcehtml,
  		'forcejpeg!'            => \$opt_forcejpeg,
  		'forcemontage!'		=> \$opt_forcemontage,
@@ -265,7 +286,10 @@ diff -u -r1.117 -r1.161
  		'frames!'               => \$opt_frames,
  		'framestyle=i'		=> \$opt_framestyle,
  		'header=s'		=> \$opt_header,
-@@ -803,6 +836,7 @@
++		'headins=s'             => \$opt_headins,
+ 		'help!'			=> \$opt_help,
+ 		'htimage=s'		=> \$opt_htimage,
+ 		'htmlext=s'             => \$opt_htmlext,
  		'iconbase=s'            => \$opt_iconbase,
  		'iconpath=s'		=> \$opt_iconpath,
  		'ignorefp!'             => \$opt_ignorefp,
@@ -273,7 +297,7 @@ diff -u -r1.117 -r1.161
  		'imgindexname=s'	=> \$opt_imgindexname,
  		'indexname=s'		=> \$opt_indexname,
  		'javascript!'		=> \$opt_javascript,
-@@ -828,14 +862,21 @@
+@@ -828,14 +868,21 @@
  		'msg_up=s'              => \$opt_msg_up,
  		'pageindexname=s'	=> \$opt_pageindexname,
  		'pichtml!'              => \$opt_pichtml,
@@ -295,7 +319,7 @@ diff -u -r1.117 -r1.161
  		'prefixpath=s'		=> \$opt_prefixpath,
  		'readme=s'		=> \$opt_readme,
  		'readmevisible!'	=> \$opt_readmevisible,
-@@ -846,6 +887,12 @@
+@@ -846,6 +893,12 @@
  		'srcdir=s'		=> \$opt_srcdir,
  		'stylesheet=s'		=> \$opt_stylesheet,
  		'tables!'		=> \$opt_tables,
@@ -308,7 +332,7 @@ diff -u -r1.117 -r1.161
  		'thumbtexture=s'	=> \$opt_thumbtexture,
  		'thumbbackground=s'	=> \$opt_thumbbackground,
  		'thumbborderwidth=i'	=> \$opt_thumbborderwidth,
-@@ -1187,7 +1234,6 @@
+@@ -1187,7 +1240,6 @@
  
      evaluateRcFiles();
  
@@ -316,7 +340,7 @@ diff -u -r1.117 -r1.161
      # Decide if we want to process this directory or not based on the
      # value of $opt_ignore.  If not, then just return.
  
-@@ -1329,7 +1375,6 @@
+@@ -1329,7 +1381,6 @@
  	$pageStatusTime=fmtime($fileNames{'pageStatus'});
      }
  
@@ -324,7 +348,7 @@ diff -u -r1.117 -r1.161
      # Handle a directory name to title index file.  Store alternative
      # names in %dirTitles.
      {
-@@ -1346,34 +1391,50 @@
+@@ -1346,34 +1397,50 @@
  		    $tmp_dirTitles{$dirname} = escapehtml($dirtitle);
  		    $dirOrder{$dirname} = $pos;
  		    $pos++;
@@ -382,7 +406,7 @@ diff -u -r1.117 -r1.161
  		    $imageOrder{$imgname} = $pos;
  		    $pos++;
  		}
-@@ -1383,11 +1444,25 @@
+@@ -1383,11 +1450,25 @@
  	#
  	# This code is totally BOGUS since decision should be made on a per-page basis!!
  	#	
@@ -409,7 +433,7 @@ diff -u -r1.117 -r1.161
  	}
      }
  
-@@ -1396,6 +1471,7 @@
+@@ -1396,6 +1477,7 @@
      #
      {
  	my %tmp_iconImageUrls;
@@ -417,7 +441,7 @@ diff -u -r1.117 -r1.161
  	print( "Icon URLs:\n" )  if $opt_debug;
  	my $icon;
  	for $icon ( keys %opt_icons ) {
-@@ -1405,11 +1481,14 @@
+@@ -1405,11 +1487,14 @@
  		    if $opt_debug;
  	    }
  	}
@@ -433,7 +457,7 @@ diff -u -r1.117 -r1.161
  	}
      }
      
-@@ -1431,6 +1510,7 @@
+@@ -1431,6 +1516,7 @@
      # Build list of image files
      #
      @allImageFiles = sort( sortImages grep( /$includeRegex/io, @allFiles));
@@ -441,7 +465,7 @@ diff -u -r1.117 -r1.161
  
      # Find subdirectory names (if any) ignoring hidden directories and
      # directories without index files. Directories should have index
-@@ -1446,10 +1526,9 @@
+@@ -1446,10 +1532,9 @@
  	if ($opt_frames) {
  	    grep($tarray{$_}++, @allImageFiles);
  	    foreach $_ ( grep(! $tarray{$_},@allFiles) ) {
@@ -454,7 +478,7 @@ diff -u -r1.117 -r1.161
  			    push(@dirfiles, $_);            #  then add it to the list
  			    if ($opt_javascript) {
  				# Check which index file to use for JavaScript
-@@ -1461,6 +1540,7 @@
+@@ -1461,6 +1546,7 @@
  				    $dirJsLink{"$_"} = '';
  				}
  			    }
@@ -462,7 +486,7 @@ diff -u -r1.117 -r1.161
  		    }
  		}
  	    }
-@@ -1510,9 +1590,7 @@
+@@ -1510,9 +1596,7 @@
      if( $numimages > 0 ) {
      	$haveImages = 1;
      }
@@ -473,7 +497,7 @@ diff -u -r1.117 -r1.161
      #
      # Determine page title
      #
-@@ -1520,10 +1598,18 @@
+@@ -1520,10 +1604,18 @@
          $pageTitle = $opt_title;
      } else {
          my $dirname=basename($sourceDirectory);
@@ -494,7 +518,7 @@ diff -u -r1.117 -r1.161
      #
      # Put the PerlMagick Montage options together
      #
-@@ -1576,7 +1662,7 @@
+@@ -1576,7 +1668,7 @@
  	$tmp_montageParameters .= "mattecolor=>\'$opt_thumbframecolor\',\n "
  	    if $opt_thumbframecolor ne 'false';
  	$tmp_montageParameters .= "label=>\'$opt_thumblabel\',\n "
@@ -503,15 +527,18 @@ diff -u -r1.117 -r1.161
  	$tmp_montageParameters .= "labelwidth=>\'$opt_thumblabelwidth\',\n ";
  	$tmp_montageParameters .= "\Lzoomfilter=>\'$opt_zoomfilter\'";
  	if( !defined($montageParameters) || ($tmp_montageParameters ne $montageParameters)) {
-@@ -1597,6 +1683,7 @@
+@@ -1595,8 +1687,10 @@
+ 	 'address'		=> $opt_address,	 
+ 	 'anonymous'		=> $opt_anonymous,
  	 'backgroundimg'	=> $opt_icons{'background'},
++	 'bodytagins'           => $opt_bodytagins,
  	 'cachedir'             => !$opt_tables ? "" : $opt_cachedir,
  	 'cacheformat'          => !$opt_tables ? "" : $opt_cacheformat,
 +	 'centerfooter'         => $opt_centerfooter,
  	 'coloralink'		=> $opt_coloralink,
  	 'colorback'		=> $opt_colorback,
  	 'colorfore'		=> $opt_colorfore,
-@@ -1615,11 +1702,12 @@
+@@ -1615,18 +1709,21 @@
  	 'dirhtmlext'           => !$opt_frames ? "" : $opt_dirhtmlext,
  	 'dirindexname'         => !$opt_frames ? "" : $opt_dirindexname,
  	 'footer'               => $opt_footer,
@@ -526,7 +553,8 @@ diff -u -r1.117 -r1.161
  	 'frames'               => $opt_frames,
  	 'framestyle'           => !$opt_frames ? 1 : $opt_framestyle,
  	 'header'		=> $opt_header,
-@@ -1627,6 +1715,7 @@
++	 'headins'              => $opt_headins,
+ 	 'htimage'              => !$opt_serversidemap ? "" : $opt_htimage,
  	 'htmlext'              => !$opt_frames ? "" : $opt_htmlext,
  	 'iconbase'             => $opt_iconbase,
  	 'imgindexname'		=> $opt_imgindexname,
@@ -534,7 +562,7 @@ diff -u -r1.117 -r1.161
  	 'indexname'            => $opt_indexname,
  	 'javascript'           => $opt_javascript,
  	 'jsdirindex'           => !$opt_javascript ? "" : $fileNames{'jsDirIndex'},
-@@ -1647,8 +1736,8 @@
+@@ -1647,8 +1744,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,
@@ -545,7 +573,7 @@ diff -u -r1.117 -r1.161
  	 'msg_next'             => $opt_msg_next,
  	 'msg_pause'             => $opt_msg_pause,
  	 'msg_page_navigator'   => !$opt_frames ? "" : $opt_msg_page_navigator,
-@@ -1659,14 +1748,21 @@
+@@ -1659,14 +1756,21 @@
  	 'numpages'		=> $numPages,
  	 'pageindexname'        => $opt_pageindexname,
  	 'pichtml'              => $opt_pichtml,
@@ -567,7 +595,7 @@ diff -u -r1.117 -r1.161
  	 'prefixpath'		=> $opt_prefixpath,
  	 'readme'               => !$haveReadme ? "" : $opt_readme,
  	 'readmepresent'	=> $haveReadme,
-@@ -1676,6 +1772,12 @@
+@@ -1676,6 +1780,12 @@
  	 'stylesheet'		=> $opt_stylesheet,
  	 'subdirectories'       => !$opt_frames ? "" : join(' ',@dirNames),
  	 'tables'		=> $opt_tables,
@@ -580,7 +608,16 @@ diff -u -r1.117 -r1.161
  	 'title'		=> $pageTitle,
  	 'version'              => $opt_anonymous ? "" : $webmagickInfo{'version'},
  	 );
-@@ -1763,7 +1865,7 @@
+@@ -1749,7 +1859,7 @@
+     if ( $perlVarsVersion < $requiredPerlVarsVersion) {
+     	print ( STDERR "Need to do montage, HTML and cache because",
+     		" version has changed\n") if $opt_debug;
+-    	$opt_forcehtml = 1;
++		$opt_forcehtml = 1;
+ 		$opt_forcemontage = 1;
+ 		$opt_forcecache = 1;
+ 		$opt_forcelowres = 1;
+@@ -1763,7 +1873,7 @@
              if( ! $opt_tables && (! -f $fileNames{'pageStatus'} ||
  	       ( ! -f $fileNames{'montageGIF'} && ! -f $fileNames{'montageJPEG'} ))) {
                  # If key file is missing then do montage
@@ -589,7 +626,7 @@ diff -u -r1.117 -r1.161
  		      " file is missing\n")
  		    if $opt_debug;
                  ++$doMontage;
-@@ -1975,9 +2077,10 @@
+@@ -1975,9 +2085,10 @@
      # get indexname of parent directory
      my $upindexname =
  	     get_rc_var('..', 'opt_indexname', "$opt_indexname");
@@ -602,7 +639,7 @@ diff -u -r1.117 -r1.161
  	  " <A HREF=\"../${upindexname}\">${opt_msg_up}</A><BR>\n";
      }
  
-@@ -1987,7 +2090,7 @@
+@@ -1987,7 +2098,7 @@
      my $helphtml = '';
      if( $haveReadme ) {
  	$helphtml .= "<A HREF=\"" . escapeurl(${opt_readme}) . "\" TARGET=\"$frameTargets{'readmeview'}\"><IMG\n" .
@@ -611,7 +648,7 @@ diff -u -r1.117 -r1.161
  	    " <A HREF=\"" . escapeurl(${opt_readme}) . "\" TARGET=\"$frameTargets{'readmeview'}\">${opt_msg_readme}</A><BR>\n";
      }
  
-@@ -1997,7 +2100,7 @@
+@@ -1997,7 +2108,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" .
@@ -620,7 +657,7 @@ diff -u -r1.117 -r1.161
  	    " <A HREF=\"${opt_pageindexname}1$opt_htmlext\" TARGET=\"$frameTargets{'thumbview'}\">${opt_msg_images}</A><BR>";
      }
  
-@@ -2023,20 +2126,19 @@
+@@ -2023,20 +2134,19 @@
  	    } else {
  		$dirtitle=$subdir;
  	    }
@@ -644,7 +681,7 @@ diff -u -r1.117 -r1.161
  	    } 
  	}
      }
-@@ -2128,14 +2230,15 @@
+@@ -2128,14 +2238,15 @@
      #
      open( INDEX, ">${opt_indexname}")
  	|| die("$0: Failed to open file ${opt_indexname} for output\n$@\n");
@@ -662,7 +699,7 @@ diff -u -r1.117 -r1.161
      print( INDEX "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
  	if( "$opt_metaauthor" ne '' );
      print( INDEX "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
-@@ -2154,7 +2257,7 @@
+@@ -2154,7 +2265,7 @@
      # If in JavaScript mode, output code to switch to JavaScript pages
      # Currently knows about certain browsers.
      if( $opt_javascript ) {
@@ -671,7 +708,7 @@ diff -u -r1.117 -r1.161
  	print( INDEX '<!--' . "\n" );
  	print( INDEX '  var browserName = navigator.appName;', "\n" );
  	print( INDEX '  var browserVersion = parseInt(navigator.appVersion);', "\n" );
-@@ -2164,7 +2267,7 @@
+@@ -2164,7 +2275,7 @@
  	print( INDEX '  } else if ( browserName == "Microsoft Internet Explorer" && browserVersion >= 3) {', "\n" );
  	print( INDEX '    location = filename;', "\n" );
  	print( INDEX '  }', "\n" );
@@ -680,7 +717,7 @@ diff -u -r1.117 -r1.161
  	print( INDEX "</SCRIPT>\n" );
      }
  
-@@ -2173,20 +2276,17 @@
+@@ -2173,20 +2284,17 @@
      print( INDEX $framespechtml );
      print( INDEX "<NOFRAMES>\n" );
      print( INDEX "<BODY\n" );
@@ -710,7 +747,7 @@ diff -u -r1.117 -r1.161
      close( INDEX );
  
  
-@@ -2195,12 +2295,11 @@
+@@ -2195,12 +2303,11 @@
      if( $opt_javascript ) {
      open( INDEX, ">$fileNames{'jsDirIndex'}")
  	|| die("$0: Failed to open file $fileNames{'jsDirIndex'} for output\n$@\n");
@@ -727,7 +764,7 @@ diff -u -r1.117 -r1.161
      print( INDEX q/document.write(returnFrameHTML());/ . "\n" );
      print( INDEX q/document.close();/ . "\n" );
      print( INDEX "</SCRIPT>\n" );
-@@ -2214,7 +2313,7 @@
+@@ -2214,7 +2321,7 @@
      open( INDEX, ">${opt_pageindexname}dir${opt_dirhtmlext}")
  	|| die("$0: Failed to open file \"${opt_pageindexname}dir${opt_dirhtmlext}\"",
                  " for output\n$@\n");
@@ -736,7 +773,7 @@ diff -u -r1.117 -r1.161
      # Charset is better before title
      print( INDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
  	if( "$opt_metacharset" ne '' );
-@@ -2224,7 +2323,8 @@
+@@ -2224,7 +2331,8 @@
      print( INDEX "  <BASE TARGET=\"$opt_frame_name_top\">\n" );
  
      # Meta tags
@@ -746,7 +783,7 @@ diff -u -r1.117 -r1.161
      print( INDEX "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
  	if( "$opt_metaauthor" ne '' );
      print( INDEX "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
-@@ -2242,17 +2342,14 @@
+@@ -2242,17 +2350,14 @@
      
      print( INDEX "</HEAD>\n" );
      print( INDEX "<BODY\n" );
@@ -772,7 +809,7 @@ diff -u -r1.117 -r1.161
      print( INDEX ">\n");
      print( INDEX $pagedirhtml );
      print( INDEX "</BODY></HTML>\n" );
-@@ -2279,7 +2376,7 @@
+@@ -2279,7 +2384,7 @@
      # Calculate page index bar
      # No link for current page
      # Nothing at all when there is only one page.
@@ -781,7 +818,7 @@ diff -u -r1.117 -r1.161
  
      # Must be visible at each page, if no frames
      if (!$opt_frames) {
-@@ -2287,7 +2384,7 @@
+@@ -2287,7 +2392,7 @@
  	# --- readme link ---
  	if ( $haveReadme ) {
  	    $indexbar .= "<A HREF=\"${opt_readme}\"><IMG\n" .
@@ -790,7 +827,7 @@ diff -u -r1.117 -r1.161
  	}
  
  	# --- up link ---
-@@ -2295,7 +2392,7 @@
+@@ -2295,7 +2400,7 @@
  
  	if ( "$upindexname" ne 'NOLINK' ) {
  	    $indexbar .= "<A HREF=\"../${upindexname}\"><IMG\n" .
@@ -799,7 +836,7 @@ diff -u -r1.117 -r1.161
  	}
  
      }
-@@ -2312,7 +2409,7 @@
+@@ -2312,7 +2417,7 @@
  	$indexbar .= " TARGET=\"$frameTargets{'thumbview'}\""
  	    if ($opt_frames);
  	$indexbar .= "><IMG\n" .
@@ -808,7 +845,7 @@ diff -u -r1.117 -r1.161
      }
  
      # --- next link ---
-@@ -2322,15 +2419,13 @@
+@@ -2322,15 +2427,13 @@
  	    $indexbar .= " TARGET=\"$frameTargets{'thumbview'}\""
  		if ($opt_frames);
  	    $indexbar .= "><IMG\n" .
@@ -825,7 +862,7 @@ diff -u -r1.117 -r1.161
      # --- page links ---
      if( $numPages > 1 ) {
  	my $page;
-@@ -2352,7 +2447,7 @@
+@@ -2352,7 +2455,7 @@
      
      open( INDEX, ">$fileNames{'htmlCurrentIndex'}")
          || die("$0: Failed to open file $fileNames{'htmlCurrentIndex'} for output\n$@\n");
@@ -834,7 +871,7 @@ diff -u -r1.117 -r1.161
      # Charset is better before title
      print( INDEX "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
  	if( "$opt_metacharset" ne '' );
-@@ -2361,7 +2456,8 @@
+@@ -2361,7 +2464,8 @@
  	if ($opt_frames);
  
      # Meta tags
@@ -844,7 +881,12 @@ diff -u -r1.117 -r1.161
      print( INDEX "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
  	if( "$opt_metaauthor" ne '' );
      print( INDEX "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
-@@ -2379,32 +2475,63 @@
+@@ -2376,35 +2480,70 @@
+ 	if( "$opt_metaexpires" ne '' );
+     print( INDEX "  <LINK REL=\"stylesheet\" type=\"text/css\" HREF=\"${opt_stylesheet}\">\n")
+ 	if ("$opt_stylesheet" ne '');
++    print( INDEX "  $opt_headins\n")
++	if ("$opt_headins" ne '');
  
      print( INDEX "</HEAD>\n" );
      print( INDEX "<BODY\n" );
@@ -858,6 +900,8 @@ diff -u -r1.117 -r1.161
 -	    print( INDEX "  VLINK=\"${opt_colorvlink}\"\n" );
 -	    print( INDEX "  ALINK=\"${opt_coloralink}\"" );
 -    }
++    print( INDEX "  $opt_bodytagins\n" )
++	if ("$opt_bodytagins" ne '');
 +    print( INDEX "  TEXT=\"${opt_colorfore}\"\n" );
 +    print( INDEX "  BGCOLOR=\"${opt_colorback}\"\n" );
 +    print( INDEX "  BACKGROUND=\"$iconImageUrls{background}\"\n" )
@@ -924,7 +968,7 @@ diff -u -r1.117 -r1.161
  	}
  	else
  	{
-@@ -2423,35 +2550,47 @@
+@@ -2423,35 +2562,47 @@
  		}
  		print( INDEX
  		      "<IMG SRC=\"$montageImages[$pageNumber - 1]\" $montageImageSizes[$pageNumber - 1]",
@@ -978,7 +1022,12 @@ diff -u -r1.117 -r1.161
  			print( PICHTML "  <META NAME=\"Author\" CONTENT=\"${opt_metaauthor}\">\n" )
  			    if( "$opt_metaauthor" ne '' );
  			print( PICHTML "  <META NAME=\"Description\" CONTENT=\"${opt_metadescription}\">\n" )
-@@ -2469,32 +2608,19 @@
+@@ -2466,35 +2617,26 @@
+ 			    if( "$opt_metaexpires" ne '' );
+ 			print( PICHTML "  <LINK REL=\"stylesheet\" type=\"text/css\" HREF=\"${opt_stylesheet}\">\n")
+ 			    if ("$opt_stylesheet" ne '');
++			print( PICHTML "  $opt_headins\n")
++			    if ("$opt_headins" ne '');
  
  			print( PICHTML "</HEAD>\n" );
  			print( PICHTML "<BODY\n" );
@@ -992,6 +1041,8 @@ diff -u -r1.117 -r1.161
 -				print( PICHTML "  VLINK=\"${opt_colorvlink}\"\n" );
 -				print( PICHTML "  ALINK=\"${opt_coloralink}\"");
 -			}
++			print( PICHTML "  $opt_bodytagins\n" )
++			    if ("$opt_bodytagins" ne '');
 +			print( PICHTML "  TEXT=\"${opt_colorfore}\"\n" );
 +			print( PICHTML "  BGCOLOR=\"${opt_colorback}\"\n" );
 +			print( PICHTML "  BACKGROUND=\"$iconImageUrls{background}\"\n" )
@@ -1019,7 +1070,7 @@ diff -u -r1.117 -r1.161
  					
  				# Must be visible at each page, if no frames
  				if (!$opt_frames) {
-@@ -2502,12 +2628,12 @@
+@@ -2502,12 +2644,12 @@
  				    # --- readme link ---
  				    if ( $haveReadme ) {
  					print (PICHTML "<A HREF=\"${opt_readme}\"><IMG\n",
@@ -1034,7 +1085,7 @@ diff -u -r1.117 -r1.161
  					if ($opt_frames) {
  					    print ( PICHTML "<A HREF=\"${opt_pageindexname}${pageNumber}${opt_htmlext}\"");
  					    print ( PICHTML " TARGET=\"$frameTargets{'thumbview'}\"")
-@@ -2515,51 +2641,100 @@
+@@ -2515,51 +2657,100 @@
  					    print ( PICHTML "<A HREF=\"${pNumber}${opt_indexname}\"");
  					}
  					print ( PICHTML "><IMG SRC=\"$iconImageUrls{'up'}\"",
@@ -1152,7 +1203,7 @@ diff -u -r1.117 -r1.161
  			}
  
  			print( PICHTML "$opt_pichtmlbottom\n") if ("$opt_pichtmlbottom" ne '');
-@@ -2570,15 +2745,15 @@
+@@ -2570,15 +2761,15 @@
  
  			unless ($opt_tables)
  			{				
@@ -1172,7 +1223,7 @@ diff -u -r1.117 -r1.161
  		    } 
  	    }
  	    
-@@ -2590,7 +2765,7 @@
+@@ -2590,7 +2781,7 @@
  				print INDEX "<TR ALIGN=CENTER VALIGN=TOP>";
  			}
  				
@@ -1181,7 +1232,7 @@ diff -u -r1.117 -r1.161
  			
  			if ($opt_pichtml) {
  				print (INDEX "<A${target} HREF=\"", escapeurl($pichtml), "\">");
-@@ -2601,17 +2776,34 @@
+@@ -2601,17 +2792,34 @@
  			# 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}) {
@@ -1221,7 +1272,7 @@ diff -u -r1.117 -r1.161
  		} # if ($opt_tables)
  	
  	} # for each picture
-@@ -2622,6 +2814,13 @@
+@@ -2622,6 +2830,13 @@
  		{
  			print INDEX "</TR>";
  		}
@@ -1235,7 +1286,7 @@ diff -u -r1.117 -r1.161
  		print (INDEX "</TABLE>\n")
  	} else {print( INDEX "</MAP>\n" );}
      }
-@@ -2630,6 +2829,9 @@
+@@ -2630,6 +2845,9 @@
  
      # Print Copyright info on non-blank pages.
      if( $numimages > 0 ) {
@@ -1245,7 +1296,7 @@ diff -u -r1.117 -r1.161
         if( "${opt_address}" ne '' ) {
  	   print( INDEX "<BR><ADDRESS>${opt_address}</ADDRESS>\n" );
         }
-@@ -2642,13 +2844,17 @@
+@@ -2642,13 +2860,17 @@
         # If anonymous, don't show copyright and address info
         if( ! $opt_anonymous ) {
  	   print( INDEX "<HR>\n${opt_msg_produced_by} " );
@@ -1265,7 +1316,7 @@ diff -u -r1.117 -r1.161
      }
  
      print( INDEX "</BODY>\n" );
-@@ -2674,13 +2880,12 @@
+@@ -2674,13 +2896,12 @@
      open( JSINDEX, ">$fileNames{'jsPageIndex'}")
          || die("$0: Failed to open file $fileNames{'jsPageIndex'} for output\n$@\n");
  
@@ -1283,7 +1334,7 @@ diff -u -r1.117 -r1.161
      print( JSINDEX "  top.drawWindows();\n");
      print( JSINDEX "</SCRIPT>\n");
      print( JSINDEX "</BODY>\n");
-@@ -2714,6 +2919,8 @@
+@@ -2714,6 +2935,8 @@
  
      # Image labels
      print( JSVARS "\n// image titles\n", jsHash( 'imageLabels', \%imageLabels ) );
@@ -1292,7 +1343,7 @@ diff -u -r1.117 -r1.161
  
  	# Image labels
      #print( JSVARS "\n// table image titles\n", jsHash( 'tableImageLabels', \%tableImageLabels ) );
-@@ -2803,6 +3010,8 @@
+@@ -2803,6 +3026,8 @@
  
      # Image labels
      print( PERLVARS "\n# image titles\n", plHash( 'imageLabels', \%imageLabels ) );
@@ -1301,7 +1352,7 @@ diff -u -r1.117 -r1.161
  
  	# Table image labels
      print( PERLVARS "\n# table image titles\n", plHash( 'tableImageLabels', \%tableImageLabels ) );
-@@ -3062,7 +3271,7 @@
+@@ -3062,7 +3287,7 @@
  		# Copy image so we can play with it without effecting original
  		print( STDERR "Copying montage to scratch ...\n" )
  		    if $opt_debug;
@@ -1310,7 +1361,7 @@ diff -u -r1.117 -r1.161
  		handleMagickError( __FILE__, __LINE__, "", $image) unless ref($image);
  		last MONTAGE unless ref($image);
  	
-@@ -3465,6 +3674,10 @@
+@@ -3465,6 +3690,10 @@
  sub sortDir {
      if(defined($dirOrder{$a}) && defined($dirOrder{$b})) {
  	$dirOrder{$a} <=> $dirOrder{$b}
@@ -1321,7 +1372,7 @@ diff -u -r1.117 -r1.161
      } else {
  	lc($a) cmp lc($b);
      }
-@@ -3476,7 +3689,11 @@
+@@ -3476,7 +3705,11 @@
  sub sortImages {
      if(defined($imageOrder{$a}) && defined($imageOrder{$b})) {
  	$imageOrder{$a} <=> $imageOrder{$b}
@@ -1334,7 +1385,7 @@ diff -u -r1.117 -r1.161
  	lc($a) cmp lc($b);
      }
  }
-@@ -3533,6 +3750,9 @@
+@@ -3533,6 +3766,9 @@
  sub compareHash {
      my( $hash1, $hash2) = @_;
  
@@ -1344,7 +1395,7 @@ diff -u -r1.117 -r1.161
      if(scalar(keys(%$hash1)) != scalar(keys(%$hash2))) {
  	return( 1 ); # different length
      }
-@@ -3868,7 +4088,7 @@
+@@ -3868,7 +4104,7 @@
  	# Set image label
  	#
  	my $label = '';
@@ -1353,7 +1404,7 @@ diff -u -r1.117 -r1.161
  	    if( defined( $imageLabels{$imagename} ) ) {
  		# Set image specific label
  		$label = $imageLabels{$imagename};
-@@ -3922,7 +4142,7 @@
+@@ -3922,7 +4158,7 @@
  
  	    # put our label into the table image hash
  
@@ -1362,7 +1413,7 @@ diff -u -r1.117 -r1.161
  	    $tableImageLabels{$imagename} =~ s/\n/<BR>/g;
  
  	    print( STDERR "Applying image label: \"${label}\"\n" )
-@@ -4073,6 +4293,7 @@
+@@ -4073,6 +4309,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)
@@ -1370,7 +1421,7 @@ diff -u -r1.117 -r1.161
    --[no]help         Display usage message (default off)
    --[no]recurse      Recurse directory tree (default off)
    --srcdir	     Image directory to process
-@@ -4093,6 +4314,8 @@
+@@ -4093,6 +4330,8 @@
  Filenames:
    --dirindexname     Directory-name to title cross-reference file name
    --imgindexname     Image-name to thumbnail label cross-reference file name
@@ -1379,15 +1430,17 @@ diff -u -r1.117 -r1.161
    --indexname	     Name of master index files (default server index)
    --pageindexname    Base name of page-related index files
    --readme	     Name of directory info file
-@@ -4138,6 +4361,7 @@
+@@ -4138,7 +4377,9 @@
  
  HTML Colors & Appearance:
    --address          Optional user address info
 +  --[no]centerfooter Center the footer text (default no)
    --[no]anonymous    Don't show WebMagick address and copyright info on pages (default off)
++  --bodytagins       Insert argument into <BODY> tag
    --coloralink	     Link (active) color
    --colorback	     Background color (also applied to JPEG montage background)
-@@ -4150,31 +4374,45 @@
+   --colorfore	     Foreground text color
+@@ -4150,31 +4391,46 @@
    --dircolorlink     Link (unvisited) color (directory frame)
    --dircolorvlink    Link (visited) color (directory frame)
    --dirhtmlext       Extension for directory frame
@@ -1398,6 +1451,7 @@ diff -u -r1.117 -r1.161
    --[no]date         Output updates date (default on)
    --footer           Page footer (imagemap frame) (default to </CENTER>)
    --header           Page header (imagemap frame) (default to <CENTER>)
++  --headins          Insert argument into <HEAD> section
    --[no]javascript   Enable JavaScript output (default off)
 +  --[no]readmevisible Show README.html on first page rather than just linking (default off)
 +  --[no]tables       Use HTML tables instead of imagemaps for thumbnails (default off)
@@ -1441,7 +1495,7 @@ diff -u -r1.117 -r1.161
    --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 +4534,7 @@
+@@ -4296,6 +4552,7 @@
      s/&/&amp;/g;
      s/>/&gt;/g;
      s/</&lt;/g;
@@ -1449,7 +1503,7 @@ diff -u -r1.117 -r1.161
      return( $_ );
  }
  
-@@ -4324,23 +4563,11 @@
+@@ -4324,23 +4581,11 @@
  # Escape unsafe characters in URLs
  #		
  sub escapeurl {
@@ -1477,7 +1531,7 @@ diff -u -r1.117 -r1.161
      return( $_ );
  }
  
-@@ -4387,7 +4614,6 @@
+@@ -4387,7 +4632,6 @@
      my $rc;
      foreach $rc (@_) {
          next if ( ! -r $rc || ! -f $rc );
@@ -1485,7 +1539,7 @@ diff -u -r1.117 -r1.161
  	eval ( get_rc($rc) );
  	if( $@ ) {
  	    print( STDERR "Bad Eval for file \"${rc}\"...\n$@\n" );
-@@ -4468,7 +4694,7 @@
+@@ -4468,7 +4712,7 @@
      my $path=$top;
      $direlem='';
      do {
diff --git a/www/WebMagick/files/patch-ab b/www/WebMagick/files/patch-ab
index 5d1709c9a706..f9576b4b9373 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.21
-diff -u -r1.16 -r1.21
+retrieving revision 1.22
+diff -u -r1.16 -r1.22
 --- webmagickrc.in	4 Dec 2001 19:36:57 -0000	1.16
-+++ webmagickrc.in	26 May 2004 22:56:13 -0000	1.21
++++ webmagickrc.in	4 Apr 2011 00:06:12 -0000	1.22
 @@ -83,6 +83,7 @@
  # $opt_ignore		= 0;	# Do not webmagick this directory
  				#    but still recurse into sub-directories
@@ -14,7 +14,7 @@ diff -u -r1.16 -r1.21
  # $opt_srcdir		= '.';	# Source directory path (current directory)
  # $opt_verbose		= 0;	# Verbose flag (default off)
  # $opt_forcecache		= 0;	# Force update of cached thumbnails
-@@ -90,6 +91,9 @@
+@@ -90,30 +91,48 @@
  # $opt_forcemontage	= 0;	# Force montage (default off)
  # $opt_forcegif		= 0;	# Force GIF imagemaps (default off)
  # $opt_forcejpeg          = 0;    # Force JPEG imagemaps (default off)
@@ -24,7 +24,13 @@ diff -u -r1.16 -r1.21
  # $opt_jpegquality      = 70;   # Quality of JPEG imagemaps
  # $opt_help		= 0;	# Display usage message
  # $opt_version		= 0;	# Display version info
-@@ -101,19 +105,32 @@
+ # $opt_htmlext            = '.html'; # Use .shtml for SSI
++# $opt_bodytagins       = '';   # Insert something into <BODY> tag
+ # $opt_header           = '<CENTER>';   # Imagemap extra page header (HTML)
+ # $opt_footer           = '</CENTER>';   # Imagemap extra page footer (HTML)
++# $opt_headins          = '';   # Insert something into <HEAD> section
+ # $opt_javascript		= 1;	# Enable JavaScript output
+ # $opt_readmevisible	= 0;	# Make README.html be first page.
  # $opt_title		= '';	# Page title (blank provides default title)
  # $opt_address		= '';	# Additonal address info for bottom of
                                  #    imagemap page
@@ -57,7 +63,7 @@ diff -u -r1.16 -r1.21
  # $opt_allowconfig	 = 0; # allow user to configure table and framestyle
  
  #				
-@@ -199,8 +216,7 @@
+@@ -199,8 +218,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
@@ -67,7 +73,7 @@ diff -u -r1.16 -r1.21
  # $opt_framestyle		= 1;		# Frame style to use (out of those available)
  
  #
-@@ -245,6 +261,7 @@
+@@ -245,6 +263,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