version bump

4 files changed, 39 insertions, 23 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 9c83b8456e47..f202df84854b 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.12 2002/06/29 14:38:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.13 2002/07/09 04:27:58 seemant Exp $
+
+*imagemagick-5.4.7 (08 Jul 2002)
+
+  08 Jul 2002; Seemant Kulleen <seemant@gentoo.org> imagemagick-5.4.7.ebuild
+  files/digest-imagemagick-5.4.7 :
+
+  Version bump.
 
 *imagemagick-5.4.6 (29 Jun 2002)
 
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.4.5 b/media-gfx/imagemagick/files/digest-imagemagick-5.4.5
deleted file mode 100644
index 31b8ca6f0f8d..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b92fbc5fd662e790af0363ba4338dc0b ImageMagick-5.4.5-1.tar.gz 3874047
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.4.7 b/media-gfx/imagemagick/files/digest-imagemagick-5.4.7
new file mode 100644
index 000000000000..693df6a4434d
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-5.4.7
@@ -0,0 +1 @@
+MD5 2059a2dad90a797cd6bb26734b37bb45 ImageMagick-5.4.7-1.tar.bz2 2897178
diff --git a/media-gfx/imagemagick/imagemagick-5.4.5.ebuild b/media-gfx/imagemagick/imagemagick-5.4.7.ebuild
index ffa09772239b..bd1c198a8632 100644
--- a/media-gfx/imagemagick/imagemagick-5.4.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.4.7.ebuild
@@ -1,15 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.5.ebuild,v 1.1 2002/05/06 17:27:21 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.7.ebuild,v 1.1 2002/07/09 04:27:58 seemant Exp $
+
+inherit libtool
+inherit perl-module
 
 MY_PN=ImageMagick
 MY_P=${MY_PN}-${PV}-1
 S=${WORKDIR}/${MY_PN}-${PV}
 DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="http://imagemagick.sourceforge.net/http/${MY_P}.tar.gz"
+SRC_URI="http://imagemagick.sourceforge.net/http/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.imagemagick.org/"
 SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
 
 DEPEND="X? ( virtual/x11
 	>=app-text/dgs-0.5.9.1 )
@@ -26,7 +30,7 @@ DEPEND="X? ( virtual/x11
 
 
 src_compile() {
-	libtoolize --copy --force
+	elibtoolize
 
 	local myconf=""
 	use perl || myconf="--without-perl"
@@ -38,8 +42,7 @@ src_compile() {
 	cp configure configure.orig
 	sed -e 's:netscape:mozilla:g' configure.orig > configure
 
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
+	econf \
 		--enable-shared \
 		--enable-static \
 		--enable-lzw \
@@ -50,29 +53,35 @@ src_compile() {
 		--without-jbig \
 		--without-wmf \
 		--with-threads \
-		--build=${CHOST} \
 		${myconf} || die "bad configure"
 
 	emake || die "compile problem"
 }
 
 src_install() {
+	
+	myinst="prefix=${D}/usr PREFIX=${D}/usr"
+	myinst="${myinst} MagickSharePath=${D}/usr/share/ImageMagick/"
+	myinst="${myinst} pkgdocdir=${D}/usr/share/doc/${PF}/html"
+	myinst="${myinst} mandir=${D}/usr/share/man"
+	myinst="${myinst} datadir=${D}/usr/share"
 
-	make prefix=${D}/usr \
-		PREFIX=${D}/usr \
-		INSTALLPRIVLIB=${D}/usr/lib/perl5 \
-		INSTALLSCRIPT=${D}/usr/bin \
-		INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
-		INSTALLBIN=${D}/usr/bin \
-		INSTALLMAN1DIR=${D}/usr/share/man/man1  \
-		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		mandir=${D}/usr/share/man \
-		MagickSharePath=${D}/usr/share/ImageMagick/ \
-		pkgdocdir=${D}/usr/share/doc/${PF}/html \
-		install || die "install problem"
+	mydoc="*.txt"
+#	make prefix=${D}/usr \
+#		PREFIX=${D}/usr \
+#		INSTALLPRIVLIB=${D}/usr/lib/perl5 \
+#		INSTALLSCRIPT=${D}/usr/bin \
+#		INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
+#		INSTALLBIN=${D}/usr/bin \
+#		INSTALLMAN1DIR=${D}/usr/share/man/man1  \
+#		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+#		mandir=${D}/usr/share/man \
+#		MagickSharePath=${D}/usr/share/ImageMagick/ \
+#		pkgdocdir=${D}/usr/share/doc/${PF}/html \
+#		install || die "install problem"
 
+	base_src_install
+	
 	rm -f ${D}/usr/share/ImageMagick/*.txt
 
-	dodoc Copyright.txt PLATFORMS.txt QuickStart.txt README.txt TODO.txt
 }
-