Index: head/java/eclipse/Makefile
===================================================================
--- head/java/eclipse/Makefile	(revision 528797)
+++ head/java/eclipse/Makefile	(revision 528798)
@@ -1,99 +1,99 @@
 # Created by: Jonathan Chen <jonc@chen.org.nz>
 # $FreeBSD$
 
 PORTNAME=	eclipse
-PORTVERSION=	4.14
+PORTVERSION=	4.15
 CATEGORIES=	java devel
 
-# Update to git-tag on git.eclipse.org
-ECLIPSE_TAG=	R4_14
-ECLIPSE_TSTAMP=	20191220-0429
+# Update to eclipse.platform.releng.aggregator.git git-tag on git.eclipse.org
+ECLIPSE_TAG=	R4_15
+ECLIPSE_TSTAMP=	20200318-1047
 
 ECLIPSE_SUFX=	${ECLIPSE_TAG}.tar.xz
 ECLIPSE_MODULES=jdt/eclipse.jdt \
 		jdt/eclipse.jdt.core \
 		jdt/eclipse.jdt.core.binaries \
 		jdt/eclipse.jdt.debug \
 		jdt/eclipse.jdt.ui \
 		pde/eclipse.pde.build \
 		pde/eclipse.pde.ui \
 		platform/eclipse.platform \
 		platform/eclipse.platform.common \
 		platform/eclipse.platform.debug \
 		platform/eclipse.platform.releng \
 		platform/eclipse.platform.releng.aggregator \
 		platform/eclipse.platform.resources \
 		platform/eclipse.platform.runtime \
 		platform/eclipse.platform.swt \
 		platform/eclipse.platform.swt.binaries \
 		platform/eclipse.platform.team \
 		platform/eclipse.platform.text \
 		platform/eclipse.platform.ua \
 		platform/eclipse.platform.ui \
 		platform/eclipse.platform.ui.tools \
 		equinox/rt.equinox.binaries \
 		equinox/rt.equinox.bundles \
 		equinox/rt.equinox.framework \
 		equinox/rt.equinox.p2
 # Each Eclipse module has its own MASTER_SITE
 .for M in ${ECLIPSE_MODULES}
 MASTER_SITES+=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g} \
 		https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g}
 DISTFILES+=	${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g}
 .endfor
 
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jonc@chen.org.nz
-COMMENT=	Eclipse IDE 2019-12
+COMMENT=	Eclipse IDE 2020-03
 
 LICENSE=	EPL
 
 ONLY_FOR_ARCHS=	amd64 powerpc64
 
 BUILD_DEPENDS=	git:devel/git-lite \
 		${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
 LIB_DEPENDS=	libsecret-1.so:security/libsecret \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 USES=		compiler:c++11-lang gmake pkgconfig gnome
 USE_GNOME=	gtk30
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	daemonblade
 GH_PROJECT=	eclipse-maven-repo
 
-USE_JAVA=	8
+USE_JAVA=	11+
 
 DESKTOP_ENTRIES="Eclipse" \
 		"${COMMENT}" \
 		"${PORTNAME}" \
 		"${PORTNAME}" \
 		"Development;IDE;Java;" \
 		"false"
 
 SUB_FILES=	${PORTNAME}
 
 #LOCAL_P2=	file://${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/${PORTVERSION}
 MAVEN_ENV=	MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME}
 MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
 MAVEN_ECLIPSE=	-Dnative=gtk.freebsd.${ARCH} -DforceContextQualifier=v${ECLIPSE_TSTAMP}
 
 ECLIPSE_RESULT=	eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz
 
 # Let's abuse this to get to the right place.
 WRKSRC_SUBDIR=	../eclipse.platform.releng.aggregator-${ECLIPSE_TAG}
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_REPO} ${MAVEN_ECLIPSE} -DskipTests clean verify
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${TAR} -x --directory ${STAGEDIR}${DATADIR}/.. --file ${WRKSRC}/${ECLIPSE_RESULT}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 # generate dynamic plist, to cater for different ARCHS
 post-install:
 	cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST}
 	cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d | ${SED} -e 's,^,@dir ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/java/eclipse/distinfo
