diff -ruN /usr/ports/java/eclipse/Makefile ./Makefile
--- /usr/ports/java/eclipse/Makefile	2019-11-24 14:49:58.526039000 +1300
+++ ./Makefile	2020-01-01 11:24:26.837204000 +1300
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	eclipse
-PORTVERSION=	4.12
-PORTREVISION=	1
+PORTVERSION=	4.14
 CATEGORIES=	java devel
 
 # Update to git-tag on git.eclipse.org
-ECLIPSE_TAG=	R4_12
-ECLIPSE_TSTAMP=	20190617-0403
+ECLIPSE_TAG=	R4_14
+ECLIPSE_TSTAMP=	20191220-0429
 
 ECLIPSE_SUFX=	${ECLIPSE_TAG}.tar.xz
 ECLIPSE_MODULES=jdt/eclipse.jdt \
@@ -46,7 +45,7 @@
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jonc@chen.org.nz
-COMMENT=	Eclipse IDE 2019-06
+COMMENT=	Eclipse IDE 2019-12
 
 LICENSE=	EPL
 
@@ -74,9 +73,10 @@
 
 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} -Dcomparator.repo=file://${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/p2-stub -DforceContextQualifier=v${ECLIPSE_TSTAMP}
+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
 
diff -ruN /usr/ports/java/eclipse/distinfo ./distinfo
--- /usr/ports/java/eclipse/distinfo	2019-11-24 14:49:58.526356000 +1300
+++ ./distinfo	2019-12-31 17:49:03.703990000 +1300
@@ -1,53 +1,53 @@
-TIMESTAMP = 1564954773
-SHA256 (eclipse/eclipse.jdt-R4_12.tar.xz) = 45ae25fb2da5f0dabb0a3e661cd7c0bdb7e64c11ef022ef69634b78b7c0d53e2
-SIZE (eclipse/eclipse.jdt-R4_12.tar.xz) = 37540
-SHA256 (eclipse/eclipse.jdt.core-R4_12.tar.xz) = 5e2397a22ac6b4c8c4335da21c51c53f391b7aa22287e8c2a0a51d32ca56a735
-SIZE (eclipse/eclipse.jdt.core-R4_12.tar.xz) = 8454552
-SHA256 (eclipse/eclipse.jdt.core.binaries-R4_12.tar.xz) = e7ff8a3148707694b14140abdaa40feca610694f3b729c0851abaab321063b7d
-SIZE (eclipse/eclipse.jdt.core.binaries-R4_12.tar.xz) = 34416416
-SHA256 (eclipse/eclipse.jdt.debug-R4_12.tar.xz) = a111fc4ff7f054a691cd27ae8999eac08d9a840a7dc44d09568573442ae1471a
-SIZE (eclipse/eclipse.jdt.debug-R4_12.tar.xz) = 1431080
-SHA256 (eclipse/eclipse.jdt.ui-R4_12.tar.xz) = 375bce94a24c56a9ae23d3c0029b169abc3281feb4217678fdab0903684f4762
-SIZE (eclipse/eclipse.jdt.ui-R4_12.tar.xz) = 14583880
-SHA256 (eclipse/eclipse.pde.build-R4_12.tar.xz) = 891a4bcc90cd96514f318eee9eaf96fc15159d77d1fc409ed249906acb68022e
-SIZE (eclipse/eclipse.pde.build-R4_12.tar.xz) = 868404
-SHA256 (eclipse/eclipse.pde.ui-R4_12.tar.xz) = cd075169014eaa1869c961bd1d5142289963639cbc7ba6d77807f94db660bea0
-SIZE (eclipse/eclipse.pde.ui-R4_12.tar.xz) = 29767800
-SHA256 (eclipse/eclipse.platform-R4_12.tar.xz) = ddf3a506a37cf8d9a3710075b3317e672e6be3c7b862d4040fdfbec79dd4ea8e
-SIZE (eclipse/eclipse.platform-R4_12.tar.xz) = 1371240
-SHA256 (eclipse/eclipse.platform.common-R4_12.tar.xz) = 135bae9bde971e0d554baef0f7d5490856d328872aba4cbd6f4de6dd9ec45716
-SIZE (eclipse/eclipse.platform.common-R4_12.tar.xz) = 34509332
-SHA256 (eclipse/eclipse.platform.debug-R4_12.tar.xz) = 73794b36665ff3d5e91a9192580b0d13adf7465c84ecb348968ca1b442102b7e
-SIZE (eclipse/eclipse.platform.debug-R4_12.tar.xz) = 1372736
-SHA256 (eclipse/eclipse.platform.releng-R4_12.tar.xz) = b881cdf06b04a8b540a4eb78284f6bdbf0dc6609558a4ab47ab985f0b806bece
-SIZE (eclipse/eclipse.platform.releng-R4_12.tar.xz) = 410360
-SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_12.tar.xz) = c7fe65208ca7e534305ea02b9121af7f1610aeb06d2699ccadd1df7aa0326d65
-SIZE (eclipse/eclipse.platform.releng.aggregator-R4_12.tar.xz) = 693384
-SHA256 (eclipse/eclipse.platform.resources-R4_12.tar.xz) = 5f52c24383d93097e4afbe4e7bd6219a503d3fb53d5753bef1e6788459f81790
-SIZE (eclipse/eclipse.platform.resources-R4_12.tar.xz) = 856912
-SHA256 (eclipse/eclipse.platform.runtime-R4_12.tar.xz) = 249076673934470080f0978561f88bce094e0c5d020e9e310925f8cd0a0d79ee
-SIZE (eclipse/eclipse.platform.runtime-R4_12.tar.xz) = 432824
-SHA256 (eclipse/eclipse.platform.swt-R4_12.tar.xz) = e32661c3d7d1593fb38a3d0c19d015cf0e257cd25c80c74acbd95e2c5e7c0a29
-SIZE (eclipse/eclipse.platform.swt-R4_12.tar.xz) = 3526948
-SHA256 (eclipse/eclipse.platform.swt.binaries-R4_12.tar.xz) = 29959c650f57cc6fa93f301a3d4a3e4648ecfeeedcb9ad665f7bb35672f44d5d
-SIZE (eclipse/eclipse.platform.swt.binaries-R4_12.tar.xz) = 579236
-SHA256 (eclipse/eclipse.platform.team-R4_12.tar.xz) = a4dae95b11dcdfec3f7481582be72ce5145e91096d6f2b654958a0afea601bab
-SIZE (eclipse/eclipse.platform.team-R4_12.tar.xz) = 4633400
-SHA256 (eclipse/eclipse.platform.text-R4_12.tar.xz) = 5ce41cb1f01f4fd1960f6f12e8e4e78dd8140b45657ac911be8deedfc6ce9953
-SIZE (eclipse/eclipse.platform.text-R4_12.tar.xz) = 1248060
-SHA256 (eclipse/eclipse.platform.ua-R4_12.tar.xz) = 28a705e7ea2a0bb9739bfba031373215601c61e75f7d99e0635b5f08f30f8d98
-SIZE (eclipse/eclipse.platform.ua-R4_12.tar.xz) = 4510416
-SHA256 (eclipse/eclipse.platform.ui-R4_12.tar.xz) = dbd4e45afe474d149cc5a5bfd767a68caa3a24fe106004a55fca18e412a7f92a
-SIZE (eclipse/eclipse.platform.ui-R4_12.tar.xz) = 5937024
-SHA256 (eclipse/eclipse.platform.ui.tools-R4_12.tar.xz) = 610cfc9ac0e57114ddd6985a5a1ce0179f54397d2a2295de29166ece08af2daf
-SIZE (eclipse/eclipse.platform.ui.tools-R4_12.tar.xz) = 318476
-SHA256 (eclipse/rt.equinox.binaries-R4_12.tar.xz) = b439a66d4a28aad2bb4ea6ae5adddf39a95c9d1c348923c258f42c683f1ffb7f
-SIZE (eclipse/rt.equinox.binaries-R4_12.tar.xz) = 624016
-SHA256 (eclipse/rt.equinox.bundles-R4_12.tar.xz) = 4e0a2c72e0f459231fc51607b03598274902e04b308d3028ba9d30b57cb8a81d
-SIZE (eclipse/rt.equinox.bundles-R4_12.tar.xz) = 1141852
-SHA256 (eclipse/rt.equinox.framework-R4_12.tar.xz) = 8d154acf89d503cdd6ee8a83854a4a69d14f15430089a71f80bcb3a603d32b55
-SIZE (eclipse/rt.equinox.framework-R4_12.tar.xz) = 2813400
-SHA256 (eclipse/rt.equinox.p2-R4_12.tar.xz) = c3972cb745756fbea87ca0098803c538d1fc300637bbc1062fe359f0ca72dbc8
-SIZE (eclipse/rt.equinox.p2-R4_12.tar.xz) = 48502480
-SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.12_GH0.tar.gz) = 43093df29b4ecbbabe8806ca24f1dcc4fa53b2b0d85a59d2664fc8f3fe8d8e90
-SIZE (eclipse/daemonblade-eclipse-maven-repo-4.12_GH0.tar.gz) = 182037029
+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
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse-platform-parent ./files/patch-eclipse-platform-parent
--- /usr/ports/java/eclipse/files/patch-eclipse-platform-parent	2019-12-19 22:41:45.036765000 +1300
+++ ./files/patch-eclipse-platform-parent	2020-01-01 13:14:57.433385000 +1300
@@ -5,24 +5,15 @@
        'eclipiserun-repo' repository, such as for computing .api-descriptions and
        generating API Tools reports.
      -->
