7 files changed, 6 insertions, 69 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index ba40525b0d8..7404372e39b 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.87 2002/11/13 13:44:42 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2002/11/13 19:17:18 wiz Exp $
 
 DISTNAME=		ImageMagick-5.5.1-6
 PKGNAME=		${DISTNAME:S/-6/.6/}
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.nluug.nl/pub/ImageMagick/ \
 			ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
@@ -30,12 +31,6 @@ NOT_FOR_PLATFORM=	NetBSD-*-sparc64
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == NetBSD ||  ${OPSYS} == SunOS)
-BUILD_DEPENDS+=		bash>=2.0:../../shells/bash2
-
-CONFIGURE_SCRIPT=	${LOCALBASE}/bin/bash ./configure
-.endif
-
 # Avoid compiler bug on "arm32"
 .if (${MACHINE_ARCH} == arm32)
 CFLAGS=			-O
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index c9a85f645aa..006ea52a210 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/11/13 13:44:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/11/13 19:17:18 wiz Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/animate
@@ -64,14 +64,12 @@ lib/ImageMagick-5.5.1/type.mgk
 @exec ${MKDIR} %D/lib/ImageMagick-5.5.1/modules/coders
 lib/libMagick++.a
 lib/libMagick++.la
+lib/libMagick++-5.5.1.so
 lib/libMagick++.so
-lib/libMagick++.so.5
-lib/libMagick++.so.5.5
 lib/libMagick.a
 lib/libMagick.la
+lib/libMagick-5.5.1.so
 lib/libMagick.so
-lib/libMagick.so.5
-lib/libMagick.so.5.5
 man/man1/ImageMagick.1
 man/man1/Magick++-config.1
 man/man1/Magick-config.1
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 53a1ddea97a..d426839511b 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.10 2002/11/13 13:44:43 wiz Exp $
+$NetBSD: distinfo,v 1.11 2002/11/13 19:17:18 wiz Exp $
 
 SHA1 (ImageMagick-5.5.1-6.tar.bz2) = c5ddd8904332027e71264a3ea893720cbee06b4a
 Size (ImageMagick-5.5.1-6.tar.bz2) = 3328933 bytes
-SHA1 (patch-aa) = 953819eb591f7c30a121f14fccc57cecc070fedc
-SHA1 (patch-ab) = dd2844b849b72222f85ab903b4ba6a8171bbd4e2
 SHA1 (patch-ac) = fcc9b5518bf876a7937f3afb2d73f9a2a7948a74
 SHA1 (patch-ad) = 74f1acf61935cfaae3d2ea44a80f74598ed418b9
-SHA1 (patch-ae) = a6936bcbc0a377a498cd42e2d0c2e5e644fbdb29
-SHA1 (patch-af) = d77bd3331b5e2a7cb9d1437d2703781d4fe281a2
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
deleted file mode 100644
index ae3f57f7482..00000000000
--- a/graphics/ImageMagick/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.20 2002/11/13 13:44:43 wiz Exp $
-
---- Magick++/lib/Makefile.am.orig	Sat Oct 12 17:36:38 2002
-+++ Magick++/lib/Makefile.am
-@@ -26,7 +26,7 @@ libMagick___la_SOURCES = \
- 
- # Add -no-undefined once Cygwin supports throwing C++ exceptions from DLLs.
- libMagick___la_LDFLAGS = \
--	-release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
-+	-version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
- 
- libMagick___la_LIBADD = ../../magick/libMagick.la
- 
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
deleted file mode 100644
index 44a714e382c..00000000000
--- a/graphics/ImageMagick/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.14 2002/11/13 13:44:43 wiz Exp $
-
---- Magick++/lib/Makefile.in.orig	Thu Oct 17 04:38:16 2002
-+++ Magick++/lib/Makefile.in
-@@ -337,7 +337,7 @@ libMagick___la_SOURCES = \
- 
- # Add -no-undefined once Cygwin supports throwing C++ exceptions from DLLs.
- libMagick___la_LDFLAGS = \
--	-release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
-+	-version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
- 
- 
- libMagick___la_LIBADD = ../../magick/libMagick.la
diff --git a/graphics/ImageMagick/patches/patch-ae b/graphics/ImageMagick/patches/patch-ae
deleted file mode 100644
index 142c97b1e5a..00000000000
--- a/graphics/ImageMagick/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2002/11/13 13:44:44 wiz Exp $
-
---- magick/Makefile.am.orig	Sat Oct 12 22:56:34 2002
-+++ magick/Makefile.am
-@@ -44,7 +44,7 @@ INCLUDES = -I$(top_srcdir) $(INCLTDL)
- ALLMANPAGES = Magick-config.1
- 
- libMagick_la_LDFLAGS = -no-undefined \
--	-release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
-+	-version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
- 
- #AM_CFLAGS = @LIBRARY_EXTRA_CPPFLAGS@
- AM_CPPFLAGS = @LIBRARY_EXTRA_CPPFLAGS@
diff --git a/graphics/ImageMagick/patches/patch-af b/graphics/ImageMagick/patches/patch-af
deleted file mode 100644
index 5250655c313..00000000000
--- a/graphics/ImageMagick/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2002/11/13 13:44:44 wiz Exp $
-
---- magick/Makefile.in.orig	Thu Oct 17 04:37:54 2002
-+++ magick/Makefile.in
-@@ -359,7 +359,7 @@ INCLUDES = -I$(top_srcdir) $(INCLTDL)
- ALLMANPAGES = Magick-config.1
- 
- libMagick_la_LDFLAGS = -no-undefined \
--	-release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
-+	-version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
- 
- 
- #AM_CFLAGS = @LIBRARY_EXTRA_CPPFLAGS@