Index: head/java/eclipse/Makefile.plugins =================================================================== --- head/java/eclipse/Makefile.plugins (revision 498879) +++ head/java/eclipse/Makefile.plugins (nonexistent) @@ -1,14 +0,0 @@ -# $FreeBSD$ -NO_BUILD= yes -USE_JAVA= yes -JAVA_VERSION= 1.7+ -JAVA_OS= native - -REPO_DIRS?= features plugins - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse - @(cd ${WRKSRC}; ${COPYTREE_SHARE} "${REPO_DIRS}" ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse/) - @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s share/eclipse/dropins/${PORTNAME} -not -type d) >> ${TMPPLIST} - @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d share/eclipse/dropins/${PORTNAME} -type d -empty) \ - | ${SED} -ne 's,^,@dir ,p' >> ${TMPPLIST} Property changes on: head/java/eclipse/Makefile.plugins ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ 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/Makefile =================================================================== --- head/java/eclipse/Makefile (revision 498879) +++ head/java/eclipse/Makefile (revision 498880) @@ -1,144 +1,98 @@ -# Created by: Jimmy Kelley +# Created by: Jonathan Chen # $FreeBSD$ PORTNAME= eclipse -PORTVERSION= 4.6 -PORTREVISION= 2 +PORTVERSION= 4.11 CATEGORIES= java devel -MASTER_SITES= https://s3.amazonaws.com/freebsd-eclipse-dist/ -DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \ - ${PORTNAME}-maven-repo-${PORTVERSION}.xz -DIST_SUBDIR= eclipse -MAINTAINER= ljboiler@gmail.com -COMMENT= Eclipse Neon +# Update to git-tag on git.eclipse.org +ECLIPSE_TAG= R4_11 +ECLIPSE_TSTAMP= 20190321-0023 -LICENSE= EPL +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://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} +DISTFILES+= ${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g} +.endfor -BROKEN= fails to build -DEPRECATED= Uses webkit-gtk2 which has security issues -EXPIRATION_DATE=2019-04-30 -ONLY_FOR_ARCHS= amd64 i386 -CONFLICTS_INSTALL= eclipse +DIST_SUBDIR= ${PORTNAME} -BUILD_DEPENDS= ${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33 -LIB_DEPENDS= libcairo.so:graphics/cairo -# libwebkitgtk-1.0.so:www/webkit-gtk2 +MAINTAINER= jonc@chen.org.nz +COMMENT= Eclipse IDE 2019-03 -USES= gmake pkgconfig tar:xz -USE_GL= glu -USE_GNOME= gconf2 gtk20 gnomevfs2 libgnome libgnomeui -USE_JAVA= yes -JAVA_OS= native -JAVA_VERSION= 1.8 -JAVA_VENDOR= openjdk -JAVA_BUILD= yes -JAVA_RUN= yes +LICENSE= EPL -OPTIONS_DEFINE= SWT_GTK3_SUPPORT -SWT_GTK3_SUPPORT_DESC= Enable GTK3 support in SWT (GUI) -OPTIONS_SINGLE= INSTALLPKG -OPTIONS_SINGLE_INSTALLPKG= FULL_SDK PLATFORM_SDK PLATFORM -FULL_SDK_DESC= Full SDK (JDT, PDE, source, API docs) -PLATFORM_SDK_DESC= Platform with source, API Docs (no Java tools) -PLATFORM_DESC= Platform only (no Java tools, no source or docs) +ONLY_FOR_ARCHS= amd64 power64 -OPTIONS_DEFAULT= FULL_SDK +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= gmake pkgconfig gnome +USE_GNOME= gtk30 -.include +USE_GITHUB= yes +GH_ACCOUNT= daemonblade +GH_PROJECT= eclipse-maven-repo +GH_TAGNAME= ${PORTVERSION} -PATCH_STRIP= -p1 +USE_JAVA= yes +JAVA_VERSION= 1.8 -.if ${PORT_OPTIONS:MSWT_GTK3_SUPPORT} -USE_GNOME+= gtk30 -#LIB_DEPENDS+= libwebkitgtk-3.0.so:www/webkit-gtk3 -MVN_SETTINGS+= -Dmachine_gtk3=1 -SWTGTK3OPT= -.else -SWTGTK3OPT= SWT_GTK3=0 -.endif +DESKTOP_ENTRIES="Eclipse" \ + "${COMMENT}" \ + "${PORTNAME}" \ + "${PORTNAME}" \ + "Development;IDE;Java;" \ + false -WRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION} -GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator +SUB_FILES= ${PORTNAME} -MVN_LOCAL_REPO= -Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION}/repository -MVN_TEST_FLAG= -Dmaven.test.skip=true -DskipTests=true -MVN_SETTINGS+= --offline -MVN_OPTS?= MAVEN_OPTS='-Xmx1024m' -ECLIPSE_WS= gtk -ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/} -E_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//} -ECLIPSE_BUILDID=I20160606-1100 -SCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \ - E_SHORTARCH=${E_SHORTARCH} -PORTDESTDIR= ${PREFIX}/lib/eclipse +MAVEN_ENV= MAVEN_OPTS=-Xmx1024m +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} -.if ${ARCH}=="i386" -EXTRA_PATCHES= ${FILESDIR}/i386-patch-freebsd_natives -.endif +ECLIPSE_RESULT= eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz -.if ${ARCH}=="amd64" -EXTRA_PATCHES= ${FILESDIR}/amd64-patch-freebsd_natives -.endif +# Let's abuse this to get to the right place. +WRKSRC_SUBDIR= ../eclipse.platform.releng.aggregator-${ECLIPSE_TAG} -# Someday it would be nice to see about moving the product selection into the patch phase (and only build the -# product the user wants), but that may prove to be difficult if not impossible with the way the eclipse tycho -# builder is a "all-or-nothing" thing right now. -.if ${PORT_OPTIONS:MFULL_SDK} -PRODUCT_TARFILE= \ - ${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/org.eclipse.sdk.ide-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz -.endif -.if ${PORT_OPTIONS:MPLATFORM_SDK} -PRODUCT_TARFILE= \ - ${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/target/products/org.eclipse.platform.sdk-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz -.endif -.if ${PORT_OPTIONS:MPLATFORM} -PRODUCT_TARFILE= \ - ${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz -.endif - -post-patch: - @(for f in `${GREP} -hE '(\-\-\-|%%ECLIPSE_ARCH%%)' ${FILESDIR}/patch-* | ${GREP} -B1 'ECLIPSE_ARCH' | ${GREP} '^\-\-\-' | ${SED} -e 's/^\-\-\- .\///'` ; \ - do \ - ${ECHO_MSG} "Updating ECLIPSE_ARCH in file $$f"; \ - ${REINPLACE_CMD} -e "s|%%ECLIPSE_ARCH%%|${ECLIPSE_ARCH}|g" ${WRKSRC}/$$f; \ - done) - do-build: - @(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} M2_HOME=${LOCALBASE}/share/java/maven33 ${MVN_OPTS} \ - mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \ - -DbuildId=${ECLIPSE_BUILDID}) + cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_REPO} ${MAVEN_ECLIPSE} -DskipTests clean verify do-install: - @${RM} -r ${STAGEDIR}${PORTDESTDIR} - @( cd ${STAGEDIR}${PREFIX}/lib; ${TAR} xfz ${PRODUCT_TARFILE} ) - @${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name \*.orig -delete - @${SED} \ - -e "s+%%BROWSER%%+${GECKO:S/19//}+g" \ - -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ - -e "s+%%JAVA_HOME%%+${JAVA_HOME}+g" \ - -e "s+%%JAVA_OS%%+${JAVA_OS}+g" \ - -e "s+%%JAVA_VERSION%%+${JAVA_VERSION}+g" \ - -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ - -e "s+%%SWTGTK3OPT%%+${SWTGTK3OPT}+g" \ - ${FILESDIR}/eclipse.in > ${BUILD_WRKSRC}/eclipse.tmp -.if defined(JAVA_VENDOR) - @${REINPLACE_CMD} -e "s+%%JAVA_VENDOR_SPECIFICATION%%+JAVA_VENDOR=\"${JAVA_VENDOR}\"+g" \ - ${BUILD_WRKSRC}/eclipse.tmp -.else - @${REINPLACE_CMD} -e "s+%%JAVA_VENDOR_SPECIFICATION%%++g" \ - ${BUILD_WRKSRC}/eclipse.tmp -.endif - ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/eclipse.tmp ${STAGEDIR}${PREFIX}/bin/eclipse - @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s lib/eclipse -not -type d) >> ${TMPPLIST} - @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s bin/eclipse -not -type d) >> ${TMPPLIST} - @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d lib/eclipse -type d -empty) | ${SED} -ne "s,^,@dir ,p" >> ${TMPPLIST} - @${ECHO_CMD} "@exec echo '-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%D/share/eclipse/dropins' >> %D/lib/eclipse/eclipse.ini" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${SED} -i '' '/^-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/d' %D/lib/eclipse/eclipse.ini" >> ${TMPPLIST} - @${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins - @${ECHO_CMD} "@dir share/eclipse/dropins" >> ${TMPPLIST} + ${MKDIR} ${STAGEDIR}${DATADIR} + ${TAR} -x --directory ${STAGEDIR}${DATADIR}/.. --file ${WRKSRC}/${ECLIPSE_RESULT} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -distclean: - ${RM} -r ${DISTDIR}/eclipse +# dynamically add timestamped profiles, which should be excluded from pkg-plist +post-install: + cd ${STAGEDIR}${PREFIX} && ${FIND} -s share/${PORTNAME} -name '*.profile.gz' >> ${TMPPLIST} .include Index: head/java/eclipse/distinfo =================================================================== --- head/java/eclipse/distinfo (revision 498879) +++ head/java/eclipse/distinfo (revision 498880) @@ -1,5 +1,53 @@ -TIMESTAMP = 1466985570 -SHA256 (eclipse/eclipse.platform.releng.aggregator-4.6.xz) = 916df36f28bd53dd17c9f059b19bad2f58c58865705c1d81ca59bf128bda32f7 -SIZE (eclipse/eclipse.platform.releng.aggregator-4.6.xz) = 215088004 -SHA256 (eclipse/eclipse-maven-repo-4.6.xz) = 5f6e816b012158a5c7e4b5bc7ecc1b12d1cae91e530ec503e8cd9910ab28a624 -SIZE (eclipse/eclipse-maven-repo-4.6.xz) = 135692066 +TIMESTAMP = 1554503098 +SHA256 (eclipse/eclipse.jdt-R4_11.tar.xz) = 69cfb50655af18880880ef4292e2856ad12d847527553bb7d13f2a3443f566ce +SIZE (eclipse/eclipse.jdt-R4_11.tar.xz) = 37580 +SHA256 (eclipse/eclipse.jdt.core-R4_11.tar.xz) = 903c7591a4698badbd279d09b2aefd3604820aba54cf2958e4fd5cfa0d806f24 +SIZE (eclipse/eclipse.jdt.core-R4_11.tar.xz) = 8371984 +SHA256 (eclipse/eclipse.jdt.core.binaries-R4_11.tar.xz) = ddcf1962d1b869c22cc31d0634d280e68b91a6c8f5561f64a5072e558460e7a2 +SIZE (eclipse/eclipse.jdt.core.binaries-R4_11.tar.xz) = 34416600 +SHA256 (eclipse/eclipse.jdt.debug-R4_11.tar.xz) = 028222dbe3d2ebc4002b3b362e0500a791e86ef9e4fca9a5d7a1bed97f9bc395 +SIZE (eclipse/eclipse.jdt.debug-R4_11.tar.xz) = 1425276 +SHA256 (eclipse/eclipse.jdt.ui-R4_11.tar.xz) = 28ca01db7a12183125b9794cd56bb0dd6b5ba449014bc8bfe9ac6991e63b5a77 +SIZE (eclipse/eclipse.jdt.ui-R4_11.tar.xz) = 14117296 +SHA256 (eclipse/eclipse.pde.build-R4_11.tar.xz) = 32496ccf12e630762fd59fd18ebc1bae9f96437f012aaeab5797ba29f6b2ddd7 +SIZE (eclipse/eclipse.pde.build-R4_11.tar.xz) = 868176 +SHA256 (eclipse/eclipse.pde.ui-R4_11.tar.xz) = 7ac38d3c2b52c030d7011395c94fe6dbdacc735a308911c1c0689388e54f6e87 +SIZE (eclipse/eclipse.pde.ui-R4_11.tar.xz) = 29759352 +SHA256 (eclipse/eclipse.platform-R4_11.tar.xz) = f9512fc71c40c37703b89617efdbd48f1fac4d4558e705b9a13596a567241a5d +SIZE (eclipse/eclipse.platform-R4_11.tar.xz) = 952108 +SHA256 (eclipse/eclipse.platform.common-R4_11.tar.xz) = a3062ed00ebe342a98e1132449d42987e104b741e1b86201c456af47fdd004c3 +SIZE (eclipse/eclipse.platform.common-R4_11.tar.xz) = 34049880 +SHA256 (eclipse/eclipse.platform.debug-R4_11.tar.xz) = 2e2b675035e808b121a9cb38cd5c26e35a6f2c38853f9dbd9db37d5e2ef1b921 +SIZE (eclipse/eclipse.platform.debug-R4_11.tar.xz) = 1369408 +SHA256 (eclipse/eclipse.platform.releng-R4_11.tar.xz) = a550feae2316d591b0990460a053abc19dd87b80c86c351cce98bff33194ede9 +SIZE (eclipse/eclipse.platform.releng-R4_11.tar.xz) = 411064 +SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_11.tar.xz) = c25d05c355585e5fcd6465a95899dd1eb6d2af92aab16d90bf0cdf3a6044c4fc +SIZE (eclipse/eclipse.platform.releng.aggregator-R4_11.tar.xz) = 690924 +SHA256 (eclipse/eclipse.platform.resources-R4_11.tar.xz) = 59be5020229e5053909194c55d416a384b2cf00b7a578d8df50d80c6bb8c6948 +SIZE (eclipse/eclipse.platform.resources-R4_11.tar.xz) = 857244 +SHA256 (eclipse/eclipse.platform.runtime-R4_11.tar.xz) = 70b9ea7151ea5c60feea289f3a8b7fcd66619f46f2ef2fde0a7ae2a034355330 +SIZE (eclipse/eclipse.platform.runtime-R4_11.tar.xz) = 432764 +SHA256 (eclipse/eclipse.platform.swt-R4_11.tar.xz) = b779fe217ac503b28b83fa1104b17cd99e8b6086bdb31be3f9efbd2f4135bc96 +SIZE (eclipse/eclipse.platform.swt-R4_11.tar.xz) = 3535864 +SHA256 (eclipse/eclipse.platform.swt.binaries-R4_11.tar.xz) = 805b830cb1cc45895594c1ac5fb96173a968fa954a33cb90dacf57215b651796 +SIZE (eclipse/eclipse.platform.swt.binaries-R4_11.tar.xz) = 1077336 +SHA256 (eclipse/eclipse.platform.team-R4_11.tar.xz) = f4f36cb722f393e25626ea5131b4d9017f3d47d69f33f2982f7a6bdeda5b3dad +SIZE (eclipse/eclipse.platform.team-R4_11.tar.xz) = 4665536 +SHA256 (eclipse/eclipse.platform.text-R4_11.tar.xz) = da6fad72804338e40efa7572bf162e7f88dac8dc8a14eb2fe4f733ed47b0c6be +SIZE (eclipse/eclipse.platform.text-R4_11.tar.xz) = 1247548 +SHA256 (eclipse/eclipse.platform.ua-R4_11.tar.xz) = a879ef849eaf4585832bd8203f167a031c4f05c9916dc5138ed541eba4f0a870 +SIZE (eclipse/eclipse.platform.ua-R4_11.tar.xz) = 4438264 +SHA256 (eclipse/eclipse.platform.ui-R4_11.tar.xz) = 00e5235b09106bd2f23c01257d50330ff2ed7511bb4dbdbbbe21929e2f25dc85 +SIZE (eclipse/eclipse.platform.ui-R4_11.tar.xz) = 6013124 +SHA256 (eclipse/eclipse.platform.ui.tools-R4_11.tar.xz) = 4cc9941e49bb5f10b9155649165643e9afe5b758b2d3e0807c7c368797963b03 +SIZE (eclipse/eclipse.platform.ui.tools-R4_11.tar.xz) = 316036 +SHA256 (eclipse/rt.equinox.binaries-R4_11.tar.xz) = a4476629efbd4f5063ff42e0aebb9b75e0f40f667fa7a90152e6e1b14934e8f7 +SIZE (eclipse/rt.equinox.binaries-R4_11.tar.xz) = 623604 +SHA256 (eclipse/rt.equinox.bundles-R4_11.tar.xz) = 4b1cada1dcb6b4cddd65f96a85740fcfe053722e836351f0e2ab53a54d531bc9 +SIZE (eclipse/rt.equinox.bundles-R4_11.tar.xz) = 1139768 +SHA256 (eclipse/rt.equinox.framework-R4_11.tar.xz) = 39ea7af8cb7c56e6b4819902de00f498f881c6b66599d5a5b275f2bd32765480 +SIZE (eclipse/rt.equinox.framework-R4_11.tar.xz) = 2812036 +SHA256 (eclipse/rt.equinox.p2-R4_11.tar.xz) = 019ec06efb58a12417c0a1ae9ecfdc368ab8e4ad25364970bd112dc03b9a53c8 +SIZE (eclipse/rt.equinox.p2-R4_11.tar.xz) = 45251216 +SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.11_GH0.tar.gz) = ab9e83997cccc02c235c8d3aa67db6f9963b25ede3d22d961d9292925a2f6bfa +SIZE (eclipse/daemonblade-eclipse-maven-repo-4.11_GH0.tar.gz) = 167655977 Index: head/java/eclipse/files/patch-aggregator =================================================================== --- head/java/eclipse/files/patch-aggregator (revision 498879) +++ head/java/eclipse/files/patch-aggregator (nonexistent) @@ -1,365 +0,0 @@ -diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml -index 71a6610..cc260cd 100644 ---- a/eclipse-platform-parent/pom.xml -+++ b/eclipse-platform-parent/pom.xml -@@ -80,7 +80,7 @@ - The tycho-eclipserun-plugin will create its instance of Eclipse from this - 'eclipiserun-repo' repository, such as for computing .api-descriptions. - --> -- http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6RC2-201605191730/ -+ http://download.eclipse.org/eclipse/updates/4.6/R-4.6-201606061100/ - - http://download.eclipse.org/eclipse/updates/4.6-I-builds - -@@ -253,6 +253,11 @@ - - - -+ freebsd -+ gtk -+ %%ECLIPSE_ARCH%% -+ -+ - linux - gtk - x86 -@@ -480,13 +485,13 @@ - - false - ${qualifier.format} -- jgit -+ - - pom.xml - - ${jgit.dirtyWorkingTree-platformDefault} - -- true -+ false - - - false -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml -index 7e6fd26..f1773e0 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml -+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml -@@ -139,6 +139,11 @@ - p2 - - -+ freebsd -+ gtk -+ %%ECLIPSE_ARCH%% -+ -+ - linux - gtk - x86 -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml -index c7f7ca9..1387a12 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml -+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml -@@ -44,6 +44,11 @@ - p2 - - -+ freebsd -+ gtk -+ %%ECLIPSE_ARCH%% -+ -+ - linux - gtk - x86 -@@ -99,6 +106,7 @@ - - - zip -+ tar.gz - tar.gz - tar.gz - -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml -index 2bc2ddf..96b6c41 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml -+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml -@@ -15,6 +15,8 @@ - - - -+ -+ - - - -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml -index 129d0a6..a8f76b6 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml -+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml -@@ -278,6 +278,16 @@ - fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" /> - -+ -+ -@@ -346,6 +356,16 @@ - fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" /> - -+ -+ -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf -index c2f679b..742fe0b 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf -+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf -@@ -55,6 +55,23 @@ units.3.touchpoint.version=1.0.0 - units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); - units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); - -+requires.4.namespace=org.eclipse.equinox.p2.iu -+requires.4.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% -+requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) -+requires.4.range=[1.0.0,1.0.0] -+requires.4.greedy=true -+ -+units.4.id=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% -+units.4.version=1.0.0 -+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu -+units.4.provides.1.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% -+units.4.provides.1.version=1.0.0 -+units.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) -+units.4.touchpoint.id=org.eclipse.equinox.p2.osgi -+units.4.touchpoint.version=1.0.0 -+units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); -+units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); -+ - # Restrict range so we are not an automatic update for 3.x. - update.id = org.eclipse.platform.ide - update.range = [4.0,$version$) -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml -index 502b599..5b885e5 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml -+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml -@@ -76,6 +76,7 @@ - - - zip -+ tar.gz - tar.gz - tar.gz - -@@ -87,6 +88,19 @@ - - - -+ -+ org.eclipse.tycho -+ target-platform-configuration -+ -+ -+ -+ freebsd -+ gtk -+ %%ECLIPSE_ARCH%% -+ -+ -+ -+ - - - -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml -index a8a32d0..2ab8a62 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml -+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml -@@ -39,6 +39,60 @@ - '${buildId}' - - -+ -+ -+ org.eclipse.tycho -+ tycho-p2-director-plugin -+ -+ -+ materialize-products -+ -+ materialize-products -+ -+ -+ SDKProfile -+ -+ -+ org.eclipse.platform.sdk -+ eclipse -+ -+ Eclipse.app -+ -+ -+ -+ -+ -+ -+ archive-products -+ pre-integration-test -+ -+ archive-products -+ -+ -+ -+ zip -+ tar.gz -+ tar.gz -+ tar.gz -+ -+ -+ -+ -+ -+ -+ -+ org.eclipse.tycho -+ target-platform-configuration -+ -+ -+ -+ freebsd -+ gtk -+ %%ECLIPSE_ARCH%% -+ -+ -+ -+ - - - -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties -index f34ae99..6293698 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties -+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties -@@ -9,56 +9,8 @@ - # IBM Corporation - initial API and implementation - ############################################################################### - --#root.permissions.755=eclipse --root.win32.win32.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86 --root.win32.win32.x86.permissions.755=eclipse.exe --root.win32.win32.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86_64 --root.win32.win32.x86_64.permissions.755=eclipse.exe -- --# Care is need there, for "macosx", as several forms will appear to work, but end up --# having wrong value in the CFBundleIdentifier field, in the Info.plist, resulting --# in "application requires Java 6" (see bug 445026, and bug 457071) --# These are not required at all, for our "product build", but are to get --# configuration_roots complete (see bug 457071). --root.macosx.cocoa.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64 --root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse --#root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse -- --# from org.eclipse.equinox.core.feature --#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.aix.gtk.ppc=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/aix/ppc --root.aix.gtk.ppc.permissions.755=eclipse --root.aix.gtk.ppc64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/aix/ppc64 --root.aix.gtk.ppc64.permissions.755=eclipse -- --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.hpux.gtk.ia64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/hpux/ia64 --root.hpux.gtk.ia64.permissions.755=eclipse -- --root.solaris.gtk.sparcv9=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/sparcv9 --root.solaris.gtk.sparcv9.permissions.755=eclipse --root.solaris.gtk.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86_64 --root.solaris.gtk.x86_64.permissions.755=eclipse -- --root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86 --root.linux.gtk.x86.permissions.755=eclipse --root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc --root.linux.gtk.ppc.permissions.755=eclipse --root.linux.gtk.ppc64=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64 --root.linux.gtk.ppc64.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.linux.gtk.s390x=rootfiles/linux.gtk.s390x,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390x --root.linux.gtk.s390x.permissions.755=eclipse --root.linux.gtk.s390=rootfiles/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390 --root.linux.gtk.s390.permissions.755=eclipse -- -+root.freebsd.gtk.%%ECLIPSE_ARCH%%=rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/%%ECLIPSE_ARCH%% -+root.freebsd.gtk.%%ECLIPSE_ARCH%%.permissions.755=eclipse - - bin.includes = feature.properties - -- -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml -index 29be78c..207a934 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml -+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml -@@ -72,6 +72,7 @@ - - - zip -+ tar.gz - tar.gz - tar.gz - -@@ -85,6 +86,20 @@ - - - -+ -+ -+ org.eclipse.tycho -+ target-platform-configuration -+ -+ -+ -+ freebsd -+ gtk -+ %%ECLIPSE_ARCH%% -+ -+ -+ -+ - - - -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml ---- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml -+++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml -@@ -35,6 +35,6 @@ - platform.sdk - sdk -- eclipse-junit-tests -+ -- eclipse.platform.repository -+ - - Property changes on: head/java/eclipse/files/patch-aggregator ___________________________________________________________________ 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-freebsd_natives =================================================================== --- head/java/eclipse/files/patch-freebsd_natives (revision 498879) +++ head/java/eclipse/files/patch-freebsd_natives (nonexistent) @@ -1,104 +0,0 @@ ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig 2014-04-15 21:04:15.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 2014-04-16 07:41:08.000000000 -0500 -@@ -17,7 +17,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},) -@@ -25,15 +25,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/ ---- ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile.orig 2014-04-15 21:27:02.000000000 -0500 -+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile 2014-04-16 07:45:00.000000000 -0500 -@@ -18,7 +18,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 gconf-2.0` - COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 ${TARGET_ENVIRONMENT} -@@ -30,15 +30,15 @@ - - compile: - @echo "Building file: $(GNOMEPROXY.O)" -- @echo "Invoking: GCC C Compiler" -- gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) -+ @echo "Invoking: C Compiler" -+ $(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 -+ @echo "Invoking: C Linker" -+ $(CC) $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc - @echo "Finished building target: $(LIB_NAME_FULL)" - @echo " " - ---- ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak.orig 2014-04-15 21:32:58.000000000 -0500 -+++ ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak 2014-04-16 07:57:53.000000000 -0500 -@@ -42,15 +42,15 @@ - EXEC = $(PROGRAM_OUTPUT) - DLL = $(PROGRAM_LIBRARY) - #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -lX11 --LIBS = -lpthread -ldl -+LIBS = -pthread - GTK_LIBS = \ - -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" \ - -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \ - -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\"" - LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic --CFLAGS = ${M_ARCH} -g -s -Wall\ -+CFLAGS = ${M_ARCH} -g -Wall -pthread\ - -fpic \ -- -DLINUX \ -+ -DFREEBSD \ - -DMOZILLA_FIX \ - -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ - -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ -@@ -59,7 +59,7 @@ - $(GTK_LIBS) \ - -I. \ - -I.. \ -- -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \ -+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(DEFAULT_OS) \ - `pkg-config --cflags gtk+-2.0` - - all: $(EXEC) $(DLL) -@@ -98,10 +98,10 @@ - $(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o - - $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) -- $(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) -+ $(CC) -s ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) - - $(DLL): $(DLL_OBJS) $(COMMON_OBJS) -- $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) -+ $(CC) -s $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) - - install: all - cp $(EXEC) $(OUTPUT_DIR) Property changes on: head/java/eclipse/files/patch-freebsd_natives ___________________________________________________________________ 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/amd64-patch-freebsd_natives =================================================================== --- head/java/eclipse/files/amd64-patch-freebsd_natives (revision 498879) +++ head/java/eclipse/files/amd64-patch-freebsd_natives (nonexistent) @@ -1,311 +0,0 @@ ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:04:15.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:20:17.000000000 -0500 -@@ -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.x86_64; singleton:=true - Bundle-Version: 1.2.200.qualifier - Bundle-Vendor: %providerName - Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" - Bundle-Localization: fragment --Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) -+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64)) ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml.orig 2014-04-15 21:04:15.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 2014-04-16 07:19:54.000000000 -0500 -@@ -15,10 +15,10 @@ - eclipse.platform.resources - eclipse.platform.resources - 4.6.0-SNAPSHOT -- ../../ -+ ../../../../ - - org.eclipse.core -- org.eclipse.core.filesystem.linux.x86_64 -+ org.eclipse.core.filesystem.freebsd.x86_64 - 1.2.200-SNAPSHOT - eclipse-plugin - -@@ -33,7 +33,7 @@ - p2 - - -- linux -+ freebsd - gtk - x86_64 - -@@ -50,7 +50,7 @@ - - - native -- gtk.linux.x86_64 -+ gtk.freebsd.x86_64 - - - -@@ -64,13 +64,13 @@ - process-resources - - -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ - - - ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties 2014-04-16 07:20:05.000000000 -0500 -@@ -8,5 +8,5 @@ - # Contributors: - # IBM Corporation - initial API and implementation - ############################################################################### --fragmentName = Core File System for Linux -+fragmentName = Core File System for FreeBSD - providerName = Eclipse.org ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project.orig 2014-04-15 21:04:15.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project 2014-04-16 07:19:20.000000000 -0500 -@@ -1,6 +1,6 @@ - - -- org.eclipse.core.filesystem.linux.x86_64 -+ org.eclipse.core.filesystem.freebsd.x86_64 - - - ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:26:16.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:36:19.000000000 -0500 -@@ -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.x86_64; singleton:=true - Bundle-Version: 3.105.0.qualifier - Bundle-ManifestVersion: 2 - Bundle-Localization: fragment -@@ -30,7 +30,7 @@ - org.eclipse.swt.internal.gtk; x-internal:=true, - org.eclipse.swt.internal.mozilla; 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=x86_64)) - SWT-WS: gtk --SWT-OS: linux -+SWT-OS: freebsd - SWT-Arch: x86_64 ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2014-04-15 21:26:16.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2014-04-16 07:35:58.000000000 -0500 -@@ -1,10 +1,10 @@ - -- -+ - - -- -+ - -- -+ - - - ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml.orig 2014-04-15 21:26:16.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml 2014-04-16 07:36:13.000000000 -0500 -@@ -20,12 +20,12 @@ - ../binaries-parent/ - - org.eclipse.swt -- org.eclipse.swt.gtk.linux.x86_64 -+ org.eclipse.swt.gtk.freebsd.x86_64 - 3.105.0-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk - x86_64 - ${buildId} -@@ -61,7 +61,7 @@ - - - native -- gtk.linux.x86_64 -+ gtk.freebsd.x86_64 - - - -@@ -74,7 +74,7 @@ - process-resources - - -- -+ - - - ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project.orig 2014-04-15 21:26:16.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project 2014-04-16 07:36:05.000000000 -0500 -@@ -1,6 +1,6 @@ - - -- org.eclipse.swt.gtk.linux.x86_64 -+ org.eclipse.swt.gtk.freebsd.x86_64 - - - ---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:27:02.000000000 -0500 -+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:28:07.000000000 -0500 -@@ -3,8 +3,8 @@ - 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.x86_64;singleton:=true - Bundle-Version: 1.2.0.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=x86_64)) - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 ---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml.orig 2014-04-15 21:27:02.000000000 -0500 -+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml 2014-04-16 07:28:28.000000000 -0500 -@@ -18,7 +18,7 @@ - ../../../../ - - org.eclipse.core -- org.eclipse.core.net.linux.x86_64 -+ org.eclipse.core.net.freebsd.x86_64 - 1.2.0-SNAPSHOT - eclipse-plugin - -@@ -31,7 +31,7 @@ - - - -- linux -+ freebsd - gtk - x86_64 - -@@ -48,7 +48,7 @@ - - - native -- gtk.linux.x86_64 -+ gtk.freebsd.x86_64 - - - -@@ -62,12 +62,12 @@ - process-resources - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - - ---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:27:02.000000000 -0500 -+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties 2014-04-16 07:28:39.000000000 -0500 -@@ -8,5 +8,5 @@ - # Contributors: - # IBM Corporation - initial API and implementation - ############################################################################### --fragmentName = Proxy for Linux x86_64 -+fragmentName = Proxy for FreeBSD x86_64 - providerName = Eclipse.org ---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/.project.orig 2014-04-15 21:27:02.000000000 -0500 -+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/.project 2014-04-16 07:28:03.000000000 -0500 -@@ -1,6 +1,6 @@ - - -- org.eclipse.core.net.linux.x86_64 -+ org.eclipse.core.net.freebsd.x86_64 - - - ---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:32:54.000000000 -0500 -+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:51:22.000000000 -0500 -@@ -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.x86_64;singleton:=true - Bundle-Version: 1.1.400.qualifier - Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.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=x86_64)) -+Bundle-Localization: launcher.gtk.freebsd.x86_64 - Eclipse-BundleShape: dir ---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml.orig 2014-04-23 07:51:42.000000000 -0500 -+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml 2014-04-23 10:08:46.000000000 -0500 -@@ -18,12 +18,12 @@ - ../../launcher-binary-parent - - org.eclipse.equinox -- org.eclipse.equinox.launcher.gtk.linux.x86_64 -+ org.eclipse.equinox.launcher.gtk.freebsd.x86_64 - 1.1.400-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk - x86_64 - ---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties.orig 2014-07-25 19:31:29.000000000 -0500 -+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties 2014-07-25 20:04:21.000000000 -0500 -@@ -8,5 +8,5 @@ - # Contributors: - # IBM Corporation - initial API and implementation - ############################################################################### --pluginName = Equinox Launcher Linux X86_64 Fragment -+pluginName = Equinox Launcher FreeBSD X86_64 Fragment - providerName = Eclipse.org - Equinox ---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project.orig 2014-04-15 21:32:54.000000000 -0500 -+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project 2014-04-16 07:51:09.000000000 -0500 -@@ -1,6 +1,6 @@ - - -- org.eclipse.equinox.launcher.gtk.linux.x86_64 -+ org.eclipse.equinox.launcher.gtk.freebsd.x86_64 - - - ---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties.orig 2014-07-25 19:35:37.000000000 -0500 -+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties 2014-07-25 20:07:49.000000000 -0500 -@@ -10,7 +10,7 @@ - ############################################################################### - bin.includes = META-INF/,\ -- launcher.gtk.linux.x86_64.properties,\ -+ launcher.gtk.freebsd.x86_64.properties,\ - about.html - - customBuildCallbacks=customBuildCallbacks.xml - generateSourceBundle=false Property changes on: head/java/eclipse/files/amd64-patch-freebsd_natives ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -ON \ 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-submodules =================================================================== --- head/java/eclipse/files/patch-submodules (revision 498879) +++ head/java/eclipse/files/patch-submodules (nonexistent) @@ -1,2210 +0,0 @@ -diff --git a/eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml b/eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml -index 1c2033f..e80dcd8 100644 ---- a/eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml -+++ b/eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml -@@ -70,6 +70,20 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java b/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java -index 442bd6c..119ce58 100644 ---- a/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java -+++ b/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java -@@ -694,7 +694,7 @@ public final class Utils implements IPDEBuildConstants, IBuildPropertiesConstant - arguments.add("-sf"); //$NON-NLS-1$ - arguments.add(links[i]); - arguments.add(links[i + 1]); -- script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ -+ script.printExecTask("ln", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ - arguments.clear(); - } - } -diff --git a/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java b/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java -index 08540fa..582bc74 100644 ---- a/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java -+++ b/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java -@@ -933,7 +933,7 @@ public class ModelBuildScriptGenerator extends AbstractBuildScriptGenerator { - for (int i = 0; i < links.length; i += 2) { - arguments.add(links[i]); - arguments.add(links[i + 1]); -- script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ -+ script.printExecTask("ln -s", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ - arguments.clear(); - } - } -diff --git a/eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java b/eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java -index 5399a48..e395cb5 100644 ---- a/eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java -+++ b/eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java -@@ -314,6 +314,8 @@ public class JNLPGenerator extends DefaultHandler { - return "HP-UX"; //$NON-NLS-1$ - if ("aix".equalsIgnoreCase(os)) //$NON-NLS-1$ - return "AIX"; //$NON-NLS-1$ -+ if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$ -+ return "FreeBSD"; //$NON-NLS-1$ - return os; - } - -diff --git a/eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml b/eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml -index eac9576..9081501 100644 ---- a/eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml -+++ b/eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml -@@ -18,6 +18,18 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties b/eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties -index be53c51..7e89865 100644 ---- a/eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties -+++ b/eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties -@@ -18,6 +18,8 @@ root.macosx.carbon.ppc.permissions.755=Eclipse.app/Contents/MacOS/eclipse - - root.win32.win32.x86=eclipse.exe, eclipsec.exe - root.linux.motif.x86=eclipse,libcairo-swt.so,libXm.so.2,about_files/,about.html,icon.xpm -+root.freebsd.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm -+root.freebsd.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm - root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm - root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm - root.linux.gtk.ppc=eclipse -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java -index 436c5b0..dd4b3fc 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java -@@ -336,6 +336,8 @@ public class ProductExportOperation extends FeatureExportOperation { - images = getExpandedPath(info.getIconPath(ILauncherInfo.LINUX_ICON)); - } else if (configs[i][0].equals("macosx")) { //$NON-NLS-1$ - images = getExpandedPath(info.getIconPath(ILauncherInfo.MACOSX_ICON)); -+ } else if (configs[i][0].equals("freebsd")) { //$NON-NLS-1$ -+ images = getExpandedPath(info.getIconPath(ILauncherInfo.FREEBSD_ICON)); - } - if (images != null) { - if (icons.length() > 0) -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java -index 617304c..e2a6a31 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java -@@ -17,12 +17,14 @@ public interface IArgumentsInfo extends IProductObject { - public static final String P_PROG_ARGS_MAC = "programArgsMac"; //$NON-NLS-1$ - public static final String P_PROG_ARGS_SOL = "programArgsSol"; //$NON-NLS-1$ - public static final String P_PROG_ARGS_WIN = "programArgsWin"; //$NON-NLS-1$ -+ public static final String P_PROG_ARGS_FRE = "programArgsFre"; //$NON-NLS-1$ - - public static final String P_VM_ARGS = "vmArgs"; //$NON-NLS-1$ - public static final String P_VM_ARGS_LIN = "vmArgsLin"; //$NON-NLS-1$ - public static final String P_VM_ARGS_MAC = "vmArgsMac"; //$NON-NLS-1$ - public static final String P_VM_ARGS_SOL = "vmArgsSol"; //$NON-NLS-1$ - public static final String P_VM_ARGS_WIN = "vmArgsWin"; //$NON-NLS-1$ -+ public static final String P_VM_ARGS_FRE = "vmArgsFre"; //$NON-NLS-1$ - - public static final String P_ARGS_ARCH_X86 = "argsX86"; //$NON-NLS-1$ - public static final String P_ARGS_ARCH_X86_64 = "argsX86_64"; //$NON-NLS-1$ -@@ -37,6 +39,7 @@ public interface IArgumentsInfo extends IProductObject { - public static final int L_ARGS_MACOS = 2; - public static final int L_ARGS_SOLAR = 3; - public static final int L_ARGS_WIN32 = 4; -+ public static final int L_ARGS_FRBSD = 5; - - public static final int L_ARGS_ARCH_ALL = 0; - public static final int L_ARGS_ARCH_X86 = 1; -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.java -index e88ee99..40628dc 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.java -@@ -12,6 +12,8 @@ package org.eclipse.pde.internal.core.iproduct; - - public interface ILauncherInfo extends IProductObject { - -+ public static final String FREEBSD_ICON = "freebsdIcon"; //$NON-NLS-1$ -+ - public static final String LINUX_ICON = "linuxIcon"; //$NON-NLS-1$ - - public static final String MACOSX_ICON = "macosxIcon"; //$NON-NLS-1$ -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java -index 5dcda32..437aab8 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java -@@ -20,12 +20,14 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - - private static final long serialVersionUID = 1L; - private String[] fProgramArgs = new String[8]; -+ private String[] fProgramArgsFre = new String[8]; - private String[] fProgramArgsLin = new String[8]; - private String[] fProgramArgsMac = new String[8]; - private String[] fProgramArgsSol = new String[8]; - private String[] fProgramArgsWin = new String[8]; - - private String[] fVMArgs = new String[8]; -+ private String[] fVMArgsFre = new String[8]; - private String[] fVMArgsLin = new String[8]; - private String[] fVMArgsMac = new String[8]; - private String[] fVMArgsSol = new String[8]; -@@ -34,11 +36,13 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - public ArgumentsInfo(IProductModel model) { - super(model); - this.initializeArgs(fProgramArgs); -+ this.initializeArgs(fProgramArgsFre); - this.initializeArgs(fProgramArgsLin); - this.initializeArgs(fProgramArgsMac); - this.initializeArgs(fProgramArgsSol); - this.initializeArgs(fProgramArgsWin); - this.initializeArgs(fVMArgs); -+ this.initializeArgs(fVMArgsFre); - this.initializeArgs(fVMArgsLin); - this.initializeArgs(fVMArgsMac); - this.initializeArgs(fVMArgsSol); -@@ -66,6 +70,12 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - if (isEditable()) - firePropertyChanged(P_PROG_ARGS, old, fProgramArgs[arch]); - break; -+ case L_ARGS_FRBSD : -+ old = fProgramArgsFre[arch]; -+ fProgramArgsFre[arch] = args; -+ if (isEditable()) -+ firePropertyChanged(P_PROG_ARGS_FRE, old, fProgramArgsFre[arch]); -+ break; - case L_ARGS_LINUX : - old = fProgramArgsLin[arch]; - fProgramArgsLin[arch] = args; -@@ -101,6 +111,8 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - switch (platform) { - case L_ARGS_ALL : - return fProgramArgs[arch]; -+ case L_ARGS_FRBSD : -+ return fProgramArgsFre[arch]; - case L_ARGS_LINUX : - return fProgramArgsLin[arch]; - case L_ARGS_MACOS : -@@ -150,6 +162,9 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - } else if (Platform.OS_SOLARIS.equals(os)) { - archArgs = archIndex > 0 ? getProgramArguments(L_ARGS_SOLAR, archIndex) + " " + archArgsAllPlatforms : archArgsAllPlatforms; //$NON-NLS-1$ - return getCompleteArgs(archArgs, getProgramArguments(L_ARGS_SOLAR), fProgramArgs[L_ARGS_ARCH_ALL]); -+ } else if (Platform.OS_FREEBSD.equals(os)) { -+ archArgs = archIndex > 0 ? getProgramArguments(L_ARGS_FRBSD, archIndex) + " " + archArgsAllPlatforms : archArgsAllPlatforms; //$NON-NLS-1$ -+ return getCompleteArgs(archArgs, getProgramArguments(L_ARGS_FRBSD), fProgramArgs[L_ARGS_ARCH_ALL]); - } else { - return getCompleteArgs(archArgsAllPlatforms, "", fProgramArgs[L_ARGS_ALL]); //$NON-NLS-1$ - } -@@ -170,6 +185,12 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - if (isEditable()) - firePropertyChanged(P_VM_ARGS, old, fVMArgs[arch]); - break; -+ case L_ARGS_FRBSD : -+ old = fVMArgsFre[arch]; -+ fVMArgsFre[arch] = args; -+ if (isEditable()) -+ firePropertyChanged(P_VM_ARGS_FRE, old, fVMArgsFre[arch]); -+ break; - case L_ARGS_LINUX : - old = fVMArgsLin[arch]; - fVMArgsLin[arch] = args; -@@ -205,6 +226,8 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - switch (platform) { - case L_ARGS_ALL : - return fVMArgs[arch]; -+ case L_ARGS_FRBSD : -+ return fVMArgsFre[arch]; - case L_ARGS_LINUX : - return fVMArgsLin[arch]; - case L_ARGS_MACOS : -@@ -255,6 +278,9 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - } else if (Platform.OS_SOLARIS.equals(os)) { - archArgs = archIndex > 0 ? getVMArguments(L_ARGS_SOLAR, archIndex) + " " + archArgsAllPlatforms : archArgsAllPlatforms; //$NON-NLS-1$ - return getCompleteArgs(archArgs, getVMArguments(L_ARGS_SOLAR), fVMArgs[L_ARGS_ARCH_ALL]); -+ } else if (Platform.OS_FREEBSD.equals(os)) { -+ archArgs = archIndex > 0 ? getVMArguments(L_ARGS_FRBSD, archIndex) + " " + archArgsAllPlatforms : archArgsAllPlatforms; //$NON-NLS-1$ -+ return getCompleteArgs(archArgs, getVMArguments(L_ARGS_FRBSD), fVMArgs[L_ARGS_ARCH_ALL]); - } else { - return getCompleteArgs(archArgsAllPlatforms, "", fVMArgs[L_ARGS_ARCH_ALL]); //$NON-NLS-1$ - } -@@ -278,6 +304,9 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - if (child.getNodeName().equals(P_PROG_ARGS)) { - parentArgs = fProgramArgs; - fProgramArgs[L_ARGS_ARCH_ALL] = getText(child).trim(); -+ } else if (child.getNodeName().equals(P_PROG_ARGS_FRE)) { -+ parentArgs = fProgramArgsFre; -+ fProgramArgsFre[L_ARGS_ARCH_ALL] = getText(child).trim(); - } else if (child.getNodeName().equals(P_PROG_ARGS_LIN)) { - parentArgs = fProgramArgsLin; - fProgramArgsLin[L_ARGS_ARCH_ALL] = getText(child).trim(); -@@ -293,6 +322,9 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - } else if (child.getNodeName().equals(P_VM_ARGS)) { - parentArgs = fVMArgs; - fVMArgs[L_ARGS_ARCH_ALL] = getText(child).trim(); -+ } else if (child.getNodeName().equals(P_VM_ARGS_FRE)) { -+ parentArgs = fVMArgsFre; -+ fVMArgsFre[L_ARGS_ARCH_ALL] = getText(child).trim(); - } else if (child.getNodeName().equals(P_VM_ARGS_LIN)) { - parentArgs = fVMArgsLin; - fVMArgsLin[L_ARGS_ARCH_ALL] = getText(child).trim(); -@@ -353,6 +385,15 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - writeArchArgs(fProgramArgs, subIndent, writer); - writer.println(subIndent + ""); //$NON-NLS-1$ //$NON-NLS-2$ - } -+ if (hasArgs(fProgramArgsFre)) { -+ writer.print(subIndent + "<" + P_PROG_ARGS_FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ -+ if (fProgramArgsFre[L_ARGS_ARCH_ALL].length() > 0) { -+ writer.print(getWritableString(fProgramArgsFre[L_ARGS_ARCH_ALL])); -+ } -+ writer.println(); -+ writeArchArgs(fProgramArgsFre, subIndent, writer); -+ writer.println(subIndent + ""); //$NON-NLS-1$ //$NON-NLS-2$ -+ } - if (hasArgs(fProgramArgsLin)) { - writer.print(subIndent + "<" + P_PROG_ARGS_LIN + ">"); //$NON-NLS-1$ //$NON-NLS-2$ - if (fProgramArgsLin[L_ARGS_ARCH_ALL].length() > 0) { -@@ -398,6 +439,15 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { - writeArchArgs(fVMArgs, subIndent, writer); - writer.println(subIndent + ""); //$NON-NLS-1$ //$NON-NLS-2$ - } -+ if (hasArgs(fVMArgsFre)) { -+ writer.print(subIndent + "<" + P_VM_ARGS_FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ -+ if (fVMArgsFre[L_ARGS_ARCH_ALL].length() > 0) { -+ writer.print(getWritableString(fVMArgsFre[L_ARGS_ARCH_ALL])); -+ } -+ writer.println(); -+ writeArchArgs(fVMArgsFre, subIndent, writer); -+ writer.println(subIndent + ""); //$NON-NLS-1$ //$NON-NLS-2$ -+ } - if (hasArgs(fVMArgsLin)) { - writer.print(subIndent + "<" + P_VM_ARGS_LIN + ">"); //$NON-NLS-1$ //$NON-NLS-2$ - if (fVMArgsLin[L_ARGS_ARCH_ALL].length() > 0) { -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ConfigurationFileInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ConfigurationFileInfo.java -index c3c286b..ab12da0 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ConfigurationFileInfo.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ConfigurationFileInfo.java -@@ -24,11 +24,13 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati - private String fUse; - private String fPath; - -+ private static final String FRE = Constants.OS_FREEBSD; - private static final String LIN = Constants.OS_LINUX; - private static final String MAC = Constants.OS_MACOSX; - private static final String SOL = Constants.OS_SOLARIS; - private static final String WIN = Constants.OS_WIN32; - -+ private String fFrePath, fFreUse; - private String fLinPath, fLinUse; - private String fMacPath, fMacUse; - private String fSolPath, fSolUse; -@@ -79,6 +81,9 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati - } else if (child.getNodeName().equals(WIN)) { - fWinPath = getText(child); - fWinUse = fWinPath == null ? "default" : "custom"; //$NON-NLS-1$ //$NON-NLS-2$ -+ } else if (child.getNodeName().equals(FRE)) { -+ fFrePath = getText(child); -+ fFreUse = fFrePath == null ? "default" : "custom"; //$NON-NLS-1$ //$NON-NLS-2$ - } - } - } -@@ -101,6 +106,10 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati - fWinPath = fWinPath == null ? fPath : null; - fWinUse = "custom"; //$NON-NLS-1$ - } -+ if (fFreUse == null) { -+ fFrePath = fFrePath == null ? fPath : null; -+ fFreUse = "custom"; //$NON-NLS-1$ -+ } - // null out things - fPath = null; - fUse = "default"; //$NON-NLS-1$ -@@ -159,6 +168,12 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati - writer.print(getWritableString(fWinPath.trim())); - writer.println(""); //$NON-NLS-1$ //$NON-NLS-2$ - } -+ if (fFrePath != null) { -+ writer.print(indent); -+ writer.print(" <" + FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ -+ writer.print(getWritableString(fFrePath.trim())); -+ writer.println(""); //$NON-NLS-1$ //$NON-NLS-2$ -+ } - - writer.print(indent + ""); //$NON-NLS-1$ - writer.println(); -@@ -192,6 +207,11 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati - fSolUse = use; - if (isEditable()) - firePropertyChanged(SOL, old, fSolUse); -+ } else if (Platform.OS_FREEBSD.equals(os)) { -+ String old = fFreUse; -+ fFreUse = use; -+ if (isEditable()) -+ firePropertyChanged(FRE, old, fFreUse); - } - } - -@@ -207,6 +227,8 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati - return fMacUse; - } else if (Platform.OS_SOLARIS.equals(os)) { - return fSolUse; -+ } else if (Platform.OS_FREEBSD.equals(os)) { -+ return fFreUse; - } - return null; - } -@@ -239,6 +261,11 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati - fSolPath = path; - if (isEditable()) - firePropertyChanged(SOL, old, fSolPath); -+ } else if (Platform.OS_FREEBSD.equals(os)) { -+ String old = fFrePath; -+ fFrePath = path; -+ if (isEditable()) -+ firePropertyChanged(FRE, old, fFrePath); - } - } - -@@ -254,6 +281,8 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati - return fMacPath; - } else if (Platform.OS_SOLARIS.equals(os)) { - return fSolPath; -+ } else if (Platform.OS_FREEBSD.equals(os)) { -+ return fFrePath; - } - return null; - } -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java -index e0d0333..d8b9100 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java -@@ -22,17 +22,20 @@ import org.w3c.dom.NodeList; - - public class JREInfo extends ProductObject implements IJREInfo { - -+ private static final String JRE_FRE = "freebsd"; //$NON-NLS-1$ - private static final String JRE_LIN = "linux"; //$NON-NLS-1$ - private static final String JRE_MAC = "macos"; //$NON-NLS-1$ - private static final String JRE_SOL = "solaris"; //$NON-NLS-1$ - private static final String JRE_WIN = "windows"; //$NON-NLS-1$ - - private static final long serialVersionUID = 1L; -+ private IPath fJVMFre; - private IPath fJVMLin; - private IPath fJVMMac; - private IPath fJVMSol; - private IPath fJVMWin; - -+ private boolean bIncludeFre; - private boolean bIncludeLin; - private boolean bIncludeMac; - private boolean bIncludeSol; -@@ -54,6 +57,8 @@ public class JREInfo extends ProductObject implements IJREInfo { - return fJVMMac; - } else if (Platform.OS_SOLARIS.equals(os)) { - return fJVMSol; -+ } else if (Platform.OS_FREEBSD.equals(os)) { -+ return fJVMFre; - } - return null; - } -@@ -82,6 +87,11 @@ public class JREInfo extends ProductObject implements IJREInfo { - fJVMSol = jreContainerPath; - if (isEditable()) - firePropertyChanged(JRE_SOL, old, fJVMSol); -+ } else if (Platform.OS_FREEBSD.equals(os)) { -+ IPath old = fJVMFre; -+ fJVMFre = jreContainerPath; -+ if (isEditable()) -+ firePropertyChanged(JRE_FRE, old, fJVMFre); - } - } - -@@ -118,6 +128,9 @@ public class JREInfo extends ProductObject implements IJREInfo { - } else if (child.getNodeName().equals(JRE_SOL)) { - fJVMSol = getPath(child); - bIncludeSol = include; -+ } else if (child.getNodeName().equals(JRE_FRE)) { -+ fJVMFre = getPath(child); -+ bIncludeFre = include; - } else if (child.getNodeName().equals(JRE_WIN)) { - fJVMWin = getPath(child); - bIncludeWin = include; -@@ -166,6 +179,12 @@ public class JREInfo extends ProductObject implements IJREInfo { - writer.print(fJVMSol.toPortableString()); - writer.println(""); //$NON-NLS-1$ //$NON-NLS-2$ - } -+ if (fJVMFre != null) { -+ writer.print(indent); -+ writer.print(" <" + JRE_FRE + " include=\"" + String.valueOf(bIncludeFre) + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ -+ writer.print(fJVMFre.toPortableString()); -+ writer.println(""); //$NON-NLS-1$ //$NON-NLS-2$ -+ } - if (fJVMWin != null) { - writer.print(indent); - writer.print(" <" + JRE_WIN + " include=\"" + String.valueOf(bIncludeWin) + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ -@@ -184,6 +203,8 @@ public class JREInfo extends ProductObject implements IJREInfo { - return bIncludeMac; - } else if (Platform.OS_SOLARIS.equals(os)) { - return bIncludeSol; -+ } else if (Platform.OS_FREEBSD.equals(os)) { -+ return bIncludeFre; - } - return false; - } -@@ -209,6 +230,11 @@ public class JREInfo extends ProductObject implements IJREInfo { - bIncludeSol = includeJRE; - if (isEditable()) - firePropertyChanged(JRE_SOL, old, Boolean.valueOf(bIncludeSol)); -+ } else if (Platform.OS_FREEBSD.equals(os)) { -+ Boolean old = Boolean.valueOf(bIncludeFre); -+ bIncludeFre = includeJRE; -+ if (isEditable()) -+ firePropertyChanged(JRE_FRE, old, Boolean.valueOf(bIncludeFre)); - } - } - -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java -index 9387921..5e461cc 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java -@@ -71,7 +71,9 @@ public class LauncherInfo extends ProductObject implements ILauncherInfo { - Node child = children.item(i); - if (child.getNodeType() == Node.ELEMENT_NODE) { - String name = child.getNodeName(); -- if (name.equals("linux")) { //$NON-NLS-1$ -+ if (name.equals("freebsd")) { //$NON-NLS-1$ -+ parseFreeBSD((Element) child); -+ } else if (name.equals("linux")) { //$NON-NLS-1$ - parseLinux((Element) child); - } else if (name.equals("macosx")) { //$NON-NLS-1$ - parseMac((Element) child); -@@ -122,13 +124,18 @@ public class LauncherInfo extends ProductObject implements ILauncherInfo { - fIcons.put(LINUX_ICON, element.getAttribute("icon")); //$NON-NLS-1$ - } - -+ private void parseFreeBSD(Element element) { -+ fIcons.put(FREEBSD_ICON, element.getAttribute("icon")); //$NON-NLS-1$ -+ } -+ - @Override - public void write(String indent, PrintWriter writer) { - writer.print(indent + " 0) - writer.print(" name=\"" + fLauncherName + "\""); //$NON-NLS-1$ //$NON-NLS-2$ - writer.println(">"); //$NON-NLS-1$ - -+ writeFreeBSD(indent + " ", writer); //$NON-NLS-1$ - writeLinux(indent + " ", writer); //$NON-NLS-1$ - writeMac(indent + " ", writer); //$NON-NLS-1$ - writeSolaris(indent + " ", writer); //$NON-NLS-1$ -@@ -182,4 +189,10 @@ public class LauncherInfo extends ProductObject implements ILauncherInfo { - writer.println(indent + ""); //$NON-NLS-1$ //$NON-NLS-2$ - } - -+ private void writeFreeBSD(String indent, PrintWriter writer) { -+ String icon = fIcons.get(FREEBSD_ICON); -+ if (icon != null && icon.length() > 0) -+ writer.println(indent + ""); //$NON-NLS-1$ //$NON-NLS-2$ -+ } -+ - } -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java -index 8ee34a0..d6aaf40 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java -@@ -160,7 +160,7 @@ public class IntroTemplate extends PDETemplateSection { - presentationElement.setAttribute("home-page-id", "root"); //$NON-NLS-1$ //$NON-NLS-2$ - IPluginElement implementationElement = factory.createElement(presentationElement); - implementationElement.setName("implementation"); //$NON-NLS-1$ -- implementationElement.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ -+ implementationElement.setAttribute("os", "win32,linux,macosx,freebsd"); //$NON-NLS-1$ //$NON-NLS-2$ - if (getTargetVersion() == 3.0) - implementationElement.setAttribute("style", "content/shared.css"); //$NON-NLS-1$//$NON-NLS-2$ - -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java -index 32e395e..994e51d 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java -@@ -1004,6 +1004,7 @@ public class PDEUIMessages extends NLS { - public static String LauncherSection_48High; - public static String LauncherSection_256High; - public static String LauncherSection_linuxLabel; -+ public static String LauncherSection_freebsdLabel; - public static String LauncherSection_large; - public static String LauncherSection_medium; - public static String LauncherSection_small; -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java -index 06ee395..ee92f5c 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java -@@ -34,6 +34,7 @@ public class ArgumentsSection extends PDESection { - private static final String[] TAB_LABELS = new String[5]; - static { - TAB_LABELS[IArgumentsInfo.L_ARGS_ALL] = PDEUIMessages.ArgumentsSection_allPlatforms; -+ TAB_LABELS[IArgumentsInfo.L_ARGS_FRBSD] = "freebsd"; //$NON-NLS-1$ - TAB_LABELS[IArgumentsInfo.L_ARGS_LINUX] = "linux"; //$NON-NLS-1$ - TAB_LABELS[IArgumentsInfo.L_ARGS_MACOS] = "macosx"; //$NON-NLS-1$ - TAB_LABELS[IArgumentsInfo.L_ARGS_SOLAR] = "solaris"; //$NON-NLS-1$ -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java -index e6bde32..6334e65 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java -@@ -50,8 +50,8 @@ public class ConfigurationSection extends PDESection { - private FormEntry fCustomEntry; - private boolean fBlockChanges; - -- private static final String[] TAB_LABELS = {"linux", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ -- private static final String[] TAB_OS = {Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; -+ private static final String[] TAB_LABELS = {"freebsd", "linux", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ -+ private static final String[] TAB_OS = {Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; - - private CTabFolder fTabFolder; - private int fLastTab; -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java -index e51b309..d44ec23 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java -@@ -63,8 +63,8 @@ public class JRESection extends PDESection { - private ComboViewerPart fEEsCombo; - private boolean fBlockChanges; - -- private static final String[] TAB_LABELS = {"linux", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ -- private static final String[] TAB_OS = {Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; -+ private static final String[] TAB_LABELS = {"freebsd", "linux", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ -+ private static final String[] TAB_OS = {Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; - - private CTabFolder fTabFolder; - private int fLastTab; -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java -index 7be4406..92d3bcd 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java -@@ -60,6 +60,7 @@ public class LauncherSection extends PDESection { - private CTabFolder fTabFolder; - private Composite fNotebook; - private StackLayout fNotebookLayout; -+ private Composite fFreeBSDSection; - private Composite fLinuxSection; - private Composite fMacSection; - private Composite fSolarisSection; -@@ -156,6 +157,7 @@ public class LauncherSection extends PDESection { - fNotebookLayout = new StackLayout(); - fNotebook.setLayout(fNotebookLayout); - -+ fFreeBSDSection = addFreeBSDSection(fNotebook, toolkit); - fLinuxSection = addLinuxSection(fNotebook, toolkit); - fMacSection = addMacSection(fNotebook, toolkit); - fSolarisSection = addSolarisSection(fNotebook, toolkit); -@@ -181,6 +183,7 @@ public class LauncherSection extends PDESection { - } - - private void createTabs() { -+ addTab("freebsd"); //$NON-NLS-1$ - addTab("linux"); //$NON-NLS-1$ - addTab("macosx"); //$NON-NLS-1$ - addTab("solaris"); //$NON-NLS-1$ -@@ -188,16 +191,19 @@ public class LauncherSection extends PDESection { - - String currentTarget = TargetPlatform.getOS(); - if ("win32".equals(currentTarget)) { //$NON-NLS-1$ -- fTabFolder.setSelection(3); -+ fTabFolder.setSelection(4); - fNotebookLayout.topControl = fWin32Section; - } else if ("macosx".equals(currentTarget)) { //$NON-NLS-1$ -- fTabFolder.setSelection(1); -+ fTabFolder.setSelection(2); - fNotebookLayout.topControl = fMacSection; - } else if ("solaris".equals(currentTarget)) { //$NON-NLS-1$ -- fTabFolder.setSelection(2); -+ fTabFolder.setSelection(3); - fNotebookLayout.topControl = fSolarisSection; -- } else { -+ } else if ("freebsd".equals(currentTarget)) { //$NON-NLS-1$ - fTabFolder.setSelection(0); -+ fNotebookLayout.topControl = fFreeBSDSection; -+ } else { -+ fTabFolder.setSelection(1); - fNotebookLayout.topControl = fLinuxSection; - } - } -@@ -290,6 +296,14 @@ public class LauncherSection extends PDESection { - } - } - -+ private Composite addFreeBSDSection(Composite parent, FormToolkit toolkit) { -+ Composite comp = createComposite(parent, toolkit); -+ createLabel(comp, toolkit, PDEUIMessages.LauncherSection_freebsdLabel, 3); -+ fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_icon, ILauncherInfo.FREEBSD_ICON)); -+ toolkit.paintBordersFor(comp); -+ return comp; -+ } -+ - private Composite addLinuxSection(Composite parent, FormToolkit toolkit) { - Composite comp = createComposite(parent, toolkit); - createLabel(comp, toolkit, PDEUIMessages.LauncherSection_linuxLabel, 3); -@@ -446,7 +460,7 @@ public class LauncherSection extends PDESection { - } - - private String getExtension(String iconId) { -- if (iconId.equals(ILauncherInfo.LINUX_ICON)) -+ if (iconId.equals(ILauncherInfo.LINUX_ICON) || iconId.equals(ILauncherInfo.FREEBSD_ICON)) - return "xpm"; //$NON-NLS-1$ - if (iconId.equals(ILauncherInfo.MACOSX_ICON)) - return "icns"; //$NON-NLS-1$ -@@ -473,15 +487,18 @@ public class LauncherSection extends PDESection { - Control oldPage = fNotebookLayout.topControl; - switch (index) { - case 0 : -- fNotebookLayout.topControl = fLinuxSection; -+ fNotebookLayout.topControl = fFreeBSDSection; - break; - case 1 : -- fNotebookLayout.topControl = fMacSection; -+ fNotebookLayout.topControl = fLinuxSection; - break; - case 2 : -- fNotebookLayout.topControl = fSolarisSection; -+ fNotebookLayout.topControl = fMacSection; - break; - case 3 : -+ fNotebookLayout.topControl = fSolarisSection; -+ break; -+ case 4 : - fNotebookLayout.topControl = fWin32Section; - break; - } -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties -index fecf4aa..de25e4f 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties -@@ -596,6 +596,7 @@ LauncherSection_48Low=48x48 (8-bit): - LauncherSection_48High=48x48 (32-bit): - LauncherSection_256High=256x256 (32-bit): - LauncherSection_linuxLabel=A single XPM icon is required: -+LauncherSection_freebsdLabel=A single XPM icon is required: - LauncherSection_large=Large: - LauncherSection_medium=Medium: - LauncherSection_small=Small: -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java -index 3c8c426..fa46f72 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java -@@ -128,7 +128,7 @@ public class ProductIntroOperation extends BaseManifestOperation implements IVar - implementation.setName("implementation"); //$NON-NLS-1$ - implementation.setAttribute("kind", "html"); //$NON-NLS-1$ //$NON-NLS-2$ - implementation.setAttribute("style", "content/shared.css"); //$NON-NLS-1$ //$NON-NLS-2$ -- implementation.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ -+ implementation.setAttribute("os", "win32,linux,macosx,freebsd"); //$NON-NLS-1$ //$NON-NLS-2$ - - presentation.add(implementation); - -diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java -index bcedc5e..a313d19 100644 ---- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java -+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java -@@ -106,7 +106,7 @@ public class PropertiesSection extends TableSection { - private IConfigurationProperty fEdit; - private Set fExistingNames; - -- private String[] COMBO_OSLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; -+ private String[] COMBO_OSLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32, Platform.OS_FREEBSD}; - private String[] COMBO_ARCHLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.ARCH_X86, Platform.ARCH_X86_64, Platform.ARCH_PPC, Platform.ARCH_IA64, Platform.ARCH_IA64_32, Platform.ARCH_PA_RISC, Platform.ARCH_SPARC}; - - public PropertyDialog(Shell shell, IConfigurationProperty property, Set existingNames) { -diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml -index 7e7e8ac..72c8597 100644 ---- a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml -+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml -@@ -60,6 +60,7 @@ - - - -+ - - - -@@ -70,6 +71,7 @@ - - - -+ - - - -diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml -index d8c8edf..886e7d8 100644 ---- a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml -+++ b/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml -@@ -39,11 +39,9 @@ - - - -- - - - -diff --git a/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java b/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java -index a335001..003e20a 100644 ---- a/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java -+++ b/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java -@@ -98,7 +98,7 @@ public class LocalFileSystem extends FileSystem { - String arch = System.getProperty("osgi.arch", ""); //$NON-NLS-1$ //$NON-NLS-2$ - if (os.equals(Constants.OS_WIN32)) - attributes |= EFS.ATTRIBUTE_ARCHIVE | EFS.ATTRIBUTE_HIDDEN; -- else if (os.equals(Constants.OS_LINUX) || (os.equals(Constants.OS_SOLARIS) && arch.equals(Constants.ARCH_SPARC))) -+ else if (os.equals(Constants.OS_FREEBSD) || os.equals(Constants.OS_LINUX) || (os.equals(Constants.OS_SOLARIS) && arch.equals(Constants.ARCH_SPARC))) - attributes |= EFS.ATTRIBUTE_EXECUTABLE | EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET; - else if (os.equals(Constants.OS_MACOSX) || os.equals(Constants.OS_HPUX) || os.equals(Constants.OS_QNX)) - attributes |= EFS.ATTRIBUTE_EXECUTABLE; -diff --git a/eclipse.platform.resources/pom.xml b/eclipse.platform.resources/pom.xml -index 4b33285..6b6fcc7 100644 ---- a/eclipse.platform.resources/pom.xml -+++ b/eclipse.platform.resources/pom.xml -@@ -43,6 +43,7 @@ - - - bundles/org.eclipse.core.filesystem -+ bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.%%ECLIPSE_ARCH%% - bundles/org.eclipse.core.filesystem.hpux.ia64 - bundles/org.eclipse.core.filesystem.hpux.PA_RISC - bundles/org.eclipse.core.filesystem.linux.ppc -diff --git a/eclipse.platform.resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/SymlinkTest.java b/eclipse.platform.resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/SymlinkTest.java -index 7c8ad8c..b15bbf6 100644 ---- a/eclipse.platform.resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/SymlinkTest.java -+++ b/eclipse.platform.resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/SymlinkTest.java -@@ -339,7 +339,7 @@ public class SymlinkTest extends FileSystemTest { - public void testSymlinkEnabled() { - String os = Platform.getOS(); - String arch = Platform.getOSArch(); -- if (Platform.OS_LINUX.equals(os) || (Platform.OS_SOLARIS.equals(os) && Platform.ARCH_SPARC.equals(arch)) || Platform.OS_MACOSX.equals(os) || Platform.OS_AIX.equals(os) || isWindowsVistaOrHigher()) { -+ if (Platform.OS_FREEBSD.equals(os) || Platform.OS_LINUX.equals(os) || (Platform.OS_SOLARIS.equals(os) && Platform.ARCH_SPARC.equals(arch)) || Platform.OS_MACOSX.equals(os) || Platform.OS_AIX.equals(os) || isWindowsVistaOrHigher()) { - assertTrue(haveSymlinks()); - } else { - assertFalse(haveSymlinks()); -diff --git a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java -index 8ace8e8..21ba40f 100644 ---- a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java -+++ b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java -@@ -62,7 +62,7 @@ public final class InternalPlatform { - //XXX This is not synchronized - private static Map logs = new HashMap(5); - -- private static final String[] OS_LIST = {Platform.OS_AIX, Platform.OS_HPUX, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_QNX, Platform.OS_SOLARIS, Platform.OS_WIN32}; -+ private static final String[] OS_LIST = {Platform.OS_AIX, Platform.OS_FREEBSD, Platform.OS_HPUX, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_QNX, Platform.OS_SOLARIS, Platform.OS_WIN32}; - private static String password = ""; //$NON-NLS-1$ - private static final String PASSWORD = "-password"; //$NON-NLS-1$ - -diff --git a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java -index 18b64e4..344be72 100644 ---- a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java -+++ b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java -@@ -261,6 +261,17 @@ public final class Platform { - public static final String OS_MACOSX = "macosx";//$NON-NLS-1$ - - /** -+ * Constant string (value "freebsd") indicating the platform is running on a -+ * FreeBSD operating system. -+ *