--    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.12-I-builds/</eclipserun-repo>
-+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.12/</eclipserun-repo>
+-    <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>
      
--    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.12-I-builds</comparator.repo>
-+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.12</comparator.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>
  
      <!--
        NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
-@@ -100,7 +100,7 @@
-       it).
-       And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable.
-     -->
--    <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646</emf-repo.url>
-+    <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/release/2.18</emf-repo.url>
- 
-     <ecf-repo.url>https://download.eclipse.org/rt/ecf/3.14.5/site.p2/</ecf-repo.url>
- 
-@@ -262,14 +262,14 @@
+@@ -263,14 +263,14 @@
            </target>
            <environments>
              <environment>
@@ -41,12 +32,12 @@
              </environment>
              <environment>
                <os>win32</os>
-@@ -657,7 +657,7 @@
+@@ -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.12-I-builds</eclipse-p2-repo.url>
-+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.12</eclipse-p2-repo.url>
+-        <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>
        </properties>
        <repositories>
          <repository>
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.pde.ui ./files/patch-eclipse.pde.ui
--- /usr/ports/java/eclipse/files/patch-eclipse.pde.ui	2019-11-24 14:49:58.526835000 +1300
+++ ./files/patch-eclipse.pde.ui	2020-01-01 13:14:57.925154000 +1300
@@ -1,7 +1,7 @@
 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
