Attachment 204339 Details for Bug 237854 – octave - optionnal java, qt5

[patch] octave - optionnal java, qt5

octave.diff (text/plain), 6.75 KB, created by Lorenzo Salvadore on 2019-05-12 20:49:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lorenzo Salvadore

Created: 2019-05-12 20:49:00 UTC

Size: 6.75 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 501436)
>+++ Makefile	(working copy)
>@@ -3,8 +3,8 @@
> 
> PORTNAME=	octave
> PORTVERSION=	${OCTAVE_VERSION}
>-PORTREVISION=	3
>-CATEGORIES=	math java
>+PORTREVISION=	4
>+CATEGORIES=	math
> MASTER_SITES=	GNU
> 
> MAINTAINER=	stephen@FreeBSD.org
>@@ -33,7 +33,6 @@
> 		libumfpack.so:math/suitesparse \
> 		libglpk.so:math/glpk \
> 		libgl2ps.so:print/gl2ps \
>-		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
> 		libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
> 		libdrm.so:graphics/libdrm \
>@@ -42,13 +41,12 @@
> 		libportaudio.so:audio/portaudio
> #		libsndfile.so:audio/libsndfile # Commented out until this port no longer has vulnerabilities.
> 
>-USES=		charsetfix fortran gmake libtool perl5 pkgconfig qt:5 readline \
>+USES=		charsetfix fortran gmake libtool perl5 pkgconfig readline \
> 		tar:xz compiler:c++14-lang \
> 		desktop-file-utils gl iconv
> USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
> USE_PERL5=	build
> GNU_CONFIGURE=	yes
>-USE_JAVA=	yes
> JAVA_VERSION=	1.7+
> USE_QT=		core gui help network opengl \
> 		qmake_build buildtools_build linguist_build \
>@@ -79,20 +77,28 @@
> 		--enable-shared \
> 		--disable-jit \
> 		--disable-openmp \
>-		--with-qt=5 \
> 		--with-osmesa
> 
> INFO=		octave liboctave
> 
>-OPTIONS_DEFINE=	DOCS
>+INSTALL_TARGET=	install-strip
> 
>-DOCS_CONFIGURE_ENABLE=	docs
>+OPTIONS_DEFINE=	DOCS JAVA QT5
> 
> OPTIONS_RADIO=		BLAS
> OPTIONS_RADIO_BLAS=	OPENBLAS NETLIB ATLAS
>-OPTIONS_DEFAULT=	OPENBLAS
>+OPTIONS_DEFAULT=	JAVA OPENBLAS QT5
>+OPTIONS_SUB=		yes
> 
>+DOCS_CONFIGURE_ENABLE=	docs
>+JAVA_CONFIGURE_ENABLE=	java
>+QT5_CONFIGURE_WITH=	qt=5 qscintilla
>+
>+QT5_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
>+
> DOCS_USE=	TEX=dvipsk:build,formats:build
>+JAVA_USE=	JAVA=yes
>+QT5_USES=	qt:5
> OPENBLAS_USES=	blaslapack:openblas
> NETLIB_USES=	blaslapack:netlib
> ATLAS_USES=		blaslapack:atlas
>@@ -103,7 +109,6 @@
> 
> post-install:
> 	(cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib  .)
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/octave/${PORTVERSION}/liboctave.so.7.0.0
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 501436)
>+++ pkg-plist	(working copy)
>@@ -752,9 +752,9 @@
> lib/octave/%%OCTAVE_VERSION%%/liboctave.so
> lib/octave/%%OCTAVE_VERSION%%/liboctave.so.7
> lib/octave/%%OCTAVE_VERSION%%/liboctave.so.7.0.0
>-lib/octave/%%OCTAVE_VERSION%%/liboctgui.so
>-lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5
>-lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5.0.0
>+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so
>+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5
>+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5.0.0
> lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so
> lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.7
> lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.7.0.0
>@@ -765,7 +765,7 @@
> lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__glpk__.oct
> lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_fltk__.oct
> lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_gnuplot__.oct
>-lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_qt__.oct
>+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_qt__.oct
> lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__ode15__.oct
> lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__voronoi__.oct
> lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/amd.oct
>@@ -783,8 +783,8 @@
> lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/symrcm.oct
> libdata/pkgconfig/octave.pc
> libdata/pkgconfig/octinterp.pc
>-libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-gui
>-libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-svgconvert
>+%%QT5%%libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-gui
>+%%QT5%%libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-svgconvert
> %%PORTDOCS%%man/man1/mkoctfile.1.gz
> %%PORTDOCS%%man/man1/octave-cli.1.gz
> %%PORTDOCS%%man/man1/octave-config.1.gz
>@@ -813,7 +813,7 @@
> %%DATADIR%%/%%OCTAVE_VERSION%%/etc/CITATION
> %%DATADIR%%/%%OCTAVE_VERSION%%/etc/NEWS
> %%DATADIR%%/%%OCTAVE_VERSION%%/etc/built-in-docstrings
>-%%DATADIR%%/%%OCTAVE_VERSION%%/etc/default-qt-settings
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/etc/default-qt-settings
> %%DATADIR%%/%%OCTAVE_VERSION%%/etc/doc-cache
> %%DATADIR%%/%%OCTAVE_VERSION%%/etc/macros.texi
> %%DATADIR%%/%%OCTAVE_VERSION%%/etc/profiler/flat.html
>@@ -1269,22 +1269,22 @@
> %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-logo.ico
> %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-logo.svg
> %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-sombrero.png
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/be_BY.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ca_ES.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/de_DE.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/en_US.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/es_ES.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/eu_ES.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/fr_FR.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/it_IT.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ja_JP.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/lt_LT.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/nl_NL.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_BR.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_PT.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ru_RU.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/uk_UA.qm
>-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/zh_CN.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/be_BY.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ca_ES.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/de_DE.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/en_US.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/es_ES.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/eu_ES.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/fr_FR.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/it_IT.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ja_JP.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/lt_LT.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/nl_NL.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_BR.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_PT.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ru_RU.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/uk_UA.qm
>+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/zh_CN.qm
> %%DATADIR%%/%%OCTAVE_VERSION%%/m/+containers/Map.m
> %%DATADIR%%/%%OCTAVE_VERSION%%/m/+matlab/+lang/makeUniqueStrings.m
> %%DATADIR%%/%%OCTAVE_VERSION%%/m/+matlab/+lang/makeValidName.m
>@@ -1578,7 +1578,7 @@
> %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/javaclasspath.m
> %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/javamem.m
> %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/javarmpath.m
>-%%DATADIR%%/%%OCTAVE_VERSION%%/m/java/octave.jar
>+%%JAVA%%%%DATADIR%%/%%OCTAVE_VERSION%%/m/java/octave.jar
> %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/usejava.m
> %%DATADIR%%/%%OCTAVE_VERSION%%/m/legacy/findstr.m
> %%DATADIR%%/%%OCTAVE_VERSION%%/m/legacy/flipdim.m

Flags:

salvadore: maintainer-approval? (stephen)

Actions: View | Diff

Attachments on bug 237854: 204339