USE_LIBTOOL instead of PKGLIBTOOL.

4 files changed, 34 insertions, 56 deletions

diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index efa8437e4a5..05a7a979f3e 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:21 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/21 01:09:06 jlam Exp $
 #
 
-DISTNAME=	guile-gtk-0.17
-CATEGORIES=	devel x11 gnome
-MASTER_SITES=	http://www.ping.de/sites/zagadka/guile-gtk/download/ \
-		http://erin.netpedia.net/download/ \
-		http://erin.linuxbox.com/guile-gtk/download/ \
-		http://linux.cem.itesm.mx/~jarios/guile-gtk/download/
+DISTNAME=		guile-gtk-0.17
+CATEGORIES=		devel x11 gnome
+MASTER_SITES=		http://www.ping.de/sites/zagadka/guile-gtk/download/ \
+			http://erin.netpedia.net/download/ \
+			http://erin.linuxbox.com/guile-gtk/download/ \
+			http://linux.cem.itesm.mx/~jarios/guile-gtk/download/
 
-MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://www.ping.de/sites/zagadka/guile-gtk/
+MAINTAINER=		rh@netbsd.org
+HOMEPAGE=		http://www.ping.de/sites/zagadka/guile-gtk/
 
-DEPENDS+=	gnome-core-*:../../x11/gnome-core
-DEPENDS+=	guile-1.3.*:../../lang/guile
+DEPENDS+=		gnome-core-*:../../x11/gnome-core
+DEPENDS+=		guile-1.3.*:../../lang/guile
 
-GNU_CONFIGURE=	YES
-USE_PKGLIBTOOL=	YES
-USE_X11=	YES
+GNU_CONFIGURE=		# defined
+USE_X11=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-gtk/files/patch-sum b/devel/guile-gtk/files/patch-sum
index 23aaa5628ad..376a38b837d 100644
--- a/devel/guile-gtk/files/patch-sum
+++ b/devel/guile-gtk/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:39 danw Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/21 01:09:07 jlam Exp $
 
-MD5 (patch-aa) = 8639ad22d0903f08634fd64eeda2f5ee
+MD5 (patch-aa) = 60b88d1a54ed59e3c8fd80fabcfcfae9
 MD5 (patch-ab) = d28b87615af6c07fcc7a5a79933f103d
diff --git a/devel/guile-gtk/patches/patch-aa b/devel/guile-gtk/patches/patch-aa
index a63638843f4..98a77f7224f 100644
--- a/devel/guile-gtk/patches/patch-aa
+++ b/devel/guile-gtk/patches/patch-aa
@@ -1,33 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2000/05/02 18:48:39 danw Exp $
+$NetBSD: patch-aa,v 1.3 2000/06/21 01:09:07 jlam Exp $
 
---- configure.orig	Sun Oct 17 01:16:57 1999
-+++ configure	Sun Dec 19 18:46:02 1999
-@@ -1316,7 +1316,7 @@
-   echo "$ac_t""no" 1>&6
- 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"
-@@ -1414,6 +1414,7 @@
- # --recheck option to rerun configure.
- #
- EOF
-+
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
- # So, don't put newlines in cache variables' values.
-@@ -1470,6 +1471,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.
-@@ -2562,7 +2564,7 @@
+--- configure.orig	Sat Oct 16 19:16:57 1999
++++ configure	Tue Jun 20 20:59:41 2000
+@@ -2562,7 +2562,7 @@
  
  echo $ac_n "checking whether libtool wins""... $ac_c" 1>&6
  echo "configure:2565: checking whether libtool wins" >&5
diff --git a/devel/guile-gtk/pkg/PLIST b/devel/guile-gtk/pkg/PLIST
index c38aae84a3c..7b0c76c26bb 100644
--- a/devel/guile-gtk/pkg/PLIST
+++ b/devel/guile-gtk/pkg/PLIST
@@ -1,21 +1,23 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/12/20 11:58:46 rh Exp $
-bin/guile-gtk-1.2
+@comment $NetBSD: PLIST,v 1.2 2000/06/21 01:09:07 jlam Exp $
 bin/build-guile-gtk
 bin/guile-gtk
+bin/guile-gtk-1.2
 include/guile-gtk.h
-lib/libguilegtk-1.2.so.0.0
-lib/libguilegtk-1.2.a
-lib/libguiledlopenhelper.so.0.0
 lib/libguiledlopenhelper.a
-share/guile/gtk-1.2/gtk.scm
+lib/libguiledlopenhelper.la
+lib/libguiledlopenhelper.so.0.0
+lib/libguilegtk-1.2.a
+lib/libguilegtk-1.2.la
+lib/libguilegtk-1.2.so.0.0
+share/guile-gtk/gdk-1.2.defs
+share/guile-gtk/gtk-1.2.defs
 share/guile/gtk-1.2/gdk.scm
-share/guile/gtk/gtk.scm
-share/guile/gtk/gdk.scm
-share/guile/gtk/dynlink.scm
+share/guile/gtk-1.2/gtk.scm
 share/guile/gtk/config.scm
+share/guile/gtk/dynlink.scm
 share/guile/gtk/event-repl.scm
-share/guile-gtk/gtk-1.2.defs
-share/guile-gtk/gdk-1.2.defs
+share/guile/gtk/gdk.scm
+share/guile/gtk/gtk.scm
 @dirrm share/guile/gtk-1.2
 @dirrm share/guile/gtk
 @dirrm share/guile-gtk