-@@ -80,8 +80,8 @@
+@@ -81,8 +81,8 @@
        <plugin id="org.eclipse.osgi.util"/>
        <plugin id="org.eclipse.swt"/>
        <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.releng ./files/patch-eclipse.platform.releng
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.releng	2019-11-24 14:49:58.526927000 +1300
+++ ./files/patch-eclipse.platform.releng	2020-01-01 13:14:57.946294000 +1300
@@ -14,7 +14,7 @@
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -348,9 +348,9 @@
+@@ -355,9 +355,9 @@
           unpack="false"/>
  
     <plugin
@@ -27,7 +27,7 @@
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -387,9 +387,9 @@
+@@ -394,9 +394,9 @@
           unpack="false"/>
  
     <plugin
@@ -40,7 +40,7 @@
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -451,9 +451,9 @@
+@@ -458,9 +458,9 @@
           unpack="false"/>
  
     <plugin
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk ./files/patch-eclipse.platform.releng.prereqs.sdk
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk	2019-11-24 14:49:58.526990000 +1300
+++ ./files/patch-eclipse.platform.releng.prereqs.sdk	1970-01-01 12:00:00.000000000 +1200
@@ -1,12 +0,0 @@
-diff -ru eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
---- eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target	0000-00-00 00:00:00.000000000 +0000
-@@ -167,7 +167,7 @@
-       <unit id="org.eclipse.emf.edit" version="2.15.0.v20190528-0725"/>
-       <unit id="org.eclipse.emf.databinding" version="1.5.0.v20180706-1146"/>
-       <unit id="org.eclipse.emf.databinding.edit" version="1.6.0.v20190323-1031"/>
--      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646"/>
-+      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.18"/>
-     </location>
- 
-     <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder ./files/patch-eclipse.platform.releng.tychoeclipsebuilder
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder	2019-11-24 14:49:58.527183000 +1300
+++ ./files/patch-eclipse.platform.releng.tychoeclipsebuilder	2020-01-01 13:14:57.965864000 +1300
@@ -8,9 +8,9 @@
 -      value="eclipse-platform-${eclispeBaseLabel}-linux-gtk-x86_64.tar.gz" />
 +      value="eclipse-platform-${eclispeBaseLabel}-freebsd-gtk-amd64.tar.gz" />
  
-     <!--
-       mavenproperties.properties is produced during the build and contains
-@@ -334,4 +334,4 @@
+      <!-- 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>
  
@@ -98,23 +98,23 @@
  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.11-linux-gtk-x86_64.tar.gz
-+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.11-freebsd-gtk-amd64.tar.gz
- org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.11-win32-x86_64.zip
- org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.11-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
  
 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
-@@ -8,9 +8,9 @@
+@@ -7,9 +7,9 @@
  
+ 
  mkdir -p workarea/${buildId}/eclipse-testing
- #cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-SDK-4.11-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
--cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-platform-4.11-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
-+cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-platform-4.11-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+-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 ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/
-+cp ../../eclipse-SDK-${buildId}-freebsd-gtk-amd64.tar.gz workarea/${buildId}/eclipse-testing/
+-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 eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
  
@@ -142,8 +142,8 @@
 -      <linux icon="icon.xpm"/>
 +      <freebsd icon="icon.xpm"/>
        <macosx icon="rt.icns"/>
-       <win useIco="true">
-          <ico path="rt.ico"/>
+       <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
@@ -178,8 +178,8 @@
 -      <linux icon="icons/icon.xpm"/>
 +      <freebsd icon="icons/icon.xpm"/>
        <macosx icon="icons/Eclipse.icns"/>
