- Update octave to 4.4.0.

- Either bump portrevision or mark broken for octave-forge-* ports.
- Bump port revision for octave-forge.
This commit is contained in:
Stephen Montgomery-Smith 2018-05-03 23:42:35 +00:00
parent a68f18cd9b
commit 4ebc7d7f8c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=468999
104 changed files with 419 additions and 475 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-benchmark PORTNAME= octave-forge-benchmark
PORTVERSION= 1.1.1 PORTVERSION= 1.1.1
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= benchmarks math CATEGORIES= benchmarks math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-actuarial PORTNAME= octave-forge-actuarial
PORTVERSION= 1.1.0 PORTVERSION= 1.1.0
PORTREVISION= 14 PORTREVISION= 15
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -12,6 +12,7 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= does not build with octave version >= 4.4.0
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk" .include "${.CURDIR}/../../Mk/bsd.octave.mk"

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-bim PORTNAME= octave-forge-bim
PORTVERSION= 1.1.5 PORTVERSION= 1.1.5
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-bioinfo PORTNAME= octave-forge-bioinfo
PORTVERSION= 0.1.2 PORTVERSION= 0.1.2
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-bsltl PORTNAME= octave-forge-bsltl
PORTVERSION= 1.1.1 PORTVERSION= 1.1.1
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-cgi PORTNAME= octave-forge-cgi
PORTVERSION= 0.1.2 PORTVERSION= 0.1.2
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-civil-engineering PORTNAME= octave-forge-civil-engineering
PORTVERSION= 1.0.7 PORTVERSION= 1.0.7
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-communications PORTNAME= octave-forge-communications
PORTVERSION= 1.2.1 PORTVERSION= 1.2.1
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,6 +3,7 @@
PORTNAME= octave-forge-control PORTNAME= octave-forge-control
PORTVERSION= 3.1.0 PORTVERSION= 3.1.0
PORTREVISION= 1
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-data-smoothing PORTNAME= octave-forge-data-smoothing
PORTVERSION= 1.3.0 PORTVERSION= 1.3.0
PORTREVISION= 11 PORTREVISION= 12
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
RUN_DEPENDS+= ${TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct RUN_DEPENDS+= ${TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
BROKEN= does not build with octave version 4.4.0
# OCTSRC is the name of the directory of the package. # OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
OCTSRC= ${DISTNAME} OCTSRC= ${DISTNAME}

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-dataframe PORTNAME= octave-forge-dataframe
PORTVERSION= 1.2.0 PORTVERSION= 1.2.0
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,6 +3,7 @@
PORTNAME= octave-forge-dicom PORTNAME= octave-forge-dicom
PORTVERSION= 0.2.1 PORTVERSION= 0.2.1
PORTREVISION= 1
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-divand PORTNAME= octave-forge-divand
PORTVERSION= 1.1.2 PORTVERSION= 1.1.2
PORTREVISION= 7 PORTREVISION= 8
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-doctest PORTNAME= octave-forge-doctest
PORTVERSION= 0.6.1 PORTVERSION= 0.6.1
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-econometrics PORTNAME= octave-forge-econometrics
PORTVERSION= 1.1.1 PORTVERSION= 1.1.1
PORTREVISION= 10 PORTREVISION= 11
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -12,6 +12,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= does not build with octave version >= 4.4.0
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ENV+= HOME=${WRKSRC} CONFIGURE_ENV+= HOME=${WRKSRC}

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-fenv PORTNAME= octave-forge-fenv
PORTVERSION= 0.1.0 PORTVERSION= 0.1.0
PORTREVISION= 14 PORTREVISION= 15
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-financial PORTNAME= octave-forge-financial
PORTVERSION= 0.5.1 PORTVERSION= 0.5.1
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-fits PORTNAME= octave-forge-fits
PORTVERSION= 1.0.7 PORTVERSION= 1.0.7
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -12,6 +12,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv3 LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
BROKEN= does not build with octave >= 4.4.0
# OCTSRC is the name of the directory of the package. # OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
OCTSRC= ${OCTAVE_PKGNAME} OCTSRC= ${OCTAVE_PKGNAME}

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-fpl PORTNAME= octave-forge-fpl
PORTVERSION= 1.3.5 PORTVERSION= 1.3.5
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -12,6 +12,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv3 LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
BROKEN= help text unusable with octave 4.4.0
# OCTSRC is the name of the directory of the package. # OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
OCTSRC= ${OCTAVE_PKGNAME} OCTSRC= ${OCTAVE_PKGNAME}

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-ga PORTNAME= octave-forge-ga
PORTVERSION= 0.10.0 PORTVERSION= 0.10.0
PORTREVISION= 11 PORTREVISION= 12
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -9,6 +9,8 @@ CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME} COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
BROKEN= does not build with octave 4.4.0
# OCTSRC is the name of the directory of the package. # OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
OCTSRC= ${DISTNAME} OCTSRC= ${DISTNAME}

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-generate_html PORTNAME= octave-forge-generate_html
PORTVERSION= 0.3.1 PORTVERSION= 0.3.1
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-geometry PORTNAME= octave-forge-geometry
PORTVERSION= 3.0.0 PORTVERSION= 3.0.0
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-gnuplot PORTNAME= octave-forge-gnuplot
PORTVERSION= 1.0.1 PORTVERSION= 1.0.1
PORTREVISION= 14 PORTREVISION= 15
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-gsl PORTNAME= octave-forge-gsl
PORTVERSION= 2.1.0 PORTVERSION= 2.1.0
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-ident PORTNAME= octave-forge-ident
PORTVERSION= 1.0.7 PORTVERSION= 1.0.7
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -14,6 +14,8 @@ LICENSE_NAME= Many different licenses
LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BROKEN= does not build with octave 4.4.0
# OCTSRC is the name of the directory of the package. # OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
OCTSRC= ${DISTNAME} OCTSRC= ${DISTNAME}

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-informationtheory PORTNAME= octave-forge-informationtheory
PORTVERSION= 0.1.8 PORTVERSION= 0.1.8
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-integration PORTNAME= octave-forge-integration
PORTVERSION= 1.0.7 PORTVERSION= 1.0.7
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-interval PORTNAME= octave-forge-interval
PORTVERSION= 3.1.0 PORTVERSION= 3.1.0
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,6 +3,7 @@
PORTNAME= octave-forge-io PORTNAME= octave-forge-io
PORTVERSION= 2.4.11 PORTVERSION= 2.4.11
PORTREVISION= 1
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= math CATEGORIES= math

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-irsa PORTNAME= octave-forge-irsa
PORTVERSION= 1.0.7 PORTVERSION= 1.0.7
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-level-set PORTNAME= octave-forge-level-set
PORTVERSION= 0.3.0 PORTVERSION= 0.3.0
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -10,6 +10,8 @@ CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME} COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
BROKEN= does not build with octave 4.4.0
# OCTSRC is the name of the directory of the package. # OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
OCTSRC= ${OCTAVE_PKGNAME} OCTSRC= ${OCTAVE_PKGNAME}

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-lssa PORTNAME= octave-forge-lssa
PORTVERSION= 0.1.2 PORTVERSION= 0.1.2
PORTREVISION= 11 PORTREVISION= 12
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-ltfat PORTNAME= octave-forge-ltfat
PORTVERSION= 2.1.2 PORTVERSION= 2.1.2
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= math CATEGORIES= math

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-mapping PORTNAME= octave-forge-mapping
PORTVERSION= 1.2.1 PORTVERSION= 1.2.1
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -12,6 +12,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv3 LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
BROKEN= depends upon octave-forge-general, which is broken
RUN_DEPENDS+= ${TARBALLS_DIR}/general.tar.gz:math/octave-forge-general RUN_DEPENDS+= ${TARBALLS_DIR}/general.tar.gz:math/octave-forge-general
RUN_DEPENDS+= ${TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry RUN_DEPENDS+= ${TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry
RUN_DEPENDS+= ${TARBALLS_DIR}/linear-algebra.tar.gz:math/octave-forge-linear-algebra RUN_DEPENDS+= ${TARBALLS_DIR}/linear-algebra.tar.gz:math/octave-forge-linear-algebra

View file

@ -12,6 +12,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv3 LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
BROKEN= depends upon octave-forge-general, which is broken
# OCTSRC is the name of the directory of the package. # OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
OCTSRC= ${DISTNAME} OCTSRC= ${DISTNAME}

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-missing-functions PORTNAME= octave-forge-missing-functions
PORTVERSION= 1.0.2 PORTVERSION= 1.0.2
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-msh PORTNAME= octave-forge-msh
PORTVERSION= 1.0.10 PORTVERSION= 1.0.10
PORTREVISION= 8 PORTREVISION= 9
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-multicore PORTNAME= octave-forge-multicore
PORTVERSION= 0.2.15 PORTVERSION= 0.2.15
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-mvn PORTNAME= octave-forge-mvn
PORTVERSION= 1.1.0 PORTVERSION= 1.1.0
PORTREVISION= 9 PORTREVISION= 10
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-nan PORTNAME= octave-forge-nan
PORTVERSION= 3.1.4 PORTVERSION= 3.1.4
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-ncarray PORTNAME= octave-forge-ncarray
PORTVERSION= 1.0.4 PORTVERSION= 1.0.4
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,6 +3,7 @@
PORTNAME= octave-forge-netcdf PORTNAME= octave-forge-netcdf
PORTVERSION= 1.0.12 PORTVERSION= 1.0.12
PORTREVISION= 1
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-nlwing2 PORTNAME= octave-forge-nlwing2
PORTVERSION= 1.2.0 PORTVERSION= 1.2.0
PORTREVISION= 14 PORTREVISION= 15
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-nnet PORTNAME= octave-forge-nnet
PORTVERSION= 0.1.13 PORTVERSION= 0.1.13
PORTREVISION= 14 PORTREVISION= 15
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-nurbs PORTNAME= octave-forge-nurbs
PORTVERSION= 1.3.13 PORTVERSION= 1.3.13
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-oct2mat PORTNAME= octave-forge-oct2mat
PORTVERSION= 1.0.7 PORTVERSION= 1.0.7
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-octclip PORTNAME= octave-forge-octclip
PORTVERSION= 1.0.8 PORTVERSION= 1.0.8
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-octproj PORTNAME= octave-forge-octproj
PORTVERSION= 1.1.5 PORTVERSION= 1.1.5
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-odebvp PORTNAME= octave-forge-odebvp
PORTVERSION= 1.0.6 PORTVERSION= 1.0.6
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-optics PORTNAME= octave-forge-optics
PORTVERSION= 0.1.3 PORTVERSION= 0.1.3
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-optim PORTNAME= octave-forge-optim
PORTVERSION= 1.5.2 PORTVERSION= 1.5.2
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,6 +3,7 @@
PORTNAME= octave-forge-optiminterp PORTNAME= octave-forge-optiminterp
PORTVERSION= 0.3.5 PORTVERSION= 0.3.5
PORTREVISION= 1
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-outliers PORTNAME= octave-forge-outliers
PORTVERSION= 0.13.9 PORTVERSION= 0.13.9
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -12,6 +12,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv3 LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
BROKEN= does not build with octave 4.4.0
# OCTSRC is the name of the directory of the package. # OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
OCTSRC= ${DISTNAME} OCTSRC= ${DISTNAME}

View file

@ -12,6 +12,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= does not build with octave version >= 4.4.0
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
post-patch: post-patch:

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-plot PORTNAME= octave-forge-plot
PORTVERSION= 1.1.0 PORTVERSION= 1.1.0
PORTREVISION= 12 PORTREVISION= 13
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-quaternion PORTNAME= octave-forge-quaternion
PORTVERSION= 2.4.0 PORTVERSION= 2.4.0
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-queueing PORTNAME= octave-forge-queueing
PORTVERSION= 1.2.5 PORTVERSION= 1.2.5
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-secs1d PORTNAME= octave-forge-secs1d
PORTVERSION= 0.0.9 PORTVERSION= 0.0.9
PORTREVISION= 11 PORTREVISION= 12
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-secs2d PORTNAME= octave-forge-secs2d
PORTVERSION= 0.0.8 PORTVERSION= 0.0.8
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-secs3d PORTNAME= octave-forge-secs3d
PORTVERSION= 0.0.1 PORTVERSION= 0.0.1
PORTREVISION= 13 PORTREVISION= 14
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -12,6 +12,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv3 LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
BROKEN= does not build with octave 4.4.0
# OCTSRC is the name of the directory of the package. # OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
OCTSRC= ${DISTNAME} OCTSRC= ${DISTNAME}

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-simp PORTNAME= octave-forge-simp
PORTVERSION= 1.1.0 PORTVERSION= 1.1.0
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-sockets PORTNAME= octave-forge-sockets
PORTVERSION= 1.2.0 PORTVERSION= 1.2.0
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-sparsersb PORTNAME= octave-forge-sparsersb
PORTVERSION= 1.0.5 PORTVERSION= 1.0.5
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-specfun PORTNAME= octave-forge-specfun
PORTVERSION= 1.1.0 PORTVERSION= 1.1.0
PORTREVISION= 12 PORTREVISION= 13
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-special-matrix PORTNAME= octave-forge-special-matrix
PORTVERSION= 1.0.7 PORTVERSION= 1.0.7
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-splines PORTNAME= octave-forge-splines
PORTVERSION= 1.3.2 PORTVERSION= 1.3.2
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-statistics PORTNAME= octave-forge-statistics
PORTVERSION= 1.3.0 PORTVERSION= 1.3.0
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-stk PORTNAME= octave-forge-stk
PORTVERSION= 2.5.0 PORTVERSION= 2.5.0
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-strings PORTNAME= octave-forge-strings
PORTVERSION= 1.2.0 PORTVERSION= 1.2.0
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-struct PORTNAME= octave-forge-struct
PORTVERSION= 1.0.14 PORTVERSION= 1.0.14
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-symband PORTNAME= octave-forge-symband
PORTVERSION= 1.0.10 PORTVERSION= 1.0.10
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-symbolic PORTNAME= octave-forge-symbolic
PORTVERSION= 2.6.0 PORTVERSION= 2.6.0
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-tcl-octave PORTNAME= octave-forge-tcl-octave
PORTVERSION= 0.1.8 PORTVERSION= 0.1.8
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -12,6 +12,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv3 LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
BROKEN= does not build with octave 4.4.0
RUN_DEPENDS+= ${TARBALLS_DIR}/signal.tar.gz:math/octave-forge-signal RUN_DEPENDS+= ${TARBALLS_DIR}/signal.tar.gz:math/octave-forge-signal
# OCTSRC is the name of the directory of the package. # OCTSRC is the name of the directory of the package.

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-tsa PORTNAME= octave-forge-tsa
PORTVERSION= 4.4.5 PORTVERSION= 4.4.5
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-video PORTNAME= octave-forge-video
PORTVERSION= 1.2.4 PORTVERSION= 1.2.4
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,7 +3,7 @@
PORTNAME= octave-forge-zenity PORTNAME= octave-forge-zenity
PORTVERSION= 0.5.7 PORTVERSION= 0.5.7
PORTREVISION= 17 PORTREVISION= 18
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,6 +3,7 @@
PORTNAME= octave-forge-zeromq PORTNAME= octave-forge-zeromq
PORTVERSION= 1.3.0 PORTVERSION= 1.3.0
PORTREVISION= 1
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org

View file

@ -3,6 +3,7 @@
PORTNAME= octave-forge PORTNAME= octave-forge
PORTVERSION= 20180409 PORTVERSION= 20180409
PORTREVISION= 1
CATEGORIES= math CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org MAINTAINER= stephen@FreeBSD.org
@ -27,7 +28,7 @@ OPTIONS_DEFINE= ACTUARIAL AUDIO BENCHMARK BIM BIOINFO BSLTL CGI \
STRUCT SYMBAND SYMBOLIC TCL_OCTAVE TISEAN TSA VIDEO \ STRUCT SYMBAND SYMBOLIC TCL_OCTAVE TISEAN TSA VIDEO \
ZENITY ZEROMQ ZENITY ZEROMQ
OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NOCTCLIP:NOCTPROJ} OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NOCTCLIP:NOCTPROJ:NAUDIO:NDATABASE:NDICOM:NENGINE:NFL_CORE:NFUZZY_LOGIC_TOOLKIT:NGENERAL:NIMAGE:NLINEAR_ALGEBRA:NMECHANICS:NMISCELLANEOUS:NPARALLEL:NPDB:NSIGNAL:NTISEAN}
TARBALLS_DIR= ${LOCALBASE}/share/octave/tarballs TARBALLS_DIR= ${LOCALBASE}/share/octave/tarballs

