Index: head/java/eclipse/Makefile
===================================================================
--- head/java/eclipse/Makefile	(revision 539544)
+++ head/java/eclipse/Makefile	(revision 539545)
@@ -1,99 +1,99 @@
 # Created by: Jonathan Chen <jonc@chen.org.nz>
 # $FreeBSD$
 
 PORTNAME=	eclipse
-PORTVERSION=	4.15
+PORTVERSION=	4.16
 CATEGORIES=	java devel
 
 # Update to eclipse.platform.releng.aggregator.git git-tag on git.eclipse.org
-ECLIPSE_TAG=	R4_15
-ECLIPSE_TSTAMP=	20200318-1047
+ECLIPSE_TAG=	R4_16
+ECLIPSE_TSTAMP=	20200617-1404
 
 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 2020-03
+COMMENT=	Eclipse IDE 2020-06
 
 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=	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 539544)
+++ head/java/eclipse/distinfo	(revision 539545)
@@ -1,53 +1,53 @@
-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
+TIMESTAMP = 1592448357
+SHA256 (eclipse/eclipse.jdt-R4_16.tar.xz) = 9f93c368bf782ad8d3e4124f0ec11087b1b462052139165cec7aa4fa9bcc7050
+SIZE (eclipse/eclipse.jdt-R4_16.tar.xz) = 29304
+SHA256 (eclipse/eclipse.jdt.core-R4_16.tar.xz) = 1b734dfa8ddd40e09efa37303c099ad2dd11633474e7270a9c043dc625d93728
+SIZE (eclipse/eclipse.jdt.core-R4_16.tar.xz) = 8650672
+SHA256 (eclipse/eclipse.jdt.core.binaries-R4_16.tar.xz) = 9cb0d7c97a46191ff60738a8da327552786293f05392bd0be10c30ecbf78b637
+SIZE (eclipse/eclipse.jdt.core.binaries-R4_16.tar.xz) = 34416600
+SHA256 (eclipse/eclipse.jdt.debug-R4_16.tar.xz) = 845eedbf3a424f4cc7a138028bfaea74a4e6f93871903603bb886b6bc9c96d23
+SIZE (eclipse/eclipse.jdt.debug-R4_16.tar.xz) = 1462764
+SHA256 (eclipse/eclipse.jdt.ui-R4_16.tar.xz) = 08ea5e36ea0279bd86d2a2fb877664becfd043e4f37291ee4f173f7f41246e0b
+SIZE (eclipse/eclipse.jdt.ui-R4_16.tar.xz) = 15771884
+SHA256 (eclipse/eclipse.pde.build-R4_16.tar.xz) = e56ac953b3722de9a40d6b1759f5da78bf369dc49bcce47435ce9fdec6e89fea
+SIZE (eclipse/eclipse.pde.build-R4_16.tar.xz) = 868696
+SHA256 (eclipse/eclipse.pde.ui-R4_16.tar.xz) = 7db5936fc6d7cbc2f02dea114c00099837af6f37120d6a10da2b8ef2b7ded4c1
+SIZE (eclipse/eclipse.pde.ui-R4_16.tar.xz) = 29819796
+SHA256 (eclipse/eclipse.platform-R4_16.tar.xz) = 3d5d3e6b3968c744c4a94e968ae7f29ef8229f93556351007e054922c751f82e
+SIZE (eclipse/eclipse.platform-R4_16.tar.xz) = 1446740
+SHA256 (eclipse/eclipse.platform.common-R4_16.tar.xz) = a1fbec04f8b1bc28082ca23d8850efe44e3bbe1fa7bd38c8cc7a8b5536cd9c99
+SIZE (eclipse/eclipse.platform.common-R4_16.tar.xz) = 35851024
+SHA256 (eclipse/eclipse.platform.debug-R4_16.tar.xz) = 649b547351db7acafad225e90915b1bd96cb3ae1964b4c420956030b5979e431
+SIZE (eclipse/eclipse.platform.debug-R4_16.tar.xz) = 1372776
+SHA256 (eclipse/eclipse.platform.releng-R4_16.tar.xz) = 3b9016785fc52e75462c69222c0855228b23a8eac3184e615f6a045a13dda643
+SIZE (eclipse/eclipse.platform.releng-R4_16.tar.xz) = 406928
+SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_16.tar.xz) = bdbc90306a3dabaf3be6c01ca090f7da6434eada0a2137935acc2aa11fd3c0c1
+SIZE (eclipse/eclipse.platform.releng.aggregator-R4_16.tar.xz) = 605404
+SHA256 (eclipse/eclipse.platform.resources-R4_16.tar.xz) = f443677069d43b444b17627f0a593cf6fbb82eb86a69f37c9c331267d1d51d33
+SIZE (eclipse/eclipse.platform.resources-R4_16.tar.xz) = 813528
+SHA256 (eclipse/eclipse.platform.runtime-R4_16.tar.xz) = 69d32fc771c293c33d1adb0bbf480cb4b79116d23f8ec5ebf8f3b243894b59ce
+SIZE (eclipse/eclipse.platform.runtime-R4_16.tar.xz) = 431312
+SHA256 (eclipse/eclipse.platform.swt-R4_16.tar.xz) = d864f1d3a275d93118be35a360c92d8943c3eb9d67cc72916bab5ecd85dc7262
+SIZE (eclipse/eclipse.platform.swt-R4_16.tar.xz) = 6236756
+SHA256 (eclipse/eclipse.platform.swt.binaries-R4_16.tar.xz) = b875dba475ed19f2b55cbade3a54b4b9afe522037efeb42909e1e9d89dd84dc0
+SIZE (eclipse/eclipse.platform.swt.binaries-R4_16.tar.xz) = 563508
+SHA256 (eclipse/eclipse.platform.team-R4_16.tar.xz) = 180590b0a7516e246c7343298506f62f29c853e4090899891c6c301d4be801a7
+SIZE (eclipse/eclipse.platform.team-R4_16.tar.xz) = 4633900
+SHA256 (eclipse/eclipse.platform.text-R4_16.tar.xz) = 1d243c92c8eb67a9aef9de7c87bf228f4d057b380b7b60ac9ca77fa64363f0f9
+SIZE (eclipse/eclipse.platform.text-R4_16.tar.xz) = 1319632
+SHA256 (eclipse/eclipse.platform.ua-R4_16.tar.xz) = 8c3ca5fe144588f2d994906461779fa782b257f3643b7686a9606bcf7b907c75
+SIZE (eclipse/eclipse.platform.ua-R4_16.tar.xz) = 4621924
+SHA256 (eclipse/eclipse.platform.ui-R4_16.tar.xz) = fd232ac1fddaec771ec895b995fb0c47813577e3b5a87f72b29b01363e08eeca
+SIZE (eclipse/eclipse.platform.ui-R4_16.tar.xz) = 5967112
+SHA256 (eclipse/eclipse.platform.ui.tools-R4_16.tar.xz) = 43a75d63cb4f294fa39b749dfe4e6751493ffbc5c45e8009099bb8683290009b
+SIZE (eclipse/eclipse.platform.ui.tools-R4_16.tar.xz) = 328668
+SHA256 (eclipse/rt.equinox.binaries-R4_16.tar.xz) = e7e198a3ffa5f0392277e4f648ca59469ec8bbaeafe553620b023f287d9fb8f1
+SIZE (eclipse/rt.equinox.binaries-R4_16.tar.xz) = 299708
+SHA256 (eclipse/rt.equinox.bundles-R4_16.tar.xz) = 7a91d247020b62cb5d2fe9886e9ae5693b60aa0d3d1331f88b83070d65285637
+SIZE (eclipse/rt.equinox.bundles-R4_16.tar.xz) = 1161164
+SHA256 (eclipse/rt.equinox.framework-R4_16.tar.xz) = c1f2d3410c546e09adbed2eb97880d7f109890a6abcb625291271e776224e780
+SIZE (eclipse/rt.equinox.framework-R4_16.tar.xz) = 2827340
+SHA256 (eclipse/rt.equinox.p2-R4_16.tar.xz) = ef8216e3013688a5f2bd62128a10f19c420bfc587345d47810f25e1d254c4bf1
+SIZE (eclipse/rt.equinox.p2-R4_16.tar.xz) = 48490416
+SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.16_GH0.tar.gz) = 73355577a36e6ee976464ab16416fc966d91763f20dfa70ff4d4fd7ff460cfc5
+SIZE (eclipse/daemonblade-eclipse-maven-repo-4.16_GH0.tar.gz) = 198477770
Index: head/java/eclipse/files/patch-eclipse-platform-parent
===================================================================
--- head/java/eclipse/files/patch-eclipse-platform-parent	(revision 539544)
+++ head/java/eclipse/files/patch-eclipse-platform-parent	(revision 539545)
@@ -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 @@
+@@ -80,9 +80,9 @@
        'eclipiserun-repo' repository, such as for computing .api-descriptions and
        generating API Tools reports.
      -->
