Update ImageMagick package to 4.1.3.

4 files changed, 19 insertions, 24 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index bcd0782e7b8..3f10ca38717 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 1998/10/14 19:19:01 tron Exp $
+# $NetBSD: Makefile,v 1.30 1998/11/01 22:34:11 tron Exp $
 #
 
-DISTNAME=	ImageMagick-4.1.2
+DISTNAME=	ImageMagick-4.1.3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -15,7 +15,7 @@ DEPENDS+=	tiff-3.4:../../graphics/tiff
 
 CONFLICTS=	ImageMagick-4.0 ImageMagick-4.0.1 ImageMagick-4.0.3 \
 		ImageMagick-4.0.5 ImageMagick-4.0.6 ImageMagick-4.0.7 \
-		ImageMagick-4.0.8 ImageMagick-4.1.1
+		ImageMagick-4.0.8 ImageMagick-4.1.1 ImageMagick-4.1.2
 
 pre-configure:
 .if exists(/usr/lib/libbz2.a)
diff --git a/graphics/ImageMagick/files/md5 b/graphics/ImageMagick/files/md5
index b25206ec4f4..a40625152d0 100644
--- a/graphics/ImageMagick/files/md5
+++ b/graphics/ImageMagick/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.16 1998/10/14 19:19:02 tron Exp $
+$NetBSD: md5,v 1.17 1998/11/01 22:34:11 tron Exp $
 
-MD5 (ImageMagick-4.1.2.tar.gz) = 6598026f95f6afbfd071b275fe4e1635
+MD5 (ImageMagick-4.1.3.tar.gz) = 3da6a8496904b370f278b7873a50e3bf
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index d7c399b8c09..e35ca4d63f5 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 1998/09/28 18:13:37 tron Exp $
+$NetBSD: patch-aa,v 1.6 1998/11/01 22:34:12 tron Exp $
 
---- Magick.tmpl.orig	Fri Sep 18 03:21:46 1998
-+++ Magick.tmpl	Tue Sep 22 23:06:22 1998
+--- Magick.tmpl.orig	Thu Oct 22 18:32:57 1998
++++ Magick.tmpl	Sun Nov  1 23:14:22 1998
 @@ -37,17 +37,17 @@
  #ifdef RsArchitecture
  XCOMM EXTENSIONS_DEFINES= -DHasLZW -DHasShape
@@ -23,8 +23,8 @@ $NetBSD: patch-aa,v 1.5 1998/09/28 18:13:37 tron Exp $
  
  XCOMM By default, the maximum color value is 255.  To increase the maximum to
  XCOMM 65535 define:
-@@ -59,17 +59,17 @@
- XCOMM of these optional plug-ins, uncomment the respective define.  Make sure
+@@ -59,16 +59,16 @@
+ XCOMM of these optional delegates, uncomment the respective define.  Make sure
  XCOMM the path names are correct.  See README for more details.
  XCOMM
 -XCOMM #define HasBZLIB
@@ -34,11 +34,9 @@ $NetBSD: patch-aa,v 1.5 1998/09/28 18:13:37 tron Exp $
  XCOMM #define HasHDF
  XCOMM #define HasJBIG
 -XCOMM #define HasJPEG
--XCOMM #define HasMPEG
 -XCOMM #define HasPNG
 -XCOMM #define HasTIFF
 +#define HasJPEG
-+#define HasMPEG
 +#define HasPNG
 +#define HasTIFF
  XCOMM #define HasTTF
@@ -47,7 +45,7 @@ $NetBSD: patch-aa,v 1.5 1998/09/28 18:13:37 tron Exp $
  
  #ifdef HasBZLIB
  BZLIB_DEFINES= -DHasBZLIB
-@@ -108,13 +108,13 @@
+@@ -107,24 +107,24 @@
  
  #ifdef HasJPEG
  JPEG_DEFINES= -DHasJPEG
@@ -58,13 +56,6 @@ $NetBSD: patch-aa,v 1.5 1998/09/28 18:13:37 tron Exp $
  JPEG_LIBRARIES= -ljpeg
  #endif
  
- #ifdef HasMPEG
--MPEG_BINDIR= /usr/local/bin
-+MPEG_BINDIR= ${PREFIX}/bin
- MPEG_DEFINES= -DMPEGDecodeDelegate=\"$(MPEG_BINDIR)/mpeg2decode\" \
-   -DMPEGEncodeDelegate=\"$(MPEG_BINDIR)/mpeg2encode\"
- #endif
-@@ -122,16 +122,16 @@
  #ifdef HasPNG
  XCOMM Use libpng-1.00 or above.  You must also link with Zlib.
  PNG_DEFINES= -DHasPNG
@@ -85,7 +76,7 @@ $NetBSD: patch-aa,v 1.5 1998/09/28 18:13:37 tron Exp $
  TIFF_LIBRARIES= -ltiff
  #endif
  
-@@ -144,8 +144,8 @@
+@@ -137,8 +137,8 @@
  
  #ifdef HasZLIB
  ZLIB_DEFINES= -DHasZLIB
@@ -96,7 +87,7 @@ $NetBSD: patch-aa,v 1.5 1998/09/28 18:13:37 tron Exp $
  ZLIB_LIBRARIES= -lz
  #endif
  
-@@ -162,15 +162,15 @@
+@@ -155,16 +155,16 @@
  XCOMM the top level X11 include directory or X11/X.h will be overwritten.
  
  #ifndef PREFIX
@@ -104,6 +95,7 @@ $NetBSD: patch-aa,v 1.5 1998/09/28 18:13:37 tron Exp $
 +PREFIX=${X11BASE}
  #endif
  
+ DelegatePath= -DDelegatePath=\"$(PREFIX)/share/ImageMagick/\"
  LOCALDIR= $(PREFIX)/bin
  LOCALINC= $(PREFIX)/include/magick
  LOCALLIB= $(PREFIX)/lib
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index 18399e94979..9b00a944e4d 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 1998/10/14 19:19:02 tron Exp $
+@comment $NetBSD: PLIST,v 1.14 1998/11/01 22:34:12 tron Exp $
 bin/xtp
 bin/display
 bin/montage
@@ -20,9 +20,10 @@ include/magick/widget.h
 include/magick/PreRvIcccm.h
 include/magick/memory.h
 include/magick/delegates.h
+include/magick/version.h
 @dirrm include/magick
 lib/libMagick.a
-lib/libMagick.so.4.0.12
+lib/libMagick.so.4.0.13
 man/cat1/display.0
 man/cat1/montage.0
 man/cat1/import.0
@@ -35,3 +36,5 @@ man/cat1/ImageMagick.0
 man/cat5/quantize.0
 man/cat4/miff.0
 man/cat1/xtp.0
+share/ImageMagick/delegates.mgk
+@dirrm share/ImageMagick