Upgrade to version 4.0.

3 files changed, 44 insertions, 40 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 7816ccc9b19f..70fd9a7cc026 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,12 +1,13 @@
+PATCH_STRIP=	-p0 -b
 # New ports collection makefile for:	ImageMagick
-# Version required:	3.9.2
+# Version required:	4.0
 # Date created:		15 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.22 1997/11/29 01:35:38 jseger Exp $
+# $Id: Makefile,v 1.23 1997/12/01 08:00:52 tg Exp $
 #
 
-DISTNAME=	ImageMagick-3.9.2
+DISTNAME=	ImageMagick-4.0
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
 		ftp://ftp.cci.fr/pub/unix/gfx/ImageMagick/ \
@@ -17,22 +18,24 @@ MASTER_SITES=	ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
 		ftp://ftp.oce.nl/pub/Internet/audio+video/ImageMagick/ \
 		http://hpux.csc.liv.ac.uk/hppd/hpux/X11/Viewers/ImageMagick-3.9.2/
 
-MAINTAINER=	jseger@freebsd.org
+MAINTAINER=	jseger@FreeBSD.org
 
 LIB_DEPENDS=    jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
 		mpeg\\.1\\.:${PORTSDIR}/graphics/mpeg-lib \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
 		png\\.0\\.:${PORTSDIR}/graphics/png \
-		jbig\\.0\\.:${PORTSDIR}/graphics/jbigkit
-
+		jbig\\.0\\.:${PORTSDIR}/graphics/jbigkit \
+		ttf\\.1\\.:${PORTSDIR}/print/freetype
+BUILD_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig \
+		picttoppm:${PORTSDIR}/graphics/netpbm \
+		gs:${PORTSDIR}/print/ghostscript5
+
+MAN1=	ImageMagick.1 animate.1 combine.1 convert.1 display.1 identify.1 import.1 mogrify.1 xtp.1
+MAN4=	miff.4
+MAN5=	quantize.5
 WRKSRC=		${WRKDIR}/ImageMagick
-USE_IMAKE=	YES
-
-post-patch:
-	@perl -pi -e "s|!!LOCALBASE!!|${LOCALBASE}|g;" ${WRKSRC}/Magick.tmpl
-
-pre-build:
-	@(cd ${WRKSRC}/magick; make)
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--enable-lzw
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 793dfd5cb5c5..59a5deb0d285 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-3.9.2.tar.gz) = 79603b0ae994046cf17bb98035b7aa0a
+MD5 (ImageMagick-4.0.tar.gz) = 71bb8846253789414e98e1476418cdaa
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 8412694f8144..ed40a070d6a2 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -1,36 +1,37 @@
-lib/libMagick.so.3.13
-@exec ldconfig -m %D/lib
-lib/libMagick.a
-man/man5/quantize.5.gz
-man/man5/miff.5.gz
-man/man1/display.1.gz
-man/man1/montage.1.gz
-man/man1/import.1.gz
-man/man1/animate.1.gz
-man/man1/convert.1.gz
-man/man1/identify.1.gz
-man/man1/mogrify.1.gz
-man/man1/combine.1.gz
-man/man1/ImageMagick.1.gz
-man/man1/xtp.1.gz
-bin/display
-bin/montage
-bin/import
 bin/animate
+bin/combine
 bin/convert
+bin/display
 bin/identify
+bin/import
 bin/mogrify
-bin/combine
+bin/montage
 bin/xtp
-include/magick/magick.h
-include/magick/image.h
-include/magick/gems.h
+include/magick/PreRvIcccm.h
+include/magick/X.h
 include/magick/compress.h
-include/magick/monitor.h
 include/magick/error.h
+include/magick/gems.h
+include/magick/image.h
+include/magick/magick.h
+include/magick/monitor.h
+include/magick/plug-ins.h
 include/magick/utility.h
-include/magick/X.h
 include/magick/widget.h
-include/magick/PreRvIcccm.h
-include/magick/plug-ins.h
+lib/libMagick.a
+lib/libMagick.la
+lib/libMagick.so
+lib/libMagick.so.4.0
+@exec ldconfig -m %D/lib
+man/man1/ImageMagick.1.gz
+man/man1/animate.1.gz
+man/man1/combine.1.gz
+man/man1/convert.1.gz
+man/man1/display.1.gz
+man/man1/identify.1.gz
+man/man1/import.1.gz
+man/man1/mogrify.1.gz
+man/man1/xtp.1.gz
+man/man4/miff.4.gz
+man/man5/quantize.5.gz
 @dirrm include/magick