===================================================================
--- head/java/eclipse/distinfo	(revision 528797)
+++ head/java/eclipse/distinfo	(revision 528798)
@@ -1,53 +1,53 @@
-TIMESTAMP = 1577767743
-SHA256 (eclipse/eclipse.jdt-R4_14.tar.xz) = 5f577c57eb8cb4994a5d0e1e084d0bbb2f4e7277f6660e55281a5cb5c4f49fe3
-SIZE (eclipse/eclipse.jdt-R4_14.tar.xz) = 37472
-SHA256 (eclipse/eclipse.jdt.core-R4_14.tar.xz) = 650cb2292e0be904ca8cea6658e598289e2c0f71a130e15bca742674d7f8db8e
-SIZE (eclipse/eclipse.jdt.core-R4_14.tar.xz) = 8532944
-SHA256 (eclipse/eclipse.jdt.core.binaries-R4_14.tar.xz) = 14c823ee07fbf8fb8dfc7c597640da66d05c205753c0ceca80fafa63d1844c79
-SIZE (eclipse/eclipse.jdt.core.binaries-R4_14.tar.xz) = 34417384
-SHA256 (eclipse/eclipse.jdt.debug-R4_14.tar.xz) = ae5901055a7e4fec14d4a01e4825ef68c0abd449e79c146bce89d33a6324fa05
-SIZE (eclipse/eclipse.jdt.debug-R4_14.tar.xz) = 1435944
-SHA256 (eclipse/eclipse.jdt.ui-R4_14.tar.xz) = 135bad844a43bf60c11d22ef4adf691445b35b06e24ad01304ae17d357b93325
-SIZE (eclipse/eclipse.jdt.ui-R4_14.tar.xz) = 15020316
-SHA256 (eclipse/eclipse.pde.build-R4_14.tar.xz) = 9a62bed3f0def46d1bb22cd0e59ee6e2827d7c74ef0b35576e14dea81efedd85
-SIZE (eclipse/eclipse.pde.build-R4_14.tar.xz) = 868360
-SHA256 (eclipse/eclipse.pde.ui-R4_14.tar.xz) = 8e6566eb0d6176e3ca7d1faef1b36504c450a7d894d9483597319b7b2bb1774c
-SIZE (eclipse/eclipse.pde.ui-R4_14.tar.xz) = 29827820
-SHA256 (eclipse/eclipse.platform-R4_14.tar.xz) = fccccc8818ce8d43fff0e1e089df29cf6a31d23f5b1234e398eb1f34c83f5724
-SIZE (eclipse/eclipse.platform-R4_14.tar.xz) = 1369868
-SHA256 (eclipse/eclipse.platform.common-R4_14.tar.xz) = d0ed5aa143f81c22f4a031a96179c70790a43239717a4a8f1543d91f9a33ed05
-SIZE (eclipse/eclipse.platform.common-R4_14.tar.xz) = 34297556
-SHA256 (eclipse/eclipse.platform.debug-R4_14.tar.xz) = f1b1447ffa05bd13a448d2c1fc127d20e54a0662a0ba62f539a12b15d4b59e47
-SIZE (eclipse/eclipse.platform.debug-R4_14.tar.xz) = 1367732
-SHA256 (eclipse/eclipse.platform.releng-R4_14.tar.xz) = d4802b92df3c4a303741e8b31edb010464cba8eae5ff39ce502cb198921592be
-SIZE (eclipse/eclipse.platform.releng-R4_14.tar.xz) = 408388
-SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_14.tar.xz) = 1192f7fd4746d6083dd9a3bdfb49fa52703e8fa848096a73fe7d0ee3ddc1dbdd
-SIZE (eclipse/eclipse.platform.releng.aggregator-R4_14.tar.xz) = 689936
-SHA256 (eclipse/eclipse.platform.resources-R4_14.tar.xz) = cbd69d80478aca49d61f5c676a09f8098310c10833f69612699bc8b3d757f0af
-SIZE (eclipse/eclipse.platform.resources-R4_14.tar.xz) = 818836
-SHA256 (eclipse/eclipse.platform.runtime-R4_14.tar.xz) = a3487152397f997cb47a403bc64e270b5db17a08a5ce3b3223c5d77ae7057745
-SIZE (eclipse/eclipse.platform.runtime-R4_14.tar.xz) = 433100
-SHA256 (eclipse/eclipse.platform.swt-R4_14.tar.xz) = 1078174b76ea8d02f879956daa88c9d55805d51b3c02fe34ddf4e2239c4f2eb8
-SIZE (eclipse/eclipse.platform.swt-R4_14.tar.xz) = 6142300
-SHA256 (eclipse/eclipse.platform.swt.binaries-R4_14.tar.xz) = b030736e2a9e8e8c40affcd75e9bd78b76f379dbb8d406b51294e8f66ea5e386
-SIZE (eclipse/eclipse.platform.swt.binaries-R4_14.tar.xz) = 606164
-SHA256 (eclipse/eclipse.platform.team-R4_14.tar.xz) = 1753b5cd9df8dd47f167ee0d33cf63f6737389296f8ece95b0790d68890273b3
-SIZE (eclipse/eclipse.platform.team-R4_14.tar.xz) = 4633852
-SHA256 (eclipse/eclipse.platform.text-R4_14.tar.xz) = 2d48c1d855e520227d3a08cc54dad70dafab4563cacafa331d5cddcb36280325
-SIZE (eclipse/eclipse.platform.text-R4_14.tar.xz) = 1304152
-SHA256 (eclipse/eclipse.platform.ua-R4_14.tar.xz) = f5f97ad6797a4fa66457a36ec11dc27d09fa9d22c735d44cd4735f39acbbd714
-SIZE (eclipse/eclipse.platform.ua-R4_14.tar.xz) = 4532772
-SHA256 (eclipse/eclipse.platform.ui-R4_14.tar.xz) = 594c8fe38ba6eeb3c6844a460e7bbc406a633030b192fea40887d2190ebdea08
-SIZE (eclipse/eclipse.platform.ui-R4_14.tar.xz) = 5949320
-SHA256 (eclipse/eclipse.platform.ui.tools-R4_14.tar.xz) = 112ab40eb5db342c6948dd36c94fc8637b4d01f9470068e6bf1aa06563c2cc59
-SIZE (eclipse/eclipse.platform.ui.tools-R4_14.tar.xz) = 319832
-SHA256 (eclipse/rt.equinox.binaries-R4_14.tar.xz) = 2e419d56e2b5ed4d9a85bfc47e752061c5efffb9042db5b76b96b8777d55b73a
-SIZE (eclipse/rt.equinox.binaries-R4_14.tar.xz) = 298664
-SHA256 (eclipse/rt.equinox.bundles-R4_14.tar.xz) = 74dab60a8c1a3e788b07423e9eb0adc3ff1fd937e68c148dc31f7b0fbf7142bf
-SIZE (eclipse/rt.equinox.bundles-R4_14.tar.xz) = 1152024
-SHA256 (eclipse/rt.equinox.framework-R4_14.tar.xz) = 014150fd8d9552e9664ef7a1e29e760388cf592d4b0b52574566e96da0fa0ad4
-SIZE (eclipse/rt.equinox.framework-R4_14.tar.xz) = 2820048
-SHA256 (eclipse/rt.equinox.p2-R4_14.tar.xz) = 36dc7555430277635627d214cea650c13db703fa26302bb47dc3719f68feff67
-SIZE (eclipse/rt.equinox.p2-R4_14.tar.xz) = 48492172
-SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.14_GH0.tar.gz) = c9c2045ee30995765d6a64d53258289aa413ecaf4a81dafe19ab204329aabe89
-SIZE (eclipse/daemonblade-eclipse-maven-repo-4.14_GH0.tar.gz) = 188740301
+TIMESTAMP = 1584679339
+SHA256 (eclipse/eclipse.jdt-R4_15.tar.xz) = e19048ee90c06306567f1cd676dd6eb39bc962c944b1f0252d042284f1908d88
+SIZE (eclipse/eclipse.jdt-R4_15.tar.xz) = 37572
+SHA256 (eclipse/eclipse.jdt.core-R4_15.tar.xz) = b663e63962eff041615c13a06e28ed6e3e0afcc9e8560306f0e70d63f1009ca0
+SIZE (eclipse/eclipse.jdt.core-R4_15.tar.xz) = 8551616
+SHA256 (eclipse/eclipse.jdt.core.binaries-R4_15.tar.xz) = cdc2430eaedd9d140db2f20239c33aad3b74f5206106f40050947e0889f41e50
+SIZE (eclipse/eclipse.jdt.core.binaries-R4_15.tar.xz) = 34416588
+SHA256 (eclipse/eclipse.jdt.debug-R4_15.tar.xz) = f184afa9c033fdfc96ac3e3d97dc25257919d2de709adf646f2a9df7d53231cb
+SIZE (eclipse/eclipse.jdt.debug-R4_15.tar.xz) = 1449716
+SHA256 (eclipse/eclipse.jdt.ui-R4_15.tar.xz) = 1a5bd4c6b99ff55a3bac9d34cb2627a207240a90599d9aeb744e5066026949ec
+SIZE (eclipse/eclipse.jdt.ui-R4_15.tar.xz) = 15131660
+SHA256 (eclipse/eclipse.pde.build-R4_15.tar.xz) = daf47aed01e96b92b2c102c5a036f337c9f6408a2e653d342a6cf24571270548
+SIZE (eclipse/eclipse.pde.build-R4_15.tar.xz) = 868656
+SHA256 (eclipse/eclipse.pde.ui-R4_15.tar.xz) = b980c295042d96b93161e138d7a6f682a30882d1b4b73b6827286c154d4d7c3a
+SIZE (eclipse/eclipse.pde.ui-R4_15.tar.xz) = 29829076
+SHA256 (eclipse/eclipse.platform-R4_15.tar.xz) = be0586f49b875766dca009b227f412af799b316c856e1c1d9d674f9b3906d81a
+SIZE (eclipse/eclipse.platform-R4_15.tar.xz) = 1363244
+SHA256 (eclipse/eclipse.platform.common-R4_15.tar.xz) = eea2d2f96d19a79401e64b279688d0ad6cca89a4d1ca2031609c4be2650e69d1
+SIZE (eclipse/eclipse.platform.common-R4_15.tar.xz) = 34958196
+SHA256 (eclipse/eclipse.platform.debug-R4_15.tar.xz) = b5a853bc08970411db4c389d3f3ff23e229f0200d292d00323eb97986b94c869
+SIZE (eclipse/eclipse.platform.debug-R4_15.tar.xz) = 1369696
+SHA256 (eclipse/eclipse.platform.releng-R4_15.tar.xz) = 29b4e8b0d2289bc052be8ae3162ffbcfa6bac6749f6a3b24ab78c9db731277ff
+SIZE (eclipse/eclipse.platform.releng-R4_15.tar.xz) = 408380
+SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_15.tar.xz) = 383e5f9a6267e1d478dfbe7f3b909f8a63d9518465d552bddf9a8d338d2c1b9f
+SIZE (eclipse/eclipse.platform.releng.aggregator-R4_15.tar.xz) = 693064
+SHA256 (eclipse/eclipse.platform.resources-R4_15.tar.xz) = 12846615fcc84abb7df669b674065ebf5698a848cf3391d912803f2045364a7e
+SIZE (eclipse/eclipse.platform.resources-R4_15.tar.xz) = 813408
+SHA256 (eclipse/eclipse.platform.runtime-R4_15.tar.xz) = d6364d57cafcb6c386dfbb59b4f3aa445d0fe0e6abe4c7986d2336acd50fcffb
+SIZE (eclipse/eclipse.platform.runtime-R4_15.tar.xz) = 431232
+SHA256 (eclipse/eclipse.platform.swt-R4_15.tar.xz) = 2d836da78db0dcebd315f98dc3bff8ad1df8ddd81adad381d8ad9ffb22efdc6f
+SIZE (eclipse/eclipse.platform.swt-R4_15.tar.xz) = 6089636
+SHA256 (eclipse/eclipse.platform.swt.binaries-R4_15.tar.xz) = ddf35a6902924b2a3351edba52a5b28ab744da9fe539a4b2d64dcaffa1164d00
+SIZE (eclipse/eclipse.platform.swt.binaries-R4_15.tar.xz) = 613600
+SHA256 (eclipse/eclipse.platform.team-R4_15.tar.xz) = abcdc28136d81f2f9a53fc9c88eef1ec9dd71fb08e774b6cb1e3996d07b0586c
+SIZE (eclipse/eclipse.platform.team-R4_15.tar.xz) = 4634640
+SHA256 (eclipse/eclipse.platform.text-R4_15.tar.xz) = ed5f134436b202096f6873e8cda6fe7a264b1942d575c9cc7f0ea4f4c132ec68
+SIZE (eclipse/eclipse.platform.text-R4_15.tar.xz) = 1306572
+SHA256 (eclipse/eclipse.platform.ua-R4_15.tar.xz) = 19af7c2ab16776779170405db0d732044119343bb6a59e0ecd63cfc809111d2d
+SIZE (eclipse/eclipse.platform.ua-R4_15.tar.xz) = 4619436
+SHA256 (eclipse/eclipse.platform.ui-R4_15.tar.xz) = 47c81e6245c49867837e71cd5f15b67846ac421c644251737d8210a974e8f4ae
+SIZE (eclipse/eclipse.platform.ui-R4_15.tar.xz) = 5960144
+SHA256 (eclipse/eclipse.platform.ui.tools-R4_15.tar.xz) = 7b90c081376125df0c3029121b3c05dda39e18375df4deba9c01b73da3cae100
+SIZE (eclipse/eclipse.platform.ui.tools-R4_15.tar.xz) = 319124
+SHA256 (eclipse/rt.equinox.binaries-R4_15.tar.xz) = 3e5e0ec55eb3c1933e47c637c8b75db85821e705aaa672d1848c5442fd67b937
+SIZE (eclipse/rt.equinox.binaries-R4_15.tar.xz) = 298624
+SHA256 (eclipse/rt.equinox.bundles-R4_15.tar.xz) = f4b02d3c5f516a2630a77db7b4e181d1d893aa3a80461479a5693709825e649b
+SIZE (eclipse/rt.equinox.bundles-R4_15.tar.xz) = 1152256
+SHA256 (eclipse/rt.equinox.framework-R4_15.tar.xz) = a834e4bfd80b3c5ea483dcdc584b0adde4bb447214d153f4d4c3f519177b76ec
+SIZE (eclipse/rt.equinox.framework-R4_15.tar.xz) = 2822776
+SHA256 (eclipse/rt.equinox.p2-R4_15.tar.xz) = c90e988c186186f0f3cd174e1e1b15829c6d6e2fefcc2df71687205b1c3e3920
+SIZE (eclipse/rt.equinox.p2-R4_15.tar.xz) = 48486692
+SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.15_GH0.tar.gz) = 666ba1ed30bf3b2d51c7b62c092c93fc3a6abf049c11eded2de9bc7e43564ef1
+SIZE (eclipse/daemonblade-eclipse-maven-repo-4.15_GH0.tar.gz) = 185792514
Index: head/java/eclipse/files/patch-production
===================================================================
--- head/java/eclipse/files/patch-production	(revision 528797)
+++ head/java/eclipse/files/patch-production	(nonexistent)
@@ -1,14 +0,0 @@
-diff -ru production/checkConfigIIUs.sh production/checkConfigIIUs.sh
---- production/checkConfigIIUs.sh	0000-00-00 00:00:00.000000000 +0000
-+++ production/checkConfigIIUs.sh	0000-00-00 00:00:00.000000000 +0000
-@@ -39,8 +39,8 @@
- 
- declare -a PLATFORMS=( \
- cocoa.macosx.x86_64 \
--gtk.linux.ppc64le \
--gtk.linux.x86_64 \
-+gtk.freebsd.powerpc64 \
-+gtk.freebsd.amd64 \
- win32.win32.x86_64 \
- )
- NPLATFORMS=${#PLATFORMS[@]}

Property changes on: head/java/eclipse/files/patch-production
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/java/eclipse/files/eclipse.in
===================================================================
--- head/java/eclipse/files/eclipse.in	(revision 528797)
+++ head/java/eclipse/files/eclipse.in	(revision 528798)
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
 # FreeBSD-specific startup script for Eclipse Platform
 #
 # See: http://www.eclipse.org
 #
 # $FreeBSD$
 #
-exec %%DATADIR%%/eclipse "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" exec %%DATADIR%%/eclipse "$@"
Index: head/java/eclipse/files/patch-eclipse-platform-parent
===================================================================
--- head/java/eclipse/files/patch-eclipse-platform-parent	(revision 528797)
+++ head/java/eclipse/files/patch-eclipse-platform-parent	(revision 528798)
@@ -1,43 +1,43 @@
 diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml
 --- eclipse-platform-parent/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse-platform-parent/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -89,9 +89,9 @@
        'eclipiserun-repo' repository, such as for computing .api-descriptions and
        generating API Tools reports.
      -->
--    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.14-I-builds/</eclipserun-repo>
-+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.14/</eclipserun-repo>
+-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.15-I-builds/</eclipserun-repo>
++    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.15/</eclipserun-repo>
      
--    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.14-I-builds</comparator.repo>
-+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.14</comparator.repo>
+-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15-I-builds</comparator.repo>
++    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15</comparator.repo>
  
      <!--
        NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
 @@ -263,14 +263,14 @@
            </target>
            <environments>
              <environment>
 -              <os>linux</os>
 +              <os>freebsd</os>
                <ws>gtk</ws>
 -              <arch>x86_64</arch>
 +              <arch>amd64</arch>
              </environment>
              <environment>
 -              <os>linux</os>
 +              <os>freebsd</os>
                <ws>gtk</ws>
 -              <arch>ppc64le</arch>
 +              <arch>powerpc64</arch>
              </environment>
              <environment>
                <os>win32</os>
 @@ -635,7 +635,7 @@
            For maintenance streams should always be "M-builds".
            Ideally, this value would be provided by the environment, see bug 489789.
          -->
--        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.14-I-builds</eclipse-p2-repo.url>
-+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.14</eclipse-p2-repo.url>
+-        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15-I-builds</eclipse-p2-repo.url>
++        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15</eclipse-p2-repo.url>
        </properties>
        <repositories>
          <repository>
Index: head/java/eclipse/files/patch-eclipse.platform.releng
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.releng	(revision 528797)
+++ head/java/eclipse/files/patch-eclipse.platform.releng	(revision 528798)
@@ -1,84 +1,84 @@
 diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
 --- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -96,9 +96,9 @@
           unpack="false"/>
  
     <plugin
 -         id="org.eclipse.core.net.linux.x86_64"
 -         os="linux"
 -         arch="x86_64"
 +         id="org.eclipse.core.net.freebsd.amd64"
 +         os="freebsd"
 +         arch="amd64"
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -355,9 +355,9 @@
+@@ -362,9 +362,9 @@
           unpack="false"/>
  
     <plugin
 -         id="org.eclipse.core.filesystem.linux.x86_64"
 -         os="linux"
 -         arch="x86_64"
 +         id="org.eclipse.core.filesystem.freebsd.amd64"
 +         os="freebsd"
 +         arch="amd64"
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -394,9 +394,9 @@
+@@ -401,9 +401,9 @@
           unpack="false"/>
  
     <plugin
 -         id="org.eclipse.core.filesystem.linux.ppc64le"
 -         os="linux"
 -         arch="ppc64le"
 +         id="org.eclipse.core.filesystem.freebsd.powerpc64"
 +         os="freebsd"
 +         arch="powerpc64"
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -458,9 +458,9 @@
+@@ -465,9 +465,9 @@
           unpack="false"/>
  
     <plugin
 -         id="org.eclipse.equinox.security.linux.x86_64"
 -         os="linux"
 -         arch="x86_64"
 +         id="org.eclipse.equinox.security.freebsd.amd64"
 +         os="freebsd"
 +         arch="amd64"
           download-size="0"
           install-size="0"
           version="0.0.0"
 diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
 --- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -55,10 +55,10 @@
                </plugins>
                <excludes>
                  <plugin id="org.eclipse.platform.doc.user"/>
 -                <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
 +                <plugin id="org.eclipse.core.filesystem.freebsd.amd64"/>
                  <plugin id="org.eclipse.core.filesystem.macosx"/>
                  <plugin id="org.eclipse.core.filesystem.win32.x86_64"/>
 -                <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>
 +                <plugin id="org.eclipse.core.filesystem.freebsd.powerpc64"/>
                  <plugin id="org.eclipse.core.resources.win32.x86_64"/>
                </excludes>
              </configuration>
 diff -ru eclipse.platform.releng/pom.xml eclipse.platform.releng/pom.xml
 --- eclipse.platform.releng/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -66,7 +66,9 @@
      <module>features/org.eclipse.releng.tools</module>
      <module>features/org.eclipse.sdk</module>
      <module>features/org.eclipse.sdk.examples-feature</module>
 +<!--
      <module>features/org.eclipse.sdk.tests</module>
 +-->
      <module>features/org.eclipse.test-feature</module>
    </modules>
  
Index: head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder	(revision 528797)
+++ head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder	(revision 528798)
@@ -1,286 +1,286 @@
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -111,7 +111,7 @@
      -->
      <property
        name="platformFile"
 -      value="eclipse-platform-${eclispeBaseLabel}-linux-gtk-x86_64.tar.gz" />
 +      value="eclipse-platform-${eclispeBaseLabel}-freebsd-gtk-amd64.tar.gz" />
  
       <!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when
        using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version,
 @@ -308,4 +308,4 @@
        file="${settingsDir}/org.eclipse.core.net.prefs" />
    </target>
  
 -</project>
 \ No newline at end of file
 +</project>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -8,12 +8,12 @@
          fileName="eclipse-SDK-${BUILD_ID}-win32-x86_64.zip"></platform>
        <platform
          id="SLG264"
 -        name="Linux (64 bit version)"
 -        fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-x86_64.tar.gz"></platform>
 +        name="FreeBSD (64 bit version)"
 +        fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-amd64.tar.gz"></platform>
        <platform
          id="SLG2PPC64LE"
 -        name="Linux (64 bit version for Power PC)"
 -        fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-ppc64le.tar.gz"></platform>
 +        name="FreeBSD (64 bit version for Power PC)"
 +        fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform>
        <platform
          id="SMCC64"
          name="Mac OSX (64 bit version)"
 @@ -70,12 +70,12 @@
          fileName="eclipse-platform-${BUILD_ID}-win32-x86_64.zip"></platform>
        <platform
          id="PLG264"
 -        name="Linux (64 bit version)"
 -        fileName="eclipse-platform-${BUILD_ID}-linux-gtk-x86_64.tar.gz"></platform>
 +        name="FreeBSD (64 bit version)"
 +        fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-amd64.tar.gz"></platform>
        <platform
          id="PLG2PPC64LE"
 -        name="Linux (64 bit version for Power PC)"
 -        fileName="eclipse-platform-${BUILD_ID}-linux-gtk-ppc64le.tar.gz"></platform>
 +        name="FreeBSD (64 bit version for Power PC)"
 +        fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform>
        <platform
          id="PMCC64"
          name="Mac OSX (64 bit version)"
 @@ -150,12 +150,12 @@
          fileName="swt-${BUILD_ID}-win32-win32-x86_64.zip"></platform>
        <platform
          id="SWTLG64"
 -        name="Linux (64 bit version)"
 -        fileName="swt-${BUILD_ID}-gtk-linux-x86_64.zip"></platform>
 +        name="FreeBSD (64 bit version)"
 +        fileName="swt-${BUILD_ID}-gtk-freebsd-amd64.zip"></platform>
        <platform
          id="SWTLG2PPC64LE"
 -        name="Linux (64 bit version for Power PC)"
 -        fileName="swt-${BUILD_ID}-gtk-linux-ppc64le.zip"></platform>
 +        name="FreeBSD (64 bit version for Power PC)"
 +        fileName="swt-${BUILD_ID}-gtk-freebsd-powerpc64.zip"></platform>
        <platform
          id="SWTMCC64"
          name="Mac OSX (64 bit version)"
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -138,9 +138,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
 -              <os>linux</os>
 +              <os>freebsd</os>
                <ws>gtk</ws>
 -              <arch>x86_64</arch>
 +              <arch>amd64</arch>
              </environment>
              <environment>
                <os>win32</os>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties	0000-00-00 00:00:00.000000000 +0000
 @@ -1,11 +1,11 @@
  #Properties required by equinox p2 tests
  # Version from .../eclipse-junit-tests/src/main/resources/
  
 -org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-${buildId}-linux-gtk-x86_64.tar.gz
 +org.eclipse.equinox.p2.reconciler.tests.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-${buildId}-freebsd-gtk-amd64.tar.gz
  org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
  org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
  
--org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz
-+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.13-freebsd-gtk-amd64.tar.gz
- org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.13-win32-x86_64.zip
- org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.13-macosx-cocoa-x86_64.tar.gz
+-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz
++org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.14-freebsd-gtk-amd64.tar.gz
+ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.14-win32-x86_64.zip
+ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.14-macosx-cocoa-x86_64.tar.gz
  
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	0000-00-00 00:00:00.000000000 +0000
 @@ -7,9 +7,9 @@
  
  
  mkdir -p workarea/${buildId}/eclipse-testing
--cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
-+cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-platform-4.13-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+-cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
++cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
  
--cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-SDK-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
-+cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-SDK-4.13-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/
+-cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
++cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/
  
  cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
  
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -14,8 +14,8 @@
    <target name="equinoxlaunchers">
      <property name="archiveRoot" value="launchers" />
      <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" />
 -    <buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" />
 -    <buildRepos os="linux" ws="gtk" arch="ppc64le" archiveName="${archiveRoot}-linux.gtk.ppc64le.${buildId}.tar.gz" />
 +    <buildRepos os="freebsd" ws="gtk" arch="amd64" archiveName="${archiveRoot}-freebsd.gtk.amd64.${buildId}.tar.gz" />
 +    <buildRepos os="freebsd" ws="gtk" arch="powerpc64" archiveName="${archiveRoot}-freebsd.gtk.powerpc64.${buildId}.tar.gz" />
      <buildRepos os="macosx" ws="cocoa" arch="x86_64" archiveName="${archiveRoot}-macosx.cocoa.x86_64.${buildId}.tar.gz" />
    </target>
  
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
 --- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product	0000-00-00 00:00:00.000000000 +0000
 @@ -18,7 +18,7 @@
     <windowImages/>
  
     <launcher name="rt">
 -      <linux icon="icon.xpm"/>
 +      <freebsd icon="icon.xpm"/>
        <macosx icon="rt.icns"/>
        <win useIco="false">
           <bmp/>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -43,9 +43,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
 -              <os>linux</os>
 +              <os>freebsd</os>
                <ws>gtk</ws>
 -              <arch>x86_64</arch>
 +              <arch>amd64</arch>
              </environment>
              <environment>
                <os>win32</os>
 @@ -91,7 +91,7 @@
              <configuration>
                <formats>
                  <win32>zip</win32>
 -                <linux>tar.gz</linux>
 +                <freebsd>tar.gz</freebsd>
                  <macosx>tar.gz</macosx>
                </formats>
              </configuration>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
 --- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product	0000-00-00 00:00:00.000000000 +0000
 @@ -18,7 +18,7 @@
     <splash
        location="org.eclipse.platform" />
     <launcher name="eclipse">
 -      <linux icon="icons/icon.xpm"/>
 +      <freebsd icon="icons/icon.xpm"/>
        <macosx icon="icons/Eclipse.icns"/>
        <win useIco="false">
           <bmp/>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -79,7 +79,7 @@
              <configuration>
                <formats>
                  <win32>zip</win32>
 -                <linux>tar.gz</linux>
 +                <freebsd>tar.gz</freebsd>
                  <macosx>tar.gz</macosx>
                </formats>
              </configuration>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product
 --- eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product	0000-00-00 00:00:00.000000000 +0000
 @@ -18,7 +18,7 @@
     <splash
        location="org.eclipse.platform" />
     <launcher name="eclipse">
 -      <linux icon="icons/icon.xpm"/>
 +      <freebsd icon="icons/icon.xpm"/>
        <macosx icon="icons/Eclipse.icns"/>
        <win useIco="false">
           <bmp/>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/pom.xml eclipse.platform.releng.tychoeclipsebuilder/pom.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -36,7 +36,9 @@
      <module>platform</module>
      <module>platform.sdk</module>
      <module>sdk</module>
 +	<!-- disabled
      <module>eclipse-junit-tests</module>
      <module>eclipse.platform.repository</module>
 +	  -->
    </modules>
  </project>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product
 --- eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product	0000-00-00 00:00:00.000000000 +0000
 @@ -16,7 +16,7 @@
     </launcherArgs>
  
     <launcher name="eclipse">
 -      <linux icon="icons/icon.xpm"/>
 +      <freebsd icon="icons/icon.xpm"/>
        <macosx icon="icons/Eclipse.icns"/>
        <win useIco="false">
           <bmp/>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
 --- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties	0000-00-00 00:00:00.000000000 +0000
 @@ -29,11 +29,11 @@
  #root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe
  #root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe
  
 -root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
 -root.linux.gtk.ppc64le.permissions.755=eclipse
 +root.freebsd.gtk.powerpc64=rootfiles/freebsd.gtk.powerpc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64
 +root.freebsd.gtk.powerpc64.permissions.755=eclipse
  
 -root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
 -root.linux.gtk.x86_64.permissions.755=eclipse
 +root.freebsd.gtk.amd64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64
 +root.freebsd.gtk.amd64.permissions.755=eclipse
  
  bin.includes = feature.properties
  
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
 --- eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product	0000-00-00 00:00:00.000000000 +0000
 @@ -18,7 +18,7 @@
     <windowImages/>
  
     <launcher name="eclipse">
 -      <linux icon="icons/icon.xpm"/>
 +      <freebsd icon="icons/icon.xpm"/>
        <macosx icon="icons/Eclipse.icns"/>
        <win useIco="false">
           <bmp/>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -77,7 +77,7 @@
              <configuration>
                <formats>
                  <win32>zip</win32>
 -                <linux>tar.gz</linux>
 +                <freebsd>tar.gz</freebsd>
                  <macosx>tar.gz</macosx>
                </formats>
              </configuration>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product
 --- eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product	0000-00-00 00:00:00.000000000 +0000
 @@ -18,7 +18,7 @@
     <splash
        location="org.eclipse.platform" />
     <launcher name="eclipse">
 -      <linux icon="icons/icon.xpm"/>
 +      <freebsd icon="icons/icon.xpm"/>
        <macosx icon="icons/Eclipse.icns"/>
        <win useIco="false">
           <bmp/>
Index: head/java/eclipse/files/patch-eclipse.platform.resources
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.resources	(revision 528797)
+++ head/java/eclipse/files/patch-eclipse.platform.resources	(revision 528798)
@@ -1,174 +1,174 @@
 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile
 --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile	0000-00-00 00:00:00.000000000 +0000
 @@ -20,7 +20,7 @@
  LIB_NAME_FULL = libunixfile_1_0_0.so
  
  #Set this to be your OS type
 -OS_TYPE = linux
 +OS_TYPE = freebsd
  
  #Set this to be the location of your JRE
  ifeq (${JAVA_HOME},)
 @@ -28,15 +28,11 @@
  endif
  
  JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
 -OPT_FLAGS=-O2 -g -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 +OPT_FLAGS=-O2 -g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
  
  core:
 -	gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
 -	gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc
 +	${CC} $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
 +	${CC} $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc
  
  clean:
  	rm -f $(CORE.O) $(LIB_NAME_FULL)
 -
 -install: core
 -	rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so
 -	mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/
 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project
 --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <projectDescription>
 -	<name>org.eclipse.core.filesystem.linux.x86_64</name>
 +	<name>org.eclipse.core.filesystem.freebsd.amd64</name>
  	<comment></comment>
  	<projects>
  	</projects>
 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF
 --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 @@ -1,9 +1,9 @@
  Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: %fragmentName
 -Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true
 +Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.amd64; singleton:=true
  Bundle-Version: 1.2.300.qualifier
  Bundle-Vendor: %providerName
  Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.7.200,2.0.0)"
  Bundle-Localization: fragment
 -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64))
 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml
 --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -18,7 +18,7 @@
      <relativePath>../../</relativePath>
    </parent>
    <groupId>org.eclipse.core</groupId>
 -  <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.core.filesystem.freebsd.amd64</artifactId>
    <version>1.2.300-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