-       <win useIco="true">
-          <ico path="icons/eclipse.ico"/>
+       <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
@@ -202,8 +202,8 @@
 -      <linux icon="icons/icon.xpm"/>
 +      <freebsd icon="icons/icon.xpm"/>
        <macosx icon="icons/Eclipse.icns"/>
-       <win useIco="true">
-          <ico path="icons/eclipse.ico"/>
+       <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
@@ -227,8 +227,8 @@
 -      <linux icon="icons/icon.xpm"/>
 +      <freebsd icon="icons/icon.xpm"/>
        <macosx icon="icons/Eclipse.icns"/>
-       <win useIco="true">
-          <ico path="icons/eclipse.ico"/>
+       <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
@@ -258,8 +258,8 @@
 -      <linux icon="icons/icon.xpm"/>
 +      <freebsd icon="icons/icon.xpm"/>
        <macosx icon="icons/Eclipse.icns"/>
-       <win useIco="true">
-          <ico path="icons/eclipse.ico"/>
+       <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
@@ -282,5 +282,5 @@
 -      <linux icon="icons/icon.xpm"/>
 +      <freebsd icon="icons/icon.xpm"/>
        <macosx icon="icons/Eclipse.icns"/>
-       <win useIco="true">
-          <ico path="icons/eclipse.ico"/>
+       <win useIco="false">
+          <bmp/>
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.resources ./files/patch-eclipse.platform.resources
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.resources	2019-11-24 14:49:58.527335000 +1300
+++ ./files/patch-eclipse.platform.resources	2020-01-01 13:14:58.008729000 +1300
@@ -67,7 +67,7 @@
    <version>1.2.300-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
-@@ -33,9 +33,9 @@
+@@ -37,9 +37,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
@@ -79,7 +79,7 @@
              </environment>
            </environments>
          </configuration>
-@@ -50,7 +50,7 @@
+@@ -54,7 +54,7 @@
          <property>
            <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
            <name>native</name>
@@ -88,7 +88,7 @@
          </property>
        </activation>
        <build>
-@@ -63,10 +63,10 @@
+@@ -67,10 +67,10 @@
                  <phase>process-resources</phase>
                  <configuration>
                    <target>
@@ -103,67 +103,6 @@
                 <include name="libunixfile_*.so"/>
             </fileset>
             </copy>
-diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF
---- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/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; singleton:=true
-+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.i386; singleton:=true
- Bundle-Version: 1.4.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))
-+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=i386))
-diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml
---- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/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</artifactId>
-+  <artifactId>org.eclipse.core.filesystem.freebsd.i386</artifactId>
-   <version>1.4.300-SNAPSHOT</version>
-   <packaging>eclipse-plugin</packaging>
- 
-@@ -33,9 +33,9 @@
-           <resolver>p2</resolver>
-           <environments>
-             <environment>
--              <os>linux</os>
-+              <os>freebsd</os>
-               <ws>gtk</ws>
--              <arch>x86</arch>
-+              <arch>i386</arch>
-             </environment>
-           </environments>
-         </configuration>
-@@ -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</value>
-+          <value>gtk.freebsd.i386</value>
-         </property>
-       </activation>
-       <build>
-@@ -63,9 +63,9 @@
-                 <phase>process-resources</phase>
-                 <configuration>
-                   <target>
--                    <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
--           <copy todir="os/linux/x86">
--           <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
-+                    <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"/>
-+           <copy todir="os/freebsd/i386">
-+           <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
@@ -191,7 +130,7 @@
    <version>1.4.100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
-@@ -33,9 +33,9 @@
+@@ -37,9 +37,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.runtime ./files/patch-eclipse.platform.runtime
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.runtime	2019-11-24 14:49:58.527396000 +1300
+++ ./files/patch-eclipse.platform.runtime	2020-01-01 13:14:58.049223000 +1300
@@ -13,7 +13,7 @@
 diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
 --- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	0000-00-00 00:00:00.000000000 +0000
-@@ -207,6 +207,8 @@
+@@ -208,6 +208,8 @@
  	 */
  	public static final String OS_LINUX = "linux";//$NON-NLS-1$
  
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.swt ./files/patch-eclipse.platform.swt
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.swt	2019-11-24 14:49:58.527566000 +1300
+++ ./files/patch-eclipse.platform.swt	2020-01-01 13:14:58.193362000 +1300
@@ -10,6 +10,18 @@
  		</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
@@ -148,7 +160,7 @@
 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
-@@ -58,8 +58,8 @@
+@@ -60,8 +60,8 @@
  
  		/* Initialize the OS flags and locale constants */
  		String osName = System.getProperty ("os.name");
@@ -162,7 +174,7 @@
 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
