1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Tweak %htmlOpts more

This commit is contained in:
Andrey A. Chernov 2002-09-05 18:28:38 +00:00
parent 2a65b2a410
commit 80285b20b9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=65695

View File

@ -2,9 +2,10 @@ Index: webmagick.in
===================================================================
RCS file: /cvsroot/webmagick/WebMagick/webmagick.in,v
retrieving revision 1.103
diff -u -r1.103 webmagick.in
retrieving revision 1.105
diff -u -r1.103 -r1.105
--- webmagick.in 28 Aug 2002 21:42:32 -0000 1.103
+++ webmagick.in 5 Sep 2002 17:28:04 -0000
+++ webmagick.in 5 Sep 2002 18:21:47 -0000 1.105
@@ -302,7 +302,7 @@
$opt_serversidemap = 0; # Enable server-side maps writting
@ -23,15 +24,21 @@ diff -u -r1.103 webmagick.in
$currentDate = strftime ($opt_msg_date_format, localtime);
@@ -1597,7 +1599,6 @@
@@ -1596,8 +1598,11 @@
'address' => $opt_address,
'anonymous' => $opt_anonymous,
'backgroundimg' => $opt_icons{'background'},
'cachedir' => $opt_cachedir,
- 'cachedir' => $opt_cachedir,
- 'lowresdir' => $opt_lowresdir,
+ 'cache' => $opt_cache,
+ 'cachedir' => !$opt_cache ? "" : $opt_cachedir,
+ 'cacheformat' => !$opt_cache ? "" : $opt_cacheformat,
+ 'cachegeom' => !$opt_cache ? "" : $opt_cachegeom,
+ 'cachemin' => !$opt_cache ? 0 : $opt_cachemin,
'coloralink' => $opt_coloralink,
'colorback' => $opt_colorback,
'colorfore' => $opt_colorfore,
@@ -1634,6 +1635,12 @@
@@ -1634,6 +1639,11 @@
'jsfunctions' => !$opt_javascript ? "" : $fileNames{'jsFunctions'},
'jspageindex' => !$opt_javascript ? "" : $fileNames{'jsPageIndex'},
'jsvariables' => !$opt_javascript ? "" : $fileNames{'jsVariables'},
@ -39,12 +46,11 @@ diff -u -r1.103 webmagick.in
+ 'lowresdir' => !$opt_lowres ? "" : $opt_lowresdir,
+ 'lowresformat' => !$opt_lowres ? "" : $opt_lowresformat,
+ 'lowresgeom' => !$opt_lowres ? "" : $opt_lowresgeom,
+ 'lowresgeometry' => !$opt_lowres ? "" : $opt_lowresgeometry,
+ 'lowresmin' => !$opt_lowres ? 0 : $opt_lowresmin,
'metaauthor' => $opt_metaauthor,
'metacharset' => $opt_metacharset,
'metaclassification' => $opt_metaclassification,
@@ -1904,14 +1911,13 @@
@@ -1904,14 +1914,13 @@
# Clean up cached thumbnails
#
if( $opt_cache && -d $opt_cachedir ) {
@ -62,7 +68,7 @@ diff -u -r1.103 webmagick.in
grep( $tarray{$_}++, @imgfiles );
@extra = grep( $_ = "$opt_cachedir/$_", grep( ! $tarray{$_}, @cacheFiles ));
@@ -1922,14 +1928,13 @@
@@ -1922,14 +1931,13 @@
# Clean up cached low resolution images
#
if( $opt_lowres && -d $opt_lowresdir ) {
@ -80,7 +86,7 @@ diff -u -r1.103 webmagick.in
grep( $tarray{$_}++, @imgfiles );
@extra = grep( $_ = "$opt_lowresdir/$_", grep( ! $tarray{$_}, @lowresFiles ));
@@ -2889,12 +2894,12 @@
@@ -2889,12 +2897,12 @@
#
# If caching thumbnails then ensure that directory exists
#
@ -95,7 +101,7 @@ diff -u -r1.103 webmagick.in
# Read images into PerlMagick object
print( STDERR "\nReading images: ", join(' ', @{$imageNames[$pageNumber - 1]}), "\n" )
@@ -2925,18 +2930,20 @@
@@ -2925,18 +2933,20 @@
$filesize, # Image file size
$magick);
@ -126,7 +132,7 @@ diff -u -r1.103 webmagick.in
#then do the thumbnail
($rc, $filesize, $width, $height, $magick) =
@@ -3910,7 +3917,10 @@
@@ -3910,7 +3920,10 @@
# the size specified (it returns a number of standard
# scaled sizes) but not smaller.
# This uses a feature available in PerlMagick 1.12 and beyond