View file

@ -3,7 +3,6 @@
PORTNAME= octave PORTNAME= octave
PORTVERSION= ${OCTAVE_VERSION} PORTVERSION= ${OCTAVE_VERSION}
PORTREVISION= 2
CATEGORIES= math java CATEGORIES= math java
MASTER_SITES= GNU MASTER_SITES= GNU
@ -37,7 +36,8 @@ LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick \
libfontconfig.so:x11-fonts/fontconfig \ libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
libdrm.so:graphics/libdrm \ libdrm.so:graphics/libdrm \
libOSMesa.so:graphics/libosmesa libOSMesa.so:graphics/libosmesa \
libsundials_arkode.so:math/sundials
USES= charsetfix fortran gmake libtool perl5 pkgconfig readline \ USES= charsetfix fortran gmake libtool perl5 pkgconfig readline \
tar:xz compiler:c++14-lang tar:xz compiler:c++14-lang
@ -59,8 +59,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf" \ CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf" \
JAVA_HOME=${JAVA_HOME} \ JAVA_HOME=${JAVA_HOME} \
MAKEINFO=${LOCALBASE}/bin/makeinfo \ MAKEINFO=${LOCALBASE}/bin/makeinfo \
ac_cv_type_max_align_t=yes \ ac_cv_type_max_align_t=yes
with_OSMesa="-lOSMesa -ldrm"
CONFIGURE_ARGS= --host=${GNU_HOST} \ CONFIGURE_ARGS= --host=${GNU_HOST} \
--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \ --with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
--with-lapack="${LAPACKLIB}" \ --with-lapack="${LAPACKLIB}" \
@ -90,8 +89,6 @@ post-patch:
${REINPLACE_CMD} 's+-lcholmod+-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd ${LAPACKLIB}+' ${WRKSRC}/configure ${REINPLACE_CMD} 's+-lcholmod+-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd ${LAPACKLIB}+' ${WRKSRC}/configure
post-install: post-install:
${INSTALL_DATA} ${WRKSRC}/etc/icons/octave.desktop \
${STAGEDIR}${DESKTOPDIR}/www.octave.org-octave.desktop
(cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib .) (cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib .)
post-install-DOCS-on: post-install-DOCS-on:
@ -101,6 +98,10 @@ post-install-DOCS-on:
refcard/refcard-letter.ps interpreter/octave.ps refcard/refcard-letter.ps interpreter/octave.ps
${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
.endfor .endfor
@${MKDIR} ${STAGEDIR}${PREFIX}/${INFO_PATH}
.for file in interpreter/octave.info liboctave/liboctave.info
${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${PREFIX}/${INFO_PATH}
.endfor
check regression-test: build check regression-test: build
@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check) @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check)

