svn commit: r418342 - in branches/2016Q3/java/openjfx8-devel: . files

[Kurt Jaeger]

Author: pi
Date: Sun Jul 10 20:22:45 2016
New Revision: 418342
URL: https://svnweb.freebsd.org/changeset/ports/418342

Log:
  java/openjfx8-devel: Unbreak build after Gradle update
  
  - fix the build after recent update to Gradle 2.12.
  
  PR:		208470
  MFH:		r418313
  Submitted by:	Tobias Kortkamp <t at tobik.me> (maintainer)
  Approved by:	portmgr (junovitch)

Modified:
  branches/2016Q3/java/openjfx8-devel/Makefile
  branches/2016Q3/java/openjfx8-devel/files/patch-build.gradle
Directory Properties:
  branches/2016Q3/   (props changed)

Modified: branches/2016Q3/java/openjfx8-devel/Makefile
==============================================================================
--- branches/2016Q3/java/openjfx8-devel/Makefile	Sun Jul 10 20:11:38 2016	(r418341)
+++ branches/2016Q3/java/openjfx8-devel/Makefile	Sun Jul 10 20:22:45 2016	(r418342)
@@ -3,6 +3,7 @@
 
 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/
@@ -16,8 +17,6 @@ COMMENT=	JavaFX (OpenJFX) SDK overlay fo
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		does not build
-
 BUILD_DEPENDS=	apache-ant>0:devel/apache-ant \
 		antlr3>0:devel/antlr3 \
 		gradle:devel/gradle \

Modified: branches/2016Q3/java/openjfx8-devel/files/patch-build.gradle
==============================================================================
--- branches/2016Q3/java/openjfx8-devel/files/patch-build.gradle	Sun Jul 10 20:11:38 2016	(r418341)
+++ branches/2016Q3/java/openjfx8-devel/files/patch-build.gradle	Sun Jul 10 20:22:45 2016	(r418342)
@@ -1,5 +1,14 @@
 --- build.gradle.orig	2016-02-28 12:54:50 UTC
 +++ build.gradle
+@@ -125,7 +125,7 @@ void loadProperties(String sourceFileNam
+     def propFile = new File(sourceFileName)
+     if (propFile.canRead()) {
+         config.load(new FileInputStream(propFile))
+-        for (Map.Entry property in config) {
++        for (property in config) {
+             def keySplit = property.key.split("\\.");
+             def key = keySplit[0];
+             for (int i = 1; i < keySplit.length; i++) {
 @@ -1167,7 +1167,7 @@ allprojects {
      // By default all of our projects require junit for testing so we can just
      // setup this dependency here.