USE_PKGLIBTOOL -> USE_LIBTOOL.

LTCONFIG_OVERRIDE removes need for a patch.

4 files changed, 22 insertions, 34 deletions

diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 3f8e07a5703..a5afea96769 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:45 rh Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/15 14:17:44 wiz Exp $
 
-DISTNAME=	gtk-engines-0.8
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gtk-engines/}
+DISTNAME=		gtk-engines-0.8
+CATEGORIES=		x11
+MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gtk-engines/}
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=	imlib-*:../../graphics/imlib
+DEPENDS+=		imlib-*:../../graphics/imlib
 
-GNU_CONFIGURE=	yes
-USE_X11BASE=	yes
-USE_PKGLIBTOOL=	yes
+GNU_CONFIGURE=		yes
+USE_X11BASE=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk-engines/files/patch-sum b/x11/gtk-engines/files/patch-sum
index 97042911ca2..0bc26ca904e 100644
--- a/x11/gtk-engines/files/patch-sum
+++ b/x11/gtk-engines/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/11/20 13:37:46 tron Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/15 14:17:44 wiz Exp $
 
-MD5 (patch-aa) = 30d9b9f1f50fc252d1092205a93511ec
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/x11/gtk-engines/patches/patch-aa b/x11/gtk-engines/patches/patch-aa
deleted file mode 100644
index 28b1e771b4e..00000000000
--- a/x11/gtk-engines/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/20 13:37:47 tron Exp $
-
---- configure.orig	Tue Oct  5 21:06:56 1999
-+++ configure	Sat Nov 20 14:05:21 1999
-@@ -1517,6 +1517,7 @@
- fi
- 
- 
-+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"
-@@ -1670,6 +1671,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.
diff --git a/x11/gtk-engines/pkg/PLIST b/x11/gtk-engines/pkg/PLIST
index 83ceeaa0d98..ca74320b190 100644
--- a/x11/gtk-engines/pkg/PLIST
+++ b/x11/gtk-engines/pkg/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/11/20 13:37:47 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/08/15 14:17:45 wiz Exp $
 lib/gtk/themes/engines/libmetal.a
+lib/gtk/themes/engines/libmetal.la
 lib/gtk/themes/engines/libmetal.so.0.0
 lib/gtk/themes/engines/libnotif.a
+lib/gtk/themes/engines/libnotif.la
 lib/gtk/themes/engines/libnotif.so.0.0
 lib/gtk/themes/engines/libpixmap.a
+lib/gtk/themes/engines/libpixmap.la
 lib/gtk/themes/engines/libpixmap.so.0.0
 lib/gtk/themes/engines/libredmond95.a
+lib/gtk/themes/engines/libredmond95.la
 lib/gtk/themes/engines/libredmond95.so.0.0
 share/themes/Metal/ICON.png
 share/themes/Metal/README.html
@@ -96,4 +100,4 @@ share/themes/Redmond95/gtk/gtkrc
 @dirrm share/themes/Notif
 @dirrm share/themes/Metal/gtk
 @dirrm share/themes/Metal
-@unexec rmdir %D/lib/gtk/themes/engines %D/lib/gtk/themes %D/lib/gtk 2>/dev/null || true
+@unexec rmdir %D/lib/gtk/themes/engines %D/lib/gtk/themes %D/lib/gtk %D/share/themes 2>/dev/null || true