From 62b700e718db0205eb3b2398f3334c035ff3ba91 Mon Sep 17 00:00:00 2001 From: ache Date: Sat, 29 May 2004 02:28:06 +0000 Subject: Update to latest variant from project CVS --- www/WebMagick/Makefile | 2 +- www/WebMagick/files/patch-aa | 176 +++++++++++++++++++++---------------------- 2 files changed, 85 insertions(+), 93 deletions(-) diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile index 8c5f4c9..44bc4dd 100644 --- a/www/WebMagick/Makefile +++ b/www/WebMagick/Makefile @@ -7,7 +7,7 @@ PORTNAME= WebMagick PORTVERSION= 2.03p3 -PORTREVISION= 13 +PORTREVISION= 14 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 ada05a7..7cf6aa8 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.145 -diff -u -r1.117 -r1.145 +retrieving revision 1.146 +diff -u -r1.117 -r1.146 --- webmagick.in 23 Oct 2002 16:14:47 -0000 1.117 -+++ webmagick.in 27 May 2004 12:32:06 -0000 1.145 ++++ webmagick.in 27 May 2004 23:42:17 -0000 1.146 @@ -1,6 +1,6 @@ #! @PERL@ # -# $Id: webmagick.in,v 1.117 2002/10/23 16:14:47 clindell Exp $ -+# $Id: webmagick.in,v 1.145 2004/05/27 12:32:06 ache Exp $ ++# $Id: webmagick.in,v 1.146 2004/05/27 23:42:17 ache Exp $ # # You are looking at the main PERL script for WebMagick, a package to # intelligently create HTML and JavaScript index files and imagemaps @@ -32,15 +32,7 @@ diff -u -r1.117 -r1.145 $opt_lowres, $opt_lowresdir, $opt_lowresformat, -@@ -124,6 +126,7 @@ - $opt_lowresmin, - $opt_coloralink, - $opt_colorback, -+ $opt_tablebackcolor, - $opt_colorfore, - $opt_colorlink, - $opt_colorvlink, -@@ -144,12 +147,13 @@ +@@ -144,12 +146,13 @@ $opt_forcejpeg, $opt_forcehtml, $opt_forcemontage, @@ -55,7 +47,7 @@ diff -u -r1.117 -r1.145 $opt_frameddirfmt, %opt_framefmt, %opt_framefmt_frames, -@@ -167,6 +171,7 @@ +@@ -167,6 +170,7 @@ %opt_icons, $opt_ignore, $opt_ignorefp, @@ -63,7 +55,7 @@ diff -u -r1.117 -r1.145 $opt_imgindexname, $opt_indexname, $opt_javascript, -@@ -212,6 +217,12 @@ +@@ -212,6 +216,12 @@ $opt_srcdir, $opt_stylesheet, # URL to a CSS to use $opt_tables, @@ -76,7 +68,7 @@ diff -u -r1.117 -r1.145 $opt_thumbbackground, $opt_thumbbordercolor, $opt_thumbborderwidth, -@@ -237,14 +248,20 @@ +@@ -237,14 +247,20 @@ $opt_webmagickrc, # Per-directory WebMagick rc file name $opt_zoomfilter, $opt_pichtml, @@ -97,7 +89,7 @@ diff -u -r1.117 -r1.145 $pageStatusTime, # Time status file last modified $pageNumber, # Current page number $pathSep, # OS-specific path separator -@@ -368,6 +385,7 @@ +@@ -368,6 +384,7 @@ $opt_ignore = 0; # Do not webmagick this directory # but still recurse into sub-directories $opt_ignorefp = 1; # ignore _* special FrontPage directories (on) @@ -105,7 +97,7 @@ diff -u -r1.117 -r1.145 $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,6 +393,9 @@ $opt_forcemontage = 0; # Force montage (default off) $opt_forcegif = 0; # Force GIF imagemaps (default off) $opt_forcejpeg = 0; # Force JPEG imagemaps (default off) @@ -115,7 +107,7 @@ diff -u -r1.117 -r1.145 $opt_jpegquality = 70; # Quality for JPEG imagemaps $opt_help = 0; # Display usage message $opt_version = 0; # Display version info -@@ -386,15 +407,28 @@ +@@ -386,15 +406,28 @@ $opt_readmevisible = 0; # Make README.html be first page. $opt_title = ''; # Page title (blank provides default title) $opt_tables = 0; # disable tables @@ -145,7 +137,7 @@ diff -u -r1.117 -r1.145 $opt_pichtmltarget = ''; $opt_pichtmltitleend = '

