From b746e136edfc237e1c5eea9f258eb8a0d4ef07da Mon Sep 17 00:00:00 2001
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Thu, 13 Jul 2017 15:46:36 +0000
Subject: [PATCH] Fix build of java/openjfx8-devel with Gradle 4.0

PR:		220322
Approved by:	mat (mentor)
Differential Revision:	https://reviews.freebsd.org/D11565
---
 java/openjfx8-devel/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/openjfx8-devel/Makefile b/java/openjfx8-devel/Makefile
index ed8f212070d9..c9437251a5c0 100644
--- a/java/openjfx8-devel/Makefile
+++ b/java/openjfx8-devel/Makefile
@@ -43,12 +43,16 @@ WRKSRC=	${WRKDIR}/tobik-openjfx-rt-2de985ca8377
 # non-pristine environment.
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle
+# Fix build directories which are now language specific with Gradle 4.0
+	@${REINPLACE_CMD} -E -e 's|%%PREFIX%%|${PREFIX}|g' \
+		-e 's|"(\$$buildDir/classes)/main"|"\1/java/main"|g' \
+		-e 's|"(modules/.*/build/classes)/main"|"\1/java/main"|g' \
+		${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle
 
 do-build:
 # Gradle creates ${HOME}/.gradle, pretend home is somewhere else
 	@${MKDIR} ${WRKDIR}/dot-gradle
-	@(cd ${WRKSRC}; ${SETENV} GRADLE_USER_HOME=${WRKDIR}/dot-gradle gradle zips)
+	@(cd ${WRKSRC}; ${SETENV} GRADLE_USER_HOME=${WRKDIR}/dot-gradle gradle --no-daemon zips)
 
 do-install:
 	@(${MKDIR} ${STAGEDIR}${JAVA_HOME} \