From 66111c6d15be91debc28f649061f5ed03d48e340 Mon Sep 17 00:00:00 2001 From: seb Date: Mon, 18 Feb 2002 15:14:00 +0000 Subject: Introduce new framework for handling info files generation and installation. Summary of changes: - removal of USE_GTEXINFO - addition of mk/texinfo.mk - inclusion of this file in package Makefiles requiring it - `install-info' substituted by `${INSTALL_INFO}' in PLISTs - tuning of mk/bsd.pkg.mk: removal of USE_GTEXINFO INSTALL_INFO added to PLIST_SUBST `${INSTALL_INFO}' replace `install-info' in target rules print-PLIST target now generate `${INSTALL_INFO}' instead of `install-info' - a couple of new patch files added for a handful of packages - setting of the TEXINFO_OVERRIDE "switch" in packages Makefiles requiring it - devel/cssc marked requiring texinfo 4.0 - a couple of packages Makefiles were tuned with respect of INFO_FILES and makeinfo command usage See -newly added by this commit- section 10.24 of Packages.txt for further information. --- textproc/ispell-base/Makefile | 4 ++-- textproc/ispell-base/PLIST | 6 +++--- textproc/ispell-base/distinfo | 4 ++-- textproc/ispell-base/patches/patch-ab | 14 ++++++++------ 4 files changed, 15 insertions(+), 13 deletions(-) (limited to 'textproc/ispell-base') diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile index 895e7f5f966..9b7f0493e25 100644 --- a/textproc/ispell-base/Makefile +++ b/textproc/ispell-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:49 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:43 seb Exp $ # DISTNAME= ispell-3.1.20 @@ -17,7 +17,6 @@ MAKE_FLAGS+= TMPDIR="${WRKDIR}" WRKSRC= ${WRKDIR}/ispell-3.1 -USE_GTEXINFO= yes INFO_FILES= ispell.info .if exists(/usr/include/inttypes.h) @@ -38,4 +37,5 @@ do-configure: ${ECHO} "#define ELISPDIR \"${PREFIX}/share/emacs/site-lisp\"" >> local.h; \ ${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> local.h +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ispell-base/PLIST b/textproc/ispell-base/PLIST index 6dd9e17c386..ab3ae24e9c0 100644 --- a/textproc/ispell-base/PLIST +++ b/textproc/ispell-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:01 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:43 seb Exp $ bin/buildhash bin/findaffix bin/icombine @@ -8,9 +8,9 @@ bin/munchlist bin/sq bin/tryaffix bin/unsq -@unexec install-info --delete %D/info/ispell.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/ispell.info %D/info/dir info/ispell.info -@exec install-info %D/info/ispell.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/ispell.info %D/info/dir lib/american.hash lib/americanmed+.hash lib/english.aff diff --git a/textproc/ispell-base/distinfo b/textproc/ispell-base/distinfo index e6dcd65d36c..6c2a25ff498 100644 --- a/textproc/ispell-base/distinfo +++ b/textproc/ispell-base/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 15:04:58 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/02/18 15:14:43 seb Exp $ SHA1 (ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e Size (ispell-3.1.20.tar.gz) = 677987 bytes SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32 -SHA1 (patch-ab) = 6cad60fd5b86f6691702eb69d59cd650a9eb27a2 +SHA1 (patch-ab) = f67725f76e3fe9136381e55e3aab37ef8b729cf7 SHA1 (patch-ac) = 05b7f88754819faf2e282221ce1c2fcc446f0b36 SHA1 (patch-ad) = 72769350706c17ecf30afe99d7487edd4ad9551c SHA1 (patch-ae) = e7e2b99d9055e5beeaaf68b9a4379f630241d0bd diff --git a/textproc/ispell-base/patches/patch-ab b/textproc/ispell-base/patches/patch-ab index fa90b951858..5c88ad602f1 100644 --- a/textproc/ispell-base/patches/patch-ab +++ b/textproc/ispell-base/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $ +$NetBSD: patch-ab,v 1.2 2002/02/18 15:14:43 seb Exp $ ---- Makefile.orig Sat Jan 1 20:32:31 2000 -+++ Makefile Sat Jan 1 20:38:02 2000 +--- Makefile.orig Thu Oct 12 20:04:06 1995 ++++ Makefile @@ -240,31 +240,15 @@ set $(SHELLDEBUG); \ if [ -d $$TEXINFODIR -a -r ispell.info ]; then \ @@ -37,12 +37,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $ install-dictbuild: @. ./config.sh; \ -@@ -324,7 +308,7 @@ +@@ -323,8 +307,8 @@ + . ./config.sh; \ set $(SHELLDEBUG); \ if [ -d $$TEXINFODIR ]; then \ - if sh iwhich makeinfo >/dev/null \ +- if sh iwhich makeinfo >/dev/null \ - && makeinfo ispell.texinfo 2>/dev/null; then \ -+ && makeinfo --no-split --force ispell.texinfo 2>/dev/null; true; then \ ++ if true >/dev/null \ ++ && $(MAKEINFO) --no-split --force ispell.texinfo 2>/dev/null; true; then \ :; \ elif sh iwhich $$EMACS >/dev/null; then \ set -e; \ -- cgit v1.2.3