-@@ -37,9 +37,9 @@
+@@ -33,9 +33,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
 -              <os>linux</os>
 +              <os>freebsd</os>
                <ws>gtk</ws>
 -              <arch>x86_64</arch>
 +              <arch>amd64</arch>
              </environment>
            </environments>
          </configuration>
-@@ -54,7 +54,7 @@
+@@ -50,7 +50,7 @@
          <property>
            <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
            <name>native</name>
 -          <value>gtk.linux.x86_64</value>
 +          <value>gtk.freebsd.amd64</value>
          </property>
        </activation>
        <build>
-@@ -67,10 +67,10 @@
+@@ -63,10 +63,10 @@
                  <phase>process-resources</phase>
                  <configuration>
                    <target>
 -                    <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
 -           <mkdir dir="os/linux/x86_64/"/>
 -           <copy todir="os/linux/x86_64/">
 -           <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
 +                    <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"/>
 +           <mkdir dir="os/freebsd/amd64/"/>
 +           <copy todir="os/freebsd/amd64/">
 +           <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/">
                 <include name="libunixfile_*.so"/>
             </fileset>
             </copy>
 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF
 --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 @@ -1,9 +1,9 @@
  Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: %fragmentName
 -Bundle-SymbolicName: org.eclipse.core.filesystem.linux.ppc64le;singleton:=true
 +Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.powerpc64;singleton:=true
  Bundle-Version: 1.4.100.qualifier
  Bundle-Vendor: %providerName
  Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
  Bundle-Localization: fragment
 -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=ppc64le))
 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=powerpc64))
 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml
 --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -18,7 +18,7 @@
      <relativePath>../../</relativePath>
    </parent>
    <groupId>org.eclipse.core</groupId>
 -  <artifactId>org.eclipse.core.filesystem.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.core.filesystem.freebsd.powerpc64</artifactId>
    <version>1.4.100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
 @@ -37,9 +37,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
 -              <os>linux</os>
 +              <os>freebsd</os>
                <ws>gtk</ws>
 -              <arch>ppc64le</arch>
 +              <arch>powerpc64</arch>
              </environment>
            </environments>
          </configuration>
 diff -ru eclipse.platform.resources/pom.xml eclipse.platform.resources/pom.xml
 --- eclipse.platform.resources/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -52,8 +52,8 @@
  
    <modules>
      <module>bundles/org.eclipse.core.filesystem</module>
 -    <module>bundles/org.eclipse.core.filesystem.linux.ppc64le</module>
 -    <module>bundles/org.eclipse.core.filesystem.linux.x86_64</module>
 +    <module>bundles/org.eclipse.core.filesystem.freebsd.powerpc64</module>
 +    <module>bundles/org.eclipse.core.filesystem.freebsd.amd64</module>
      <module>bundles/org.eclipse.core.filesystem.macosx</module>
      <module>bundles/org.eclipse.core.filesystem.win32.x86_64</module>
  
 diff -ru eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml
 --- eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -28,9 +28,9 @@
           unpack="false"/-->
  
     <plugin
 -         id="org.eclipse.core.filesystem.linux.x86_64"
 -         os="linux"
 -         arch="x86_64"
 +         id="org.eclipse.core.filesystem.freebsd.amd64"
 +         os="freebsd"
 +         arch="amd64"
           download-size="0"
           install-size="0"
           version="0.0.0"
