upgrade to 1.46

6 files changed, 36 insertions, 32 deletions

diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 886824952ea0..d3dbfcd4f087 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    WebMagick
-# http://www.cyberramp.net/~bfriesen/webmagick/
+# http://www.simplesystems.org/WebMagick/
 # Version required:                     1.4*
 # Date created:                         20 May 1998
 # Whom:                                 ache
@@ -7,9 +7,9 @@
 # $FreeBSD$
 #
 
-DISTNAME=       WebMagick-1.45
+DISTNAME=       WebMagick-1.46
 CATEGORIES=     www
-MASTER_SITES=   http://www.cyberramp.net/~bfriesen/webmagick/dist/
+MASTER_SITES=   ftp://ftp.simplesystems.org/pub/WebMagick/
 
 LIB_DEPENDS=    Magick.4:${PORTSDIR}/graphics/ImageMagick
 
diff --git a/www/WebMagick/distinfo b/www/WebMagick/distinfo
index d7feca2129e6..fd943040ab1d 100644
--- a/www/WebMagick/distinfo
+++ b/www/WebMagick/distinfo
@@ -1 +1 @@
-MD5 (WebMagick-1.45.tar.gz) = 15f9973d3e839fae659d9bebe0b70492
+MD5 (WebMagick-1.46.tar.gz) = dbd72c182fa60ba66654e68c6a425091
diff --git a/www/WebMagick/files/patch-aa b/www/WebMagick/files/patch-aa
index 686a88b89e2d..7e7d6ae8bc60 100644
--- a/www/WebMagick/files/patch-aa
+++ b/www/WebMagick/files/patch-aa
@@ -1,6 +1,6 @@
---- webmagick.in.orig	Sun Dec 20 01:03:12 1998
-+++ webmagick.in	Sat Jun 12 20:01:35 1999
-@@ -128,6 +128,7 @@
+--- webmagick.in.old	Sun Oct 17 23:55:14 1999
++++ webmagick.in	Sun Nov 21 05:37:03 1999
+@@ -127,6 +127,7 @@
      $opt_dircolorlink,
      $opt_dircolorvlink,
      $opt_dirfmt,
@@ -8,7 +8,7 @@
      $opt_dirindexname,
      $opt_forcecache,
      $opt_forcegif,
-@@ -157,6 +158,7 @@
+@@ -156,6 +157,7 @@
      $opt_imgindexname,
      $opt_indexname,
      $opt_javascript,
@@ -16,7 +16,7 @@
      $opt_mapnetscape,
      $opt_maptype,
      $opt_maxgif,
-@@ -268,6 +270,7 @@
+@@ -267,6 +269,7 @@
  $opt_pageindexname	= '.index';	# Base name of secondary index files
  $opt_dirindexname	= '.dirindex';	# Subdirectory Title cross-reference
  					#  dirname   Directory Title
@@ -24,7 +24,7 @@
  $opt_imgindexname	= '.imgindex';	# Image name to label cross-reference file
  
  #
-@@ -310,6 +313,7 @@
+@@ -309,6 +312,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 +32,7 @@
  $opt_help		= 0;	# Display usage message
  $opt_version		= 0;	# Display version info
  $opt_htmlext            = '.html'; # Use .shtml for SSI
-@@ -660,6 +664,7 @@
+@@ -658,6 +662,7 @@
  		'dircolorfore=s'	=> \$opt_dircolorfore,
  		'dircolorlink=s'	=> \$opt_dircolorlink,
  		'dircolorvlink=s'	=> \$opt_dircolorvlink,
@@ -40,7 +40,7 @@
  		'dirindexname=s'	=> \$opt_dirindexname,
  		'footer=s'              => \$opt_footer,
  		'forcecache!'		=> \$opt_forcecache,
-@@ -680,6 +685,7 @@
+@@ -678,6 +683,7 @@
  		'imgindexname=s'	=> \$opt_imgindexname,
  		'indexname=s'		=> \$opt_indexname,
  		'javascript!'		=> \$opt_javascript,
@@ -48,7 +48,7 @@
  		'mapnetscape!'		=> \$opt_mapnetscape,
  		'maptype=s'		=> \$opt_maptype,
  		'maxgif=i'		=> \$opt_maxgif,
-@@ -872,7 +878,7 @@
+@@ -870,7 +876,7 @@
      # for each directory ignoring hidden directories
      use File::Find;
      print( "Processing directory tree $opt_srcdir ...\n" ) if $opt_debug;
