USE_LIBTOOL & LTCONFIG_OVERRIDE instead of PKG_LIBTOOL and part of a

patch. Update PLIST.

4 files changed, 28 insertions, 26 deletions

diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile
index 8534a6d8de6..c5135a829e3 100644
--- a/graphics/gimp-current/Makefile
+++ b/graphics/gimp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/06/01 11:23:28 rh Exp $
+# $NetBSD: Makefile,v 1.13 2000/06/25 01:06:20 wiz Exp $
 
 DISTNAME=		gimp-1.1.18
 CATEGORIES=		graphics
@@ -19,7 +19,8 @@ DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 USE_X11BASE=		yes
 USE_GMAKE=		yes
-USE_PKGLIBTOOL=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE} \
 			--disable-perl \
diff --git a/graphics/gimp-current/files/patch-sum b/graphics/gimp-current/files/patch-sum
index c25be6f8049..d356e97b66c 100644
--- a/graphics/gimp-current/files/patch-sum
+++ b/graphics/gimp-current/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.5 2000/03/14 16:52:28 tron Exp $
+$NetBSD: patch-sum,v 1.6 2000/06/25 01:06:21 wiz Exp $
 
-MD5 (patch-aa) = 6dca8b3d6cf021d0bba9aef1b3c9ad06
+MD5 (patch-aa) = 526e1dea43c63a79235c1e2652c3482d
 MD5 (patch-ab) = 37b67cc506600f5229527da58747f8d7
 MD5 (patch-ac) = 2b688e4ce5da5794af580957219d6a99
 MD5 (patch-ad) = 9b247d142475bc190152375e51866ada
diff --git a/graphics/gimp-current/patches/patch-aa b/graphics/gimp-current/patches/patch-aa
index c8ac8f1c4a7..3fc25120ffd 100644
--- a/graphics/gimp-current/patches/patch-aa
+++ b/graphics/gimp-current/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/03/14 16:52:28 tron Exp $
+$NetBSD: patch-aa,v 1.4 2000/06/25 01:06:22 wiz Exp $
 
 --- configure.orig	Sat Mar  4 03:23:00 2000
 +++ configure	Tue Mar 14 16:16:27 2000
@@ -11,22 +11,6 @@ $NetBSD: patch-aa,v 1.3 2000/03/14 16:52:28 tron Exp $
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
-@@ -1360,6 +1360,7 @@
- *) lt_target="$target" ;;
- esac
- 
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1513,6 +1514,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.
 @@ -4302,8 +4304,8 @@
  
  
diff --git a/graphics/gimp-current/pkg/PLIST b/graphics/gimp-current/pkg/PLIST
index e9e3b9d6c65..5de019408fb 100644
--- a/graphics/gimp-current/pkg/PLIST
+++ b/graphics/gimp-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/03/14 16:52:29 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/06/25 01:06:22 wiz Exp $
 bin/gimp
 bin/gimp-config
 bin/gimptool
@@ -37,13 +37,21 @@ include/libgimp/parasiteF.h
 include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/gimp/1.1/modules/libcdisplay_gamma.a
-lib/gimp/1.1/modules/libcdisplay_gamma.so.0.0
+lib/gimp/1.1/modules/libcdisplay_gamma.la
+lib/gimp/1.1/modules/libcdisplay_gamma.so
+lib/gimp/1.1/modules/libcdisplay_gamma.so.0
 lib/gimp/1.1/modules/libcolorsel_gtk.a
-lib/gimp/1.1/modules/libcolorsel_gtk.so.0.0
+lib/gimp/1.1/modules/libcolorsel_gtk.la
+lib/gimp/1.1/modules/libcolorsel_gtk.so
+lib/gimp/1.1/modules/libcolorsel_gtk.so.0
 lib/gimp/1.1/modules/libcolorsel_triangle.a
-lib/gimp/1.1/modules/libcolorsel_triangle.so.0.0
+lib/gimp/1.1/modules/libcolorsel_triangle.la
+lib/gimp/1.1/modules/libcolorsel_triangle.so
+lib/gimp/1.1/modules/libcolorsel_triangle.so.0
 lib/gimp/1.1/modules/libcolorsel_water.a
-lib/gimp/1.1/modules/libcolorsel_water.so.0.0
+lib/gimp/1.1/modules/libcolorsel_water.la
+lib/gimp/1.1/modules/libcolorsel_water.so
+lib/gimp/1.1/modules/libcolorsel_water.so.0
 lib/gimp/1.1/plug-ins/AlienMap
 lib/gimp/1.1/plug-ins/AlienMap2
 lib/gimp/1.1/plug-ins/CEL
@@ -203,10 +211,19 @@ lib/gimp/1.1/plug-ins/xpm
 lib/gimp/1.1/plug-ins/xwd
 lib/gimp/1.1/plug-ins/zealouscrop
 lib/libgck.a
+lib/libgck.la
+lib/libgck.so
+lib/libgck.so.18
 lib/libgck.so.18.0
 lib/libgimp.a
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.18
 lib/libgimp.so.18.0
 lib/libgimpui.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.18
 lib/libgimpui.so.18.0
 share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
 share/locale/cs/LC_MESSAGES/gimp-script-fu.mo