--    <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>
+-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.16-I-builds/</eclipserun-repo>
++    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.16/</eclipserun-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>
+-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.16-I-builds</comparator.repo>
++    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.16</comparator.repo>
  
      <!--
        NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
-@@ -263,14 +263,14 @@
+@@ -254,14 +254,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 @@
+@@ -626,7 +626,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.15-I-builds</eclipse-p2-repo.url>
-+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15</eclipse-p2-repo.url>
+-        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.16-I-builds</eclipse-p2-repo.url>
++        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.16</eclipse-p2-repo.url>
        </properties>
        <repositories>
          <repository>
Index: head/java/eclipse/files/patch-eclipse.pde.ui
===================================================================
--- head/java/eclipse/files/patch-eclipse.pde.ui	(revision 539544)
+++ head/java/eclipse/files/patch-eclipse.pde.ui	(revision 539545)
@@ -1,14 +1,14 @@
 diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product
 --- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
-@@ -81,8 +81,8 @@
+@@ -80,8 +80,8 @@
        <plugin id="org.eclipse.osgi.util"/>
        <plugin id="org.eclipse.swt"/>
        <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
 -      <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/>
 -      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
 +      <plugin id="org.eclipse.swt.gtk.freebsd.powerpc64" fragment="true"/>
 +      <plugin id="org.eclipse.swt.gtk.freebsd.amd64" fragment="true"/>
        <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
