pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/math/octave Changes 2.1.69:
details: https://anonhg.NetBSD.org/pkgsrc/rev/caca34a86764
branches: trunk
changeset: 491926:caca34a86764
user: adam <adam%pkgsrc.org@localhost>
date: Fri Apr 01 10:15:46 2005 +0000
description:
Changes 2.1.69:
* Bug fixes
diffstat:
math/octave/Makefile | 116 ++-
math/octave/PLIST | 1233 +++++++++++++++++++++++++++++-------
math/octave/buildlink3.mk | 27 +
math/octave/distinfo | 20 +-
math/octave/octave.mk | 21 +
math/octave/options.mk | 13 +
math/octave/patches/egcs-patch-aa | 76 --
math/octave/patches/patch-aa | 86 +-
math/octave/patches/patch-ac | 43 +-
math/octave/patches/patch-ae | 29 +-
math/octave/patches/patch-af | 47 +-
math/octave/patches/patch-ag | 79 +-
math/octave/patches/patch-ah | 22 +-
13 files changed, 1307 insertions(+), 505 deletions(-)
diffs (truncated from 2108 to 300 lines):
diff -r 32e0741004cd -r caca34a86764 math/octave/Makefile
--- a/math/octave/Makefile Fri Apr 01 10:15:19 2005 +0000
+++ b/math/octave/Makefile Fri Apr 01 10:15:46 2005 +0000
@@ -1,68 +1,94 @@
-# $NetBSD: Makefile,v 1.51 2005/03/24 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2005/04/01 10:15:46 adam Exp $
-DISTNAME= octave-2.0.17
-PKGREVISION= 3
+DISTNAME= octave-${OCTAVE_VER}
CATEGORIES= math
MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/ \
- ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/ \
ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/ \
ftp://ftp.task.gda.pl/pub/software/octave/
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= tech-pkg%NetBSD.org@localhost
+MAINTAINER= adam%NetBSD.org@localhost
HOMEPAGE= http://www.che.wisc.edu/octave/
-COMMENT= High-level language, primarily intended for numerical computations
+COMMENT= High-level language, intended for numerical computations
-BUILD_DEPENDS+= teTeX>=1.0.7:../../print/teTeX
-DEPENDS+= gnuplot{,-nox11}>=3.7:../../graphics/gnuplot
+BUILD_DEPENDS+= bison>=1.875:../../devel/bison
+BUILD_DEPENDS+= gperf>=2.7:../../devel/gperf
+DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
-CONFLICTS+= octave-2.1.*
+OCTAVE_VER= 2.1.69
+CONFLICTS+= octave-current-*
+
+.if (${MACHINE_ARCH} == "arm32")
+BROKEN= Internal compiler error occurs on arm32 (even with gcc-2.95.3)
+.endif
USE_BUILDLINK3= yes
-USE_X11= yes
-GNU_CONFIGURE= yes
-USE_LANGUAGES= fortran
-USE_LIBTOOL= yes
+USE_GNU_READLINE= yes
USE_GNU_TOOLS+= make
-CONFIGURE_ENV+= FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}"
-CPPFLAGS+= -I${WRKDIR}/include
-LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib
+USE_LIBTOOL= yes
+USE_MAKEINFO= yes
+USE_PERL5= build
+GNU_CONFIGURE= yes
+
+GCC_REQD= 3.0
+USE_LANGUAGES= c c++ fortran
+
+# needed for loading of shared objects such as those in the
+# octave-forge package or user written ones compiled with
+# mkoctfile
+CONFIGURE_ARGS+= --enable-dl
-USE_MAKEINFO= YES
-INFO_FILES= liboctave.info octave.info
-LIBOCTAVE_INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3
+.include "options.mk"
+
+INFO_FILES= octave.info liboctave.info
+LIBOCTAVE_INFO= liboctave.info liboctave.info-1 \
+ liboctave.info-2 liboctave.info-3
+OCTAVE_DOC= faq/Octave-FAQ.ps interpreter/octave.ps \
+ liboctave/liboctave.ps refcard/refcard-a4.ps \
+ refcard/refcard-legal.ps refcard/refcard-letter.ps
+OCTAVE_HTML= faq/Octave-FAQ_*.html interpreter/octave_*.html \
+ liboctave/liboctave_*.html
+
+UNWRAP_FILES+= mkoctfile octave-bug src/oct-conf.h
post-extract:
- ${FIND} ${WRKSRC}/doc -type f -name \*.info\* -print | ${XARGS} ${RM} -f
+ ${FIND} ${WRKSRC}/doc -type f -name '*.info*' -exec ${RM} -f {} \;
+ ${MKDIR} ${WRKSRC}/src/pic
+
+# substitute in the real path to various bits of the toolchain because
+# mkoctfile will be used potentially by users and it needs to point
+# at the same compilers as were used in building octave. We also
+# fix up the path to sed otherwise we end up with the buildlink directory
+# in mkoctfile
+post-build:
+ ${MV} ${WRKSRC}/mkoctfile ${WRKSRC}/mkoctfile.bak
+ ${SED} \
+ -e 's;"${CC}";"${CCPATH}";g' \
+ -e 's;"${CXX}";"${CXXPATH}";g' \
+ -e 's;"${FC}";"${FCPATH}";g' \
+ -e 's@^:[ \t]*\$${SED=.*@: \$$\{SED="${SED}"\}@g' \
+ ${WRKSRC}/mkoctfile.bak > ${WRKSRC}/mkoctfile
+ ${CHMOD} a+x ${WRKSRC}/mkoctfile
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/octave/2.0.17/doc
-.for file in ${LIBOCTAVE_INFO}
- ${INSTALL_DATA} ${WRKSRC}/doc/liboctave/${file} ${PREFIX}/info
+.for f in ${LIBOCTAVE_INFO}
+ ${INSTALL_DATA} ${WRKSRC}/doc/liboctave/${f} ${PREFIX}/info
.endfor
- ${INSTALL_DATA} ${WRKSRC}/doc/interpreter/octave.ps ${PREFIX}/share/octave/2.0.17/doc
- ${INSTALL_DATA} ${WRKSRC}/doc/liboctave/liboctave.ps ${PREFIX}/share/octave/2.0.17/doc
- ${INSTALL_DATA} ${WRKSRC}/doc/refcard/refcard-letter.ps ${PREFIX}/share/octave/2.0.17/doc
- ${INSTALL_DATA} ${WRKSRC}/doc/refcard/refcard-legal.ps ${PREFIX}/share/octave/2.0.17/doc
- ${INSTALL_DATA} ${WRKSRC}/doc/refcard/refcard-a4.ps ${PREFIX}/share/octave/2.0.17/doc
- ${INSTALL_DATA} ${WRKSRC}/doc/faq/Octave-FAQ.ps ${PREFIX}/share/octave/2.0.17/doc
-
-.include "../../mk/compiler.mk"
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
+.for f in ${OCTAVE_DOC}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
+.endfor
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/octave
+.for f in ${OCTAVE_HTML}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/html/octave
+.endfor
-.if !empty(CC_VERSION:Mgcc-3*)
-PKG_FAIL_REASON= "Octave does not build with ${CC_VERSION} - please use octave-current."
-.endif
-
-.if !empty(CC_VERSION:Mgcc-2.8.1)
-post-patch:
- @EGCS_VERSION=`${CC} -v 2>&1 | ${AWK} '{print $$4}'`; \
- if [ $$EGCS_VERSION -lt 19981201 ]; then \
- cd ${WRKSRC}; \
- for FILE in ${PATCHDIR}/egcs-patch-*; do \
- ${PATCH} ${PATCH_ARGS} < $$FILE; \
- done; \
- fi
-.endif
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../math/blas/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
+.include "../../math/lapack/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 32e0741004cd -r caca34a86764 math/octave/PLIST
--- a/math/octave/PLIST Fri Apr 01 10:15:19 2005 +0000
+++ b/math/octave/PLIST Fri Apr 01 10:15:46 2005 +0000
@@ -1,225 +1,739 @@
-@comment $NetBSD: PLIST,v 1.8 2004/03/08 08:25:00 seb Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/04/01 10:15:46 adam Exp $
bin/mkoctfile
bin/mkoctfile-${PKGVERSION}
bin/octave
-bin/${PKGNAME}
+bin/octave-${PKGVERSION}
bin/octave-bug
bin/octave-bug-${PKGVERSION}
-include/${PKGNAME}/octave/Array-flags.h
-include/${PKGNAME}/octave/Array-idx.h
-include/${PKGNAME}/octave/Array.cc
-include/${PKGNAME}/octave/Array.h
-include/${PKGNAME}/octave/Array2-idx.h
-include/${PKGNAME}/octave/Array2.cc
-include/${PKGNAME}/octave/Array2.h
-include/${PKGNAME}/octave/Array3-idx.h
-include/${PKGNAME}/octave/Array3.cc
-include/${PKGNAME}/octave/Array3.h
-include/${PKGNAME}/octave/BaseSLList.h
-include/${PKGNAME}/octave/Bounds.h
-include/${PKGNAME}/octave/CColVector.h
-include/${PKGNAME}/octave/CDiagMatrix.h
-include/${PKGNAME}/octave/CMatrix.h
-include/${PKGNAME}/octave/CRowVector.h
-include/${PKGNAME}/octave/CmplxAEPBAL.h
-include/${PKGNAME}/octave/CmplxCHOL.h
-include/${PKGNAME}/octave/CmplxDET.h
-include/${PKGNAME}/octave/CmplxHESS.h
-include/${PKGNAME}/octave/CmplxLU.h
-include/${PKGNAME}/octave/CmplxQR.h
-include/${PKGNAME}/octave/CmplxQRP.h
-include/${PKGNAME}/octave/CmplxSCHUR.h
-include/${PKGNAME}/octave/CmplxSVD.h
-include/${PKGNAME}/octave/CollocWt.h
-include/${PKGNAME}/octave/DAE.h
-include/${PKGNAME}/octave/DAEFunc.h
-include/${PKGNAME}/octave/DASSL.h
-include/${PKGNAME}/octave/DLList.h
-include/${PKGNAME}/octave/DiagArray2.cc
-include/${PKGNAME}/octave/DiagArray2.h
-include/${PKGNAME}/octave/EIG.h
-include/${PKGNAME}/octave/FEGrid.h
-include/${PKGNAME}/octave/LP.h
-include/${PKGNAME}/octave/LPsolve.h
-include/${PKGNAME}/octave/LSODE.h
-include/${PKGNAME}/octave/LinConst.h
-include/${PKGNAME}/octave/MArray-defs.h
-include/${PKGNAME}/octave/MArray.cc
-include/${PKGNAME}/octave/MArray.h
-include/${PKGNAME}/octave/MArray2.cc
-include/${PKGNAME}/octave/MArray2.h
-include/${PKGNAME}/octave/MDiagArray2.cc
-include/${PKGNAME}/octave/MDiagArray2.h
-include/${PKGNAME}/octave/Map.h
-include/${PKGNAME}/octave/Matrix.h
-include/${PKGNAME}/octave/NLConst.h
-include/${PKGNAME}/octave/NLEqn.h
-include/${PKGNAME}/octave/NLFunc.h
-include/${PKGNAME}/octave/NLP.h
-include/${PKGNAME}/octave/ODE.h
-include/${PKGNAME}/octave/ODEFunc.h
-include/${PKGNAME}/octave/Objective.h
-include/${PKGNAME}/octave/Pix.h
-include/${PKGNAME}/octave/QP.h
-include/${PKGNAME}/octave/Quad.h
-include/${PKGNAME}/octave/Range.h
-include/${PKGNAME}/octave/SLList.h
-include/${PKGNAME}/octave/SLStack.h
-include/${PKGNAME}/octave/Stack.h
-include/${PKGNAME}/octave/base-de.h
-include/${PKGNAME}/octave/base-lu.cc
-include/${PKGNAME}/octave/base-lu.h
-include/${PKGNAME}/octave/base-min.h
-include/${PKGNAME}/octave/builtins.h
-include/${PKGNAME}/octave/byte-swap.h
-include/${PKGNAME}/octave/chMatrix.h
-include/${PKGNAME}/octave/cmd-hist.h
-include/${PKGNAME}/octave/config.h
-include/${PKGNAME}/octave/dColVector.h
-include/${PKGNAME}/octave/dDiagMatrix.h
-include/${PKGNAME}/octave/dMatrix.h
-include/${PKGNAME}/octave/dRowVector.h
-include/${PKGNAME}/octave/data-conv.h
-include/${PKGNAME}/octave/data.h
-include/${PKGNAME}/octave/dbleAEPBAL.h
-include/${PKGNAME}/octave/dbleCHOL.h
-include/${PKGNAME}/octave/dbleDET.h
-include/${PKGNAME}/octave/dbleGEPBAL.h
-include/${PKGNAME}/octave/dbleHESS.h
-include/${PKGNAME}/octave/dbleLU.h
-include/${PKGNAME}/octave/dbleQR.h
-include/${PKGNAME}/octave/dbleQRP.h
-include/${PKGNAME}/octave/dbleSCHUR.h
-include/${PKGNAME}/octave/dbleSVD.h
-include/${PKGNAME}/octave/defaults.h
-include/${PKGNAME}/octave/defun-dld.h
-include/${PKGNAME}/octave/defun-int.h
-include/${PKGNAME}/octave/defun.h
-include/${PKGNAME}/octave/dir-ops.h
-include/${PKGNAME}/octave/dirfns.h
-include/${PKGNAME}/octave/dynamic-ld.h
-include/${PKGNAME}/octave/error.h
-include/${PKGNAME}/octave/f77-fcn.h
-include/${PKGNAME}/octave/file-io.h
-include/${PKGNAME}/octave/file-ops.h
-include/${PKGNAME}/octave/fn-cache.h
-include/${PKGNAME}/octave/getopt.h
-include/${PKGNAME}/octave/gripes.h
-include/${PKGNAME}/octave/help.h
-include/${PKGNAME}/octave/idx-vector.h
-include/${PKGNAME}/octave/input.h
-include/${PKGNAME}/octave/lex.h
-include/${PKGNAME}/octave/lo-error.h
-include/${PKGNAME}/octave/lo-ieee.h
-include/${PKGNAME}/octave/lo-mappers.h
-include/${PKGNAME}/octave/lo-specfun.h
-include/${PKGNAME}/octave/lo-utils.h
-include/${PKGNAME}/octave/load-save.h
-include/${PKGNAME}/octave/mach-info.h
-include/${PKGNAME}/octave/mappers.h
-include/${PKGNAME}/octave/mx-base.h
-include/${PKGNAME}/octave/mx-defs.h
-include/${PKGNAME}/octave/mx-ext.h
-include/${PKGNAME}/octave/oct-alloc.h
-include/${PKGNAME}/octave/oct-cmplx.h
-include/${PKGNAME}/octave/oct-conf.h
-include/${PKGNAME}/octave/oct-fstrm.h
-include/${PKGNAME}/octave/oct-glob.h
-include/${PKGNAME}/octave/oct-gperf.h
-include/${PKGNAME}/octave/oct-hist.h
-include/${PKGNAME}/octave/oct-iostrm.h
-include/${PKGNAME}/octave/oct-map.h
-include/${PKGNAME}/octave/oct-math.h
-include/${PKGNAME}/octave/oct-obj.h
-include/${PKGNAME}/octave/oct-prcstrm.h
-include/${PKGNAME}/octave/oct-procbuf.h
-include/${PKGNAME}/octave/oct-stdstrm.h
-include/${PKGNAME}/octave/oct-stream.h
-include/${PKGNAME}/octave/oct-strstrm.h
-include/${PKGNAME}/octave/oct-term.h
-include/${PKGNAME}/octave/oct.h
-include/${PKGNAME}/octave/op-cm-cm.h
-include/${PKGNAME}/octave/op-cm-cs.h
-include/${PKGNAME}/octave/op-cm-m.h
-include/${PKGNAME}/octave/op-cm-s.h
-include/${PKGNAME}/octave/op-cs-cm.h
-include/${PKGNAME}/octave/op-cs-cs.h
-include/${PKGNAME}/octave/op-cs-m.h
-include/${PKGNAME}/octave/op-cs-s.h
-include/${PKGNAME}/octave/op-m-cm.h
-include/${PKGNAME}/octave/op-m-cs.h
-include/${PKGNAME}/octave/op-m-m.h
Home |
Main Index |
Thread Index |
Old Index