summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-05 16:27:22 +0000
committerjlam <jlam@pkgsrc.org>2006-03-05 16:27:22 +0000
commit6e0c05032135f85018332563ebc1048e6b05b159 (patch)
treee3c6cf61f7cffff30eee10d4bef3729227d7edcb /textproc
parentd6bd870fec965dee7f70a4f3b12e39fa5abac05b (diff)
downloadpkgsrc-6e0c05032135f85018332563ebc1048e6b05b159.tar.gz
* 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.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/grep/Makefile4
-rw-r--r--textproc/ndtpd/Makefile4
-rw-r--r--textproc/rubber/Makefile4
-rw-r--r--textproc/wdiff/Makefile4
4 files changed, 8 insertions, 8 deletions
diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile
index a9793ddc41f..b05e0461b7f 100644
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/05 16:27:28 jlam Exp $
#
DISTNAME= grep-2.5.1
@@ -17,7 +17,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --disable-perl-regexp
-USE_MAKEINFO= YES
+USE_TOOLS+= makeinfo
TEXINFO_REQD= 4.0
INFO_FILES= grep.info
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index 4e46fd7a6e8..99ba44090d8 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:11:04 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/05 16:27:28 jlam Exp $
#
DISTNAME= ndtpd-3.1.5
@@ -12,11 +12,11 @@ COMMENT= Server for accessing CD-ROM books with NDTP
PKG_INSTALLATION_TYPES= pkgviews overwrite
+USE_TOOLS+= makeinfo
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
INFO_FILES= ndtpd-ja.info ndtpd.info
-USE_MAKEINFO= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --localstatedir=${NDTPD_RUNDIR:Q}
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index 1658be5d87b..0a1859dd578 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:07 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/05 16:27:28 jlam Exp $
#
DISTNAME= rubber-1.0
@@ -10,9 +10,9 @@ MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://www.pps.jussieu.fr/~beffara/soft/rubber/
COMMENT= Automated system for building LaTeX documents
+USE_TOOLS+= makeinfo
USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
-USE_MAKEINFO= yes
INFO_FILES= rubber.info
TEXINFO_REQD= 4.6
PYTHON_VERSIONS_ACCEPTED= 24 23
diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index cf94f71198d..d4ac6edae7d 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:51 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/05 16:27:29 jlam Exp $
#
DISTNAME= wdiff-0.5
@@ -14,7 +14,7 @@ GNU_CONFIGURE= yes
CONFIGURE_HAS_INFODIR= no
CONFIGURE_HAS_MANDIR= no
-USE_MAKEINFO= yes
+USE_TOOLS+= makeinfo
INFO_FILES= wdiff.info
INSTALLATION_DIRS= bin ${INFO_DIR} ${PKGMANDIR}/man1 share/doc/wdiff