Index: head/java/openjfx8-devel/Makefile
===================================================================
--- head/java/openjfx8-devel/Makefile	(revision 423639)
+++ head/java/openjfx8-devel/Makefile	(revision 423640)
@@ -1,61 +1,61 @@
 # Created by: Tobias Kortkamp <t@tobik.me>
 # $FreeBSD$
 
 PORTNAME=	openjfx8
 PORTVERSION=	20160228
 PORTREVISION=	1
 CATEGORIES=	java x11-toolkits devel
 MASTER_SITES=	https://bitbucket.org/tobik/openjfx-rt/get/ \
 		http://bitbucket.org/tobik/openjfx-rt/get/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	freebsd${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	t@tobik.me
 COMMENT=	JavaFX (OpenJFX) SDK overlay for OpenJDK 8
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	apache-ant>0:devel/apache-ant \
 		antlr3>0:devel/antlr3 \
 		gradle:devel/gradle \
 		swt-devel>0:x11-toolkits/swt-devel
 RUN_DEPENDS=	swt-devel>0:x11-toolkits/swt-devel
-LIB_DEPENDS=	libjpeg.so:graphics/jpeg-turbo
 
+USES=		jpeg
 USE_GL=		yes
 USE_GNOME=	gtk20
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
 JAVA_VERSION=	1.8
 
 BROKEN_FreeBSD_9=	does not build
 
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST_SUB=	ARCH=${ARCH} \
 		JAVA_HOME=${JAVA_HOME}
 
 WRKSRC=	${WRKDIR}/tobik-openjfx-rt-2de985ca8377
 
 # NOTE: This port won't build if openjfx8-devel is currently
 # installed.  This is not a problem in Poudriere or Synth but
 # something to be aware of if you're trying to build this port in a
 # non-pristine environment.
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle
 
 do-build:
 # Gradle creates ${HOME}/.gradle, pretend home is somewhere else
 	@${MKDIR} ${WRKDIR}/dot-gradle
 	@(cd ${WRKSRC}; ${SETENV} GRADLE_USER_HOME=${WRKDIR}/dot-gradle gradle zips)
 
 do-install:
 	@(${MKDIR} ${STAGEDIR}${JAVA_HOME} \
 		&& ${TAR} -C ${STAGEDIR}${JAVA_HOME} \
 			-xf ${WRKSRC}/build/bundles/javafx-sdk-overlay.zip)
 
 	@${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \;
 
 .include <bsd.port.mk>
Index: head/net/guacamole-server/Makefile
===================================================================
--- head/net/guacamole-server/Makefile	(revision 423639)
+++ head/net/guacamole-server/Makefile	(revision 423640)
@@ -1,78 +1,77 @@
 # Created by: Ultima <ultima1252@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	guacamole-server
 PORTVERSION=	0.9.9
 PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	ultima1252@gmail.com
 COMMENT=	HTML5 Clientless Remote Desktop
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libossp-uuid.so:misc/ossp-uuid \
-		libpng.so:graphics/png \
-		libjpeg.so:graphics/jpeg-turbo
+		libpng.so:graphics/png
 
 CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glyptodon
 
-USES=		autoreconf libtool localbase pkgconfig shebangfix ssl
+USES=		autoreconf jpeg libtool localbase pkgconfig shebangfix ssl
 USE_GNOME=	cairo
 SHEBANG_FILES=	${WRKSRC}/src/protocols/rdp/keymaps/generate.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-guacd-conf=${PREFIX}/etc/guacd/guacd.conf
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 USERS=		guacamole
 GROUPS=		guacamole
 
 USE_RC_SUBR=	guacd
 SUB_LIST+=	GUACD_USER=${USERS} \
 		GUACD_GROUP=${GROUPS}
 
 OPTIONS_DEFINE=		RDP SSH VNC VORBIS PULSEAUDIO WEBP
 OPTIONS_DEFAULT=	RDP SSH VNC VORBIS PULSEAUDIO WEBP
 OPTIONS_SUB=		yes
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_DESC?=	VNC audio support (Experimental)
 RDP_LIB_DEPENDS=	libfreerdp.so:net/freerdp
 RDP_DESC?=		RDP Protocal Support
 SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 SSH_USE=		GNOME=pango
 SSH_DESC?=		SSH Support
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VNC_DESC?=		VNC Protocol Support
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 VORBIS_DESC?=		Ogg Vorbis for compression
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_DESC?=		WebP support
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \
 			 s|/etc/guacamole|${PREFIX}/etc/guacd|g' \
 			 ${WRKSRC}/src/guacd/man/guacd.conf.5
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac.so.*
 .if ${PORT_OPTIONS:MSSH}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-ssh.so.*
 .endif
 .if ${PORT_OPTIONS:MRDP}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacsnd-client.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacdr-client.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacsvc-client.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-rdp.so.*
 .endif
 .if ${PORT_OPTIONS:MVNC}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-vnc.so.*
 .endif
 
 .include <bsd.port.post.mk>