2 files changed, 66 insertions, 17 deletions

diff --git a/www/WebMagick/files/patch-aa b/www/WebMagick/files/patch-aa
index 7e7d6ae8bc60..5d559aa3ced8 100644
--- a/www/WebMagick/files/patch-aa
+++ b/www/WebMagick/files/patch-aa
@@ -1,5 +1,5 @@
---- webmagick.in.old	Sun Oct 17 23:55:14 1999
-+++ webmagick.in	Sun Nov 21 05:37:03 1999
+--- webmagick.in.orig	Sun Oct 17 23:55:14 1999
++++ webmagick.in	Thu Nov 25 23:44:06 1999
 @@ -127,6 +127,7 @@
      $opt_dircolorlink,
      $opt_dircolorvlink,
@@ -16,7 +16,15 @@
      $opt_mapnetscape,
      $opt_maptype,
      $opt_maxgif,
-@@ -267,6 +269,7 @@
+@@ -164,6 +166,7 @@
+     $opt_metadescription,
+     $opt_metaexpires,
+     $opt_metakeywords,
++    $opt_nodate,
+     $opt_pageindexname,
+     $opt_prefixpath,
+     $opt_prune,
+@@ -267,6 +270,7 @@
  $opt_pageindexname	= '.index';	# Base name of secondary index files
  $opt_dirindexname	= '.dirindex';	# Subdirectory Title cross-reference
  					#  dirname   Directory Title
@@ -24,7 +32,7 @@
  $opt_imgindexname	= '.imgindex';	# Image name to label cross-reference file
  
  #
-@@ -309,6 +312,7 @@
+@@ -309,6 +313,7 @@
  $opt_forcemontage	= 0;	# Force montage (default off)
  $opt_forcegif		= 0;	# Force GIF imagemaps (default off)
  $opt_forcejpeg          = 0;    # Force JPEG imagemaps (default off)
@@ -32,7 +40,15 @@
  $opt_help		= 0;	# Display usage message
  $opt_version		= 0;	# Display version info
  $opt_htmlext            = '.html'; # Use .shtml for SSI
-@@ -658,6 +662,7 @@
+@@ -319,6 +324,7 @@
+ $opt_title		= '';	# Page title (blank provides default title)
+ $opt_address		= '';	# Additonal address info for bottom of
+                                 #    imagemap page
++$opt_nodate             = 0;    # Don't show updates date
+ $opt_pichtml            = 0;    # Write separate HTML for each picture
+ $opt_pichtmlext         = '.html'; # Use .shtml for SSI
+ $opt_pichtmltarget      = '';
+@@ -658,6 +664,7 @@
  		'dircolorfore=s'	=> \$opt_dircolorfore,
  		'dircolorlink=s'	=> \$opt_dircolorlink,
  		'dircolorvlink=s'	=> \$opt_dircolorvlink,
@@ -40,7 +56,7 @@
  		'dirindexname=s'	=> \$opt_dirindexname,
  		'footer=s'              => \$opt_footer,
  		'forcecache!'		=> \$opt_forcecache,
-@@ -678,6 +683,7 @@
+@@ -678,9 +685,11 @@
  		'imgindexname=s'	=> \$opt_imgindexname,
  		'indexname=s'		=> \$opt_indexname,
  		'javascript!'		=> \$opt_javascript,
@@ -48,7 +64,11 @@
  		'mapnetscape!'		=> \$opt_mapnetscape,
  		'maptype=s'		=> \$opt_maptype,
  		'maxgif=i'		=> \$opt_maxgif,
-@@ -870,7 +876,7 @@
++		'nodate!'               => \$opt_nodate,
+ 		'pageindexname=s'	=> \$opt_pageindexname,
+ 		'pichtml!'              => \$opt_pichtml,
+ 		'pichtmlbottom=s'       => \$opt_pichtmlbottom,
+@@ -870,7 +879,7 @@
      # for each directory ignoring hidden directories
      use File::Find;
      print( "Processing directory tree $opt_srcdir ...\n" ) if $opt_debug;
