Upgrade to version 4.0 of ImageMagick (from Hitoshi Osada

osada@meme.hokudai.ac.jp, thatrack@da2.so-net.or.jp).

Fixes PR pkg/4890.

7 files changed, 102 insertions, 33 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index bb952ff6e4d..1f322d5c7c1 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,12 +1,12 @@
 # New ports collection Makefile for: ImageMagick
-# Version required:	3.9.3
+# Version required:	4.0
 # Date created:         11th December 1997
 # Whom:                 tron
 #
-# $NetBSD: Makefile,v 1.4 1998/01/24 20:15:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/01/27 13:51:04 agc Exp $
 #
 
-DISTNAME=	ImageMagick-3.9.3
+DISTNAME=	ImageMagick-4.0
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
 		ftp://ftp.ms.mff.cuni.cz/MIRRORS/ftp.wizards.dupont.com/pub/ImageMagick/ \
@@ -16,17 +16,32 @@ MAINTAINER=	packages@netbsd.org
 
 LIB_DEPENDS=    jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
 		mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib \
-		png\\.0\\.96:${PORTSDIR}/graphics/png \
+		png\\.0\\.:${PORTSDIR}/graphics/png \
 		tiff\\.3\\.4:${PORTSDIR}/graphics/tiff
 
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/ImageMagick
+USE_X11=	yes
+XMKMF=		$(MAKE_ENV) xmkmf -a
 MAKE_ENV=	LOCALBASE=${LOCALBASE} PREFIX=${PREFIX}
 
 NO_CHECKSUM=	yes
 
 CAT1=		display.0 montage.0 import.0 animate.0 convert.0 identify.0 \
-		mogrify.0 combine.0 ImageMagick.0 quantize.0 miff.0 xtp.0
+		mogrify.0 combine.0 ImageMagick.0 xtp.0
+
+CAT4=		miff.0
+CAT5=		quantize.0
+
+post-extract:
+	(cd ${WRKSRC} && \
+	    for i in display montage import animate convert identify \
+		mogrify combine ImageMagick; do \
+	        ln -s $$i.1 $$i.man ; \
+	    done; \
+	    ln -s miff.4 miff.man; \
+	    ln -s quantize.5 quantize.man; )
+	(cd ${WRKSRC}/xtp && ln -s xtp.1 xtp.man)
+
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib || /usr/bin/true
diff --git a/graphics/ImageMagick/files/md5 b/graphics/ImageMagick/files/md5
index d3de9ab481c..3b3e2ddbf09 100644
--- a/graphics/ImageMagick/files/md5
+++ b/graphics/ImageMagick/files/md5
@@ -1 +1 @@
-MD5 (ImageMagick-3.9.3.tar.gz) = 3bfce7c5e5f657e3ffa06c7f3172333b
+MD5 (ImageMagick-4.0.tar.gz) = 60d49b8f4747bab8dd48018097656ccd
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index dbb88fbbbdf..f34bacfcfa2 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,11 +1,12 @@
---- Magick.tmpl.orig	Tue Dec  9 05:08:48 1997
-+++ Magick.tmpl	Thu Dec 11 01:43:36 1997
-@@ -33,12 +33,12 @@
- XCOMM HasShape if your X server supports the Shape Extension and
- XCOMM HasSharedMemory for the Shared Memory Extension.
- XCOMM
+--- 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
  
  XCOMM Set DoSharedLib to HasSharedLibraries to build ImageMagick with shared
  XCOMM libraries.
@@ -15,7 +16,7 @@
  
  XCOMM By default, the maximum color value is 255.  To increase the maximum to
  XCOMM 65535 define:
-@@ -56,10 +56,10 @@
+@@ -60,10 +60,10 @@
  XCOMM #define HasFPX
  XCOMM #define HasHDF
  XCOMM #define HasJBIG
@@ -30,7 +31,7 @@
  XCOMM #define HasTTF
  
  #ifdef HasDPS
-@@ -92,29 +92,29 @@
+@@ -96,29 +96,29 @@
  
  #ifdef HasJPEG
  JPEG_DEFINES= -DHasJPEG
@@ -51,7 +52,7 @@
  #endif
  
  #ifdef HasPNG
- PNG_DEFINES= -DHasPNG
+ PNG_DEFINES= -DHasPNG -DHasZLIB
 -PNG_INCLUDES= -I$(TOP)/png -I$(TOP)/zlib
 -PNG_FLAGS= -L$(TOP)/png -L$(TOP)/zlib
 +PNG_INCLUDES= -I${LOCALBASE}/include
@@ -68,7 +69,7 @@
  TIFF_LIBRARIES= -ltiff
  #endif
  
-@@ -136,10 +136,10 @@
+@@ -140,10 +140,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.
  
@@ -79,7 +80,9 @@
 +LOCALDIR= $(PREFIX)/bin
 +LOCALINC= $(PREFIX)/include/magick
 +LOCALLIB= $(PREFIX)/lib
