From 6e0c05032135f85018332563ebc1048e6b05b159 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 5 Mar 2006 16:27:22 +0000
Subject: * Teach the tools framework how to supply the pkgsrc version of  
 makeinfo if no native makeinfo executable exists.  Honor TEXINFO_REQD   when
 determining whether the native makeinfo can be used.

* Remove USE_MAKEINFO and replace it with USE_TOOLS+=makeinfo.

* Get rid of all the "split" argument deduction for makeinfo since
  the PLIST module already handles varying numbers of split info files
  correctly.

NOTE: Platforms that have "makeinfo" in the base system should check
      that the makeinfo entries of pkgsrc/mk/tools.${OPSYS}.mk are
      correct.
---
 shells/bash/Makefile       | 4 ++--
 shells/zsh/Makefile.common | 4 ++--
 shells/zsh3/Makefile       | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'shells')

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 8cd78736784..a8c1a3503de 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:30:39 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/05 16:27:28 jlam Exp $
 
 DISTNAME=	bash-3.1
 PKGNAME=	bash-3.1pl1
@@ -18,7 +18,7 @@ CONFLICTS=	static-bash-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_MAKEINFO=		yes
+USE_TOOLS+=		makeinfo
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index debd8c42f54..180b9b2b325 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2005/12/29 06:22:13 jlam Exp $
+# $NetBSD: Makefile.common,v 1.33 2006/03/05 16:27:28 jlam Exp $
 
 DISTNAME=       zsh-${ZSH_VERSION}
 CATEGORIES=	shells
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--enable-etcdir=${PKG_SYSCONFDIR:Q}
 
-USE_MAKEINFO=		yes
+USE_TOOLS+=		makeinfo
 INFO_FILES=		zsh.info
 TEXINFO_REQD=		4.0
 
diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile
index 7b2eb95123d..341704cbf34 100644
--- a/shells/zsh3/Makefile
+++ b/shells/zsh3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:39 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/05 16:27:28 jlam Exp $
 #
 
 DISTNAME=       zsh-3.0.8
@@ -15,8 +15,7 @@ HOMEPAGE=	http://sunsite.dk/zsh/
 COMMENT=	The Z shell
 
 GNU_CONFIGURE=	yes
-USE_MAKEINFO=	YES
-
+USE_TOOLS+=	makeinfo
 INFO_FILES=	zsh.info
 
 .include "../../mk/bsd.prefs.mk"
-- 
cgit v1.2.3