Index: head/java/eclipse/files/patch-eclipse.platform.swt
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.swt	(revision 528797)
+++ head/java/eclipse/files/patch-eclipse.platform.swt	(revision 528798)
@@ -1,355 +1,355 @@
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk
 --- eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk	0000-00-00 00:00:00.000000000 +0000
 @@ -10,7 +10,7 @@
  	<classpathentry kind="src" path="Eclipse SWT/common_j2se"/>
  	<classpathentry kind="src" path="Eclipse SWT PI/gtk">
  		<attributes>
 -			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="org.eclipse.swt.gtk.linux.x86_64"/>
 +			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="org.eclipse.swt.gtk.freebsd.amd64"/>
  		</attributes>
  	</classpathentry>
  	<classpathentry kind="src" path="Eclipse SWT PI/cairo"/>
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java	0000-00-00 00:00:00.000000000 +0000
 @@ -10,7 +10,7 @@
   *
   * Contributors:
   *     IBM Corporation - initial API and implementation
 - *     Pierre-Yves B., pyvesdev@gmail.com - Bug 219750: [styled text] Typing ~~ inserts é~~
 + *     Pierre-Yves B., pyvesdev@gmail.com - Bug 219750
   *******************************************************************************/
  package org.eclipse.swt.widgets;
  
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java	0000-00-00 00:00:00.000000000 +0000
 @@ -69,12 +69,12 @@
  static String arch() {
  	String osArch = System.getProperty("os.arch"); //$NON-NLS-1$
  	if (osArch.equals ("i386") || osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
 -	if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$
  	return osArch;
  }
  
  static String os() {
  	String osName = System.getProperty("os.name"); //$NON-NLS-1$
 +	if (osName.equals ("FreeBSD")) return "freebsd"; //$NON-NLS-1$ $NON-NLS-2$
  	if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$
  	if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$
  	if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	0000-00-00 00:00:00.000000000 +0000
 @@ -72,7 +72,7 @@
  
  cd `dirname $0`
  
 -MAKE_TYPE=make
 +MAKE_TYPE=gmake
  
  export CFLAGS='-O -Wall -fPIC'
  
 @@ -86,21 +86,14 @@
  		MAKEFILE=make_win32.mak
  		;;
  	*)
 -		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
 +		SWT_OS=`uname -s | tr '[:upper:]' '[:lower:]'`
  		MAKEFILE=make_linux.mak
  		;;
  esac
  
  # Determine which CPU type we are building for
  if [ "${MODEL}" = "" ]; then
 -	if uname -i > /dev/null 2>&1; then
 -		MODEL=`uname -i`
 -		if [ ${MODEL} = 'unknown' ]; then
 -		  MODEL=`uname -m`
 -		fi
 -	else
  		MODEL=`uname -m`
 -	fi
  fi
  case $MODEL in
  	"x86_64")
 @@ -111,6 +104,11 @@
  		SWT_ARCH=x86
  		AWT_ARCH=i386
  		;;
 +	"powerpc" | "powerpc64")
 +		SWT_ARCH=ppc64
 +		AWT_ARCH=ppc64
 +		MODEL=`uname -p`
 +		;;
  	*)
  		SWT_ARCH=$MODEL
  		AWT_ARCH=$MODEL
 @@ -118,6 +116,13 @@
  esac
  
  case $SWT_OS.$SWT_ARCH in
 +	"freebsd.ppc64")
 +		if [ "${JAVA_HOME}" = "" ]; then
 +			DYNAMIC_JAVA_HOME=`readlink -f /usr/local/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
 +			JAVA_HOME = $DYNAMIC_JAVA_HOME
 +			export JAVA_HOME
 +		fi
 +		;;
  	"linux.x86")
  		if [ "${CC}" = "" ]; then
  			export CC=gcc
 @@ -194,7 +199,7 @@
  
  
  # For 64-bit CPUs, we have a switch
 -if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
 +if [ ${MODEL} = 'amd64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'powerpc64' ]; then
  	SWT_PTR_CFLAGS=-DJNI64
  	if [ -d /lib64 ]; then
  		XLIB64=-L/usr/X11R6/lib64
 @@ -205,6 +210,11 @@
  		XLIB64="${XLIB64} -L/usr/lib64"
  		SWT_LFLAGS=-m64
  		export SWT_LFLAGS
 +	fi
 +	if [ ${SWT_OS} = "freebsd" ]
 +	then
 +		SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
 +		export SWT_LFLAGS=-m64
  	fi
  	export SWT_PTR_CFLAGS
  fi
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
-@@ -101,16 +101,18 @@
+@@ -103,16 +103,18 @@
  WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  
 +port_prefix=`pkg-config --variable=prefix gtk+-3.0`
  CFLAGS := $(CFLAGS) \
  		-DSWT_VERSION=$(SWT_VERSION) \
  		$(NATIVE_STATS) \
  		$(SWT_DEBUG) \
  		$(SWT_WEBKIT_DEBUG) \
 -		-DLINUX -DGTK \
 +		-DFREEBSD -DGTK \
 +		-I$(port_prefix)/include \
  		-I$(JAVA_HOME)/include \
 -		-I$(JAVA_HOME)/include/linux \
 +		-I$(JAVA_HOME)/include/freebsd \
  		${SWT_PTR_CFLAGS}
 -LFLAGS = -shared -fPIC ${SWT_LFLAGS}
 +LFLAGS = -shared -fPIC -m64 ${SWT_LFLAGS} -L$(port_prefix)/lib
  
  ifndef NO_STRIP
  	# -s = Remove all symbol table and relocation information from the executable.
-@@ -253,10 +255,6 @@
+@@ -255,10 +257,6 @@
  	cp $(ALL_SWT_LIBS) $(OUTPUT_DIR)
  ifeq ($(BUILD_WEBKIT2EXTENSION),yes)
  	@# Copy webextension into it's own folder, but create folder first.
 -	@# CAREFULLY delete '.so' files inside webextension*. Then carefully remove the directories. 'rm -rf' seemed too risky of an approach.
 -	@-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so)" ] && rm -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so`
 -	@-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*)" ] && rmdir -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*`
 -
  	@# Copying webextension is not critical for build to succeed, thus we use '-'. SWT can still function without a webextension.
  	@-[ -d $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) ] || mkdir -v $(OUTPUT_DIR)/$(WEBEXTENSION_DIR)  # If folder does not exist, make it.
  	-cp $(WEBKIT_EXTENSION_LIB) $(OUTPUT_DIR)/$(WEBEXTENSION_DIR)/
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	0000-00-00 00:00:00.000000000 +0000
 @@ -60,8 +60,8 @@
  
  		/* Initialize the OS flags and locale constants */
  		String osName = System.getProperty ("os.name");
 -		boolean isLinux = false, isWin32 = false;
 -		if (osName.equals ("Linux")) isLinux = true;
 +		boolean isLinux = osName.equals ("Linux") || osName.equals ("FreeBSD");
 +		boolean isWin32 = false;
  		if (osName.startsWith("Windows")) isWin32 = true;
  		IsLinux = isLinux;  IsWin32 = isWin32;
  
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
-@@ -157,7 +157,7 @@
+@@ -120,7 +120,7 @@
  	 * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
  	 * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
  	 */