-@@ -155,7 +155,7 @@
+@@ -157,7 +157,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
  	 */
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.swt.binaries ./files/patch-eclipse.platform.swt.binaries
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.swt.binaries	2019-11-24 14:49:58.527682000 +1300
+++ ./files/patch-eclipse.platform.swt.binaries	2020-01-01 13:14:58.206933000 +1300
@@ -83,7 +83,7 @@
  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.111.0.qualifier
+ Bundle-Version: 3.113.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
 @@ -26,8 +26,8 @@
@@ -141,7 +141,7 @@
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
-   <version>3.111.0-SNAPSHOT</version>
+   <version>3.113.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -171,7 +171,7 @@
  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.111.0.qualifier
+ Bundle-Version: 3.113.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
 @@ -26,8 +26,8 @@
@@ -212,7 +212,7 @@
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>
-   <version>3.111.0-SNAPSHOT</version>
+   <version>3.113.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.team ./files/patch-eclipse.platform.team
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.team	2019-11-24 14:49:58.527789000 +1300
+++ ./files/patch-eclipse.platform.team	2020-01-01 13:14:58.320798000 +1300
@@ -68,7 +68,7 @@
  Bundle-Localization: fragment
 -Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true
 +Bundle-SymbolicName: org.eclipse.core.net.freebsd.amd64;singleton:=true
- Bundle-Version: 1.2.300.qualifier
+ Bundle-Version: 1.2.400.qualifier
  Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
 -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64))
@@ -84,10 +84,10 @@
    <groupId>org.eclipse.core</groupId>
 -  <artifactId>org.eclipse.core.net.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.core.net.freebsd.amd64</artifactId>
-   <version>1.2.300-SNAPSHOT</version>
+   <version>1.2.400-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
-@@ -30,9 +30,9 @@
+@@ -34,9 +34,9 @@
          <configuration>
            <environments>
              <environment>
@@ -99,7 +99,7 @@
              </environment>
            </environments>
          </configuration>
-@@ -47,7 +47,7 @@
+@@ -51,7 +51,7 @@
          <property>
            <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
            <name>native</name>
@@ -108,7 +108,7 @@
          </property>
        </activation>
        <build>
-@@ -60,9 +60,9 @@
+@@ -64,9 +64,9 @@
                  <phase>process-resources</phase>
                  <configuration>
                    <target>
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.text ./files/patch-eclipse.platform.text
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.text	1970-01-01 12:00:00.000000000 +1200
+++ ./files/patch-eclipse.platform.text	2020-01-01 13:14:58.399357000 +1300
@@ -0,0 +1,12 @@
+diff -ru eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml
+--- eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -1298,7 +1298,7 @@
+             %blockSelectionModeFont.description
+          </description>
+          <fontValue
+-               os="linux"
++               os="freebsd"
+                value="Monospace-regular-10"
+                ws="gtk">
+          </fontValue>
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.ua ./files/patch-eclipse.platform.ua
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.ua	2019-11-24 14:49:58.527912000 +1300
+++ ./files/patch-eclipse.platform.ua	2020-01-01 13:14:58.506458000 +1300
@@ -35,15 +35,15 @@
  			prefs
  					.put("custom_browser_path", //$NON-NLS-1$
  							"\"C:\\Program Files\\Internet Explorer\\IEXPLORE.EXE\" %1"); //$NON-NLS-1$
