svn commit: r489729 - head/math/scilab

[Don Lewis]

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 at 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 at 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} \