Update to ImageMagick 4.0.3.

6 files changed, 57 insertions, 71 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 3a40b592a51..1ab5f5e31a6 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -3,10 +3,10 @@
 # Date created:         09th February 1998
 # Whom:                 tron
 #
-# $NetBSD: Makefile,v 1.13 1998/02/24 14:45:15 tron Exp $
+# $NetBSD: Makefile,v 1.14 1998/03/19 09:23:07 tron Exp $
 #
 
-DISTNAME=	ImageMagick-4.0.1
+DISTNAME=	ImageMagick-4.0.3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
 		ftp://ftp.ms.mff.cuni.cz/MIRRORS/ftp.wizards.dupont.com/pub/ImageMagick/ \
diff --git a/graphics/ImageMagick/files/md5 b/graphics/ImageMagick/files/md5
index bc00c4edf7a..7c8f21e2357 100644
--- a/graphics/ImageMagick/files/md5
+++ b/graphics/ImageMagick/files/md5
@@ -1 +1 @@
-MD5 (ImageMagick-4.0.1.tar.gz) = fb3090f2c4fc6e70a76f31a381c32494
+MD5 (ImageMagick-4.0.3.tar.gz) = 2bd5676de5a3c78555e42c0ff5713b05
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index f34bacfcfa2..8633a0a3c35 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,22 +1,20 @@
---- Magick.tmpl.orig	Thu Jan  8 07:16:35 1998
-+++ Magick.tmpl	Sat Jan 24 19:15:35 1998
-@@ -36,13 +36,13 @@
- #ifdef RsArchitecture
- XCOMM EXTENSIONS_DEFINES= -DHasLZW -DHasShape
- #else
--XCOMM EXTENSIONS_DEFINES= -DHasLZW -DHasShape -DHasSharedMemory
-+EXTENSIONS_DEFINES= -DHasLZW -DHasShape -DHasSharedMemory
- #endif
- 
+--- Magick.tmpl.orig	Wed Mar 11 21:28:31 1998
++++ Magick.tmpl	Thu Mar 19 09:58:46 1998
+@@ -43,11 +43,11 @@
  XCOMM Set DoSharedLib to HasSharedLibraries to build ImageMagick with shared
  XCOMM libraries.
  XCOMM
 -XCOMM #define DoSharedLib  HasSharedLibraries
 +#define DoSharedLib  HasSharedLibraries
  
+ XCOMM Define the location of the X11 RGB color database.
+ XCOMM
+-XCOMM DATABASE_DEFINES= -DRGBColorDatabase=\"/usr/openwin/lib/X11/rgb.txt\"
++DATABASE_DEFINES= -DRGBColorDatabase=\"/usr/X11R6/lib/X11/rgb.txt\"
+ 
  XCOMM By default, the maximum color value is 255.  To increase the maximum to
  XCOMM 65535 define:
-@@ -60,10 +60,10 @@
+@@ -67,12 +67,12 @@
  XCOMM #define HasFPX
  XCOMM #define HasHDF
  XCOMM #define HasJBIG
@@ -29,9 +27,12 @@
 +#define HasPNG
 +#define HasTIFF
  XCOMM #define HasTTF
+-XCOMM #define HasZLIB
++#define HasZLIB
  
  #ifdef HasDPS
-@@ -96,29 +96,29 @@
+ DPS_DEFINES= -DHasDPS
+@@ -104,29 +104,29 @@
  
  #ifdef HasJPEG
  JPEG_DEFINES= -DHasJPEG
@@ -52,12 +53,12 @@
  #endif
  
  #ifdef HasPNG
- PNG_DEFINES= -DHasPNG -DHasZLIB
--PNG_INCLUDES= -I$(TOP)/png -I$(TOP)/zlib
--PNG_FLAGS= -L$(TOP)/png -L$(TOP)/zlib
+ PNG_DEFINES= -DHasPNG
+-PNG_INCLUDES= -I$(TOP)/png
+-PNG_FLAGS= -L$(TOP)/png
 +PNG_INCLUDES= -I${LOCALBASE}/include
 +PNG_FLAGS= -L${LOCALBASE}/lib
- PNG_LIBRARIES= -lpng -lz
+ PNG_LIBRARIES= -lpng
  #endif
  
  #ifdef HasTIFF
@@ -69,17 +70,31 @@
  TIFF_LIBRARIES= -ltiff
  #endif
  
-@@ -140,10 +140,12 @@
+@@ -139,8 +139,8 @@
+ 
+ #ifdef HasZLIB
+ ZLIB_DEFINES= -DHasZLIB
+-ZLIB_INCLUDES= -I$(TOP)/zlib
+-ZLIB_FLAGS= -L$(TOP)/zlib
++ZLIB_INCLUDES= 
++ZLIB_FLAGS= 
+ ZLIB_LIBRARIES= -lz
+ #endif
+ 
+@@ -156,16 +156,12 @@
  XCOMM ImageMagick has an include file named X.h.  Do not set LOCALINC to
  XCOMM the top level X11 include directory or X11/X.h will be overwritten.
  
