From owner-svn-ports-all@freebsd.org Mon May 7 00:34:30 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F0EBFCB8FC; Mon, 7 May 2018 00:34:30 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1F0796B57E; Mon, 7 May 2018 00:34:30 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0B8F61410E; Mon, 7 May 2018 00:34:30 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w470YT63099199; Mon, 7 May 2018 00:34:29 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w470YTrI099198; Mon, 7 May 2018 00:34:29 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201805070034.w470YTrI099198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Mon, 7 May 2018 00:34:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469260 - head/math/octave X-SVN-Group: ports-head X-SVN-Commit-Author: stephen X-SVN-Commit-Paths: head/math/octave X-SVN-Commit-Revision: 469260 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2018 00:34:30 -0000 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 who told me these changes. In this revision: - Switch from QT4 to QT5. - Bump portrevision. Submitted by: Adriaan de Groot 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