USE_LIBTOOL instead of PKGLIBTOOL.

3 files changed, 29 insertions, 35 deletions

diff --git a/misc/gnucash/Makefile b/misc/gnucash/Makefile
index 468e8107e18..288181c2680 100644
--- a/misc/gnucash/Makefile
+++ b/misc/gnucash/Makefile
@@ -1,32 +1,35 @@
-# $NetBSD: Makefile,v 1.12 2000/06/01 11:23:35 rh Exp $
+# $NetBSD: Makefile,v 1.13 2000/06/21 05:38:21 jlam Exp $
 #
 
-DISTNAME=       gnucash-1.3.7
-CATEGORIES=	misc
-MASTER_SITES=   ftp://ftp.gnucash.org/pub/gnucash/sources/unstable/1.3.x/
+DISTNAME=		gnucash-1.3.7
+CATEGORIES=		misc
+MASTER_SITES=		ftp://ftp.gnucash.org/pub/gnucash/sources/unstable/1.3.x/
 
-MAINTAINER=	drankin@bohemians.lexington.ky.us
-HOMEPAGE=	http://www.gnucash.org/
+MAINTAINER=		drankin@bohemians.lexington.ky.us
+HOMEPAGE=		http://www.gnucash.org/
 
-DEPENDS+=	gnome-libs>=1.0.40:../../x11/gnome-libs
-DEPENDS+=	gettext>=0.10.35:../../devel/gettext
-DEPENDS+=	eperl-2.2.14:../../textproc/eperl
-DEPENDS+=	libperl-5.00404:../../lang/libperl
-DEPENDS+=	guile-1.3.*:../../lang/guile
-DEPENDS+=	guile-slib-2c7:../../devel/guile-slib
-DEPENDS+=	swig-1.1p5:../../devel/swig
-DEPENDS+=	libxml>=1.8.5:../../textproc/libxml
+DEPENDS+=		gnome-libs>=1.0.40:../../x11/gnome-libs
+DEPENDS+=		gettext>=0.10.35:../../devel/gettext
+DEPENDS+=		eperl-2.2.14:../../textproc/eperl
+DEPENDS+=		libperl-5.00404:../../lang/libperl
+DEPENDS+=		guile-1.3.*:../../lang/guile
+DEPENDS+=		guile-slib-2c7:../../devel/guile-slib
+DEPENDS+=		swig-1.1p5:../../devel/swig
+DEPENDS+=		libxml>=1.8.5:../../textproc/libxml
 
-USE_X11=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-guile-config=${LOCALBASE}/bin/guile-config \
-	--without-motif --without-included-gettext \
-   --with-perl-includes=${LOCALBASE}/lib/perl5/${MACHINE_ARCH}-netbsd/5.00404
+USE_GMAKE=		# defined
+USE_PERL=		# defined
+USE_X11=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/lib/g-wrap/ltconfig
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-guile-config=${LOCALBASE}/bin/guile-config
+CONFIGURE_ARGS+=	--without-motif --without-included-gettext
+CONFIGURE_ARGS+= \
+    --with-perl-includes=${LOCALBASE}/lib/perl5/${MACHINE_ARCH}-netbsd/5.00404
 CONFIGURE_ENV+=	"LOCALBASE=${LOCALBASE}"
-USE_GMAKE=	yes
-USE_PERL=	yes
-USE_PKGLIBTOOL=	yes
 
-ALL_TARGET=	gnome
+ALL_TARGET=		gnome
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnucash/files/patch-sum b/misc/gnucash/files/patch-sum
index 27569315f09..48313c5bdf1 100644
--- a/misc/gnucash/files/patch-sum
+++ b/misc/gnucash/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/05/13 06:21:02 rh Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/21 05:38:23 jlam Exp $
 
 MD5 (patch-aa) = cba09025966ce8d716121a52b34d111e
 MD5 (patch-ab) = ec8365eaadeed38e48a375985add1fa0
@@ -8,4 +8,4 @@ MD5 (patch-ae) = dd79e34570aaa07adbba367661f59b9d
 MD5 (patch-af) = fdf1033c63922b08d2c47667ae37b044
 MD5 (patch-ag) = 75c00d2c75c5bdf239e86375ffe01b07
 MD5 (patch-ah) = 0cb264b879ddba6580507031166ee125
-MD5 (patch-ai) = d804d2dea0d174cae64f95aed7d29f9c
+MD5 (patch-ai) = bf7607a5aa8aeea261a14a799a9fbf52
diff --git a/misc/gnucash/patches/patch-ai b/misc/gnucash/patches/patch-ai
index 68b69d39b7b..37356e10397 100644
--- a/misc/gnucash/patches/patch-ai
+++ b/misc/gnucash/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2000/05/13 06:21:02 rh Exp $
+$NetBSD: patch-ai,v 1.2 2000/06/21 05:38:23 jlam Exp $
 
 --- lib/g-wrap/configure.orig	Fri Mar 31 04:55:10 2000
 +++ lib/g-wrap/configure	Thu May  4 11:04:27 2000
@@ -20,12 +20,3 @@ $NetBSD: patch-ai,v 1.1 2000/05/13 06:21:02 rh Exp $
        break
      fi
    done
-@@ -1552,7 +1552,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.