View file

@ -1,5 +1,5 @@
# $FreeBSD$ # $FreeBSD$
# Version to share with ports depending on octave # Version to share with ports depending on octave
OCTAVE_VERSION= 4.2.2 OCTAVE_VERSION= 4.4.0

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1521063489 TIMESTAMP = 1525230670
SHA256 (octave-4.2.2.tar.xz) = a7cbbbdf139238ad8dd03fa1c8df9ad899ca8b61cbfdfda46a6b9795f6c2429c SHA256 (octave-4.4.0.tar.xz) = d6867c57bc108ae988106d3c3fb6a380b5be5fee61b23ceedf44051477e8f0bc
SIZE (octave-4.2.2.tar.xz) = 18531988 SIZE (octave-4.4.0.tar.xz) = 22000144

View file

@ -1,6 +1,6 @@
--- build-aux/find-defun-files.sh.orig 2017-02-22 17:15:26 UTC --- build-aux/find-defun-files.sh.orig 2018-04-30 17:03:56 UTC
+++ build-aux/find-defun-files.sh +++ build-aux/find-defun-files.sh
@@ -2,7 +2,7 @@ @@ -20,7 +20,7 @@
set -e set -e

View file

@ -1,4 +1,4 @@
--- build-aux/find-files-with-tests.sh.orig 2017-02-22 18:01:55 UTC --- build-aux/find-files-with-tests.sh.orig 2018-04-30 17:03:56 UTC
+++ build-aux/find-files-with-tests.sh +++ build-aux/find-files-with-tests.sh
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
set -e set -e