--LOCALDIR= /usr/local/bin
--LOCALINC= /usr/local/include/magick
--LOCALLIB= /usr/local/lib
--LOCALMAN= /usr/local/man/man1
-+LOCALDIR= $(PREFIX)/bin
-+LOCALINC= $(PREFIX)/include/magick
-+LOCALLIB= $(PREFIX)/lib
+-#ifndef PREFIX
+-PREFIX=/usr/local
+-#endif
+-
+ LOCALDIR= $(PREFIX)/bin
+ LOCALINC= $(PREFIX)/include/magick
+ LOCALLIB= $(PREFIX)/lib
+-LOCALMAN1= $(PREFIX)/man/man1
+-LOCALMAN4= $(PREFIX)/man/man4
+-LOCALMAN5= $(PREFIX)/man/man5
 +LOCALMAN1= $(PREFIX)/man/cat1
 +LOCALMAN4= $(PREFIX)/man/cat4
 +LOCALMAN5= $(PREFIX)/man/cat5
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index 06b513548f6..e0a1ce3cabe 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,50 +1,41 @@
---- Imakefile.orig	Sun Feb  1 07:41:50 1998
-+++ Imakefile	Thu Feb  5 02:12:14 1998
-@@ -61,7 +61,7 @@
-   combine xtp
- #endif
- 
--SUBDIRS = magick
-+SUBDIRS = magick xtp
- 
- AllTarget($(PROGRAMS))
- DependTarget()
+--- Imakefile.orig	Tue Feb 24 21:03:43 1998
++++ Imakefile	Thu Mar 19 09:46:13 1998
 @@ -76,28 +76,28 @@
  NormalProgramTarget(display,display.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
  NormalLintTarget($(LINTSRCS))
  InstallProgram(display,$(LOCALDIR))
--InstallMultipleMan(display.1,$(LOCALMAN))
+-InstallMultipleMan(display.1,$(LOCALMAN1))
 +InstallMultipleManSuffix(display,$(LOCALMAN1),1)
  NormalProgramTarget(montage,montage.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
  InstallProgram(montage,$(LOCALDIR))
--InstallMultipleMan(montage.1,$(LOCALMAN))
+-InstallMultipleMan(montage.1,$(LOCALMAN1))
 +InstallMultipleManSuffix(montage,$(LOCALMAN1),1)
  NormalProgramTarget(import,import.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
  InstallProgram(import,$(LOCALDIR))
--InstallMultipleMan(import.1,$(LOCALMAN))
+-InstallMultipleMan(import.1,$(LOCALMAN1))
 +InstallMultipleManSuffix(import,$(LOCALMAN1),1)
  NormalProgramTarget(animate,animate.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
  InstallProgram(animate,$(LOCALDIR))
--InstallMultipleMan(animate.1,$(LOCALMAN))
+-InstallMultipleMan(animate.1,$(LOCALMAN1))
 +InstallMultipleManSuffix(animate,$(LOCALMAN1),1)
  NormalProgramTarget(convert,convert.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
  InstallProgram(convert,$(LOCALDIR))
--InstallMultipleMan(convert.1,$(LOCALMAN))
+-InstallMultipleMan(convert.1,$(LOCALMAN1))
 +InstallMultipleManSuffix(convert,$(LOCALMAN1),1)
  NormalProgramTarget(identify,identify.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
  InstallProgram(identify,$(LOCALDIR))
--InstallMultipleMan(identify.1,$(LOCALMAN))
+-InstallMultipleMan(identify.1,$(LOCALMAN1))
 +InstallMultipleManSuffix(identify,$(LOCALMAN1),1)
  NormalProgramTarget(mogrify,mogrify.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
  InstallProgram(mogrify,$(LOCALDIR))
--InstallMultipleMan(mogrify.1,$(LOCALMAN))
+-InstallMultipleMan(mogrify.1,$(LOCALMAN1))
 +InstallMultipleManSuffix(mogrify,$(LOCALMAN1),1)
  NormalProgramTarget(combine,combine.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
  InstallProgram(combine,$(LOCALDIR))
--InstallMultipleMan(combine.1,$(LOCALMAN))
--InstallMultipleMan(ImageMagick.1,$(LOCALMAN))
--InstallMultipleMan(miff.4,$(LOCALMAN))
--InstallMultipleMan(quantize.5,$(LOCALMAN))
+-InstallMultipleMan(combine.1,$(LOCALMAN1))
+-InstallMultipleMan(ImageMagick.1,$(LOCALMAN1))
+-InstallMultipleMan(miff.4,$(LOCALMAN4))
+-InstallMultipleMan(quantize.5,$(LOCALMAN5))
 +InstallMultipleManSuffix(combine,$(LOCALMAN1),1)
 +InstallMultipleManSuffix(ImageMagick,$(LOCALMAN1),1)
 +InstallMultipleManSuffix(miff,$(LOCALMAN4),4)
diff --git a/graphics/ImageMagick/patches/patch-ad b/graphics/ImageMagick/patches/patch-ad
deleted file mode 100644
index f9ef9dae663..00000000000
--- a/graphics/ImageMagick/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- magick/magick.h.orig	Mon Feb  9 01:56:04 1998
-+++ magick/magick.h	Mon Feb  9 22:56:49 1998
-@@ -4,6 +4,8 @@
- #ifndef _MAGICK_H
- #define _MAGICK_H
- 
-+#include <paths.h>
-+
- #if defined(__cplusplus) || defined(c_plusplus)
- extern "C" {
- #endif
-@@ -145,7 +147,7 @@
- #endif
- #define ShowImageCommand \
-   "display %s -immutable -window_group 0x%lx -title \"%s of %s\" tmp:%s &"
--#define TemporaryDirectory  "/usr/tmp"
-+#define TemporaryDirectory _PATH_VARTMP
- #else
- #if defined(vms)
- #define ApplicationDefaults  "decw$system_defaults:"
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index aea185587d3..7b96bf0c329 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/02/09 22:21:28 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/03/19 09:23:08 tron Exp $
 bin/xtp
 bin/display
 bin/montage
@@ -21,7 +21,7 @@ include/magick/PreRvIcccm.h
 include/magick/plug-ins.h
 @dirrm include/magick
 lib/libMagick.a
-lib/libMagick.so.4.0.1
+lib/libMagick.so.4.0.3
 @exec /sbin/ldconfig || /usr/bin/true
 @unexec /sbin/ldconfig || /usr/bin/true
 man/cat1/display.0