Index: head/editors/libreoffice/Makefile
===================================================================
--- head/editors/libreoffice/Makefile	(revision 403435)
+++ head/editors/libreoffice/Makefile	(revision 403436)
@@ -1,321 +1,321 @@
 # $FreeBSD$
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	0
+PORTREVISION=	1
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
 		http://dev-www.libreoffice.org/src/:src \
 		http://dev-www.libreoffice.org/extern/:ext
 DISTFILES=	${PORTNAME}-${LOVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	libreoffice
 EXTRACT_ONLY:=	${DISTFILES}
 
 COMMENT=	Full integrated office productivity suite
 
 BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/include/sqlext.h:${PORTSDIR}/databases/unixODBC \
 		cppunit-config:${PORTSDIR}/devel/cppunit \
 		dmake:${PORTSDIR}/devel/dmake \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		mdds>=0.9.0:${PORTSDIR}/devel/mdds \
 		gpatch:${PORTSDIR}/devel/patch \
 		ucpp:${PORTSDIR}/devel/ucpp \
 		${LOCALBASE}/include/sane/sane.h:${PORTSDIR}/graphics/sane-backends \
 		vigra-config:${PORTSDIR}/graphics/vigra \
 		${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm \
 		bash:${PORTSDIR}/shells/bash \
 		gsed:${PORTSDIR}/textproc/gsed
 LIB_DEPENDS=	libfbembed.so:${PORTSDIR}/databases/firebird25-client \
 		libapr-1.so:${PORTSDIR}/devel/apr1 \
 		libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
 		libicutu.so:${PORTSDIR}/devel/icu \
 		liblangtag.so:${PORTSDIR}/devel/liblangtag \
 		liborcus-0.10.so:${PORTSDIR}/devel/liborcus \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libcairo.so:${PORTSDIR}/graphics/cairo \
 		libgraphite2.so:${PORTSDIR}/graphics/graphite2 \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 		libcdr-0.1.so:${PORTSDIR}/graphics/libcdr01 \
 		libetonyek-0.1.so:${PORTSDIR}/graphics/libetonyek01 \
 		libfreehand-0.1.so:${PORTSDIR}/graphics/libfreehand \
 		libgltf-0.0.so:${PORTSDIR}/graphics/libgltf \
 		libwpg-0.3.so:${PORTSDIR}/graphics/libwpg03 \
 		libGeneratedSaxParser.so:${PORTSDIR}/graphics/opencollada \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libpoppler.so:${PORTSDIR}/graphics/poppler \
 		libCoinMP.so:${PORTSDIR}/math/coinmp \
 		liblpsolve55.so:${PORTSDIR}/math/lp_solve \
 		libcmis-0.5.so:${PORTSDIR}/net/libcmis \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
 		libmspub-0.1.so:${PORTSDIR}/print/libmspub01 \
 		libpagemaker-0.0.so:${PORTSDIR}/print/libpagemaker \
 		libnss3.so:${PORTSDIR}/security/nss \
 		libclucene-core.so:${PORTSDIR}/textproc/clucene \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 		libhyphen.so:${PORTSDIR}/textproc/hyphen \
 		libabw-0.1.so:${PORTSDIR}/textproc/libabw \
 		libe-book-0.1.so:${PORTSDIR}/textproc/libe-book \
 		libexttextcat-2.0.so:${PORTSDIR}/textproc/libexttextcat \
 		libmwaw-0.3.so:${PORTSDIR}/textproc/libmwaw03 \
 		libodfgen-0.1.so:${PORTSDIR}/textproc/libodfgen01 \
 		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge \
 		libvisio-0.1.so:${PORTSDIR}/textproc/libvisio01 \
 		libwpd-0.10.so:${PORTSDIR}/textproc/libwpd010 \
 		libwps-0.4.so:${PORTSDIR}/textproc/libwps \
 		libxml2.so:${PORTSDIR}/textproc/libxml2 \
 		libxslt.so:${PORTSDIR}/textproc/libxslt \
 		libmythes-1.2.so:${PORTSDIR}/textproc/mythes \
 		librdf.so:${PORTSDIR}/textproc/redland \
 		libserf-1.so:${PORTSDIR}/www/serf
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
 		${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:${PORTSDIR}/x11-fonts/gentium-basic \
 		${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \
 		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g
 
 DISTFILES+=	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src \
 		4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src
 
 .if defined(PRERELEASE)
 MASTER_SITES+=	http://dev-builds.libreoffice.org/pre-releases/src/
 .endif
 
 CONFLICTS_INSTALL=	libreoffice4-4.*
 
 INSTALL_TARGET=	distro-pack-install
 WRKSRC=		${WRKDIR}/${PORTNAME}-${LOVERSION}
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf aclocal
 USE_GL=		gl glew glu
 USE_OPENLDAP=	yes
 USE_PERL5=	build
 USE_QT4=	# empty but required
 USE_XORG=	xaw xrandr
 USES=		bison compiler:c++11-lib cpe gmake jpeg perl5 pkgconfig \
 		python shared-mime-info tar:xz
 WANT_GNOME=	yes
 
 OPTIONS_DEFINE=	CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \
 		TEST VERBOSE WEBDAV
 OPTIONS_DEFAULT=	CUPS GTK2
 
 JAVA_DESC=	Add Java support (XML filters, macros)
 MMEDIA_DESC=	Enable multimedia backend for impress
 PGSQL_DESC=	Build with PostgreSQL-SDBC driver
 SDK_DESC=	Build with SDK
 SYSTRAY_DESC=	Enable systemtray quickstarter
 TEST_DESC=	Run all regression tests
 VERBOSE_DESC=	Increase build verbosity
 WEBDAV_DESC=	Enable webdav protocol
 
 CUPS_CONFIGURE_ENABLE=	cups
 CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
 
 GNOME_CONFIGURE_ENABLE=	dbus gconf lockdown
 GNOME_IMPLIES=	GTK2
 GNOME_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 GNOME_USE=	GNOME=gconf2
 
 GTK_USE_GNOME=	gtk-update-icon-cache
 GTK_USES=	desktop-file-utils
 GTK_VARS=	POST_PLIST=add-plist-gnome
 
 GTK2_CONFIGURE_ENABLE=	gtk
 GTK2_USE=	GNOME=gtk20,${GTK_USE_GNOME}
 GTK2_USES=	${GTK_USES}
 GTK2_VARS=	${GTK_VARS}
 
 GTK3_CONFIGURE_ENABLE=	gtk3
 GTK3_USE=	GNOME=gtk30,${GTK_USE_GNOME}
 GTK3_USES=	${GTK_USES}
 GTK3_VARS=	${GTK_VARS}
 
 JAVA_BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
 			${JAVAJARDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec \
 			${JAVAJARDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
 			${JAVAJARDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
 			${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
 			${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit \
 			${JAVAJARDIR}/bsh.jar:${PORTSDIR}/lang/bsh
 JAVA_CATEGORIES=	java
 JAVA_CONFIGURE_ON=	--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-beanshell-jar=${JAVAJARDIR}/bsh.jar \
 			--with-commons-codec-jar=${JAVAJARDIR}/commons-codec.jar \
 			--with-commons-httpclient-jar=${JAVAJARDIR}/commons-httpclient.jar \
 			--with-commons-lang-jar=${JAVAJARDIR}/commons-lang.jar \
 			--with-commons-logging-jar=${JAVAJARDIR}/commons-logging.jar \
 			--with-jdk-home="${JAVA_HOME}" \
 			--with-junit=${JAVAJARDIR}/junit.jar \
 			--with-hamcrest=${JAVAJARDIR}/hamcrest.jar \
 			--without-system-jfreereport
 JAVA_CONFIGURE_WITH=	java
 # XXX jni.h from GNU classpath causes ABI conflicts.
 JAVA_CONFLICTS_BUILD=	classpath-[0-9]*
 JAVA_DISTFILES=	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
 		3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \
 		35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \
 		39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \
 		3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \
 		798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:src \
 		8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \
 		97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \
 		ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \
 		ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \
 		d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \
 		db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \
 		eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \
 		f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src
 JAVA_USE=	JAVA=yes
 JAVA_VARS=	JAVA_BUILD=yes
 
 KDE4_CONFIGURE_ENABLE=	kde4
 KDE4_CONFIGURE_ENV=	KDE4DIR="${KDE4_PREFIX}" \
 			QT4DIR="${QT_PREFIX}" \
 			QT4INC="${QT_INCDIR}" \
 			QT4LIB="${QT_LIBDIR}"
 KDE4_USE=	KDE4=kdelibs QT4=moc_build,qmake_build
 
 MMEDIA_CONFIGURE_ENABLE=	gstreamer-1-0
 MMEDIA_USE=	GSTREAMER1=yes
 
 PGSQL_CONFIGURE_ENABLE=	postgresql-sdbc
 PGSQL_CONFIGURE_WITH=	gssapi krb5
 PGSQL_USES=	pgsql
 
 SDK_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 SDK_CONFIGURE_ENABLE=	odk
 SDK_CONFIGURE_OFF=	--without-doxygen
 SDK_CONFIGURE_ON=	--with-doxygen=${LOCALBASE}/bin/doxygen
 SDK_DISTFILES=	185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext
 
 SYSTRAY_CONFIGURE_ENABLE=	systray
 
 TEST_CONFIGURE_ENABLE=	cve-tests
 
 VERBOSE_CONFIGURE_ON=	--enable-verbose
 
 WEBDAV_CONFIGURE_ENABLE=	neon
 WEBDAV_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
 
 ACLOCAL_ARGS=	-I "${WRKSRC}/m4"
 CPPFLAGS+=	-isystem ${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 COLLADA_MODS=	COLLADABaseUtils COLLADAFramework \
 		COLLADASaxFrameworkLoader GeneratedSaxParser
 COLLADA_CFLAGS=	${COLLADA_MODS:S|^|-isystem ${LOCALBASE}/include/opencollada/|}
 COLLADA_LIBS=	-L${LOCALBASE}/lib/opencollada \
 		${COLLADA_MODS:S|^COLLADA|OpenCOLLADA|:S|^|-l|}
 
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--disable-epm \
 		--disable-fetch-external \
 		--disable-gnome-vfs \
 		--disable-kde \
 		--disable-kdeab \
 		--disable-mergelibs \
 		--disable-online-update \
 		--disable-packagekit \
 		--enable-cairo-canvas \
 		--enable-graphite \
 		--enable-python=system \
 		--enable-release-build \
 		--exec-prefix=${PREFIX} \
 		--with-alloc=system \
 		--with-boost=${LOCALBASE} \
 		--with-build-version="FreeBSD ports ${PKGVERSION}" \
 		--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 		--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 		--with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
 		--with-external-thes-dir=${LOCALBASE}/share/mythes \
 		--with-gnu-patch=${LOCALBASE}/bin/gpatch \
 		--with-os-version=${OSVERSION} \
 		--with-parallelism=${MAKE_JOBS_NUMBER} \
 		--with-system-curl \
 		--with-system-dicts \
 		--with-system-libs \
 		--with-system-libxml \
 		--with-system-opencollada \
 		--with-system-ucpp \
 		--with-system-zlib \
 		--with-vendor="FreeBSD ports" \
 		--without-fonts \
 		--without-myspell-dicts \
 		--without-system-npapi-headers
 
 CONFIGURE_ENV=	DMAKE=${LOCALBASE}/bin/dmake \
 		FIREBIRD_CFLAGS="-isystem ${LOCALBASE}/include" \
 		FIREBIRD_LIBS="-L${LOCALBASE}/lib -lfbembed" \
 		GNUTAR="${TAR}" \
 		GPERF=${LOCALBASE}/bin/gperf \
 		OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \
 		OPENCOLLADA_LIBS="${COLLADA_LIBS}" \
 		OPENSSL_CFLAGS="-I/usr/include" \
 		OPENSSL_LIBS="-lcrypto -lssl" \
 		PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
 		PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"
 
 MAKE_ENV+=	CXXFLAGS_WARN="${CXXFLAGS_WARN}"
 MAKE_ENV+=	GNUSED=${LOCALBASE}/bin/gsed
 MAKE_ENV+=	DISPLAY= LANG=C LC_ALL=C
 
 _MAKE_JOBS=	#
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 .if ${COMPILER_FEATURES:Mlibstdc++}
 BROKEN=		Build with system libstdc++ is unsupported
 .endif
 
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 CONFIGURE_ENV+=	FLEX=${LOCALBASE}/bin/flex
 .endif
 .endif # FreeBSD
 
 .if ${COMPILER_TYPE} == "clang"
 CXXFLAGS_WARN=	-Woverloaded-virtual -Wno-unused-parameter
 .if${COMPILER_VERSION} >= 36
 CXXFLAGS_WARN+=	-Wno-unused-local-typedefs
 .endif
 .else
 CXXFLAGS_WARN=	-Wshadow -Woverloaded-virtual
 .endif
 
 pre-configure:
 	@${TOUCH} ${WRKSRC}/autogen.lastrun
 
 post-configure:
 	@${TOUCH} ${WRKSRC}/src.downloaded
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s lib/libreoffice -type d -empty \
 	    -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s bin etc lib man -not -type d >> ${TMPPLIST}
 .for subdir in application-registry applications icons mime mime-info mimelnk
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST}
 .endfor
 
 post-install-SDK-on:
 .for subdir in include share share/doc share/idl
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST}
 .endfor
 
 add-plist-gnome:
 .for subdir in gnome hicolor locolor
 	@${ECHO_CMD} "@rmtry share/icons/${subdir}/icon-theme.cache" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/editors/libreoffice4/Makefile
===================================================================
--- head/editors/libreoffice4/Makefile	(revision 403435)
+++ head/editors/libreoffice4/Makefile	(revision 403436)
@@ -1,380 +1,381 @@
 # $FreeBSD$
 
 PORTNAME=	libreoffice
 PORTVERSION=	4.3.7
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/ \
 		http://dev-www.libreoffice.org/extern/:ext \
 		http://dev-www.libreoffice.org/src/:src
 PKGNAMESUFFIX=	4
 DISTFILES=	${PORTNAME}-${LOVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	libreoffice
 EXTRACT_ONLY:=	${DISTFILES}
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Full integrated office productivity suite
 
 LICENSE=	LGPL3 MPL
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \
 		cppunit-config:${PORTSDIR}/devel/cppunit \
 		dmake:${PORTSDIR}/devel/dmake \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		mdds>=0.9.0:${PORTSDIR}/devel/mdds \
 		gpatch:${PORTSDIR}/devel/patch \
 		ucpp:${PORTSDIR}/devel/ucpp \
 		vigra-config:${PORTSDIR}/graphics/vigra \
 		${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm \
 		bash:${PORTSDIR}/shells/bash \
 		gsed:${PORTSDIR}/textproc/gsed
 LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1 \
 		libicutu.so:${PORTSDIR}/devel/icu \
 		liblangtag.so:${PORTSDIR}/devel/liblangtag \
 		liborcus-0.8.so:${PORTSDIR}/devel/liborcus07 \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libcairo.so:${PORTSDIR}/graphics/cairo \
 		libgraphite2.so:${PORTSDIR}/graphics/graphite2 \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 		libcdr-0.1.so:${PORTSDIR}/graphics/libcdr01 \
 		libetonyek-0.1.so:${PORTSDIR}/graphics/libetonyek01 \
 		libfreehand-0.1.so:${PORTSDIR}/graphics/libfreehand \
 		libgltf-0.0.so:${PORTSDIR}/graphics/libgltf \
 		libwpg-0.3.so:${PORTSDIR}/graphics/libwpg03 \
 		libGeneratedSaxParser.so:${PORTSDIR}/graphics/opencollada \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libpoppler.so:${PORTSDIR}/graphics/poppler \
 		liblpsolve55.so:${PORTSDIR}/math/lp_solve \
 		libcmis-0.5.so:${PORTSDIR}/net/libcmis \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
 		libmspub-0.1.so:${PORTSDIR}/print/libmspub01 \
 		libnss3.so:${PORTSDIR}/security/nss \
 		libclucene-core.so:${PORTSDIR}/textproc/clucene \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 		libhyphen.so:${PORTSDIR}/textproc/hyphen \
 		libabw-0.1.so:${PORTSDIR}/textproc/libabw \
 		libe-book-0.1.so:${PORTSDIR}/textproc/libe-book \
 		libexttextcat-2.0.so:${PORTSDIR}/textproc/libexttextcat \
 		libmwaw-0.3.so:${PORTSDIR}/textproc/libmwaw03 \
 		libodfgen-0.1.so:${PORTSDIR}/textproc/libodfgen01 \
 		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge \
 		libvisio-0.1.so:${PORTSDIR}/textproc/libvisio01 \
 		libwpd-0.10.so:${PORTSDIR}/textproc/libwpd010 \
 		libwps-0.3.so:${PORTSDIR}/textproc/libwps03 \
 		libxml2.so:${PORTSDIR}/textproc/libxml2 \
 		libxslt.so:${PORTSDIR}/textproc/libxslt \
 		libmythes-1.2.so:${PORTSDIR}/textproc/mythes \
 		librdf.so:${PORTSDIR}/textproc/redland \
 		libserf-1.so:${PORTSDIR}/www/serf
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \
 		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
 		${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:${PORTSDIR}/x11-fonts/gentium-basic \
 		${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \
 		${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g
 
 CONFLICTS_INSTALL=	libreoffice-5.*
 ONLY_FOR_ARCHS=	amd64 i386
 
 _MAKE_JOBS=	#
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf aclocal
 USE_GL=		gl glew glu
 USE_OPENLDAP=	yes
 USE_PERL5=	build
 USE_QT4=	# empty but required
 USE_XORG=	xaw xrandr
 USES=		bison compiler:c++11-lang cpe gmake jpeg perl5 pkgconfig python shared-mime-info tar:xz
 WANT_GNOME=	yes
 
 LOVERSION=	${PORTVERSION}.${RCVER}
 RCVER=		2
 
 DISTFILES+=	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src \
 		4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src
 
 EXTRA_PATCHES=	${FILESDIR}/enable-opencollada:-p1
 WRKSRC=		${WRKDIR}/${PORTNAME}-${LOVERSION}
 
 COLLADA_MODS=		COLLADABaseUtils COLLADAFramework \
 			COLLADASaxFrameworkLoader GeneratedSaxParser
 COLLADA_CFLAGS=		${COLLADA_MODS:S|^|-I${LOCALBASE}/include/opencollada/|}
 COLLADA_LIBS=		-L${LOCALBASE}/lib/opencollada \
 			${COLLADA_MODS:S|^COLLADA|OpenCOLLADA|:S|^|-l|}
 
 CONFIGURE_ENV=		DMAKE=${LOCALBASE}/bin/dmake \
 			GNUTAR="${TAR}" \
 			GPERF=${LOCALBASE}/bin/gperf \
 			OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \
 			OPENCOLLADA_LIBS="${COLLADA_LIBS}" \
 			OPENSSL_CFLAGS="-I/usr/include" \
 			OPENSSL_LIBS="-lcrypto -lssl" \
 			PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
 			PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"
 
 CONFIGURE_ARGS+=	--disable-dependency-tracking \
 			--disable-fetch-external \
 			--disable-online-update \
 			--exec-prefix=${PREFIX} \
 			--with-build-version="FreeBSD ports ${PKGVERSION}" \
 			--with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch \
 			--with-os-version=${OSVERSION} \
 			--with-parallelism=${MAKE_JOBS_NUMBER} \
 			--with-vendor="FreeBSD ports"
 
 CONFIGURE_ARGS+=	--disable-coinmp \
 			--disable-epm \
 			--disable-firebird-sdbc \
 			--disable-gnome-vfs \
 			--disable-gstreamer-0-10 \
 			--disable-kde \
 			--disable-kdeab \
 			--disable-mergelibs \
 			--disable-packagekit \
 			--enable-cairo-canvas \
 			--enable-graphite \
 			--enable-python=system \
 			--with-alloc=system \
 			--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 			--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 			--with-external-thes-dir=${LOCALBASE}/share/mythes \
 			--with-system-altlinuxhyph \
 			--with-system-apr \
 			--with-system-boost \
 			--with-system-cairo \
 			--with-system-clucene \
 			--with-system-cppunit \
 			--with-system-curl \
 			--with-system-dicts \
 			--with-system-expat \
 			--with-system-glew \
 			--with-system-glm \
 			--with-system-graphite \
 			--with-system-harfbuzz \
 			--with-system-hunspell \
 			--with-system-icu \
 			--with-system-jpeg \
 			--with-system-lcms2 \
 			--with-system-libabw \
 			--with-system-libcdr \
 			--with-system-libcmis \
 			--with-system-libebook \
 			--with-system-libetonyek \
 			--with-system-libexttextcat \
 			--with-system-libfreehand \
 			--with-system-libgltf \
 			--with-system-liblangtag \
 			--with-system-libmspub \
 			--with-system-libmwaw \
 			--with-system-libodfgen \
 			--with-system-libpng \
 			--with-system-librevenge \
 			--with-system-libvisio \
 			--with-system-libwpd \
 			--with-system-libwpg \
 			--with-system-libwps \
 			--with-system-libxml \
 			--with-system-lpsolve \
 			--with-system-mdds \
 			--with-system-mesa-headers \
 			--with-system-mythes \
 			--with-system-neon \
 			--with-system-nss \
 			--with-system-opencollada \
 			--with-system-openldap \
 			--with-system-openssl \
 			--with-system-orcus \
 			--with-system-poppler \
 			--with-system-postgresql \
 			--with-system-redland \
 			--with-system-serf \
 			--with-system-ucpp \
 			--with-system-vigra \
 			--with-system-zlib \
 			--without-fonts \
 			--without-myspell-dicts \
 			--without-system-npapi-headers
 
 #XXX add: --with-system-libeot or --with-system-libatomic_ops
 
 OPTIONS_DEFINE=	CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK \
 		SYSTRAY TEST VERBOSE WEBDAV
 OPTIONS_DEFAULT=CUPS GTK2
 
 JAVA_DESC=	Add Java support (XML filters, macros)
 MMEDIA_DESC=	Enable multimedia backend for impress
 PGSQL_DESC=	Build with PostgreSQL-SDBC driver
 SDK_DESC=	Build with SDK
 SYSTRAY_DESC=	Enable systemtray quickstarter
 TEST_DESC=	Run all regression tests
 VERBOSE_DESC=	Increase build verbosity
 WEBDAV_DESC=	Enable webdav protocol
 
 CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
 CUPS_CONFIGURE_ENABLE=	cups
 
 DEBUG_CONFIGURE_ON=	--enable-crashdump --enable-dbgutil --enable-debug
 DEBUG_CONFIGURE_OFF=	--enable-release-build
 
 GNOME_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 GNOME_USE=	GNOME=gconf2
 GNOME_CONFIGURE_ENABLE=	dbus gconf lockdown
 
 GTK3_USE=		GNOME=gtk30
 GTK3_CONFIGURE_ENABLE=	gtk3
 
 JAVA_CATEGORIES=	java
 JAVA_DISTFILES=	048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip:src \
 		17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
 		2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz:src \
 		3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \
 		35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \
 		39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \
 		3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \
 		798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:src \
 		8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz:src \
 		8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \
 		97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \
 		a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip:src \
 		ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \
 		ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \
 		d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \
 		db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \
 		e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz:src \
 		ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz:src \
 		eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \
 		f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src
 JAVA_BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
 			${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit
 # XXX jni.h from GNU classpath causes ABI conflicts.
 JAVA_CONFLICTS_BUILD=	classpath-[0-9]*
 JAVA_CONFIGURE_ON=	--enable-ext-wiki-publisher \
 			--enable-report-builder \
 			--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-jdk-home="${JAVA_HOME}" \
 			--with-junit=${JAVAJARDIR}/junit.jar \
 			--with-hamcrest=${JAVAJARDIR}/hamcrest.jar
 JAVA_CONFIGURE_OFF=	--without-java
 JAVA_USE=	JAVA=yes
 JAVA_VARS=	JAVA_BUILD=yes
 
 KDE4_USE=	KDE4=kdelibs QT4=moc_build,qmake_build
 KDE4_CONFIGURE_ENABLE=	kde4
 KDE4_CONFIGURE_ENV=	KDE4DIR="${KDE4_PREFIX}" \
 			QT4DIR="${QT_PREFIX}" \
 			QT4INC="${QT_INCDIR}" \
 			QT4LIB="${QT_LIBDIR}"
 
 MMEDIA_USE=	GSTREAMER1=yes
 MMEDIA_CONFIGURE_ENABLE=	gstreamer
 
 PGSQL_USES=	pgsql:9.0+
 PGSQL_CONFIGURE_ENABLE=	postgresql-sdbc
 PGSQL_CONFIGURE_WITH=	gssapi krb5
 
 SDK_DISTFILES=	185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext
 SDK_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 SDK_CONFIGURE_ENABLE=	odk
 SDK_CONFIGURE_ON=	--with-doxygen=${LOCALBASE}/bin/doxygen
 SDK_CONFIGURE_OFF=	--without-doxygen
 
 SYSTRAY_CONFIGURE_ENABLE=	systray
 
 TEST_CONFIGURE_ENABLE=	cve-tests
 
 WEBDAV_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
 WEBDAV_CONFIGURE_ENABLE=	neon
 
 # for dynamic plist generation
 PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 IGNORE=			is broken with DEBUG option
 .else
 EXTRA_PATCHES+=		${FILESDIR}/extra-Makefile.in
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG} || ${PORT_OPTIONS:MVERBOSE}
 CONFIGURE_ARGS+=	--enable-verbose
 .endif
 
 .if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gtk
 .else
 CONFIGURE_ARGS+=	--disable-gtk
 .endif
 
 .if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
 USES+=		desktop-file-utils
 CONFIGURE_ARGS+=	--enable-gio
 INSTALLS_ICONS=	yes
 .else
 CONFIGURE_ARGS+=	--disable-gio
 .endif
 
 .if empty(PORT_OPTIONS:MTEST)
 EXTRA_PATCHES+=		${FILESDIR}/disable-cppunittester
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_FEATURES:Mlibc++}
 EXTRA_PATCHES+=	${FILESDIR}/extra-libc++:-p1
 EXTRA_PATCHES+=	${FILESDIR}/extra-libc++.i386:-p0
 .endif
 
 .if ${COMPILER_FEATURES:Mlibstdc++}
 EXTRA_PATCHES+=	${FILESDIR}/extra-configure.ac
 .endif
 
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 CONFIGURE_ENV+=	FLEX=${LOCALBASE}/bin/flex
 .endif
 
 ACLOCAL_ARGS=	-I "${WRKSRC}/m4"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ENV+=	ENVCFLAGS="${CFLAGS}" ENVCFLAGSCXX="${CXXFLAGS}"
 MAKE_ENV+=	ENVLINKFLAGS="${LDFLAGS}"
 MAKE_ENV+=	GNUSED=${LOCALBASE}/bin/gsed
 MAKE_ENV+=	LANG=C LC_ALL=C
 
 pre-configure:
 	@${TOUCH} ${WRKSRC}/autogen.lastrun
 
 post-configure:
 	@${TOUCH} ${WRKSRC}/src.downloaded
 
 do-install:
 	@cd ${WRKSRC} && ${MAKE_CMD} ${MAKE_ARGS} distro-pack-install
 	@${RM} -f ${PLISTD} ${PLISTF}
 	@cd ${STAGEDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \
 	    -empty -exec ${ECHO_CMD} "@dir {}" \; >> ${PLISTD}
 	@cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s bin etc lib man \
 	    \( -type f -o -type l \) -print >> ${PLISTF}
 .for subdir in application-registry applications icons mime mime-info mimelnk
 	@cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \
 	    \( -type f -o -type l \) -print >> ${PLISTF}
 .endfor
 .if ${PORT_OPTIONS:MSDK}
 .for subdir in include share share/doc share/idl
 	@cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s ${subdir}/libreoffice \
 	    \( -type f -o -type l \) -print >> ${PLISTF}
 .endfor
 .endif
 	@${SORT} -u ${PLISTF} >> ${TMPPLIST}
 	@${SORT} -u ${PLISTD} >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
Index: head/games/aquaria/Makefile
===================================================================
--- head/games/aquaria/Makefile	(revision 403435)
+++ head/games/aquaria/Makefile	(revision 403436)
@@ -1,64 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	aquaria
 PORTVERSION=	1.002
 DISTVERSIONPREFIX=	OSE-v
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Underwater 2D fantasy action-adventure (game engine)
 
 LICENSE=	GPLv2 # or any later version
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
 LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
 		libftgl.so:${PORTSDIR}/graphics/ftgl \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libtinyxml2.so:${PORTSDIR}/textproc/tinyxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AquariaOSE
 GH_PROJECT=	Aquaria
 
 USES=		cmake lua:51 ninja openal pkgconfig
 EXCLUDE=	AL FTGL GL SDL* freetype2 glm glpng/png glpng/zlib \
 		libogg-* libvorbis-* lua-* tinyxml2*
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ExternalLibs/,}
 CMAKE_ARGS+=	-DAQUARIA_DEFAULT_DATA_DIR="${DATADIR}" \
 		-DAQUARIA_INTERNAL_FREETYPE=off \
 		-DAQUARIA_INTERNAL_FTGL=off \
 		-DAQUARIA_INTERNAL_LUA=off \
 		-DAQUARIA_INTERNAL_OGGVORBIS=off \
 		-DAQUARIA_INTERNAL_OPENAL=off \
 		-DAQUARIA_INTERNAL_PNG=off \
 		-DAQUARIA_INTERNAL_SDL=off \
 		-DAQUARIA_INTERNAL_TINYXML2=off \
 		-DAQUARIA_INTERNAL_ZLIB=off
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (vorbis deps)
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/aquaria
 PORTDATA=	*
 
 DESKTOP_ENTRIES="${GH_PROJECT}" \
 		"" \
 		"${DATADIR}/${PORTNAME}.png" \
 		"${PORTNAME}" \
 		"Game;ArcadeGame;" \
 		""
 
 OPTIONS_DEFINE=	DEBUG SDL2
 OPTIONS_DEFAULT=SDL2
 
 SDL2_DESC=	Use SDL 2.x instead of SDL 1.2.x
 SDL2_CMAKE_ON=	-DAQUARIA_USE_SDL2=on
 SDL2_USE=	SDL=sdl2
 SDL2_USE_OFF=	SDL=sdl
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 .for d in game_scripts files
 	(cd ${WRKSRC}/${d} && ${COPYTREE_SHARE} \
 		"." ${STAGEDIR}${DATADIR}/override)
 .endfor
 
 .include <bsd.port.mk>
Index: head/graphics/cegui/Makefile
===================================================================
--- head/graphics/cegui/Makefile	(revision 403435)
+++ head/graphics/cegui/Makefile	(revision 403436)
@@ -1,128 +1,129 @@
 # Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cegui
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/crayzedsgui/CEGUI%20Mk-2/0.8
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Library providing windowing and widgets for graphics APIs
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/2b/2/}
 CONFIGURE_ENV+=	TOLUA_INC="${LUA_INCDIR}"
 CMAKE_ARGS=	-DCEGUI_SAMPLES_ENABLED:BOOL=OFF \
 		-DCEGUI_BUILD_TESTS=OFF
 USE_LDCONFIG=	yes
 USES=		compiler:c++11-lib cmake pathfix pkgconfig tar:bzip2
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	FREETYPE PCRE LUA FRIBIDI DOCS
 OPTIONS_GROUP=	XMLPARSER IMAGECODEC RENDERER
 OPTIONS_GROUP_XMLPARSER=	EXPAT XERCES LIBXML2 RAPIDXML TINYXML
 OPTIONS_GROUP_IMAGECODEC=	DEVIL FREEIMAGE
 OPTIONS_GROUP_RENDERER=	OPENGL OPENGL3 OGRE IRRLICHT
 
 OPTIONS_DEFAULT=	FREETYPE PCRE LUA FRIBIDI PYTHON
 OPTIONS_DEFAULT+=	EXPAT LIBXML2 TINYXML
 OPTIONS_DEFAULT+=	DEVIL FREEIMAGE
 OPTIONS_DEFAULT+=	OPENGL OPENGL3 OGRE
 
 OPTIONS_SUB=	yes
 
 FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 FREETYPE_CMAKE_ON=	-DCEGUI_HAS_FREETYPE=ON
 FREETYPE_CMAKE_OFF=	-DCEGUI_HAS_FREETYPE=OFF
 PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 PCRE_CMAKE_ON=		-DCEGUI_HAS_PCRE_REGEX=ON
 PCRE_CMAKE_OFF=		-DCEGUI_HAS_PCRE_REGEX=OFF
 LUA_USES=		lua:51
 LUA_LIB_DEPENDS=	libtolua++-${LUA_VER}.so:${PORTSDIR}/lang/tolua++
 LUA_CMAKE_ON=		-DCEGUI_BUILD_LUA_MODULE=ON -DCEGUI_BUILD_LUA_GENERATOR=ON
 LUA_CMAKE_OFF=		-DCEGUI_BUILD_LUA_MODULE=OFF -DCEGUI_BUILD_LUA_GENERATOR=OFF
 # this option is not currently used as it doesn't compile (see also CMAKE_ARGS below)
 PYTHON_USES=		python
 PYTHON_LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
 PYTHON_CMAKE_ON=	-DCEGUI_BUILD_PYTHON_MODULES=ON
 PYTHON_CMAKE_OFF=	-DCEGUI_BUILD_PYTHON_MODULES=OFF
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
 FRIBIDI_CMAKE_ON=	-DCEGUI_USE_FRIBIDI=ON
 FRIBIDI_CMAKE_OFF=	-DCEGUI_USE_FRIBIDI=OFF
 
 EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 EXPAT_CMAKE_ON=		-DCEGUI_BUILD_XMLPARSER_EXPAT=ON
 EXPAT_CMAKE_OFF=	-DCEGUI_BUILD_XMLPARSER_EXPAT=OFF
 XERCES_LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3
 XERCES_CMAKE_ON=	-DCEGUI_BUILD_XMLPARSER_XERCES=ON
 XERCES_CMAKE_OFF=	-DCEGUI_BUILD_XMLPARSER_XERCES=OFF
 LIBXML2_USE=		GNOME=libxml2
 LIBXML2_CMAKE_ON=	-DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
 LIBXML2_CMAKE_OFF=	-DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF
 RAPIDXML_BUILD_DEPENDS=	${LOCALBASE}/include/rapidxml.hpp:${PORTSDIR}/textproc/rapidxml
 RAPIDXML_DESC=		XML parser support via RapidXML
 RAPIDXML_CMAKE_ON=	-DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON
 RAPIDXML_CMAKE_OFF=	-DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
 TINYXML_LIB_DEPENDS=	libtinyxml.so:${PORTSDIR}/textproc/tinyxml
 TINYXML_CMAKE_ON=	-DCEGUI_BUILD_XMLPARSER_TINYXML=ON
 TINYXML_CMAKE_OFF=	-DCEGUI_BUILD_XMLPARSER_TINYXML=OFF
 
 DEVIL_DESC=		DevIL based ImageCodec module
 DEVIL_LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil
 DEVIL_CMAKE_ON=		-DCEGUI_BUILD_IMAGECODEC_DEVIL=ON
 DEVIL_CMAKE_OFF=	-DCEGUI_BUILD_IMAGECODEC_DEVIL=OFF
 FREEIMAGE_DESC=		FreeImage based ImageCodec module
 FREEIMAGE_LIB_DEPENDS=	libfreeimage.so:${PORTSDIR}/graphics/freeimage
 FREEIMAGE_CMAKE_ON=	-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
 FREEIMAGE_CMAKE_OFF=	-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
 
 OGRE_DESC=		Ogre3D support
 OGRE_LIB_DEPENDS=	libOgreMain.so:${PORTSDIR}/graphics/ogre3d
 OGRE_CMAKE_ON=		-DCEGUI_BUILD_RENDERER_OGRE=ON
 OGRE_CMAKE_OFF=		-DCEGUI_BUILD_RENDERER_OGRE=OFF
 IRRLICHT_DESC=		Irrlicht support
 IRRLICHT_LIB_DEPENDS=	libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
 IRRLICHT_CMAKE_ON=	-DCEGUI_BUILD_RENDERER_IRRLICHT=ON
 IRRLICHT_CMAKE_OFF=	-DCEGUI_BUILD_RENDERER_IRRLICHT=OFF
 OPENGL_BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
 OPENGL_USE=		GL=gl,glew
 OPENGL_CMAKE_ON=	-DCEGUI_BUILD_RENDERER_OPENGL=ON
 OPENGL_CMAKE_OFF=	-DCEGUI_BUILD_RENDERER_OPENGL=OFF
 OPENGL3_DESC=		OpenGL 3+ support (core profile)
 OPENGL3_BUILD_DEPENDS=	${OPENGL_BUILD_DEPENDS}
 OPENGL3_USE=		${OPENGL_USE}
 OPENGL3_CMAKE_ON=	-DCEGUI_BUILD_RENDERER_OPENGL3=ON
 OPENGL3_CMAKE_OFF=	-DCEGUI_BUILD_RENDERER_OPENGL3=OFF
 
 # not present in ports/unsupported, but may appear later
 CMAKE_ARGS+=		-DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF \
 			-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF \
 			-DCEGUI_BUILD_IMAGECODEC_SILLY=OFF \
 			-DCEGUI_BUILD_IMAGECODEC_PVR=OFF \
 			-DCEGUI_BUILD_RENDERER_OPENGLES=OFF \
 			-DCEGUI_BUILD_RENDERER_DIRECTFB=OFF
 CMAKE_ARGS+=		-DCEGUI_BUILD_PYTHON_MODULES=OFF # python support doesn't build
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MEXPAT} || ${PORT_OPTIONS:MXERCES} || ${PORT_OPTIONS:MLIBXML2} || ${PORT_OPTIONS:MRAPIDXML} || ${PORT_OPTIONS:MTINYXML}
 PLIST_SUB+=	XMLPARSERS=""
 .else
 PLIST_SUB+=	XMLPARSERS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL} || ${PORT_OPTIONS:MOPENGL3}
 PLIST_SUB+=	ANYOPENGL=""
 .else
 PLIST_SUB+=	ANYOPENGL="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\$${CEGUI_LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|g' \
 		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.post.mk>
Index: head/graphics/gource/Makefile
===================================================================
--- head/graphics/gource/Makefile	(revision 403435)
+++ head/graphics/gource/Makefile	(revision 403436)
@@ -1,30 +1,31 @@
 # Created by: demon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	gource
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/acaudwell/Gource/releases/download/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	OpenGL-based 3D visualisation tool for source control repositories
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
 LIB_DEPENDS=	libSDL_image.so:${PORTSDIR}/graphics/sdl_image \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libpcre.so:${PORTSDIR}/devel/pcre \
 		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
 RUN_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig compiler:c++0x
 USE_GL=		glew
 
 CONFIGURE_ARGS+=--with-boost-system=boost_system \
 		--with-boost-filesystem=boost_filesystem
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
Index: head/graphics/libetonyek01/Makefile
===================================================================
--- head/graphics/libetonyek01/Makefile	(revision 403435)
+++ head/graphics/libetonyek01/Makefile	(revision 403436)
@@ -1,45 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	libetonyek
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://dev-www.libreoffice.org/src/${PORTNAME}/
 PKGNAMESUFFIX=	01
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library to interpret and import Apple Keynote presentations
 
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	mdds>=0.12.1_1:${PORTSDIR}/devel/mdds \
 		${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
 LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
 		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 OPTIONS_DEFINE=	TEST
 
 CONFIGURE_ARGS=	--disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 GNU_CONFIGURE=	yes
 USES=		compiler:c++11-lang gmake libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cppunit.pc:${PORTSDIR}/devel/cppunit
 TEST_CONFIGURE_OFF=	--disable-tests
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,zlib,,g" ${WRKSRC}/libetonyek.pc.in
 
 .if ${PORT_OPTIONS:MTEST}
 post-build:
 	@cd ${WRKSRC}/src/test && ${MAKE_CMD} check
 .endif
 
 .include <bsd.port.mk>
Index: head/graphics/libgltf/Makefile
===================================================================
--- head/graphics/libgltf/Makefile	(revision 403435)
+++ head/graphics/libgltf/Makefile	(revision 403436)
@@ -1,25 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	libgltf
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	LODEV
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	C++ Library for rendering OpenGL models stored in glTF format
 
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/ptr_container/ptr_map.hpp:${PORTSDIR}/devel/boost-libs \
 		${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
 
 USES=		compiler:c++0x libtool pathfix pkgconfig tar:bzip2
 USE_GL=		glew
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-werror
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
Index: head/math/glm/Makefile
===================================================================
--- head/math/glm/Makefile	(revision 403435)
+++ head/math/glm/Makefile	(revision 403436)
@@ -1,25 +1,27 @@
 # Created by: demon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	glm
-PORTVERSION=	0.9.6.3
+PORTVERSION=	0.9.7.1
 PORTEPOCH=	1
 CATEGORIES=	math graphics
-MASTER_SITES=	SF/ogl-math/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	C++ mathematics library for software based on the OpenGL GLSL
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/copying.txt
 
-USES=		zip dos2unix
+USE_GITHUB=	yes
+GH_ACCOUNT=	g-truc
+
+USES=		dos2unix
+DOS2UNIX_FILES=	glm/detail/dummy.cpp
 NO_ARCH=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${PORTNAME} \
 	    ${STAGEDIR}${PREFIX}/include '( ! -name *.orig )'
 
 .include <bsd.port.mk>
Index: head/math/glm/distinfo
===================================================================
--- head/math/glm/distinfo	(revision 403435)
+++ head/math/glm/distinfo	(revision 403436)
@@ -1,2 +1,2 @@
-SHA256 (glm-0.9.6.3.zip) = 14651b56b10fa68082446acaf6a1116d56b757c8d375b34b5226a83140acd2b2
-SIZE (glm-0.9.6.3.zip) = 4233404
+SHA256 (g-truc-glm-0.9.7.1_GH0.tar.gz) = 285a0dc8f762b4e523c8710fbd97accaace0c61f45bc8be2bdb0deed07b0e6f3
+SIZE (g-truc-glm-0.9.7.1_GH0.tar.gz) = 3453078
Index: head/math/glm/pkg-plist
===================================================================
--- head/math/glm/pkg-plist	(revision 403435)
+++ head/math/glm/pkg-plist	(revision 403436)
@@ -1,254 +1,254 @@
 include/glm/CMakeLists.txt
 include/glm/common.hpp
 include/glm/detail/_features.hpp
 include/glm/detail/_fixes.hpp
 include/glm/detail/_noise.hpp
 include/glm/detail/_swizzle.hpp
 include/glm/detail/_swizzle_func.hpp
 include/glm/detail/_vectorize.hpp
 include/glm/detail/dummy.cpp
 include/glm/detail/func_common.hpp
 include/glm/detail/func_common.inl
 include/glm/detail/func_exponential.hpp
 include/glm/detail/func_exponential.inl
 include/glm/detail/func_geometric.hpp
 include/glm/detail/func_geometric.inl
 include/glm/detail/func_integer.hpp
 include/glm/detail/func_integer.inl
 include/glm/detail/func_matrix.hpp
 include/glm/detail/func_matrix.inl
-include/glm/detail/func_noise.hpp
-include/glm/detail/func_noise.inl
 include/glm/detail/func_packing.hpp
 include/glm/detail/func_packing.inl
 include/glm/detail/func_trigonometric.hpp
 include/glm/detail/func_trigonometric.inl
 include/glm/detail/func_vector_relational.hpp
 include/glm/detail/func_vector_relational.inl
 include/glm/detail/glm.cpp
 include/glm/detail/intrinsic_common.hpp
 include/glm/detail/intrinsic_common.inl
 include/glm/detail/intrinsic_exponential.hpp
 include/glm/detail/intrinsic_exponential.inl
 include/glm/detail/intrinsic_geometric.hpp
 include/glm/detail/intrinsic_geometric.inl
 include/glm/detail/intrinsic_integer.hpp
 include/glm/detail/intrinsic_integer.inl
 include/glm/detail/intrinsic_matrix.hpp
 include/glm/detail/intrinsic_matrix.inl
 include/glm/detail/intrinsic_trigonometric.hpp
 include/glm/detail/intrinsic_trigonometric.inl
 include/glm/detail/intrinsic_vector_relational.hpp
 include/glm/detail/intrinsic_vector_relational.inl
 include/glm/detail/precision.hpp
 include/glm/detail/setup.hpp
 include/glm/detail/type_float.hpp
 include/glm/detail/type_gentype.hpp
 include/glm/detail/type_gentype.inl
 include/glm/detail/type_half.hpp
 include/glm/detail/type_half.inl
 include/glm/detail/type_int.hpp
 include/glm/detail/type_mat.hpp
 include/glm/detail/type_mat.inl
 include/glm/detail/type_mat2x2.hpp
 include/glm/detail/type_mat2x2.inl
 include/glm/detail/type_mat2x3.hpp
 include/glm/detail/type_mat2x3.inl
 include/glm/detail/type_mat2x4.hpp
 include/glm/detail/type_mat2x4.inl
 include/glm/detail/type_mat3x2.hpp
 include/glm/detail/type_mat3x2.inl
 include/glm/detail/type_mat3x3.hpp
 include/glm/detail/type_mat3x3.inl
 include/glm/detail/type_mat3x4.hpp
 include/glm/detail/type_mat3x4.inl
 include/glm/detail/type_mat4x2.hpp
 include/glm/detail/type_mat4x2.inl
 include/glm/detail/type_mat4x3.hpp
 include/glm/detail/type_mat4x3.inl
 include/glm/detail/type_mat4x4.hpp
 include/glm/detail/type_mat4x4.inl
 include/glm/detail/type_vec.hpp
 include/glm/detail/type_vec.inl
 include/glm/detail/type_vec1.hpp
 include/glm/detail/type_vec1.inl
 include/glm/detail/type_vec2.hpp
 include/glm/detail/type_vec2.inl
 include/glm/detail/type_vec3.hpp
 include/glm/detail/type_vec3.inl
 include/glm/detail/type_vec4.hpp
 include/glm/detail/type_vec4.inl
 include/glm/detail/type_vec4_avx.inl
 include/glm/detail/type_vec4_avx2.inl
 include/glm/detail/type_vec4_sse2.inl
 include/glm/exponential.hpp
 include/glm/ext.hpp
 include/glm/fwd.hpp
 include/glm/geometric.hpp
 include/glm/glm.hpp
 include/glm/gtc/bitfield.hpp
 include/glm/gtc/bitfield.inl
+include/glm/gtc/color_space.hpp
+include/glm/gtc/color_space.inl
 include/glm/gtc/constants.hpp
 include/glm/gtc/constants.inl
 include/glm/gtc/epsilon.hpp
 include/glm/gtc/epsilon.inl
 include/glm/gtc/integer.hpp
 include/glm/gtc/integer.inl
 include/glm/gtc/matrix_access.hpp
 include/glm/gtc/matrix_access.inl
 include/glm/gtc/matrix_integer.hpp
 include/glm/gtc/matrix_inverse.hpp
 include/glm/gtc/matrix_inverse.inl
 include/glm/gtc/matrix_transform.hpp
 include/glm/gtc/matrix_transform.inl
 include/glm/gtc/noise.hpp
 include/glm/gtc/noise.inl
 include/glm/gtc/packing.hpp
 include/glm/gtc/packing.inl
 include/glm/gtc/quaternion.hpp
 include/glm/gtc/quaternion.inl
 include/glm/gtc/random.hpp
 include/glm/gtc/random.inl
 include/glm/gtc/reciprocal.hpp
 include/glm/gtc/reciprocal.inl
 include/glm/gtc/round.hpp
 include/glm/gtc/round.inl
 include/glm/gtc/type_precision.hpp
 include/glm/gtc/type_precision.inl
 include/glm/gtc/type_ptr.hpp
 include/glm/gtc/type_ptr.inl
 include/glm/gtc/ulp.hpp
 include/glm/gtc/ulp.inl
 include/glm/gtc/vec1.hpp
 include/glm/gtc/vec1.inl
 include/glm/gtx/associated_min_max.hpp
 include/glm/gtx/associated_min_max.inl
 include/glm/gtx/bit.hpp
 include/glm/gtx/bit.inl
 include/glm/gtx/closest_point.hpp
 include/glm/gtx/closest_point.inl
 include/glm/gtx/color_space.hpp
 include/glm/gtx/color_space.inl
 include/glm/gtx/color_space_YCoCg.hpp
 include/glm/gtx/color_space_YCoCg.inl
 include/glm/gtx/common.hpp
 include/glm/gtx/common.inl
 include/glm/gtx/compatibility.hpp
 include/glm/gtx/compatibility.inl
 include/glm/gtx/component_wise.hpp
 include/glm/gtx/component_wise.inl
 include/glm/gtx/dual_quaternion.hpp
 include/glm/gtx/dual_quaternion.inl
 include/glm/gtx/euler_angles.hpp
 include/glm/gtx/euler_angles.inl
 include/glm/gtx/extend.hpp
 include/glm/gtx/extend.inl
 include/glm/gtx/extented_min_max.hpp
 include/glm/gtx/extented_min_max.inl
 include/glm/gtx/fast_exponential.hpp
 include/glm/gtx/fast_exponential.inl
 include/glm/gtx/fast_square_root.hpp
 include/glm/gtx/fast_square_root.inl
 include/glm/gtx/fast_trigonometry.hpp
 include/glm/gtx/fast_trigonometry.inl
 include/glm/gtx/gradient_paint.hpp
 include/glm/gtx/gradient_paint.inl
 include/glm/gtx/handed_coordinate_space.hpp
 include/glm/gtx/handed_coordinate_space.inl
+include/glm/gtx/hash.hpp
+include/glm/gtx/hash.inl
 include/glm/gtx/integer.hpp
 include/glm/gtx/integer.inl
 include/glm/gtx/intersect.hpp
 include/glm/gtx/intersect.inl
 include/glm/gtx/io.hpp
 include/glm/gtx/io.inl
 include/glm/gtx/log_base.hpp
 include/glm/gtx/log_base.inl
 include/glm/gtx/matrix_cross_product.hpp
 include/glm/gtx/matrix_cross_product.inl
 include/glm/gtx/matrix_decompose.hpp
 include/glm/gtx/matrix_decompose.inl
 include/glm/gtx/matrix_interpolation.hpp
 include/glm/gtx/matrix_interpolation.inl
 include/glm/gtx/matrix_major_storage.hpp
 include/glm/gtx/matrix_major_storage.inl
 include/glm/gtx/matrix_operation.hpp
 include/glm/gtx/matrix_operation.inl
 include/glm/gtx/matrix_query.hpp
 include/glm/gtx/matrix_query.inl
 include/glm/gtx/matrix_transform_2d.hpp
 include/glm/gtx/matrix_transform_2d.inl
 include/glm/gtx/mixed_product.hpp
 include/glm/gtx/mixed_product.inl
-include/glm/gtx/multiple.hpp
-include/glm/gtx/multiple.inl
 include/glm/gtx/norm.hpp
 include/glm/gtx/norm.inl
 include/glm/gtx/normal.hpp
 include/glm/gtx/normal.inl
 include/glm/gtx/normalize_dot.hpp
 include/glm/gtx/normalize_dot.inl
 include/glm/gtx/number_precision.hpp
 include/glm/gtx/number_precision.inl
 include/glm/gtx/optimum_pow.hpp
 include/glm/gtx/optimum_pow.inl
 include/glm/gtx/orthonormalize.hpp
 include/glm/gtx/orthonormalize.inl
 include/glm/gtx/perpendicular.hpp
 include/glm/gtx/perpendicular.inl
 include/glm/gtx/polar_coordinates.hpp
 include/glm/gtx/polar_coordinates.inl
 include/glm/gtx/projection.hpp
 include/glm/gtx/projection.inl
 include/glm/gtx/quaternion.hpp
 include/glm/gtx/quaternion.inl
 include/glm/gtx/range.hpp
 include/glm/gtx/raw_data.hpp
 include/glm/gtx/raw_data.inl
 include/glm/gtx/rotate_normalized_axis.hpp
 include/glm/gtx/rotate_normalized_axis.inl
 include/glm/gtx/rotate_vector.hpp
 include/glm/gtx/rotate_vector.inl
 include/glm/gtx/scalar_multiplication.hpp
 include/glm/gtx/scalar_relational.hpp
 include/glm/gtx/scalar_relational.inl
 include/glm/gtx/simd_mat4.hpp
 include/glm/gtx/simd_mat4.inl
 include/glm/gtx/simd_quat.hpp
 include/glm/gtx/simd_quat.inl
 include/glm/gtx/simd_vec4.hpp
 include/glm/gtx/simd_vec4.inl
 include/glm/gtx/spline.hpp
 include/glm/gtx/spline.inl
 include/glm/gtx/std_based_type.hpp
 include/glm/gtx/std_based_type.inl
 include/glm/gtx/string_cast.hpp
 include/glm/gtx/string_cast.inl
 include/glm/gtx/transform.hpp
 include/glm/gtx/transform.inl
 include/glm/gtx/transform2.hpp
 include/glm/gtx/transform2.inl
 include/glm/gtx/type_aligned.hpp
 include/glm/gtx/type_aligned.inl
 include/glm/gtx/vector_angle.hpp
 include/glm/gtx/vector_angle.inl
 include/glm/gtx/vector_query.hpp
 include/glm/gtx/vector_query.inl
 include/glm/gtx/wrap.hpp
 include/glm/gtx/wrap.inl
 include/glm/integer.hpp
 include/glm/mat2x2.hpp
 include/glm/mat2x3.hpp
 include/glm/mat2x4.hpp
 include/glm/mat3x2.hpp
 include/glm/mat3x3.hpp
 include/glm/mat3x4.hpp
 include/glm/mat4x2.hpp
 include/glm/mat4x3.hpp
 include/glm/mat4x4.hpp
 include/glm/matrix.hpp
 include/glm/packing.hpp
 include/glm/trigonometric.hpp
 include/glm/vec2.hpp
 include/glm/vec3.hpp
 include/glm/vec4.hpp
 include/glm/vector_relational.hpp