graphics/jogamp-jogl:

- Fix build with clang and remove forced dependency on gcc. Respect CC
- Use BINARY_ALIAS provided by the port framework instead of crafted solution
- Rename FreeBSD specific patch (this one should go upstream)
- Tweak WWW

3 files changed, 32 insertions, 19 deletions

diff --git a/graphics/jogamp-jogl/Makefile b/graphics/jogamp-jogl/Makefile
index 5cb1e8ff512d..744e0718800c 100644
--- a/graphics/jogamp-jogl/Makefile
+++ b/graphics/jogamp-jogl/Makefile
@@ -3,6 +3,7 @@
 
 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/
@@ -18,24 +19,23 @@ 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' \
diff --git a/graphics/jogamp-jogl/files/patch-freebsd.x86 b/graphics/jogamp-jogl/files/patch-freebsd
index e753584956d6..17b2cbc76660 100644
--- a/graphics/jogamp-jogl/files/patch-freebsd.x86
+++ b/graphics/jogamp-jogl/files/patch-freebsd
@@ -1,6 +1,19 @@
---- 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 @@
+--- 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 -->
   
@@ -9,7 +22,7 @@
          <syslibset dir="/usr/local/lib" libs="X11"/>
        </linker>
  
-@@ -1383,7 +1383,7 @@
+@@ -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" />
@@ -18,9 +31,9 @@
      </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 @@
+--- jogl/make/build-nativewindow.xml.orig	2015-10-10 01:08:14 UTC
++++ jogl/make/build-nativewindow.xml
+@@ -373,7 +373,7 @@
  
        <!-- linker configuration -->
  
@@ -29,7 +42,7 @@
          <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 @@
+@@ -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" />
@@ -38,9 +51,9 @@
      </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 @@
+--- jogl/make/build-newt.xml.orig	2015-10-10 01:08:14 UTC
++++ jogl/make/build-newt.xml
+@@ -289,7 +289,7 @@
  
        <!-- linker configuration -->
  
@@ -49,7 +62,7 @@
          <linkerarg value="-L/usr/local/lib"/>
          <syslibset libs="X11"/>
          <syslibset libs="Xrandr"/>
-@@ -528,8 +528,8 @@
+@@ -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" />
diff --git a/graphics/jogamp-jogl/pkg-descr b/graphics/jogamp-jogl/pkg-descr
index f5739599eadf..bbc57bd25ba2 100644
--- a/graphics/jogamp-jogl/pkg-descr
+++ b/graphics/jogamp-jogl/pkg-descr
@@ -7,4 +7,4 @@ 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