Changes 3.0.0:

* Compatibility with Matlab graphics is much better now.  We now
  have some graphics features that work like Matlab's Handle
  Graphics (tm):
* The way Octave handles search paths has changed.
* Previous versions of Octave had a number of built-in variables to
  control warnings (for example, warn_divide_by_zero).  These
  variables have been replaced by warning identifiers that are used
  with the warning function to control the state of warnings.
* All built-in variables have been converted to functions.
* For compatibility with Matlab, the output order of Octave's
  "system" function has changed.
* For compatibility with Matlab, the output of Octave's fsolve
  function has been changed.
* For compatibility with Matlab, normcdf, norminv, normpdf, and
  normrnd have been modified to compute distributions using the
  standard deviation instead of the variance.
* For compatibility with Matlab, gamcdf, gaminv, gampdf, gamrnd,
  expcdf, expinv, exppdf and exprnd have been modified to compute
  the distributions using the standard scale factor rather than
  one over the scale factor.

1 files changed, 26 insertions, 28 deletions

diff --git a/math/octave/Makefile b/math/octave/Makefile
index a2b8aa7c0bc..dc0a1bd8c74 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2007/11/12 19:48:50 heinz Exp $
+# $NetBSD: Makefile,v 1.72 2008/01/11 01:23:43 adam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
-PKGREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/ \
-		ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/ \
-		ftp://ftp.task.gda.pl/pub/software/octave/
+MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
@@ -16,51 +13,53 @@ BUILD_DEPENDS+=	bison>=1.875:../../devel/bison
 BUILD_DEPENDS+=	gperf>=2.7:../../devel/gperf
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
-OCTAVE_VER=	2.1.73
-CONFLICTS+=	octave-current-[0-9]*
+OCTAVE_VER=	3.0.0
+CONFLICTS+=	octave-2.*
 
 .if (${MACHINE_ARCH} == "arm32")
 BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
 .endif
 
 USE_GNU_READLINE=	yes
-USE_LANGUAGES=		c c++ fortran
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake makeinfo perl
+USE_TOOLS+=		gmake makeinfo perl gsed
 GNU_CONFIGURE=		yes
+USE_DIRS+=		xdg-1.1
 
 GCC_REQD+=		3.0
-INSTALLATION_DIRS+=	share/doc/octave
-INSTALLATION_DIRS+=	share/octave/${OCTAVE_VER}/doc
+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
+# octave-forge package or user written ones compiled with mkoctfile
 CONFIGURE_ARGS+=	--enable-dl
+# shared libraries are handled automatically in pkgsrc
+CONFIGURE_ARGS+=	--enable-static
+CONFIGURE_ARGS+=	--disable-shared
+
+# trick pkgsrc into real gsed, needed for "mkf77def"
+TOOLS_PLATFORM.gsed=	#empty
 
 .include "options.mk"
 
 GNU_PLATFORM_DIR!=	${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM}
-PLIST_SUBST+=	GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q}
+PLIST_SUBST+=		GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR}
 
 INFO_FILES=	yes
-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
+OCTAVE_DOC=	faq/Octave-FAQ.ps  liboctave/liboctave.ps \
+		refcard/refcard-a4.ps refcard/refcard-legal.ps \
+		refcard/refcard-letter.ps
 
-UNWRAP_FILES+=	mkoctfile octave-bug src/oct-conf.h
+INSTALLATION_DIRS+=	share/octave/${OCTAVE_VER}/doc
+UNWRAP_FILES+=		mkoctfile octave-bug src/oct-conf.h
 
 post-extract:
 	find ${WRKSRC}/doc -type f -name '*.info*' -print | xargs 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
+# 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' \
@@ -69,6 +68,7 @@ post-build:
 		-e 's@^:[ \t]*\$${SED=.*@: \$$\{SED="${SED}"\}@g' \
 		${WRKSRC}/mkoctfile.bak > ${WRKSRC}/mkoctfile
 	chmod a+x ${WRKSRC}/mkoctfile
+	(cd ${WRKSRC}/doc/interpreter && gmake octave.ps)
 
 post-install:
 	cd ${WRKSRC}/doc/liboctave;					\
@@ -79,13 +79,11 @@ post-install:
 .for f in ${OCTAVE_DOC}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .endfor
-.for f in ${OCTAVE_HTML}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/octave
-.endfor
 
 .include "../../audio/libsndfile/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../math/blas/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"