diff -ruN /usr/ports/java/eclipse/Makefile ./Makefile
--- /usr/ports/java/eclipse/Makefile 2019-09-18 17:07:55.051618000 +1200
+++ ./Makefile 2019-09-21 12:06:16.955921000 +1200
@@ -2,13 +2,12 @@
# $FreeBSD$
PORTNAME= eclipse
-PORTVERSION= 4.12
-PORTREVISION= 1
+PORTVERSION= 4.13
CATEGORIES= java devel
# Update to git-tag on git.eclipse.org
-ECLIPSE_TAG= R4_12
-ECLIPSE_TSTAMP= 20190617-0403
+ECLIPSE_TAG= R4_13
+ECLIPSE_TSTAMP= 20190908-2345
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-09
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} -Dcomparator.repo=${LOCAL_P2} -Declipserun-repo=${LOCAL_P2}/ -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-09-18 17:07:55.143584000 +1200
+++ ./distinfo 2019-09-21 11:54:48.573947000 +1200
@@ -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 = 1569023688
+SHA256 (eclipse/eclipse.jdt-R4_13.tar.xz) = e68d1929eb945696c12cd50106f4210a605a46a57c1e49127253530ee48b4261
+SIZE (eclipse/eclipse.jdt-R4_13.tar.xz) = 37508
+SHA256 (eclipse/eclipse.jdt.core-R4_13.tar.xz) = 41d6127baeea34eaf50d407f9aa4e10cf910a13b171281b0d8caa0a6e159f072
+SIZE (eclipse/eclipse.jdt.core-R4_13.tar.xz) = 8479784
+SHA256 (eclipse/eclipse.jdt.core.binaries-R4_13.tar.xz) = e930edf167b0170af3620ae7aefff3d1b7ac511de0021b65f6b3c5947d1aebc0
+SIZE (eclipse/eclipse.jdt.core.binaries-R4_13.tar.xz) = 34416724
+SHA256 (eclipse/eclipse.jdt.debug-R4_13.tar.xz) = 701ae772f632b846185f8c97c2cf64d5fb279d05d582703b940d940b70f297b7
+SIZE (eclipse/eclipse.jdt.debug-R4_13.tar.xz) = 1434836
+SHA256 (eclipse/eclipse.jdt.ui-R4_13.tar.xz) = 68723a5c2a84f64c40f1f3a086d15a6f824e79b9b1b9f9cca5946c7d6cef854f
+SIZE (eclipse/eclipse.jdt.ui-R4_13.tar.xz) = 14613568
+SHA256 (eclipse/eclipse.pde.build-R4_13.tar.xz) = 10918ef4c5ad21d2c872b27774e6f3ea0221dbc1d951a35d7ef71f3774768162
+SIZE (eclipse/eclipse.pde.build-R4_13.tar.xz) = 868664
+SHA256 (eclipse/eclipse.pde.ui-R4_13.tar.xz) = 2dca727a9469893c59add9d949b988d6ba933009d487028e961b84112f20f8a7
+SIZE (eclipse/eclipse.pde.ui-R4_13.tar.xz) = 29833816
+SHA256 (eclipse/eclipse.platform-R4_13.tar.xz) = ae85e3190daec8f7ebf3b1db8026eb0a53e0fc86dbf5c7997b91a43c90a317f7
+SIZE (eclipse/eclipse.platform-R4_13.tar.xz) = 1370960
+SHA256 (eclipse/eclipse.platform.common-R4_13.tar.xz) = a3434a1412448d2c0af92e33b5df2fd40b7dfb195f122e209dfb0d5fc72f1cda
+SIZE (eclipse/eclipse.platform.common-R4_13.tar.xz) = 36277272
+SHA256 (eclipse/eclipse.platform.debug-R4_13.tar.xz) = 448ce89b26b0ed5fcdacf945951fc836ab9a421d0fe10e188fdeccf28ee50e30
+SIZE (eclipse/eclipse.platform.debug-R4_13.tar.xz) = 1356036
+SHA256 (eclipse/eclipse.platform.releng-R4_13.tar.xz) = e190780ad2bab7ab80bc062cc8ed9d2d0830349670552e581f3f643ebd7c8027
+SIZE (eclipse/eclipse.platform.releng-R4_13.tar.xz) = 410608
+SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_13.tar.xz) = 3ce8c942f339e9248edab9c983da06938462a62cb2ff093ede1b588c633c5ad7
+SIZE (eclipse/eclipse.platform.releng.aggregator-R4_13.tar.xz) = 688764
+SHA256 (eclipse/eclipse.platform.resources-R4_13.tar.xz) = 1f74ae4452c797a612cf30c0577d79f42b4d451a4fbaabc36b3b407ff3ab11e3
+SIZE (eclipse/eclipse.platform.resources-R4_13.tar.xz) = 819092
+SHA256 (eclipse/eclipse.platform.runtime-R4_13.tar.xz) = 455158f9a32e0f026b81ea8c8aa99f1c7eb98b845aad9d4478c7cedead23c155
+SIZE (eclipse/eclipse.platform.runtime-R4_13.tar.xz) = 434852
+SHA256 (eclipse/eclipse.platform.swt-R4_13.tar.xz) = 37b08ac37b3ca64fdf6637a3de6f737696cb367462997a10dedf26c0037e7614
+SIZE (eclipse/eclipse.platform.swt-R4_13.tar.xz) = 6100732
+SHA256 (eclipse/eclipse.platform.swt.binaries-R4_13.tar.xz) = 6c770190a67075792236f12243010476f2e86fa2969ae9e94a5a9f67c2252cdf
+SIZE (eclipse/eclipse.platform.swt.binaries-R4_13.tar.xz) = 599884
+SHA256 (eclipse/eclipse.platform.team-R4_13.tar.xz) = 540d6cd0fe05dbca4a1d397f914a3a7cc4108bf56e0d92d2a4f2161879fbd088
+SIZE (eclipse/eclipse.platform.team-R4_13.tar.xz) = 4636172
+SHA256 (eclipse/eclipse.platform.text-R4_13.tar.xz) = 1a71f72b085a7417c5c47c33239a01966fca4d9e164c0f4a36602758dc08430c
+SIZE (eclipse/eclipse.platform.text-R4_13.tar.xz) = 1290156
+SHA256 (eclipse/eclipse.platform.ua-R4_13.tar.xz) = 7c37cdd767c55abaeb6f4f85abef0e875a7e650eaf67d3b936de61f78662db66
+SIZE (eclipse/eclipse.platform.ua-R4_13.tar.xz) = 4530684
+SHA256 (eclipse/eclipse.platform.ui-R4_13.tar.xz) = bae93710b1291f1611f6122a9e6917266c3c122ebb9fa5d82a2b078731faf1bc
+SIZE (eclipse/eclipse.platform.ui-R4_13.tar.xz) = 5939952
+SHA256 (eclipse/eclipse.platform.ui.tools-R4_13.tar.xz) = 76a784adeb0a08cd3e9833e4e845faa3fc4571d2c57aee5b78f4d94b19f628f5
+SIZE (eclipse/eclipse.platform.ui.tools-R4_13.tar.xz) = 318792
+SHA256 (eclipse/rt.equinox.binaries-R4_13.tar.xz) = d5c4e1cb13b1fc13df7ac7f05f3cf7600d72ac580b0e41563322157fb7fc849f
+SIZE (eclipse/rt.equinox.binaries-R4_13.tar.xz) = 298540
+SHA256 (eclipse/rt.equinox.bundles-R4_13.tar.xz) = 6dba61f1f687ec94315bb203028df72d11c3ede3e37fe60786e8d791ca1152c2
+SIZE (eclipse/rt.equinox.bundles-R4_13.tar.xz) = 1152516
+SHA256 (eclipse/rt.equinox.framework-R4_13.tar.xz) = 5855906a8f72fb9f9c4fad469c4eed1aeea34669bc756b1fa73a55ba048d6e6c
+SIZE (eclipse/rt.equinox.framework-R4_13.tar.xz) = 2817028
+SHA256 (eclipse/rt.equinox.p2-R4_13.tar.xz) = 31e9e6d05acfac3c1e75c29c26b2709f4bad226132897791c3dac86bdb7a3435
+SIZE (eclipse/rt.equinox.p2-R4_13.tar.xz) = 48508540
+SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.13_GH0.tar.gz) = eda9570d073262a3c1f1435a85975b1f9c01b2b82cdd8b8561afcfb5bf69a18a
+SIZE (eclipse/daemonblade-eclipse-maven-repo-4.13_GH0.tar.gz) = 925519556
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-09-18 17:07:55.189577000 +1200
+++ ./files/patch-eclipse-platform-parent 2019-09-21 11:02:18.650494000 +1200
@@ -5,11 +5,11 @@
'eclipiserun-repo' repository, such as for computing .api-descriptions and
generating API Tools reports.
-->
-- https://download.eclipse.org/eclipse/updates/4.12-I-builds/
-+ https://download.eclipse.org/eclipse/updates/4.12/
+- https://download.eclipse.org/eclipse/updates/4.13-I-builds/
++ https://download.eclipse.org/eclipse/updates/4.13/
-- https://download.eclipse.org/eclipse/updates/4.12-I-builds
-+ https://download.eclipse.org/eclipse/updates/4.12
+- https://download.eclipse.org/eclipse/updates/4.13-I-builds
++ https://download.eclipse.org/eclipse/updates/4.13
-- https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646
-+ https://download.eclipse.org/modeling/emf/emf/builds/release/2.18
+- https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201907100440/
++ https://download.eclipse.org/modeling/emf/emf/builds/release/2.19/
https://download.eclipse.org/rt/ecf/3.14.5/site.p2/
-@@ -262,14 +262,14 @@
+@@ -263,14 +263,14 @@
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-09-18 17:07:55.207190000 +1200
+++ ./files/patch-eclipse.pde.ui 2019-09-10 17:11:02.326528000 +1200
@@ -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 @@
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-09-18 17:07:55.207940000 +1200
+++ ./files/patch-eclipse.platform.releng 2019-09-10 17:11:02.326591000 +1200
@@ -14,7 +14,7 @@
download-size="0"
install-size="0"
version="0.0.0"
-@@ -348,9 +348,9 @@
+@@ -355,9 +355,9 @@
unpack="false"/>
-
-
--
-+
-
-
-
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-09-18 17:07:55.208682000 +1200
+++ ./files/patch-eclipse.platform.releng.tychoeclipsebuilder 2019-09-10 17:11:02.326683000 +1200
@@ -98,20 +98,20 @@
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.12-linux-gtk-x86_64.tar.gz
++org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.12-freebsd-gtk-amd64.tar.gz
+ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.12-win32-x86_64.zip
+ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.12-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.12-201906051800/eclipse-platform-4.12-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
++cp /home/files/buildzips/oxygen/R/R-4.12-201906051800/eclipse-platform-4.12-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/
@@ -142,8 +142,8 @@
-
+
-
-
+
+
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 @@
-
+
-
-
+
+
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 @@
-
+
-
-
+
+
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 @@
-
+
-
-
+
+
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 @@
-
+
-
-
+
+
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 @@
-
+
-
-
+
+
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-09-18 17:07:55.208809000 +1200
+++ ./files/patch-eclipse.platform.resources 2019-09-10 17:11:02.326764000 +1200
@@ -67,7 +67,7 @@
1.2.300-SNAPSHOT
eclipse-plugin
-@@ -33,9 +33,9 @@
+@@ -37,9 +37,9 @@
p2
@@ -79,7 +79,7 @@
-@@ -50,7 +50,7 @@
+@@ -54,7 +54,7 @@
native
@@ -88,7 +88,7 @@
-@@ -63,10 +63,10 @@
+@@ -67,10 +67,10 @@
process-resources
@@ -103,67 +103,6 @@
-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 @@
- ../../
-
- org.eclipse.core
-- org.eclipse.core.filesystem.linux.x86
-+ org.eclipse.core.filesystem.freebsd.i386
- 1.4.300-SNAPSHOT
- eclipse-plugin
-
-@@ -33,9 +33,9 @@
- p2
-
-
-- linux
-+ freebsd
- gtk
-- x86
-+ i386
-
-
-
-@@ -50,7 +50,7 @@
-
-
- native
-- gtk.linux.x86
-+ gtk.freebsd.i386
-
-
-
-@@ -63,9 +63,9 @@
- process-resources
-
-
--
--
--
-+
-+
-+
-
-
-
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 @@
1.4.100-SNAPSHOT
eclipse-plugin
-@@ -33,9 +33,9 @@
+@@ -37,9 +37,9 @@
p2
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-09-18 17:07:55.208894000 +1200
+++ ./files/patch-eclipse.platform.runtime 2019-09-10 17:11:02.326825000 +1200
@@ -1,7 +1,7 @@
diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 0000-00-00 00:00:00.000000000 +0000
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
//XXX This is not synchronized
private Map logs = new HashMap<>(5);
@@ -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-09-18 17:07:55.209518000 +1200
+++ ./files/patch-eclipse.platform.swt 2019-09-10 17:11:02.326948000 +1200
@@ -148,7 +148,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 +162,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-09-18 17:07:55.209616000 +1200
+++ ./files/patch-eclipse.platform.swt.binaries 2019-09-10 17:11:02.327031000 +1200
@@ -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.112.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
@@ -26,8 +26,8 @@
@@ -141,7 +141,7 @@
org.eclipse.swt
- org.eclipse.swt.gtk.linux.x86_64
+ org.eclipse.swt.gtk.freebsd.amd64
- 3.111.0-SNAPSHOT
+ 3.112.0-SNAPSHOT
eclipse-plugin
@@ -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.112.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
@@ -26,8 +26,8 @@
@@ -212,7 +212,7 @@
org.eclipse.swt
- org.eclipse.swt.gtk.linux.ppc64le
+ org.eclipse.swt.gtk.freebsd.powerpc64
- 3.111.0-SNAPSHOT
+ 3.112.0-SNAPSHOT
eclipse-plugin
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-09-18 17:07:55.209699000 +1200
+++ ./files/patch-eclipse.platform.team 2019-09-10 17:11:02.327111000 +1200
@@ -87,7 +87,7 @@
1.2.300-SNAPSHOT
eclipse-plugin
-@@ -30,9 +30,9 @@
+@@ -34,9 +34,9 @@
@@ -99,7 +99,7 @@
-@@ -47,7 +47,7 @@
+@@ -51,7 +51,7 @@
native
@@ -108,7 +108,7 @@
-@@ -60,9 +60,9 @@
+@@ -64,9 +64,9 @@
process-resources
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-09-18 17:07:55.218620000 +1200
+++ ./files/patch-eclipse.platform.ua 2019-09-10 17:11:02.327173000 +1200
@@ -35,8 +35,8 @@
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 -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-09-18 17:07:55.218783000 +1200
+++ ./files/patch-eclipse.platform.ui 2019-09-10 17:11:02.327263000 +1200
@@ -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 @@
p2
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-09-18 17:07:55.218904000 +1200
+++ ./files/patch-rt.equinox.bundles 2019-09-10 17:11:02.327347000 +1200
@@ -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 @@
org.eclipse.equinox
- org.eclipse.equinox.security.linux.x86_64
+ org.eclipse.equinox.security.freebsd.amd64
- 1.1.200-SNAPSHOT
+ 1.1.300-SNAPSHOT
eclipse-plugin
-@@ -31,9 +31,9 @@
+@@ -35,9 +35,9 @@
p2
@@ -91,7 +87,7 @@
-@@ -47,7 +47,7 @@
+@@ -51,7 +51,7 @@
native
@@ -100,7 +96,7 @@
-@@ -60,7 +60,7 @@
+@@ -64,7 +64,7 @@
process-resources
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-09-18 17:07:55.219565000 +1200
+++ ./files/patch-rt.equinox.framework 2019-09-10 17:11:02.327495000 +1200
@@ -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 @@
org.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.linux.aarch64
+ org.eclipse.equinox.launcher.gtk.freebsd.aarch64
- 1.1.1000-SNAPSHOT
+ 1.1.1100-SNAPSHOT
eclipse-plugin
@@ -31,7 +31,7 @@
+ freebsd
gtk
aarch64
-
+ true
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 @@
../../launcher-binary-parent
org.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.linux.x86_64
+ org.eclipse.equinox.launcher.gtk.freebsd.amd64
- 1.1.1000-SNAPSHOT
+ 1.1.1100-SNAPSHOT
eclipse-plugin
@@ -87,6 +87,7 @@
gtk
- x86_64
+ amd64
+ true
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
@@ -98,7 +99,7 @@
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
+ 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=arm))
-Bundle-Localization: launcher.gtk.linux.arm
@@ -108,13 +109,13 @@
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 @@
+@@ -18,14 +18,14 @@
../../launcher-binary-parent
org.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.linux.arm
+ org.eclipse.equinox.launcher.gtk.freebsd.armv7
- 1.1.1000-SNAPSHOT
+ 1.1.1100-SNAPSHOT
eclipse-plugin
@@ -123,6 +124,7 @@
gtk
- arm
+ armv7
+ true
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
@@ -134,33 +136,23 @@
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
+ 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))
-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 @@
+@@ -18,14 +18,14 @@
../../launcher-binary-parent
org.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.linux.x86
+ org.eclipse.equinox.launcher.gtk.freebsd.i386
- 1.1.1000-SNAPSHOT
+ 1.1.1100-SNAPSHOT
eclipse-plugin
@@ -169,6 +161,7 @@
gtk
- x86
+ i386
+ true
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
@@ -191,7 +184,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 +194,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 @@
../../launcher-binary-parent
org.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.linux.ppc64le
+ org.eclipse.equinox.launcher.gtk.freebsd.powerpc64
- 1.1.1000-SNAPSHOT
+ 1.1.1100-SNAPSHOT
eclipse-plugin
@@ -216,65 +209,9 @@
gtk
- ppc64le
+ powerpc64
+ true
-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