View file

@ -1,11 +0,0 @@
--- build-aux/mk-builtins.sh.orig 2017-02-22 18:01:55 UTC
+++ build-aux/mk-builtins.sh
@@ -20,7 +20,7 @@
set -e
-SED=${SED:-sed}
+SED=gsed
defun_dld_are_built_in=false
make_header=false

View file

@ -1,4 +1,4 @@
--- build-aux/mk-octave-config-h.sh.orig 2017-02-22 18:01:55 UTC --- build-aux/mk-octave-config-h.sh.orig 2018-04-30 17:03:56 UTC
+++ build-aux/mk-octave-config-h.sh +++ build-aux/mk-octave-config-h.sh
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
# autoconf-generated config.h file. See the notes at the top of the # autoconf-generated config.h file. See the notes at the top of the

View file

@ -1,6 +1,6 @@
--- configure.orig 2017-02-22 18:18:36 UTC --- configure.orig 2018-04-30 17:03:56 UTC
+++ configure +++ configure
@@ -17857,7 +17857,7 @@ $as_echo_n "checking whether the $compil @@ -17720,7 +17720,7 @@ $as_echo_n "checking whether the $compil
hardcode_minus_L=no hardcode_minus_L=no
hardcode_shlibpath_var=unsupported hardcode_shlibpath_var=unsupported
inherit_rpath=no inherit_rpath=no
@ -9,7 +9,7 @@
module_cmds= module_cmds=
module_expsym_cmds= module_expsym_cmds=
old_archive_from_new_cmds= old_archive_from_new_cmds=
@@ -18159,7 +18159,7 @@ _LT_EOF @@ -18022,7 +18022,7 @@ _LT_EOF
wlarc= wlarc=
else else
archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@ -18,7 +18,7 @@
fi fi
;; ;;
@@ -18178,7 +18178,7 @@ _LT_EOF @@ -18041,7 +18041,7 @@ _LT_EOF
_LT_EOF _LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@ -27,7 +27,7 @@
else else
ld_shlibs=no ld_shlibs=no
fi fi
@@ -18207,7 +18207,7 @@ _LT_EOF @@ -18070,7 +18070,7 @@ _LT_EOF
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@ -36,7 +36,7 @@
else else
ld_shlibs=no ld_shlibs=no
fi fi
@@ -18225,7 +18225,7 @@ _LT_EOF @@ -18088,7 +18088,7 @@ _LT_EOF
*) *)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@ -45,7 +45,7 @@
else else
ld_shlibs=no ld_shlibs=no
fi fi
@@ -18874,7 +18874,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > @@ -18737,7 +18737,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
hardcode_direct_absolute=yes hardcode_direct_absolute=yes
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
@ -54,7 +54,7 @@
hardcode_libdir_flag_spec='$wl-rpath,$libdir' hardcode_libdir_flag_spec='$wl-rpath,$libdir'
export_dynamic_flag_spec='$wl-E' export_dynamic_flag_spec='$wl-E'
else else
@@ -19723,7 +19723,7 @@ freebsd* | dragonfly*) @@ -19586,7 +19586,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat version_type=freebsd-$objformat
case $version_type in case $version_type in
freebsd-elf*) freebsd-elf*)
@ -63,7 +63,7 @@
soname_spec='$libname$release$shared_ext$major' soname_spec='$libname$release$shared_ext$major'
need_version=no need_version=no
need_lib_prefix=no need_lib_prefix=no
@@ -20867,7 +20867,7 @@ striplib= @@ -20730,7 +20730,7 @@ striplib=
old_striplib= old_striplib=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
$as_echo_n "checking whether stripping libraries is possible... " >&6; } $as_echo_n "checking whether stripping libraries is possible... " >&6; }
@ -72,7 +72,7 @@
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded" test -z "$striplib" && striplib="$STRIP --strip-unneeded"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -21119,7 +21119,7 @@ hardcode_automatic_CXX=no @@ -20982,7 +20982,7 @@ hardcode_automatic_CXX=no
inherit_rpath_CXX=no inherit_rpath_CXX=no
module_cmds_CXX= module_cmds_CXX=
module_expsym_cmds_CXX= module_expsym_cmds_CXX=
@ -81,7 +81,7 @@
old_archive_cmds_CXX=$old_archive_cmds old_archive_cmds_CXX=$old_archive_cmds
reload_flag_CXX=$reload_flag reload_flag_CXX=$reload_flag
reload_cmds_CXX=$reload_cmds reload_cmds_CXX=$reload_cmds
@@ -21330,7 +21330,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld @@ -21193,7 +21193,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# archiving commands below assume that GNU ld is being used. # archiving commands below assume that GNU ld is being used.
if test yes = "$with_gnu_ld"; then if test yes = "$with_gnu_ld"; then
archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
@ -90,7 +90,7 @@
hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
export_dynamic_flag_spec_CXX='$wl--export-dynamic' export_dynamic_flag_spec_CXX='$wl--export-dynamic'
@@ -22022,7 +22022,7 @@ fi @@ -21885,7 +21885,7 @@ fi
case `$CC -V 2>&1` in case `$CC -V 2>&1` in
*"Version 7."*) *"Version 7."*)
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
@ -99,7 +99,7 @@
;; ;;
*) # Version 8.0 or newer *) # Version 8.0 or newer
tmp_idyn= tmp_idyn=
@@ -22030,7 +22030,7 @@ fi @@ -21893,7 +21893,7 @@ fi
ia64*) tmp_idyn=' -i_dynamic';; ia64*) tmp_idyn=' -i_dynamic';;
esac esac
archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@ -108,7 +108,7 @@
;; ;;
esac esac
archive_cmds_need_lc_CXX=no archive_cmds_need_lc_CXX=no
@@ -22062,7 +22062,7 @@ fi @@ -21925,7 +21925,7 @@ fi
;; ;;
*) # Version 6 and above use weak symbols *) # Version 6 and above use weak symbols
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
@ -117,7 +117,7 @@
;; ;;
esac esac
@@ -22073,7 +22073,7 @@ fi @@ -21936,7 +21936,7 @@ fi
cxx*) cxx*)
# Compaq C++ # Compaq C++
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
@ -126,7 +126,7 @@
runpath_var=LD_RUN_PATH runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir' hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -22107,7 +22107,7 @@ fi @@ -21970,7 +21970,7 @@ fi
# Sun C++ 5.9 # Sun C++ 5.9
no_undefined_flag_CXX=' -zdefs' no_undefined_flag_CXX=' -zdefs'
archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@ -135,7 +135,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_libdir_flag_spec_CXX='-R$libdir'
whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object_CXX=yes compiler_needs_object_CXX=yes
@@ -22175,7 +22175,7 @@ fi @@ -22038,7 +22038,7 @@ fi
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
@ -144,7 +144,7 @@
export_dynamic_flag_spec_CXX='$wl-E' export_dynamic_flag_spec_CXX='$wl-E'
whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi fi
@@ -23700,7 +23700,7 @@ freebsd* | dragonfly*) @@ -23563,7 +23563,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat version_type=freebsd-$objformat
case $version_type in case $version_type in
freebsd-elf*) freebsd-elf*)
@ -153,7 +153,7 @@
soname_spec='$libname$release$shared_ext$major' soname_spec='$libname$release$shared_ext$major'
need_version=no need_version=no
need_lib_prefix=no need_lib_prefix=no
@@ -24891,7 +24891,7 @@ hardcode_automatic_F77=no @@ -24751,7 +24751,7 @@ hardcode_automatic_F77=no
inherit_rpath_F77=no inherit_rpath_F77=no
module_cmds_F77= module_cmds_F77=
module_expsym_cmds_F77= module_expsym_cmds_F77=
@ -162,7 +162,7 @@
old_archive_cmds_F77=$old_archive_cmds old_archive_cmds_F77=$old_archive_cmds
reload_flag_F77=$reload_flag reload_flag_F77=$reload_flag
reload_cmds_F77=$reload_cmds reload_cmds_F77=$reload_cmds
@@ -25618,7 +25618,7 @@ $as_echo_n "checking whether the $compil @@ -25478,7 +25478,7 @@ $as_echo_n "checking whether the $compil
hardcode_minus_L_F77=no hardcode_minus_L_F77=no
hardcode_shlibpath_var_F77=unsupported hardcode_shlibpath_var_F77=unsupported
inherit_rpath_F77=no inherit_rpath_F77=no
@ -171,7 +171,7 @@
module_cmds_F77= module_cmds_F77=
module_expsym_cmds_F77= module_expsym_cmds_F77=
old_archive_from_new_cmds_F77= old_archive_from_new_cmds_F77=
@@ -25920,7 +25920,7 @@ _LT_EOF @@ -25780,7 +25780,7 @@ _LT_EOF
wlarc= wlarc=
else else
archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@ -180,7 +180,7 @@
fi fi
;; ;;
@@ -25939,7 +25939,7 @@ _LT_EOF @@ -25799,7 +25799,7 @@ _LT_EOF
_LT_EOF _LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@ -189,7 +189,7 @@
else else
ld_shlibs_F77=no ld_shlibs_F77=no
fi fi
@@ -25968,7 +25968,7 @@ _LT_EOF @@ -25828,7 +25828,7 @@ _LT_EOF
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir' hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir'
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@ -198,7 +198,7 @@
else else
ld_shlibs_F77=no ld_shlibs_F77=no
fi fi
@@ -25986,7 +25986,7 @@ _LT_EOF @@ -25846,7 +25846,7 @@ _LT_EOF
*) *)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@ -207,7 +207,7 @@
else else
ld_shlibs_F77=no ld_shlibs_F77=no
fi fi
@@ -26585,7 +26585,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > @@ -26445,7 +26445,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
hardcode_direct_absolute_F77=yes hardcode_direct_absolute_F77=yes
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
@ -216,7 +216,7 @@
hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir' hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir'
export_dynamic_flag_spec_F77='$wl-E' export_dynamic_flag_spec_F77='$wl-E'
else else
@@ -27262,7 +27262,7 @@ freebsd* | dragonfly*) @@ -27122,7 +27122,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat version_type=freebsd-$objformat
case $version_type in case $version_type in
freebsd-elf*) freebsd-elf*)
@ -225,25 +225,7 @@
soname_spec='$libname$release$shared_ext$major' soname_spec='$libname$release$shared_ext$major'
need_version=no need_version=no
need_lib_prefix=no need_lib_prefix=no
@@ -34697,7 +34697,7 @@ $as_echo_n "checking Qt version $ver... @@ -34165,7 +34165,7 @@ fi
case "$qt_version" in
4)
QT_MODULES="QtCore QtGui QtNetwork QtOpenGL"
- octave_qscintilla_libnames=qscintilla2
+ octave_qscintilla_libnames=qscintilla2_qt4
;;
5)
QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
@@ -35738,7 +35738,7 @@ esac
fi
if test -n "$QTCHOOSER"; then
- LRELEASEFLAGS="-qt$qt_version"
+ LRELEASEFLAGS=""
fi
fi
fi
@@ -38632,7 +38632,7 @@ fi
fi fi
# Generic LAPACK library? # Generic LAPACK library?
@ -252,34 +234,56 @@
if test $ax_lapack_ok = no; then if test $ax_lapack_ok = no; then
save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS" save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh` as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh`
@@ -40410,7 +40410,7 @@ fi @@ -70670,9 +70670,6 @@ esac
fi fi
# Generic LAPACK library? if test -n "$MOC"; then
-for lapack in lapack lapack_rs6k; do - if test -n "$QTCHOOSER"; then
+for lapack in openblasp; do - MOCFLAGS="-qt$qt_version"
if test $ax_lapack_ok = no; then - fi
save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS" QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE moc"
as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh` else
@@ -42216,7 +42216,7 @@ fi QT_TOOLS_MISSING="$QT_TOOLS_MISSING moc"
@@ -70885,9 +70882,6 @@ esac
fi fi
# Generic LAPACK library? if test -n "$UIC"; then
-for lapack in lapack lapack_rs6k; do - if test -n "$QTCHOOSER"; then
+for lapack in openblasp; do - UICFLAGS="-qt$qt_version"
if test $ax_lapack_ok = no; then - fi
save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS" QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE uic"
as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh` else
@@ -43161,7 +43161,7 @@ $as_echo "$as_me: WARNING: $warn_ccolamd QT_TOOLS_MISSING="$QT_TOOLS_MISSING uic"
@@ -71100,9 +71094,6 @@ esac
fi
### Check for CHOLMOD library. if test -n "$RCC"; then
### If your cholmod library requires cblas, then you will need to - if test -n "$QTCHOOSER"; then
-### configure with --with-cholmod="-lcholmod -lcblas". - RCCFLAGS="-qt$qt_version"
+### configure with --with-cholmod="-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd -lopenblasp -lcblas". - fi
QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE rcc"
else
QT_TOOLS_MISSING="$QT_TOOLS_MISSING rcc"
@@ -71315,9 +71306,6 @@ esac
fi
save_LIBS="$LIBS" if test -n "$LRELEASE"; then
LIBS="$COLAMD_LDFLAGS $COLAMD_LIBS $AMD_LDFLAGS $AMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" - if test -n "$QTCHOOSER"; then
@@ -43201,7 +43201,7 @@ fi - LRELEASEFLAGS="-qt$qt_version"
- fi
QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE lrelease"
else
QT_TOOLS_MISSING="$QT_TOOLS_MISSING lrelease"
@@ -73640,7 +73628,7 @@ if test $use_osmesa = yes; then
warn_osmesa="OSMesa library not found. Offscreen rendering with FLTK will be disabled."
fi
- OSMESA_LIBS="-lOSMesa"
+ OSMESA_LIBS="-lOSMesa -ldrm"
save_CPPFLAGS="$CPPFLAGS"
save_LDFLAGS="$LDFLAGS"
save_LIBS="$LIBS"
@@ -75018,7 +75006,7 @@ fi
;; ;;
yes | "") yes | "")
ac_octave_cholmod_pkg_check=yes ac_octave_cholmod_pkg_check=yes
@ -288,7 +292,7 @@
;; ;;
-* | */* | *.a | *.so | *.so.* | *.o) -* | */* | *.a | *.so | *.so.* | *.o)
CHOLMOD_LIBS="$with_cholmod" CHOLMOD_LIBS="$with_cholmod"
@@ -43602,7 +43602,7 @@ fi @@ -75598,7 +75586,7 @@ fi
;; ;;
yes | "") yes | "")
ac_octave_umfpack_pkg_check=yes ac_octave_umfpack_pkg_check=yes
@ -297,45 +301,9 @@
;; ;;
-* | */* | *.a | *.so | *.so.* | *.o) -* | */* | *.a | *.so | *.so.* | *.o)
UMFPACK_LIBS="$with_umfpack" UMFPACK_LIBS="$with_umfpack"
@@ -43767,7 +43767,7 @@ fi @@ -77450,6 +77438,13 @@ $as_echo_n "checking for include file <j
;; JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/darwin"
yes | "")
ac_octave_umfpack_pkg_check=yes
- UMFPACK_LIBS="-lumfpack"
+ UMFPACK_LIBS="-lumfpack -lsuitesparseconfig -lamd -lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd -lopenblasp -lcolamd -lopenblasp"
;;
-* | */* | *.a | *.so | *.so.* | *.o)
UMFPACK_LIBS="$with_umfpack"
@@ -54704,7 +54704,7 @@ else
*-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";;
- freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+dragonfly* | freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";;
darwin*) gl_cv_func_snprintf_retval_c99="guessing yes";;
@@ -59551,7 +59551,7 @@ $as_echo "#define FLEXIBLE_ARRAY_MEMBER
aix* | beos* | openbsd* | mirbsd* | irix*)
FLOAT_H=float.h
;;
- freebsd*)
+dragonfly* | freebsd*)
case "$host_cpu" in
i[34567]86 )
FLOAT_H=float.h
@@ -65648,7 +65648,7 @@ else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
+dragonfly* | freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
gl_cv_func_open_slash="guessing no" ;;
*)
gl_cv_func_open_slash="guessing yes" ;;
@@ -74358,6 +74358,13 @@ $as_echo_n "checking for include file <j
fi fi
JAVA_LIBS="-framework JavaVM"
;; ;;
+ freebsd*) + freebsd*)
+ if test -n "$JAVA_CPPFLAGS"; then + if test -n "$JAVA_CPPFLAGS"; then

View file

@ -1,6 +1,6 @@
--- libinterp/corefcn/sysdep.cc.orig 2018-03-08 03:49:02 UTC --- libinterp/corefcn/sysdep.cc.orig 2018-04-30 17:03:56 UTC
+++ libinterp/corefcn/sysdep.cc +++ libinterp/corefcn/sysdep.cc
@@ -61,6 +61,10 @@ along with Octave; see the file COPYING. @@ -58,6 +58,10 @@ along with Octave; see the file COPYING.
# include <omp.h> # include <omp.h>
#endif #endif
@ -11,7 +11,7 @@
#include "cmd-edit.h" #include "cmd-edit.h"
#include "file-ops.h" #include "file-ops.h"
#include "lo-mappers.h" #include "lo-mappers.h"
@@ -97,6 +101,7 @@ along with Octave; see the file COPYING. @@ -92,6 +96,7 @@ along with Octave; see the file COPYING.
static void static void
BSD_init (void) BSD_init (void)
{ {
@ -19,7 +19,7 @@
# if defined (HAVE_FLOATINGPOINT_H) # if defined (HAVE_FLOATINGPOINT_H)
// Disable trapping on common exceptions. // Disable trapping on common exceptions.
# if ! defined (FP_X_DNML) # if ! defined (FP_X_DNML)
@@ -104,6 +109,9 @@ BSD_init (void) @@ -99,6 +104,9 @@ BSD_init (void)
# endif # endif
fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_DNML|FP_X_UFL|FP_X_IMP)); fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_DNML|FP_X_UFL|FP_X_IMP));
# endif # endif

View file

@ -1,11 +0,0 @@
--- libinterp/mk-pkg-add.orig 2017-02-22 18:01:55 UTC
+++ libinterp/mk-pkg-add
@@ -20,7 +20,7 @@
set -e
-SED=${SED:-sed}
+SED=gsed
srcdir="$1"
shift

Some files were not shown because too many files have changed in this diff Show more