Index: head/graphics/jogamp-jogl/Makefile
===================================================================
--- head/graphics/jogamp-jogl/Makefile	(revision 508800)
+++ head/graphics/jogamp-jogl/Makefile	(revision 508801)
@@ -1,65 +1,65 @@
 # Created by: Tassilo Philipp <tphilipp@potion-studios.com>
 # $FreeBSD$
 
 PORTNAME=	jogamp-jogl
 PORTVERSION=	2.2.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics devel java
 MASTER_SITES=	http://jogamp.org/deployment/jogamp-current/archive/Sources/ \
 		http://jogamp.org/deployment/v${PORTVERSION}/archive/Sources/
 DISTFILES=	jogl-v${PORTVERSION}.tar.7z \
 		gluegen-v${PORTVERSION}.tar.7z
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Java bindings for OpenGL
 
 EXTRACT_DEPENDS=	${7Z_CMD}:archivers/p7zip
-BUILD_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
-RUN_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel
+BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
+RUN_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_ANT=	yes
 USE_GCC=	yes
 USE_JAVA=	yes
 USE_XORG=	x11 xcursor xrandr xrender xxf86vm
 
 7Z_CMD=		${LOCALBASE}/bin/7z
 EXTRACT_CMD=	${7Z_CMD}
 EXTRACT_BEFORE_ARGS=	x -so
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 
 PATCH_WRKSRC=	${WRKDIR}
 BUILD_WRKSRC=	${WRKDIR}/jogl/make
 BUILD_BINPATH=	${WRKSRC}/bin
 MAKE_ENV+=	PATH="${BUILD_BINPATH}:${PATH}"
 
 post-extract:
 	${MV} ${WRKDIR}/gluegen-v${PORTVERSION} ${WRKDIR}/gluegen
 	${MV} ${WRKDIR}/jogl-v${PORTVERSION} ${WRKDIR}/jogl
 	${MKDIR} ${BUILD_BINPATH}
 	${LN} -sf ${LOCALBASE}/bin/${CC} ${BUILD_BINPATH}/gcc
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|g' \
 		${BUILD_WRKSRC}/build-common.xml
 	${REINPLACE_CMD} -e '/name="all"/s|,test.compile||g' \
 		${BUILD_WRKSRC}/build.xml
 
 pre-build:
 	@(cd ${WRKDIR}/gluegen/make; \
 		${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} all.no_junit)
 
 do-install:
 	${INSTALL_LIB} \
 		${WRKDIR}/gluegen/build/obj/libgluegen2-rt.so \
 		${WRKDIR}/jogl/build/lib/*.so \
 		${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} \
 		${WRKDIR}/gluegen/build/gluegen2-rt.jar \
 		${WRKDIR}/gluegen/build/gluegen2.jar \
 		${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKDIR}/jogl/build/jar/jogl-all.jar \
 		${STAGEDIR}${JAVAJARDIR}/jogl2.jar
 
 .include <bsd.port.mk>
Index: head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml
===================================================================
--- head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml	(revision 508800)
+++ head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml	(revision 508801)
@@ -1,31 +1,31 @@
 --- jogl/make/build-common.xml.orig	2015-03-27 14:58:50 UTC
 +++ jogl/make/build-common.xml
 @@ -130,8 +130,8 @@
          <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
            <istrue value="${isWindowsX86}" />
          </condition>
 -        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar">
 -          <istrue value="${isFreeBSDAMD64}" />
-+        <condition property="swt.jar" value="%%JAVALIBDIR%%/swt-devel.jar">
++        <condition property="swt.jar" value="%%JAVALIBDIR%%/swt.jar">
 +          <istrue value="${isFreeBSD}" />
          </condition>
          <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar">
            <istrue value="${isLinuxAMD64}" />
 @@ -210,7 +210,7 @@
          <property name="gluegen.build.xml"          value="${gluegen.make}/build.xml" />
          <property name="build.gluegen"              value="${gluegen.root}/${rootrel.build}" />
          <property name="obj.gluegen"                value="${build.gluegen}/obj"/>
 -        <property name="gluegen.jar"                value="${build.gluegen}/gluegen.jar" />
 +        <property name="gluegen.jar"                value="${build.gluegen}/gluegen2.jar" />
  
          <property name="build.joal"                 value="${joal.root}/${rootrel.build}" /> <!-- optional -->
  
 @@ -434,7 +434,7 @@
          </path>
  
          <!-- JavaSE combinations -->
 -        <property name="gluegen-rt.jar"                 value="${build.gluegen}/gluegen-rt.jar" />
 +        <property name="gluegen-rt.jar"                 value="${build.gluegen}/gluegen2-rt.jar" />
          <property name="gluegen-rt-android.jar"         value="${build.gluegen}/gluegen-rt-android.jar" />
          <property name="gluegen-test-util.jar"          value="${build.gluegen}/gluegen-test-util.jar" />
          <property name="jogl-test.jar"                  value="${jar}/jogl-test.jar"/>