From owner-svn-ports-all@freebsd.org Tue Jan 8 17:51:15 2019 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 0014B1485335; Tue, 8 Jan 2019 17:51:14 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9500C6F72E; Tue, 8 Jan 2019 17:51:14 +0000 (UTC) (envelope-from truckman@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 7ECB9318C; Tue, 8 Jan 2019 17:51:14 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x08HpE6J023711; Tue, 8 Jan 2019 17:51:14 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x08HpEib023710; Tue, 8 Jan 2019 17:51:14 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201901081751.x08HpEib023710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Tue, 8 Jan 2019 17:51:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489729 - head/math/scilab X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: head/math/scilab X-SVN-Commit-Revision: 489729 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9500C6F72E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 08 Jan 2019 17:51:15 -0000 Author: truckman Date: Tue Jan 8 17:51:14 2019 New Revision: 489729 URL: https://svnweb.freebsd.org/changeset/ports/489729 Log: Make USES=gl conditional on the GUI option to unbreak build when GUI is disabled. Error was: scilab-5.5.2_15 need to specify gl component with USE_GL. because USE_GUI is conditional on GUI. While here, tweak Makefile statement ordering to reduce portlint warnings. PR: 234651 Approved by: makc (maintainer) MFH: 2019Q1 Modified: head/math/scilab/Makefile Modified: head/math/scilab/Makefile ============================================================================== --- head/math/scilab/Makefile Tue Jan 8 17:36:01 2019 (r489728) +++ head/math/scilab/Makefile Tue Jan 8 17:51:14 2019 (r489729) @@ -8,14 +8,14 @@ CATEGORIES= math cad java MASTER_SITES= https://www.scilab.org/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} +MAINTAINER= makc@FreeBSD.org +COMMENT= Scientific software package for numerical computations + LICENSE= GPLv2 BSD3CLAUSE LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING-BSD -MAINTAINER= makc@FreeBSD.org -COMMENT= Scientific software package for numerical computations - # A partial dependencies list can be found at: # http://wiki.scilab.org/Dependencies_of_Scilab_5.X LIB_DEPENDS= libxml2.so:textproc/libxml2 \ @@ -28,12 +28,12 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libamd.so:math/suitesparse RUN_DEPENDS= xdg-open:devel/xdg-utils -USES= cpe desktop-file-utils fortran gettext gl gmake gnome iconv \ +USES= cpe desktop-file-utils fortran gettext gmake gnome iconv \ libtool ncurses pathfix pkgconfig shared-mime-info USE_CXXSTD= gnu++98 USE_LOCALE= en_US.UTF-8 -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -99,6 +99,7 @@ GUI_BUILD_DEPENDS= ${_GUI_DEPENDS} \ GUI_RUN_DEPENDS= ${_GUI_DEPENDS} GUI_ALL_TARGET= all doc +GUI_USES= gl GUI_USE= GL=gl JAVA=yes GUI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-bin-JAVA_HOME GUI_CONFIGURE_ON= --with-jdk=${JAVA_HOME} \