From owner-svn-ports-all@freebsd.org Wed Jan 4 15:54:30 2017 Return-Path: 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 0E825C9FE2E; Wed, 4 Jan 2017 15:54:30 +0000 (UTC) (envelope-from asomers@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 C3C3C192F; Wed, 4 Jan 2017 15:54:29 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v04FsSVs064351; Wed, 4 Jan 2017 15:54:28 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v04FsS1E064348; Wed, 4 Jan 2017 15:54:28 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201701041554.v04FsS1E064348@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 4 Jan 2017 15:54:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430571 - in head/java/openjfx8-devel: . files X-SVN-Group: ports-head 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2017 15:54:30 -0000 Author: asomers (src committer) Date: Wed Jan 4 15:54:28 2017 New Revision: 430571 URL: https://svnweb.freebsd.org/changeset/ports/430571 Log: java/openjfx8-devel fix build with Gradle 3.2.1 Add a missing build dependency on junit to the Makefile, and fix the path to Hamcrest in build.gradle. Also, reset MAINTAINER by request of the current maintainer. PR: 215677 Reviewed by: brd, Tobias Kortkamp Approved by: brd (ports) Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9005 Modified: head/java/openjfx8-devel/Makefile head/java/openjfx8-devel/files/patch-build.gradle head/java/openjfx8-devel/files/patch-buildSrc_build.gradle Modified: head/java/openjfx8-devel/Makefile ============================================================================== --- head/java/openjfx8-devel/Makefile Wed Jan 4 15:44:26 2017 (r430570) +++ head/java/openjfx8-devel/Makefile Wed Jan 4 15:54:28 2017 (r430571) @@ -11,7 +11,7 @@ PKGNAMESUFFIX= -devel DISTNAME= freebsd${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= t@tobik.me +MAINTAINER= ports@FreeBSD.org COMMENT= JavaFX (OpenJFX) SDK overlay for OpenJDK 8 LICENSE= GPLv2 @@ -20,6 +20,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= apache-ant>0:devel/apache-ant \ antlr3>0:devel/antlr3 \ gradle:devel/gradle \ + ${JAVALIBDIR}/junit.jar:java/junit \ swt-devel>0:x11-toolkits/swt-devel RUN_DEPENDS= swt-devel>0:x11-toolkits/swt-devel Modified: head/java/openjfx8-devel/files/patch-build.gradle ============================================================================== --- head/java/openjfx8-devel/files/patch-build.gradle Wed Jan 4 15:44:26 2017 (r430570) +++ head/java/openjfx8-devel/files/patch-build.gradle Wed Jan 4 15:54:28 2017 (r430571) @@ -9,21 +9,23 @@ def keySplit = property.key.split("\\."); def key = keySplit[0]; for (int i = 1; i < keySplit.length; i++) { -@@ -1167,7 +1167,7 @@ allprojects { +@@ -1167,7 +1167,8 @@ allprojects { // By default all of our projects require junit for testing so we can just // setup this dependency here. dependencies { - testCompile group: "junit", name: "junit", version: "4.8.2" -+ testCompile files("%%PREFIX%%/share/java/classes/junit4.jar") ++ testCompile files("%%PREFIX%%/share/java/classes/junit4.jar", ++ "%%PREFIX%%/share/java/classes/hamcrest.jar") if (BUILD_CLOSED && DO_JCOV) { testCompile name: "jcov" } -@@ -1307,11 +1307,9 @@ project(":graphics") { +@@ -1307,11 +1308,10 @@ project(":graphics") { dependencies { compile project(":base"), BUILD_SRC compile files("/usr/local/share/java/classes/swt-devel.jar") - stubCompile group: "junit", name: "junit", version: "4.8.2", -+ stubCompile files("%%PREFIX%%/share/java/classes/junit4.jar"), ++ stubCompile files("%%PREFIX%%/share/java/classes/junit4.jar", ++ "%%PREFIX%%/share/java/classes/hamcrest.jar"), project(":base").sourceSets.test.output, sourceSets.main.output - antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" - antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" @@ -32,7 +34,7 @@ } // Create a single "native" task which will depend on all the individual native tasks for graphics -@@ -1601,9 +1599,7 @@ project(":graphics") { +@@ -1601,9 +1601,7 @@ project(":graphics") { copy { into libsDir from f.getParentFile() @@ -43,7 +45,7 @@ includeEmptyDirs = false } // Have to rename the swt jar because it is some platform specific name but -@@ -1787,7 +1783,7 @@ project(":fxpackager") { +@@ -1787,7 +1785,7 @@ project(":fxpackager") { } dependencies { @@ -52,7 +54,7 @@ } // When producing the jar, we need to relocate a few class files -@@ -2048,21 +2044,6 @@ project(":fxpackager") { +@@ -2048,21 +2046,6 @@ project(":fxpackager") { jar.dependsOn buildJavaPackager jar.dependsOn packagerJar Modified: head/java/openjfx8-devel/files/patch-buildSrc_build.gradle ============================================================================== --- head/java/openjfx8-devel/files/patch-buildSrc_build.gradle Wed Jan 4 15:44:26 2017 (r430570) +++ head/java/openjfx8-devel/files/patch-buildSrc_build.gradle Wed Jan 4 15:54:28 2017 (r430571) @@ -1,6 +1,6 @@ --- buildSrc/build.gradle.orig 2016-02-28 12:54:50 UTC +++ buildSrc/build.gradle -@@ -81,11 +81,9 @@ sourceSets { +@@ -81,11 +81,10 @@ sourceSets { getConfigurations().create("antlr3"); dependencies { @@ -10,7 +10,8 @@ - antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" - antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" + compile files("%%PREFIX%%/share/java/classes/antlr-3.5.2-complete.jar") -+ testCompile files("%%PREFIX%%/share/java/classes/junit4.jar") ++ testCompile files("%%PREFIX%%/share/java/classes/junit4.jar", ++ "%%PREFIX%%/share/java/classes/hamcrest.jar") + antlr3 files("%%PREFIX%%/share/java/classes/antlr-3.5.2-complete.jar") }