--	static final int ASYNC_EXEC_TIMEOUT_MS = 10000; // Webkit2.
+-	static final int ASYNC_EXEC_TIMEOUT_MS = 10000;
 +	static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD
  
- 	static boolean bug522733FirstInstanceCreated = false; //Webkit2 workaround for Bug 522733
- 
+ 	/** Workaround for bug 522733 */
+ 	static boolean bug522733FirstInstanceCreated = false;
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
 --- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
 @@ -16,11 +16,11 @@
  requires.3.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
  
  requires.4.namespace = org.eclipse.equinox.p2.iu
 -requires.4.name = org.eclipse.swt.gtk.linux.x86_64
 +requires.4.name = org.eclipse.swt.gtk.freebsd.amd64
  requires.4.range = [$version$,$version$]
 -requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
 +requires.4.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=amd64)(!(org.eclipse.swt.buildtime=true)))
  
  requires.5.namespace = org.eclipse.equinox.p2.iu
 -requires.5.name = org.eclipse.swt.gtk.linux.ppc64le
 +requires.5.name = org.eclipse.swt.gtk.freebsd.powerpc64
  requires.5.range = [$version$,$version$]
 -requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
 +requires.5.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)(!(org.eclipse.swt.buildtime=true)))
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
 --- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -63,11 +63,11 @@
  		</antcall>
  		<antcall target="check_fragment_libraries">
  			<param name="library_count" value="8"/>
 -			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64le"/>
 +			<param name="fragment" value="org.eclipse.swt.gtk.freebsd.powerpc64"/>
  		</antcall>
  		<antcall target="check_fragment_libraries">
  			<param name="library_count" value="8"/>
 -			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/>
 +			<param name="fragment" value="org.eclipse.swt.gtk.freebsd.amd64"/>
  		</antcall>
  		<antcall target="check_fragment_libraries">
  			<param name="library_count" value="4"/>
 @@ -80,12 +80,12 @@
  		<property name="checkdir" value="~/build/check_libraries"/>
  		<property name="library_count" value="23"/>
  		<property name="fragment" value=""/>
 -		<fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
 +		<fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
  			<filename regex="[0-9][0-9][0-9][0-9]."/>
  			<filename regex="${swt_version}."/>
  			<exclude name="**/.git/**"/>
  		</fileset>
 -		<fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
 +		<fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.freebsd.powerpc64/**, **/org.eclipse.swt.gtk.freebsd.amd64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
  			<filename regex="[0-9][0-9][0-9][0-9]."/>
  			<filename regex="${swt_version}." negate="true"/>
  			<exclude name="**/.git/**"/>
 @@ -115,13 +115,13 @@
  			trust="true"
  			outputproperty="m_linux_x86_64_output"
  			command="hostname"/>
 -		<sshexec host="${m_linux_ppc64le}"
 +		<sshexec host="${m_linux_powerpc64}"
  			port="2256"
  			username="swtbuild"
  			keyfile="${keyfile}"
  			failonerror="false"
  			trust="true"
 -			outputproperty="m_linux_ppc64le_output"
 +			outputproperty="m_linux_powerpc64_output"
  			command="hostname"/>
  		<sshexec host="${m_mac}"
  			username="swtbuild"
 @@ -139,10 +139,10 @@
  				<matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/>
  			</and>
  		</condition>
 -		<condition property="m_linux_ppc64le_test" value="${success_msg}" else="${fail_msg}">
 +		<condition property="m_linux_powerpc64_test" value="${success_msg}" else="${fail_msg}">
  			<and>
 -				<length string="${m_linux_ppc64le_output}" when="greater" length="0"/>
 -				<matches pattern="x${m_linux_ppc64le_output}*" string="x${m_linux_ppc64le}"/>
 +				<length string="${m_linux_powerpc64_output}" when="greater" length="0"/>
 +				<matches pattern="x${m_linux_powerpc64_output}*" string="x${m_linux_powerpc64}"/>
  			</and>
  		</condition>
  		<condition property="m_mac_test" value="${success_msg}" else="${fail_msg}">
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup
 --- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup	0000-00-00 00:00:00.000000000 +0000
 @@ -103,7 +103,7 @@
                xsi:type="predicates:NotPredicate">
              <operand
                  xsi:type="predicates:NamePredicate"
 -                pattern=".*(cocoa|gtk|win32)(\.(macosx|aix|hpux|linux|solaris|win32)(\.(x86_64|ppc64|ia64|aarch64|arm|ppc64|ppc64le|s390|s390x|x86|sparcv9))?)?"/>
 +                pattern=".*(cocoa|gtk|win32)(\.(freebsd|macosx|aix|hpux|linux|solaris|win32)(\.(amd64|x86_64|powerpc64|ia64|aarch64|arm|ppc64|ppc64le|s390|s390x|x86|sparcv9))?)?"/>
            </operand>
            <operand
                xsi:type="predicates:NamePredicate"
 diff -ru eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
 --- eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
 @@ -10,11 +10,11 @@
  requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64))
  
  requires.3.namespace = org.eclipse.equinox.p2.iu
 -requires.3.name = org.eclipse.swt.gtk.linux.x86_64
 +requires.3.name = org.eclipse.swt.gtk.freebsd.amd64
  requires.3.range = 0.0.0
 -requires.3.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64))
 +requires.3.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=amd64))
  
  requires.4.namespace = org.eclipse.equinox.p2.iu
 -requires.4.name = org.eclipse.swt.gtk.linux.ppc64le
 +requires.4.name = org.eclipse.swt.gtk.freebsd.powerpc64
  requires.4.range = 0.0.0
 -requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le))
 +requires.4.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64))
 diff -ru eclipse.platform.swt/pom.xml eclipse.platform.swt/pom.xml
 --- eclipse.platform.swt/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -85,11 +85,12 @@
        <activation>
          <os>
            <family>unix</family>
 -          <name>Linux</name>
  	</os>
        </activation>
  	  <modules>
 +		<!-- disabled
  	    <module>tests/org.eclipse.swt.tests.gtk</module>
 +		  -->
  	  </modules>
      </profile>
      <profile>
 @@ -118,7 +119,9 @@
      <module>examples/org.eclipse.swt.examples.ole.win32</module>
      <module>examples/org.eclipse.swt.examples.views</module>
      <module>tests/org.eclipse.swt.tests.fragments.feature</module>
 +	<!-- disabled
      <module>tests/org.eclipse.swt.tests</module>
 +	  -->
      <module>features/org.eclipse.swt.tools.feature</module>
    </modules>
  </project>
 diff -ru eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml
 --- eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -20,10 +20,10 @@
     </license>
  
     <plugin
 -         id="org.eclipse.swt.gtk.linux.x86_64"
 -         os="linux"
 +         id="org.eclipse.swt.gtk.freebsd.amd64"
 +         os="freebsd"
           ws="gtk"
 -         arch="x86_64"
 +         arch="amd64"
           download-size="0"
           install-size="0"
           version="0.0.0"
 @@ -31,10 +31,10 @@
           unpack="false"/>
  
     <plugin
 -         id="org.eclipse.swt.gtk.linux.ppc64le"
 -         os="linux"
 +         id="org.eclipse.swt.gtk.freebsd.powerpc64"
 +         os="freebsd"
           ws="gtk"
 -         arch="ppc64le"
 +         arch="powerpc64"
           download-size="0"
           install-size="0"
           version="0.0.0"
