Modify to use pkg'd libtool instead of private copy. Give it proper

INSTALL_* macros in configure instead of patching around them.  Remove
aclocal directory if this is the last pkg using it.
Portlint: reformat DESCR to <80 columns.

4 files changed, 35 insertions, 22 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 40f5d010bc0..2322c5c0b84 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/07/02 15:30:15 perry Exp $
-#
-# taken from the FreeBSD port by jseger@FreeBSD.org
+# $NetBSD: Makefile,v 1.2 1998/07/17 19:39:42 tv Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
 #
 
@@ -10,7 +8,12 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	perry@piermont.com
 
+BUILD_DEPENDS=	${PREFIX}/bin/libtool:../../devel/libtool
+
 GNU_CONFIGURE=	YES
-MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV=	LIBTOOL=${PREFIX}/bin/libtool \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-.include "../../mk/bsd.pkg.mk"
\ No newline at end of file
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile/patches/patch-ab b/lang/guile/patches/patch-ab
index c2ebb3243fe..0455047eae9 100644
--- a/lang/guile/patches/patch-ab
+++ b/lang/guile/patches/patch-ab
@@ -1,10 +1,20 @@
---- libguile/Makefile.in.orig	Sun Nov  2 15:47:39 1997
-+++ libguile/Makefile.in	Sun Nov  2 15:47:48 1997
-@@ -40,7 +40,6 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = true
+--- configure.orig	Fri Jul 17 15:25:15 1998
++++ configure	Fri Jul 17 15:25:40 1998
+@@ -1167,7 +1167,7 @@
+ 
+ 
+ 
+-
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(top_builddir)/libtool'
+ 
+@@ -1216,7 +1216,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
++fi
+ 
+ echo $ac_n "checking for AIX""... $ac_c" 1>&6
+ echo "configure:1223: checking for AIX" >&5
diff --git a/lang/guile/pkg/DESCR b/lang/guile/pkg/DESCR
index 747952d59aa..f99ba642acd 100644
--- a/lang/guile/pkg/DESCR
+++ b/lang/guile/pkg/DESCR
@@ -1,5 +1,5 @@
-GUILE, GNU's Ubiquitous Intelligent Language for Extension, is a library that 
-implements the Scheme language plus various convenient facilities. It's designed
-so that you can link it into an application or utility to make it extensible. 
-Our plan is to link this library into all GNU programs that call for 
-extensibility.
+GUILE, GNU's Ubiquitous Intelligent Language for Extension, is a library
+that implements the Scheme language plus various convenient facilities.
+It's designed so that you can link it into an application or utility to
+make it extensible. Our plan is to link this library into all GNU programs
+that call for extensibility. 
diff --git a/lang/guile/pkg/PLIST b/lang/guile/pkg/PLIST
index 7588c6bc36a..b09cbf07171 100644
--- a/lang/guile/pkg/PLIST
+++ b/lang/guile/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/07/02 15:30:16 perry Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/07/17 19:39:42 tv Exp $
 bin/guile
 bin/guile-snarf
 include/guile/gh.h
@@ -82,7 +82,6 @@ include/libguile/threads.h
 include/libguile/coop-defs.h
 include/libguile.h
 lib/libguile.a
-lib/libguile.la
 lib/libguile.so.2.0
 share/aclocal/guile.m4
 share/aclocal/threads.m4
@@ -104,3 +103,4 @@ share/guile/1.2/ice-9/version.scm
 @dirrm share/guile/1.2/ice-9
 @dirrm share/guile/1.2
 @dirrm share/guile
+@unexec rmdir %D/share/aclocal 2>/dev/null || true