'; # End tags for picture title $opt_pichtmltitlestart = '

'; # Start tags for picture title -@@ -491,8 +525,7 @@ +@@ -491,8 +524,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 @@ -155,7 +147,7 @@ diff -u -r1.117 -r1.145 $opt_framestyle = 1; # Frame style to use (out of those available) # -@@ -539,6 +572,7 @@ +@@ -539,6 +571,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 @@ -163,7 +155,7 @@ diff -u -r1.117 -r1.145 # $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 +630,11 @@ +@@ -596,12 +629,11 @@ # | | | # ------------- $opt_framefmt{1}= @@ -180,7 +172,7 @@ diff -u -r1.117 -r1.145 $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 +649,15 @@ +@@ -616,16 +648,15 @@ # | | | # ------------- $opt_framefmt{2}= @@ -203,7 +195,7 @@ diff -u -r1.117 -r1.145 $opt_framefmt_frames{2}=3; # Number of frames expressed by this frame format # Three frame screen with directories listed in left frame, -@@ -640,16 +672,15 @@ +@@ -640,16 +671,15 @@ # | | | # ------------- $opt_framefmt{3}= @@ -226,7 +218,7 @@ diff -u -r1.117 -r1.145 $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 +695,15 @@ +@@ -664,16 +694,15 @@ # | | | # ------------- $opt_framefmt{4}= @@ -249,7 +241,7 @@ diff -u -r1.117 -r1.145 $opt_framefmt_frames{4}=3; # Number of frames expressed by this frame format # -@@ -756,6 +786,7 @@ +@@ -756,6 +785,7 @@ use Getopt::Long; if ( ! GetOptions( 'address=s' => \$opt_address, @@ -257,7 +249,7 @@ diff -u -r1.117 -r1.145 'anonymous!' => \$opt_anonymous, 'cache!' => \$opt_cache, 'cachedir=s' => \$opt_cachedir, -@@ -790,10 +821,11 @@ +@@ -790,10 +820,11 @@ 'forcehtml!' => \$opt_forcehtml, 'forcejpeg!' => \$opt_forcejpeg, 'forcemontage!' => \$opt_forcemontage, @@ -271,7 +263,7 @@ diff -u -r1.117 -r1.145 'frames!' => \$opt_frames, 'framestyle=i' => \$opt_framestyle, 'header=s' => \$opt_header, -@@ -803,6 +835,7 @@ +@@ -803,6 +834,7 @@ 'iconbase=s' => \$opt_iconbase, 'iconpath=s' => \$opt_iconpath, 'ignorefp!' => \$opt_ignorefp, @@ -279,7 +271,7 @@ diff -u -r1.117 -r1.145 'imgindexname=s' => \$opt_imgindexname, 'indexname=s' => \$opt_indexname, 'javascript!' => \$opt_javascript, -@@ -828,14 +861,20 @@ +@@ -828,14 +860,20 @@ 'msg_up=s' => \$opt_msg_up, 'pageindexname=s' => \$opt_pageindexname, 'pichtml!' => \$opt_pichtml, @@ -300,7 +292,7 @@ diff -u -r1.117 -r1.145 'prefixpath=s' => \$opt_prefixpath, 'readme=s' => \$opt_readme, 'readmevisible!' => \$opt_readmevisible, -@@ -846,6 +885,12 @@ +@@ -846,6 +884,12 @@ 'srcdir=s' => \$opt_srcdir, 'stylesheet=s' => \$opt_stylesheet, 'tables!' => \$opt_tables, @@ -313,7 +305,7 @@ diff -u -r1.117 -r1.145 'thumbtexture=s' => \$opt_thumbtexture, 'thumbbackground=s' => \$opt_thumbbackground, 'thumbborderwidth=i' => \$opt_thumbborderwidth, -@@ -1187,7 +1232,6 @@ +@@ -1187,7 +1231,6 @@ evaluateRcFiles(); @@ -321,7 +313,7 @@ diff -u -r1.117 -r1.145 # Decide if we want to process this directory or not based on the # value of $opt_ignore. If not, then just return. -@@ -1329,7 +1373,6 @@ +@@ -1329,7 +1372,6 @@ $pageStatusTime=fmtime($fileNames{'pageStatus'}); } @@ -329,7 +321,7 @@ diff -u -r1.117 -r1.145 # Handle a directory name to title index file. Store alternative # names in %dirTitles. { -@@ -1346,34 +1389,50 @@ +@@ -1346,34 +1388,50 @@ $tmp_dirTitles{$dirname} = escapehtml($dirtitle); $dirOrder{$dirname} = $pos; $pos++; @@ -387,7 +379,7 @@ diff -u -r1.117 -r1.145 $imageOrder{$imgname} = $pos; $pos++; } -@@ -1383,11 +1442,25 @@ +@@ -1383,11 +1441,25 @@ # # This code is totally BOGUS since decision should be made on a per-page basis!! # @@ -414,7 +406,7 @@ diff -u -r1.117 -r1.145 } } -@@ -1396,6 +1469,7 @@ +@@ -1396,6 +1468,7 @@ # { my %tmp_iconImageUrls; @@ -422,7 +414,7 @@ diff -u -r1.117 -r1.145 print( "Icon URLs:\n" ) if $opt_debug; my $icon; for $icon ( keys %opt_icons ) { -@@ -1405,11 +1479,14 @@ +@@ -1405,11 +1478,14 @@ if $opt_debug; } } @@ -438,7 +430,7 @@ diff -u -r1.117 -r1.145 } } -@@ -1431,6 +1508,7 @@ +@@ -1431,6 +1507,7 @@ # Build list of image files # @allImageFiles = sort( sortImages grep( /$includeRegex/io, @allFiles)); @@ -446,7 +438,7 @@ diff -u -r1.117 -r1.145 # Find subdirectory names (if any) ignoring hidden directories and # directories without index files. Directories should have index -@@ -1446,10 +1524,9 @@ +@@ -1446,10 +1523,9 @@ if ($opt_frames) { grep($tarray{$_}++, @allImageFiles); foreach $_ ( grep(! $tarray{$_},@allFiles) ) { @@ -459,7 +451,7 @@ diff -u -r1.117 -r1.145 push(@dirfiles, $_); # then add it to the list if ($opt_javascript) { # Check which index file to use for JavaScript -@@ -1461,6 +1538,7 @@ +@@ -1461,6 +1537,7 @@ $dirJsLink{"$_"} = ''; } } @@ -467,7 +459,7 @@ diff -u -r1.117 -r1.145 } } } -@@ -1510,9 +1588,7 @@ +@@ -1510,9 +1587,7 @@ if( $numimages > 0 ) { $haveImages = 1; } @@ -478,7 +470,7 @@ diff -u -r1.117 -r1.145 # # Determine page title # -@@ -1520,10 +1596,18 @@ +@@ -1520,10 +1595,18 @@ $pageTitle = $opt_title; } else { my $dirname=basename($sourceDirectory); @@ -499,7 +491,7 @@ diff -u -r1.117 -r1.145 # # Put the PerlMagick Montage options together # -@@ -1576,7 +1660,7 @@ +@@ -1576,7 +1659,7 @@ $tmp_montageParameters .= "mattecolor=>\'$opt_thumbframecolor\',\n " if $opt_thumbframecolor ne 'false'; $tmp_montageParameters .= "label=>\'$opt_thumblabel\',\n " @@ -508,7 +500,7 @@ diff -u -r1.117 -r1.145 $tmp_montageParameters .= "labelwidth=>\'$opt_thumblabelwidth\',\n "; $tmp_montageParameters .= "\Lzoomfilter=>\'$opt_zoomfilter\'"; if( !defined($montageParameters) || ($tmp_montageParameters ne $montageParameters)) { -@@ -1597,6 +1681,7 @@ +@@ -1597,6 +1680,7 @@ 'backgroundimg' => $opt_icons{'background'}, 'cachedir' => !$opt_tables ? "" : $opt_cachedir, 'cacheformat' => !$opt_tables ? "" : $opt_cacheformat, @@ -516,7 +508,7 @@ diff -u -r1.117 -r1.145 'coloralink' => $opt_coloralink, 'colorback' => $opt_colorback, 'colorfore' => $opt_colorfore, -@@ -1615,11 +1700,12 @@ +@@ -1615,11 +1699,12 @@ 'dirhtmlext' => !$opt_frames ? "" : $opt_dirhtmlext, 'dirindexname' => !$opt_frames ? "" : $opt_dirindexname, 'footer' => $opt_footer, @@ -531,7 +523,7 @@ diff -u -r1.117 -r1.145 'frames' => $opt_frames, 'framestyle' => !$opt_frames ? 1 : $opt_framestyle, 'header' => $opt_header, -@@ -1627,6 +1713,7 @@ +@@ -1627,6 +1712,7 @@ 'htmlext' => !$opt_frames ? "" : $opt_htmlext, 'iconbase' => $opt_iconbase, 'imgindexname' => $opt_imgindexname, @@ -539,7 +531,7 @@ diff -u -r1.117 -r1.145 'indexname' => $opt_indexname, 'javascript' => $opt_javascript, 'jsdirindex' => !$opt_javascript ? "" : $fileNames{'jsDirIndex'}, -@@ -1647,8 +1734,8 @@ +@@ -1647,8 +1733,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, @@ -550,7 +542,7 @@ diff -u -r1.117 -r1.145 'msg_next' => $opt_msg_next, 'msg_pause' => $opt_msg_pause, 'msg_page_navigator' => !$opt_frames ? "" : $opt_msg_page_navigator, -@@ -1659,14 +1746,20 @@ +@@ -1659,14 +1745,20 @@ 'numpages' => $numPages, 'pageindexname' => $opt_pageindexname, 'pichtml' => $opt_pichtml, @@ -571,20 +563,20 @@ diff -u -r1.117 -r1.145 'prefixpath' => $opt_prefixpath, 'readme' => !$haveReadme ? "" : $opt_readme, 'readmepresent' => $haveReadme, -@@ -1676,6 +1769,12 @@ +@@ -1676,6 +1768,12 @@ 'stylesheet' => $opt_stylesheet, 'subdirectories' => !$opt_frames ? "" : join(' ',@dirNames), 'tables' => $opt_tables, -+ 'tablebackcolor' => $opt_tablebackcolor, -+ 'fancytables' => $opt_fancytables, -+ 'fancytableheight' => $opt_fancytableheight, ++ 'tablebackcolor' => !$opt_tables ? "" : $opt_tablebackcolor, ++ 'fancytables' => !$opt_tables ? 0 : $opt_fancytables, ++ 'fancytableheight' => !$opt_tables ? 0 : $opt_fancytableheight, + 'tables_bottom' => !$opt_tables ? "" : $opt_tables_bottom, + 'tables_params' => !$opt_tables ? "" : $opt_tables_params, + 'tables_top' => !$opt_tables ? "" : $opt_tables_top, 'title' => $pageTitle, 'version' => $opt_anonymous ? "" : $webmagickInfo{'version'}, ); -@@ -1763,7 +1862,7 @@ +@@ -1763,7 +1861,7 @@ if( ! $opt_tables && (! -f $fileNames{'pageStatus'} || ( ! -f $fileNames{'montageGIF'} && ! -f $fileNames{'montageJPEG'} ))) { # If key file is missing then do montage @@ -593,7 +585,7 @@ diff -u -r1.117 -r1.145 " file is missing\n") if $opt_debug; ++$doMontage; -@@ -1975,7 +2074,8 @@ +@@ -1975,7 +2073,8 @@ # get indexname of parent directory my $upindexname = get_rc_var('..', 'opt_indexname', "$opt_indexname"); @@ -603,7 +595,7 @@ diff -u -r1.117 -r1.145 $uphtml = "" . " ${opt_msg_up}
\n"; -@@ -2023,20 +2123,19 @@ +@@ -2023,20 +2122,19 @@ } else { $dirtitle=$subdir; } @@ -626,7 +618,7 @@ diff -u -r1.117 -r1.145 } } } -@@ -2128,14 +2227,15 @@ +@@ -2128,14 +2226,15 @@ # open( INDEX, ">${opt_indexname}") || die("$0: Failed to open file ${opt_indexname} for output\n$@\n"); @@ -644,7 +636,7 @@ diff -u -r1.117 -r1.145 print( INDEX " \n" ) if( "$opt_metaauthor" ne '' ); print( INDEX " \n" ) -@@ -2154,7 +2254,7 @@ +@@ -2154,7 +2253,7 @@ # If in JavaScript mode, output code to switch to JavaScript pages # Currently knows about certain browsers. if( $opt_javascript ) { @@ -653,7 +645,7 @@ diff -u -r1.117 -r1.145 print( INDEX '