-+ * Note this constant is not officially supported by the eclipse project -+ * and is only available on eclipse versions built from the FreeBSD ports -+ * tree. -+ *

-+ */ -+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ -+ -+ /** - * Constant string (value "unknown") indicating the platform is running on a - * machine running an unknown operating system. - *

-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp -index 7c713c7..f166708 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp -@@ -180,7 +180,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1NewLocalFile) - jint rc = 0; - XPCOM_NATIVE_ENTER(env, that, _1NS_1NewLocalFile_FUNC); - if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail; -- rc = (jint)NS_NewLocalFile(*(nsAString *)arg0, arg1, (nsILocalFile**)lparg2); -+ rc = (jint)NS_NewLocalFile(*(nsAString *)arg0, arg1, (nsIFile**)lparg2); - fail: - if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0); - XPCOM_NATIVE_EXIT(env, that, _1NS_1NewLocalFile_FUNC); -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h -index afc18ec..3b6da84 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h -@@ -32,6 +32,8 @@ - - #define XPCOM_LOAD_FUNCTION LOAD_FUNCTION - -+#define nsStaticModuleInfo void -+ - #ifdef _WIN32 - #if !(defined(__i386__) || defined(_M_IX86) || defined(_X86_)) - #define nsStaticModuleInfo void /* define on 64-bit win32 due to use of XULRunner 10 SDK */ -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh -index 689616e..86afdfe 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh -@@ -64,6 +64,8 @@ case $OS in - "FreeBSD") - SWT_OS=freebsd - MAKEFILE=make_freebsd.mak -+ MAKE_TYPE=gmake -+ MODEL=`uname -m` - ;; - *) - SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'` -@@ -407,6 +409,34 @@ case $SWT_OS.$SWT_ARCH in - export PKG_CONFIG_PATH="/opt/gtk_64bit/lib/hpux64/pkgconfig" - fi - ;; -+ "freebsd.x86"|"freebsd.x86_64") -+# PATH="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin:$PATH" -+ if [ "${CC}" = "" ]; then -+ CC="cc" -+ fi -+ if [ "${CXX}" = "" ]; then -+ CXX="c++" -+ fi -+ if [ "${CDE_HOME}" = "" ]; then -+ CDE_HOME="/usr/dt" -+ fi -+ if [ "${JAVA_HOME}" = "" ]; then -+ JAVA_HOME="/usr/local/openjdk7" -+ fi -+ if [ "${PKG_CONFIG_PATH}" = "" ]; then -+ PKG_CONFIG_PATH="/usr/local/libdata/pkgconfig/" -+ fi -+# if [ "${MOZILLA_SDK}" = "" ]; then -+# MOZILLA_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk" -+# fi -+# if [ "${MOZILLA_INCLUDES}" = "" ]; then -+# MOZILLA_INCLUDES="-I${MOZILLA_SDK} -I${MOZILLA_SDK}/xpcom/include -I${MOZILLA_SDK}/nspr/include -I${MOZILLA_SDK}/embed_base/include -I${MOZILLA_SDK}/embedstring/include -I${MOZILLA_SDK}/string/include" -+# fi -+# if [ "${MOZILLA_LIBS}" = "" ]; then -+# MOZILLA_LIBS="${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4" -+# fi -+ export PATH CC CXX CDE_HOME JAVA_HOME PKG_CONFIG_PATH MOZILLA_SDK MOZILLA_INCLUDES MOZILLA_LIBS; -+ ;; - esac - - -@@ -478,24 +508,35 @@ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ] - export MOZILLA_INCLUDES - export MOZILLA_LIBS - MAKE_MOZILLA=make_mozilla -+ echo "Mozilla/XPCOM found, compiling Mozilla embedded browser support" - elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then - MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom` - MOZILLA_LIBS=`pkg-config --libs firefox-xpcom` - export MOZILLA_INCLUDES - export MOZILLA_LIBS - MAKE_MOZILLA=make_mozilla -- elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then -- XULRUNNER_INCLUDES=`pkg-config --cflags libxul` -- XULRUNNER_LIBS=`pkg-config --libs libxul` -+ echo "Firefox/XPCOM found, compiling Mozilla embedded browser support" -+ elif [ x`pkg-config --exists libxul libxul-embedding && echo YES` = "xNO" ]; then # don't bother, it doesn't work -+ XULRUNNER_INCLUDES="-include /usr/local/include/libxul/mozilla-config.h `pkg-config --cflags libxul libxul-embedding`" -+ XULRUNNER_LIBS=`pkg-config --libs libxul-embedding` - export XULRUNNER_INCLUDES - export XULRUNNER_LIBS - MAKE_MOZILLA=make_xulrunner -+ echo "XULRunner/XPCOM found, compiling Mozilla embedded browser support" - else - echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" - echo " *** Mozilla embedding support will not be compiled." - fi - fi - -+if [ x`pkg-config --exists webkit-1.0 && echo YES` = "xYES" ]; then -+ echo "WebKit found, compiling webkit embedded browser support." -+ MAKE_WEBKIT=make_webkit -+else -+ echo "WebKit not found:" -+ echo " *** WebKit embedding support will not be compiled." -+fi -+ - # Find AWT if available - if [ -z "${AWT_LIB_PATH}" ]; then - if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then -@@ -524,5 +565,5 @@ fi - if [ "x${1}" = "xclean" ]; then - ${MAKE_TYPE} -f $MAKEFILE clean - else -- ${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} -+ ${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA $MAKE_WEBKIT ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} - fi -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak -index d2da90e..51989f8 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak -@@ -1,5 +1,5 @@ - #******************************************************************************* --# Copyright (c) 2000, 2011 IBM Corporation and others. -+# Copyright (c) 2000, 2012 IBM Corporation and others. - # All rights reserved. This program and the accompanying materials - # are made available under the terms of the Eclipse Public License v1.0 - # which accompanies this distribution, and is available at -@@ -9,7 +9,7 @@ - # IBM Corporation - initial API and implementation - #******************************************************************************* - --# Makefile for creating SWT libraries for Linux GTK -+# Makefile for creating SWT libraries for FreeBSD GTK - - include make_common.mak - -@@ -21,13 +21,19 @@ WS_PREFIX = gtk - SWT_PREFIX = swt - CDE_PREFIX = swt-cde - AWT_PREFIX = swt-awt -+ifeq ($(GTK_VERSION), 3.0) -+SWTPI_PREFIX = swt-pi3 -+else - SWTPI_PREFIX = swt-pi -+endif - CAIRO_PREFIX = swt-cairo - ATK_PREFIX = swt-atk - GNOME_PREFIX = swt-gnome - MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION) - XULRUNNER_PREFIX = swt-xulrunner -+XULRUNNER24_PREFIX = swt-xulrunner24 - XPCOMINIT_PREFIX = swt-xpcominit -+WEBKIT_PREFIX = swt-webkit - GLX_PREFIX = swt-glx - - SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -@@ -39,28 +45,36 @@ ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -+XULRUNNER24_LIB = lib$(XULRUNNER24_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -+WEBKIT_LIB = lib$(WEBKIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - - CAIROCFLAGS = `pkg-config --cflags cairo` - CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo - - # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) --GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)` --GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst -+GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)` -+ifeq ($(GTK_VERSION), 3.0) -+GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0 -lXtst -+else -+GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-x11-$(GTK_VERSION) -lgthread-2.0 -lXtst -+endif - - CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc - --AWT_LFLAGS = -shared -+AWT_LFLAGS = -shared ${SWT_LFLAGS} - AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt - --ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)` --ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 -+ATKCFLAGS = `pkg-config --cflags atk gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)` -+ATKLIBS = `pkg-config --libs-only-L atk` -latk-1.0 - - GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` - GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 - --GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -lGL -lGLU -lm -+ -+SWT_LFLAGS = -L/usr/local/lib - - # Uncomment for Native Stats tool - #NATIVE_STATS = -DNATIVE_STATS -@@ -75,11 +89,24 @@ MOZILLACFLAGS = -O \ - -Wno-non-virtual-dtor \ - -fPIC \ - -I. \ -+ -I/usr/local/include \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/freebsd \ - ${SWT_PTR_CFLAGS} --MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic -- -+MOZILLALFLAGS = -shared ${SWT_LFLAGS} -Wl,--version-script=mozilla_exports -Bsymbolic -+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ -+ -DNO__1XPCOMGlueStartup \ -+ -DNO__1XPCOMGlueLoadXULFunctions \ -+ -DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \ -+ -DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \ -+ -DNO_nsDynamicFunctionLoad_1sizeof \ -+ -DNO__1Call__IIIIII \ -+ -DNO__1Call__JJJJJI \ -+ -DNO_nsDynamicFunctionLoad -+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2 -+ -+WEBKITCFLAGS = `pkg-config --cflags glib-2.0` -+ - SWT_OBJECTS = swt.o c.o c_stats.o callback.o - CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o - AWT_OBJECTS = swt_awt.o -@@ -88,19 +115,22 @@ CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o - ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o - GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o - MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o --XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o -+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o -+XULRUNNER24_OBJECTS = swt.o xpcom24_custom.o - XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o -+WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o - GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - - CFLAGS = -O -Wall \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DFREEBSD -DGTK \ -+ -I/usr/local/include \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/freebsd \ - -fPIC \ - ${SWT_PTR_CFLAGS} --LFLAGS = -shared -fPIC -+LFLAGS = -shared -fPIC ${SWT_LFLAGS} - - ifndef NO_STRIP - AWT_LFLAGS := $(AWT_LFLAGS) -s -@@ -108,7 +138,7 @@ ifndef NO_STRIP - LFLAGS := $(LFLAGS) -s - endif - --all: make_swt make_atk make_gnome make_glx -+all: make_swt make_atk make_glx make_webkit - - # - # SWT libs -@@ -210,42 +240,47 @@ $(MOZILLA_LIB): $(MOZILLA_OBJECTS) - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} - - xpcom.o: xpcom.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp - - xpcom_structs.o: xpcom_structs.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp - - xpcom_custom.o: xpcom_custom.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp - - xpcom_stats.o: xpcom_stats.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp - - # --# XULRunner lib -+# XULRunner libs - # - make_xulrunner:$(XULRUNNER_LIB) - - $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) -+ echo -e "#include\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | $(CXX) $(LFLAGS) $(CFLAGS) -xc - -o libswt-xulrunner-fix10.so - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} - - xpcomxul.o: xpcom.cpp -- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp -+ $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp - - xpcomxul_structs.o: xpcom_structs.cpp -- $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp -+ $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp - - xpcomxul_custom.o: xpcom_custom.cpp -- $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp -+ $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp - - xpcomxul_stats.o: xpcom_stats.cpp -- $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp -+ $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp -+ -+ -+make_xulrunner24:$(XULRUNNER24_LIB) - --xpcomxulglue.o: xpcomglue.cpp -- $(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp -+$(XULRUNNER24_LIB): $(XULRUNNER24_OBJECTS) -+ echo -e "#include\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | $(CXX) $(LFLAGS) $(CFLAGS) -L${XULRUNNER24_SDK}/lib -Wl,--whole-archive -lmozglue -Wl,--no-whole-archive -xc - -o libswt-xulrunner-fix24.so -+ $(CXX) -o $(XULRUNNER24_LIB) $(XULRUNNER24_OBJECTS) $(MOZILLALFLAGS) -L${XULRUNNER24_SDK}/lib -lxpcomglue - --xpcomxulglue_stats.o: xpcomglue_stats.cpp -- $(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp -+xpcom24_custom.o: xpcom24_custom.cpp -+ $(CXX) $(MOZILLACFLAGS) -c xpcom24_custom.cpp - - # - # XPCOMInit lib -@@ -265,6 +300,23 @@ xpcominit_stats.o: xpcominit_stats.cpp - $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp - - # -+# WebKit lib -+# -+make_webkit: $(WEBKIT_LIB) -+ -+$(WEBKIT_LIB): $(WEBKIT_OBJECTS) -+ $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) -+ -+webkit.o: webkitgtk.c -+ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o -+ -+webkit_structs.o: webkitgtk_structs.c -+ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_structs.c -o webkit_structs.o -+ -+webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h -+ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o -+ -+# - # GLX lib - # - make_glx: $(GLX_LIB) -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c -index 8392189..f02a5ef 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c -@@ -4162,11 +4162,17 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init) - JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported) - (JNIEnv *env, jclass that) - { -+ return 1; -+ /* -+ g_thread_supported is non-existent in glib-2.36+, -+ but is still referenced. -+ - jboolean rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1thread_1supported_FUNC); - rc = (jboolean)g_thread_supported(); - OS_NATIVE_EXIT(env, that, _1g_1thread_1supported_FUNC); - return rc; -+ */ - } - #endif - -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java -index cc81dd1..fa992cd 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java -@@ -47,18 +47,19 @@ public class OS extends C { - } - - /** OS Constants */ -- public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, BIG_ENDIAN; -+ public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsFreeBSD, BIG_ENDIAN; - static { - - /* Initialize the OS flags and locale constants */ - String osName = System.getProperty ("os.name"); -- boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false; -+ boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isFreeBSD = false; - if (osName.equals ("Linux")) isLinux = true; - if (osName.equals ("AIX")) isAIX = true; - if (osName.equals ("Solaris")) isSunOS = true; - if (osName.equals ("SunOS")) isSunOS = true; - if (osName.equals ("HP-UX")) isHPUX = true; -- IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; -+ if (osName.equals ("FreeBSD")) isFreeBSD = true; -+ IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; IsFreeBSD = isFreeBSD; - - byte[] buffer = new byte[4]; - long /*int*/ ptr = OS.malloc(4); -diff --git a/eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf b/eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf -index 39c103e..d1b97c0 100644 ---- a/eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf -+++ b/eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf -@@ -73,3 +73,8 @@ requires.17.namespace = org.eclipse.equinox.p2.iu - requires.17.name = org.eclipse.swt.gtk.hpux.ia64 - requires.17.range = 0.0.0 - requires.17.filter = (&(osgi.os=hpux)(osgi.ws=gtk)(osgi.arch=ia64)) -+ -+requires.18.namespace = org.eclipse.equinox.p2.iu -+requires.18.name = org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%% -+requires.18.range = 0.0.0 -+requires.18.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%)) -diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf -index 98517c0..6f17162 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf -@@ -95,3 +95,8 @@ requires.19.namespace = org.eclipse.equinox.p2.iu - requires.19.name = org.eclipse.swt.gtk.linux.aarch64 - requires.19.range = [$version$,$version$] - requires.19.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true))) -+ -+requires.20.namespace = org.eclipse.equinox.p2.iu -+requires.20.name = org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%% -+requires.20.range = [$version$,$version$] -+requires.20.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%)(!(org.eclipse.swt.buildtime=true))) -diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml -index cc8d6f7..46c8f5a 100644 ---- a/eclipse.platform.swt.binaries/pom.xml -+++ b/eclipse.platform.swt.binaries/pom.xml -@@ -91,6 +91,7 @@ - bundles/org.eclipse.swt.gtk.linux.s390x - bundles/org.eclipse.swt.gtk.linux.x86 - bundles/org.eclipse.swt.gtk.linux.x86_64 -+ bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%% - bundles/org.eclipse.swt.gtk.solaris.sparcv9 - bundles/org.eclipse.swt.gtk.solaris.x86_64 - bundles/org.eclipse.swt.win32.win32.x86 -diff --git a/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c b/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c -index 2417b4e..c665afe 100644 ---- a/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c -+++ b/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c -@@ -17,7 +17,7 @@ - #include - #include - --#ifdef __linux__ -+#ifdef __STDC__ - #include - #else - #include -diff --git a/eclipse.platform.team/pom.xml b/eclipse.platform.team/pom.xml -index d192566..3b590cd 100644 ---- a/eclipse.platform.team/pom.xml -+++ b/eclipse.platform.team/pom.xml -@@ -63,6 +63,7 @@ - features/org.eclipse.cvs-feature - - -+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.%%ECLIPSE_ARCH%% - bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86 - bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64 - bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86 -diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java -index 7482d60..c3150b7 100644 ---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java -+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java -@@ -39,6 +39,9 @@ public class HelpBasePreferenceInitializer extends - } else if (os.indexOf("linux") != -1) { //$NON-NLS-1$ - prefs.put("custom_browser_path", //$NON-NLS-1$ - "konqueror %1"); //$NON-NLS-1$ -+ } else if (os.indexOf("freebsd") != -1) { //$NON-NLS-1$ -+ prefs.put("custom_browser_path", //$NON-NLS-1$ -+ "firefox %1"); //$NON-NLS-1$ - } else { - prefs.put("custom_browser_path", "mozilla %1"); //$NON-NLS-1$ //$NON-NLS-2$ - } -diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java -index 3fc1fd7..47ab00d 100644 ---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java -+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java -@@ -99,6 +99,7 @@ public class BrowserManager { - if (Constants.WS_WIN32.equalsIgnoreCase(os)) { - setDefaultBrowserID(BROWSER_ID_SYSTEM); - } else if (Constants.OS_AIX.equalsIgnoreCase(os) -+ || (Constants.OS_FREEBSD.equalsIgnoreCase(os)) - || (Constants.OS_HPUX.equalsIgnoreCase(os)) - || (Constants.OS_LINUX.equalsIgnoreCase(os)) - || (Constants.OS_SOLARIS.equalsIgnoreCase(os))) { -diff --git a/eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java b/eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java -index dec7f54..859167c 100644 ---- a/eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java -+++ b/eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java -@@ -64,7 +64,8 @@ public class EmbeddedBrowserFactory implements IBrowserFactory { - */ - private boolean test() { - if (!Constants.OS_WIN32.equalsIgnoreCase(Platform.getOS()) -- && !Constants.OS_LINUX.equalsIgnoreCase(Platform.getOS())) { -+ && !Constants.OS_LINUX.equalsIgnoreCase(Platform.getOS()) -+ && !Constants.OS_FREEBSD.equalsIgnoreCase(Platform.getOS())) { - return false; - } - if (!tested) { -diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml -index 966c283..fdde997 100644 ---- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml -+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml -@@ -455,6 +465,16 @@ - fragment="true"/> - - -+ -+ - - -+ -+ - - -+ - - - -diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml -index 32968af..6610342 100644 ---- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml -+++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml -@@ -21,4 +21,70 @@ - org.eclipse.equinox.launcher - 1.3.200-SNAPSHOT - eclipse-plugin -+ -+ -+ -+ -+ -+ maven-antrun-plugin -+ 1.7 -+ -+ -+ bsf -+ bsf -+ 2.4.0 -+ -+ -+ rhino -+ js -+ 1.7R2 -+ -+ -+ org.apache.ant -+ ant-apache-bsf -+ 1.8.3 -+ -+ -+ org.apache.ant -+ ant-nodeps -+ 1.8.1 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ build-native-launchers-gtk.freebsd.%%ECLIPSE_ARCH%% -+ -+ -+ native -+ gtk.freebsd.%%ECLIPSE_ARCH%% -+ -+ -+ -+ -+ -+ maven-antrun-plugin -+ -+ -+ compile-executable-natives -+ generate-resources -+ -+ -+ -+ -+ -+ -+ run -+ -+ -+ -+ -+ -+ -+ -+ - -diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java -index 6e83b71..db56cd5 100644 ---- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java -+++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java -@@ -26,6 +26,7 @@ public class Constants { - public static final String INTERNAL_OS_OS400 = "OS/400"; //$NON-NLS-1$ - public static final String INTERNAL_OS_OS390 = "OS/390"; //$NON-NLS-1$ - public static final String INTERNAL_OS_ZOS = "z/OS"; //$NON-NLS-1$ -+ public static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$ - - public static final String ARCH_X86 = "x86";//$NON-NLS-1$ - public static final String ARCH_X86_64 = "x86_64";//$NON-NLS-1$ -@@ -91,6 +92,17 @@ public class Constants { - public static final String OS_ZOS = "z/os"; //$NON-NLS-1$ - - /** -+ * Constant string (value "freebsd") indicating the platform is running on a -+ * FreeBSD operating system. -+ *

