diff options
author | seb <seb> | 2002-02-18 15:14:00 +0000 |
---|---|---|
committer | seb <seb> | 2002-02-18 15:14:00 +0000 |
commit | 3d0911b16019865b66bd0db4ae4768f4d13d0909 (patch) | |
tree | c84409a165bd501342b10b825394cf1eb3684d02 /math/octave | |
parent | 41d99a9521443bed0b4de1c8b7469d9717545251 (diff) | |
download | pkgsrc-3d0911b16019865b66bd0db4ae4768f4d13d0909.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/octave')
-rw-r--r-- | math/octave/Makefile | 3 | ||||
-rw-r--r-- | math/octave/PLIST | 10 | ||||
-rw-r--r-- | math/octave/distinfo | 5 | ||||
-rw-r--r-- | math/octave/patches/patch-ai | 13 | ||||
-rw-r--r-- | math/octave/patches/patch-aj | 29 | ||||
-rw-r--r-- | math/octave/patches/patch-ak | 13 |
6 files changed, 66 insertions, 7 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index de354406d64..45e0419dccd 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2002/02/17 20:30:39 seb Exp $ +# $NetBSD: Makefile,v 1.29 2002/02/18 15:14:33 seb Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.16 @@ -60,4 +60,5 @@ post-patch: fi .endif +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/octave/PLIST b/math/octave/PLIST index 88284b1e665..a02cb1d9b01 100644 --- a/math/octave/PLIST +++ b/math/octave/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:51 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:33 seb Exp $ bin/octave bin/octave-bug bin/mkoctfile @@ -209,8 +209,8 @@ include/${PKGNAME}/oct-conf.h include/${PKGNAME}/oct-gperf.h @exec ln -s ${PKGNAME} %D/include/octave @unexec ${RM} -f %D/include/octave -@unexec install-info --delete %D/info/octave.info %D/info/dir -@unexec install-info --delete %D/info/liboctave.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/octave.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/liboctave.info %D/info/dir info/octave.info info/octave.info-1 info/octave.info-10 @@ -228,8 +228,8 @@ info/liboctave.info info/liboctave.info-1 info/liboctave.info-2 info/liboctave.info-3 -@exec install-info %D/info/liboctave.info %D/info/dir -@exec install-info %D/info/octave.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/liboctave.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/octave.info %D/info/dir lib/${PKGNAME}/libcruft.a lib/${PKGNAME}/liboctave.a lib/${PKGNAME}/liboctinterp.a diff --git a/math/octave/distinfo b/math/octave/distinfo index 9ae503dc154..bd075e4a3c7 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 03:03:24 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3 2002/02/18 15:14:33 seb Exp $ SHA1 (octave-2.0.16.tar.gz) = 50db40d260e5294520af67d03c2933567cec31e0 Size (octave-2.0.16.tar.gz) = 3840681 bytes @@ -8,3 +8,6 @@ SHA1 (patch-ae) = 385d3b34764c245530378a04c42735b597c881e4 SHA1 (patch-af) = 8e1f3e3b4f18eeaa77c60ab887d9898b8e5936cc SHA1 (patch-ag) = c31a22e4feb22b2ee10301556bf2d497e5c1c895 SHA1 (patch-ah) = faf342ddb0eeb91927dc119670e2124a214e5346 +SHA1 (patch-ai) = 033c68b15de66e5b7c26d579d39ab20bad57a1e1 +SHA1 (patch-aj) = ce0e8b477c45ef93959bb264dfc85357b34ed454 +SHA1 (patch-ak) = acf783819036e5b8d2cf0e082855e8c24a1aad6d diff --git a/math/octave/patches/patch-ai b/math/octave/patches/patch-ai new file mode 100644 index 00000000000..e9bb39a5f23 --- /dev/null +++ b/math/octave/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2002/02/18 15:14:33 seb Exp $ + +--- doc/liboctave/Makefile.in.orig Sun Feb 17 22:48:00 2002 ++++ doc/liboctave/Makefile.in +@@ -43,7 +43,7 @@ + .PHONY: all + + liboctave.info: $(TEXINFO) ../conf.texi +- -makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi ++ -$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi + + liboctave.dvi: $(TEXINFO) ../conf.texi + -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \ diff --git a/math/octave/patches/patch-aj b/math/octave/patches/patch-aj new file mode 100644 index 00000000000..992dd3c4b1d --- /dev/null +++ b/math/octave/patches/patch-aj @@ -0,0 +1,29 @@ +$NetBSD: patch-aj,v 1.1 2002/02/18 15:14:33 seb Exp $ + +--- doc/interpreter/Makefile.in.orig Sun Feb 17 22:48:00 2002 ++++ doc/interpreter/Makefile.in +@@ -56,7 +56,7 @@ + .PHONY: all + + octave.info: $(TEXINFO) ../conf.texi +- -makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/octave.texi ++ -$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $(srcdir)/octave.texi + + octave.dvi: $(TEXINFO) ../conf.texi + -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \ +@@ -67,13 +67,13 @@ + -dvips -o octave.ps octave.dvi + + ../../INSTALL.OCTAVE: install.texi +- -makeinfo -D INSTALLONLY \ ++ -$(MAKEINFO) -D INSTALLONLY \ + --no-validate --no-headers --no-split --output INSTALL \ + -I$(srcdir) -I$(srcdir)/.. $(srcdir)/install.texi + mv INSTALL ../../INSTALL.OCTAVE + + ../../BUGS: bugs.texi +- -makeinfo -D BUGSONLY \ ++ -$(MAKEINFO) -D BUGSONLY \ + --no-validate --no-headers --no-split --output BUGS \ + -I$(srcdir) -I$(srcdir)/.. $(srcdir)/bugs.texi + mv BUGS ../../BUGS diff --git a/math/octave/patches/patch-ak b/math/octave/patches/patch-ak new file mode 100644 index 00000000000..747e8c07f9a --- /dev/null +++ b/math/octave/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2002/02/18 15:14:33 seb Exp $ + +--- doc/faq/Makefile.in.orig Sun Feb 17 22:48:00 2002 ++++ doc/faq/Makefile.in +@@ -39,7 +39,7 @@ + .PHONY: all + + Octave-FAQ.info: Octave-FAQ.texi +- -makeinfo -I$(srcdir) $(srcdir)/Octave-FAQ.texi ++ -$(MAKEINFO) -I$(srcdir) $(srcdir)/Octave-FAQ.texi + + Octave-FAQ.dvi: Octave-FAQ.texi + -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \ |