USE_LIBTOOL instead of PKGLIBTOOL.

4 files changed, 27 insertions, 40 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index f61f05cfc1a..8b30c79e50b 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,26 +1,28 @@
-# $NetBSD: Makefile,v 1.57 2000/06/01 11:23:26 rh Exp $
+# $NetBSD: Makefile,v 1.58 2000/06/21 02:45:15 jlam Exp $
 
-DISTNAME=	ImageMagick-5.1.1
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=		ImageMagick-5.1.1
+CATEGORIES=		graphics
+MASTER_SITES=		${MASTER_SITE_LOCAL}
+EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.wizards.dupont.com/cristy/ImageMagick.html
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.wizards.dupont.com/cristy/ImageMagick.html
 
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	mpeg2codec-1.2:../../graphics/mpeg2codec
-DEPENDS+=	png>=1.0.6:../../graphics/png
-DEPENDS+=	tiff-*:../../graphics/tiff
+DEPENDS+=		jpeg-6b:../../graphics/jpeg
+DEPENDS+=		mpeg2codec-1.2:../../graphics/mpeg2codec
+DEPENDS+=		png>=1.0.6:../../graphics/png
+DEPENDS+=		tiff-*:../../graphics/tiff
 
-MIRROR_DISTFILE= no
-USE_PKGLIBTOOL=	yes
-USE_X11=	yes
-GNU_CONFIGURE=	yes
+MIRROR_DISTFILE=	no
+
+GNU_CONFIGURE=		# defined
+USE_X11=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 # Avoid compiler bug on "arm32"
 .if (${MACHINE_ARCH} == arm32)
-CFLAGS=		-O
+CFLAGS=			-O
 .endif
 
 # For things for which we do not specify an explicit dependency above, disable
diff --git a/graphics/ImageMagick/files/patch-sum b/graphics/ImageMagick/files/patch-sum
index 19161da9590..d2a39219d55 100644
--- a/graphics/ImageMagick/files/patch-sum
+++ b/graphics/ImageMagick/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/03/21 22:18:24 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/21 02:45:17 jlam Exp $
 
-MD5 (patch-aa) = ad8a064f1e13a16800e93d98b39659f8
+MD5 (patch-aa) = 3eb6f5bb131b2150cf371a9195fb20b4
 MD5 (patch-ab) = 53267446ee149dc4e2291fad62464f0a
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index d56261df80e..69d0f0e7c8f 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,24 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2000/03/21 22:18:24 tron Exp $
+$NetBSD: patch-aa,v 1.13 2000/06/21 02:45:17 jlam Exp $
 
---- configure.orig	Fri Feb  4 23:41:28 2000
-+++ configure	Tue Mar 21 22:21:52 2000
-@@ -1673,6 +1673,7 @@
- # Must also pass -no-undefined to libtool in Makefile
- # AC_LIBTOOL_WIN32_DLL
- 
-+if false; then
- # Configure libtool
- # Check whether --enable-shared or --disable-shared was given.
- if test "${enable_shared+set}" = set; then
-@@ -2057,6 +2058,7 @@
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -4303,6 +4305,7 @@
+--- configure.orig	Fri Feb  4 17:41:28 2000
++++ configure	Tue Jun 20 22:29:55 2000
+@@ -4303,6 +4303,7 @@
  # Find Posix threads library
  #
  LIB_THREAD=''
@@ -26,7 +10,7 @@ $NetBSD: patch-aa,v 1.12 2000/03/21 22:18:24 tron Exp $
  echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
  echo "configure:4308: checking for pthread_attr_init in -lpthread" >&5
  ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
-@@ -4346,6 +4349,7 @@
+@@ -4346,6 +4347,7 @@
     DEF_THREAD="-D_REENTRANT"
  else
    echo "$ac_t""no" 1>&6
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index 0116a597b9f..4611af67c39 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2000/03/21 22:18:24 tron Exp $
+@comment $NetBSD: PLIST,v 1.24 2000/06/21 02:45:18 jlam Exp $
 bin/Magick-config
 bin/animate
 bin/combine
@@ -28,6 +28,7 @@ include/magick/utility.h
 include/magick/version.h
 include/magick/xwindows.h
 lib/libMagick.a
+lib/libMagick.la
 lib/libMagick.so.5.11
 man/man1/ImageMagick.1
 man/man1/animate.1