svn commit: r508801 - in head/graphics/jogamp-jogl: . files

[Max Brazhnikov]

Author: makc
Date: Mon Aug 12 23:28:41 2019
New Revision: 508801
URL: https://svnweb.freebsd.org/changeset/ports/508801

Log:
  graphics/jogamp-jogl:
  - Switch to x11-toolkits/swt which is newer than swt-devel port
  
  PR:	219186

Modified:
  head/graphics/jogamp-jogl/Makefile
  head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml

Modified: head/graphics/jogamp-jogl/Makefile
==============================================================================
--- head/graphics/jogamp-jogl/Makefile	Mon Aug 12 23:07:37 2019	(r508800)
+++ head/graphics/jogamp-jogl/Makefile	Mon Aug 12 23:28:41 2019	(r508801)
@@ -3,7 +3,7 @@
 
 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/
@@ -14,8 +14,8 @@ MAINTAINER=	makc at 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
 

Modified: head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml
==============================================================================
--- head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml	Mon Aug 12 23:07:37 2019	(r508800)
+++ head/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml	Mon Aug 12 23:28:41 2019	(r508801)
@@ -6,7 +6,7 @@
          </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">