Index: head/graphics/jogamp-jogl/Makefile
===================================================================
--- head/graphics/jogamp-jogl/Makefile	(revision 538926)
+++ head/graphics/jogamp-jogl/Makefile	(revision 538927)
@@ -1,62 +1,62 @@
 # Created by: Tassilo Philipp <tphilipp@potion-studios.com>
 # $FreeBSD$
 
 PORTNAME=	jogamp-jogl
 PORTVERSION=	2.3.2
+PORTREVISION=	1
 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.xz \
 		gluegen-v${PORTVERSION}.tar.xz \
 		jcpp-v${PORTVERSION}.tar.xz
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Java bindings for OpenGL
 
 BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
 RUN_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USES=		tar:xz xorg
+USES=		compiler tar:xz xorg
 
 USE_ANT=	yes
-USE_GCC=	yes
 USE_JAVA=	yes
 USE_XORG=	x11 xcursor xrandr xrender xxf86vm
 
 PATCH_WRKSRC=	${WRKDIR}
 BUILD_WRKSRC=	${WRKDIR}/jogl/make
-BUILD_BINPATH=	${WRKSRC}/bin
-MAKE_ENV+=	PATH="${BUILD_BINPATH}:${PATH}"
 
+# compiler must be literally "gcc" or "clang"
+BINARY_ALIAS=	${CHOSEN_COMPILER_TYPE}=${CC}
+MAKE_ARGS=	-Dgcc.compat.compiler=${CHOSEN_COMPILER_TYPE}
+
 post-extract:
 	${MV} ${WRKDIR}/gluegen-v${PORTVERSION} ${WRKDIR}/gluegen
 	${MV} ${WRKDIR}/jcpp-v${PORTVERSION}/src ${WRKDIR}/gluegen/jcpp/src
 	${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-freebsd.x86
===================================================================
--- head/graphics/jogamp-jogl/files/patch-freebsd.x86	(revision 538926)
+++ head/graphics/jogamp-jogl/files/patch-freebsd.x86	(nonexistent)
@@ -1,62 +0,0 @@
---- jogl/make/build-jogl.xml.orig	2014-03-11 00:59:24.000000000 +0000
-+++ jogl/make/build-jogl.xml	2014-05-12 07:33:35.849403725 +0000
-@@ -1195,7 +1195,7 @@
- 
-       <!-- linker configuration -->
-  
--      <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd">
-+      <linker id="linker.cfg.freebsd.x86.jogl.x11" extends="linker.cfg.freebsd.x86">
-         <syslibset dir="/usr/local/lib" libs="X11"/>
-       </linker>
- 
-@@ -1383,7 +1383,7 @@
-     <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
-       <echo message="FreeBSD" />
-       <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
--      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.jogl.x11" />
-+      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.x86.jogl.x11" />
-     </target>
- 
-     <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
---- jogl/make/build-nativewindow.xml.orig	2014-03-11 00:59:24.000000000 +0000
-+++ jogl/make/build-nativewindow.xml	2014-05-12 07:32:13.047407428 +0000
-@@ -365,7 +365,7 @@
- 
-       <!-- linker configuration -->
- 
--      <linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd">
-+      <linker id="linker.cfg.freebsd.x86.nativewindow.x11" extends="linker.cfg.freebsd.x86">
-         <syslibset dir="/usr/local/lib" libs="X11"/>
-         <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
-         <syslibset dir="/usr/local/lib" libs="Xrender"/>
-@@ -562,7 +562,7 @@
-     <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
-       <echo message="FreeBSD.x86" />
-       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
--      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.nativewindow.x11" />
-+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.x86.nativewindow.x11" />
-     </target>
-     
-     <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
---- jogl/make/build-newt.xml.orig	2014-03-11 00:59:24.000000000 +0000
-+++ jogl/make/build-newt.xml	2014-05-12 07:32:57.565406321 +0000
-@@ -273,7 +273,7 @@
- 
-       <!-- linker configuration -->
- 
--      <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
-+      <linker id="linker.cfg.freebsd.x86.newt.x11" extends="linker.cfg.freebsd.x86">
-         <linkerarg value="-L/usr/local/lib"/>
-         <syslibset libs="X11"/>
-         <syslibset libs="Xrandr"/>
-@@ -528,8 +528,8 @@
-     <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
-       <echo message="FreeBSD.x86" />
-       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
--      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.newt.x11"
--                                                            else="linker.cfg.freebsd">
-+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.x86.newt.x11"
-+                                                            else="linker.cfg.freebsd.x86">
-           <isset property="isX11" />
-       </condition>
-       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />

Property changes on: head/graphics/jogamp-jogl/files/patch-freebsd.x86
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/jogamp-jogl/files/patch-freebsd
===================================================================
--- head/graphics/jogamp-jogl/files/patch-freebsd	(nonexistent)
+++ head/graphics/jogamp-jogl/files/patch-freebsd	(revision 538927)
@@ -0,0 +1,75 @@
+--- jogl/make/build-jogl.xml.orig	2015-10-10 01:08:14 UTC
++++ jogl/make/build-jogl.xml
+@@ -1184,9 +1184,9 @@
+       <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
+ 
+       <compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd">
+-        <!-- Need to force X11R6 headers on to include path after stub_includes -->
+-        <includepath path="stub_includes/opengl"/>
+-        <includepath path="/usr/local/include" />
++        <!-- Force /usr/local/include headers on to include path after all others to fix build with clang -->
++        <compilerarg value="-idirafter" />
++        <compilerarg value="/usr/local/include" />
+       </compiler>
+ 
+       <compiler id="compiler.cfg.linux.armv6.jogl.x11" extends="compiler.cfg.linux.armv6">
+@@ -1203,7 +1203,7 @@
+ 
+       <!-- linker configuration -->
+  
+-      <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd">
++      <linker id="linker.cfg.freebsd.x86.jogl.x11" extends="linker.cfg.freebsd.x86">
+         <syslibset dir="/usr/local/lib" libs="X11"/>
+       </linker>
+ 
+@@ -1401,7 +1401,7 @@
+     <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
+       <echo message="FreeBSD" />
+       <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
+-      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.jogl.x11" />
++      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.x86.jogl.x11" />
+     </target>
+ 
+     <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
+--- jogl/make/build-nativewindow.xml.orig	2015-10-10 01:08:14 UTC
++++ jogl/make/build-nativewindow.xml
+@@ -373,7 +373,7 @@
+ 
+       <!-- linker configuration -->
+ 
+-      <linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd">
++      <linker id="linker.cfg.freebsd.x86.nativewindow.x11" extends="linker.cfg.freebsd.x86">
+         <syslibset dir="/usr/local/lib" libs="X11"/>
+         <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
+         <syslibset dir="/usr/local/lib" libs="Xrender"/>
+@@ -582,7 +582,7 @@
+     <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
+       <echo message="FreeBSD.x86" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
+-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.nativewindow.x11" />
++      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.x86.nativewindow.x11" />
+     </target>
+     
+     <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
+--- jogl/make/build-newt.xml.orig	2015-10-10 01:08:14 UTC
++++ jogl/make/build-newt.xml
+@@ -289,7 +289,7 @@
+ 
+       <!-- linker configuration -->
+ 
+-      <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
++      <linker id="linker.cfg.freebsd.x86.newt.x11" extends="linker.cfg.freebsd.x86">
+         <linkerarg value="-L/usr/local/lib"/>
+         <syslibset libs="X11"/>
+         <syslibset libs="Xrandr"/>
+@@ -560,8 +560,8 @@
+     <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
+       <echo message="FreeBSD.x86" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
+-      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.newt.x11"
+-                                                            else="linker.cfg.freebsd">
++      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.x86.newt.x11"
++                                                            else="linker.cfg.freebsd.x86">
+           <isset property="isX11" />
+       </condition>
+       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />

Property changes on: head/graphics/jogamp-jogl/files/patch-freebsd
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/jogamp-jogl/pkg-descr
===================================================================
--- head/graphics/jogamp-jogl/pkg-descr	(revision 538926)
+++ head/graphics/jogamp-jogl/pkg-descr	(revision 538927)
@@ -1,10 +1,10 @@
 The JOGL project hosts the development version of the Java (TM) Binding for the
 OpenGL API (JSR-231), and is designed to provide hardware-supported 3D graphics
 to applications written in Java. JOGL provides full access to the APIs in the
 OpenGL 1.3 - 3.0, >= 3.1, ES 1.x and ES 2.x specification as well as nearly all
 vendor extensions. It integrates with the AWT and Swing widget sets, as well
 with custom windowing toolkits using the NativeWindow API. It is part of a
 suite of open-source technologies initiated by the Game Technology Group at Sun
 Microsystems.
 
-WWW: http://jogamp.org/jogl
+WWW: https://jogamp.org/jogl