Index: head/java/eclipse/files/patch-eclipse.platform.swt.binaries
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.swt.binaries	(revision 528797)
+++ head/java/eclipse/files/patch-eclipse.platform.swt.binaries	(revision 528798)
@@ -1,249 +1,249 @@
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 @@ -2,7 +2,7 @@
  Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
  Bundle-Name: %fragmentName
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.aarch64; singleton:=true
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.aarch64; singleton:=true
  Bundle-Version: 3.109.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
 @@ -26,8 +26,8 @@
   org.eclipse.swt.internal.cairo; x-internal:=true,
   org.eclipse.swt.internal.gtk; x-internal:=true,
   org.eclipse.swt.internal.opengl.glx; x-internal:=true
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64))
  SWT-WS: gtk
 -SWT-OS: linux
 +SWT-OS: freebsd
  SWT-Arch: aarch64
 -Automatic-Module-Name: org.eclipse.swt.gtk.linux.aarch64
 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.aarch64
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/build.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="UTF-8"?>
 -<project name="org.eclipse.swt.gtk.linux.aarch64" default="build.jars" basedir=".">
 +<project name="org.eclipse.swt.gtk.freebsd.aarch64" default="build.jars" basedir=".">
  
  	<property name="swt.ws" value="gtk" />
 -	<property name="swt.os" value="linux" />
 +	<property name="swt.os" value="freebsd" />
  	<property name="swt.arch" value="aarch64" />
  	<property name="targets" value="install"/>
  	
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -20,12 +20,12 @@
      <relativePath>../binaries-parent/</relativePath>
    </parent>
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.aarch64</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.aarch64</artifactId>
    <version>3.109.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
 -    <os>linux</os>
 +    <os>freebsd</os>
      <ws>gtk</ws>
      <arch>aarch64</arch>
      <buildid>${buildId}</buildid>
 @@ -61,7 +61,7 @@
          <property>
            <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
            <name>native</name>
 -          <value>gtk.linux.aarch64</value>
 +          <value>gtk.freebsd.aarch64</value>
          </property>
        </activation>
        <build>
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <projectDescription>
 -	<name>org.eclipse.swt.gtk.linux.x86_64</name>
 +	<name>org.eclipse.swt.gtk.freebsd.amd64</name>
  	<comment></comment>
  	<projects>
  	</projects>
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 @@ -2,7 +2,7 @@
  Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
  Bundle-Name: %fragmentName
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true
- Bundle-Version: 3.113.0.qualifier
+ Bundle-Version: 3.114.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
 @@ -26,8 +26,8 @@
   org.eclipse.swt.internal.cairo; x-internal:=true,
   org.eclipse.swt.internal.gtk; x-internal:=true,
   org.eclipse.swt.internal.opengl.glx; x-internal:=true
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))
  SWT-WS: gtk
 -SWT-OS: linux
 -SWT-Arch: x86_64
 -Automatic-Module-Name: org.eclipse.swt.gtk.linux.x86_64
 +SWT-OS: freebsd
 +SWT-Arch: amd64
 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.amd64
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -1,9 +1,9 @@
  <?xml version="1.0" encoding="UTF-8"?>
 -<project name="org.eclipse.swt.gtk.linux.x86_64" default="build.jars" basedir=".">
 +<project name="org.eclipse.swt.gtk.freebsd.amd64" default="build.jars" basedir=".">
  
  	<property name="swt.ws" value="gtk" />
 -	<property name="swt.os" value="linux" />
 -	<property name="swt.arch" value="x86_64" />
 +	<property name="swt.os" value="freebsd" />
 +	<property name="swt.arch" value="amd64" />
  	<property name="targets" value="install"/>
  	
  	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh	0000-00-00 00:00:00.000000000 +0000
 @@ -36,10 +36,10 @@
  
  if [ "${DEV_ECLIPSE}" != "" ]; then
  	echo " Copying generated *.jar files into your ${DEV_ECLIPSE} folder"
 -	cp -v ./target/org.eclipse.swt.gtk.linux.x86_64-*-SNAPSHOT.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.linux.x86_64_*
 -	cp -v ./target/org.eclipse.swt.gtk.linux.x86_64-*-SNAPSHOT-sources.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.linux.x86_64.source_*.jar
 +	cp -v ./target/org.eclipse.swt.gtk.freebsd.amd64-*-SNAPSHOT.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.freebsd.amd64_*
 +	cp -v ./target/org.eclipse.swt.gtk.freebsd.amd64-*-SNAPSHOT-sources.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.freebsd.amd64.source_*.jar
  	echo "Note: Below should list newly generated *jar files with current timestamp"
 -	ls -l --color=auto -a ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.linux.x86_64*
 +	ls -l --color=auto -a ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.freebsd.amd64*
  else
  	echo "Note:" 
  	echo "  Set DEV_ECLIPSE to your development eclipse folder to have the *.jar files copied into it automatically."
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -20,14 +20,14 @@
      <relativePath>../binaries-parent/</relativePath>
    </parent>
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
-   <version>3.113.0-SNAPSHOT</version>
+   <version>3.114.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
 -    <os>linux</os>
 +    <os>freebsd</os>
      <ws>gtk</ws>
 -    <arch>x86_64</arch>
 +    <arch>amd64</arch>
      <buildid>${buildId}</buildid>
    </properties>
  
 @@ -61,7 +61,7 @@
          <property>
            <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
            <name>native</name>
 -          <value>gtk.linux.x86_64</value>
 +          <value>gtk.freebsd.amd64</value>
          </property>
        </activation>
        <build>
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 @@ -2,7 +2,7 @@
  Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
  Bundle-Name: %fragmentName
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true
- Bundle-Version: 3.113.0.qualifier
+ Bundle-Version: 3.114.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
 @@ -26,8 +26,8 @@
   org.eclipse.swt.internal.cairo; x-internal:=true,
   org.eclipse.swt.internal.gtk; x-internal:=true,
   org.eclipse.swt.internal.opengl.glx; x-internal:=true
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64))
  SWT-WS: gtk
 -SWT-OS: linux
 -SWT-Arch: ppc64le
 -Automatic-Module-Name: org.eclipse.swt.gtk.linux.ppc64le
 +SWT-OS: freebsd
 +SWT-Arch: powerpc64
 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.powerpc64
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -1,9 +1,9 @@
  <?xml version="1.0" encoding="UTF-8"?>
 -<project name="org.eclipse.swt.gtk.linux.ppc64le" default="build.jars" basedir=".">
 +<project name="org.eclipse.swt.gtk.freebsd.powerpc64" default="build.jars" basedir=".">
  
  	<property name="swt.ws" value="gtk" />
 -	<property name="swt.os" value="linux" />
 -	<property name="swt.arch" value="ppc64le" />
 +	<property name="swt.os" value="freebsd" />
 +	<property name="swt.arch" value="powerpc64" />
  	<property name="targets" value="install"/>
  	
  	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml
 --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -20,14 +20,14 @@
      <relativePath>../binaries-parent/</relativePath>
    </parent>
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>
-   <version>3.113.0-SNAPSHOT</version>
+   <version>3.114.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
 -    <os>linux</os>
 +    <os>freebsd</os>
      <ws>gtk</ws>
 -    <arch>ppc64le</arch>
 +    <arch>powerpc64</arch>
      <buildid>${buildId}</buildid>
    </properties>
  
 @@ -61,7 +61,7 @@
          <property>
            <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
            <name>native</name>
 -          <value>gtk.linux.ppc64le</value>
 +          <value>gtk.freebsd.powerpc64</value>
          </property>
        </activation>
        <build>
 diff -ru eclipse.platform.swt.binaries/pom.xml eclipse.platform.swt.binaries/pom.xml
 --- eclipse.platform.swt.binaries/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt.binaries/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -54,8 +54,8 @@
  
    <modules>
      <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
 -    <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
 -    <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
 +    <module>bundles/org.eclipse.swt.gtk.freebsd.powerpc64</module>
 +    <module>bundles/org.eclipse.swt.gtk.freebsd.amd64</module>
      <module>bundles/org.eclipse.swt.win32.win32.x86_64</module>
    </modules>
  
