diff options
author | seb <seb@pkgsrc.org> | 2002-02-18 15:14:00 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2002-02-18 15:14:00 +0000 |
commit | 66111c6d15be91debc28f649061f5ed03d48e340 (patch) | |
tree | c84409a165bd501342b10b825394cf1eb3684d02 /math/calc | |
parent | 0b7fe93445e5b9c2ed4f512cd83d2c904922531b (diff) | |
download | pkgsrc-66111c6d15be91debc28f649061f5ed03d48e340.tar.gz |
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.
Diffstat (limited to 'math/calc')
-rw-r--r-- | math/calc/Makefile | 3 | ||||
-rw-r--r-- | math/calc/PLIST | 6 | ||||
-rw-r--r-- | math/calc/distinfo | 4 | ||||
-rw-r--r-- | math/calc/patches/patch-aa | 13 |
4 files changed, 13 insertions, 13 deletions
diff --git a/math/calc/Makefile b/math/calc/Makefile index 288e279ee69..91ed583a987 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/04/14 21:43:50 jtb Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:29 seb Exp $ DISTNAME= calc-2.02f CATEGORIES= math @@ -29,4 +29,5 @@ do-install: ${WRKSRC}/calccard.tex ${PREFIX}/${SITE_LISP}/calc ${INSTALL_DATA} ${WRKSRC}/calc.info* ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/calc/PLIST b/math/calc/PLIST index 10e0dbcc9f3..420a89f6602 100644 --- a/math/calc/PLIST +++ b/math/calc/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:10 zuntum Exp $ -@unexec install-info --delete --info-dir=%D/info %D/info/calc.info +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:29 seb Exp $ +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/calc.info info/calc.info info/calc.info-1 info/calc.info-10 @@ -35,7 +35,7 @@ info/calc.info-6 info/calc.info-7 info/calc.info-8 info/calc.info-9 -@exec install-info --info-dir=%D/info %D/info/calc.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/calc.info ${SITE_LISP}/calc/calc-aent.el ${SITE_LISP}/calc/calc-aent.elc ${SITE_LISP}/calc/calc-alg-2.el diff --git a/math/calc/distinfo b/math/calc/distinfo index 6454274d138..abc9f5d13ad 100644 --- a/math/calc/distinfo +++ b/math/calc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 08:45:38 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/02/18 15:14:29 seb Exp $ SHA1 (calc-2.02f.tar.gz) = 1a1d54fb90725aacaf1c9308a94be4b813ac4880 Size (calc-2.02f.tar.gz) = 831865 bytes -SHA1 (patch-aa) = 14d11b1b7f8db0a8929a5ac632aa3571bee05652 +SHA1 (patch-aa) = 38688806fb5b62e7ac3ca1783376abfb79fd2bfe SHA1 (patch-ab) = f8634afae8f7236bcf2e4c232e5cd60d5500e0cb diff --git a/math/calc/patches/patch-aa b/math/calc/patches/patch-aa index 4bd04c828a0..b632b4b4d9a 100644 --- a/math/calc/patches/patch-aa +++ b/math/calc/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2000/12/13 23:51:35 jtb Exp $ +$NetBSD: patch-aa,v 1.3 2002/02/18 15:14:29 seb Exp $ ---- Makefile.orig Mon Dec 16 04:50:45 1996 +--- Makefile.orig Mon Dec 16 05:50:45 1996 +++ Makefile -@@ -29,10 +29,10 @@ +@@ -29,10 +29,9 @@ # Programs. @@ -11,11 +11,10 @@ $NetBSD: patch-aa,v 1.2 2000/12/13 23:51:35 jtb Exp $ TEX = tex TEXINDEX = texindex -MAKEINFO = makeinfo -+MAKEINFO = makeinfo --no-validate MAKE = make ECHO = @echo REMOVE = -rm -f -@@ -54,13 +54,10 @@ +@@ -54,13 +53,10 @@ # to make the steps more explicit while the `make' is in progress. all: $(MAKE) compile @@ -29,14 +28,14 @@ $NetBSD: patch-aa,v 1.2 2000/12/13 23:51:35 jtb Exp $ $(MAKE) info $(ECHO) "Calc is now installed." -@@ -83,9 +80,9 @@ +@@ -83,9 +79,9 @@ # Format the Calc manual for the Info system using makeinfo. info: calc.info calc.info: calc.texinfo - -$(MAKEINFO) calc.texinfo - $(ECHO) "Please ignore warnings for Copying, Getting Started, and Interactive Tutorial." - $(MAKE) texinfo -+ $(MAKEINFO) calc.texinfo ++ $(MAKEINFO) --no-validate calc.texinfo +# $(ECHO) "Please ignore warnings for Copying, Getting Started, and Interactive Tutorial." +# $(MAKE) texinfo |