From 3267e7911c7c98c43cab67353d54b0b9dafa5191 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.
---
 security/libtasn1/Makefile | 4 ++--
 security/sfs/Makefile      | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'security')

diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 83eabef5096..61da8fe4366 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:34 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/05 16:27:28 jlam Exp $
 
 DISTNAME=	libtasn1-0.3.0
 CATEGORIES=	security devel
@@ -13,8 +13,8 @@ COMMENT=	ASN.1 structure parser library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_TOOLS+=		makeinfo
 USE_LIBTOOL=		yes
-USE_MAKEINFO=		yes
 GNU_CONFIGURE=		yes
 TEST_TARGET=		check
 
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index c7aae068bc0..5e3e27d13d6 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:11 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/03/05 16:27:28 jlam Exp $
 #
 
 DISTNAME=		sfs-0.7.2
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--with-sfsdir=${SFS_ROOT:Q}
 CONFIGURE_ARGS+=	--disable-uvfs
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		makeinfo perl:run
 
 GCC_REQD+=		2.95.3
 
@@ -40,7 +40,6 @@ SFSEXAMPLEDIR=		${PREFIX}/share/examples/sfs
 
 MESSAGE_SUBST+=		SFSDIR=${SFS_ROOT} SFSEXAMPLEDIR=${SFSEXAMPLEDIR}
 
-USE_MAKEINFO=		YES
 INFO_FILES=		sfs.info
 
 post-install:
-- 
cgit v1.2.3