Index: head/cad/calculix/Makefile
===================================================================
--- head/cad/calculix/Makefile	(revision 516744)
+++ head/cad/calculix/Makefile	(revision 516745)
@@ -1,95 +1,95 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	calculix
 PORTVERSION=	2.15
 PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
 DIST_SUBDIR=	calculix
 EXTRACT_ONLY=	${DIST_SOURCES}
 
 MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	Three-Dimensional Structural Finite Element Program
 
 LICENSE=	GPLv2
 
 BROKEN_aarch64=		fails to link: shapeFunctions.c:(function attach_new): relocation R_AARCH64_CALL26 out of range
 
 RUN_DEPENDS=	ccx:cad/calculix-ccx
 
-USES=		gmake tar:bzip2 compiler:c++11-lib
+USES=		gl gmake tar:bzip2 compiler:c++11-lib xorg
 USE_XORG=	ice sm x11 xext xi xmu xt
 USE_GL=		gl glu # uses its own glut
 
 DIST_SOURCES=	cgx_${PORTVERSION}.all${EXTRACT_SUFX}
 DIST_HTM=	cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
 DIST_PDF=	cgx_${PORTVERSION}.pdf
 DIST_EXAMPLES=	cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/CalculiX
 CGX_VER=	cgx_${PORTVERSION}
 
 CXXFLAGS+=	-std=c++98
 
 BROWSER?=	firefox
 PSVIEWER?=	gv
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 DISTFILES+=	${DIST_EXAMPLES}
 EXTRACT_ONLY+=	${DIST_EXAMPLES}
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${DIST_HTM} ${DIST_PDF}
 EXTRACT_ONLY+=	${DIST_HTM}
 DOCSDIR=	${PREFIX}/share/doc/CalculiX
 .endif
 
 .if ${ARCH} == "sparc64"
 CFLAGS+=	-fPIC
 FFLAGS+=	-fPIC
 .else
 CFLAGS+=	-fpic
 FFLAGS+=	-fpic
 .endif
 
 pre-build:
 	@${REINPLACE_CMD} -e 's!c++!${CXX}!g;' \
 		${WRKSRC}/libSNL/src/makefile
 	@${REINPLACE_CMD} -e 's+%%DOCSDIR%%+${DOCSDIR}+g; \
 	s+"firefox"+"${BROWSER}"+ ; \
 	s+"gv"+"${PSVIEWER}"+ ;' \
 		${WRKSRC}/${CGX_VER}/src/cgx.h
 
 do-build:
 	@(cd ${WRKSRC}/libSNL/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
 	@(cd ${WRKSRC}/${CGX_VER}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${CGX_VER}/src/cgx \
 	  ${STAGEDIR}${PREFIX}/bin/cgx
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/cgx
 	@(cd ${WRKSRC}/${CGX_VER}/doc/cgx && ${COPYTREE_SHARE} . \
 	  ${STAGEDIR}${DOCSDIR}/cgx)
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cgx_${PORTVERSION}.pdf \
 	  ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	# Some garbage crept in
 	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/constant/polyMesh/*~
 	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/constant/*~
 	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/system/*~
 	@${RM} ${WRKSRC}/${CGX_VER}/examples/ifwhiledemo/*.*~
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/${CGX_VER}/examples && ${COPYTREE_SHARE} . \
 	  ${STAGEDIR}${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
Index: head/cad/dinotrace/Makefile
===================================================================
--- head/cad/dinotrace/Makefile	(revision 516744)
+++ head/cad/dinotrace/Makefile	(revision 516745)
@@ -1,43 +1,43 @@
 # Created by: Joachim Strombergson <watchman@ludd.ltu.se>
 # $FreeBSD$
 
 PORTNAME=	dinotrace
 PORTVERSION=	9.4c
 PORTREVISION=	8
 CATEGORIES=	cad
 MASTER_SITES=	http://www.veripool.org/ftp/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical signal trace waveform viewer
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake motif perl5 tar:tgz
+USES=		gmake motif perl5 tar:tgz xorg
 USE_XORG=	x11 sm ice xmu xt
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 
 INFO=		dinotrace
 PLIST_FILES=	bin/dinotrace
 
 OPTIONS_DEFINE=	EMACS
 OPTIONS_DEFAULT=	EMACS
 EMACS_DESC=	Install Emacs supplimentary files
 
 EMACS_USES=	emacs:run
 EMACS_RUN_DEPENDS=	verilog-mode.el${EMACS_PKGNAMESUFFIX}>0:cad/verilog-mode.el@${EMACS_FLAVOR}
 EMACS_PLIST_FILES=	${EMACS_SITE_LISPDIR}/dinotrace.el ${EMACS_SITE_LISPDIR}/sim-log.el
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"-O3"|""|' ${WRKSRC}/configure
 
 post-install-EMACS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 .for F in dinotrace.el sim-log.el
 	${INSTALL_DATA} ${WRKSRC}/lisp/${F} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/cad/feappv/Makefile
===================================================================
--- head/cad/feappv/Makefile	(revision 516744)
+++ head/cad/feappv/Makefile	(revision 516745)
@@ -1,50 +1,50 @@
 # Created by: Pedro F. Giffuni <giffunip@asme.org>
 # $FreeBSD$
 
 PORTNAME=	feappv
 PORTVERSION=	4.1i
 PORTREVISION=	4
 DISTVERSIONPREFIX=v
 CATEGORIES=	cad science
 MASTER_SITES=	http://projects.ce.berkeley.edu/feap/${PORTNAME}/:1
 DISTFILES=	${PORTDOCS}:1
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Finite element analysis program (personal version)
 
-USES=		fortran gmake localbase:ldflags
+USES=		fortran gmake localbase:ldflags xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	sanjayg0
 USE_XORG=	x11
 MAKEFILE=	makefile
 MAKE_ENV=	FEAPPVHOME4_1="${WRKSRC}"
 ALL_TARGET=	install
 
 LDFLAGS+=	-lX11 -lm
 
 PLIST_FILES=	bin/feappv lib/libfeappv.a
 PORTDOCS=	manual41.pdf
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's| make | $$(MAKE) |' ${WRKSRC}/makefile
 	@${REINPLACE_CMD} -e \
 		'/^  FF /s|=.*|= ${FC}| ; \
 		 /^  CC /s|=.*|= ${CC}| ; \
 		 /^  FFOPTFLAG /s|=.*|= ${FFLAGS}| ; \
 		 /^  CCOPTFLAG /s|=.*|= ${CFLAGS}| ; \
 		 /^  LDOPTIONS /s|=.*|= ${LDFLAGS}| ; \
 		 s|Feappv.a|libfeappv.a|' ${WRKSRC}/makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/feappv ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/libfeappv.a ${STAGEDIR}${PREFIX}/lib
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DISTDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/cad/gmsh/Makefile
===================================================================
--- head/cad/gmsh/Makefile	(revision 516744)
+++ head/cad/gmsh/Makefile	(revision 516745)
@@ -1,71 +1,72 @@
 # Created by: Pedro Giffuni <giffunip@asme.org>
 # $FreeBSD$
 
 PORTNAME=	gmsh
 DISTVERSION=	4.3.0
 PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://gmsh.info/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 DIST_SUBDIR=	gmsh
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Automatic 3D finite element mesh generator
 
 LICENSE=	AGPLv3+ APACHE20 GPLv3+ GPLv2+ LGPL21
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgmp.so:math/gmp \
 		libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libsz.so:science/szip \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	getdp:science/getdp
 
-USES=		blaslapack compiler:c++11-lang cmake fortran gl jpeg tar:tgz
+USES=		blaslapack compiler:c++11-lang cmake fortran gl jpeg tar:tgz \
+		xorg
 USE_GL=		gl glu
 USE_XORG=	x11 xcursor xext xinerama xfixes xft xrender
 
 CMAKE_ARGS=	-DCMAKE_SKIP_RPATH:BOOL=YES
 
 OPTIONS_DEFINE=	CGNS DOCS MED OCC SHARED STATIC
 OPTIONS_DEFAULT=	CGNS MED OCC
 OPTIONS_SUB=	yes
 
 CGNS_DESC=	Enable CGNS mesh import
 MED_DESC=	Enable MED mesh and post file formats
 OCC_DESC=	Enable OpenCASCADE geometrical models
 SHARED_DESC=	Build shared library and install header files
 STATIC_DESC=	Build static library
 
 PLIST_SUB=	VER=${PORTVERSION} VE=${PORTVERSION:R}
 
 # TODO
 # Dependencies against PythonLibs, swig and petsc are found and registered if
 # installed
 # => add knobs to handle them.
 
 CGNS_CMAKE_BOOL=	ENABLE_CGNS
 CGNS_LIB_DEPENDS=	libcgns.so:science/cgnslib
 DOCS_CMAKE_BOOL=	INSTALL_DOCS
 MED_CMAKE_BOOL=		ENABLE_MED
 MED_LIB_DEPENDS=	libmed.so:french/med
 OCC_CMAKE_BOOL=		ENABLE_OCC
 OCC_CMAKE_ON=		-DOCC_INC=${LOCALBASE}/include/OpenCASCADE
 OCC_LIB_DEPENDS=	libopenblas.so:math/openblas libTKernel.so:cad/opencascade
 OCC_USES=		gnome
 OCC_USE=		gnome=cairo
 SHARED_CMAKE_BOOL=	ENABLE_BUILD_SHARED
 SHARED_USE=		LDCONFIG=yes
 STATIC_CMAKE_BOOL=	ENABLE_BUILD_LIB
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|share/doc/gmsh|${DOCSDIR_REL}|" \
 		-e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt
 
 post-install-SHARED-on:
 	${RM} -r ${STAGEDIR}/wrkdirs
 
 .include <bsd.port.mk>
Index: head/cad/irsim/Makefile
===================================================================
--- head/cad/irsim/Makefile	(revision 516744)
+++ head/cad/irsim/Makefile	(revision 516745)
@@ -1,55 +1,55 @@
 # Created by: swallace
 # $FreeBSD$
 
 PORTNAME=	irsim
 PORTVERSION=	9.7.100
 PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/irsim/archive/
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Event-driven logic-level simulator for MOS circuis
 
 LICENSE=	GPLv2
 
 OPTIONS_RADIO=	INTERPRETER
 OPTIONS_RADIO_INTERPRETER=	SCHEME TCL
 OPTIONS_DEFAULT=	SCHEME
 SCHEME_DESC=	Scheme interpreter
 TCL_DESC=	Tcl interpreter
 OPTIONS_SUB=	yes
 
 SCHEME_CONFIGURE_ON=	--with-interpreter=scheme
 TCL_CONFIGURE_ON=	--with-interpreter=tcl
 TCL_USES=		tk:tea
 
 CONFIGURE_WRKSRC=	${WRKSRC}/scripts
 
-USES=	gmake tar:tgz
+USES=	gmake tar:tgz xorg
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTCL}
 PLIST_SUB+=	NOTCL="@comment "
 .else
 WISH=		${FALSE}
 PLIST_SUB+=	NOTCL=""
 .endif
 
 .if empty(PORT_OPTIONS:MSCHEME) && empty(PORT_OPTIONS:MTCL)
 CONFIGURE_ARGS+=	--with-interpreter=no
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|FreeBSD-\*|*-*-freebsd*| ; \
 		 s|wish |${WISH:T} | ; \
 		 s|"-fpic"|"-fPIC"| ; \
 		 /-l\/usr\/X11R6\/include/d' ${CONFIGURE_WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/cad/kicad/Makefile
===================================================================
--- head/cad/kicad/Makefile	(revision 516744)
+++ head/cad/kicad/Makefile	(revision 516745)
@@ -1,82 +1,82 @@
 # Created by: Thierry Thomas <thierry@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kicad
 PORTVERSION=	5.1.4
 PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	cad
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Schematic and PCB editing software
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm	\
 		swig3.0:devel/swig30
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs	\
 		libngspice.so:cad/ngspice_rework@shlib	\
 		libTKernel.so:cad/opencascade		\
 		libpixman-1.so:x11/pixman		\
 		libpng.so:graphics/png			\
 		libcurl.so:ftp/curl
 
 CONFLICTS=	kicad-devel-r201*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KiCad
 GH_PROJECT=	kicad-source-mirror
 
 USES=		cmake:noninja compiler:c++11-lib desktop-file-utils gl gnome	\
-		pkgconfig python:2.7 shared-mime-info shebangfix ssl tar:xz
+		pkgconfig python:2.7 shared-mime-info shebangfix ssl tar:xz xorg
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 
 USE_XORG=	ice x11 xext
 USE_GL=		gl glew glu glut
 USE_WX=		3.0
 WX_COMPS=	python:lib wx
 USE_GNOME=	atk cairo
 CXXFLAGS+=	--std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}	\
 		-DwxWidgets_USE_UNICODE=ON			\
 		-DKICAD_SCRIPTING_WXPYTHON=ON			\
 		-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD}		\
 		-DKICAD_SCRIPTING=ON 				\
 		-DKICAD_SCRIPTING_MODULES=ON			\
 		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF		\
 		-DKICAD_USE_OCE=OFF				\
 		-DKICAD_USE_OCC=ON				\
 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
 OPTIONS_DEFINE=	DOCS DOXYGEN NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 DOXYGEN_VARS=	LICENSE+=GFDL LICENSE_COMB=multi
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_ALL_TARGET=	all doxygen-docs
 DOXYGEN_PORTDOCS=	doxygen
 
 # The CheckCXXSymbolExists module has been shipped with CMake since 3.0 times.
 # The ancient implementation that this bundled module uses, no longer works
 # because it uses CMake internals that have gone away in 3.11.
 post-extract:
 	${RM} ${WRKSRC}/CMakeModules/CheckCXXSymbolExists.cmake
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/share/kicad|${DATADIR}|'		\
 		-e 's|/usr/local|${PREFIX}|'				\
 		${WRKSRC}/common/gestfich.cpp
 	${REINPLACE_CMD} -e 's|/usr/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \
 		${WRKSRC}/common/pgm_base.cpp
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/cad/kicad-devel/Makefile
===================================================================
--- head/cad/kicad-devel/Makefile	(revision 516744)
+++ head/cad/kicad-devel/Makefile	(revision 516745)
@@ -1,161 +1,161 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
 PORTREVISION=	11
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}
 
 MAINTAINER=		mr@FreeBSD.org
 COMMENT=		Schematic and PCB editing software
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/bin/swig3.0:devel/swig30
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libngspice.so:cad/ngspice_rework@shlib \
 		libTKernel.so:cad/opencascade \
 		libpixman-1.so:x11/pixman \
 		libpng.so:graphics/png \
 		libcurl.so:ftp/curl
 
 CONFLICTS=	kicad-4.*
 
 USE_GITHUB=     yes
 GH_ACCOUNT=     KiCad
 GH_PROJECT=     kicad-source-mirror
 GH_TAGNAME=	${GIT_SRC_HASH}
 
 CXXFLAGS+=	--std=c++11 -I${WRKSRC} -I${WRKSRC}/include -I${LOCALBASE}/include -msse
 USE_GL=		gl glew glu glut
 USE_WX=		3.0
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_GNOME=	atk cairo	# Required by libwx_gtk2_aui-2.8.so
 USE_XORG+=	ice pixman x11 xext
 
 BROKEN_aarch64=		Fails to compile: use of undeclared identifier builtin_ia32_emms
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_SUB=	OPSYS=${OPSYS}	\
 		DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
 BINS=		cvpcb eeschema gerbview kicad pcbnew
 EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 		contrib_makefiles.txt running_kicad_under_W98.txt
 USES=		desktop-file-utils shared-mime-info compiler:c++11-lib tar:bzip2 cmake:insource,noninja \
-		gettext python:2.7 shebangfix ssl
+		gettext python:2.7 shebangfix ssl gl xorg gnome
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Debug" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION} \
 		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
 		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
 		-DwxWidgets_USE_DEBUG=ON \
 		-DwxWidgets_USE_USE_UNICODE=ON \
 		-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \
 		-DKICAD_SCRIPTING=ON \
 		-DKICAD_SCRIPTING_MODULES=ON \
 		-DKICAD_SCRIPTING_WXPYTHON=ON \
 		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF \
 		-DKICAD_SKIP_BOOST=YES \
 		-DKICAD_SPICE=ON \
 		-DKICAD_USE_OCE=OFF \
 		-DKICAD_USE_OCC=ON \
 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 
 .include "Makefile.git_rev"
 
 showversions:
 	@${ECHO} "GIT_SRC_HASH: ${GIT_SRC_HASH}"
 	@${ECHO} "GIT_SRC_DATE: ${GIT_SRC_DATE}"
 	@${ECHO} "DISTDIR: ${DISTDIR}"
 	@${ECHO} "DIST_SUBDIR: ${DIST_SUBDIR}"
 	@${ECHO} "DISTNAME: ${DISTNAME}"
 	@${ECHO} "DISTVERSION: ${DISTVERSION}"
 
 # Updating to new rev:
 # sh files/newVersion.sh
 # make makesum && make clean
 # make install #breaks probably due to plist differences
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
 # < Check PLIST_FILE_LIST below >
 
 tmp:
 	echo "${DATADIR} ${DATADIR:H}"
 
 # The CheckCXXSymbolExists module has been shipped with CMake since 3.0 times.
 # The ancient implementation that this bundled module uses, no longer works
 # because it uses CMake internals that have gone away in 3.11.
 post-extract:
 	${RM} ${WRKSRC}/CMakeModules/CheckCXXSymbolExists.cmake
 
 post-configure:
 	${REINPLACE_CMD} -e 's|#define HAVE_ISO646_H|//#define HAVE_ISO646_H|'     \
 		${WRKSRC}/config.h
 	for f in `${FIND} ${WRKSRC} -name \*.make -o -name link.txt` ; do				\
 		${REINPLACE_CMD}						\
 		-e 's|CC = gcc|#CC = gcc|'					\
 		-e 's|LD = gcc|LD = ${CC}|'					\
 		-e 's|LD = g++|LD = ${CXX}|'					\
 		-e 's|wx-config|${WX_CONFIG}|'					\
 		-e 's|CXX_FLAGS =|CXX_FLAGS = -I${LOCALBASE}/include|'		\
 		-e 's|C_FLAGS =|C_FLAGS = -I${LOCALBASE}/include|'		\
 		-e 's|LDFLAGS =|LDFLAGS += -L${LOCALBASE}/lib|'			\
 		-e 's|gcc -D|${CC} -D|'						\
 		-e 's/-pthread;-D_THREAD_SAFE/-pthread -D_THREAD_SAFE/g'	\
 		$$f ;								\
 	done
 
 pre-install:
 	@echo "${DATADIR}, ${DOCSDIR}"
 
 #post-install:
 #.for subdir in library modules template
 #	${CP} -Rp ${WRKDIR}/kicad-library-master/${subdir} ${STAGEDIR}${DATADIR}
 #.endfor
 #.for subdir in internat
 #	${CP} -Rp ${WRKDIR}/kicad-doc/${subdir} ${STAGEDIR}${DOCSDIR}
 #.endfor
 
 PLIST_FILE_LIST=	bin/freeroute.jnlp \
 			bin/cvpcb \
 			bin/eeschema \
 			bin/gerbview \
 			bin/kicad \
 			bin/pcbnew \
 			bin/pl_editor \
 			bin/bitmap2component \
 			bin/pcb_calculator \
 			share/mimelnk/application/x-kicad-schematic.desktop \
 			share/mimelnk/application/x-kicad-project.desktop \
 			share/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/48x48/apps/kicad.png \
 			share/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/scalable/apps/kicad.svg \
 			share/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg \
 			share/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/22x22/mimetypes/application-x-kicad-project.png \
 			share/mime/packages/kicad.xml \
 			share/applications/kicad.desktop \
 			share/applications/eeschema.desktop
 
 PLIST_DIR_LIST=		lib/kicad
 
 PLIST_SHAREDDIR_LIST=	share/mimelnk/application \
 			share/mimelnk
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc
 IGNORE=		builds only with clang
 .endif
 
 .include <bsd.port.post.mk>
Index: head/cad/librecad/Makefile
===================================================================
--- head/cad/librecad/Makefile	(revision 516744)
+++ head/cad/librecad/Makefile	(revision 516745)
@@ -1,53 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	librecad
 DISTVERSION=	2.2.0-rc1
 PORTREVISION=	10
 CATEGORIES=	cad
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	2D CAD system
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/licenses/gpl-2.0.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
 LIB_DEPENDS=	libmuparser.so:math/muparser \
 		libfreetype.so:print/freetype2
 
-USES=		compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:5
+USES=		compiler:c++11-lib desktop-file-utils pkgconfig gl qmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	LibreCAD
 GH_PROJECT=	LibreCAD
 USE_GL=		gl
 USE_QT=		core gui printsupport svg widgets \
 		buildtools_build linguisttools_build
 
 QMAKE_ARGS+=	BOOST_DIR="${LOCALBASE}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|QMAKE_CXXFLAGS += -g||' \
 		${WRKSRC}/common.pri
 	@${REINPLACE_CMD} -e 's|lrelease|${LRELEASE}|' \
 		${WRKSRC}/scripts/postprocess-unix.sh
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/librecad/src/lib/engine/rs_settings.cpp \
 		${WRKSRC}/librecad/src/lib/engine/rs_system.cpp
 
 pre-install:
 	@${CHMOD} +w ${WRKSRC}/unix/resources/plugins/*.so
 	@${STRIP_CMD} ${WRKSRC}/unix/resources/plugins/*.so
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/librecad ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/ttf2lff ${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC}/unix/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo
 	${INSTALL_DATA} ${WRKSRC}/unix/appdata/librecad.appdata.xml \
 		${STAGEDIR}${PREFIX}/share/metainfo
 	${INSTALL_DATA} ${WRKSRC}/desktop/librecad.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/librecad/res/main/librecad.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
Index: head/cad/linuxcnc-devel/Makefile
===================================================================
--- head/cad/linuxcnc-devel/Makefile	(revision 516744)
+++ head/cad/linuxcnc-devel/Makefile	(revision 516745)
@@ -1,61 +1,62 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	linuxcnc
 PORTVERSION=	20170708
 PORTREVISION=	15
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Open Source CNC machine controller
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libBLT25.so:x11-toolkits/blt \
 		${PY_BOOST} \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libmodbus.so:comms/libmodbus \
 		libncurses.so:devel/ncurses \
 		libXaw.so:x11-toolkits/libXaw \
 		libtclx8.4.so:lang/tclX
 RUN_DEPENDS=	bash:shells/bash \
 		bwidget>=1.4:x11-toolkits/bwidget \
 		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:x11-toolkits/py-vte \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext \
 		${LOCALBASE}/lib/Img/libtkimg1.4.7.so:graphics/libimg
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 NO_PACKAGE=	Licensing conflict between LinuxCNC (GPL2) and readline (GPL3)
 
 WRKSRC_SUBDIR=	src
 PATCH_WRKSRC=	${WRKDIR}/linuxcnc-${GH_TAGNAME}
 ALL_TARGET=	default
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-realtime=uspace --enable-non-distributable=yes \
 		CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
 		CXXFLAGS="-I${LOCALBASE}/include" CXX="${CXX}" CC="${CC}" \
 		--with-locale-dir="${PREFIX}/share/locale" --with-python=${PYTHON_CMD} \
 		--with-boost-python=boost_python27
 MAKE_ENV=	BUILD_VERBOSE=1
-USES=		autoreconf gettext gmake ncurses pkgconfig python:2.7 readline shebangfix tk
+USES=		autoreconf gettext gl gmake gnome ncurses pkgconfig python:2.7 \
+		readline shebangfix tk xorg
 USE_GL=		gl glu
 USE_GNOME=	cairo gdkpixbuf2 libgnomeprintui pygtksourceview
 USE_XORG=	ice sm x11 xext xft xinerama xmu xrender xscrnsaver xt
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	LinuxCNC
 GH_TAGNAME=	5b7929df50e0574cb1105143fffe525916d8a4c2
 
 post-patch:
 		${FIND} ${PATCH_WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i '' \
 			-e 's|#!.*/bin/bash|#!${LOCALBASE}/bin/bash|' \
 			-e 's|#!.*/usr/bin/tclsh|#!${LOCALBASE}/bin/tclsh8.6|' \
 			-e 's|#!.*/usr/bin/wish|#!${LOCALBASE}/bin/wish8.6|' \
 			-e 's|#!.*/usr/bin/env python|#!/usr/bin/env python2.7|' \
 			-e 's|#!.*/usr/bin/python|#!/usr/bin/env python2.7|' \
 			-e 's|lib/tcltk|lib/tcllib|'
 
 .include <bsd.port.mk>
Index: head/cad/magic/Makefile
===================================================================
--- head/cad/magic/Makefile	(revision 516744)
+++ head/cad/magic/Makefile	(revision 516745)
@@ -1,54 +1,54 @@
 # Created by: swallace
 # $FreeBSD$
 
 PORTNAME=	magic
 PORTVERSION=	7.5.240
 PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/magic/archive/ \
 		http://fossies.org/linux/misc/
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Interactive editor for VLSI layouts
 
 LICENSE=	MIT
 LICENSE_FILE=	${FILESDIR}/license.txt
 
 LIB_DEPENDS=	libBLT25.so:x11-toolkits/blt
 
-USES=		gmake tk:tea tar:tgz
+USES=		gmake gl tk:tea tar:tgz xorg
 USE_XORG=	ice xext xi xmu
 USE_GL=		gl
 CONFIGURE_ARGS=	--with-opengl
 CONFIGURE_WRKSRC=	${WRKSRC}/scripts
 ALL_TARGET=	tcllibrary
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DESKTOP_ENTRIES="Magic" "" "" "${PORTNAME}" "" ""
 
 PORTSCOUT=	limit:^7\.
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^#!.*|#!${AWK} -f|' ${WRKSRC}/ext2spice/spice2sim
 	@${REINPLACE_CMD} -e \
 		's|TCL_LIB_NAME=.*|TCL_LIB_NAME="tcl${TCL_VER:S/.//}"|g ; \
 		 s|TK_LIB_NAME=.*|TK_LIB_NAME="tk${TK_VER:S/.//}"|g ; \
 		 s|wish$${TK_VERSION}|${WISH:T}|g ; \
 		 s|tclsh$${TK_VERSION}|${TCLSH:T}|g ; \
 		 s|-l/usr/X11R6/include|-I${LOCALBASE}/include|g' \
 	    ${CONFIGURE_WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		'/CFLAGS/s| -pg | |' ${WRKSRC}/tcltk/Makefile
 	@${REINPLACE_CMD} -e \
 		's|^#!.*|#!${TCLSH}|' ${WRKSRC}/tcltk/strip_reflibs.tcl
 	@${REINPLACE_CMD} -e \
 		's|^#!.*|#!${WISH}|' ${WRKSRC}/tcltk/tkshell.tcl
 
 pre-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} database/database.h)
 
 .include <bsd.port.mk>
Index: head/cad/netgen/Makefile
===================================================================
--- head/cad/netgen/Makefile	(revision 516744)
+++ head/cad/netgen/Makefile	(revision 516745)
@@ -1,70 +1,70 @@
 # Created by: Thierry Thomas <thierry@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	netgen
 PORTVERSION=	5.3.1
 PORTREVISION=	10
 CATEGORIES=	cad
 #MASTER_SITES=	SF/netgen-mesher/netgen-mesher/${PORTVERSION:C|\.[[:digit:]]+$||}/
 MASTER_SITES=	http://faculty.missouri.edu/~stephen/
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Automatic 3D tetrahedral mesh generator
 
 LIB_DEPENDS=	libTix8.4.3.so:x11-toolkits/tix \
 		libtogl.so:graphics/togl
 
 OCC_BROKEN=	Does not compile because of issues with cad/opencascade
 
 USE_LDCONFIG=	yes
-USES=		gmake jpeg libtool localbase tk:tea
+USES=		gl gmake jpeg libtool localbase tk:tea xorg
 USE_GL=		gl glu
 USE_XORG=	x11 xmu xi
 MAKE_JOBS_UNSAFE=	yes
 CPPFLAGS+=	-isystem ${LOCALBASE}/lib/Togl-1.7
 CONFIGURE_ARGS=	--enable-jpeglib
 INSTALL_TARGET=	install-strip
 
 FETCH_BEFORE_ARGS+=	-o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
 OPTIONS_DEFINE=		OCC FFMPEG
 OCC_DESC=		Compile with OpenCascade geometry kernel
 FFMPEG_DESC=		video recording with FFmpeg
 OPTIONS_DEFAULT=	# OCC
 
 BROKEN_sparc64=		internal gcc error (Bug 23159)
 
 OCC_LIB_DEPENDS=	libTKernel.so:cad/opencascade
 OCC_CXXFLAGS=		-DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/OpenCASCADE
 OCC_CONFIGURE_ON=	--enable-occ
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ON=	--enable-ffmpeg
 
 MACHINE=	${OPSYS:tu}
 
 SUB_LIST=	PREFIX=${PREFIX}
 SUB_FILES=	pkg-message
 MAKE_ENV=	TK_VER=${TK_VER} TCL_VER=${TCL_VER}	\
 		TCL_INCLUDEDIR="${TCL_INCLUDEDIR}"	\
 		TK_INCLUDEDIR="${TK_INCLUDEDIR}"	\
 		MACHINE=${MACHINE} MAKE=${MAKE_CMD}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/ngdir/s,"\.","${PREFIX}/bin",' \
 		${WRKSRC}/ng/ng.tcl \
 		${WRKSRC}/ng/ngappinit.cpp
 
 post-install:
 #	copy some additional headers for build cad/salome-netgenplugin
 	${MKDIR} ${STAGEDIR}${DATADIR}/include
 	${SH} ${FILESDIR}/netgen_copy_include_for_salome ${WRKSRC} ${STAGEDIR}${PREFIX}
 	${LN} ${STAGEDIR}${PREFIX}/lib/libnglib.so ${STAGEDIR}${PREFIX}/lib/libnglib.so.1
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300014
 BROKEN=			does not build with recent versions of FreeBSD
 .endif
 
 .include <bsd.port.post.mk>
Index: head/cad/openscad/Makefile
===================================================================
--- head/cad/openscad/Makefile	(revision 516744)
+++ head/cad/openscad/Makefile	(revision 516745)
@@ -1,51 +1,51 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	openscad
 PORTVERSION=	2019.05.10
 PORTREVISION=	3
 #PORTREVISION=	1
 CATEGORIES=	cad
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	b6c170cc5dd1.patch:-p1
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libopencsg.so:graphics/opencsg \
 		libCGAL.so:math/cgal \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
 CONFLICTS=	openscad
 
 USES=		bison compiler:c++11-lib desktop-file-utils eigen:3 gettext \
-		pkgconfig qmake qt:5 shared-mime-info
+		gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
 USE_GNOME=	glib20 libxml2
 USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
 USE_XORG=	x11
 GH_TAGNAME=	0f6d569b57112b79f657a82b0809dc420fbff163
 QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 LDFLAGS+=	-Wl,--as-needed
 
 post-patch:
 	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/openscad.pro
 
 .include <bsd.port.mk>
Index: head/cad/openscad-devel/Makefile
===================================================================
--- head/cad/openscad-devel/Makefile	(revision 516744)
+++ head/cad/openscad-devel/Makefile	(revision 516745)
@@ -1,51 +1,51 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	openscad
 PORTVERSION=	2019.09.05
 #PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	b6c170cc5dd1.patch:-p1
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libopencsg.so:graphics/opencsg \
 		libCGAL.so:math/cgal \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
 CONFLICTS=	openscad
 
 USES=		bison compiler:c++11-lib desktop-file-utils eigen:3 gettext \
-		pkgconfig qmake qt:5 shared-mime-info
+		gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
 USE_GNOME=	glib20 libxml2
 USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
 USE_XORG=	x11
 GH_TAGNAME=	e891d31bafea7c5f2e0004e4501dc8d2391862f3
 QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 LDFLAGS+=	-Wl,--as-needed
 
 post-patch:
 	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/openscad.pro
 
 .include <bsd.port.mk>
Index: head/cad/pcb/Makefile
===================================================================
--- head/cad/pcb/Makefile	(revision 516744)
+++ head/cad/pcb/Makefile	(revision 516745)
@@ -1,73 +1,73 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pcb
 PORTVERSION=	4.2.0
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	X11 interactive printed circuit board layout system
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	m4>=1.4.11:devel/m4 \
 		${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
 LIB_DEPENDS=	libgd.so:graphics/gd \
 		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	m4>=1.4.11:devel/m4 \
 		${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
 
 USES=		gl gmake gnome pkgconfig tk:run shared-mime-info \
-		desktop-file-utils
+		desktop-file-utils xorg
 USE_GL=		gl glu
 USE_GNOME=	intltool cairo pangox-compat
 USE_XORG=	x11 xrender xinerama
 
 CONFLICTS=	gts-[0-9]*
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	INSTALL_DATA="${BSD_INSTALL_DATA}"
 LDFLAGS+=	-lpthread
 
 PORTDOCS=	\
 	pcb.html pcb.pdf refcard.pdf pad.png puller.png thermal.png	\
 	examples tutorial gcode.png gcode_control_img.png		\
 	gcode_tool_path.png
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=MOTIF GTK NONE
 OPTIONS_DEFAULT=GTK
 DOCS_CONFIGURE_ENABLE=	doc
 DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE} \
 			${ICONV_CONFIGURE_ARG}
 NLS_CONFIGURE_OFF=	--without-libintl \
 			--without-iconv
 NLS_USES=	gettext iconv
 .for L in fr nl ru pt_BR
 NLS_PLIST_FILES+=	share/locale/${L}/LC_MESSAGES/pcb.mo
 .endfor
 MOTIF_DESC=	Motif widgets
 MOTIF_USES=	motif
 MOTIF_CONFIGURE_ON=	--with-gui=lesstif
 MOTIF_CONFIGURE_ENV=	WISH=${WISH}
 GTK_DESC=	GIMP ToolKit widgets
 GTK_USE=	GNOME=gtk20
 GTK_CONFIGURE_ON=	--with-gui=gtk
 GTK_CONFIGURE_ENV=	WISH=${WISH}
 NONE_DESC=	No GUI support
 NONE_CONFIGURE_ON=	--without-gui
 NONE_CONFIGURE_ENV=	WISH=/usr/bin/true
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	Uses x86 specific libc functions and has not been ported
 
 DOCS_INFO=		pcb
 
 .include <bsd.port.mk>
Index: head/cad/qcad/Makefile
===================================================================
--- head/cad/qcad/Makefile	(revision 516744)
+++ head/cad/qcad/Makefile	(revision 516745)
@@ -1,82 +1,82 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	qcad
 PORTVERSION=	3.22.0.12
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 #PORTREVISION=
 CATEGORIES=	cad
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Professional CAD system
 
 LICENSE=	GPLv3
 
 .if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
 BROKEN_i386=	ld: error: relocation R_386_PC32 cannot be used against symbol ON_GetPointListBoundingBox
 .endif
 
 BUILD_DEPENDS=	bash:shells/bash	\
 		${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs
 
 MAKE_JOBS_UNSAFE=yes
 
-USES=		compiler:c++11-lang gmake qmake qt:5
+USES=		compiler:c++11-lang gl gmake qmake qt:5
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 USE_QT=		buildtools qmake_build \
 		designer gui help imageformats network opengl script \
 		scripttools sql svg uitools xml xmlpatterns webkit
 USE_GL=		glu
 
 DESKTOP_ENTRIES="QCad"	\
 		"" \
 		"${DATADIR}/scripts/qcad_icon.png"	\
 		"${PREFIX}/bin/qcad-bin"	\
 		""	\
 		true
 
 .if defined(WITH_DEBUG)
 RESDIR=		${WRKSRC}/debug
 .else
 RESDIR=		${WRKSRC}/release
 .endif
 
 SHRLIBS=	qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations	\
 		qcadsnap qcadspatialindex qcadstemmer spatialindexnavel
 STALIBS=	dxflib stemmer
 SHRDIR=		fonts libraries linetypes patterns plugins scripts themes ts
 #QSCRIPTS should not be installed to avoid conflicts with texlive-base
 QSCRIPTS=	bbox dwg2bmp dwg2pdf dwg2svg
 
 OPTIONS_DEFINE=	EXAMPLES
 
 CFLAGS_i386= -fPIC
 CXXFLAGS_i386= -fPIC
 
 pre-configure:
 	${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|"	\
 		${WRKSRC}/src/core/RS.cpp
 	${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|"	\
 		${WRKSRC}/src/core/RSettings.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${RESDIR}/qcad-bin ${STAGEDIR}${PREFIX}/bin/
 	${LN} -sf qcad-bin ${STAGEDIR}${PREFIX}/bin/qcad
 .for lib in ${SHRLIBS:C|^|lib|:C|$|.so|}
 	${INSTALL_LIB} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/${lib}.0
 	${LN} -sf ${lib}.0 ${STAGEDIR}${PREFIX}/lib/${lib}
 .endfor
 .for lib in ${STALIBS:C|^|lib|:C|$|.a|}
 	${INSTALL_DATA} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for dir in ${SHRDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/cad/qelectrotech/Makefile
===================================================================
--- head/cad/qelectrotech/Makefile	(revision 516744)
+++ head/cad/qelectrotech/Makefile	(revision 516745)
@@ -1,44 +1,45 @@
 # Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	qelectrotech
 DISTVERSION=	0.7.0
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://git.tuxfamily.org/qet/qet.git/snapshot/
 DISTNAME=	qet-${DISTVERSION}
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	QElectroTech is application to design electric diagrams
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler:c++11-lib desktop-file-utils kde:5 qmake qt:5 shared-mime-info
+USES=		compiler:c++11-lib desktop-file-utils gl kde:5 qmake qt:5 \
+		shared-mime-info
 USE_GL=		gl
 USE_QT=		concurrent core gui network printsupport sql sql-sqlite3 \
 		svg widgets xml \
 		buildtools_build
 USE_KDE=	coreaddons widgetsaddons
 
 OPTIONS_DEFINE=       DEBUG DOCS
 
 DEBUG_VARS=           BUILD_TYPE=debug
 DEBUG_VARS_OFF=       BUILD_TYPE=release
 
 ALL_TARGET=           ${BUILD_TYPE}-all
 
 pre-configure:
 	${MV} ${WRKSRC}/man/files/pt ${WRKSRC}/man/files/pt_PT
 	${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,g' \
 		${WRKSRC}/${PORTNAME}.pro
 	${REINPLACE_CMD} -e 's,doc/,share/doc/,g' \
 		${WRKSRC}/${PORTNAME}.pro
 	${REINPLACE_CMD} -e 's,../share,share,g' \
 		${WRKSRC}/${PORTNAME}.pro
 
 post-stage:
 	# Sources come with accidental Dolphin state
 	${RM} ${STAGEDIR}${DATADIR}/elements/10_electric/20_manufacturers_articles/bosch_rexroth/.directory
 
 .include <bsd.port.mk>
Index: head/cad/repsnapper/Makefile
===================================================================
--- head/cad/repsnapper/Makefile	(revision 516744)
+++ head/cad/repsnapper/Makefile	(revision 516745)
@@ -1,35 +1,35 @@
 # Created by: Martin Dieringer <martin.dieringe@gmx.de>
 # $FreeBSD$
 
 PORTNAME=	repsnapper
 DISTVERSION=	2.5a4
 PORTREVISION=	6
 CATEGORIES=	cad
 
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Controller and GCode generator for RepRap 3D printers
 
 LICENSE=	GPLv2 BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm \
 		libpolyclipping.so:graphics/polyclipping \
 		libzip.so:archivers/libzip
 
-USES=		compiler:c++11-lib autoreconf gettext gmake libtool localbase \
-		perl5 pkgconfig
+USES=		compiler:c++11-lib autoreconf gettext gl gmake gnome libtool \
+		localbase perl5 pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	timschmidt
 USE_GNOME=	gtkmm24 intltool libxml++26
 USE_GL=		gl
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/repsnapper/repsnapper.conf \
 		${STAGEDIR}${PREFIX}/etc/xdg/repsnapper/repsnapper.conf.sample
 
 .include <bsd.port.mk>
Index: head/cad/solvespace/Makefile
===================================================================
--- head/cad/solvespace/Makefile	(revision 516744)
+++ head/cad/solvespace/Makefile	(revision 516745)
@@ -1,36 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	solvespace
 PORTVERSION=	2.3
 PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	cad
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Parametric 2d/3d CAD
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libjson-c.so:devel/json-c \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 USE_GITHUB=	yes
 GH_PROJECT=	libdxfrw:libdxfrw
 GH_TAGNAME=	8f95895:libdxfrw
 GH_SUBDIR=	extlib/libdxfrw:libdxfrw
 
-USES=		cmake compiler:c++11-lang gl gnome pkgconfig
+USES=		cmake compiler:c++11-lang gl gnome pkgconfig xorg
 USE_GL=		gl glu glew
 USE_GNOME=	atkmm gtk20 pangomm
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e '/-stdlib=libc++/d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
Index: head/cad/sumo/Makefile
===================================================================
--- head/cad/sumo/Makefile	(revision 516744)
+++ head/cad/sumo/Makefile	(revision 516745)
@@ -1,36 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	sumo
 DISTVERSION=	1.2.0
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dlr.de/ts/en/Portaldata/16/Resources/projekte/sumo/
 DISTFILES=	${PORTNAME}-src-${DISTVERSIONFULL}${EXTRACT_SUFX}
 
 MAINTAINER=	enriquefynn@gmail.com
 COMMENT=	Traffic simulation suite for road vehicles, public transportation, etc
 
 BROKEN_powerpc64=	fails to configure: xerces-lib not found in /usr/local/lib
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libFOX-1.6.so:x11-toolkits/fox16 \
 		libfreetype.so:print/freetype2 \
 		libgdal.so:graphics/gdal \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff \
 		libxerces-c.so:textproc/xerces-c3
 
-USES=		cmake jpeg python shebangfix zip
+USES=		cmake gl jpeg python shebangfix zip xorg
 SHEBANG_FILES=	tools/*.py tools/*/*.py \
 		tools/*/*/*.py tools/*/*/*/*.py \
 		tools/*/*/*/*/*/*.py \
 		tools/game/A10KW/build.sh \
 		tools/game/rebuild_networks.sh \
 		tools/build/rebuild_cscope.sh \
 		tools/build/dailyUpdateMakeGCC.sh
 		
 python_OLD_CMD+="/usr/bin/env python"
 USE_GL=		gl glu
 USE_XORG=	x11 xcursor xext xfixes xft xi xrandr xrender
 
 .include <bsd.port.mk>
Index: head/cad/varkon/Makefile
===================================================================
--- head/cad/varkon/Makefile	(revision 516744)
+++ head/cad/varkon/Makefile	(revision 516745)
@@ -1,71 +1,71 @@
 # Created by: Pedro F. Giffuni
 # $FreeBSD$
 
 PORTNAME=	varkon
 PORTVERSION=	1.19E
 PORTREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Varkon_${PORTVERSION}
 DISTNAME=	Varkon_sources_${PORTVERSION}
 DIST_SUBDIR=	varkon
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free CAD system and applications development tool
 
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 WRKSRC=		${WRKDIR}/Varkon_${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/sources
 
+USES=		gl gmake xorg
 USE_XORG=	xpm
 USE_GL=		glu
-USES=		gmake
 MAKE_ENV=	PLATFORM=FreeBSD
 ALL_TARGET=	# none
 MAKE_JOBS_UNSAFE=	yes
 
 VARKON_PREFIX=	${PREFIX}/lib/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.o" -delete
 
 do-configure:
 	@${REINPLACE_CMD} -e \
 		's|%%VARKON_PREFIX%%|${VARKON_PREFIX}|g ; \
 		 s|%%DOCSDIR%%|${DOCSDIR}|g' ${WRKSRC}/com/english/varkon
 	@${REINPLACE_CMD} -e \
 		's|^PLATFORM|#PLATFORM|' ${BUILD_WRKSRC}/Makefile
 	@${FIND} ${BUILD_WRKSRC} -name "Makefile.FreeBSD" -print0 | \
 		${XARGS} -0 ${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|g ; \
 		 s|/usr/X11R6|${LOCALBASE}|g ; \
 		 s|-O[[:space:]]|| ; \
 		 s|cc $$(LIBS)|$$(CC) $$(LIBS)|'
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/com/english/varkon ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${VARKON_PREFIX}
 .for i in erm lib mdf
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${VARKON_PREFIX})
 .endfor
 	@${MKDIR} ${STAGEDIR}${VARKON_PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${STAGEDIR}${VARKON_PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${VARKON_PREFIX}/cnf
 .for i in fnt icons plt tol
 	@(cd ${WRKSRC}/cnf && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${VARKON_PREFIX}/cnf)
 .endfor
 	@${MKDIR} ${STAGEDIR}${VARKON_PREFIX}/cnf/ini
 	${INSTALL_DATA} ${WRKSRC}/cnf/ini/english/linux \
 		${STAGEDIR}${VARKON_PREFIX}/cnf/ini/freebsd
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}	#Varkon Manual
 	@(cd ${WRKSRC}/man && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/cad/z88/Makefile
===================================================================
--- head/cad/z88/Makefile	(revision 516744)
+++ head/cad/z88/Makefile	(revision 516745)
@@ -1,63 +1,63 @@
 # Created by: Pedro F. Giffuni <giffunip@asme.org>
 # $FreeBSD$
 
 PORTNAME=	z88
 DISTVERSIONPREFIX=	v
 DISTVERSION=	15
 CATEGORIES=	cad
 
 MAINTAINER=	phascolarctos@protonmail.ch
 COMMENT=	Compact Finite Element Analysis System
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		gl gnome pkgconfig
+USES=		gl gnome pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_XORG=	x11
 
 GH_ACCOUNT=	LSCAD
 GH_PROJECT=	Z88OS
 
 BUILD_WRKSRC=	${WRKSRC}/make/make_unix_64
 INSTALL_WRKSRC=	${WRKSRC}/bin/unix64
 
 Z88_BIN_SUFFIXES=	g h n r o x
 Z88_DATA=	51.txt z88.dyn z88.fcd z88elp.txt z88i1.txt z88i2.txt z88i5.txt z88int.txt \
 		z88man.txt z88mat.txt z88ni.txt z88o0.txt z88o1.txt z88o2.txt z88o3.txt z88o4.txt z88o5.txt z88o8.txt z88x.dxf
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	for x in ${BUILD_WRKSRC}/*; do ${REINPLACE_CMD} 's,z88v15os,Z88OS-15, ; s,gcc,${CC}, ; s,CFLAGS =,CFLAGS+=, ; s,-O2,, ; s,LDLIBSOX,LDFLAGS, ; s,LDFLAGS =,LDFLAGS+=, ; s,--copy-dt-needed-entries,,' $$x; done
 
 post-patch-DOCS-on:
 	${REINPLACE_CMD} 's,%%DOCSDIR%%,${DOCSDIR},' ${INSTALL_WRKSRC}/z88.fcd
 
 do-build:
 	cd ${BUILD_WRKSRC}; for x in com ${Z88_BIN_SUFFIXES}; do ${SETENV} ${MAKE_ENV} ${MAKE} -f z88$$x.mk.gcc64 z88$$x ; done
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/z88com ${STAGEDIR}${DATADIR}
 	for x in ${Z88_BIN_SUFFIXES}; do ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/z88$$x ${STAGEDIR}${PREFIX}/bin; done
 	${INSTALL_DATA} ${Z88_DATA:S,^,${INSTALL_WRKSRC}/,} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${FILESDIR}/z88 ${STAGEDIR}${PREFIX}/bin
 	${SED} -i '' 's,%%DATADIR%%,${DATADIR},' ${STAGEDIR}${PREFIX}/bin/z88
 	${SED} -i '' 's,%%Z88_DATA%%,${Z88_DATA},' ${STAGEDIR}${PREFIX}/bin/z88
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for x in e g; do ${INSTALL_DATA} ${WRKSRC}/docu/z88man$$x.pdf ${STAGEDIR}${DOCSDIR}; done
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/chinese/aterm/Makefile
===================================================================
--- head/chinese/aterm/Makefile	(revision 516744)
+++ head/chinese/aterm/Makefile	(revision 516745)
@@ -1,20 +1,21 @@
 # Created by: gugod@gugod.org
 # $FreeBSD$
 
 PORTNAME=	aterm
 PORTVERSION=	1.0.1
 CATEGORIES=	chinese x11
 MASTER_SITES=	SF
 
 MAINTAINER=	gugod@gugod.org
 COMMENT=	Color vt102 terminal emulator with transparency support
 
+USES=		xorg
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-xim --enable-big5
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	"@(,,4711) bin/aterm" \
 		man/man1/aterm.1.gz
 
 .include <bsd.port.mk>
Index: head/chinese/fcitx/Makefile
===================================================================
--- head/chinese/fcitx/Makefile	(revision 516744)
+++ head/chinese/fcitx/Makefile	(revision 516745)
@@ -1,117 +1,117 @@
 # Created by: Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
 # $FreeBSD$
 
 PORTNAME=	fcitx
 PORTVERSION=	4.2.9.6
 PORTREVISION=	3
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://download.fcitx-im.org/fcitx/:fcitx \
 		http://download.fcitx-im.org/data/:data
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:fcitx \
 		en_dict-${_DICT_VER}.tar.gz:data \
 		pinyin.tar.gz:data \
 		py_stroke-${_PYSTROKE_VER}.tar.gz:data \
 		py_table-${_PYTABLE_VER}.tar.gz:data \
 		table.tar.gz:data
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Flexible Input Method Framework
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
 		bash:shells/bash \
 		${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:x11/xkeyboard-config
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libdbus-1.so:devel/dbus \
 		libXfixes.so:x11/libXfixes \
 		libXinerama.so:x11/libXinerama \
 		libXrender.so:x11/libXrender \
 		libxkbcommon.so:x11/libxkbcommon \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		xkeyboard-config>=0:x11/xkeyboard-config
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTSDIR=${PORTSDIR}
 
 CONFLICTS=	zh-scim-fcitx-3.*
 
 USE_GNOME=	pango intltool libxml2 introspection
 USE_KDE=	ecm
 USE_XORG=	x11 xext xkbfile sm ice
 USE_LDCONFIG=	yes
 USES=		compiler:c++11-lang gnome tar:xz cmake:noninja desktop-file-utils \
 		gettext-tools:build,run gettext-runtime iconv:wchar_t \
-		kde:5 pkgconfig shared-mime-info compiler:c++14-lang
+		kde:5 pkgconfig shared-mime-info compiler:c++14-lang xorg
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	GTK2 GTK3 OPENCC TPUNC DOCS
 OPTIONS_DEFAULT=GTK2 GTK3
 OPTIONS_SUB=	yes
 
 GTK2_DESC=	Enable Gtk2 IM module
 GTK2_USE=	GNOME=gtk20
 GTK2_CMAKE_ON=	-DENABLE_GTK2_IM_MODULE=ON
 
 GTK3_DESC=	Enable Gtk3 IM module
 GTK3_USE=	GNOME=gtk30
 GTK3_CMAKE_ON=	-DENABLE_GTK3_IM_MODULE=ON
 
 OPENCC_DESC=	Enable OpenCC for Chinese Transform
 TPUNC_DESC=	Use traditional quotation marks
 
 .include <bsd.port.options.mk>
 
 CMAKE_ARGS+=	-DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON \
 		-DLIBICONV_LIBC_HAS_ICONV_OPEN=OFF \
 		-DDATADIR=${DATADIR} \
 		-DDOCSDIR=${DOCSDIR} \
 		-DGOBJECT_INTROSPECTION_GIRDIR=${PREFIX}/share/gir-1.0 \
 		-DGOBJECT_INTROSPECTION_TYPELIBDIR=${PREFIX}/lib/girepository-1.0 \
 		-DMANPREFIX=${MANPREFIX} \
 		-DPREFIX=${PREFIX} \
 		-DENABLE_QT=OFF -DENABLE_QT_IM_MODULE=OFF -DENABLE_QT_GUI=OFF
 
 .if ${PORT_OPTIONS:MGTK2}
 SUB_LIST+=	GTK2_IM=fcitx
 .else
 SUB_LIST+=	GTK2_IM=xim
 .endif
 
 .if ${PORT_OPTIONS:MGTK3}
 PLIST_SUB+=	GTK3=""
 SUB_LIST+=	GTK3_IM=fcitx
 .else
 PLIST_SUB+=	GTK3="@comment "
 SUB_LIST+=	GTK3_IM=xim
 .endif
 
 .if ${PORT_OPTIONS:MOPENCC}
 LIB_DEPENDS+=	libopencc.so:chinese/opencc
 .else
 CMAKE_ARGS+=	-DENABLE_OPENCC=OFF
 .endif
 
 .if ${PORT_OPTIONS:MTPUNC}
 EXTRA_PATCHES+=	${FILESDIR}/tpunc-data_punc.mb.zh_CN
 .endif
 
 .if defined(WITH_DEBUG)
 CMAKE_ARGS+=	-DENABLE_DEBUG=ON
 .endif
 
 _DICT_VER=	20121020
 _PYSTROKE_VER=	20121124
 _PYTABLE_VER=	20121124
 
 post-patch:
 	@${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/src/module/spell/dict/.
 	@${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/src/im/pinyin/data/.
 	@${CP} ${_DISTDIR}/py_stroke-${_PYSTROKE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/.
 	@${CP} ${_DISTDIR}/py_table-${_PYTABLE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/.
 	@${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/src/im/table/data/.
 
 .include <bsd.port.mk>
Index: head/chinese/fcitx-ui-light/Makefile
===================================================================
--- head/chinese/fcitx-ui-light/Makefile	(revision 516744)
+++ head/chinese/fcitx-ui-light/Makefile	(revision 516745)
@@ -1,23 +1,23 @@
 # Created by: Zhihao Yuan <lichray@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	fcitx-ui-light
 PORTVERSION=	0.1.3
 PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	http://download.fcitx-im.org/${PORTNAME}/
 DIST_SUBDIR=	fcitx
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Alternative light weight UI for Fcitx
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
 		libfontconfig.so:x11-fonts/fontconfig
 
+USES=		tar:bzip2 cmake gettext gnome pkgconfig xorg
 USE_XORG=	x11 xft xpm
-USES=		tar:bzip2 cmake gettext pkgconfig
 USE_GNOME=	intltool
 
 .include <bsd.port.mk>
Index: head/chinese/gcin/Makefile
===================================================================
--- head/chinese/gcin/Makefile	(revision 516744)
+++ head/chinese/gcin/Makefile	(revision 516745)
@@ -1,76 +1,76 @@
 # Created by: Shen Chuan-Hsing
 # $FreeBSD$
 
 PORTNAME=	gcin
 PORTVERSION=	2.8.9
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://hyperrate.com/gcin-source/
 EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.xz
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Traditional Chinese input utility in X
 
 LICENSE=	LGPL21
 
 BROKEN_powerpc64=	fails to build: gmake[3]: *** [Makefile:30: en-american] Error 255
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
-USES=		gmake gnome pkgconfig tar:xz
+USES=		gmake gnome pkgconfig tar:xz xorg
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--use_gtk3=N --use_qt5=N
 USE_GNOME=	gtk30
 USE_XORG=	x11 xtst xext
 INSTALLS_ICONS=	YES
 USE_LDCONFIG=	${PREFIX}/lib/gcin
 
 OPTIONS_DEFINE=	ANTHY
 OPTIONS_SUB=	yes
 ANTHY_DESC=	Japanese anthy IM module
 
 ANTHY_BUILD_DEPENDS=	${LOCALBASE}/include/anthy/anthy.h:japanese/anthy
 ANTHY_LIB_DEPENDS=	libanthy.so:japanese/anthy
 ANTHY_CONFIGURE_OFF=	--use_anthy=N
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,&,,; 1 s,##!/bin/bash,#!/bin/sh,; \
 		s,-ldl,,; \
 		s,mandir=$$datadir,mandir=$$prefix,; \
 		s,/usr/share,$$prefix/share,; \
 		1, 300 s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,; \
 		/GCIN_DEBUG/ d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,; \
 		s,%%PREFIX%%,${PREFIX},;' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \
 		${WRKSRC}/menu/Makefile
 	@${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \
 		${WRKSRC}/scripts/Makefile
 	@${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${LOCALBASE},;' \
 		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \
 		${WRKSRC}/scripts/gtab.append_prepare \
 		${WRKSRC}/scripts/tsin-gtab-import \
 		${WRKSRC}/scripts/tsin-gtab-edit
 	@${REINPLACE_CMD} -e 's,bash,sh,; s/&//; 12,13 s/=/ /; \
 		s/export/setenv/; s/$$UTF8ED/xdg-open/' \
 		${WRKSRC}/scripts/html-browser
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \
 		${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \
 		${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
 		${WRKSRC}/scripts/utf8-edit
 	@${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/X11R6/lib,${LOCALBASE}/lib,' ${WRKSRC}/im-client/Makefile
 
 post-build:
 .if !defined(DEBUG_FLAGS)
 	@${FIND} ${WRKSRC} -name "*.so*" | ${XARGS} ${STRIP_CMD}
 .endif
 
 post-install:
 .if !defined(DEBUG_FLAGS)
 .for f in gcin* gtab-merge juyin-learn phoa2* sim2trad trad2sim ts-edit tsa2d32 tsd2a32 tsin2gtab-phrase tslearn
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/chinese/ibus-chewing/Makefile
===================================================================
--- head/chinese/ibus-chewing/Makefile	(revision 516744)
+++ head/chinese/ibus-chewing/Makefile	(revision 516745)
@@ -1,32 +1,32 @@
 # Created by: Eric L. Camachat <eric@camachat.org>
 # $FreeBSD$
 
 PORTNAME=	ibus-chewing
 PORTVERSION=	1.5.1
 CATEGORIES=	chinese
 
 MAINTAINER=	eric@camachat.org
 COMMENT=	Chewing engine for IBus
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	gob2:devel/gob2 \
 		${LOCALBASE}/share/cmake/Modules/ManageEnvironmentCommon.cmake:devel/cmake-fedora \
 		ibus-daemon:textproc/ibus
 LIB_DEPENDS=	libchewing.so:chinese/libchewing
 RUN_DEPENDS=	ibus-daemon:textproc/ibus
 
 CMAKE_ARGS=	-DSYSCONF_INSTALL_DIR=${PREFIX}/etc \
 		-DLIB_DIR=${PREFIX}/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.freedesktop.IBus.Chewing.gschema.xml
-USES=		cmake:noninja gettext pkgconfig
+USES=		cmake:noninja gettext gnome pkgconfig xorg
 USE_GNOME=	gtk20
 USE_XORG=	xtst
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	definite
 
 .include <bsd.port.mk>
Index: head/chinese/libcangjie/Makefile
===================================================================
--- head/chinese/libcangjie/Makefile	(revision 516744)
+++ head/chinese/libcangjie/Makefile	(revision 516745)
@@ -1,34 +1,34 @@
 # Created by: blubee <hello@blubee.me>
 # $FreeBSD$
 
 PORTNAME=		libcangjie
 PORTVERSION=		1.3
 PORTREVISION=		1
 DISTVERSIONPREFIX=	v
 CATEGORIES=		chinese
 
 MAINTAINER=	hello@blubee.me
 COMMENT=	C library implementing the Cangjie input method
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3		\
 		libfreetype.so:print/freetype2          \
 		libdbus-1.so:devel/dbus
 
-USES=		autoreconf gmake libtool localbase pkgconfig sqlite
+USES=		autoreconf gmake libtool localbase pkgconfig sqlite xorg
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 USE_XORG=	xi
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cangjians
 GH_PROJECT=	libcangjie
 
 post-install:
 	@(${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so)
 
 .include <bsd.port.mk>
Index: head/chinese/librime/Makefile
===================================================================
--- head/chinese/librime/Makefile	(revision 516744)
+++ head/chinese/librime/Makefile	(revision 516745)
@@ -1,39 +1,39 @@
 # Created by: Zhihao Yuan <lichray@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	librime
 PORTVERSION=	1.2.9
 DISTVERSIONPREFIX=	rime-
 PORTREVISION=	19
 CATEGORIES=	chinese textproc
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Rime Input Method Engine, the core library
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libleveldb.so:databases/leveldb \
 		libmarisa.so:devel/marisa-trie \
 		libopencc.so:chinese/opencc \
 		libyaml-cpp.so:devel/yaml-cpp
 
-USES=		cmake compiler:c++11-lib gettext pathfix perl5 pkgconfig
+USES=		cmake compiler:c++11-lib gettext pathfix perl5 pkgconfig xorg
 USE_PERL5=	build patch
 
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 USE_XORG=	xorgproto
 LDFLAGS+=	-lintl
 USE_GITHUB=	yes
 GH_ACCOUNT=	rime
 
 PLIST_SUB=	VER=${PORTVERSION}
 
 post-patch:
 	@${FIND} ${WRKSRC} \( -name '*.cc' -or -name '*.h' \) \
 		-exec ${PERL} -i -pe '$$. == 1 && s/^\xef\xbb\xbf//;' {} \;
 
 .include <bsd.port.mk>
Index: head/comms/acfax/Makefile
===================================================================
--- head/comms/acfax/Makefile	(revision 516744)
+++ head/comms/acfax/Makefile	(revision 516745)
@@ -1,36 +1,36 @@
 # Created by: Darren <igla@batterybackups.net>
 # $FreeBSD$
 
 PORTNAME=	acfax
 PORTVERSION=	0.981011
 PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	ftp://ftp.funet.fi/pub/ham/unix/Linux/misc/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0.//}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Receive faxes using sound card and radio
 
 LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 PLIST_FILES=	bin/acfax
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	x11 xext xmu xt sm ice
 
 post-extract:
 	@${TOUCH} ${WRKSRC}/acfax.man
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|setup_fax(120, 288|setup_fax(120, 576|' \
 		${WRKSRC}/acfax.c
 	@${REINPLACE_CMD} -e 's|ixoc = 288|ixoc = 576|' ${WRKSRC}/fax_funcs.c
 	@${REINPLACE_CMD} -e 's|regex.h|gnuregex.h|' ${WRKSRC}/RegExp.h
 	@${REINPLACE_CMD} -e 's| -O2 -Wall||g ; \
 		 s|-lm|-lm -lgnuregex|' ${WRKSRC}/Imakefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/acfax ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/comms/flcluster/Makefile
===================================================================
--- head/comms/flcluster/Makefile	(revision 516744)
+++ head/comms/flcluster/Makefile	(revision 516745)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	flcluster
 PORTVERSION=	1.0.4
 PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/fldigi/${PORTNAME}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	FLCLUSTER is a management tool for accessing dxcluster nodes
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		autoreconf compiler:c++11-lib gmake pkgconfig
+USES=		autoreconf compiler:c++11-lib gmake pkgconfig xorg
 USE_CXXSTD=	gnu++0x
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xft xext xfixes xcursor xinerama
 CONFIGURE_ENV=	FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \
 		    EXTRA_LIBS="-lexecinfo"
 
 PLIST_FILES=	bin/flcluster share/applications/flcluster.desktop \
 			share/pixmaps/flcluster.xpm
 .include <bsd.port.mk>
Index: head/comms/fldigi/Makefile
===================================================================
--- head/comms/fldigi/Makefile	(revision 516744)
+++ head/comms/fldigi/Makefile	(revision 516745)
@@ -1,69 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	fldigi
 PORTVERSION=	4.1.08
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Digital decoder for psk, cw, psk31, olivia
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc\
 		docbook-xsl>=1.0:textproc/docbook-xsl\
 		xsltproc:textproc/libxslt
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs\
 		libpng.so:graphics/png \
 		libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libportaudio.so:audio/portaudio \
 		libsndfile.so:audio/libsndfile \
 		libsamplerate.so:audio/libsamplerate
 
-USES=		autoreconf compiler:c++11-lib jpeg gmake perl5 pkgconfig shebangfix
+USES=		autoreconf compiler:c++11-lib jpeg gmake perl5 pkgconfig \
+		shebangfix xorg
 
 USE_CXXSTD=	gnu++0x
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xft xext xfixes xcursor xinerama xrender
 CONFIGURE_ENV=	FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \
 		    EXTRA_LIBS="-lexecinfo"
 
 OPTIONS_DEFINE=	NATIVE_OPT FLARQ OSS PULSEAUDIO HAMLIB NLS DOCS
 
 NATIVE_OPT_DESC=	Enable Native Optimizations
 FLARQ_DESC=		Compile flarq
 OSS_DESC=		Support OSS
 PULSEAUDIO_DESC=	PulseAudio support
 HAMLIB_DESC=		Support rig control via hamlib
 
 OPTIONS_DEFAULT=	FLARQ OSS HAMLIB
 OPTIONS_SUB=		yes
 
 NATIVE_OPT_CONFIGURE_ON=	--enable-optimizations=native
 NATIVE_OPT_CONFIGURE_OFF=	--enable-optimizations=none
 FLARQ_CONFIGURE_ENABLE=		flarq
 OSS_CONFIGURE_ENABLE=		oss
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 HAMLIB_CONFIGURE_WITH=		hamlib
 HAMLIB_LIB_DEPENDS=		libhamlib.so:comms/hamlib
 NLS_CONFIGURE_ENABLE=		nls
 NLS_USES=			gettext
 
 # Always need asciidoc for man pages
 CONFIGURE_ARGS+=--with-asciidoc
 # Always need soundfile
 CONFIGURE_ARGS+=--with-sndfile
 
 post-configure:
 # force rebuild of man pages
 	${RM} ${WRKSRC}/doc/*.1
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/comms/flrig/Makefile
===================================================================
--- head/comms/flrig/Makefile	(revision 516744)
+++ head/comms/flrig/Makefile	(revision 516745)
@@ -1,34 +1,34 @@
 # Created by: Stephen Hurd <shurd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	flrig
 PORTVERSION=	1.3.48
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/fldigi/${PORTNAME}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Ham Radio rig control program, cooperates with fldigi
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfltk.so:x11-toolkits/fltk
 
-USES=		gmake jpeg
+USES=		gmake jpeg xorg
 USE_XORG=	x11 xrender xcursor xfixes xext xft xinerama
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	FLTK_CONFIG="${LOCALBASE}/bin/fltk-config"
 PLIST_FILES=	bin/flrig share/applications/flrig.desktop \
 		 share/pixmaps/flrig.xpm
 OPTIONS_DEFINE=	NATIVE_OPT
 
 NATIVE_OPT_DESC=	Enable Native Optimizations
 
 NATIVE_OPT_CONFIGURE_ON+=	--enable-optimizations=native
 NATIVE_OPT_CONFIGURE_OFF+=	--enable-optimizations=none
 
 CFLAGS_powerpc64=	-mminimal-toc
 
 .include <bsd.port.mk>
Index: head/comms/geoid/Makefile
===================================================================
--- head/comms/geoid/Makefile	(revision 516744)
+++ head/comms/geoid/Makefile	(revision 516745)
@@ -1,36 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	geoid
 PORTVERSION=	1.0
 DISTVERSIONSUFFIX=	.src
 PORTREVISION=	9
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/LinuxApps/
 DISTNAME=	fl_geoid
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Geodetic computer for amateur radio use
 
 LICENSE=	GPLv2+ NONE  # only one src file contains license
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libpng.so:graphics/png
 
-USES=		gmake jpeg
+USES=		gmake jpeg xorg
 USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
 MAKEFILE=	makefile
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/geoid.cxx
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/geoid ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/geoid.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/country.pos ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/comms/ibp/Makefile
===================================================================
--- head/comms/ibp/Makefile	(revision 516744)
+++ head/comms/ibp/Makefile	(revision 516745)
@@ -1,25 +1,25 @@
 # Created by: Diane Bruce <db@db.net>
 # $FreeBSD$
 
 PORTNAME=	ibp
 PORTVERSION=	0.21
 PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ \
 		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Little program for monitoring amateur radio beacons
 
-USES=		imake ncurses tar:tgz
+USES=		imake ncurses tar:tgz xorg
 USE_XORG=	x11
 
 post-patch:
 	${REINPLACE_CMD} -e 's|-lcurses|-lncurses|' ${WRKSRC}/Imakefile \
 		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ibp ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/ibp.1 ${STAGEDIR}${MANPREFIX}/man/man1/ibp.1
 
 .include <bsd.port.mk>
Index: head/comms/linrad/Makefile
===================================================================
--- head/comms/linrad/Makefile	(revision 516744)
+++ head/comms/linrad/Makefile	(revision 516745)
@@ -1,76 +1,76 @@
 # $FreeBSD$
 
 PORTNAME=	linrad
 PORTVERSION=	4.02
 PORTREVISION=	4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.nitehawk.com/sm5bsz/linuxdsp/archive/\
 		http://www.sm5bsz.com/linuxdsp/archive/
 DISTNAME=	lir04-02
 EXTRACT_SUFX=	.tbz
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio DSP utility (SDR)
 
 LIB_DEPENDS=	librtlsdr.so:comms/rtl-sdr \
 		libportaudio.so:audio/portaudio \
 		libftdi.so:devel/libftdi
 BUILD_DEPENDS=	nasm:devel/nasm
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		gmake tar:bzip2
+USES=		gmake tar:bzip2 xorg
 USE_XORG=	x11
 LINRAD_DOCFILES=	z_APM.txt z_BUFFERS.txt z_CALIBRATE.txt \
 			z_COPYRIGHT.txt z_GIFINFO.txt \
 			z_MORSE_DECODING.txt z_MOUSE.txt z_NETWORK.txt \
 			z_PARALLEL_PORT.txt z_SETTINGS.txt \
 			z_USERS_EXTRA.txt z_USERS_HWARE.txt
 
 BROKEN_aarch64=		fails to compile: implicit declaration of function outb
 BROKEN_armv6=		fails to configure: cannot find /nxb-bin/usr/bin/cc
 BROKEN_armv7=		fails to configure: cannot find /nxb-bin/usr/bin/cc
 BROKEN_powerpc64=	fails to compile: implicit declaration of function outb
 BROKEN_sparc64=		fails to compile: implicit declaration of function outb
 
 .include <bsd.port.pre.mk>
 .if ${ARCH} == "i386"
 BINFILE=	xlinrad
 .else
 BINFILE=	xlinrad64
 .endif
 ALL_TARGET=	${BINFILE}
 
 post-patch:
 # These extensions seem to be Windows only
 #	@${CP} ${WRKSRC}/extra_w3sz.c ${WRKSRC}/users_extra.c
 #	@${CP} ${WRKSRC}/users_tr.c ${WRKSRC}/users_hwaredriver.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		 ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}/|' \
 		${WRKSRC}/help.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}/|' \
 		${WRKSRC}/libfind1.c
 # NOTE: The code that actually does anything in users.c is currently
 #       #ifdef'd out because it's just a non-working example
 	@${REINPLACE_CMD} -e "s|ttyd|ttyu|" \
 	    ${WRKSRC}/lxsys.c
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/errors.lir ${STAGEDIR}${DATADIR}/errors.lir
 	${INSTALL_DATA} ${WRKSRC}/help.lir ${STAGEDIR}${DATADIR}/help.lir
 	${INSTALL_SCRIPT} -m0555 ${FILESDIR}/linrad ${STAGEDIR}${PREFIX}/bin/linrad
 # Some day we may want the svga version as well.
 #	${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.svga
 	${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${BINFILE} ${STAGEDIR}${PREFIX}/bin/x${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${LINRAD_DOCFILES}
 	@${INSTALL_DATA}  ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}/$f
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/comms/lirc/Makefile
===================================================================
--- head/comms/lirc/Makefile	(revision 516744)
+++ head/comms/lirc/Makefile	(revision 516745)
@@ -1,73 +1,73 @@
 # Created by: Mike Heffner <mikeh@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	lirc
 PORTVERSION=	0.9.0
 PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	SF/${PORTNAME}/LIRC/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux Infrared Remote Control
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 
-USES=		alias autoreconf gmake libtool localbase python tar:bzip2
+USES=		alias autoreconf gmake libtool localbase python tar:bzip2 xorg
 USE_XORG=	sm x11 ice
 USE_CSTD=	gnu89
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sandboxed --with-devdir=/var/run/lirc \
 		--sysconfdir=${PREFIX}/etc
 
 USE_RC_SUBR=	lircd
 PORTDOCS=	html images irxevent.keys lirc.css lirc.hwdb
 PORTEXAMPLES=	remotes
 SUB_FILES=	pkg-message lircd.conf
 
 OPTIONS_DEFINE=	MINIMAL DEBUG UARTLIRC DOCS EXAMPLES
 OPTIONS_DEFINE_i386=	SMODE2 # requires svgalib which is...
 OPTIONS_DEFINE_amd64=	SMODE2 # ...only available on x86
 OPTIONS_SUB=	yes
 
 MINIMAL_DESC=	Build with minimal dependencies
 UARTLIRC_DESC=	Install serial LIRC driver
 SMODE2_DESC=	Build smode2 (shows signal waveform), requires svgalib
 
 MINIMAL_LIB_DEPENDS_OFF=libftdi.so:devel/libftdi \
 			libirman.so:comms/libirman
 MINIMAL_CONFIGURE_OFF=	--with-driver=userspace
 MINIMAL_CONFIGURE_ON=	--with-driver=dvico
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 SMODE2_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SMODE2_PLIST_FILES=	bin/smode2
 
 UARTLIRC_RUN_DEPENDS=	uartlirc>=0.3:comms/uartlirc
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's/`$${LIBUSB_CONFIG} --libs`/-lusb/' \
 		-e 's/`$${LIBUSB_CONFIG} --cflags`//' \
 		${WRKSRC}/configure.ac
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/lircd.conf ${STAGEDIR}${PREFIX}/etc/lircd.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/run/lirc
 
 post-install-MINIMAL-on:
 	# bacause --with-driver is specified, it installs remotes/dvico/lircd.conf.fusionHDTV to etc/lircd/
 	# remove to not break the plist, but remote configs handling should probably be fixed...
 	@${RM} -r ${STAGEDIR}${PREFIX}/etc/lirc
 
 post-install-DOCS-on:
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "html images irxevent.keys lirc.css lirc.hwdb" ${STAGEDIR}${DOCSDIR}/)
 
 post-install-EXAMPLES-on:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} remotes ${STAGEDIR}${EXAMPLESDIR}/)
 
 .include <bsd.port.mk>
Index: head/comms/py-qt5-serialport/Makefile
===================================================================
--- head/comms/py-qt5-serialport/Makefile	(revision 516744)
+++ head/comms/py-qt5-serialport/Makefile	(revision 516745)
@@ -1,31 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	serialport
 CATEGORIES=	comms devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtSerialPort module
 
 BUILD_DEPENDS=	${PY_ENUM34}
 RUN_DEPENDS=	${PY_ENUM34}
 
 CONFIGURE_ARGS=	--enable QtSerialPort
 PYQT_DIST=	yes
 
-USES=		python pyqt:5 qt:5
+USES=		gl python pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui serialport qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtSerialPort API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
Index: head/comms/seyon/Makefile
===================================================================
--- head/comms/seyon/Makefile	(revision 516744)
+++ head/comms/seyon/Makefile	(revision 516745)
@@ -1,29 +1,29 @@
 # Created by: Michael Elbel (me)
 # $FreeBSD$
 
 PORTNAME=	seyon
 PORTVERSION=	2.20c
 CATEGORIES=	comms
 MASTER_SITES=	DEBIAN
 DISTFILES=	${DISTNAME:S/-/_/}.orig${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Communications package for the X Window system
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	x11 xext xpm xmu xaw xt sm ice
 
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/seyon lib/X11/app-defaults/Seyon \
 		lib/X11/app-defaults/Seyon-color lib/X11/seyon.help \
 		man/man1/${PORTNAME}.1.gz
 
 post-extract:
 	${CHMOD} +x ${WRKSRC}/makever.sh
 
 post-patch:
 	${REINPLACE_CMD} -e "s/getline(/seyon_getline(/g" \
 		${WRKSRC}/SeDecl.h ${WRKSRC}/SeScript.c ${WRKSRC}/SeSupp.c
 
 .include <bsd.port.mk>
Index: head/comms/syncterm/Makefile
===================================================================
--- head/comms/syncterm/Makefile	(revision 516744)
+++ head/comms/syncterm/Makefile	(revision 516745)
@@ -1,44 +1,45 @@
 # Created by: shurd
 # $FreeBSD$
 
 PORTNAME=	syncterm
 PORTVERSION=	1.0
 CATEGORIES=	comms
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	ANSI-BBS terminal which supports telnet, rlogin, and SSH
 
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/syncterm-${PORTVERSION}/src/syncterm
 USES=		gmake perl5 tar:tgz
 USE_PERL5=	build
 MAKEFILE=	GNUmakefile
 PLIST_FILES=	bin/syncterm \
 		man/man1/syncterm.1.gz \
 		share/applications/syncterm.desktop \
 		share/icons/hicolor/64x64/apps/syncterm.png
 
 NO_CCACHE=	yes
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ARGS+=	WITHOUT_PORTAUDIO=yes
 MAKE_ARGS+=	-C ${WRKSRC}
 MAKE_ARGS+=	PREFIX="${PREFIX}"
 MAKE_ARGS+=	INSTALL_EXE="${INSTALL_PROGRAM}"
 MAKE_ARGS+=	RELEASE=1
 
 OPTIONS_DEFINE=	X11 SDL
 OPTIONS_DEFAULT=	X11 SDL
 
+X11_USES=	xorg
 X11_USE=	xorg=x11
 X11_MAKE_ARGS_OFF=	NO_X=1
 
 SDL_USE=	SDL=sdl
 SDL_MAKE_ARGS=	USE_SDL=1
 SDL_MAKE_ARGS_OFF=	WITHOUT_SDL=1
 
 ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	does not configure except on i386 amd64
 
 .include <bsd.port.mk>
Index: head/comms/twpsk/Makefile
===================================================================
--- head/comms/twpsk/Makefile	(revision 516744)
+++ head/comms/twpsk/Makefile	(revision 516745)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	twpsk
 PORTVERSION=	4.3
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://wa0eir.bcts.info/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	takefu@airport.fm
 COMMENT=	X psk31 client
 
 LICENSE=	GPLv3
 
-USES=		motif pkgconfig
+USES=		motif pkgconfig xorg
 USE_XORG=	sm ice xt x11
 
 LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-L${LOCALBASE}/lib -I${PREFIX}/include
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
Index: head/comms/viewfax/Makefile
===================================================================
--- head/comms/viewfax/Makefile	(revision 516744)
+++ head/comms/viewfax/Makefile	(revision 516745)
@@ -1,19 +1,19 @@
 # Created by: jmz
 # $FreeBSD$
 
 PORTNAME=	viewfax
 PORTVERSION=	2.6
 PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.ping.de/pub/unix/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display files containing g3 and/or g4 coded fax pages
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/viewfax lib/viewfax.tif \
 		man/man1/viewfax.1.gz
 
 .include <bsd.port.mk>
Index: head/comms/xastir/Makefile
===================================================================
--- head/comms/xastir/Makefile	(revision 516744)
+++ head/comms/xastir/Makefile	(revision 516745)
@@ -1,93 +1,93 @@
 # Created by: Carl Makin <carl@stagecraft.cx>
 # $FreeBSD$
 
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
 DISTVERSION=	2.1.4
 PORTREVISION=	2
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	carl@stagecraft.cx
 COMMENT=	X Amateur Station Tracking and Information Reporting
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
 RUN_DEPENDS=	wget:ftp/wget
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libjasper.so:graphics/jasper \
 		libjbig.so:graphics/jbigkit \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libshp.so:devel/shapelib \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libwebpmux.so:graphics/webp \
 		libwmflite.so:graphics/libwmf
 
-USES=		gettext gmake jpeg motif python:run shebangfix
+USES=		gettext gmake gnome jpeg motif python:run shebangfix xorg
 
 USE_XORG=	ice sm x11 xext xt
 USE_GNOME+=	libxml2
 GNU_CONFIGURE=	yes
 
 SHEBANG_FILES=	scripts/gpx2shape
 SHEBANG_REGEX=	./scripts/.*\.(sh|pl|py)
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Xastir
 GH_PROJECT=	Xastir
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		BDB CURL DAVIS DBFAWK ERRORPOP FESTIVAL GEOTIFF GPSMAN
 OPTIONS_RADIO=		MGG
 OPTIONS_RADIO_MGG=	GMAGICK IMAGICK
 
 DAVIS_DESC=	Include Davis Weatherstation Support
 DBFAWK_DESC=	Include DBFAWK Support
 CURL_DESC=	Include CURL Internet Image support
 GEOTIFF_DESC=	Include GeoTIFF Support
 GPSMAN_DESC=	Include GPSMAN Support
 FESTIVAL_DESC=	Include Festival Voice Synthesis Support
 ERRORPOP_DESC=	Send error popups to stderr
 BDB_DESC=	Tiger Map Caching using Berkeley DB
 MGG_DESC=	Image library for raster map processing
 IMAGICK_DESC=	ImageMagick (Version 6)
 GMAGICK_DESC=	GraphicsMagick (Needs GCC to compile)
 
 OPTIONS_DEFAULT=	BDB CURL DBFAWK GMAGICK
 
 DAVIS_CONFIGURE_ON=	--enable-davis
 
 IMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
 IMAGICK_CONFIGURE_WITH=	imagemagick
 
 GMAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
 GMAGICK_CONFIGURE_WITH=	graphicsmagick
 GMAGICK_USES=		compiler:gcc-c++11-lib
 
 DBFAWK_LIB_DEPENDS=	libpcre.so:devel/pcre
 DBFAWK_CONFIGURE_WITH=	dbfawk
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
 
 GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:graphics/gpsmanshp
 GPSMAN_IMPLIES=		SHAPELIB
 GPSMAN_CONFIGURE_WITH=	gpsman
 
 FESTIVAL_BUILD_DEPENDS=		festival:audio/festival
 FESTIVAL_CONFIGURE_WITH=	festival
 
 #RTREE_CONFIGURE_WITH=	rtree
 
 ERRORPOP_CONFIGURE_WITH=	errorpopups
 
 BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${BDB_LIB_DIR}
 
 .include <bsd.port.mk>
Index: head/converters/wkhtmltopdf/Makefile
===================================================================
--- head/converters/wkhtmltopdf/Makefile	(revision 516744)
+++ head/converters/wkhtmltopdf/Makefile	(revision 516745)
@@ -1,95 +1,95 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	wkhtmltopdf
 PORTVERSION=	0.12.5
 PORTREVISION=	5
 CATEGORIES=	converters
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Convert HTML (or live webpages) to PDF or image
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=		fails to build: error: cast from pointer to smaller type loses information
 BROKEN_armv6=		fails to build: error: Not supported ARM architecture
 BROKEN_armv7=		fails to build: error: invalid operand for instruction
 BROKEN_mips64=		fails to link: undefined reference to __sync_add_and_fetch_4
 
 RUN_DEPENDS=	webfonts>=0:x11-fonts/webfonts
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libQt5WebKit.so:www/qt5-webkit
 
-USES=		compiler:c++11-lang gmake iconv jpeg perl5 pkgconfig ssl
+USES=		compiler:c++11-lang gmake iconv jpeg perl5 pkgconfig ssl xorg
 USE_XORG=	x11 xext xrender
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 WKQT_TAGNAME=	5db36ec
 GH_TUPLE=	${PORTNAME}:qt:${WKQT_TAGNAME}:qt
 USE_CXXSTD=	gnu++98
 HAS_CONFIGURE=	yes
 
 PATCH_WRKSRC=		${WRKSRC}/qt
 CONFIGURE_WRKSRC=	${WRKSRC}/build/qt
 BUILD_WRKSRC=		${WRKSRC}/build/qt
 INSTALL_WRKSRC=		${WRKSRC}/build/app
 
 CONFIGURE_SCRIPT=	../../qt/configure
 CONFIGURE_ARGS=	-prefix ${WRKSRC}/build/qt \
 	-opensource -confirm-license -fast -release -static \
 	-graphicssystem raster -webkit -exceptions -xmlpatterns -system-zlib \
 	-system-libpng -system-libjpeg -no-libmng -no-libtiff -no-stl \
 	-no-accessibility -no-qt3support -no-phonon -no-phonon-backend \
 	-no-opengl -no-declarative -no-script -no-scripttools \
 	-no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \
 	-no-sql-sqlite -no-sql-sqlite2 -no-mmx -no-3dnow -no-sse -no-sse2 \
 	-no-multimedia -nomake demos -nomake docs -nomake examples \
 	-nomake tools -nomake tests -nomake translations -xrender -largefile \
 	-iconv -openssl-linked -no-rpath -no-dbus -no-nis -no-cups -no-pch \
 	-no-gtkstyle -no-nas-sound -no-sm -no-xshape -no-xinerama -no-xcursor \
 	-no-xfixes -no-xrandr -no-mitshm -no-xinput -no-xkb -no-glib \
 	-no-gstreamer -D ENABLE_VIDEO=0 -no-openvg -no-xsync \
 	-no-audio-backend -no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx \
 	-no-neon
 
 MAKE_ARGS=	INSTALL_ROOT="${STAGEDIR}${PREFIX}"
 
 pre-patch:
 	${RMDIR} ${WRKSRC}/qt
 	${LN} -s ../qt-${WKQT_TAGNAME} ${WRKSRC}/qt
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		-e 's|/usr/X11R6/include|${LOCALBASE}/include/X11|g' \
 		-e 's|/usr/X11R6/lib|${LOCALBASE}/lib|g' \
 		${PATCH_WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' \
 		${PATCH_WRKSRC}/mkspecs/common/gcc-base.conf
 	${REINPLACE_CMD} -e "s|gcc|${CC}|g" -e "s|g++|${CXX}|g" \
 		${PATCH_WRKSRC}/mkspecs/common/g++-base.conf
 	${REINPLACE_CMD} -e "s|share/man|man|g" \
 		${WRKSRC}/src/image/image.pro \
 		${WRKSRC}/src/pdf/pdf.pro
 	${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/image/image.pro
 	${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/pdf/pdf.pro
 	${MKDIR} ${WRKSRC}/build/app ${WRKSRC}/build/qt \
 		${WRKSRC}/build/wkhtmltox
 
 post-build:
 	cd ${WRKSRC}/build/app && ${SETENV} ${MAKE_ENV} \
 		../qt/bin/qmake ../../wkhtmltopdf.pro && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \
 		${ALL_TARGET}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wkhtmltoimage \
 		${STAGEDIR}${PREFIX}/bin/wkhtmltopdf \
 		${STAGEDIR}${PREFIX}/lib/libwkhtmltox.so.${PORTVERSION}
 
 .include <bsd.port.mk>