From 75ffb0f31d17e4754293df7f008d842f7a366f94 Mon Sep 17 00:00:00 2001 From: seb Date: Sat, 2 Aug 2003 19:39:08 +0000 Subject: Convert to USE_NEW_TEXINFO. Remove now unnecessary patch files. --- math/octave/Makefile | 5 +++-- math/octave/PLIST | 6 +----- math/octave/distinfo | 5 +---- math/octave/patches/patch-ai | 13 ------------- math/octave/patches/patch-aj | 29 ----------------------------- math/octave/patches/patch-ak | 13 ------------- 6 files changed, 5 insertions(+), 66 deletions(-) delete mode 100644 math/octave/patches/patch-ai delete mode 100644 math/octave/patches/patch-aj delete mode 100644 math/octave/patches/patch-ak (limited to 'math') diff --git a/math/octave/Makefile b/math/octave/Makefile index d05cdbf367c..834d55c7cc5 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2003/07/17 21:47:51 grant Exp $ +# $NetBSD: Makefile,v 1.35 2003/08/02 19:39:08 seb Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.17 @@ -29,6 +29,8 @@ CONFIGURE_ENV+= FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}" CPPFLAGS+= -I${WRKDIR}/include LDFLAGS+= -Wl,${RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib +USE_NEW_TEXINFO= YES +USE_MAKEINFO= YES INFO_FILES= liboctave.info octave.info LIBOCTAVE_INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3 @@ -62,5 +64,4 @@ post-patch: fi .endif -.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/octave/PLIST b/math/octave/PLIST index 68e414b801c..502d345a869 100644 --- a/math/octave/PLIST +++ b/math/octave/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2003/07/02 20:58:34 jtb Exp $ +@comment $NetBSD: PLIST,v 1.7 2003/08/02 19:39:08 seb Exp $ bin/mkoctfile bin/mkoctfile-${PKGVERSION} bin/octave @@ -211,8 +211,6 @@ include/${PKGNAME}/octave/xdiv.h include/${PKGNAME}/octave/xpow.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 info/liboctave.info info/liboctave.info-1 info/liboctave.info-2 @@ -230,8 +228,6 @@ 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 lib/${PKGNAME}/libcruft.a lib/${PKGNAME}/liboctave.a lib/${PKGNAME}/liboctinterp.a diff --git a/math/octave/distinfo b/math/octave/distinfo index 119c70ebc3d..0f860abfee5 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2003/07/02 20:58:34 jtb Exp $ +$NetBSD: distinfo,v 1.5 2003/08/02 19:39:08 seb Exp $ SHA1 (octave-2.0.17.tar.bz2) = 4d07280cc7c13818bd900d66481bd976a2309aa5 Size (octave-2.0.17.tar.bz2) = 3064093 bytes @@ -9,6 +9,3 @@ 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 deleted file mode 100644 index e9bb39a5f23..00000000000 --- a/math/octave/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 992dd3c4b1d..00000000000 --- a/math/octave/patches/patch-aj +++ /dev/null @@ -1,29 +0,0 @@ -$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 deleted file mode 100644 index 747e8c07f9a..00000000000 --- a/math/octave/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$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):" ; \ -- cgit v1.2.3