Index: head/math/octave/Makefile =================================================================== --- head/math/octave/Makefile (revision 405986) +++ head/math/octave/Makefile (revision 405987) @@ -1,95 +1,95 @@ # Created by: chuckr@FreeBSD.org # $FreeBSD$ PORTNAME= octave PORTVERSION= 4.0.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= GNU MAINTAINER= maho@FreeBSD.org COMMENT= High-level interactive language for numerical computations LICENSE= GPLv3 BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ gsed:${PORTSDIR}/textproc/gsed \ ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \ gsed:${PORTSDIR}/textproc/gsed \ ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo LIB_DEPENDS= libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick \ libarpack.so:${PORTSDIR}/math/arpack \ libcurl.so:${PORTSDIR}/ftp/curl \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ libftgl.so:${PORTSDIR}/graphics/ftgl \ libhdf5.so:${PORTSDIR}/science/hdf5 \ libpcre.so:${PORTSDIR}/devel/pcre \ libqhull.so.5:${PORTSDIR}/math/qhull5 \ libqrupdate.so:${PORTSDIR}/math/qrupdate \ libumfpack.so:${PORTSDIR}/math/suitesparse \ libglpk.so:${PORTSDIR}/math/glpk \ libgl2ps.so:${PORTSDIR}/print/gl2ps \ libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 USES= charsetfix fortran gmake libtool perl5 pkgconfig tar:xz USE_LDCONFIG= yes USE_PERL5= build USE_TEX= dvipsk:build -USE_GCC= yes GNU_CONFIGURE= yes USE_JAVA= yes JAVA_VERSION= 1.7+ USE_QT4= gui network uic_build moc_build rcc_build linguist_build OCTAVE_VERSION= ${PORTVERSION} GNU_HOST= ${ARCH}-portbld-freebsd${OSREL} PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf" \ JAVA_HOME=${JAVA_HOME} \ MAKEINFO=${LOCALBASE}/bin/makeinfo CONFIGURE_ARGS= --host=${GNU_HOST} \ --with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \ --with-lapack="${LAPACKLIB}" \ --enable-shared \ --disable-jit OPTIONS_DEFINE= DOCS OPTIONS_RADIO= BLAS OPTIONS_RADIO_BLAS= OPENBLAS NETLIB ATLAS OPTIONS_DEFAULT= OPENBLAS OPENBLAS_USES= blaslapack:openblas NETLIB_USES= blaslapack:netlib ATLAS_USES= blaslapack:atlas INFO= octave liboctave post-patch: ${REINPLACE_CMD} 's+"makeinfo"+"${LOCALBASE}/bin/makeinfo"+' ${WRKSRC}/libinterp/corefcn/help.cc ${REINPLACE_CMD} 's+lapack lapack_rs6k+${LAPACKLIB:C/-l//}+' ${WRKSRC}/configure ${REINPLACE_CMD} 's+-lumfpack+-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd ${LAPACKLIB}+' ${WRKSRC}/configure ${REINPLACE_CMD} 's+-lcholmod+-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd ${LAPACKLIB}+' ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/etc/icons/octave.desktop \ ${STAGEDIR}${DESKTOPDIR}/www.octave.org-octave.desktop (cd ${STAGEDIR}${DATADIR} && ln -s ${PORTVERSION}/imagelib .) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in liboctave/liboctave.ps \ refcard/refcard-a4.ps refcard/refcard-legal.ps \ refcard/refcard-letter.ps interpreter/octave.ps ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR} .endfor check regression-test: build @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check) .include Index: head/math/octave/files/patch-libinterp-octave-value-ov-classdef.cc =================================================================== --- head/math/octave/files/patch-libinterp-octave-value-ov-classdef.cc (nonexistent) +++ head/math/octave/files/patch-libinterp-octave-value-ov-classdef.cc (revision 405987) @@ -0,0 +1,14 @@ +--- libinterp/octave-value/ov-classdef.cc.orig 2015-07-21 17:05:21.000000000 +0900 ++++ libinterp/octave-value/ov-classdef.cc 2015-07-21 17:05:32.000000000 +0900 +@@ -1937,6 +1937,11 @@ + return true; + } + ++void cdef_object_scalar::mark_as_constructed (const cdef_class& cls) ++{ ++ ctor_list.erase (cls); ++} ++ + handle_cdef_object::~handle_cdef_object (void) + { + #if DEBUG_TRACE Property changes on: head/math/octave/files/patch-libinterp-octave-value-ov-classdef.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/octave/files/patch-libinterp-octave-value-ov-classdef.h =================================================================== --- head/math/octave/files/patch-libinterp-octave-value-ov-classdef.h (nonexistent) +++ head/math/octave/files/patch-libinterp-octave-value-ov-classdef.h (revision 405987) @@ -0,0 +1,11 @@ +--- libinterp/octave-value/ov-classdef.h.orig 2015-07-21 17:04:55.000000000 +0900 ++++ libinterp/octave-value/ov-classdef.h 2015-07-21 17:05:32.000000000 +0900 +@@ -438,7 +438,7 @@ + + void mark_as_constructed (void) { ctor_list.clear (); } + +- void mark_as_constructed (const cdef_class& cls) { ctor_list.erase (cls); } ++ void mark_as_constructed (const cdef_class& cls); + + bool is_constructed (void) const { return ctor_list.empty (); } + Property changes on: head/math/octave/files/patch-libinterp-octave-value-ov-classdef.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property