--		} else if (os.indexOf("linux") != -1) { //$NON-NLS-1$
-+		} else if (os.indexOf("linux") != -1 || os.indexOf("freebsd") != -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
-@@ -103,6 +103,7 @@
+@@ -102,6 +102,7 @@
  				setDefaultBrowserID(BROWSER_ID_SYSTEM);
  			} else if (Constants.OS_AIX.equalsIgnoreCase(os)
  					|| (Constants.OS_HPUX.equalsIgnoreCase(os))
diff -ruN /usr/ports/java/eclipse/files/patch-eclipse.platform.ui ./files/patch-eclipse.platform.ui
--- /usr/ports/java/eclipse/files/patch-eclipse.platform.ui	2019-11-24 14:49:58.528033000 +1300
+++ ./files/patch-eclipse.platform.ui	2020-01-01 13:14:58.874886000 +1300
@@ -1,7 +1,7 @@
 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
-@@ -32,9 +32,9 @@
+@@ -37,9 +37,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
@@ -81,32 +81,24 @@
 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,6 +12,12 @@
-         basestylesheeturi="css/e4-dark.css"
+@@ -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.css"
-+        id="org.eclipse.e4.ui.css.theme.e4_dark"
-+        label="%theme.dark"
-         os="linux">
      </theme>
      <theme
-@@ -34,6 +40,12 @@
-         os="macosx"
-         os_version="10.14">
-     </theme>
-+      <theme
-+            basestylesheeturi="css/e4_default_gtk.css"
-+            id="org.eclipse.e4.ui.css.theme.e4_default"
-+            label="%theme.gtk"
-+            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
diff -ruN /usr/ports/java/eclipse/files/patch-rt.equinox.bundles ./files/patch-rt.equinox.bundles
--- /usr/ports/java/eclipse/files/patch-rt.equinox.bundles	2019-11-24 14:49:58.528167000 +1300
+++ ./files/patch-rt.equinox.bundles	2020-01-01 13:14:58.999839000 +1300
@@ -30,7 +30,7 @@
  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.200.qualifier
+ 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
@@ -49,24 +49,20 @@
  LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1`
  LIBSECRET_LIBS = `pkg-config --libs libsecret-1`
  
--CFLAGS = -shared -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux"
-+CFLAGS = -shared -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/freebsd"
+-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
- 
-@@ -9,10 +9,10 @@
+@@ -10,7 +10,7 @@
  	rm ../libkeystorelinuxnative.so ../target/keystoreLinuxNative.o
- 	
+ 
  ../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o
--	$(CC) $(CFLAGS) -o $@ $< $(LIBSECRET_LIBS)
-+	$(CC) $(CFLAGS) -s -o $@ $< $(LIBSECRET_LIBS)
- 	
- ../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c
--	$(CC) -c -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -o $@ $(TESTFLAGS) $(LIBSECRET_CFLAGS) keystoreLinuxNative.c
-+	$(CC) -c -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/freebsd" -o $@ $(TESTFLAGS) $(LIBSECRET_CFLAGS) keystoreLinuxNative.c
+-	$(CC) $(LDFLAGS) -o $@ $<
++	$(CC) $(LDFLAGS) -s -o $@ $<
  
- ../target: 
- 	mkdir -p ../target
+ ../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
@@ -76,10 +72,10 @@
    <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.200-SNAPSHOT</version>
+   <version>1.1.300-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
-@@ -31,9 +31,9 @@
+@@ -35,9 +35,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
@@ -91,7 +87,7 @@
              </environment>
            </environments>
          </configuration>
-@@ -47,7 +47,7 @@
+@@ -51,7 +51,7 @@
          <property>
            <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
            <name>native</name>
@@ -100,7 +96,7 @@
          </property>
        </activation>
        <build>
-@@ -60,7 +60,7 @@
+@@ -64,7 +64,7 @@
                  <phase>process-resources</phase>
                  <configuration>
                    <target>
@@ -166,7 +162,7 @@
 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
-@@ -90,7 +90,7 @@
+@@ -89,7 +89,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>
diff -ruN /usr/ports/java/eclipse/files/patch-rt.equinox.framework ./files/patch-rt.equinox.framework
--- /usr/ports/java/eclipse/files/patch-rt.equinox.framework	2019-11-24 14:49:58.528317000 +1300
+++ ./files/patch-rt.equinox.framework	2020-01-01 13:14:59.102175000 +1300
@@ -7,7 +7,7 @@
  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.1000.qualifier
+ Bundle-Version: 1.1.1100.qualifier
  Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
 -Bundle-Localization: launcher.gtk.linux.aarch64
@@ -23,7 +23,7 @@
    <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.1000-SNAPSHOT</version>
+   <version>1.1.1100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -31,7 +31,7 @@
 +    <os>freebsd</os>
      <ws>gtk</ws>
      <arch>aarch64</arch>
-   </properties>
+     <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
@@ -52,7 +52,7 @@
  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.1000.qualifier
+ Bundle-Version: 1.1.1100.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
@@ -72,13 +72,13 @@
 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,13 +18,13 @@
+@@ -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.1000-SNAPSHOT</version>
+   <version>1.1.1100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -87,90 +87,9 @@
      <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.armv7/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/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.arm;singleton:=true
-+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.armv7;singleton:=true
- Bundle-Version: 1.1.1000.qualifier
- Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)"
--Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm))
--Bundle-Localization: launcher.gtk.linux.arm
-+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=armv7))
-+Bundle-Localization: launcher.gtk.freebsd.armv7
- Eclipse-BundleShape: dir
-diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -18,13 +18,13 @@
-     <relativePath>../../launcher-binary-parent</relativePath>
-   </parent>
-   <groupId>org.eclipse.equinox</groupId>
--  <artifactId>org.eclipse.equinox.launcher.gtk.linux.arm</artifactId>
-+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.armv7</artifactId>
-   <version>1.1.1000-SNAPSHOT</version>
-   <packaging>eclipse-plugin</packaging>
- 
-   <properties>
--    <os>linux</os>
-+    <os>freebsd</os>
-     <ws>gtk</ws>
--    <arch>arm</arch>
-+    <arch>armv7</arch>
-   </properties>
- </project>
-diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/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;singleton:=true
-+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.i386;singleton:=true
- Bundle-Version: 1.1.1000.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))
--Bundle-Localization: launcher.gtk.linux.x86
-+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=i386))
-+Bundle-Localization: launcher.gtk.freebsd.i386
- Eclipse-BundleShape: dir
-diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.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 Fragment
-+pluginName = Equinox Launcher FreeBSD/i386 Fragment
- providerName = Eclipse.org - Equinox
-diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -18,13 +18,13 @@
-     <relativePath>../../launcher-binary-parent</relativePath>
-   </parent>
-   <groupId>org.eclipse.equinox</groupId>
--  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
-+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.i386</artifactId>
-   <version>1.1.1000-SNAPSHOT</version>
-   <packaging>eclipse-plugin</packaging>
- 
-   <properties>
--    <os>linux</os>
-+    <os>freebsd</os>
-     <ws>gtk</ws>
--    <arch>x86</arch>
-+    <arch>i386</arch>
-   </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
@@ -191,7 +110,7 @@
  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.1000.qualifier
+ Bundle-Version: 1.1.1100.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
@@ -201,13 +120,13 @@
 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,13 +18,13 @@
+@@ -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.1000-SNAPSHOT</version>
+   <version>1.1.1100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -216,65 +135,9 @@
      <ws>gtk</ws>
 -    <arch>ppc64le</arch>
 +    <arch>powerpc64</arch>
+     <skipAPIAnalysis>true</skipAPIAnalysis>
    </properties>
  </project>
-diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
---- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java	0000-00-00 00:00:00.000000000 +0000
-@@ -78,6 +78,7 @@
- 	// this internally to be Solaris.
- 	private static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$
- 	private static final String INTERNAL_OS_LINUX = "Linux"; //$NON-NLS-1$
-+	private static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$
- 	private static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$
- 	private static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$
- 	private static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$
-@@ -746,7 +747,7 @@
- 		// setup default values for known OSes if nothing was specified
- 		if (osName.equals(Constants.OS_WIN32))
- 			return Constants.WS_WIN32;
--		if (osName.equals(Constants.OS_LINUX))
-+		if (osName.equals(Constants.OS_LINUX) || osName.equals(Constants.OS_FREEBSD))
- 			return Constants.WS_GTK;
- 		if (osName.equals(Constants.OS_MACOSX))
- 			return Constants.WS_COCOA;
-@@ -769,6 +770,8 @@
- 		// EXCEPTION: All mappings of SunOS convert to Solaris
- 		if (osName.equalsIgnoreCase(INTERNAL_OS_SUNOS))
- 			return Constants.OS_SOLARIS;
-+		if (osName.equalsIgnoreCase(INTERNAL_OS_FREEBSD))
-+			return Constants.OS_FREEBSD;
- 		if (osName.equalsIgnoreCase(INTERNAL_OS_LINUX))
- 			return Constants.OS_LINUX;
- 		if (osName.equalsIgnoreCase(INTERNAL_OS_QNX))
-diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java
---- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java	0000-00-00 00:00:00.000000000 +0000
-@@ -80,7 +80,7 @@
- 
- 		if ("iw".equals(lang) || "he".equals(lang) || "ar".equals(lang) || "fa".equals(lang) || "ur".equals(lang)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- 			String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
--			if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac")) { //$NON-NLS-1$	//$NON-NLS-2$ //$NON-NLS-3$
-+			if (osName.startsWith("freebsd") || osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac")) { //$NON-NLS-1$	//$NON-NLS-2$ //$NON-NLS-3$
- 				IS_PROCESSING_NEEDED = true;
- 			}
- 		}
-diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
---- rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java	0000-00-00 00:00:00.000000000 +0000
-+++ rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java	0000-00-00 00:00:00.000000000 +0000
-@@ -26,6 +26,12 @@
- 	//TODO These constants need to be aligned with the OSGi ones. See page 64-588 of the spec
- 
- 	/**
-+	 * Constant string (value "freebsd") indicating the platform is running on a
-+	 * FreeBSD-based operating system.
-+	 */
-+	public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$
-+
-+	/**
- 	 * Constant string (value "win32") indicating the platform is running on a
- 	 * Window 32-bit operating system (e.g., Windows 98, NT, 2000).
- 	 */
 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
@@ -297,7 +160,7 @@
 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
-@@ -32,20 +32,20 @@
+@@ -33,20 +33,20 @@
           fragment="true"/>
  
     <plugin
@@ -327,7 +190,7 @@
 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
-@@ -126,8 +126,13 @@
+@@ -112,8 +112,13 @@
  				;;
  		esac
  		;;
@@ -342,19 +205,8 @@
  	;;
  esac
  export CC
-@@ -149,7 +154,9 @@
- 	export JAVA_HOME
- fi
+@@ -146,19 +151,20 @@
  
--if [ $defaultOSArch = "ppc64le" ];  then
-+if [ $defaultOSArch = "amd64" ];  then
-+	export M_ARCH=-m64
-+elif [ $defaultOSArch = "ppc64le" ];  then
- 	M_ARCH=-m64
- 	export M_ARCH
- elif [ "$defaultOSArch" = "s390" ];  then
-@@ -169,19 +176,20 @@
- 
  LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
  OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
 +mkdir -p ${OUTPUT_DIR}
@@ -381,7 +233,7 @@
 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
-@@ -91,10 +91,11 @@
+@@ -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\""
@@ -396,7 +248,7 @@
  	-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
  	-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
  	-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
-@@ -102,7 +103,8 @@
+@@ -92,7 +93,8 @@
  	$(GTK_LIBS) \
  	-I. \
  	-I.. \
@@ -406,7 +258,7 @@
  	`pkg-config --cflags gtk+-3.0`
  
  all: $(EXEC) $(DLL)
-@@ -140,11 +142,11 @@
+@@ -130,11 +132,11 @@
  
  $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
  	$(info Linking and generating: $(EXEC))
@@ -457,29 +309,10 @@
 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
-@@ -118,13 +118,13 @@
+@@ -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_x86">
--		<mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}"/>
--		<copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true">
--			<fileset dir="${basedir}/bin/gtk/linux/x86" includes="**"			/>
-+	<target name="rootFilesfreebsd_gtk_i386">
-+		<mkdir dir="${feature.base}/freebsd.gtk.i386/${collectingFolder}"/>
-+		<copy todir="${feature.base}/freebsd.gtk.i386/${collectingFolder}" failonerror="true" overwrite="true">
-+			<fileset dir="${basedir}/bin/gtk/freebsd/i386" includes="**"			/>
- 			<fileset dir="${basedir}/gtk_root" includes="**"			/>
- 		</copy>
--		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="launcher" />
-+		<chmod perm="755" dir="${feature.base}/freebsd.gtk.i386/${collectingFolder}" includes="launcher" />
- 	</target>
- 	<target name="rootFileslinux_gtk_ppc">
- 		<mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/>
-@@ -134,37 +134,37 @@
- 		</copy>
- 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="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">
@@ -493,24 +326,11 @@
 -		<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_arm">
--		<mkdir dir="${feature.base}/linux.gtk.arm/${collectingFolder}"/>
--		<copy todir="${feature.base}/linux.gtk.arm/${collectingFolder}" failonerror="true" overwrite="true">
--			<fileset dir="${basedir}/bin/gtk/linux/arm" includes="**"			/>
-+        <target name="rootFilesfreebsd_gtk_armv7">
-+		<mkdir dir="${feature.base}/freebsd.gtk.armv7/${collectingFolder}"/>
-+		<copy todir="${feature.base}/freebsd.gtk.armv7/${collectingFolder}" failonerror="true" overwrite="true">
-+			<fileset dir="${basedir}/bin/gtk/freebsd/armv7" includes="**"			/>
- 			<fileset dir="${basedir}/gtk_root" includes="**"			/>
- 		</copy>
--		<chmod perm="755" dir="${feature.base}/linux.gtk.arm/${collectingFolder}" includes="launcher" />
-+		<chmod perm="755" dir="${feature.base}/freebsd.gtk.armv7/${collectingFolder}" includes="launcher" />
- 	</target>
--        <target name="rootFileslinux_gtk_aarch64">
+-    <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">
++    <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="**"			/>
@@ -534,15 +354,17 @@
  	</target>
  	<target name="rootFileslinux_gtk_ia64">
  		<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/>
-@@ -212,7 +212,7 @@
+@@ -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_powerpc64"/>
- 		<antcall target="rootFileslinux_gtk_x86_64"/>
+-		<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
diff -ruN /usr/ports/java/eclipse/files/patch-rt.equinox.p2 ./files/patch-rt.equinox.p2
--- /usr/ports/java/eclipse/files/patch-rt.equinox.p2	2019-11-24 14:49:58.528460000 +1300
+++ ./files/patch-rt.equinox.p2	2020-01-01 13:14:59.334822000 +1300
@@ -57,7 +57,7 @@
        <plugin id="org.eclipse.equinox.security.ui"/>
        <plugin id="org.eclipse.equinox.simpleconfigurator"/>
        <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
-@@ -134,7 +134,7 @@
+@@ -133,7 +133,7 @@
        <plugin id="org.eclipse.osgi.util"/>
        <plugin id="org.eclipse.swt"/>
        <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
diff -ruN /usr/ports/java/eclipse/scripts/pre-patch ./scripts/pre-patch
--- /usr/ports/java/eclipse/scripts/pre-patch	2019-11-24 14:49:58.530811000 +1300
+++ ./scripts/pre-patch	2019-12-31 17:27:03.928694000 +1300
@@ -46,4 +46,3 @@
 
 # Clean up binaries
 rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux
-find . -name '*.so' -delete