From owner-svn-ports-all@freebsd.org  Thu Jul 13 15:46:37 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D13A0DA6F2C;
 Thu, 13 Jul 2017 15:46:37 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9E4287CEE9;
 Thu, 13 Jul 2017 15:46:37 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6DFkaO6040555;
 Thu, 13 Jul 2017 15:46:36 GMT (envelope-from tobik@FreeBSD.org)
Received: (from tobik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6DFkaxw040554;
 Thu, 13 Jul 2017 15:46:36 GMT (envelope-from tobik@FreeBSD.org)
Message-Id: <201707131546.v6DFkaxw040554@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tobik set sender to
 tobik@FreeBSD.org using -f
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Thu, 13 Jul 2017 15:46:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r445658 - head/java/openjfx8-devel
X-SVN-Group: ports-head
X-SVN-Commit-Author: tobik
X-SVN-Commit-Paths: head/java/openjfx8-devel
X-SVN-Commit-Revision: 445658
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jul 2017 15:46:37 -0000

Author: tobik
Date: Thu Jul 13 15:46:36 2017
New Revision: 445658
URL: https://svnweb.freebsd.org/changeset/ports/445658

Log:
  Fix build of java/openjfx8-devel with Gradle 4.0
  
  PR:		220322
  Approved by:	mat (mentor)
  Differential Revision:	https://reviews.freebsd.org/D11565

Modified:
  head/java/openjfx8-devel/Makefile

Modified: head/java/openjfx8-devel/Makefile
==============================================================================
--- head/java/openjfx8-devel/Makefile	Thu Jul 13 15:46:06 2017	(r445657)
+++ head/java/openjfx8-devel/Makefile	Thu Jul 13 15:46:36 2017	(r445658)
@@ -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} \