@@ -57,7 +77,7 @@
  } else {
      print( "Processing directory $opt_srcdir ...\n" ) if $opt_debug;
      $sourceDirectory = $opt_srcdir;
-@@ -934,7 +940,7 @@
+@@ -934,7 +943,7 @@
  sub wanted {
      my($dev,$ino,$mode,$nlink,$uid,$gid);
      ($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_);
@@ -66,7 +86,7 @@
          if( $_ ne '.' && get_rc_var('.', 'opt_prune', 0) ) {
              $File::Find::prune=1;
  	    # following funny logic is to avoid warnings about $prune
-@@ -1425,6 +1431,7 @@
+@@ -1425,6 +1434,7 @@
  	 'dircolorfore'		=> $opt_dircolorfore,
  	 'dircolorlink'		=> $opt_dircolorlink,
  	 'dircolorvlink'	=> $opt_dircolorvlink,
@@ -74,7 +94,16 @@
  	 'dirindexname'		=> $opt_dirindexname,
  	 'footer'               => $opt_footer,
  	 'framemarginwidth'	=> $opt_framemarginwidth,
-@@ -1694,7 +1701,7 @@
+@@ -1450,7 +1460,7 @@
+ 	 'readme'		=> $opt_readme,
+ 	 'readmepresent'	=> $haveReadme,
+ 	 'readmevisible'	=> $opt_readmevisible,
+-	 'dateText'		=> "Page updated on $calendarMonths[$dateMonth] $dateDay, $dateYear",
++	 'dateText'             => $opt_nodate ? "" : "Page updated on $calendarMonths[$dateMonth] $dateDay, $dateYear",
+ 	 'subdirectories'	=> join(' ',@dirNames),
+ 	 'title'		=> $pageTitle,
+ 	 'version'		=> $webmagickInfo{'version'},
+@@ -1694,7 +1704,7 @@
  sub writeTopIndexes {
  
      print( STDERR "Writing Index Files ${opt_indexname} & ",
@@ -83,7 +112,7 @@
                  if $opt_debug;
  
      #---- Generate the Variables for Format Options ----
-@@ -1805,7 +1812,7 @@
+@@ -1805,7 +1815,7 @@
      # Pull README into thumbnail frame if it exists, and is
      # either marked always visible or there are no images.
      #
@@ -92,7 +121,7 @@
  
      if( $opt_framefmt_frames{$opt_framestyle} <= 2 ) {
  	if( $haveReadme && ( $opt_readmevisible || ! $haveImages ) ) {
-@@ -1923,8 +1930,8 @@
+@@ -1923,8 +1933,8 @@
  
      # ----- Output Frame Directory File (usally ".indexdir.html") ------
      #
@@ -103,7 +132,15 @@
                  " for output\n$@\n");
      print( INDEX "<HTML>\n<HEAD>\n" );
      print( INDEX "  <TITLE>${pageTitle}</TITLE>\n" );
-@@ -2762,7 +2769,7 @@
+@@ -2143,6 +2153,7 @@
+ 		 ">WebMagick</A>" );
+ 	   print( INDEX " $webmagickInfo{version}</NOBR>, <NOBR>Copyright &copy;</NOBR> <NOBR>Bob Friesenhahn</NOBR>\n" );
+        }
++       print( INDEX "</FONT>\n" );
+        print( INDEX "</ADDRESS>\n" );
+     }
+ 
+@@ -2762,7 +2773,7 @@
  		$status = $montage->Write(
  					  filename=>"JPEG:$fileNames{'montageJPEG'}",
  					  interlace=>'Plane',
@@ -112,7 +149,7 @@
  					  );
  		handleMagickError( __FILE__, __LINE__, $fileNames{'montageJPEG'}, $status) if "$status";
  		last MONTAGE if "$status";
-@@ -3369,6 +3376,8 @@
+@@ -3369,6 +3380,8 @@
  
  Montage:
    --forcegif         Force imagemap to be in GIF format
@@ -121,7 +158,7 @@
    --maxgif           Maximum size of GIF imagemap before trying JPEG
    --columns	     Montage columns
    --rows	     Montage rows (max)
-@@ -3408,6 +3417,7 @@
+@@ -3408,9 +3421,11 @@
    --dircolorfore     Foreground color (directory frame)
    --dircolorlink     Link (unvisited) color (directory frame)
    --dircolorvlink    Link (visited) color (directory frame)
@@ -129,3 +166,7 @@
  
    --javascript	     Enable JavaScript output
    --header           Page header (imagemap frame)
++  --nodate           Don't print updates date
+   --title            Page title
+   --pichtml          Per-image HTML file generation
+   --pichtmlext       Per-image HTML file extension (default .html)
diff --git a/www/WebMagick/files/patch-ab b/www/WebMagick/files/patch-ab
index 9e939dfda5b8..24fcdac3afb7 100644
--- a/www/WebMagick/files/patch-ab
+++ b/www/WebMagick/files/patch-ab
@@ -1,5 +1,5 @@
---- webmagickrc.in.bak	Sun Oct 17 18:43:44 1999
-+++ webmagickrc.in	Sun Nov 21 05:41:33 1999
+--- webmagickrc.in.orig	Sun Oct 17 18:43:44 1999
++++ webmagickrc.in	Thu Nov 25 23:48:03 1999
 @@ -41,6 +41,7 @@
  # $opt_pageindexname	= '.index';	# Base name of secondary index files
  # $opt_dirindexname	= '.dirindex';	# Subdirectory Title cross-reference
@@ -16,3 +16,11 @@
  # $opt_help		= 0;	# Display usage message
  # $opt_version		= 0;	# Display version info
  # $opt_htmlext            = '.html'; # Use .shtml for SSI
+@@ -93,6 +95,7 @@
+ # $opt_title		= '';	# Page title (blank provides default title)
+ # $opt_address		= '';	# Additonal address info for bottom of
+                                 #    imagemap page
++# $opt_nodate           = 0;    # Don't show updates date
+ # $opt_pichtml            = 0;    # Write separate HTML for each picture
+ # $opt_pichtmlext         = '.html'; # Use .shtml for SSI
+ # $opt_pichtmltarget      = '';