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. --- math/octave-current/Makefile | 4 ++-- math/octave-current/PLIST | 10 +++++----- math/octave-current/distinfo | 8 ++++++-- math/octave-current/patches/patch-ak | 16 ++++++++++++---- math/octave-current/patches/patch-am | 12 ++++++++++++ math/octave-current/patches/patch-an | 13 +++++++++++++ math/octave-current/patches/patch-ao | 30 ++++++++++++++++++++++++++++++ math/octave-current/patches/patch-ap | 13 +++++++++++++ 8 files changed, 93 insertions(+), 13 deletions(-) create mode 100644 math/octave-current/patches/patch-am create mode 100644 math/octave-current/patches/patch-an create mode 100644 math/octave-current/patches/patch-ao create mode 100644 math/octave-current/patches/patch-ap (limited to 'math/octave-current') diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index fe1cdd3b211..b4fc80b2f9e 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/01/03 17:09:45 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2002/02/18 15:14:32 seb Exp $ DISTNAME= octave-2.1.33 PKGNAME= octave-2.1.34 @@ -26,7 +26,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_FORTRAN= yes USE_GMAKE= yes -USE_GTEXINFO= yes CONFIGURE_ARGS+=--with-g77 CONFIGURE_ARGS+=--enable-shared --enable-rpath CONFIGURE_ARGS+=-prefix=${PREFIX} @@ -60,4 +59,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/$f ${PREFIX}/share/doc/html/octave .endfor +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST index 8675fac865d..41efa1ae971 100644 --- a/math/octave-current/PLIST +++ b/math/octave-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/03 17:09:45 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:32 seb Exp $ bin/mkoctfile bin/mkoctfile-2.1.34 bin/octave @@ -272,8 +272,8 @@ include/${PKGNAME}/octave/vx-s-ccv.h include/${PKGNAME}/octave/vx-s-crv.h include/${PKGNAME}/octave/xdiv.h include/${PKGNAME}/octave/xpow.h -@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 +@unexec ${INSTALL_INFO} --delete %D/info/octave.info %D/info/dir info/liboctave.info info/liboctave.info-1 info/liboctave.info-2 @@ -294,8 +294,8 @@ info/octave.info-6 info/octave.info-7 info/octave.info-8 info/octave.info-9 -@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/libcruft.a lib/libcruft.la lib/libcruft.so diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo index e18763fb0dc..4cffa349b8b 100644 --- a/math/octave-current/distinfo +++ b/math/octave-current/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/01/03 17:09:46 wiz Exp $ +$NetBSD: distinfo,v 1.10 2002/02/18 15:14:32 seb Exp $ SHA1 (octave-2.1.33.tar.bz2) = 15a07d08647a2c2aeedb31917ac41ed3b7bb4245 Size (octave-2.1.33.tar.bz2) = 3740256 bytes @@ -14,5 +14,9 @@ SHA1 (patch-ag) = c848d3dff78de1975b376b133c514068d956db31 SHA1 (patch-ah) = 5e1b20562559124a33bbdcdff2194805929d06f9 SHA1 (patch-ai) = 248dbc97c2233c47dc532f86b0fb2fd3ebd18068 SHA1 (patch-aj) = 8e2bbe9afde5567540b32fc183f58b87fbf9a547 -SHA1 (patch-ak) = b998dfe27accebec38cffa38555a3e32932c0c07 +SHA1 (patch-ak) = 3de50cdd07f3ceca1aa0cd34442f873f0348122f SHA1 (patch-al) = 7134c3cb12ce4fdd5cbe2a39c586aeac6dab2045 +SHA1 (patch-am) = a5e0b06a9bc1209a4463e7fd8655d1e674476a85 +SHA1 (patch-an) = 47bffab64a8094c7846d22eaa7860e529cb587bc +SHA1 (patch-ao) = 053de6f1f6f1bed959e63752c31ea54ac03985fc +SHA1 (patch-ap) = a7c1ccd8ba7bd51d6cba0a3428ab7c4cc8e0e1f5 diff --git a/math/octave-current/patches/patch-ak b/math/octave-current/patches/patch-ak index a34f35d33fa..096daee62da 100644 --- a/math/octave-current/patches/patch-ak +++ b/math/octave-current/patches/patch-ak @@ -1,7 +1,7 @@ -$NetBSD: patch-ak,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ +$NetBSD: patch-ak,v 1.2 2002/02/18 15:14:32 seb Exp $ ---- kpathsea/Makefile.in.orig Thu Apr 27 10:05:26 2000 -+++ kpathsea/Makefile.in Thu Apr 27 10:08:11 2000 +--- kpathsea/Makefile.in.orig Mon May 4 18:36:19 1998 ++++ kpathsea/Makefile.in @@ -148,6 +148,7 @@ INSTALL_SCRIPT = $(INSTALL_PROGRAM) INSTALL_DATA = @INSTALL_DATA@ @@ -10,7 +10,15 @@ $NetBSD: patch-ak,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ INSTALL_LIBTOOL_PROG = INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(LIBTOOL) install-prog # Creating (symbolic) links. -@@ -253,7 +254,7 @@ +@@ -189,7 +190,6 @@ + # End of programs.make. + + # texi.make -- making .dvi and .info from .texi. +-MAKEINFO = makeinfo + MAKEINFO_FLAGS = --paragraph-indent=2 -I$(srcdir) + + TEXI2DVI = texi2dvi +@@ -253,7 +253,7 @@ $(kpathsea): $(objects) klibtool.version $(LIBTOOL) archive $(AR) $(ARFLAGS) $@ $(objects) diff --git a/math/octave-current/patches/patch-am b/math/octave-current/patches/patch-am new file mode 100644 index 00000000000..c99ed5bb867 --- /dev/null +++ b/math/octave-current/patches/patch-am @@ -0,0 +1,12 @@ +$NetBSD: patch-am,v 1.4 2002/02/18 15:14:32 seb Exp $ + +--- readline/doc/Makefile.in.orig Sun Feb 17 16:26:41 2002 ++++ readline/doc/Makefile.in +@@ -41,7 +41,6 @@ + BUILD_DIR = @BUILD_DIR@ + TEXINPUTDIR = $(srcdir) + +-MAKEINFO = LANGUAGE= makeinfo + TEXI2DVI = $(srcdir)/texi2dvi + TEXI2HTML = $(srcdir)/texi2html + QUIETPS = #set this to -q to shut up dvips diff --git a/math/octave-current/patches/patch-an b/math/octave-current/patches/patch-an new file mode 100644 index 00000000000..4966144e7eb --- /dev/null +++ b/math/octave-current/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1 2002/02/18 15:14:32 seb Exp $ + +--- doc/faq/Makefile.in.orig Sun Feb 17 16:26:40 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):"; \ diff --git a/math/octave-current/patches/patch-ao b/math/octave-current/patches/patch-ao new file mode 100644 index 00000000000..41695a0ea33 --- /dev/null +++ b/math/octave-current/patches/patch-ao @@ -0,0 +1,30 @@ +$NetBSD: patch-ao,v 1.1 2002/02/18 15:14:32 seb Exp $ + +--- doc/interpreter/Makefile.in.orig Sun Feb 17 16:26:40 2002 ++++ doc/interpreter/Makefile.in +@@ -81,7 +81,7 @@ + @mv $@.t $@ + + octave.info: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi +- -makeinfo -I$(srcdir) -I$(srcdir)/.. $< ++ -$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $< + + octave.dvi: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi + -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \ +@@ -93,14 +93,14 @@ + + ../../INSTALL.OCTAVE: install.texi + rm -f INSTALL +- -makeinfo -D INSTALLONLY \ ++ -$(MAKEINFO) -D INSTALLONLY \ + --no-validate --no-headers --no-split --output INSTALL \ + -I$(srcdir) -I$(srcdir)/.. $< + mv INSTALL ../../INSTALL.OCTAVE + + ../../BUGS: bugs.texi + rm -f BUGS +- -makeinfo -D BUGSONLY \ ++ -$(MAKEINFO) -D BUGSONLY \ + --no-validate --no-headers --no-split --output BUGS \ + -I$(srcdir) -I$(srcdir)/.. $< + mv BUGS ../../BUGS diff --git a/math/octave-current/patches/patch-ap b/math/octave-current/patches/patch-ap new file mode 100644 index 00000000000..a834440009e --- /dev/null +++ b/math/octave-current/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD: patch-ap,v 1.1 2002/02/18 15:14:32 seb Exp $ + +--- doc/liboctave/Makefile.in.orig Sun Feb 17 16:26:40 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):"; \ -- cgit v1.2.3