Index: head/cad/openvsp/Makefile
===================================================================
--- head/cad/openvsp/Makefile	(revision 490382)
+++ head/cad/openvsp/Makefile	(revision 490383)
@@ -1,69 +1,68 @@
 # $FreeBSD$
 
 PORTNAME=	openvsp
 DISTVERSIONPREFIX=	${GH_PROJECT}_
 DISTVERSION=	3.16.2
 PORTREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Create a 3D model of an aircraft defined by engineering parameters
 
 LICENSE=	NOSA13
 LICENSE_NAME=	NASA Open Source Agreement version 1.3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_aarch64=		fails to compile: invokes x86 asm
 BROKEN_armv6=		fails to compile: invokes x86 asm
 BROKEN_armv7=		fails to compile: invokes x86 asm
 
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfltk.so:x11-toolkits/fltk \
-		libGLEW.so:graphics/glew \
 		libcpptest.so:devel/cpptest
 BUILD_DEPENDS=	${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
 
 USES=		compiler:c++11-lang cmake:noninja localbase\
 		gl gnome jpeg
 USE_GITHUB=	yes
 GH_PROJECT=	OpenVSP
 GH_ACCOUNT=	${GH_PROJECT}
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
 CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
 CMAKE_ARGS=	-DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CODEELI:BOOLEAN=no \
 		-DVSP_USE_SYSTEM_EIGEN:BOOLEAN=no \
 		-DVSP_USE_SYSTEM_LIBXML2:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_FLTK:boolean=yes \
 		-DVSP_USE_SYSTEM_CMINPACK:boolean=no \
 		-DVSP_USE_SYSTEM_GLM:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_GLEW:BOOLEAN=yes
 USE_XORG=	ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \
 		xinerama xrender xxf86vm
-USE_GL=		gl glu
+USE_GL=		gl glew glu
 
 USE_GNOME=	libxml2
 
 .include <bsd.port.options.mk>
 
 BUILD_PREFIX=	OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-${DISTVERSION}-FreeBSD
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin
 	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/vsp*
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for d in CustomScripts airfoil matlab scripts textures
 	(cd ${BUILD_WRKSRC}/${BUILD_PREFIX}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 .endfor
 	${CP} ${BUILD_WRKSRC}/${BUILD_PREFIX}/LICENSE ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/games/xptools/Makefile
===================================================================
--- head/games/xptools/Makefile	(revision 490382)
+++ head/games/xptools/Makefile	(revision 490383)
@@ -1,105 +1,103 @@
 # $FreeBSD$
 
 PORTNAME=	xptools
 DISTVERSION=	wed_161r1
 PORTREVISION=	7
 CATEGORIES=	games
 
 MAINTAINER=	mike.d.ft402@gmail.com
 COMMENT=	X-Plane Scenery Tools
 
 LICENSE=	MIT
 
 DEPRECATED=		Qt4 has been EOL since december 2015
 EXPIRATION_DATE=	2019-03-15
 
 # Platform-specific defines in patch-src_XESCore_Airports.cpp.
 # Somewhere on FlightGear wiki it is said WED would only work for AMD64 anyway.
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	gnustat:sysutils/coreutils \
 		${LOCALBASE}/lib/libntl.a:math/ntl \
 		cmake:devel/cmake
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
 		libgmp.so:math/gmp \
 		libjasper.so:graphics/jasper \
 		libgeotiff.so:graphics/libgeotiff \
 		libproj.so:graphics/proj \
 		libmpfr.so:math/mpfr \
 		libpng.so:graphics/png \
 		libshp.so:devel/shapelib \
 		libsquish.so:graphics/squish \
 		libtiff.so:graphics/tiff \
-		lib3ds.so:graphics/lib3ds \
-		libGLw.so:graphics/libGLw \
-		libGLU.so:graphics/libGLU
+		lib3ds.so:graphics/lib3ds
 
-USES=		eigen:3 gmake jpeg qt:4 sqlite ssl
+USES=		eigen:3 gl gmake jpeg qt:4 sqlite ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	X-Plane
 GH_SUBDIR=	libs:xptools_libs
 GH_TAGNAME=	982173e:xptools_libs
 
 USE_CXXSTD=	c++11
 USE_BINUTILS=	yes
+USE_GL=		gl glu glw
 USE_QT=		corelib gui moc opengl
-USE_GL+=	gl
 
 BINARIES=	DDSTool DSFTool MeshTool ObjConverter ObjView RenderFarm RenderFarmUI WED XGrinder XPlaneSupportLin.p
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DEBUG
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 IGNORE=	the Makefile has no flags for both debug and optimization
 .else
 ALL_TARGET=		debug
 .endif
 .else
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 ALL_TARGET=		release-opt
 .else
 ALL_TARGET=		release
 .endif
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e's:g++:${CXX}:g' \
 		-e's|gcc|${CC}|g' \
 		${WRKSRC}/makerules/global/toplevel.mk \
 		${WRKSRC}/src/OneOffs/Makefile
 	@${REINPLACE_CMD} \
 		-e's:-Wl,--exclude-libs,libpng.a::g' \
 		-e's:\./libs/local$$(MULTI_SUFFIX)/lib/libCGAL.a:XYZZY&:g' \
 		-e's: \./libs/local$$(MULTI_SUFFIX)/lib/libCGAL_Core.a::g' \
 		-e's:\./libs/local$$(MULTI_SUFFIX)/lib/libdime.a:XYZZY&:g' \
 		-e's: .*libz.a: /usr/lib/libz.a /usr/lib/libbz2.a /usr/lib/liblzma.a:g' \
 		-e's: \./libs/local$$(MULTI_SUFFIX)/lib: ${PREFIX}/lib:g' \
 		-e's: ${PREFIX}/lib/libtiff.a:& ${PREFIX}/lib/libjbig.a:g' \
 		-e's:XYZZY::g' \
 		-e's: -ldl: -lexecinfo -lelf:g' \
 		${WRKSRC}/makerules/ac3d \
 		${WRKSRC}/makerules/DDSTool \
 		${WRKSRC}/makerules/DSFTool \
 		${WRKSRC}/makerules/ObjConverter \
 		${WRKSRC}/makerules/ObjView \
 		${WRKSRC}/makerules/RenderFarm \
 		${WRKSRC}/makerules/WED \
 		${WRKSRC}/makerules/XGrinder
 
 pre-build:
 	cd ${WRKSRC}/libs && ${GMAKE}
 
 do-install:
 .for f in ${BINARIES}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/*/*/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 .include <bsd.port.mk>