Index: head/java/eclipse/Makefile =================================================================== --- head/java/eclipse/Makefile (revision 521828) +++ head/java/eclipse/Makefile (revision 521829) @@ -1,99 +1,99 @@ # Created by: Jonathan Chen # $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 \ jdt/eclipse.jdt.core \ jdt/eclipse.jdt.core.binaries \ jdt/eclipse.jdt.debug \ jdt/eclipse.jdt.ui \ pde/eclipse.pde.build \ pde/eclipse.pde.ui \ platform/eclipse.platform \ platform/eclipse.platform.common \ platform/eclipse.platform.debug \ platform/eclipse.platform.releng \ platform/eclipse.platform.releng.aggregator \ platform/eclipse.platform.resources \ platform/eclipse.platform.runtime \ platform/eclipse.platform.swt \ platform/eclipse.platform.swt.binaries \ platform/eclipse.platform.team \ platform/eclipse.platform.text \ platform/eclipse.platform.ua \ platform/eclipse.platform.ui \ platform/eclipse.platform.ui.tools \ equinox/rt.equinox.binaries \ equinox/rt.equinox.bundles \ equinox/rt.equinox.framework \ equinox/rt.equinox.p2 # Each Eclipse module has its own MASTER_SITE .for M in ${ECLIPSE_MODULES} MASTER_SITES+= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g} \ https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} DISTFILES+= ${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g} .endfor DIST_SUBDIR= ${PORTNAME} MAINTAINER= jonc@chen.org.nz -COMMENT= Eclipse IDE 2019-06 +COMMENT= Eclipse IDE 2019-12 LICENSE= EPL ONLY_FOR_ARCHS= amd64 powerpc64 BUILD_DEPENDS= git:devel/git-lite \ ${LOCALBASE}/share/java/maven/bin/mvn:devel/maven LIB_DEPENDS= libsecret-1.so:security/libsecret \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 USES= compiler:c++11-lang gmake pkgconfig gnome USE_GNOME= gtk30 USE_GITHUB= yes GH_ACCOUNT= daemonblade GH_PROJECT= eclipse-maven-repo USE_JAVA= 8 DESKTOP_ENTRIES="Eclipse" \ "${COMMENT}" \ "${PORTNAME}" \ "${PORTNAME}" \ "Development;IDE;Java;" \ "false" SUB_FILES= ${PORTNAME} +#LOCAL_P2= file://${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/${PORTVERSION} MAVEN_ENV= MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME} MAVEN_REPO= -Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION} -MAVEN_ECLIPSE= -Dnative=gtk.freebsd.${ARCH} -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 # Let's abuse this to get to the right place. WRKSRC_SUBDIR= ../eclipse.platform.releng.aggregator-${ECLIPSE_TAG} do-build: cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_REPO} ${MAVEN_ECLIPSE} -DskipTests clean verify do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${TAR} -x --directory ${STAGEDIR}${DATADIR}/.. --file ${WRKSRC}/${ECLIPSE_RESULT} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin # generate dynamic plist, to cater for different ARCHS post-install: cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST} cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d | ${SED} -e 's,^,@dir ,' >> ${TMPPLIST} .include Index: head/java/eclipse/distinfo =================================================================== --- head/java/eclipse/distinfo (revision 521828) +++ head/java/eclipse/distinfo (revision 521829) @@ -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 Index: head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk (revision 521828) +++ head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk (nonexistent) @@ -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 @@ - - - -- -+ - - - Property changes on: head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse-platform-parent =================================================================== --- head/java/eclipse/files/patch-eclipse-platform-parent (revision 521828) +++ head/java/eclipse/files/patch-eclipse-platform-parent (revision 521829) @@ -1,52 +1,43 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml --- eclipse-platform-parent/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse-platform-parent/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -89,9 +89,9 @@ 'eclipiserun-repo' repository, such as for computing .api-descriptions and generating API Tools reports. --> -- 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.14-I-builds/ ++ https://download.eclipse.org/eclipse/updates/4.14/ -- 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.14-I-builds ++ https://download.eclipse.org/eclipse/updates/4.14 -- 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/rt/ecf/3.14.5/site.p2/ - -@@ -262,14 +262,14 @@ +@@ -263,14 +263,14 @@ - linux + freebsd gtk - x86_64 + amd64 - linux + freebsd gtk - ppc64le + powerpc64 win32 -@@ -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. --> -- 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.14-I-builds ++ https://download.eclipse.org/eclipse/updates/4.14 Index: head/java/eclipse/files/patch-eclipse.pde.ui =================================================================== --- head/java/eclipse/files/patch-eclipse.pde.ui (revision 521828) +++ head/java/eclipse/files/patch-eclipse.pde.ui (revision 521829) @@ -1,14 +1,14 @@ diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product --- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 -@@ -80,8 +80,8 @@ +@@ -81,8 +81,8 @@ - - + + Index: head/java/eclipse/files/patch-eclipse.platform.releng =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.releng (revision 521828) +++ head/java/eclipse/files/patch-eclipse.platform.releng (revision 521829) @@ -1,84 +1,84 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml --- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 @@ -96,9 +96,9 @@ unpack="false"/> - + - + diff -ru eclipse.platform.releng/pom.xml eclipse.platform.releng/pom.xml --- eclipse.platform.releng/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -66,7 +66,9 @@ features/org.eclipse.releng.tools features/org.eclipse.sdk features/org.eclipse.sdk.examples-feature + features/org.eclipse.test-feature Index: head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder (revision 521828) +++ head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder (revision 521829) @@ -1,286 +1,286 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml --- eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml 0000-00-00 00:00:00.000000000 +0000 @@ -111,7 +111,7 @@ --> + value="eclipse-platform-${eclispeBaseLabel}-freebsd-gtk-amd64.tar.gz" /> - diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product --- eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product 0000-00-00 00:00:00.000000000 +0000 @@ -16,7 +16,7 @@ - + - - + + diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties --- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 0000-00-00 00:00:00.000000000 +0000 @@ -29,11 +29,11 @@ #root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe #root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe -root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le -root.linux.gtk.ppc64le.permissions.755=eclipse +root.freebsd.gtk.powerpc64=rootfiles/freebsd.gtk.powerpc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64 +root.freebsd.gtk.powerpc64.permissions.755=eclipse -root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64 -root.linux.gtk.x86_64.permissions.755=eclipse +root.freebsd.gtk.amd64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64 +root.freebsd.gtk.amd64.permissions.755=eclipse bin.includes = feature.properties diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product --- eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product 0000-00-00 00:00:00.000000000 +0000 @@ -18,7 +18,7 @@ - + - - + + diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml --- eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -77,7 +77,7 @@ zip - tar.gz + tar.gz tar.gz diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product --- eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product 0000-00-00 00:00:00.000000000 +0000 @@ -18,7 +18,7 @@ - + - - + + Index: head/java/eclipse/files/patch-eclipse.platform.resources =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.resources (revision 521828) +++ head/java/eclipse/files/patch-eclipse.platform.resources (revision 521829) @@ -1,235 +1,174 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 0000-00-00 00:00:00.000000000 +0000 @@ -20,7 +20,7 @@ LIB_NAME_FULL = libunixfile_1_0_0.so #Set this to be your OS type -OS_TYPE = linux +OS_TYPE = freebsd #Set this to be the location of your JRE ifeq (${JAVA_HOME},) @@ -28,15 +28,11 @@ endif JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE} -OPT_FLAGS=-O2 -g -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +OPT_FLAGS=-O2 -g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 core: - gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C) - gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc + ${CC} $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C) + ${CC} $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc clean: rm -f $(CORE.O) $(LIB_NAME_FULL) - -install: core - rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so - mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 @@ -1,6 +1,6 @@ - org.eclipse.core.filesystem.linux.x86_64 + org.eclipse.core.filesystem.freebsd.amd64 diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName -Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true +Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.amd64; singleton:=true Bundle-Version: 1.2.300.qualifier Bundle-Vendor: %providerName Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.7.200,2.0.0)" Bundle-Localization: fragment -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64)) diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -18,7 +18,7 @@ ../../ org.eclipse.core - org.eclipse.core.filesystem.linux.x86_64 + org.eclipse.core.filesystem.freebsd.amd64 1.2.300-SNAPSHOT eclipse-plugin -@@ -33,9 +33,9 @@ +@@ -37,9 +37,9 @@ p2 - linux + freebsd gtk - x86_64 + amd64 -@@ -50,7 +50,7 @@ +@@ -54,7 +54,7 @@ native - gtk.linux.x86_64 + gtk.freebsd.amd64 -@@ -63,10 +63,10 @@ +@@ -67,10 +67,10 @@ process-resources - - - - + + + + -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 @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName -Bundle-SymbolicName: org.eclipse.core.filesystem.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.powerpc64;singleton:=true Bundle-Version: 1.4.100.qualifier Bundle-Vendor: %providerName Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)" Bundle-Localization: fragment -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=ppc64le)) +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=powerpc64)) diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml --- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -18,7 +18,7 @@ ../../ org.eclipse.core - org.eclipse.core.filesystem.linux.ppc64le + org.eclipse.core.filesystem.freebsd.powerpc64 1.4.100-SNAPSHOT eclipse-plugin -@@ -33,9 +33,9 @@ +@@ -37,9 +37,9 @@ p2 - linux + freebsd gtk - ppc64le + powerpc64 diff -ru eclipse.platform.resources/pom.xml eclipse.platform.resources/pom.xml --- eclipse.platform.resources/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -52,8 +52,8 @@ bundles/org.eclipse.core.filesystem - bundles/org.eclipse.core.filesystem.linux.ppc64le - bundles/org.eclipse.core.filesystem.linux.x86_64 + bundles/org.eclipse.core.filesystem.freebsd.powerpc64 + bundles/org.eclipse.core.filesystem.freebsd.amd64 bundles/org.eclipse.core.filesystem.macosx bundles/org.eclipse.core.filesystem.win32.x86_64 diff -ru eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml --- eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 @@ -28,9 +28,9 @@ unpack="false"/--> logs = new HashMap<>(5); - private static final String[] OS_LIST = { Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 }; + private static final String[] OS_LIST = { Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 }; private String password = ""; //$NON-NLS-1$ private static final String PASSWORD = "-password"; //$NON-NLS-1$ 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$ + public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ + /** * Constant string (value "aix") indicating the platform is running on an * AIX-based operating system. Index: head/java/eclipse/files/patch-eclipse.platform.swt =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.swt (revision 521828) +++ head/java/eclipse/files/patch-eclipse.platform.swt (revision 521829) @@ -1,343 +1,355 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk --- eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/.classpath_gtk 0000-00-00 00:00:00.000000000 +0000 @@ -10,7 +10,7 @@ - + +diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java 0000-00-00 00:00:00.000000000 +0000 +@@ -10,7 +10,7 @@ + * + * Contributors: + * IBM Corporation - initial API and implementation +- * Pierre-Yves B., pyvesdev@gmail.com - Bug 219750: [styled text] Typing ~~ inserts é~~ ++ * Pierre-Yves B., pyvesdev@gmail.com - Bug 219750 + *******************************************************************************/ + package org.eclipse.swt.widgets; + diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 @@ -69,12 +69,12 @@ static String arch() { String osArch = System.getProperty("os.arch"); //$NON-NLS-1$ if (osArch.equals ("i386") || osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ - if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$ return osArch; } static String os() { String osName = System.getProperty("os.name"); //$NON-NLS-1$ + if (osName.equals ("FreeBSD")) return "freebsd"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000 @@ -72,7 +72,7 @@ cd `dirname $0` -MAKE_TYPE=make +MAKE_TYPE=gmake export CFLAGS='-O -Wall -fPIC' @@ -86,21 +86,14 @@ MAKEFILE=make_win32.mak ;; *) - SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'` + SWT_OS=`uname -s | tr '[:upper:]' '[:lower:]'` MAKEFILE=make_linux.mak ;; esac # Determine which CPU type we are building for if [ "${MODEL}" = "" ]; then - if uname -i > /dev/null 2>&1; then - MODEL=`uname -i` - if [ ${MODEL} = 'unknown' ]; then - MODEL=`uname -m` - fi - else MODEL=`uname -m` - fi fi case $MODEL in "x86_64") @@ -111,6 +104,11 @@ SWT_ARCH=x86 AWT_ARCH=i386 ;; + "powerpc" | "powerpc64") + SWT_ARCH=ppc64 + AWT_ARCH=ppc64 + MODEL=`uname -p` + ;; *) SWT_ARCH=$MODEL AWT_ARCH=$MODEL @@ -118,6 +116,13 @@ esac case $SWT_OS.$SWT_ARCH in + "freebsd.ppc64") + if [ "${JAVA_HOME}" = "" ]; then + DYNAMIC_JAVA_HOME=`readlink -f /usr/local/bin/java | sed "s:jre/::" | sed "s:bin/java::"` + JAVA_HOME = $DYNAMIC_JAVA_HOME + export JAVA_HOME + fi + ;; "linux.x86") if [ "${CC}" = "" ]; then export CC=gcc @@ -194,7 +199,7 @@ # For 64-bit CPUs, we have a switch -if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then +if [ ${MODEL} = 'amd64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'powerpc64' ]; then SWT_PTR_CFLAGS=-DJNI64 if [ -d /lib64 ]; then XLIB64=-L/usr/X11R6/lib64 @@ -205,6 +210,11 @@ XLIB64="${XLIB64} -L/usr/lib64" SWT_LFLAGS=-m64 export SWT_LFLAGS + fi + if [ ${SWT_OS} = "freebsd" ] + then + SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64" + export SWT_LFLAGS=-m64 fi export SWT_PTR_CFLAGS fi diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 @@ -101,16 +101,18 @@ WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o +port_prefix=`pkg-config --variable=prefix gtk+-3.0` CFLAGS := $(CFLAGS) \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ $(SWT_DEBUG) \ $(SWT_WEBKIT_DEBUG) \ - -DLINUX -DGTK \ + -DFREEBSD -DGTK \ + -I$(port_prefix)/include \ -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/linux \ + -I$(JAVA_HOME)/include/freebsd \ ${SWT_PTR_CFLAGS} -LFLAGS = -shared -fPIC ${SWT_LFLAGS} +LFLAGS = -shared -fPIC -m64 ${SWT_LFLAGS} -L$(port_prefix)/lib ifndef NO_STRIP # -s = Remove all symbol table and relocation information from the executable. @@ -253,10 +255,6 @@ cp $(ALL_SWT_LIBS) $(OUTPUT_DIR) ifeq ($(BUILD_WEBKIT2EXTENSION),yes) @# Copy webextension into it's own folder, but create folder first. - @# CAREFULLY delete '.so' files inside webextension*. Then carefully remove the directories. 'rm -rf' seemed too risky of an approach. - @-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so)" ] && rm -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so` - @-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*)" ] && rmdir -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*` - @# Copying webextension is not critical for build to succeed, thus we use '-'. SWT can still function without a webextension. @-[ -d $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) ] || mkdir -v $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) # If folder does not exist, make it. -cp $(WEBKIT_EXTENSION_LIB) $(OUTPUT_DIR)/$(WEBEXTENSION_DIR)/ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 0000-00-00 00:00:00.000000000 +0000 -@@ -58,8 +58,8 @@ +@@ -60,8 +60,8 @@ /* Initialize the OS flags and locale constants */ String osName = System.getProperty ("os.name"); - boolean isLinux = false, isWin32 = false; - if (osName.equals ("Linux")) isLinux = true; + boolean isLinux = osName.equals ("Linux") || osName.equals ("FreeBSD"); + boolean isWin32 = false; if (osName.startsWith("Windows")) isWin32 = true; IsLinux = isLinux; IsWin32 = isWin32; diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java 0000-00-00 00:00:00.000000000 +0000 -@@ -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 */ - static final int ASYNC_EXEC_TIMEOUT_MS = 10000; // Webkit2. + static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD static boolean bug522733FirstInstanceCreated = false; //Webkit2 workaround for Bug 522733 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf --- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 @@ -16,11 +16,11 @@ requires.3.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) requires.4.namespace = org.eclipse.equinox.p2.iu -requires.4.name = org.eclipse.swt.gtk.linux.x86_64 +requires.4.name = org.eclipse.swt.gtk.freebsd.amd64 requires.4.range = [$version$,$version$] -requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) +requires.4.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=amd64)(!(org.eclipse.swt.buildtime=true))) requires.5.namespace = org.eclipse.equinox.p2.iu -requires.5.name = org.eclipse.swt.gtk.linux.ppc64le +requires.5.name = org.eclipse.swt.gtk.freebsd.powerpc64 requires.5.range = [$version$,$version$] -requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true))) +requires.5.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)(!(org.eclipse.swt.buildtime=true))) diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml --- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 0000-00-00 00:00:00.000000000 +0000 @@ -63,11 +63,11 @@ - + - + @@ -80,12 +80,12 @@ - + - + @@ -115,13 +115,13 @@ trust="true" outputproperty="m_linux_x86_64_output" command="hostname"/> - - + - - + + diff -ru eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup --- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000 @@ -103,7 +103,7 @@ xsi:type="predicates:NotPredicate"> + pattern=".*(cocoa|gtk|win32)(\.(freebsd|macosx|aix|hpux|linux|solaris|win32)(\.(amd64|x86_64|powerpc64|ia64|aarch64|arm|ppc64|ppc64le|s390|s390x|x86|sparcv9))?)?"/> unix - Linux + @@ -118,7 +119,9 @@ examples/org.eclipse.swt.examples.ole.win32 examples/org.eclipse.swt.examples.views tests/org.eclipse.swt.tests.fragments.feature + features/org.eclipse.swt.tools.feature diff -ru eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml --- eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/tests/org.eclipse.swt.tests.fragments.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 @@ -20,10 +20,10 @@ - + - + diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch64/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -20,12 +20,12 @@ ../binaries-parent/ org.eclipse.swt - org.eclipse.swt.gtk.linux.aarch64 + org.eclipse.swt.gtk.freebsd.aarch64 3.109.0-SNAPSHOT eclipse-plugin - linux + freebsd gtk aarch64 ${buildId} @@ -61,7 +61,7 @@ native - gtk.linux.aarch64 + gtk.freebsd.aarch64 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 @@ -1,6 +1,6 @@ - org.eclipse.swt.gtk.linux.x86_64 + org.eclipse.swt.gtk.freebsd.amd64 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 @@ -2,7 +2,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" Bundle-Name: %fragmentName Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true - Bundle-Version: 3.111.0.qualifier + Bundle-Version: 3.113.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment @@ -26,8 +26,8 @@ org.eclipse.swt.internal.cairo; x-internal:=true, org.eclipse.swt.internal.gtk; x-internal:=true, org.eclipse.swt.internal.opengl.glx; x-internal:=true -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64)) SWT-WS: gtk -SWT-OS: linux -SWT-Arch: x86_64 -Automatic-Module-Name: org.eclipse.swt.gtk.linux.x86_64 +SWT-OS: freebsd +SWT-Arch: amd64 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.amd64 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/build.xml 0000-00-00 00:00:00.000000000 +0000 @@ -1,9 +1,9 @@ - + - - + + diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/mvnBuildSwtJar.sh 0000-00-00 00:00:00.000000000 +0000 @@ -36,10 +36,10 @@ if [ "${DEV_ECLIPSE}" != "" ]; then echo " Copying generated *.jar files into your ${DEV_ECLIPSE} folder" - cp -v ./target/org.eclipse.swt.gtk.linux.x86_64-*-SNAPSHOT.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.linux.x86_64_* - cp -v ./target/org.eclipse.swt.gtk.linux.x86_64-*-SNAPSHOT-sources.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.linux.x86_64.source_*.jar + cp -v ./target/org.eclipse.swt.gtk.freebsd.amd64-*-SNAPSHOT.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.freebsd.amd64_* + cp -v ./target/org.eclipse.swt.gtk.freebsd.amd64-*-SNAPSHOT-sources.jar ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.freebsd.amd64.source_*.jar echo "Note: Below should list newly generated *jar files with current timestamp" - ls -l --color=auto -a ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.linux.x86_64* + ls -l --color=auto -a ${DEV_ECLIPSE}/plugins/org.eclipse.swt.gtk.freebsd.amd64* else echo "Note:" echo " Set DEV_ECLIPSE to your development eclipse folder to have the *.jar files copied into it automatically." diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -20,14 +20,14 @@ ../binaries-parent/ org.eclipse.swt - org.eclipse.swt.gtk.linux.x86_64 + org.eclipse.swt.gtk.freebsd.amd64 - 3.111.0-SNAPSHOT + 3.113.0-SNAPSHOT eclipse-plugin - linux + freebsd gtk - x86_64 + amd64 ${buildId} @@ -61,7 +61,7 @@ native - gtk.linux.x86_64 + gtk.freebsd.amd64 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 @@ -2,7 +2,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" Bundle-Name: %fragmentName Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true - Bundle-Version: 3.111.0.qualifier + Bundle-Version: 3.113.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment @@ -26,8 +26,8 @@ org.eclipse.swt.internal.cairo; x-internal:=true, org.eclipse.swt.internal.gtk; x-internal:=true, org.eclipse.swt.internal.opengl.glx; x-internal:=true -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64)) SWT-WS: gtk -SWT-OS: linux -SWT-Arch: ppc64le -Automatic-Module-Name: org.eclipse.swt.gtk.linux.ppc64le +SWT-OS: freebsd +SWT-Arch: powerpc64 +Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.powerpc64 diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/build.xml 0000-00-00 00:00:00.000000000 +0000 @@ -1,9 +1,9 @@ - + - - + + diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml --- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -20,14 +20,14 @@ ../binaries-parent/ org.eclipse.swt - org.eclipse.swt.gtk.linux.ppc64le + org.eclipse.swt.gtk.freebsd.powerpc64 - 3.111.0-SNAPSHOT + 3.113.0-SNAPSHOT eclipse-plugin - linux + freebsd gtk - ppc64le + powerpc64 ${buildId} @@ -61,7 +61,7 @@ native - gtk.linux.ppc64le + gtk.freebsd.powerpc64 diff -ru eclipse.platform.swt.binaries/pom.xml eclipse.platform.swt.binaries/pom.xml --- eclipse.platform.swt.binaries/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt.binaries/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -54,8 +54,8 @@ bundles/org.eclipse.swt.cocoa.macosx.x86_64 - bundles/org.eclipse.swt.gtk.linux.ppc64le - bundles/org.eclipse.swt.gtk.linux.x86_64 + bundles/org.eclipse.swt.gtk.freebsd.powerpc64 + bundles/org.eclipse.swt.gtk.freebsd.amd64 bundles/org.eclipse.swt.win32.win32.x86_64 Index: head/java/eclipse/files/patch-eclipse.platform.team =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.team (revision 521828) +++ head/java/eclipse/files/patch-eclipse.platform.team (revision 521829) @@ -1,134 +1,134 @@ diff -ru eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile --- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile 0000-00-00 00:00:00.000000000 +0000 @@ -22,7 +22,7 @@ LIB_NAME = gnomeproxy.so LIB_NAME_FULL = libgnomeproxy-1.0.0.so -OS_TYPE = linux +OS_TYPE = freebsd JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE} INCLUDE = `pkg-config --cflags gio-2.0` COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 ${TARGET_ENVIRONMENT} @@ -34,15 +34,13 @@ compile: @echo "Building file: $(GNOMEPROXY.O)" - @echo "Invoking: GCC C Compiler" - gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) + $(CC) $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) @echo "Finished building: $(GNOMEPROXY.O)" @echo " " link: compile @echo "Building target: $(LIB_NAME_FULL)" - @echo "Invoking: GCC C Linker" - gcc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc + $(CC) $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) @echo "Finished building target: $(LIB_NAME_FULL)" @echo " " diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project --- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 @@ -1,6 +1,6 @@ - org.eclipse.core.net.linux.x86_64 + org.eclipse.core.net.freebsd.amd64 diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt --- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/BUILD_INFO.txt 0000-00-00 00:00:00.000000000 +0000 @@ -1,10 +1,10 @@ Native Build Info: ------------------ -platform: linux.gtk.x86_64 +platform: freebsd.gtk.amd64 built by: Eric Williams, ericwill@redhat.com build date: 24-May-2018 -OS Name: RHEL Workstation 7.5 -OS Version: Linux 3.10.0 -Compiler version: gcc (GCC) 4.8.5 -Java version: Java(TM) 8 Runtime Environment, Standard Edition (1.8.0.171) \ No newline at end of file +OS Name: FreeBSD +OS Version: 12 +Compiler version: FreeBSD clang version 6.0.1 +Java version: Java(TM) 8 Runtime Environment, Standard Edition (1.8.0.171) diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF --- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 @@ -3,9 +3,9 @@ Bundle-Name: %fragmentName Bundle-Vendor: %providerName 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)) Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Automatic-Module-Name: org.eclipse.core.net.linux.x86_64 +Automatic-Module-Name: org.eclipse.core.net.freebsd.amd64 diff -ru eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml --- eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.team/bundles/org.eclipse.core.net.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -18,7 +18,7 @@ ../../ org.eclipse.core - org.eclipse.core.net.linux.x86_64 + org.eclipse.core.net.freebsd.amd64 - 1.2.300-SNAPSHOT + 1.2.400-SNAPSHOT eclipse-plugin -@@ -30,9 +30,9 @@ +@@ -34,9 +34,9 @@ - linux + freebsd gtk - x86_64 + amd64 -@@ -47,7 +47,7 @@ +@@ -51,7 +51,7 @@ native - gtk.linux.x86_64 + gtk.freebsd.amd64 -@@ -60,9 +60,9 @@ +@@ -64,9 +64,9 @@ process-resources - + - + diff -ru eclipse.platform.team/pom.xml eclipse.platform.team/pom.xml --- eclipse.platform.team/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.team/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -74,7 +74,7 @@ features/org.eclipse.cvs-feature - bundles/org.eclipse.core.net.linux.x86_64 + bundles/org.eclipse.core.net.freebsd.amd64 bundles/org.eclipse.core.net.win32.x86_64 tests Index: head/java/eclipse/files/patch-eclipse.platform.text =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.text (nonexistent) +++ head/java/eclipse/files/patch-eclipse.platform.text (revision 521829) @@ -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 + + + Property changes on: head/java/eclipse/files/patch-eclipse.platform.text ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.platform.ua =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.ua (revision 521828) +++ head/java/eclipse/files/patch-eclipse.platform.ua (revision 521829) @@ -1,64 +1,64 @@ diff -ru eclipse.platform.ua/org.eclipse.help.base/plugin.xml eclipse.platform.ua/org.eclipse.help.base/plugin.xml --- eclipse.platform.ua/org.eclipse.help.base/plugin.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ua/org.eclipse.help.base/plugin.xml 0000-00-00 00:00:00.000000000 +0000 @@ -131,7 +131,7 @@ + value="FreeBSD,Linux,AIX,HP,SunOS"> @@ -150,7 +150,7 @@ + value="FreeBSD,Linux,AIX,HP,SunOS"> @@ -169,7 +169,7 @@ + value="FreeBSD,Linux,AIX,HP,SunOS"> diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java --- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java 0000-00-00 00:00:00.000000000 +0000 @@ -35,7 +35,7 @@ prefs .put("custom_browser_path", //$NON-NLS-1$ "\"C:\\Program Files\\Internet Explorer\\IEXPLORE.EXE\" %1"); //$NON-NLS-1$ -- } else if (os.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)) + || (Constants.OS_FREEBSD.equalsIgnoreCase(os)) || (Constants.OS_LINUX.equalsIgnoreCase(os)) || (Constants.OS_SOLARIS.equalsIgnoreCase(os))) { setDefaultBrowserID(BROWSER_ID_MOZILLA); diff -ru eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java --- eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java 0000-00-00 00:00:00.000000000 +0000 @@ -67,6 +67,7 @@ */ private boolean test() { if (!Constants.OS_WIN32.equalsIgnoreCase(Platform.getOS()) + && !Constants.OS_FREEBSD.equalsIgnoreCase(Platform.getOS()) && !Constants.OS_LINUX.equalsIgnoreCase(Platform.getOS())) { return false; } Index: head/java/eclipse/files/patch-eclipse.platform.ui =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.ui (revision 521828) +++ head/java/eclipse/files/patch-eclipse.platform.ui (revision 521829) @@ -1,193 +1,185 @@ diff -ru eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml --- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -32,9 +32,9 @@ +@@ -37,9 +37,9 @@ p2 - linux + freebsd gtk - x86_64 + amd64 diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml --- eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml 0000-00-00 00:00:00.000000000 +0000 @@ -94,7 +94,7 @@ @@ -104,28 +104,28 @@ usr/bin/google-chrome usr/bin/chromium-browser usr/bin/konqueror usr/bin/epiphany diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java --- eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java 0000-00-00 00:00:00.000000000 +0000 @@ -210,7 +210,8 @@ if (currentTitleControl.getVisible()) { int tw = width - HMARGIN * 2 - SPACING * 2; String os = System.getProperty("os.name"); //$NON-NLS-1$ - if (Constants.OS_LINUX.equalsIgnoreCase(os)) { + if (Constants.OS_LINUX.equalsIgnoreCase(os) || + Constants.OS_FREEBSD.equalsIgnoreCase(os)) { tw += 1; // See Bug 342610 } if (bsize != null) @@ -584,4 +585,4 @@ target.setTransfer(transferTypes); target.addDropListener(listener); } -} \ No newline at end of file +} diff -ru eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml --- eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -12,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"> -+ -+ - -+ -+ - ++ os="freebsd"> + + - - + + Index: head/java/eclipse/files/patch-rt.equinox.bundles =================================================================== --- head/java/eclipse/files/patch-rt.equinox.bundles (revision 521828) +++ head/java/eclipse/files/patch-rt.equinox.bundles (revision 521829) @@ -1,177 +1,173 @@ diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF --- rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 @@ -13,7 +13,7 @@ org.eclipse.equinox.internal.security.credentials;x-internal:=true, org.eclipse.equinox.internal.security.storage;x-internal:=true, org.eclipse.equinox.internal.security.storage.friends;version="1.0.0";x-friends:="org.eclipse.equinox.security.ui", - org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.linux.x86_64", + org.eclipse.equinox.internal.security.storage.provider;x-friends:="org.eclipse.equinox.security.freebsd.amd64", org.eclipse.equinox.security.auth;version="1.0.0", org.eclipse.equinox.security.auth.credentials;version="1.0.0", org.eclipse.equinox.security.auth.module;version="1.0.0", diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 @@ -1,6 +1,6 @@ - org.eclipse.equinox.security.linux.x86_64 + org.eclipse.equinox.security.freebsd.amd64 diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName -Bundle-SymbolicName: org.eclipse.equinox.security.linux.x86_64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.security.freebsd.amd64;singleton:=true - Bundle-Version: 1.1.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 Bundle-Localization: fragment -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) -Export-Package: org.eclipse.equinox.internal.security.linux;x-internal:=true -Automatic-Module-Name: org.eclipse.equinox.security.linux.x86_64 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64)) +Export-Package: org.eclipse.equinox.internal.security.freebsd;x-internal:=true +Automatic-Module-Name: org.eclipse.equinox.security.freebsd.amd64 Eclipse-BundleShape: dir diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/keystorelinuxnative/makefile 0000-00-00 00:00:00.000000000 +0000 @@ -1,7 +1,7 @@ LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1` LIBSECRET_LIBS = `pkg-config --libs libsecret-1` --CFLAGS = -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 @@ -18,7 +18,7 @@ ../../ 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 - linux + freebsd gtk - x86_64 + amd64 -@@ -47,7 +47,7 @@ +@@ -51,7 +51,7 @@ native - gtk.linux.x86_64 + gtk.freebsd.amd64 -@@ -60,7 +60,7 @@ +@@ -64,7 +64,7 @@ process-resources - + diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties --- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/src/org/eclipse/equinox/internal/security/linux/nls/messages.properties 0000-00-00 00:00:00.000000000 +0000 @@ -12,7 +12,7 @@ # Julien HENRY - Linux implementation ############################################################################### -## Linux libsecure integration module +## FreeBSD libsecure integration module getMasterPasswordError=Secure storage was unable to retrieve the master password from the password storage. If secure storage was created using a different user account, you'll have to switch back to that account. Alternatively, you can use the password recovery, or delete and re-create secure storage. saveMasterPasswordError=Secure storage was unable to save the master password. -newMasterPasswordGenerated=New secure storage master password was generated (Linux libsecret integration module). +newMasterPasswordGenerated=New secure storage master password was generated (FreeBSD libsecret integration module). diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties --- rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/build.properties 0000-00-00 00:00:00.000000000 +0000 @@ -29,7 +29,7 @@ generate.plugin@org.eclipse.osgi.source=org.eclipse.osgi generate.plugin@org.eclipse.osgi.util.source=org.eclipse.osgi.util generate.plugin@org.eclipse.equinox.security.win32.x86_64.source=org.eclipse.equinox.security.win32.x86_64 -generate.plugin@org.eclipse.equinox.security.linux.x86_64.source=org.eclipse.equinox.security.linux.x86_64 +generate.plugin@org.eclipse.equinox.security.freebsd.amd64.source=org.eclipse.equinox.security.freebsd.amd64 generate.plugin@org.eclipse.equinox.security.macosx.source=org.eclipse.equinox.security.macosx generate.plugin@org.eclipse.equinox.security.source=org.eclipse.equinox.security generate.plugin@org.eclipse.equinox.security.ui.source=org.eclipse.equinox.security.ui diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml --- rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml 0000-00-00 00:00:00.000000000 +0000 @@ -217,9 +217,9 @@ unpack="false"/> bundles/org.eclipse.equinox.security bundles/org.eclipse.equinox.security.macosx bundles/org.eclipse.equinox.security.win32.x86_64 - bundles/org.eclipse.equinox.security.linux.x86_64 + bundles/org.eclipse.equinox.security.freebsd.amd64 bundles/org.eclipse.equinox.bidi bundles/org.eclipse.equinox.cm bundles/org.eclipse.equinox.console Index: head/java/eclipse/files/patch-rt.equinox.framework =================================================================== --- head/java/eclipse/files/patch-rt.equinox.framework (revision 521828) +++ head/java/eclipse/files/patch-rt.equinox.framework (revision 521829) @@ -1,602 +1,424 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 @@ -2,9 +2,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true - Bundle-Version: 1.1.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 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64)) +Bundle-Localization: launcher.gtk.freebsd.aarch64 Eclipse-BundleShape: dir diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -18,12 +18,12 @@ ../../launcher-binary-parent 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 - linux + 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 @@ -1,6 +1,6 @@ - org.eclipse.equinox.launcher.gtk.linux.x86_64 + org.eclipse.equinox.launcher.gtk.freebsd.amd64 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 @@ -2,9 +2,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true - Bundle-Version: 1.1.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 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64)) +Bundle-Localization: launcher.gtk.freebsd.amd64 Eclipse-BundleShape: dir diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties 0000-00-00 00:00:00.000000000 +0000 @@ -11,5 +11,5 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -pluginName = Equinox Launcher Linux X86_64 Fragment +pluginName = Equinox Launcher FreeBSD/amd64 Fragment providerName = Eclipse.org - Equinox diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,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 - linux + freebsd 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 ---- 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 @@ - ../../launcher-binary-parent - - org.eclipse.equinox -- org.eclipse.equinox.launcher.gtk.linux.arm -+ org.eclipse.equinox.launcher.gtk.freebsd.armv7 - 1.1.1000-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk -- arm -+ armv7 - - -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 @@ - ../../launcher-binary-parent - - org.eclipse.equinox -- org.eclipse.equinox.launcher.gtk.linux.x86 -+ org.eclipse.equinox.launcher.gtk.freebsd.i386 - 1.1.1000-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk -- x86 -+ i386 - - diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project 0000-00-00 00:00:00.000000000 +0000 @@ -1,6 +1,6 @@ - org.eclipse.equinox.launcher.gtk.linux.ppc64le + org.eclipse.equinox.launcher.gtk.freebsd.powerpc64 diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 @@ -2,9 +2,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true - Bundle-Version: 1.1.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 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64)) +Bundle-Localization: launcher.gtk.freebsd.powerpc64 Eclipse-BundleShape: dir diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml --- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -18,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 - linux + freebsd 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 @@ -24,11 +24,11 @@ root.win32.win32.x86_64=bin/win32/win32/x86_64 root.win32.win32.x86_64.permissions.755=launcher.exe -root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root -root.linux.gtk.ppc64le.permissions.755=launcher +root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root +root.freebsd.gtk.powerpc64.permissions.755=launcher root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64 root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/launcher -root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root -root.linux.gtk.x86_64.permissions.755=libcairo-swt.so +root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root +root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -32,20 +32,20 @@ +@@ -33,20 +33,20 @@ fragment="true"/> - - + + diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties 0000-00-00 00:00:00.000000000 +0000 @@ -20,12 +20,12 @@ root.win32.win32.x86_64=file:bin/win32/win32/x86_64/launcher.exe root.win32.win32.x86_64.permissions.755=launcher.exe -root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root -root.linux.gtk.ppc64le.permissions.755=launcher +root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root +root.freebsd.gtk.powerpc64.permissions.755=launcher root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64 root.macosx.cocoa.x86_64.permissions.755=Contents/MacOS/${launcherName} -root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root -root.linux.gtk.x86_64.permissions.755=libcairo-swt.so +root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root +root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -118,13 +118,13 @@ +@@ -76,29 +76,29 @@ -- -- -- -- -+ -+ -+ -+ - - -- -+ - - - -@@ -134,37 +134,37 @@ - - - - - - - + + + + - + -- -- -- -- -+ -+ -+ -+ - - -- -+ - -- +- - - - -+ ++ + + + - + - - - - + + + + - + -@@ -212,7 +212,7 @@ +@@ -138,8 +138,8 @@ - -+ - +- ++ ++ + diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml --- rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -54,27 +54,27 @@ - build-native-launchers-gtk.linux.arm + build-native-launchers-gtk.freebsd.armv7 native - gtk.linux.arm + gtk.freebsd.armv7 - bundles/org.eclipse.equinox.launcher.gtk.linux.arm + bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7 - build-native-launchers-gtk.linux.aarch64 + build-native-launchers-gtk.freebsd.aarch64 native - gtk.linux.aarch64 + gtk.freebsd.aarch64 - bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64 + bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64 @@ -88,8 +88,8 @@ bundles/org.eclipse.equinox.launcher bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64 - bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le - bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64 + bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64 + bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64 bundles/org.eclipse.equinox.launcher.win32.win32.x86_64 bundles/org.eclipse.osgi.tests diff -ru rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties --- rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties 0000-00-00 00:00:00.000000000 +0000 @@ -8,4 +8,4 @@ #j_linux.x86_64=/shared/common/jdk-1.6.0_10 #user names to use on each of the machines if different from the user running hudson, u_${os}.${arch} -u_linux.x86_64=swtbuild +u_freebsd.amd64=swtbuild Index: head/java/eclipse/files/patch-rt.equinox.p2 =================================================================== --- head/java/eclipse/files/patch-rt.equinox.p2 (revision 521828) +++ head/java/eclipse/files/patch-rt.equinox.p2 (revision 521829) @@ -1,96 +1,96 @@ diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch rt.equinox.p2/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch --- rt.equinox.p2/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch 0000-00-00 00:00:00.000000000 +0000 @@ -15,7 +15,7 @@ - + diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml --- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -22,9 +22,7 @@ ${project.artifactId} org.eclipse.equinox.p2.tests.AutomatedTests - - - org.eclipse.equinox.p2.reconciler-linux.gtk.x86_64.tar.gz + org.eclipse.equinox.p2.reconciler-freebsd.gtk.amd64.tar.gz diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml --- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -39,7 +39,7 @@ - tar.gz + tar.gz diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product --- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product 0000-00-00 00:00:00.000000000 +0000 @@ -47,7 +47,7 @@ - + @@ -120,7 +120,7 @@ - + -@@ -134,7 +134,7 @@ +@@ -133,7 +133,7 @@ - + diff -ru rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch --- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch 0000-00-00 00:00:00.000000000 +0000 @@ -61,7 +61,7 @@ - + diff -ru rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml --- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 @@ -184,9 +184,9 @@ unpack="false"/>