-+ * Note this constant is not officially supported by the eclipse project -+ * and is only available on eclipse versions built from the FreeBSD ports -+ * tree. -+ *

-+ */ -+ public static final String OS_FREEBSD = "freebsd"; //$NON-NLS-1$ -+ -+ /** - * Constant string (value "unknown") indicating the platform is running on a - * machine running an unknown operating system. - */ -diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java -index 85417f6..5448261 100644 ---- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java -+++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java -@@ -336,6 +336,8 @@ public class Main { - return Constants.WS_GTK; - if (osName.equals(Constants.OS_QNX)) - return Constants.WS_PHOTON; -+ if (osName.equals(Constants.OS_FREEBSD)) -+ return Constants.WS_GTK; - return Constants.WS_UNKNOWN; - } - -@@ -382,6 +384,8 @@ public class Main { - // os.name on Mac OS can be either Mac OS or Mac OS X - if (osName.regionMatches(true, 0, Constants.INTERNAL_OS_MACOSX, 0, Constants.INTERNAL_OS_MACOSX.length())) - return Constants.OS_MACOSX; -+ if (osName.equalsIgnoreCase(Constants.INTERNAL_OS_FREEBSD)) -+ return Constants.OS_FREEBSD; - return Constants.OS_UNKNOWN; - } - -diff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java -index 6f2b039..7feb9b6 100644 ---- a/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java -+++ b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java -@@ -77,7 +77,7 @@ public class TextProcessor { - - 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("windows") || osName.startsWith("linux") || osName.startsWith("mac") || osName.startsWith("freebsd")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - IS_PROCESSING_NEEDED = true; - } - } -diff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java -index 0d091d7..5acffe0 100644 ---- a/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java -+++ b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java -@@ -40,6 +40,7 @@ public class EclipseEnvironmentInfo implements EnvironmentInfo { - private static final String INTERNAL_OS_OS400 = "OS/400"; //$NON-NLS-1$ - private static final String INTERNAL_OS_OS390 = "OS/390"; //$NON-NLS-1$ - private static final String INTERNAL_OS_ZOS = "z/OS"; //$NON-NLS-1$ -+ private static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$ - // While we recognize the i386 architecture, we change - // this internally to be x86. - private static final String INTERNAL_ARCH_I386 = "i386"; //$NON-NLS-1$ -@@ -202,6 +203,8 @@ public class EclipseEnvironmentInfo implements EnvironmentInfo { - return Constants.WS_GTK; - if (osName.equals(Constants.OS_QNX)) - return Constants.WS_PHOTON; -+ if (osName.equals(Constants.OS_FREEBSD)) -+ return Constants.WS_GTK; - return Constants.WS_UNKNOWN; - } - -@@ -230,6 +233,8 @@ public class EclipseEnvironmentInfo implements EnvironmentInfo { - // os.name on Mac OS can be either Mac OS or Mac OS X - if (osName.regionMatches(true, 0, INTERNAL_OS_MACOSX, 0, INTERNAL_OS_MACOSX.length())) - return Constants.OS_MACOSX; -+ if (osName.equalsIgnoreCase(INTERNAL_OS_FREEBSD)) -+ return Constants.OS_FREEBSD; - return Constants.OS_UNKNOWN; - } - -diff --git a/rt.equinox.framework/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterImpl.java b/rt.equinox.framework/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterImpl.java -index fe1447f..3160fd5 100644 ---- a/rt.equinox.framework/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterImpl.java -+++ b/rt.equinox.framework/bundles/org.eclipse.osgi.compatibility.plugins/src/org/eclipse/osgi/compatibility/plugins/PluginConverterImpl.java -@@ -68,7 +68,7 @@ public class PluginConverterImpl implements PluginConverter { - static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$ - static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$ - static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$ -- private static final String[] OS_LIST = {org.eclipse.osgi.service.environment.Constants.OS_AIX, org.eclipse.osgi.service.environment.Constants.OS_HPUX, org.eclipse.osgi.service.environment.Constants.OS_LINUX, org.eclipse.osgi.service.environment.Constants.OS_MACOSX, org.eclipse.osgi.service.environment.Constants.OS_QNX, org.eclipse.osgi.service.environment.Constants.OS_SOLARIS, org.eclipse.osgi.service.environment.Constants.OS_WIN32}; -+ private static final String[] OS_LIST = {org.eclipse.osgi.service.environment.Constants.OS_AIX, org.eclipse.osgi.service.environment.Constants.OS_FREEBSD, org.eclipse.osgi.service.environment.Constants.OS_HPUX, org.eclipse.osgi.service.environment.Constants.OS_LINUX, org.eclipse.osgi.service.environment.Constants.OS_MACOSX, org.eclipse.osgi.service.environment.Constants.OS_QNX, org.eclipse.osgi.service.environment.Constants.OS_SOLARIS, org.eclipse.osgi.service.environment.Constants.OS_WIN32}; - protected static final String PI_RUNTIME = "org.eclipse.core.runtime"; //$NON-NLS-1$ - protected static final String PI_BOOT = "org.eclipse.core.boot"; //$NON-NLS-1$ - protected static final String PI_RUNTIME_COMPATIBILITY = "org.eclipse.core.runtime.compatibility"; //$NON-NLS-1$ -diff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java b/rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java -index 4b017cd..013d6b1 100644 ---- a/rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java -+++ b/rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java -@@ -93,6 +93,15 @@ public interface Constants { - public static final String OS_ZOS = "z/os"; //$NON-NLS-1$ - - /** -+ * Constant string (value "freebsd") indicating the platform is running on a -+ * FreeBSD operating system. -+ * Note this constant is not officially supported by the eclipse project -+ * and is only available on eclipse versions built from the FreeBSD ports -+ * tree. -+ */ -+ public static final String OS_FREEBSD = "freebsd"; //$NON-NLS-1$ -+ -+ /** - * Constant string (value "unknown") indicating the platform is running on a - * machine running an unknown operating system. - */ -diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml -index 7b4a01b..fbbbe06 100644 ---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml -+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml -@@ -92,6 +92,16 @@ - fragment="true"/> - - -+ -+ " -+ ;; -+ esac -+ ;; - "AIX" | "aix") - makefile="make_aix.mak" - defaultOS="aix" -@@ -220,13 +243,14 @@ export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS DEFAULT_J - # If the OS is supported (a makefile exists) - if [ "$makefile" != "" ]; then - if [ "$extraArgs" != "" ]; then -- make -f $makefile $extraArgs -+ echo "Building $OS launcher with args $extraArgs. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" -+ ${MAKE} -f $makefile $extraArgs - else - echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" -- make -f $makefile clean -+ ${MAKE} -f $makefile clean - case x$CC in -- x*gcc*) make -f $makefile all PICFLAG=-fpic ;; -- *) make -f $makefile all ;; -+ x*cc*) ${MAKE} -f $makefile all PICFLAG=-fpic ;; -+ *) ${MAKE} -f $makefile all ;; - esac - fi - else -diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml -index 156de22..7353724 100644 ---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml -+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml -@@ -130,6 +130,36 @@ - - - -+ build-native-launchers-gtk.freebsd.%%ECLIPSE_ARCH%% -+ -+ -+ native -+ gtk.freebsd.%%ECLIPSE_ARCH%% -+ -+ -+ -+ -+ -+ maven-antrun-plugin -+ -+ -+ compile-executable-natives -+ generate-resources -+ -+ -+ -+ -+ -+ -+ run -+ -+ -+ -+ -+ -+ -+ -+ - build-native-launchers-gtk.linux.x86_64 - - -@@ -343,6 +373,7 @@ - - - -+ - - - -diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties -index 0f30a87..36382de 100644 ---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties -+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties -@@ -19,6 +19,11 @@ root.win32.win32.x86.permissions.755=launcher.exe - root.win32.win32.x86_64=file:bin/win32/win32/x86_64/launcher.exe - root.win32.win32.x86_64.permissions.755=launcher.exe - -+root.freebsd.gtk.x86=bin/gtk/freebsd/x86,gtk_root -+root.freebsd.gtk.x86.permissions.755=launcher,libcairo-swt.so -+root.freebsd.gtk.x86_64=bin/gtk/freebsd/x86_64,gtk_root -+root.freebsd.gtk.x86_64.permissions.755=launcher,libcairo-swt.so -+ - root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root - root.linux.gtk.x86.permissions.755=launcher,libcairo-swt.so - -diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml -index cdded03..a2a0af3 100644 ---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml -+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml -@@ -128,6 +128,22 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -243,6 +259,8 @@ - - - -+ -+ - - - -diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml -index b46cdc6..d46c81d 100644 ---- a/rt.equinox.framework/pom.xml -+++ b/rt.equinox.framework/pom.xml -@@ -60,6 +60,7 @@ - bundles/org.eclipse.equinox.launcher.gtk.linux.s390x - bundles/org.eclipse.equinox.launcher.gtk.linux.x86 - bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64 -+ bundles/org.eclipse.equinox.launcher.gtk.freebsd.%%ECLIPSE_ARCH%% - bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64 - bundles/org.eclipse.equinox.launcher.win32.win32.x86 - bundles/org.eclipse.equinox.launcher.win32.win32.x86_64 -diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java -index 3cf2fe1..53f82b3 100644 ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java -+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java -@@ -123,6 +123,8 @@ public class BrandingIron { - brandAIX(descriptor); - else if ("hpux".equals(os)) //$NON-NLS-1$ - brandHPUX(descriptor); -+ else if ("freebsd".equals(os)) //$NON-NLS-1$ -+ brandFreeBSD(descriptor); - else - renameLauncher(descriptor); - descriptor.setExecutableName(name, true); -@@ -178,6 +180,14 @@ public class BrandingIron { - } - } - -+ private void brandFreeBSD(ExecutablesDescriptor descriptor) throws Exception { -+ renameLauncher(descriptor); -+ -+ File root = descriptor.getLocation(); -+ if (brandIcons) -+ Utils.copy(new File(icons[0]), new File(root, "icon.xpm")); //$NON-NLS-1$ -+ } -+ - private void brandMac(ExecutablesDescriptor descriptor) throws Exception { - //Initially the files are in: /Eclipse.app/ - //and they must appear in /MyAppName.app/ -diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java -index 73fd078..89299b2 100644 ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java -+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java -@@ -68,11 +68,13 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - private final static SAXParserFactory parserFactory = SAXParserFactory.newInstance(); - - private static final String PROGRAM_ARGS = "programArgs"; //$NON-NLS-1$ -+ private static final String PROGRAM_ARGS_FREEBSD = "programArgsFre"; //$NON-NLS-1$ - private static final String PROGRAM_ARGS_LINUX = "programArgsLin"; //$NON-NLS-1$ - private static final String PROGRAM_ARGS_MAC = "programArgsMac"; //$NON-NLS-1$ - private static final String PROGRAM_ARGS_SOLARIS = "programArgsSol"; //$NON-NLS-1$ - private static final String PROGRAM_ARGS_WIN = "programArgsWin"; //$NON-NLS-1$ - private static final String VM_ARGS = "vmArgs"; //$NON-NLS-1$ -+ private static final String VM_ARGS_FREEBSD = "vmArgsFre"; //$NON-NLS-1$ - private static final String VM_ARGS_LINUX = "vmArgsLin"; //$NON-NLS-1$ - private static final String VM_ARGS_MAC = "vmArgsMac"; //$NON-NLS-1$ - private static final String VM_ARGS_SOLARIS = "vmArgsSol"; //$NON-NLS-1$ -@@ -95,6 +97,7 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - private static final String OS_LINUX = "linux";//$NON-NLS-1$ - private static final String OS_SOLARIS = "solaris";//$NON-NLS-1$ - private static final String OS_MACOSX = "macosx";//$NON-NLS-1$ -+ private static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ - - // These must match Platform constant values - private static final String ARCH_X86 = "x86"; //$NON-NLS-1$ -@@ -138,11 +141,13 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - private static final int STATE_PLUGINS = 4; - private static final int STATE_FEATURES = 5; - private static final int STATE_PROGRAM_ARGS = 6; -+ private static final int STATE_PROGRAM_ARGS_FREEBSD = 100; - private static final int STATE_PROGRAM_ARGS_LINUX = 7; - private static final int STATE_PROGRAM_ARGS_MAC = 8; - private static final int STATE_PROGRAM_ARGS_SOLARIS = 9; - private static final int STATE_PROGRAM_ARGS_WIN = 10; - private static final int STATE_VM_ARGS = 11; -+ private static final int STATE_VM_ARGS_FREEBSD = 101; - private static final int STATE_VM_ARGS_LINUX = 12; - private static final int STATE_VM_ARGS_MAC = 13; - private static final int STATE_VM_ARGS_SOLARIS = 14; -@@ -532,6 +537,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - key = VM_ARGS_MAC; - } else if (os.equals(OS_SOLARIS)) { - key = VM_ARGS_SOLARIS; -+ } else if (os.equals(OS_FREEBSD)) { -+ key = VM_ARGS_FREEBSD; - } - - arch = arch == null ? "" : arch; //$NON-NLS-1$ -@@ -611,6 +618,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - key = PROGRAM_ARGS_MAC; - } else if (os.equals(OS_SOLARIS)) { - key = PROGRAM_ARGS_SOLARIS; -+ } else if (os.equals(OS_FREEBSD)) { -+ key = PROGRAM_ARGS_FREEBSD; - } - - arch = arch == null ? "" : arch; //$NON-NLS-1$ -@@ -724,6 +733,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - processLinux(attributes); - } else if (OS_MACOSX.equals(localName)) { - processMac(attributes); -+ } else if (OS_FREEBSD.equals(localName)) { -+ processFreeBSD(attributes); - } - if ("ico".equals(localName)) { //$NON-NLS-1$ - processIco(attributes); -@@ -735,6 +746,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - case STATE_LAUNCHER_ARGS : - if (PROGRAM_ARGS.equals(localName)) { - state = STATE_PROGRAM_ARGS; -+ } else if (PROGRAM_ARGS_FREEBSD.equals(localName)) { -+ state = STATE_PROGRAM_ARGS_FREEBSD; - } else if (PROGRAM_ARGS_LINUX.equals(localName)) { - state = STATE_PROGRAM_ARGS_LINUX; - } else if (PROGRAM_ARGS_MAC.equals(localName)) { -@@ -745,6 +758,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - state = STATE_PROGRAM_ARGS_WIN; - } else if (VM_ARGS.equals(localName)) { - state = STATE_VM_ARGS; -+ } else if (VM_ARGS_FREEBSD.equals(localName)) { -+ state = STATE_VM_ARGS_FREEBSD; - } else if (VM_ARGS_LINUX.equals(localName)) { - state = STATE_VM_ARGS_LINUX; - } else if (VM_ARGS_MAC.equals(localName)) { -@@ -764,6 +779,11 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - setArchState(localName); - break; - -+ case STATE_PROGRAM_ARGS_FREEBSD : -+ platformKeyPrefix = PROGRAM_ARGS_FREEBSD; -+ setArchState(localName); -+ break; -+ - case STATE_PROGRAM_ARGS_LINUX : - platformKeyPrefix = PROGRAM_ARGS_LINUX; - setArchState(localName); -@@ -789,6 +809,11 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - setArchState(localName); - break; - -+ case STATE_VM_ARGS_FREEBSD : -+ platformKeyPrefix = VM_ARGS_FREEBSD; -+ setArchState(localName); -+ break; -+ - case STATE_VM_ARGS_LINUX : - platformKeyPrefix = VM_ARGS_LINUX; - setArchState(localName); -@@ -961,11 +986,13 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - break; - - case STATE_PROGRAM_ARGS : -+ case STATE_PROGRAM_ARGS_FREEBSD : - case STATE_PROGRAM_ARGS_LINUX : - case STATE_PROGRAM_ARGS_MAC : - case STATE_PROGRAM_ARGS_SOLARIS : - case STATE_PROGRAM_ARGS_WIN : - case STATE_VM_ARGS : -+ case STATE_VM_ARGS_FREEBSD : - case STATE_VM_ARGS_LINUX : - case STATE_VM_ARGS_MAC : - case STATE_VM_ARGS_SOLARIS : -@@ -1008,6 +1035,9 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - case STATE_PROGRAM_ARGS : - addLaunchArgumentToMap(PROGRAM_ARGS, String.valueOf(ch, start, length)); - break; -+ case STATE_PROGRAM_ARGS_FREEBSD : -+ addLaunchArgumentToMap(PROGRAM_ARGS_FREEBSD, String.valueOf(ch, start, length)); -+ break; - case STATE_PROGRAM_ARGS_LINUX : - addLaunchArgumentToMap(PROGRAM_ARGS_LINUX, String.valueOf(ch, start, length)); - break; -@@ -1023,6 +1053,9 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - case STATE_VM_ARGS : - addLaunchArgumentToMap(VM_ARGS, String.valueOf(ch, start, length)); - break; -+ case STATE_VM_ARGS_FREEBSD : -+ addLaunchArgumentToMap(VM_ARGS_FREEBSD, String.valueOf(ch, start, length)); -+ break; - case STATE_VM_ARGS_LINUX : - addLaunchArgumentToMap(VM_ARGS_LINUX, String.valueOf(ch, start, length)); - break; -@@ -1206,6 +1239,10 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { - addIcon(OS_WIN32, attributes.getValue(WIN32_256_HIGH)); - } - -+ private void processFreeBSD(Attributes attributes) { -+ addIcon(OS_FREEBSD, attributes.getValue(ATTRIBUTE_ICON)); -+ } -+ - private void processLinux(Attributes attributes) { - addIcon(OS_LINUX, attributes.getValue(ATTRIBUTE_ICON)); - } -diff --git a/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties b/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties -index d8e85b5..10e1c66 100644 ---- a/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties -+++ b/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties -@@ -29,7 +29,8 @@ collectingFolder=${archivePrefix} - # configs=win32,win32,x86 & linux,motif,x86 - # By default the value is *,*,* - configs = win32, win32, x86 & \ -- linux, gtk, x86 & -+ linux, gtk, x86 & \ -+ freebsd, gtk, x86 - #configs=win32, win32, x86 & \ - # linux, gtk, ppc &\ - # linux, gtk, x86 & \ -diff --git a/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.discovery.releng/build.properties b/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.discovery.releng/build.properties -index 4be192c..10e1c66 100644 ---- a/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.discovery.releng/build.properties -+++ b/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.discovery.releng/build.properties -@@ -29,7 +29,8 @@ collectingFolder=${archivePrefix} - # configs=win32,win32,x86 & linux,motif,x86 - # By default the value is *,*,* - configs = win32, win32, x86 & \ -- linux, gtk, x86 -+ linux, gtk, x86 & \ -+ freebsd, gtk, x86 - #configs=win32, win32, x86 & \ - # linux, gtk, ppc &\ - # linux, gtk, x86 & \ -diff --git a/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml b/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml -index 70fdde5..d9807d9 100644 ---- a/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml -+++ b/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml -@@ -39,6 +39,9 @@ - - - -+ -+ -+ - - - -diff --git a/eclipse.platform.ua/org.eclipse.ui.intro.universal/plugin.xml b/eclipse.platform.ua/org.eclipse.ui.intro.universal/plugin.xml -index e9f8e1d..35b3df6 100644 ---- a/eclipse.platform.ua/org.eclipse.ui.intro.universal/plugin.xml -+++ b/eclipse.platform.ua/org.eclipse.ui.intro.universal/plugin.xml -@@ -46,7 +46,7 @@ - -+ os="win32,freebsd,linux,macosx,solaris"> - - -diff --git a/eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml b/eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml -index 7ed3896..84af871 100644 ---- a/eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml -+++ b/eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml -@@ -87,7 +87,7 @@ - - -diff --git a/eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml b/eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml -index 46672cb..86bfcd5 100644 ---- a/eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml -+++ b/eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml -@@ -1184,7 +1184,7 @@ - %blockSelectionModeFont.description - - - -diff --git a/eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml b/eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml -index 5334aec..0f27c9b 100644 ---- a/eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml -+++ b/eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml -@@ -21,6 +21,12 @@ - os="linux"> - - -+ -+ - -+ -+ - - - -+ tar.gz - tar.gz - - -diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product -index 92973d3..b492f25 100644 ---- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product -+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product -@@ -43,7 +43,10 @@ - - - -+ -+ - - - -@@ -128,11 +131,14 @@ - - - -+ -+ - - - -diff --git a/eclipse.platform.releng/features/org.eclipse.rcp/pom.xml b/eclipse.platform.releng/features/org.eclipse.rcp/pom.xml -index dde92d3..09ab2ae 100644 ---- a/eclipse.platform.releng/features/org.eclipse.rcp/pom.xml -+++ b/eclipse.platform.releng/features/org.eclipse.rcp/pom.xml -@@ -37,6 +37,7 @@ - - - -+ - - - -diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml -index 35144a0..5492b95 100644 ---- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml -+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml -@@ -106,6 +106,16 @@ - unpack="false"/> - - -+ -+ - - -+ -+ org.eclipse.swt - 3.105.0-SNAPSHOT - eclipse-plugin -- -+ - - - -diff --git a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml -index 73c4197..4493f7c 100644 ---- a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml -+++ b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml -@@ -21,9 +21,9 @@ - binaries-parent - 4.6.0-SNAPSHOT - pom -- -+ - - - Property changes on: head/java/eclipse/files/patch-submodules ___________________________________________________________________ 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/i386-patch-freebsd_natives =================================================================== --- head/java/eclipse/files/i386-patch-freebsd_natives (revision 498879) +++ head/java/eclipse/files/i386-patch-freebsd_natives (nonexistent) @@ -1,310 +0,0 @@ ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:04:15.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:20:17.000000000 -0500 -@@ -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.x86; singleton:=true - Bundle-Version: 1.4.200.qualifier - Bundle-Vendor: %providerName - Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" - Bundle-Localization: fragment --Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) -+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/pom.xml.orig 2014-04-15 21:04:15.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/pom.xml 2014-04-16 07:19:54.000000000 -0500 -@@ -15,10 +15,10 @@ - eclipse.platform.resources - eclipse.platform.resources - 4.6.0-SNAPSHOT -- ../../ -+ ../../../../ - - org.eclipse.core -- org.eclipse.core.filesystem.linux.x86 -+ org.eclipse.core.filesystem.freebsd.x86 - 1.4.200-SNAPSHOT - eclipse-plugin - -@@ -33,7 +33,7 @@ - p2 - - -- linux -+ freebsd - gtk - x86 - -@@ -50,7 +50,7 @@ - - - native -- gtk.linux.x86 -+ gtk.freebsd.x86 - - - -@@ -63,12 +63,13 @@ - process-resources - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ - - - ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties 2014-04-16 07:20:05.000000000 -0500 -@@ -8,5 +8,5 @@ - # Contributors: - # IBM Corporation - initial API and implementation - ############################################################################### --fragmentName = Core File System for Linux -+fragmentName = Core File System for FreeBSD - providerName = Eclipse.org ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project.orig 2014-04-15 21:04:15.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project 2014-04-16 07:19:20.000000000 -0500 -@@ -1,6 +1,6 @@ - - -- org.eclipse.core.filesystem.linux.x86 -+ org.eclipse.core.filesystem.freebsd.x86 - - - ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:26:16.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:36:19.000000000 -0500 -@@ -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; singleton:=true -+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true - Bundle-Version: 3.105.0.qualifier - Bundle-ManifestVersion: 2 - Bundle-Localization: fragment -@@ -30,7 +30,7 @@ - org.eclipse.swt.internal.gtk; x-internal:=true, - org.eclipse.swt.internal.mozilla; x-internal:=true, - org.eclipse.swt.internal.opengl.glx; x-internal:=true --Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86)) -+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86)) - SWT-WS: gtk --SWT-OS: linux -+SWT-OS: freebsd - SWT-Arch: x86 ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2014-04-15 21:26:16.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml 2014-04-16 07:35:58.000000000 -0500 -@@ -1,10 +1,10 @@ - -- -+ - - -- -+ - -- -+ - - - ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml.orig 2014-04-15 21:26:16.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml 2014-04-16 07:36:13.000000000 -0500 -@@ -20,12 +20,12 @@ - ../binaries-parent/ - - org.eclipse.swt -- org.eclipse.swt.gtk.linux.x86 -+ org.eclipse.swt.gtk.freebsd.x86 - 3.105.0-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk - x86 - ${buildId} -@@ -61,7 +61,7 @@ - - - native -- gtk.linux.x86 -+ gtk.freebsd.x86 - - - -@@ -74,7 +74,7 @@ - process-resources - - -- -+ - - - ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/.project.orig 2014-04-15 21:26:16.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/.project 2014-04-16 07:36:05.000000000 -0500 -@@ -1,6 +1,6 @@ - - -- org.eclipse.swt.gtk.linux.x86 -+ org.eclipse.swt.gtk.freebsd.x86 - - - ---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:27:02.000000000 -0500 -+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:28:07.000000000 -0500 -@@ -3,8 +3,8 @@ - Bundle-Name: %fragmentName - Bundle-Vendor: %providerName - Bundle-Localization: fragment --Bundle-SymbolicName: org.eclipse.core.net.linux.x86;singleton:=true -+Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86;singleton:=true - Bundle-Version: 1.2.0.qualifier - Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" --Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) -+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 ---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml.orig 2014-04-15 21:27:02.000000000 -0500 -+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml 2014-04-16 07:28:28.000000000 -0500 -@@ -18,7 +18,7 @@ - ../../../../ - - org.eclipse.core -- org.eclipse.core.net.linux.x86 -+ org.eclipse.core.net.freebsd.x86 - 1.2.0-SNAPSHOT - eclipse-plugin - -@@ -31,7 +31,7 @@ - - - -- linux -+ freebsd - gtk - x86 - -@@ -48,7 +48,7 @@ - - - native -- gtk.linux.x86 -+ gtk.freebsd.x86 - - - -@@ -62,12 +62,12 @@ - process-resources - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - - ---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties.orig 2014-04-15 21:27:02.000000000 -0500 -+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties 2014-04-16 07:28:39.000000000 -0500 -@@ -8,5 +8,5 @@ - # Contributors: - # IBM Corporation - initial API and implementation - ############################################################################### --fragmentName = Proxy for Linux -+fragmentName = Proxy for FreeBSD - providerName = Eclipse.org ---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/.project.orig 2014-04-15 21:27:02.000000000 -0500 -+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/.project 2014-04-16 07:28:03.000000000 -0500 -@@ -1,6 +1,6 @@ - - -- org.eclipse.core.net.linux.x86 -+ org.eclipse.core.net.freebsd.x86 - - - ---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:32:54.000000000 -0500 -+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:51:22.000000000 -0500 -@@ -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.x86;singleton:=true - Bundle-Version: 1.1.400.qualifier - Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.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=x86)) -+Bundle-Localization: launcher.gtk.freebsd.x86 - Eclipse-BundleShape: dir ---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml.orig 2014-04-23 07:51:42.000000000 -0500 -+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml 2014-04-23 10:08:46.000000000 -0500 -@@ -18,12 +18,12 @@ - ../../launcher-binary-parent - - org.eclipse.equinox -- org.eclipse.equinox.launcher.gtk.linux.x86 -+ org.eclipse.equinox.launcher.gtk.freebsd.x86 - 1.1.400-SNAPSHOT - eclipse-plugin - - -- linux -+ freebsd - gtk - x86 - ---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties.orig 2014-07-25 19:31:29.000000000 -0500 -+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 2014-07-25 20:04:21.000000000 -0500 -@@ -8,5 +8,5 @@ - # Contributors: - # IBM Corporation - initial API and implementation - ############################################################################### --pluginName = Equinox Launcher Linux X86 Fragment -+pluginName = Equinox Launcher FreeBSD X86 Fragment - providerName = Eclipse.org - Equinox ---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project.orig 2014-04-15 21:32:54.000000000 -0500 -+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project 2014-04-16 07:51:09.000000000 -0500 -@@ -1,6 +1,6 @@ - - -- org.eclipse.equinox.launcher.gtk.linux.x86 -+ org.eclipse.equinox.launcher.gtk.freebsd.x86 - - - ---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties.orig 2014-07-25 19:35:37.000000000 -0500 -+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties 2014-07-25 20:07:49.000000000 -0500 -@@ -10,7 +10,7 @@ - ############################################################################### - bin.includes = META-INF/,\ -- launcher.gtk.linux.x86.properties,\ -+ launcher.gtk.freebsd.x86.properties,\ - about.html - - customBuildCallbacks=customBuildCallbacks.xml - generateSourceBundle=false Property changes on: head/java/eclipse/files/i386-patch-freebsd_natives ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -ON \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/java/eclipse/files/eclipse.in =================================================================== --- head/java/eclipse/files/eclipse.in (revision 498879) +++ head/java/eclipse/files/eclipse.in (revision 498880) @@ -1,46 +1,9 @@ #!/bin/sh # # FreeBSD-specific startup script for Eclipse Platform # # See: http://www.eclipse.org # # $FreeBSD$ # -DEFAULT_JAVA_HOME=%%JAVA_HOME%% -ECLIPSE_HOME=%%ECLIPSE_HOME%% -DEFAULT_JAVA_CMD=java -export GRE_HOME=%%LOCALBASE%%/lib/%%BROWSER%% - -#----------------------------------------------------------------------------- -# Determine configuration settings -#----------------------------------------------------------------------------- - -# Determine the JDK home directory -if [ -z "${JAVA_HOME}" ]; then - JAVA_HOME=${DEFAULT_JAVA_HOME} -fi - -# Determine 'java' executable -if [ -z "${JAVACMD}" ]; then - if [ -n "${JAVA_HOME}" ]; then - JAVACMD="${JAVA_HOME}/bin/java" - else - JAVACMD=${DEFAULT_JAVACMD} - fi -fi - -# Check if 'java' executable can be found -if [ ! -x "$JAVACMD" ]; then - echo "Error: JAVA_HOME is not defined correctly: ${JAVA_HOME}" - echo " Unable to find ${JAVACMD}" - exit 1 -fi - -# Check if 'eclipse' executable can be found -if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then - echo "Error: ECLIPSE_HOME is not defined correctly: ${ECLIPSE_HOME}" - echo " Unable to find eclipse launcher binary" - exit 1 -fi - -JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} %%SWTGTK3OPT%% exec "${ECLIPSE_HOME}/eclipse" "$@" +exec %%DATADIR%%/eclipse "$@" Index: head/java/eclipse/files/patch-eclipse-platform-parent =================================================================== --- head/java/eclipse/files/patch-eclipse-platform-parent (nonexistent) +++ head/java/eclipse/files/patch-eclipse-platform-parent (revision 498880) @@ -0,0 +1,52 @@ +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. + --> +- http://download.eclipse.org/eclipse/updates/4.11-I-builds/ ++ http://download.eclipse.org/eclipse/updates/4.11/ + +- http://download.eclipse.org/eclipse/updates/4.11-I-builds ++ http://download.eclipse.org/eclipse/updates/4.11 + + +- http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201903030654/ ++ http://download.eclipse.org/modeling/emf/emf/builds/release/2.17/ + + http://download.eclipse.org/rt/ecf/3.14.4/site.p2/ + +@@ -262,14 +262,14 @@ + + + +- linux ++ freebsd + gtk +- x86_64 ++ amd64 + + +- linux ++ freebsd + gtk +- ppc64le ++ powerpc64 + + + win32 +@@ -639,7 +639,7 @@ + For maintenance streams should always be "M-builds". + Ideally, this value would be provided by the environment, see bug 489789. + --> +- http://download.eclipse.org/eclipse/updates/4.11-I-builds ++ http://download.eclipse.org/eclipse/updates/4.11 + + + Property changes on: head/java/eclipse/files/patch-eclipse-platform-parent ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.pde.build =================================================================== --- head/java/eclipse/files/patch-eclipse.pde.build (nonexistent) +++ head/java/eclipse/files/patch-eclipse.pde.build (revision 498880) @@ -0,0 +1,77 @@ +diff -ru eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml +--- eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -59,10 +59,10 @@ + + + +- +- ++ ++ + +- ++ + + + +diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java +--- eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000 +@@ -704,7 +704,7 @@ + arguments.add("-sf"); //$NON-NLS-1$ + arguments.add(links[i]); + arguments.add(links[i + 1]); +- script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ ++ script.printExecTask("ln", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ + arguments.clear(); + } + } +diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java +--- eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000 +@@ -922,7 +922,7 @@ + for (int i = 0; i < links.length; i += 2) { + arguments.add(links[i]); + arguments.add(links[i + 1]); +- script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ ++ script.printExecTask("ln -s", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ + arguments.clear(); + } + } +diff -ru eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java +--- eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000 +@@ -306,6 +306,8 @@ + private String convertOS(String os) { + if (os == null) + return null; ++ if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$ ++ return "FreeBSD"; //$NON-NLS-1$ + if ("win32".equalsIgnoreCase(os)) //$NON-NLS-1$ + return "Windows"; //$NON-NLS-1$ + if ("macosx".equalsIgnoreCase(os)) //$NON-NLS-1$ +diff -ru eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml +--- eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -19,9 +19,9 @@ + + + +- ++ + +- ++ + + + +diff -ru eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties +--- eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties 0000-00-00 00:00:00.000000000 +0000 +@@ -19,4 +19,4 @@ + root.permissions.755=eclipse,*.so* + + root.win32.win32.x86_64=eclipse.exe, eclipsec.exe +-root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm ++root.freebsd.gtk.amd64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm Property changes on: head/java/eclipse/files/patch-eclipse.pde.build ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.pde.ui =================================================================== --- head/java/eclipse/files/patch-eclipse.pde.ui (nonexistent) +++ head/java/eclipse/files/patch-eclipse.pde.ui (revision 498880) @@ -0,0 +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 @@ + + + +- +- ++ ++ + + + Property changes on: head/java/eclipse/files/patch-eclipse.pde.ui ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.platform.releng =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.releng (nonexistent) +++ head/java/eclipse/files/patch-eclipse.platform.releng (revision 498880) @@ -0,0 +1,71 @@ +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"/> + + + + + + + + + + +- ++ + + +- ++ + + + Property changes on: head/java/eclipse/files/patch-eclipse.platform.releng ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk (nonexistent) +++ head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk (revision 498880) @@ -0,0 +1,12 @@ +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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder (nonexistent) +++ head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder (revision 498880) @@ -0,0 +1,288 @@ +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 @@ + + +- ++ + + + Property changes on: head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.platform.resources =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.resources (nonexistent) +++ head/java/eclipse/files/patch-eclipse.platform.resources (revision 498880) @@ -0,0 +1,235 @@ +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 @@ + p2 + + +- linux ++ freebsd + gtk +- x86_64 ++ amd64 + + + +@@ -50,7 +50,7 @@ + + + native +- gtk.linux.x86_64 ++ gtk.freebsd.amd64 + + + +@@ -63,10 +63,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 @@ + 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 @@ + */ + 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. Property changes on: head/java/eclipse/files/patch-eclipse.platform.runtime ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.platform.swt =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.swt (nonexistent) +++ head/java/eclipse/files/patch-eclipse.platform.swt (revision 498880) @@ -0,0 +1,352 @@ +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 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 +@@ -68,12 +68,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 +@@ -194,7 +192,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 +203,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 +@@ -364,4 +367,4 @@ + elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then + export GTK_VERSION="3.0" + func_build_gtk3 "$@" +-fi +\ No newline at end of file ++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 @@ + + /* 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/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/buildFragment.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml +--- eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -237,8 +237,9 @@ + + + ++ + +- ++ + + + +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 @@ + + + +- ++ + + + + +- ++ + + + +@@ -122,13 +122,13 @@ + trust="true" + outputproperty="m_linux_x86_64_output" + command="hostname"/> +- + + + +- ++ + +- +- ++ ++ + + + +@@ -169,11 +169,11 @@ + + ${m_linux_x86} - ${m_linux_x86_test} + ${m_linux_x86_64} - ${m_linux_x86_64_test} +- ${m_linux_ppc64le} - ${m_linux_ppc64le_test} ++ ${m_linux_powerpc64} - ${m_linux_powerpc64_test} + ${m_mac} - ${m_mac_test} + ------------------------- + +- ++ + + + +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.110.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.110.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.armv7/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/META-INF/MANIFEST.MF +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/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.arm; singleton:=true ++Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.armv7; singleton:=true + Bundle-Version: 3.109.0.qualifier + Bundle-ManifestVersion: 2 + Bundle-Localization: fragment +@@ -26,8 +26,8 @@ + org.eclipse.swt.internal.cairo; x-internal:=true, + org.eclipse.swt.internal.gtk; x-internal:=true, + org.eclipse.swt.internal.opengl.glx; x-internal:=true +-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm)) ++Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=armv7)) + SWT-WS: gtk +-SWT-OS: linux +-SWT-Arch: arm +-Automatic-Module-Name: org.eclipse.swt.gtk.linux.arm ++SWT-OS: freebsd ++SWT-Arch: armv7 ++Automatic-Module-Name: org.eclipse.swt.gtk.freebsd.armv7 +diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/build.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/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.armv7/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/pom.xml +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.armv7/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -20,14 +20,14 @@ + ../binaries-parent/ + + org.eclipse.swt +- org.eclipse.swt.gtk.linux.arm ++ org.eclipse.swt.gtk.freebsd.armv7 + 3.109.0-SNAPSHOT + eclipse-plugin + + +- linux ++ freebsd + gtk +- arm ++ armv7 + ${buildId} + + +@@ -61,7 +61,7 @@ + + + native +- gtk.linux.arm ++ gtk.freebsd.armv7 + + + +diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/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; singleton:=true ++Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.i386; singleton:=true + Bundle-Version: 3.109.0.qualifier + Bundle-ManifestVersion: 2 + Bundle-Localization: fragment +@@ -26,7 +26,7 @@ + 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)) ++Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=i386)) + SWT-WS: gtk +-SWT-OS: linux +-SWT-Arch: x86 ++SWT-OS: freebsd ++SWT-Arch: i386 +diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/build.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/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.i386/pom.xml eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/pom.xml +--- eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.i386/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 ++ org.eclipse.swt.gtk.freebsd.i386 + 3.109.0-SNAPSHOT + eclipse-plugin + + +- linux ++ freebsd + gtk +- x86 ++ i386 + ${buildId} + + +@@ -61,7 +61,7 @@ + + + native +- gtk.linux.x86 ++ gtk.freebsd.i386 + + + +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.110.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.110.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 + + Property changes on: head/java/eclipse/files/patch-eclipse.platform.swt.binaries ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.platform.team =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.team (nonexistent) +++ head/java/eclipse/files/patch-eclipse.platform.team (revision 498880) @@ -0,0 +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 + 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 + eclipse-plugin + +@@ -30,9 +30,9 @@ + + + +- linux ++ freebsd + gtk +- x86_64 ++ amd64 + + + +@@ -47,7 +47,7 @@ + + + native +- gtk.linux.x86_64 ++ gtk.freebsd.amd64 + + + +@@ -60,9 +60,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 + Property changes on: head/java/eclipse/files/patch-eclipse.platform.team ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.platform.ua =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.ua (nonexistent) +++ head/java/eclipse/files/patch-eclipse.platform.ua (revision 498880) @@ -0,0 +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$ + 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 @@ + 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; + } Property changes on: head/java/eclipse/files/patch-eclipse.platform.ua ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-eclipse.platform.ui =================================================================== --- head/java/eclipse/files/patch-eclipse.platform.ui (nonexistent) +++ head/java/eclipse/files/patch-eclipse.platform.ui (revision 498880) @@ -0,0 +1,193 @@ +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 @@ + 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 +@@ -206,7 +206,8 @@ + if (titleLabel.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) +@@ -543,4 +544,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" + id="org.eclipse.e4.ui.css.theme.e4_dark" + label="%theme.dark" ++ os="freebsd"> ++ ++ + + + ++ ++ + + + + + + + + + + + +- +- ++ ++ + + + Property changes on: head/java/eclipse/files/patch-eclipse.platform.ui ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-production =================================================================== --- head/java/eclipse/files/patch-production (nonexistent) +++ head/java/eclipse/files/patch-production (revision 498880) @@ -0,0 +1,14 @@ +diff -ru production/checkConfigIIUs.sh production/checkConfigIIUs.sh +--- production/checkConfigIIUs.sh 0000-00-00 00:00:00.000000000 +0000 ++++ production/checkConfigIIUs.sh 0000-00-00 00:00:00.000000000 +0000 +@@ -39,8 +39,8 @@ + + declare -a PLATFORMS=( \ + cocoa.macosx.x86_64 \ +-gtk.linux.ppc64le \ +-gtk.linux.x86_64 \ ++gtk.freebsd.powerpc64 \ ++gtk.freebsd.amd64 \ + win32.win32.x86_64 \ + ) + NPLATFORMS=${#PLATFORMS[@]} Property changes on: head/java/eclipse/files/patch-production ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-rt.equinox.bundles =================================================================== --- head/java/eclipse/files/patch-rt.equinox.bundles (nonexistent) +++ head/java/eclipse/files/patch-rt.equinox.bundles (revision 498880) @@ -0,0 +1,177 @@ +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-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" + + all: ../libkeystorelinuxnative.so + +@@ -9,10 +9,10 @@ + 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 + + ../target: + mkdir -p ../target +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 + eclipse-plugin + +@@ -31,9 +31,9 @@ + p2 + + +- linux ++ freebsd + gtk +- x86_64 ++ amd64 + + + +@@ -47,7 +47,7 @@ + + + native +- gtk.linux.x86_64 ++ gtk.freebsd.amd64 + + + +@@ -60,7 +60,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 Property changes on: head/java/eclipse/files/patch-rt.equinox.bundles ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-rt.equinox.framework =================================================================== --- head/java/eclipse/files/patch-rt.equinox.framework (nonexistent) +++ head/java/eclipse/files/patch-rt.equinox.framework (revision 498880) @@ -0,0 +1,602 @@ +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 + 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 + eclipse-plugin + + +- linux ++ freebsd + gtk + aarch64 + +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 + 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 @@ + ../../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 + eclipse-plugin + + +- linux ++ freebsd + gtk +- x86_64 ++ amd64 + + +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 + 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 @@ + ../../launcher-binary-parent + + org.eclipse.equinox +- org.eclipse.equinox.launcher.gtk.linux.ppc64le ++ org.eclipse.equinox.launcher.gtk.freebsd.powerpc64 + 1.1.1000-SNAPSHOT + eclipse-plugin + + +- linux ++ freebsd + gtk +- ppc64le ++ powerpc64 + + +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$ +@@ -734,7 +735,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; +@@ -757,6 +758,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 @@ + 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 @@ + + + +- +- +- +- ++ ++ ++ ++ + + +- ++ + + + +@@ -134,37 +134,37 @@ + + + +- +- +- +- ++ ++ ++ ++ + + +- ++ + +- +- +- +- ++ ++ ++ ++ + + +- ++ + +- +- +- +- ++ ++ ++ ++ + + +- ++ + +- +- +- +- ++ ++ ++ ++ + + +- ++ + + + +@@ -212,7 +212,7 @@ + + + +- ++ + + + +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 +@@ -50,27 +50,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 + + + +@@ -84,8 +84,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 Property changes on: head/java/eclipse/files/patch-rt.equinox.framework ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/eclipse/files/patch-rt.equinox.p2 =================================================================== --- head/java/eclipse/files/patch-rt.equinox.p2 (nonexistent) +++ head/java/eclipse/files/patch-rt.equinox.p2 (revision 498880) @@ -0,0 +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 @@ + + + +- ++ + + + +@@ -121,7 +121,7 @@ + + + +- ++ + + + +@@ -135,7 +135,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 +@@ -185,9 +185,9 @@ + unpack="false"/> + +