-+LOCALMAN= $(PREFIX)/man/cat1
++LOCALMAN1= $(PREFIX)/man/cat1
++LOCALMAN4= $(PREFIX)/man/cat4
++LOCALMAN5= $(PREFIX)/man/cat5
  
  MAGICKDIR= $(TOP)/magick
  MAGICK_INCLUDES= -I$(TOP)/magick
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
new file mode 100644
index 00000000000..522a421fe15
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -0,0 +1,42 @@
+--- Imakefile~	Sun Jan  4 05:24:10 1998
++++ Imakefile	Sat Jan 24 19:17:11 1998
+@@ -68,28 +68,28 @@
+ NormalProgramTarget(display,display.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
+ NormalLintTarget($(LINTSRCS))
+ InstallProgram(display,$(LOCALDIR))
+-InstallMultipleMan(display.1,$(LOCALMAN))
++InstallMultipleMan(display,$(LOCALMAN1))
+ NormalProgramTarget(montage,montage.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
+ InstallProgram(montage,$(LOCALDIR))
+-InstallMultipleMan(montage.1,$(LOCALMAN))
++InstallMultipleMan(montage,$(LOCALMAN1))
+ NormalProgramTarget(import,import.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
+ InstallProgram(import,$(LOCALDIR))
+-InstallMultipleMan(import.1,$(LOCALMAN))
++InstallMultipleMan(import,$(LOCALMAN1))
+ NormalProgramTarget(animate,animate.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
+ InstallProgram(animate,$(LOCALDIR))
+-InstallMultipleMan(animate.1,$(LOCALMAN))
++InstallMultipleMan(animate,$(LOCALMAN1))
+ NormalProgramTarget(convert,convert.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
+ InstallProgram(convert,$(LOCALDIR))
+-InstallMultipleMan(convert.1,$(LOCALMAN))
++InstallMultipleMan(convert,$(LOCALMAN1))
+ NormalProgramTarget(identify,identify.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
+ InstallProgram(identify,$(LOCALDIR))
+-InstallMultipleMan(identify.1,$(LOCALMAN))
++InstallMultipleMan(identify,$(LOCALMAN1))
+ NormalProgramTarget(mogrify,mogrify.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
+ InstallProgram(mogrify,$(LOCALDIR))
+-InstallMultipleMan(mogrify.1,$(LOCALMAN))
++InstallMultipleMan(mogrify,$(LOCALMAN1))
+ 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,$(LOCALMAN1))
++InstallMultipleMan(ImageMagick,$(LOCALMAN1))
++InstallMultipleMan(miff,$(LOCALMAN4))
++InstallMultipleMan(quantize,$(LOCALMAN5))
diff --git a/graphics/ImageMagick/patches/patch-ac b/graphics/ImageMagick/patches/patch-ac
new file mode 100644
index 00000000000..5a0bdf0385c
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ac
@@ -0,0 +1,9 @@
+--- ./xtp/Imakefile~	Sun Jan  4 05:01:33 1998
++++ ./xtp/Imakefile	Sat Jan 24 19:20:19 1998
+@@ -41,5 +41,5 @@
+ 
+ NormalProgramTarget(xtp,$(XTPObjects),NullParameter,NullParameter,NullParameter)
+ InstallProgram(xtp,$(LOCALDIR))
+-InstallMultipleMan(xtp.1,$(LOCALMAN))
++InstallMultipleMan(xtp,$(LOCALMAN1))
+ DependTarget()
diff --git a/graphics/ImageMagick/pkg/DESCR b/graphics/ImageMagick/pkg/DESCR
index 02210c15bc3..e156869209e 100644
--- a/graphics/ImageMagick/pkg/DESCR
+++ b/graphics/ImageMagick/pkg/DESCR
@@ -1,12 +1,12 @@
-ImageMagick TM, version 3.9.3, is a package for display and interactive
-manipulation of images for the X Window System. It is written in C and
-interfaces to the X library, and therefore does not require any proprietary
-toolkit in order to compile. Although the software is copyrighted, it is
-available for free and can be redistributed without fee. 
+ImageMagick TM, is a package for display and interactive manipulation
+of images for the X Window System.  It is written in C and interfaces
+to the X library, and therefore does not require any proprietary
+toolkit in order to compile.  Although the software is copyrighted, it
+is available for free and can be redistributed without fee. 
 
-The ImageMagick image display program can display an image on any workstation
-screen running an X server. It can read and write many of the more popular
-image formats including JPEG, TIFF, PNM, GIF, and Photo CD. In addition you
-can interactively resize, rotate, sharpen, color reduce, or add special
-effects to an image and save your completed work in the same or differing
-image format. 
+The ImageMagick image display program can display an image on any
+workstation screen running an X server.  It can read and write many of
+the more popular image formats including JPEG, TIFF, PNM, GIF, and
+Photo CD.  In addition you can interactively resize, rotate, sharpen,
+color reduce, or add special effects to an image and save your
+completed work in the same or differing image format. 
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index 4585191e875..c5ce2c24540 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1998/01/24 05:17:14 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/01/27 13:51:24 agc 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.3.9.3
+lib/libMagick.so.4.0.0
 @exec /sbin/ldconfig -m %B || /usr/bin/true
 @unexec /sbin/ldconfig -m %B || /usr/bin/true
 man/cat1/display.0
@@ -33,6 +33,6 @@ man/cat1/identify.0
 man/cat1/mogrify.0
 man/cat1/combine.0
 man/cat1/ImageMagick.0
-man/cat1/quantize.0
-man/cat1/miff.0
+man/cat5/quantize.0
+man/cat4/miff.0
 man/cat1/xtp.0