USE_LIBTOOL and LTCONFIG_OVERRIDE, instead of pkglibtool and patching

configure scripts.

5 files changed, 14 insertions, 53 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index cf9856dce0c..79141bfa35e 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:33 rh Exp $
+# $NetBSD: Makefile,v 1.17 2000/06/09 08:09:42 jlam Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
 #
 
-DISTNAME=	guile-1.3.4
-CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU:=guile/}
+DISTNAME=		guile-1.3.4
+CATEGORIES=		lang
+MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
-MAINTAINER=	perry@piermont.com
-HOMEPAGE=	http://www.gnu.org/software/guile/guile.html
+MAINTAINER=		perry@piermont.com
+HOMEPAGE=		http://www.gnu.org/software/guile/guile.html
 
-USE_PKGLIBTOOL=	yes
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-INFO_FILES=	data-rep.info
+INFO_FILES=		data-rep.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile/files/patch-sum b/lang/guile/files/patch-sum
index b640cab0b13..589cf427eae 100644
--- a/lang/guile/files/patch-sum
+++ b/lang/guile/files/patch-sum
@@ -1,5 +1,3 @@
-$NetBSD: patch-sum,v 1.4 1999/12/20 11:55:16 rh Exp $
+$NetBSD: patch-sum,v 1.5 2000/06/09 08:09:43 jlam Exp $
 
-MD5 (patch-aa) = 91055ac93a313e7072b5257d28dec64c
-MD5 (patch-ac) = 041b714c85e6485bab451d8faf4bb33f
 MD5 (patch-ad) = 1854e0c1d449008d16810f9db5a1e08f
diff --git a/lang/guile/patches/patch-aa b/lang/guile/patches/patch-aa
deleted file mode 100644
index 02a93d10f18..00000000000
--- a/lang/guile/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.5 1999/12/20 11:55:17 rh Exp $
-
---- configure.orig	Sat Sep 25 16:50:16 1999
-+++ configure	Sun Dec 19 13:25:45 1999
-@@ -1782,13 +1782,14 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
--
-+fi
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
- echo "configure:1795: checking for working const" >&5
diff --git a/lang/guile/patches/patch-ac b/lang/guile/patches/patch-ac
deleted file mode 100644
index 6f6c1d6860f..00000000000
--- a/lang/guile/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/08/29 21:42:04 jlam Exp $
-
---- guile-readline/configure.orig	Wed Aug 25 07:15:20 1999
-+++ guile-readline/configure	Sun Aug 29 14:07:18 1999
-@@ -1450,13 +1450,14 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
--
-+fi
- 
- for termlib in ncurses termcap ; do
-    echo $ac_n "checking for tgoto in -l${termlib}""... $ac_c" 1>&6
diff --git a/lang/guile/pkg/PLIST b/lang/guile/pkg/PLIST
index c82e0fa2183..39dfac553e0 100644
--- a/lang/guile/pkg/PLIST
+++ b/lang/guile/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 1999/12/20 11:55:17 rh Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/06/09 08:09:44 jlam Exp $
 bin/guile
 bin/guile-config
 bin/guile-snarf
@@ -92,8 +92,10 @@ include/libguile/weaks.h
 info/data-rep.info
 @exec install-info %D/info/data-rep.info %D/info/dir
 lib/libguile.a
+lib/libguile.la
 lib/libguile.so.6.0
 lib/libguilereadline.a
+lib/libguilereadline.la
 lib/libguilereadline.so.0.0
 share/aclocal/guile.m4
 share/aclocal/qthreads.m4