+       <plugin id="org.eclipse.urischeme"/>
        <plugin id="org.w3c.css.sac"/>
-       <plugin id="org.w3c.dom.events"/>
Index: head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder	(revision 539544)
+++ head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder	(revision 539545)
@@ -1,286 +1,235 @@
-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.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.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.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.swt.binaries
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.swt.binaries	(revision 539544)
+++ head/java/eclipse/files/patch-eclipse.platform.swt.binaries	(revision 539545)
@@ -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-Version: 3.114.100.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>
+   <version>3.114.100-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.114.0.qualifier
+ Bundle-Version: 3.114.100.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.114.0-SNAPSHOT</version>
+   <version>3.114.100-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.114.0.qualifier
+ Bundle-Version: 3.114.100.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.114.0-SNAPSHOT</version>
+   <version>3.114.100-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.ua
===================================================================
--- head/java/eclipse/files/patch-eclipse.platform.ua	(revision 539544)
+++ head/java/eclipse/files/patch-eclipse.platform.ua	(revision 539545)
@@ -1,64 +1,64 @@
 diff -ru eclipse.platform.ua/org.eclipse.help.base/plugin.xml eclipse.platform.ua/org.eclipse.help.base/plugin.xml
 --- eclipse.platform.ua/org.eclipse.help.base/plugin.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ua/org.eclipse.help.base/plugin.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -131,7 +131,7 @@
              </parameter>
              <parameter
                    name="os"
 -                  value="Linux,AIX,HP,SunOS">
 +                  value="FreeBSD,Linux,AIX,HP,SunOS">
              </parameter>
           </factoryclass>
        </browser>
 @@ -150,7 +150,7 @@
              </parameter>
              <parameter
                    name="os"
 -                  value="Linux,AIX,HP,SunOS">
 +                  value="FreeBSD,Linux,AIX,HP,SunOS">
              </parameter>
           </factoryclass>
        </browser>
 @@ -169,7 +169,7 @@
              </parameter>
              <parameter
                    name="os"
 -                  value="Linux,AIX,HP,SunOS">
 +                  value="FreeBSD,Linux,AIX,HP,SunOS">
              </parameter>
           </factoryclass>
        </browser>
 diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java
 --- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java	0000-00-00 00:00:00.000000000 +0000
 @@ -35,7 +35,7 @@
  			prefs
  					.put("custom_browser_path", //$NON-NLS-1$
  							"\"C:\\Program Files\\Internet Explorer\\IEXPLORE.EXE\" %1"); //$NON-NLS-1$
 -		} else if (os.contains("linux")) { //$NON-NLS-1$
 +		} else if (os.contains("linux") || os.contains("freebsd")) { //$NON-NLS-1$
  			prefs.put("custom_browser_path", //$NON-NLS-1$
  					"konqueror %1"); //$NON-NLS-1$
  		} else {
 diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
 --- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java	0000-00-00 00:00:00.000000000 +0000
-@@ -102,6 +102,7 @@
+@@ -103,6 +103,7 @@
  				setDefaultBrowserID(BROWSER_ID_SYSTEM);
  			} else if (Constants.OS_AIX.equalsIgnoreCase(os)
  					|| (Constants.OS_HPUX.equalsIgnoreCase(os))
 +					|| (Constants.OS_FREEBSD.equalsIgnoreCase(os))
  					|| (Constants.OS_LINUX.equalsIgnoreCase(os))
  					|| (Constants.OS_SOLARIS.equalsIgnoreCase(os))) {
  				setDefaultBrowserID(BROWSER_ID_MOZILLA);
 diff -ru eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java
 --- eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java	0000-00-00 00:00:00.000000000 +0000
 @@ -67,6 +67,7 @@
  	 */
  	private boolean test() {
  		if (!Constants.OS_WIN32.equalsIgnoreCase(Platform.getOS())
 +				&& !Constants.OS_FREEBSD.equalsIgnoreCase(Platform.getOS())
  				&& !Constants.OS_LINUX.equalsIgnoreCase(Platform.getOS())) {
  			return false;
  		}
Index: head/java/eclipse/files/patch-rt.equinox.bundles
===================================================================
--- head/java/eclipse/files/patch-rt.equinox.bundles	(revision 539544)
+++ head/java/eclipse/files/patch-rt.equinox.bundles	(revision 539545)
@@ -1,173 +1,173 @@
 diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF
 --- rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 @@ -13,7 +13,7 @@
   org.eclipse.equinox.internal.security.credentials;x-internal:=true,
   org.eclipse.equinox.internal.security.storage;x-internal:=true,
   org.eclipse.equinox.internal.security.storage.friends;version="1.0.0";x-friends:="org.eclipse.equinox.security.ui",
 - org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.linux.x86_64",
 + org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.freebsd.amd64",
   org.eclipse.equinox.security.auth;version="1.0.0",
   org.eclipse.equinox.security.auth.credentials;version="1.0.0",
   org.eclipse.equinox.security.auth.module;version="1.0.0",
 diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project
 --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.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.equinox.security.linux.x86_64</name>
 +	<name>org.eclipse.equinox.security.freebsd.amd64</name>
  	<comment></comment>
  	<projects>
  	</projects>
 diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF
 --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 @@ -1,13 +1,13 @@
  Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: %fragmentName
 -Bundle-SymbolicName: org.eclipse.equinox.security.linux.x86_64;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.security.freebsd.amd64;singleton:=true
  Bundle-Version: 1.1.300.qualifier
  Bundle-Vendor: %providerName
  Fragment-Host: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Bundle-Localization: fragment
 -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
 -Export-Package: org.eclipse.equinox.internal.security.linux;x-internal:=true
 -Automatic-Module-Name: org.eclipse.equinox.security.linux.x86_64
 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64))
 +Export-Package: org.eclipse.equinox.internal.security.freebsd;x-internal:=true
 +Automatic-Module-Name: org.eclipse.equinox.security.freebsd.amd64
  Eclipse-BundleShape: dir
 diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile
 --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile	0000-00-00 00:00:00.000000000 +0000
 @@ -1,7 +1,7 @@
  LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1`
  LIBSECRET_LIBS = `pkg-config --libs libsecret-1`
  
 -CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" $(LIBSECRET_CFLAGS)
 +CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/freebsd" $(LIBSECRET_CFLAGS)
  LDFLAGS := $(LDFLAGS) -shared $(LIBSECRET_LIBS)
  
  all: ../libkeystorelinuxnative.so
 @@ -10,7 +10,7 @@
  	rm ../libkeystorelinuxnative.so ../target/keystoreLinuxNative.o
  
  ../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o
 -	$(CC) $(LDFLAGS) -o $@ $<
 +	$(CC) $(LDFLAGS) -s -o $@ $<
  
  ../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c
  	$(CC) -c $(CFLAGS) -o $@ $(TESTFLAGS) keystoreLinuxNative.c
 diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml
 --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -18,7 +18,7 @@
      <relativePath>../../</relativePath>
    </parent>
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.security.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.equinox.security.freebsd.amd64</artifactId>
    <version>1.1.300-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
 @@ -35,9 +35,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>
 @@ -51,7 +51,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>
 @@ -64,7 +64,7 @@
                  <phase>process-resources</phase>
                  <configuration>
                    <target>
 -                    <exec executable="make" newenvironment="false" dir="keystorelinuxnative/"/>
 +                    <exec executable="gmake" newenvironment="false" dir="keystorelinuxnative/"/>
                    </target>
                  </configuration>
                  <goals>
 diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties
 --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties	0000-00-00 00:00:00.000000000 +0000
 @@ -12,7 +12,7 @@
  #     Julien HENRY - Linux implementation
  ###############################################################################
  
 -## Linux libsecure integration module
 +## FreeBSD libsecure integration module
  getMasterPasswordError=Secure storage was unable to retrieve the master password from the password storage. If secure storage was created using a different user account, you'll have to switch back to that account. Alternatively, you can use the password recovery, or delete and re-create secure storage. 
  saveMasterPasswordError=Secure storage was unable to save the master password.
 -newMasterPasswordGenerated=New secure storage master password was generated (Linux libsecret integration module). 
 +newMasterPasswordGenerated=New secure storage master password was generated (FreeBSD libsecret integration module). 
 diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties
 --- rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties	0000-00-00 00:00:00.000000000 +0000
 @@ -29,7 +29,7 @@
  generate.plugin@org.eclipse.osgi.source=org.eclipse.osgi
  generate.plugin@org.eclipse.osgi.util.source=org.eclipse.osgi.util
  generate.plugin@org.eclipse.equinox.security.win32.x86_64.source=org.eclipse.equinox.security.win32.x86_64
 -generate.plugin@org.eclipse.equinox.security.linux.x86_64.source=org.eclipse.equinox.security.linux.x86_64
 +generate.plugin@org.eclipse.equinox.security.freebsd.amd64.source=org.eclipse.equinox.security.freebsd.amd64
  generate.plugin@org.eclipse.equinox.security.macosx.source=org.eclipse.equinox.security.macosx
  generate.plugin@org.eclipse.equinox.security.source=org.eclipse.equinox.security
  generate.plugin@org.eclipse.equinox.security.ui.source=org.eclipse.equinox.security.ui
 diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml
 --- rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -217,9 +217,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"
 @@ -227,9 +227,9 @@
           unpack="false"/>
  
     <plugin
 -         id="org.eclipse.equinox.security.linux.x86_64.source"
 -         os="linux"
 -         arch="x86_64"
 +         id="org.eclipse.equinox.security.freebsd.amd64.source"
 +         os="freebsd"
 +         arch="amd64"
           download-size="0"
           install-size="0"
           version="0.0.0"
 diff -ru rt.equinox.bundles/pom.xml rt.equinox.bundles/pom.xml
 --- rt.equinox.bundles/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -89,7 +89,7 @@
+@@ -84,7 +84,7 @@
      <module>bundles/org.eclipse.equinox.security</module>
      <module>bundles/org.eclipse.equinox.security.macosx</module>
      <module>bundles/org.eclipse.equinox.security.win32.x86_64</module>
 -    <module>bundles/org.eclipse.equinox.security.linux.x86_64</module>
 +    <module>bundles/org.eclipse.equinox.security.freebsd.amd64</module>
      <module>bundles/org.eclipse.equinox.bidi</module>
      <module>bundles/org.eclipse.equinox.cm</module>
      <module>bundles/org.eclipse.equinox.console</module>
Index: head/java/eclipse/files/patch-rt.equinox.framework
===================================================================
--- head/java/eclipse/files/patch-rt.equinox.framework	(revision 539544)
+++ head/java/eclipse/files/patch-rt.equinox.framework	(revision 539545)
@@ -1,424 +1,424 @@
 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 @@ -2,9 +2,9 @@
  Bundle-ManifestVersion: 2
  Bundle-Name: %pluginName
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true
- Bundle-Version: 1.1.1100.qualifier
- Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)"
+ Bundle-Version: 1.1.1200.qualifier
+ Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
 -Bundle-Localization: launcher.gtk.linux.aarch64
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64))
 +Bundle-Localization: launcher.gtk.freebsd.aarch64
  Eclipse-BundleShape: dir
 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -18,12 +18,12 @@
      <relativePath>../../launcher-binary-parent</relativePath>
    </parent>
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.launcher.gtk.linux.aarch64</artifactId>
 +  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.aarch64</artifactId>
-   <version>1.1.1100-SNAPSHOT</version>
+   <version>1.1.1200-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
 -    <os>linux</os>
 +    <os>freebsd</os>
      <ws>gtk</ws>
      <arch>aarch64</arch>
      <skipAPIAnalysis>true</skipAPIAnalysis>
 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.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.equinox.launcher.gtk.linux.x86_64</name>
 +	<name>org.eclipse.equinox.launcher.gtk.freebsd.amd64</name>
  	<comment></comment>
  	<projects>
  	</projects>
 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 @@ -2,9 +2,9 @@
  Bundle-ManifestVersion: 2
  Bundle-Name: %pluginName
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true
- Bundle-Version: 1.1.1100.qualifier
+ Bundle-Version: 1.1.1200.qualifier
  Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
 -Bundle-Localization: launcher.gtk.linux.x86_64
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))
 +Bundle-Localization: launcher.gtk.freebsd.amd64
  Eclipse-BundleShape: dir
 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties	0000-00-00 00:00:00.000000000 +0000
 @@ -11,5 +11,5 @@
  # Contributors:
  #     IBM Corporation - initial API and implementation
  ###############################################################################
 -pluginName = Equinox Launcher Linux X86_64 Fragment
 +pluginName = Equinox Launcher FreeBSD/amd64 Fragment
  providerName = Eclipse.org - Equinox
 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -18,14 +18,14 @@
      <relativePath>../../launcher-binary-parent</relativePath>
    </parent>
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.amd64</artifactId>
-   <version>1.1.1100-SNAPSHOT</version>
+   <version>1.1.1200-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
 -    <os>linux</os>
 +    <os>freebsd</os>
      <ws>gtk</ws>
 -    <arch>x86_64</arch>
 +    <arch>amd64</arch>
      <skipAPIAnalysis>true</skipAPIAnalysis>
    </properties>
  </project>
 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project	0000-00-00 00:00:00.000000000 +0000
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <projectDescription>
 -	<name>org.eclipse.equinox.launcher.gtk.linux.ppc64le</name>
 +	<name>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</name>
  	<comment></comment>
  	<projects>
  	</projects>
 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
 @@ -2,9 +2,9 @@
  Bundle-ManifestVersion: 2
  Bundle-Name: %pluginName
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true
- Bundle-Version: 1.1.1100.qualifier
+ Bundle-Version: 1.1.1200.qualifier
  Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
 -Bundle-Localization: launcher.gtk.linux.ppc64le
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64))
 +Bundle-Localization: launcher.gtk.freebsd.powerpc64
  Eclipse-BundleShape: dir
 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml
 --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -18,14 +18,14 @@
      <relativePath>../../launcher-binary-parent</relativePath>
    </parent>
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</artifactId>
-   <version>1.1.1100-SNAPSHOT</version>
+   <version>1.1.1200-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
 -    <os>linux</os>
 +    <os>freebsd</os>
      <ws>gtk</ws>
 -    <arch>ppc64le</arch>
 +    <arch>powerpc64</arch>
      <skipAPIAnalysis>true</skipAPIAnalysis>
    </properties>
  </project>
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	0000-00-00 00:00:00.000000000 +0000
 @@ -24,11 +24,11 @@
  root.win32.win32.x86_64=bin/win32/win32/x86_64
  root.win32.win32.x86_64.permissions.755=launcher.exe
  
 -root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
 -root.linux.gtk.ppc64le.permissions.755=launcher
 +root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root
 +root.freebsd.gtk.powerpc64.permissions.755=launcher
  
  root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64
  root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/launcher
  
 -root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
 -root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
 +root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root
 +root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -33,20 +33,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"
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	0000-00-00 00:00:00.000000000 +0000
 @@ -112,8 +112,13 @@
  				;;
  		esac
  		;;
 +	FreeBSD|freebsd)
 +		defaultOS="freebsd"
 +		defaultJava=DEFAULT_JAVA_EXEC
 +		makefile="make_linux.mak"
 +		;;
  	*)
 -	echo "Unknown OS -- build aborted"
 +	echo "Unknown OS $defaultOS -- build aborted"
  	;;
  esac
  export CC
 @@ -146,19 +151,20 @@
  
  LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
  OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
 +mkdir -p ${OUTPUT_DIR}
  
  export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS DEFAULT_JAVA LIBRARY_DIR
  
  # If the OS is supported (a makefile exists)
  if [ "$makefile" != "" ]; then
  	if [ "$extraArgs" != "" ]; then
 -		make -f $makefile $extraArgs
 +		gmake -f $makefile $extraArgs
  	else
  		echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS"
 -		make -f $makefile clean
 +		gmake -f $makefile clean
  		case x$CC in
 -		  x*gcc*) make -f $makefile all PICFLAG=-fpic ;;
 -		  *)      make -f $makefile all ;;
 +		  x*gcc*) gmake -f $makefile all PICFLAG=-fpic ;;
 +		  *)      gmake -f $makefile all ;;
  		esac
  	fi
  else
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
 @@ -81,10 +81,11 @@
   -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
   -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
   -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
 -LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 
 -CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
 +port_prefix=`pkg-config --variable=prefix gtk+-3.0`
 +LFLAGS = ${M_ARCH} -shared -fpic
 +CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\
  	-fpic \
 -	-DLINUX \
 +	-DFREEBSD \
  	-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
  	-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
  	-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
 @@ -92,7 +93,8 @@
  	$(GTK_LIBS) \
  	-I. \
  	-I.. \
 -	-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
 +	-I$(port_prefix)/include \
 +	-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd \
  	`pkg-config --cflags gtk+-3.0`
  
  all: $(EXEC) $(DLL)
 @@ -130,11 +132,11 @@
  
  $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
  	$(info Linking and generating: $(EXEC))
 -	$(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
 +	$(CC) ${M_ARCH} -s -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
  
  $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
  	$(info Linking and generating: $(DLL))
 -	$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
 +	$(CC) $(LFLAGS) -s -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
  
  install: all
  	cp $(EXEC) $(OUTPUT_DIR)
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -123,8 +123,8 @@
                      <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
                        <fileset dir="${rt.equinox.binaries.loc}/org.eclipse.equinox.executable/bin/">
                          <include name="cocoa/macosx/x86_64/**/*"/>
 -                        <include name="gtk/linux/ppc64le/**/*"/>
 -                        <include name="gtk/linux/x86_64/**/*"/>
 +                        <include name="gtk/freebsd/powerpc64/**/*"/>
 +                        <include name="gtk/freebsd/amd64/**/*"/>
                          <include name="win32/win32/x86_64/**/*"/>
                        </fileset>
                      </copy>
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties	0000-00-00 00:00:00.000000000 +0000
 @@ -20,12 +20,12 @@
  root.win32.win32.x86_64=file:bin/win32/win32/x86_64/launcher.exe
  root.win32.win32.x86_64.permissions.755=launcher.exe
  
 -root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
 -root.linux.gtk.ppc64le.permissions.755=launcher
 +root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root
 +root.freebsd.gtk.powerpc64.permissions.755=launcher
  
  root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64
  root.macosx.cocoa.x86_64.permissions.755=Contents/MacOS/${launcherName}
  
 -root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
 -root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
 +root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root
 +root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so
  
 diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -76,29 +76,29 @@
  		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}" />
  		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" />
  	</target>
 -	<target name="rootFileslinux_gtk_ppc64le">
 -		<mkdir dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}"/>
 -		<copy todir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" failonerror="true" overwrite="true">
 -			<fileset dir="${basedir}/bin/gtk/linux/ppc64le" includes="**"			/>
 +	<target name="rootFilesfreebsd_gtk_powerpc64">
 +		<mkdir dir="${feature.base}/freebsd.gtk.powerpc64/${collectingFolder}"/>
 +		<copy todir="${feature.base}/freebsd.gtk.powerpc64/${collectingFolder}" failonerror="true" overwrite="true">
 +			<fileset dir="${basedir}/bin/gtk/freebsd/powerpc64" includes="**"			/>
  			<fileset dir="${basedir}/gtk_root" includes="**"			/>
  		</copy>
 -		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" includes="launcher" />
 +		<chmod perm="755" dir="${feature.base}/freebsd.gtk.powerpc64/${collectingFolder}" includes="launcher" />
  	</target>
 -    <target name="rootFileslinux_gtk_aarch64">
 -		<mkdir dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}"/>
 -		<copy todir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true">
 -			<fileset dir="${basedir}/bin/gtk/linux/aarch64" includes="**"			/>
 +    <target name="rootFilesfreebsd_gtk_aarch64">
 +		<mkdir dir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}"/>
 +		<copy todir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true">
 +			<fileset dir="${basedir}/bin/gtk/freebsd/aarch64" includes="**"			/>
  			<fileset dir="${basedir}/gtk_root" includes="**"			/>
  		</copy>
 -		<chmod perm="755" dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" includes="launcher" />
 +		<chmod perm="755" dir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}" includes="launcher" />
  	</target>
 -	<target name="rootFileslinux_gtk_x86_64">
 -		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
 -		<copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
 -			<fileset dir="${basedir}/bin/gtk/linux/x86_64" includes="**"			/>
 +	<target name="rootFilesfreebsd_gtk_amd64">
 +		<mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/>
 +		<copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true">
 +			<fileset dir="${basedir}/bin/gtk/freebsd/amd64" includes="**"			/>
  			<fileset dir="${basedir}/gtk_root" includes="**"			/>
  		</copy>
 -		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="launcher" />
 +		<chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="launcher" />
  	</target>
  	<target name="rootFileslinux_gtk_ia64">
  		<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/>
 @@ -138,8 +138,8 @@
  	<target name="rootFilesgroup_group_group">
  		<antcall target="rootFileswin32_win32_x86_64"/>
  		<antcall target="rootFilesmacosx_cocoa_x86_64"/>
 -		<antcall target="rootFileslinux_gtk_ppc64le"/>
 -		<antcall target="rootFileslinux_gtk_x86_64"/>
 +		<antcall target="rootFilesfreebsd_gtk_powerpc64"/>
 +		<antcall target="rootFilesfreebsd_gtk_amd64"/>
  	</target>
  
  	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.platform.launchers.">
 diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml
 --- rt.equinox.framework/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/pom.xml	0000-00-00 00:00:00.000000000 +0000
 @@ -54,27 +54,27 @@
        </repositories>
      </profile>
      <profile>
 -      <id>build-native-launchers-gtk.linux.arm</id>
 +      <id>build-native-launchers-gtk.freebsd.armv7</id>
        <activation>
  	<property>
  	  <name>native</name>
 -	  <value>gtk.linux.arm</value>
 +	  <value>gtk.freebsd.armv7</value>
          </property>
        </activation>
        <modules>
 -	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
 +	<module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7</module>
        </modules>
      </profile>
      <profile>
 -      <id>build-native-launchers-gtk.linux.aarch64</id>
 +      <id>build-native-launchers-gtk.freebsd.aarch64</id>
        <activation>
  	<property>
  	  <name>native</name>
 -	  <value>gtk.linux.aarch64</value>
 +	  <value>gtk.freebsd.aarch64</value>
          </property>
        </activation>
        <modules>
 -	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
 +	<module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64</module>
        </modules>
      </profile>
    </profiles>
 @@ -88,8 +88,8 @@
      
      <module>bundles/org.eclipse.equinox.launcher</module>
      <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module>
 -    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
 -    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
 +    <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</module>
 +    <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64</module>
      <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module>
  
      <module>bundles/org.eclipse.osgi.tests</module>
 diff -ru rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties
 --- rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties	0000-00-00 00:00:00.000000000 +0000
 @@ -8,4 +8,4 @@
  #j_linux.x86_64=/shared/common/jdk-1.6.0_10
  
  #user names to use on each of the machines if different from the user running hudson, u_${os}.${arch}
 -u_linux.x86_64=swtbuild
 +u_freebsd.amd64=swtbuild