Index: head/java/eclipse/files/patch-eclipse.platform.ui
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.ui	(revision 528797)
+++ head/java/eclipse/files/patch-eclipse.platform.ui	(revision 528798)
@@ -1,185 +1,185 @@
 diff -ru eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml
 --- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -37,9 +37,9 @@
+@@ -33,9 +33,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
 -              <os>linux</os>
 +              <os>freebsd</os>
                <ws>gtk</ws>
 -              <arch>x86_64</arch>
 +              <arch>amd64</arch>
              </environment>
            </environments>
          </configuration>
 diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml
 --- eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -94,7 +94,7 @@
        <browser
           id="org.eclipse.ui.browser.firefox"
           name="%browserFirefox"
 -         os="linux,aix,hpux,solaris"
 +         os="freebsd,linux,aix,hpux,solaris"
           executable="firefox"
           factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
           <location>
 @@ -104,28 +104,28 @@
        <browser
           id="org.eclipse.ui.browser.chrome"
           name="%browserChrome"
 -         os="linux,aix,hpux,solaris"
 +         os="freebsd,linux,aix,hpux,solaris"
           executable="google-chrome">
           <location>usr/bin/google-chrome</location>
        </browser>
        <browser
           id="org.eclipse.ui.browser.chromium"
           name="%browserChromium"
 -         os="linux"
 +         os="freebsd,linux"
           executable="chromium-browser">
           <location>usr/bin/chromium-browser</location>
        </browser>
        <browser
           id="org.eclipse.ui.browser.konqueror"
           name="%browserKonqueror"
 -         os="linux,aix,hpux,solaris"
 +         os="freebsd,linux,aix,hpux,solaris"
           executable="konqueror">
           <location>usr/bin/konqueror</location>
        </browser>
        <browser
           id="org.eclipse.ui.browser.epiphany"
           name="%browserEpiphany"
 -         os="linux"
 +         os="freebsd,linux"
           executable="epiphany">
           <location>
           	usr/bin/epiphany
 diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java
 --- eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java	0000-00-00 00:00:00.000000000 +0000
 @@ -210,7 +210,8 @@
  				if (currentTitleControl.getVisible()) {
  					int tw = width - HMARGIN * 2 - SPACING * 2;
  					String os = System.getProperty("os.name"); //$NON-NLS-1$
 -					if (Constants.OS_LINUX.equalsIgnoreCase(os)) {
 +					if (Constants.OS_LINUX.equalsIgnoreCase(os) ||
 +						Constants.OS_FREEBSD.equalsIgnoreCase(os)) {
  						tw += 1; // See Bug 342610
  					}
  					if (bsize != null)
 @@ -584,4 +585,4 @@
  		target.setTransfer(transferTypes);
  		target.addDropListener(listener);
  	}
 -}
 \ No newline at end of file
 +}
 diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml
 --- eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -12,7 +12,7 @@
          basestylesheeturi="css/e4-dark_linux.css"
          id="org.eclipse.e4.ui.css.theme.e4_dark"
          label="%theme.dark"
 -        os="linux">
 +        os="freebsd">
      </theme>
      <theme
          basestylesheeturi="css/e4-dark_win.css"
 @@ -37,7 +37,7 @@
              basestylesheeturi="css/e4_default_gtk.css"
              id="org.eclipse.e4.ui.css.theme.e4_default"
              label="%theme.gtk"
 -            os="linux">
 +            os="freebsd">
        </theme>
        <theme
              basestylesheeturi="css/e4_default_mac.css"
 diff -ru eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java
 --- eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ui/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/IOperatingSystemRegistration.java	0000-00-00 00:00:00.000000000 +0000
 @@ -33,6 +33,8 @@
  	 * @return an instance of IOperatingSystemRegistration
  	 */
  	static IOperatingSystemRegistration getInstance() {
 +		if (Platform.OS_FREEBSD.equals(Platform.getOS()))
 +			return new RegistrationLinux();
  		if (Platform.OS_MACOSX.equals(Platform.getOS())) {
  			return new RegistrationMacOsX();
  		} else if (Platform.OS_LINUX.equals(Platform.getOS())) {
 diff -ru eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
 --- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -403,20 +403,20 @@
           fragment="true"/>
  
     <plugin
 -         id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
 -         os="linux"
 +         id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64"
 +         os="freebsd"
           ws="gtk"
 -         arch="ppc64le"
 +         arch="powerpc64"
           download-size="0"
           install-size="0"
           version="0.0.0"
           fragment="true"/>
  
     <plugin
 -         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
 -         os="linux"
 +         id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"
 +         os="freebsd"
           ws="gtk"
 -         arch="x86_64"
 +         arch="amd64"
           download-size="0"
           install-size="0"
           version="0.0.0"
 @@ -451,10 +451,10 @@
           unpack="false"/>
  
     <plugin
 -         id="org.eclipse.swt.gtk.linux.ppc64le"
 -         os="linux"
 +         id="org.eclipse.swt.gtk.freebsd.powerpc64"
 +         os="freebsd"
           ws="gtk"
 -         arch="ppc64le"
 +         arch="powerpc64"
           download-size="0"
           install-size="0"
           version="0.0.0"
 @@ -462,10 +462,10 @@
           unpack="false"/>
  
     <plugin
 -         id="org.eclipse.swt.gtk.linux.x86_64"
 -         os="linux"
 +         id="org.eclipse.swt.gtk.freebsd.amd64"
 +         os="freebsd"
           ws="gtk"
 -         arch="x86_64"
 +         arch="amd64"
           download-size="0"
           install-size="0"
           version="0.0.0"
 diff -ru eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
 --- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -39,8 +39,8 @@
                  <plugin id="javax.xml"/>
                  <plugin id="org.eclipse.swt"/>
                  <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/>
 -                <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"/>
 -                <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
 +                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64"/>
 +                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"/>
                  <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
                </excludes>
              </configuration>