@@ -57,7 +57,7 @@
  } else {
      print( "Processing directory $opt_srcdir ...\n" ) if $opt_debug;
      $sourceDirectory = $opt_srcdir;
-@@ -936,7 +942,7 @@
+@@ -934,7 +940,7 @@
  sub wanted {
      my($dev,$ino,$mode,$nlink,$uid,$gid);
      ($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_);
@@ -66,7 +66,7 @@
          if( $_ ne '.' && get_rc_var('.', 'opt_prune', 0) ) {
              $File::Find::prune=1;
  	    # following funny logic is to avoid warnings about $prune
-@@ -1426,6 +1432,7 @@
+@@ -1425,6 +1431,7 @@
  	 'dircolorfore'		=> $opt_dircolorfore,
  	 'dircolorlink'		=> $opt_dircolorlink,
  	 'dircolorvlink'	=> $opt_dircolorvlink,
@@ -74,7 +74,7 @@
  	 'dirindexname'		=> $opt_dirindexname,
  	 'footer'               => $opt_footer,
  	 'framemarginwidth'	=> $opt_framemarginwidth,
-@@ -1695,7 +1702,7 @@
+@@ -1694,7 +1701,7 @@
  sub writeTopIndexes {
  
      print( STDERR "Writing Index Files ${opt_indexname} & ",
@@ -83,7 +83,7 @@
                  if $opt_debug;
  
      #---- Generate the Variables for Format Options ----
-@@ -1806,7 +1813,7 @@
+@@ -1805,7 +1812,7 @@
      # Pull README into thumbnail frame if it exists, and is
      # either marked always visible or there are no images.
      #
@@ -92,7 +92,7 @@
  
      if( $opt_framefmt_frames{$opt_framestyle} <= 2 ) {
  	if( $haveReadme && ( $opt_readmevisible || ! $haveImages ) ) {
-@@ -1924,8 +1931,8 @@
+@@ -1923,8 +1930,8 @@
  
      # ----- Output Frame Directory File (usally ".indexdir.html") ------
      #
@@ -112,7 +112,7 @@
  					  );
  		handleMagickError( __FILE__, __LINE__, $fileNames{'montageJPEG'}, $status) if "$status";
  		last MONTAGE if "$status";
-@@ -3373,6 +3380,8 @@
+@@ -3369,6 +3376,8 @@
  
  Montage:
    --forcegif         Force imagemap to be in GIF format
@@ -121,11 +121,11 @@
    --maxgif           Maximum size of GIF imagemap before trying JPEG
    --columns	     Montage columns
    --rows	     Montage rows (max)
-@@ -3412,6 +3421,7 @@
+@@ -3408,6 +3417,7 @@
    --dircolorfore     Foreground color (directory frame)
    --dircolorlink     Link (unvisited) color (directory frame)
    --dircolorvlink    Link (visited) color (directory frame)
-+  --dirhtmlext       Extension for directories frame
++  --dirhtmlext       Extension for directory frame
  
    --javascript	     Enable JavaScript output
    --header           Page header (imagemap frame)
diff --git a/www/WebMagick/files/patch-ab b/www/WebMagick/files/patch-ab
index 9ca322ae434f..9e939dfda5b8 100644
--- a/www/WebMagick/files/patch-ab
+++ b/www/WebMagick/files/patch-ab
@@ -1,5 +1,5 @@
---- webmagickrc.in.orig	Sun Dec 20 01:03:42 1998
-+++ webmagickrc.in	Thu Mar 25 05:13:47 1999
+--- webmagickrc.in.bak	Sun Oct 17 18:43:44 1999
++++ webmagickrc.in	Sun Nov 21 05:41:33 1999
 @@ -41,6 +41,7 @@
  # $opt_pageindexname	= '.index';	# Base name of secondary index files
  # $opt_dirindexname	= '.dirindex';	# Subdirectory Title cross-reference
diff --git a/www/WebMagick/files/patch-ac b/www/WebMagick/files/patch-ac
index decf5aa2a014..73c22238d3bc 100644
--- a/www/WebMagick/files/patch-ac
+++ b/www/WebMagick/files/patch-ac
@@ -1,11 +1,11 @@
---- configure.orig	Sun Dec 20 00:46:10 1998
-+++ configure	Sun Feb 21 22:26:48 1999
-@@ -812,7 +812,7 @@
-     esac
-   done
+--- configure.bak	Mon Oct 18 00:00:03 1999
++++ configure	Sun Nov 21 05:44:06 1999
+@@ -1061,7 +1061,7 @@
+       esac
+     done
  
--  exec < /dev/tty
-+  #exec < /dev/tty
-   rm $tmpfile
+-    exec < /dev/tty
++#    exec < /dev/tty
+     rm $tmpfile
+   fi
  
-   if test -n "$font1"
diff --git a/www/WebMagick/pkg-plist b/www/WebMagick/pkg-plist
index a6104cd8073d..2d5911561380 100644
--- a/www/WebMagick/pkg-plist
+++ b/www/WebMagick/pkg-plist
@@ -1,10 +1,12 @@
 etc/webmagickrc.dist
+@exec [ ! -f %B/webmagickrc ] && cp %B/%f %B/webmagickrc
 bin/webmagick
 info/webmagick.info
 info/webmagick.info-1
 info/webmagick.info-2
 www/data/webmagick/aqua_next.gif
 www/data/webmagick/aqua_prev.gif
+www/data/webmagick/blank.html
 www/data/webmagick/blue_ball.gif
 www/data/webmagick/blue_ball_large.gif
 www/data/webmagick/blue_ball_medium.gif
@@ -12,6 +14,7 @@ www/data/webmagick/blue_dir.gif
 www/data/webmagick/blue_down.gif
 www/data/webmagick/blue_help.gif
 www/data/webmagick/blue_next.gif
+www/data/webmagick/blue_parch.jpg
 www/data/webmagick/blue_prev.gif
 www/data/webmagick/blue_readme.gif
 www/data/webmagick/blue_top.gif
@@ -19,3 +22,4 @@ www/data/webmagick/blue_up.gif
 www/data/webmagick/gray_next.gif
 www/data/webmagick/gray_prev.gif
 www/data/webmagick/webmagick.js
+@dirrm www/data/webmagick