Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 May 2018 00:34:29 +0000 (UTC)
From:      Stephen Montgomery-Smith <stephen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r469260 - head/math/octave
Message-ID:  <201805070034.w470YTrI099198@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: stephen
Date: Mon May  7 00:34:29 2018
New Revision: 469260
URL: https://svnweb.freebsd.org/changeset/ports/469260

Log:
  - In the log for r469170, I forgot to mention that I added help and
    help-tools to USE_QT4.
  - I also forgot to mention Christoph Moench-Tegeder <cmt@burggraben.net>
    who told me these changes.
  
  In this revision:
  
  - Switch from QT4 to QT5.
  - Bump portrevision.
  
  Submitted by:	Adriaan de Groot <adridg@freebsd.org>
  Obtained from:	https://reviews.freebsd.org/D15328

Modified:
  head/math/octave/Makefile

Modified: head/math/octave/Makefile
==============================================================================
--- head/math/octave/Makefile	Mon May  7 00:06:09 2018	(r469259)
+++ head/math/octave/Makefile	Mon May  7 00:34:29 2018	(r469260)
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math java
 MASTER_SITES=	GNU
 
@@ -33,7 +33,7 @@ LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMag
 		libumfpack.so:math/suitesparse \
 		libglpk.so:math/glpk \
 		libgl2ps.so:print/gl2ps \
-		libqscintilla2_qt4.so:devel/qscintilla2 \
+		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libdrm.so:graphics/libdrm \
@@ -48,7 +48,8 @@ USE_TEX=	dvipsk:build formats:build
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
-USE_QT4=	corelib gui network opengl moc_build qmake_build rcc_build uic_build linguist_build help help-tools
+USE_QT5=	core gui help network opengl \
+		qmake_build buildtools_build linguist_build
 USE_XORG=	x11 xext xfixes xft
 USE_GL=		gl glu
 
@@ -71,7 +72,7 @@ CONFIGURE_ARGS=	--host=${GNU_HOST} \
 		--enable-shared \
 		--disable-jit \
 		--disable-openmp \
-		--with-qt=4 \
+		--with-qt=5 \
 		--with-OSMesa-includedir=${LOCALBASE}/include/GL \
 		--with-OSMesa-libdir=${LOCALBASE}/lib
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805070034.w470YTrI099198>