USE_LIBTOOL instead of PKGLIBTOOL.

4 files changed, 16 insertions, 46 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index b5df1a52715..adb4262c050 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2000/06/01 11:23:22 rh Exp $
+# $NetBSD: Makefile,v 1.36 2000/06/21 00:37:20 jlam Exp $
 
 DISTNAME=		libgtop-1.0.9
 CATEGORIES=		devel gnome
@@ -14,10 +14,11 @@ DEPENDS+=		guile-[0-9]*:../../lang/guile
 
 ONLY_FOR_PLATFORM=	NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k
 
-GNU_CONFIGURE=		yes
-USE_X11BASE=		yes
-USE_GMAKE=		yes
-USE_PKGLIBTOOL=		yes
+GNU_CONFIGURE=		# defined
+USE_X11BASE=		# defined
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 CFLAGS+=		-g
 CPPFLAGS+=		-I${LOCALBASE}/include
diff --git a/devel/libgtop/files/patch-sum b/devel/libgtop/files/patch-sum
index 571481d7880..a6f5cfd3430 100644
--- a/devel/libgtop/files/patch-sum
+++ b/devel/libgtop/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.12 2000/06/08 11:43:17 tron Exp $
+$NetBSD: patch-sum,v 1.13 2000/06/21 00:37:21 jlam Exp $
 
-MD5 (patch-aa) = 4a0b8a669f3a362fbf3cfdaa1036e2a2
 MD5 (patch-ab) = 1be0d48b1e41fea46ee459a320fb11c7
 MD5 (patch-ac) = f84a83914548206edccb11e1f84bf1bf
 MD5 (patch-ad) = 617e9e681d3576d14d2b9dd4185dfd68
diff --git a/devel/libgtop/patches/patch-aa b/devel/libgtop/patches/patch-aa
deleted file mode 100644
index 5c6345b109b..00000000000
--- a/devel/libgtop/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2000/05/30 19:35:41 drochner Exp $
-
---- configure.orig	Thu May 25 16:35:06 2000
-+++ configure	Sat May 27 14:47:02 2000
-@@ -2256,6 +2256,8 @@
- *) 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"
-@@ -2414,7 +2416,7 @@
- # clobbered by the next message.
- exec 5>>./config.log
- 
--
-+fi
- 
-   # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
- if test "${enable_compile_warnings+set}" = set; then
-@@ -5682,6 +5684,7 @@
- rm -f confcache
- 
- 
-+if false; then
- # Actually configure libtool.  ac_aux_dir is where install-sh is found.
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-@@ -5706,6 +5709,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/devel/libgtop/pkg/PLIST b/devel/libgtop/pkg/PLIST
index e1144ce2840..f52f18388da 100644
--- a/devel/libgtop/pkg/PLIST
+++ b/devel/libgtop/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2000/05/30 19:35:41 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2000/06/21 00:37:23 jlam Exp $
 bin/libgtop-config
 bin/libgtop_daemon
 bin/libgtop_server
@@ -51,21 +51,29 @@ info/libgtop.info
 @exec install-info %D/info/libgtop.info %D/info/dir
 lib/libgtop-features.def
 lib/libgtop.a
+lib/libgtop.la
 lib/libgtop.so.1.8
 lib/libgtopConf.sh
 lib/libgtop_common.a
+lib/libgtop_common.la
 lib/libgtop_common.so.1.8
 lib/libgtop_guile.a
+lib/libgtop_guile.la
 lib/libgtop_guile.so.1.8
 lib/libgtop_guile_names.a
+lib/libgtop_guile_names.la
 lib/libgtop_guile_names.so.1.8
 lib/libgtop_names.a
+lib/libgtop_names.la
 lib/libgtop_names.so.1.8
 lib/libgtop_suid_common.a
+lib/libgtop_suid_common.la
 lib/libgtop_suid_common.so.1.8
 lib/libgtop_sysdeps.a
+lib/libgtop_sysdeps.la
 lib/libgtop_sysdeps.so.1.8
 lib/libgtop_sysdeps_suid.a
+lib/libgtop_sysdeps_suid.la
 lib/libgtop_sysdeps_suid.so.1.8
 share/locale/da/LC_MESSAGES/libgtop.mo
 share/locale/de/LC_MESSAGES/libgtop.mo