Index: head/java/openjfx8-devel/Makefile =================================================================== --- head/java/openjfx8-devel/Makefile (revision 430570) +++ head/java/openjfx8-devel/Makefile (revision 430571) @@ -1,59 +1,60 @@ # Created by: Tobias Kortkamp # $FreeBSD$ 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/ 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 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 USES= jpeg USE_GL= yes USE_GNOME= gtk20 USE_JAVA= yes USE_LDCONFIG= yes JAVA_VERSION= 1.8 ONLY_FOR_ARCHS= i386 amd64 PLIST_SUB= ARCH=${ARCH} \ JAVA_HOME=${JAVA_HOME} WRKSRC= ${WRKDIR}/tobik-openjfx-rt-2de985ca8377 # NOTE: This port won't build if openjfx8-devel is currently # installed. This is not a problem in Poudriere or Synth but # something to be aware of if you're trying to build this port in a # non-pristine environment. post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|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) do-install: @(${MKDIR} ${STAGEDIR}${JAVA_HOME} \ && ${TAR} -C ${STAGEDIR}${JAVA_HOME} \ -xf ${WRKSRC}/build/bundles/javafx-sdk-overlay.zip) @${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \; .include Index: head/java/openjfx8-devel/files/patch-build.gradle =================================================================== --- head/java/openjfx8-devel/files/patch-build.gradle (revision 430570) +++ head/java/openjfx8-devel/files/patch-build.gradle (revision 430571) @@ -1,76 +1,78 @@ --- 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 { +@@ -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" - antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" + antlr3 files("%%PREFIX%%/share/java/classes/antlr-3.5.2-complete.jar") } // 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() - include "**/antlr-3.1.3.jar" - include "**/stringtemplate-3.2.jar" - include "**/antlr-runtime-3.1.3.jar" + include "**/antlr-3.5.2-complete.jar" 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 { - compile group: "org.apache.ant", name: "ant", version: "1.8.2" + compile files("%%PREFIX%%/share/java/apache-ant/lib/ant.jar") } // 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 - classes << { - // Copy all of the download libraries to libs directory for the sake of the IDEs - File libsDir = rootProject.file("build/libs"); - File antLib = new File(libsDir, "ant-1.8.2.jar") - libsDir.mkdirs(); - for (File f : configurations.compile.files) { - copy { - into libsDir - from f.getParentFile() - include "**/ant-1.8.2.jar" - includeEmptyDirs = false - } - } - } - task packagerFakeJar(type: Jar) { dependsOn compileTestJava from compileTestJava.destinationDir Index: head/java/openjfx8-devel/files/patch-buildSrc_build.gradle =================================================================== --- head/java/openjfx8-devel/files/patch-buildSrc_build.gradle (revision 430570) +++ head/java/openjfx8-devel/files/patch-buildSrc_build.gradle (revision 430571) @@ -1,17 +1,18 @@ --- 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 { - compile group: "org.antlr", name: "antlr", version: "3.1.3" - testCompile group: "junit", name: "junit", version: "4.8.2" - antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" - 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") } // At the moment the ASM library shipped with Gradle that is used to