Changes 5.7.7-17:

* Bug fixes (memory leaks)

6 files changed, 41 insertions, 43 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index d8cb56ba791..2a1d0c1fe59 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.112 2004/02/27 08:51:44 grant Exp $
+# $NetBSD: Makefile,v 1.113 2004/03/02 10:31:48 adam Exp $
 
 .include "Makefile.common"
 
-PKGNAME=		ImageMagick-${DISTVERSION}
-PKGREVISION=		2
-CATEGORIES=		graphics
+PKGNAME=	ImageMagick-${DISTVERSION}
 
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.simplesystems.org/ImageMagick/
-COMMENT=		Package for display and interactive manipulation of images
+MAINTAINER=	tron@NetBSD.org
+HOMEPAGE=	http://www.simplesystems.org/ImageMagick/
+COMMENT=	Package for display and interactive manipulation of images
 
-DEPENDS+=		mpeg2codec-1.2:../../graphics/mpeg2codec
+DEPENDS+=	mpeg2codec-1.2:../../graphics/mpeg2codec
 
-CONFLICTS=		geomview<1.8.1nb2  # used to have a program named 'animate'
+CONFLICTS=	geomview<1.8.1nb2  # used to have a program named 'animate'
 
 USE_BUILDLINK3=		YES
 USE_X11=		YES
@@ -41,10 +39,14 @@ CFLAGS=			-O
 # Some configure_args come from Makefile.common
 CONFIGURE_ARGS+=	--without-perl
 
+# Remove the empty directory
+post-install:
+	${RMDIR} ${PREFIX}/share/ImageMagick
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
+.include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index f57bde2bfce..5508c2ad7a2 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,34 +1,29 @@
-# $NetBSD: Makefile.common,v 1.7 2004/01/20 12:18:15 agc Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/03/02 10:31:48 adam Exp $
 
 IM_MAJOR_VER=		5.5.7
-IM_MINOR_VER=		11
+IM_MINOR_VER=		17
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
-DISTSUFFIX=		${IM_MAJOR_VER}-${IM_MINOR_VER}
+DISTSUFFIX=	${IM_MAJOR_VER}-${IM_MINOR_VER}
 .else
-DISTSUFFIX=		${IM_MAJOR_VER}
+DISTSUFFIX=	${IM_MAJOR_VER}
 .endif
 
-DISTNAME=		ImageMagick-${DISTSUFFIX}
-DISTVERSION=		${DISTSUFFIX:S/-/./}
+DISTNAME=	ImageMagick-${DISTSUFFIX}
+DISTVERSION=	${DISTSUFFIX:S/-/./}
 
-PKGREVISION=		1
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.imagemagick.net/pub/ImageMagick/ \
+		ftp://ftp.nluug.nl/pub/ImageMagick/ \
+		ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
+		ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
+		ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/
+EXTRACT_SUFX=	.tar.bz2
 
-CATEGORIES=		graphics
-MASTER_SITES=		ftp://ftp.nluug.nl/pub/ImageMagick/ \
-			ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
-			ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
-			ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/
-EXTRACT_SUFX=		.tar.bz2
-
-WRKSRC=			${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
+WRKSRC=		${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
 
 # For things for which we do not specify an explicit dependency above, disable
-# so that we don't cause implicit "hidden" dependencies.  Users may reenable
-# any of these manually as desired (PerlMagick should probably be a separate
-# pkg, however).
-CONFIGURE_ARGS+=	--without-dps --without-fpx \
-			--without-hdf --without-jbig --without-jp2 \
-			--without-threads --without-ttf --without-wmf \
-			--without-xml --without-lcms
+# so that we don't cause implicit "hidden" dependencies.
+CONFIGURE_ARGS+=	--without-dps --without-fpx --without-hdf \
+			--without-jbig --without-threads --without-lcms
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index d0475fca33c..4ac52ab7bfd 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.12 2004/02/27 08:51:15 grant Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/03/02 10:31:48 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/animate
 bin/composite
+bin/conjure
 bin/convert
 bin/display
 bin/identify
diff --git a/graphics/ImageMagick/buildlink2.mk b/graphics/ImageMagick/buildlink2.mk
index 82019fd5de2..02beb2f700d 100644
--- a/graphics/ImageMagick/buildlink2.mk
+++ b/graphics/ImageMagick/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/01/03 18:49:41 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/03/02 10:31:48 adam Exp $
 
 .if !defined(IMAGEMAGICK_BUILDLINK2_MK)
 IMAGEMAGICK_BUILDLINK2_MK=	# defined
@@ -17,8 +17,8 @@ BUILDLINK_FILES.ImageMagick+=	lib/libMagick++.*
 
 .include "../../archivers/bzip2/buildlink2.mk"
 .include "../../graphics/jasper/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/libexif/buildlink2.mk"
+.include "../../graphics/libwmf/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	ImageMagick-buildlink
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index abbf6882383..a1f9e21b87f 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 09:10:15 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/02 10:31:48 adam Exp $
 #
 # This Makefile fragment is included by packages that use ImageMagick.
 #
@@ -19,8 +19,8 @@ BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
+.include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
 .endif # IMAGEMAGICK_BUILDLINK3_MK
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 36f22d24f42..22221d0722a 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2003/09/30 18:20:01 mycroft Exp $
+$NetBSD: distinfo,v 1.18 2004/03/02 10:31:48 adam Exp $
 
-SHA1 (ImageMagick-5.5.7-11.tar.bz2) = 7eebbfbf3917cd4edcda782482e44a618708d687
-Size (ImageMagick-5.5.7-11.tar.bz2) = 4214196 bytes
+SHA1 (ImageMagick-5.5.7-17.tar.bz2) = 27ca356c2e3e25943b09c6664ad73e278c08033b
+Size (ImageMagick-5.5.7-17.tar.bz2) = 4562452 bytes