Attachment #154587 for bug #195985




# $FreeBSD$

PORTNAME=	eclipse
PORTVERSION=	4.4.2
PORTREVISION=	3
CATEGORIES=	java devel
MASTER_SITES=	https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/
DISTFILES=	eclipse.platform.releng.aggregator-${PORTVERSION}.xz \

DIST_SUBDIR=	eclipse

MAINTAINER=	ljboiler@gmail.com
COMMENT=	Eclipse Luna SR-2

LICENSE=	EPL


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

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)

.endif
PATCH_STRIP=	-p1

.if ${PORT_OPTIONS:MSWT_GTK3_SUPPORT}
USE_GNOME+=	gtk30
LIB_DEPENDS+=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
MVN_SETTINGS+=	-Dmachine_gtk3=1
.endif

WRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION}
GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator


ECLIPSE_WS=	gtk
ECLIPSE_ARCH=	x86${ARCH:C/^i.86//:C/^amd/_/}
E_SHORTARCH=	${ARCH:C/^i.86//:C/^amd//}
ECLIPSE_BUILDID=M20150204-1700
SCRIPTS_ENV+=	ECLIPSE_ARCH=${ECLIPSE_ARCH} \
		E_SHORTARCH=${E_SHORTARCH}
PORTDESTDIR=	${PREFIX}/lib/eclipse

do-build:
	@(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} M2_HOME=${LOCALBASE}/share/java/maven31 ${MVN_OPTS} \
		mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \
		-DbuildId=${ECLIPSE_BUILDID})

do-install:
	@${RM} -rf ${STAGEDIR}${PORTDESTDIR}

Lines 10-14 Link Here

(-)Makefile.plugins (-2 / +2 lines)
10	@${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse	10	@${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse
11	@(cd ${WRKSRC}; ${COPYTREE_SHARE} "${REPO_DIRS}" ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse/)	11	@(cd ${WRKSRC}; ${COPYTREE_SHARE} "${REPO_DIRS}" ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse/)
12	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s share/eclipse/dropins/${PORTNAME} -not -type d) >> ${TMPPLIST}	12	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s share/eclipse/dropins/${PORTNAME} -not -type d) >> ${TMPPLIST}
13	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d share/eclipse/dropins/${PORTNAME} -type d -empty) \	13	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d share/eclipse/dropins/${PORTNAME} -type d) \
14	\| ${SED} -ne 's,^,@dir ,p' >> ${TMPPLIST}	14	\| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}

Lines 1-4 Link Here

(-)distinfo (-4 / +4 lines)
1	SHA256 (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 2453b2f8e12c7cd90f15dc34519e785befb69ef014e07cd2b180f8a4d7b557cd	1	SHA256 (eclipse/eclipse.platform.releng.aggregator-4.4.2.xz) = 93d9f028b840f18420b3e5193f8166ee431536f1b09a8a900144b7a4de62f791
2	SIZE (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 196545676	2	SIZE (eclipse/eclipse.platform.releng.aggregator-4.4.2.xz) = 214688453
3	SHA256 (eclipse/eclipse-maven-repo-4.3.2.xz) = f5288a26d9bdb22f5a455bba52f73589918c9bcff65bb667ae6d246467a61ca8	3	SHA256 (eclipse/eclipse-maven-repo-4.4.2.xz) = ee666bb69dd498553e50403514a1cdf332094dad6b66f03a8c38407048a92ddf
4	SIZE (eclipse/eclipse-maven-repo-4.3.2.xz) = 185972692	4	SIZE (eclipse/eclipse-maven-repo-4.4.2.xz) = 118457481




index ce98be7..fa2d1e1 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -62,7 +62,7 @@
       The tycho-eclipserun-plugin will create its instance of Eclipse from this
       'eclipiserun-repo' repository, such as for computing .api-descriptions.
     -->
-    <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.4-M-builds/M-4.4.2RC2-201501281000/</eclipserun-repo>
+    <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.4/R-4.4.2-201502041700/</eclipserun-repo>
 
     <comparator.repo>http://download.eclipse.org/eclipse/updates/4.4-M-builds</comparator.repo>
 
@@ -201,6 +201,12 @@
             </artifact>
           </target>
           <environments>
+            <environment>
+              <os>freebsd</os>
+              <ws>gtk</ws>
+              <arch>%%ECLIPSE_ARCH%%</arch>
+            </environment>
+<!--
             <environment>
               <os>linux</os>
               <ws>gtk</ws>
@@ -281,6 +287,7 @@
@@ -229,6 +235,7 @@
               <ws>gtk</ws>
               <arch>ppc64</arch>
             </environment>

           </environments>
         </configuration>
       </plugin>
@@ -360,11 +367,11 @@
           <artifactId>tycho-packaging-plugin</artifactId>
           <version>${tycho.version}</version>
           <dependencies>

             <dependency>
               <groupId>org.eclipse.tycho.extras</groupId>
               <artifactId>tycho-sourceref-jgit</artifactId>
@@ -374,14 +381,14 @@
           <configuration>
             <strictBinIncludes>false</strictBinIncludes>
             <format>'v'yyyyMMdd-HHmm</format>

-            <timestampProvider>jgit</timestampProvider>
+            <!--timestampProvider>jgit</timestampProvider-->
             <jgit.ignore>
               pom.xml
             </jgit.ignore>
             <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
-            <sourceReferences>

-            </sourceReferences>
+            </sourceReferences-->
             <archive>
               <addMavenDescriptor>false</addMavenDescriptor>
             </archive>
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,12 @@
           <resolver>p2</resolver>
           <environments>
             <environment>

               <os>linux</os>
               <ws>gtk</ws>
               <arch>x86</arch>
@@ -163,6 +169,7 @@
               <ws>cocoa</ws>
               <arch>x86_64</arch>
             </environment>

         </configuration>
       </plugin>
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,12 @@
           <resolver>p2</resolver>
           <environments>
             <environment>
+              <os>freebsd</os>
+              <ws>gtk</ws>
+              <arch>%%ECLIPSE_ARCH%%</arch>
+            </environment>
+<!--
+            <environment>
               <os>linux</os>
               <ws>gtk</ws>
               <arch>x86</arch>
@@ -68,6 +74,7 @@
               <ws>cocoa</ws>
               <arch>x86_64</arch>
             </environment>
+-->
           </environments>
         </configuration>
       </plugin>
@@ -99,6 +106,7 @@
             <configuration>
               <formats>
                 <win32>zip</win32>
+                <freebsd>tar.gz</freebsd>
                 <linux>tar.gz</linux>
                 <macosx>tar.gz</macosx>
               </formats>
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 @@
     <property name="archiveRoot" value="launchers" />
     <buildRepos os="win32" ws="win32" arch="x86" archiveName="${archiveRoot}-win32.win32.x86.${buildId}.zip" />
     <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" />
+    <buildRepos os="freebsd" ws="gtk" arch="x86" archiveName="${archiveRoot}-freebsd.gtk.x86.${buildId}.tar.gz" />
+    <buildRepos os="freebsd" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-freebsd.gtk.x86_64.${buildId}.tar.gz" />
     <buildRepos os="linux" ws="gtk" arch="x86" archiveName="${archiveRoot}-linux.gtk.x86.${buildId}.tar.gz" />
     <buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" />
       <buildRepos os="linux" ws="gtk" arch="ppc" archiveName="${archiveRoot}-linux.gtk.ppc.${buildId}.tar.gz" />
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" />
       <platform
         format="equinox"
+        id="SFG2"
+        name="FreeBSD (x86/GTK+)"
+        fileName="launchers-freebsd.gtk.x86.${BUILD_ID}.tar.gz" />
+      <platform
+        format="equinox"
+        id="SFG264"
+        name="FreeBSD (x86_64/GTK+)"
+        fileName="launchers-freebsd.gtk.x86_64.${BUILD_ID}.tar.gz" />
+      <platform
+        format="equinox"
         id="SLG2"
         name="Linux (x86/GTK+)"
         fileName="launchers-linux.gtk.x86.${BUILD_ID}.tar.gz" />
@@ -346,6 +356,16 @@
         fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" />
       <platform
         format="equinox"
+        id="ESFG2"
+        name="FreeBSD (x86/GTK+)"
+        fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86.tar.gz" />
+      <platform
+        format="equinox"
+        id="ESFG264"
+        name="FreeBSD (x86_64/GTK+)"
+        fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86_64.tar.gz" />
+      <platform
+        format="equinox"
         id="ESLG2"
         name="Linux (x86/GTK+)"
         fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties
index 80a32e4..fcb7ed5 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties
@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse
 root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
 root.solaris.gtk.x86.permissions.755=eclipse
 
+root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86
+root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse
+root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64
+root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,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=libcairo-swt.so,eclipse
 root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
 root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
 
 bin.includes = feature.properties
-
-
-
-
-
-
-
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml
index 2c342a3..5e27062 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml
@@ -20,6 +20,25 @@
                 <version>2.6</version>
                 <executions>
                     <execution>
+                        <id>copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%%</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%</directory>
+                                    <includes>
+                                        <include>about_files/*</include>
+                                        <include>about.html</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>copy-resources-gtk.linux.x86</id>
                         <phase>validate</phase>
                         <goals>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
index 0025a72..df900e7 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
@@ -68,6 +68,7 @@
             <configuration>
               <formats>
                 <win32>zip</win32>
+                <freebsd>tar.gz</freebsd>
                 <linux>tar.gz</linux>
                 <macosx>tar.gz</macosx>
               </formats>
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

 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 @@
             <configuration>
               <formats>
                 <win32>zip</win32>
+                <freebsd>tar.gz</freebsd>
                 <linux>tar.gz</linux>
                 <macosx>tar.gz</macosx>
               </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index 01c7934..c34148c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -10,58 +10,9 @@
 ###############################################################################
 root.solaris.gtk.x86.permissions.755=eclipse
 
 #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
 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=libcairo-swt.so,eclipse
 root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
 root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
 
 bin.includes = feature.properties
-
-# 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=rootfiles/macosx.cocoa.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
-
-root.macosx.cocoa.x86=rootfiles/macosx.cocoa.x86
-root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse
-root.macosx.cocoa.x86.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.sparc=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/sparc
-root.solaris.gtk.sparc.permissions.755=eclipse
-root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
-root.solaris.gtk.x86.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=libcairo-swt.so,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=libcairo-swt.so,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=libcairo-swt.so,eclipse
 
 bin.includes = feature.properties
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
index ead6cd7..550bf70 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
@@ -34,6 +34,45 @@
         <version>2.6</version>
         <executions>
           <execution>
+            <id>copy-resources-gtk.freebsd.x86</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/rootfiles/freebsd.gtk.x86</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86</directory>
+                  <includes>
+                    <include>about_files/*</include>
+                    <include>about.html</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-resources-gtk.freebsd.x86_64</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/rootfiles/freebsd.gtk.x86_64</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64
+                  </directory>
+                  <includes>
+                    <include>about_files/*</include>
+                    <include>about.html</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
             <id>copy-resources-gtk.linux.x86</id>
             <phase>validate</phase>
             <goals>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
index a849a55..ea72ce5 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
@@ -61,6 +61,7 @@
             <configuration>
               <formats>
                 <win32>zip</win32>
+                <freebsd>tar.gz</freebsd>
                 <linux>tar.gz</linux>
                 <macosx>tar.gz</macosx>
               </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
index 10b9b9f..b5a238b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
@@ -61,6 +61,7 @@
             <configuration>
               <formats>
                 <win32>zip</win32>
+                <freebsd>tar.gz</freebsd>
                 <linux>tar.gz</linux>
                 <macosx>tar.gz</macosx>
               </formats>
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 @@
             <configuration>
               <formats>
                 <win32>zip</win32>
+                <freebsd>tar.gz</freebsd>
                 <linux>tar.gz</linux>
                 <macosx>tar.gz</macosx>
               </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
index 6b59ed2..64975ba 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf

 # Restrict range so we are not an automatic update for 3.x.
 update.id= org.eclipse.sdk.ide
 update.range = [4.0,$version$)
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 @@
     <module>platform.sdk</module>
     <module>sdk</module>
     <module>eclipse-junit-tests</module>
-    <module>eclipse.platform.repository</module>
+    <!-- module>eclipse.platform.repository</module -->
   </modules>
 </project>




--- ./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
 

 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)

-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.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:17:42.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:17:22.000000000 -0500
@@ -15,10 +15,10 @@
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
     <version>4.4.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+    <relativePath>../../../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>
-  <artifactId>org.eclipse.core.filesystem.linux.x86</artifactId>
+  <artifactId>org.eclipse.core.filesystem.freebsd.x86</artifactId>
   <version>1.4.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
@@ -33,7 +33,7 @@

                 <configuration>
                   <target>
-                    <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
-           <copy todir="os/linux/x86">
-           <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
-               <include name="libunixfile_*.so"/>
-           </fileset>
-           </copy>
+                    <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
+                    <mkdir dir="os/freebsd/x86"/>
+                    <copy todir="os/freebsd/x86">
+                      <fileset dir="../../natives/unix/freebsd/">
+                        <include name="libunixfile_*.so"/>
+                      </fileset>
+                    </copy>

                   </target>
                 </configuration>
                 <goals>
--- ./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:17:34.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:16:45.000000000 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.core.filesystem.linux.x86</name>
+	<name>org.eclipse.core.filesystem.freebsd.x86</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- ./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 @@
     <artifactId>eclipse.platform.resources</artifactId>
     <groupId>eclipse.platform.resources</groupId>
     <version>4.4.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+    <relativePath>../../../../</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>
-  <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId>
+  <artifactId>org.eclipse.core.filesystem.freebsd.x86_64</artifactId>
   <version>1.2.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
@@ -33,7 +33,7 @@

                   <target>
-                    <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
-           <mkdir dir="os/linux/x86_64/"/>
-           <copy todir="os/linux/x86_64/">
-           <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
-               <include name="libunixfile_*.so"/>
-           </fileset>
-           </copy>
+                    <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
+                    <mkdir dir="os/freebsd/x86_64/"/>
+                    <copy todir="os/freebsd/x86_64/">
+                      <fileset dir="../../natives/unix/freebsd/">
+                        <include name="libunixfile_*.so"/>
+                      </fileset>
+                    </copy>

                   </target>
                 </configuration>
                 <goals>
--- ./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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.core.filesystem.linux.x86_64</name>
+	<name>org.eclipse.core.filesystem.freebsd.x86_64</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- ./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:31:38.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.103.2.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/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:31:27.000000000 -0500
@@ -20,12 +20,12 @@
     <relativePath>../binaries-parent/</relativePath>
   </parent>

   <groupId>org.eclipse.swt</groupId>
-  <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
+  <artifactId>org.eclipse.swt.gtk.freebsd.x86</artifactId>
   <version>3.103.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

     <ws>gtk</ws>
     <arch>x86</arch>
     <buildid>${buildId}</buildid>
@@ -61,7 +61,7 @@
         <property>
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
           <name>native</name>

         </property>
       </activation>
       <build>
@@ -74,7 +74,7 @@
                 <phase>process-resources</phase>
                 <configuration>
                   <target>
-                    <property name="machine_gtk3" value="1" />
+                    <!-- property name="machine_gtk3" value="1" / -->
                     <ant antfile="build.xml" target="build_libraries"/>
                   </target>
                 </configuration>
--- ./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:31:05.000000000 -0500
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.swt.gtk.linux.x86" default="build.jars" basedir=".">

-	<property name="swt.os" value="linux" />
+	<property name="swt.os" value="freebsd" />
 	<property name="swt.arch" value="x86" />
-	<property name="targets" value="make_mozilla make_xulrunner make_xulrunner24 make_xpcominit install"/>
+	<property name="targets" value="install"/>
 	
 	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
 	<property name="version.suffix" value="3.103.0" />
--- ./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:31:14.000000000 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.swt.gtk.linux.x86</name>
+	<name>org.eclipse.swt.gtk.freebsd.x86</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- ./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.103.2.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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.swt.gtk.linux.x86_64" default="build.jars" basedir=".">

-	<property name="swt.os" value="linux" />
+	<property name="swt.os" value="freebsd" />
 	<property name="swt.arch" value="x86_64" />
-	<property name="targets" value="make_mozilla make_xulrunner make_xulrunner24 make_xpcominit install"/>
+	<property name="targets" value="install"/>
 	
 	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
 	<property name="version.suffix" value="3.103.0" />
--- ./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 @@
     <relativePath>../binaries-parent/</relativePath>
   </parent>

   <groupId>org.eclipse.swt</groupId>
-  <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+  <artifactId>org.eclipse.swt.gtk.freebsd.x86_64</artifactId>
   <version>3.103.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>

     <ws>gtk</ws>
     <arch>x86_64</arch>
     <buildid>${buildId}</buildid>
@@ -61,7 +61,7 @@
         <property>
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
           <name>native</name>

         </property>
       </activation>
       <build>
@@ -74,7 +74,7 @@
                 <phase>process-resources</phase>
                 <configuration>
                   <target>
-                    <property name="machine_gtk3" value="1" />
+                    <!-- property name="machine_gtk3" value="1" / -->
                     <ant antfile="build.xml" target="build_libraries"/>
                   </target>
                 </configuration>
--- ./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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.swt.gtk.linux.x86_64</name>
+	<name>org.eclipse.swt.gtk.freebsd.x86_64</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- ./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:26:24.000000000 -0500
@@ -3,8 +3,8 @@
 Bundle-Name: %fragmentName
 Bundle-Vendor: %providerName

-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
--- ./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:27:00.000000000 -0500
@@ -18,7 +18,7 @@
     <relativePath>../../../../</relativePath>
   </parent>

                 <configuration>
                   <target>
-                    <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
-           <copy todir=".">
-           <fileset dir="../../natives/unix/linux/">
-               <include name="libgnomeproxy-*.so"/>
-           </fileset>
-           </copy>
+                    <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
+                    <copy todir=".">
+                      <fileset dir="../../natives/unix/freebsd/">
+                        <include name="libgnomeproxy-*.so"/>
+                      </fileset>

                   </target>
                 </configuration>
                 <goals>
--- ./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:27:11.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:26:18.000000000 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.core.net.linux.x86</name>
+	<name>org.eclipse.core.net.freebsd.x86</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- ./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

-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
--- ./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 @@
     <relativePath>../../../../</relativePath>
   </parent>

                 <configuration>
                   <target>
-                    <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
-           <copy todir=".">
-           <fileset dir="../../natives/unix/linux/">
-               <include name="libgnomeproxy-*.so"/>
-           </fileset>
-           </copy>
+                    <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
+                    <copy todir=".">
+                      <fileset dir="../../natives/unix/freebsd/">
+                        <include name="libgnomeproxy-*.so"/>
+                      </fileset>

                   </target>
                 </configuration>
                 <goals>
--- ./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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.core.net.linux.x86_64</name>
+	<name>org.eclipse.core.net.freebsd.x86_64</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- ./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

 	@echo "Finished building target: $(LIB_NAME_FULL)"
 	@echo " "
 
--- ./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:49:58.000000000 -0500
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName

+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:04:13.000000000 -0500
@@ -18,12 +18,12 @@
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
   <groupId>org.eclipse.equinox</groupId>

   <packaging>eclipse-plugin</packaging>
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
-    <os>linux</os>
+    <os>freebsd</os>
     <ws>gtk</ws>
     <arch>x86</arch>
   </properties>
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties.orig	2014-04-15 21:32:54.000000000 -0500
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties	2014-04-16 07:50:08.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:49:39.000000000 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.equinox.launcher.gtk.linux.x86</name>
+	<name>org.eclipse.equinox.launcher.gtk.freebsd.x86</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- ./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:10:23.000000000 -0500
@@ -10,7 +10,7 @@
 ###############################################################################
 bin.includes = META-INF/,\
                eclipse_*.so,\
-               launcher.gtk.linux.x86.properties,\
+               launcher.gtk.freebsd.x86.properties,\
                about.html
                
 customBuildCallbacks=customBuildCallbacks.xml
--- ./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

+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 @@
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
   <groupId>org.eclipse.equinox</groupId>

   <packaging>eclipse-plugin</packaging>
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
-    <os>linux</os>
+    <os>freebsd</os>
     <ws>gtk</ws>
     <arch>x86_64</arch>
   </properties>
--- ./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)

  -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 \

 
 install: all
 	cp $(EXEC) $(OUTPUT_DIR)
--- ./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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.equinox.launcher.gtk.linux.x86_64</name>
+	<name>org.eclipse.equinox.launcher.gtk.freebsd.x86_64</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- ./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/,\
                eclipse_*.so,\
-               launcher.gtk.linux.x86_64.properties,\
+               launcher.gtk.freebsd.x86_64.properties,\
                about.html
                
 customBuildCallbacks=customBuildCallbacks.xml




 				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 interface IArgumentsInfo extends IProductObject {
 
 	public static final String P_PROG_ARGS = "programArgs"; //$NON-NLS-1$
+	public static final String P_PROG_ARGS_FRE = "programArgsFre"; //$NON-NLS-1$
 	public static final String P_PROG_ARGS_LIN = "programArgsLin"; //$NON-NLS-1$
 	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_FRE = "vmArgsFre"; //$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_MACOS = 3;
+	public static final int L_ARGS_SOLAR = 4;
+	public static final int L_ARGS_WIN32 = 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

 
 	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 {
 			return getCompleteArgs(getProgramArguments(L_ARGS_MACOS), fProgramArgs);
 		} 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 {
 			return getCompleteArgs(getVMArguments(L_ARGS_MACOS), fVMArgs);
 		} 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 + "</" + P_PROG_ARGS + ">"); //$NON-NLS-1$ //$NON-NLS-2$
+					fVMArgsFre = getText(child);
 				}
 			}
 		}
+		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 + "</" + P_PROG_ARGS_FRE + ">"); //$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 + "</" + P_VM_ARGS + ">"); //$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 + "</" + P_VM_ARGS_FRE + ">"); //$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

 		presentation.add(implementation);
 
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 @@
                 <plugin id="org.eclipse.core.filesystem.aix.ppc"/>
                 <plugin id="org.eclipse.core.filesystem.aix.ppc64"/>
                 <plugin id="org.eclipse.core.filesystem.hpux.ia64"/>

                 <plugin id="org.eclipse.core.filesystem.linux.x86"/>
                 <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
                 <plugin id="org.eclipse.core.filesystem.solaris.sparc"/>
@@ -70,11 +72,16 @@
                 <plugin id="org.eclipse.core.filesystem.linux.ppc64"/>
                 <plugin id="org.eclipse.core.resources.win32.x86"/>
                 <plugin id="org.eclipse.core.resources.win32.x86_64"/>
+                <plugin id="org.eclipse.core.net.freebsd.%%ECLIPSE_ARCH%%"/>
                 <plugin id="org.eclipse.core.net.linux.x86"/>
                 <plugin id="org.eclipse.core.net.linux.x86_64"/>
                 <plugin id="org.eclipse.core.net.win32.x86"/>
                 <plugin id="org.eclipse.core.net.win32.x86_64"/>
+                <plugin id="org.eclipse.compare.win32"/>
+                <plugin id="org.eclipse.ui.win32"/>
                 <plugin id="org.eclipse.update.core.linux"/>
                 <plugin id="org.eclipse.update.core.win32"/>
                 <plugin id="org.eclipse.equinox.security.macosx"/>
+                <plugin id="org.eclipse.equinox.security.win32.x86"/>
+                <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
+                <plugin id="org.eclipse.compare.win32"/>
+                <plugin id="org.eclipse.ui.win32"/>
               </excludes>
             </configuration>
           </execution>
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 @@
               <features>
                 <feature id="org.eclipse.sdk.examples"/>
               </features>
-              <!-- 
               <excludes>
-                <plugin id="org.eclipse.sdk.examples"/>
+                <plugin id="org.eclipse.swt.examples.ole.win32"/>
                 <feature id="org.eclipse.sdk.examples.source"/>
               </excludes>
-               -->
             </configuration>
           </execution>
         </executions>
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

 
   <modules>
     <module>bundles/org.eclipse.core.filesystem</module>
+    <module>bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.%%ECLIPSE_ARCH%%</module>
     <module>bundles/org.eclipse.core.filesystem.hpux.ia64</module>
     <module>bundles/org.eclipse.core.filesystem.hpux.PA_RISC</module>
     <module>bundles/org.eclipse.core.filesystem.linux.ppc</module>

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	
@@ -12,12 +12,12 @@
 #     Tom Tromey (Red Hat, Inc.)
 #*******************************************************************************
 
+COMPONENTS_DIR=`pwd`/../../components
 cd `dirname $0`
 
 MAKE_TYPE=make
 
 # Check if we have to compile external.xpt from external.idl
-COMPONENTS_DIR=`pwd`/../../components
 if test ! -f ${COMPONENTS_DIR}/external.xpt; then
 	if test ! -f ${COMPONENTS_DIR}/external.idl; then
 		echo "Can't find ${COMPONENTS_DIR}/external.idl"
@@ -64,6 +64,8 @@ case $OS in
 	"FreeBSD")
 		SWT_OS=freebsd

+	${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
 #*******************************************************************************

 
 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 \
+	-std=c++11 \
 	${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
+SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
+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
 	
+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}
 
+CFLAGS := $(CFLAGS) -I/usr/local/include
+LDFLAGS := $(LDFLAGS) -L/usr/local/lib
+
 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
-	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
 
 #
 # Atk lib
@@ -203,22 +223,22 @@ gnome_stats.o: gnome_stats.c gnome_stats.h
 #
 # Mozilla lib
 #
-make_mozilla:$(MOZILLA_LIB)
+##make_mozilla:$(MOZILLA_LIB)
 
-$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
+##$(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
+##	$(CXX) $(MOZILLACFLAGS) ${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
+##	$(CXX) $(MOZILLACFLAGS) ${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
+##	$(CXX) $(MOZILLACFLAGS) ${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
+##	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
 
 #
-# XULRunner lib
+# XULRunner libs
 #
 make_xulrunner:$(XULRUNNER_LIB)
 
 $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+	echo -e "#include<stdlib.h>\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<stdlib.h>\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
 
 #

 #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;

 		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.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
@@ -55,7 +56,8 @@
     <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
     <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>

     <module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
     <module>bundles/org.eclipse.swt.gtk.solaris.x86</module>
     <module>bundles/org.eclipse.swt.win32.win32.x86</module>
     <module>bundles/org.eclipse.swt.win32.win32.x86_64</module>
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

 #else
 #include <strings.h>
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 @@

 		}
 		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"/>
 
    <plugin

          id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
          os="linux"
          ws="gtk"
@@ -621,6 +652,17 @@
          unpack="false"/>
 
    <plugin

          os="linux"
          ws="gtk"
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
index 918a8ff..ceb1b3e 100644
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
@@ -38,7 +38,26 @@
               <excludes>
                 <plugin id="javax.xml"/>
                 <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/>
+                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.%%ECLIPSE_ARCH%%"/>
                 <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc"/>
                 <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64"/>
                 <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86"/>
@@ -57,6 +59,8 @@
                 <plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
                 <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
                 <plugin id="org.eclipse.swt"/>
+                <plugin id="org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%"/>
+                <plugin id="org.eclipse.swt.gtk.solaris.sparc"/>
+                <plugin id="org.eclipse.swt.gtk.solaris.x86"/>
+                <plugin id="org.eclipse.swt.cocoa.macosx"/>
+                <plugin id="org.eclipse.swt.cocoa.macosx.x86_64"/>
+                <plugin id="org.eclipse.swt.gtk.linux.ppc"/>
+                <plugin id="org.eclipse.swt.gtk.linux.ppc64"/>
+                <plugin id="org.eclipse.swt.gtk.linux.ppc64le"/>
+                <plugin id="org.eclipse.swt.gtk.linux.x86"/>
+                <plugin id="org.eclipse.swt.gtk.linux.s390x"/>
+                <plugin id="org.eclipse.swt.gtk.linux.s390"/>
+                <plugin id="org.eclipse.swt.gtk.linux.x86_64"/>
+                <plugin id="org.eclipse.swt.gtk.aix.ppc"/>
+                <plugin id="org.eclipse.swt.gtk.aix.ppc64"/>
+                <plugin id="org.eclipse.swt.gtk.hpux.ia64"/>
@@ -64,10 +68,13 @@
                 <plugin id="org.eclipse.swt.gtk.linux.ppc"/>
                 <plugin id="org.eclipse.swt.gtk.linux.ppc64"/>
                 <plugin id="org.eclipse.swt.cocoa.macosx"/>
-                <plugin id="org.eclipse.swt.cocoa.macosx"/>
+                <plugin id="org.eclipse.swt.cocoa.macosx.x86_64"/>
                 <plugin id="org.eclipse.swt.gtk.aix.ppc"/>
                 <plugin id="org.eclipse.swt.gtk.aix.ppc64"/>
                 <plugin id="org.eclipse.swt.gtk.hpux.ia64"/>
+                <plugin id="org.eclipse.swt.win32.win32.x86"/>
+                <plugin id="org.eclipse.swt.win32.win32.x86_64"/>
+                <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"/>
                 <plugin id="org.eclipse.equinox.launcher"/>
+                <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.%%ECLIPSE_ARCH%%"/>
                 <plugin id="org.eclipse.equinox.launcher.gtk.solaris.sparc"/>
                 <plugin id="org.eclipse.equinox.launcher.gtk.solaris.x86"/>
                 <plugin id="org.eclipse.equinox.launcher.cocoa.macosx"/>
--- a/rt.equinox.bundles/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
+++ b/rt.equinox.bundles/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
@@ -31,6 +31,12 @@
           <resolver>p2</resolver>
           <environments>
             <environment>
+              <os>freebsd</os>
+              <ws>gtk</ws>
+              <arch>%%ECLIPSE_ARCH%%</arch>
+            </environment>
+<!--
+            <environment>
               <os>linux</os>
               <ws>gtk</ws>
               <arch>x86</arch>
@@ -55,6 +66,7 @@
               <ws>cocoa</ws>
               <arch>x86_64</arch>
             </environment>
+-->
           </environments>
         </configuration>
       </plugin>
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 @@
   <artifactId>org.eclipse.equinox.launcher</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.7</version>
+          <dependencies>
+            <dependency>
+              <groupId>bsf</groupId>
+              <artifactId>bsf</artifactId>
+              <version>2.4.0</version>
+            </dependency>
+            <dependency>
+              <groupId>rhino</groupId>
+              <artifactId>js</artifactId>
+              <version>1.7R2</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.ant</groupId>
+              <artifactId>ant-apache-bsf</artifactId>
+              <version>1.8.3</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.ant</groupId>
+              <artifactId>ant-nodeps</artifactId>
+              <version>1.8.1</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>build-native-launchers-gtk.freebsd.%%ECLIPSE_ARCH%%</id>

+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version> 1.7 </version>
+            <executions>
+              <execution>
+                <id>compile-executable-natives</id>

+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>bsf</groupId>
+                <artifactId>bsf</artifactId>
+                <version>2.4.0</version>
+              </dependency>
+              <dependency>
+                <groupId>rhino</groupId>
+                <artifactId>js</artifactId>
+                <version>1.7R2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-apache-bsf</artifactId>
+                <version>1.8.3</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-nodeps</artifactId>
+                <version>1.8.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>build-native-launchers-gtk.linux.x86_64</id>
+      <activation>
+        <property>
+          <name>native</name>
+          <value>gtk.linux.x86_64</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version> 1.7 </version>
+            <executions>
+              <execution>
+                <id>compile-executable-natives</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <target>
+                    <ant antfile="build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>bsf</groupId>
+                <artifactId>bsf</artifactId>
+                <version>2.4.0</version>
+              </dependency>
+              <dependency>
+                <groupId>rhino</groupId>
+                <artifactId>js</artifactId>
+                <version>1.7R2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-apache-bsf</artifactId>
+                <version>1.8.3</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-nodeps</artifactId>
+                <version>1.8.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>build-native-launchers-gtk.linux.x86</id>
+      <activation>
+        <property>
+          <name>native</name>
+          <value>gtk.linux.x86</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version> 1.7 </version>
+            <executions>
+              <execution>
+                <id>compile-executable-natives</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <target>
+                    <ant antfile="build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>bsf</groupId>
+                <artifactId>bsf</artifactId>
+                <version>2.4.0</version>
+              </dependency>
+              <dependency>
+                <groupId>rhino</groupId>
+                <artifactId>js</artifactId>
+                <version>1.7R2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-apache-bsf</artifactId>
+                <version>1.8.3</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-nodeps</artifactId>
+                <version>1.8.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>build-native-launchers-win32.win32.x86_64</id>
+      <activation>
+        <property>
+          <name>native</name>
+          <value>win32.win32.x86_64</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version> 1.7 </version>
+            <executions>
+              <execution>
+                <id>compile-executable-natives</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <target>
+                    <ant antfile="build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>bsf</groupId>
+                <artifactId>bsf</artifactId>
+                <version>2.4.0</version>
+              </dependency>
+              <dependency>
+                <groupId>rhino</groupId>
+                <artifactId>js</artifactId>
+                <version>1.7R2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-apache-bsf</artifactId>
+                <version>1.8.3</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-nodeps</artifactId>
+                <version>1.8.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>build-native-launchers-win32.win32.x86</id>
+      <activation>
+        <property>
+          <name>native</name>
+          <value>win32.win32.x86</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version> 1.7 </version>
+            <executions>
+              <execution>
+                <id>compile-executable-natives</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <target>
+                    <ant antfile="build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>bsf</groupId>
+                <artifactId>bsf</artifactId>
+                <version>2.4.0</version>
+              </dependency>
+              <dependency>
+                <groupId>rhino</groupId>
+                <artifactId>js</artifactId>
+                <version>1.7R2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-apache-bsf</artifactId>
+                <version>1.8.3</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-nodeps</artifactId>
+                <version>1.8.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>build-native-launchers-cocoa.macosx.x86_64</id>
+      <activation>
+        <property>
+          <name>native</name>
+          <value>cocoa.macosx.x86_64</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version> 1.7 </version>
+            <executions>
+              <execution>
+                <id>compile-executable-natives</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <target>
+                    <ant antfile="build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/carbon/" target="build_eclipse"/>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>bsf</groupId>
+                <artifactId>bsf</artifactId>
+                <version>2.4.0</version>
+              </dependency>
+              <dependency>
+                <groupId>rhino</groupId>
+                <artifactId>js</artifactId>
+                <version>1.7R2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-apache-bsf</artifactId>
+                <version>1.8.3</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-nodeps</artifactId>
+                <version>1.8.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>assemble-launchers</id>
+      <activation>
+        <property>
+          <!-- workaround. activeByDefault is disabled when another profile is 
+            selected. -->
+          <name>!longnotexistingproperty</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version> 1.7 </version>
+            <executions>
+              <execution>
+                <id>copy-executable-natives</id>
+                <phase>process-resources</phase>
+                <configuration>
+                  <target>
+                    <!-- We need to get binary bits from binary repo -->
+                    <!-- If local binaries had been built, copy will not overwrite 
+                      them -->
+                    <copy todir="bin">
+                      <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
+                        <include name="**/*"/>
+                      </fileset>
+                    </copy>
+                    <copy todir="contributed">
+                      <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
+                        <include name="**/*"/>
+                      </fileset>
+                    </copy>
+
+                    <!-- Things below were copied from custombuildCallbacks.xml, as 
+                      Tycho does not support that -->
+                    <copy includeEmptyDirs="false" todir="tempBin">
+                      <fileset dir="bin"/>
+                    </copy>
+                    <delete dir="bin"/>
+                    <move todir="bin">
+                      <fileset dir="tempBin"/>
+                    </move>
+
+                    <!-- rename eclipse launchers to "launcher" -->
+                    <move todir="bin" verbose="true">
+                      <fileset dir="bin"/>
+                      <regexpmapper from="^(.*[/\\])eclipse(.exe)?$" to="\1launcher\2"/>
+                    </move>
+                    <move todir="contributed" verbose="true">
+                      <fileset dir="contributed"/>
+                      <regexpmapper from="^(.*[/\\])eclipse(.exe)?$" to="\1launcher\2"/>
+                    </move>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>bsf</groupId>
+                <artifactId>bsf</artifactId>
+                <version>2.4.0</version>
+              </dependency>
+              <dependency>
+                <groupId>rhino</groupId>
+                <artifactId>js</artifactId>
+                <version>1.7R2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-apache-bsf</artifactId>
+                <version>1.8.3</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-nodeps</artifactId>
+                <version>1.8.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
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

 		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$

 				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.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$

 	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
@@ -343,6 +343,8 @@
                         <include name="gtk/linux/ppc64/**/*" />
                         <include name="gtk/linux/x86/**/*" />
                         <include name="gtk/linux/x86_64/**/*" />
+                        <include name="gtk/freebsd/x86/**/*" />
+                        <include name="gtk/freebsd/x86_64/**/*" />
                         <include name="gtk/solaris/sparc/**/*" />
                         <include name="gtk/solaris/x86/**/*" />
                         <include name="win32/win32/x86/**/*" />
       </build>
     </profile>
     <profile>
+      <id>build-native-launchers-gtk.freebsd.%%ECLIPSE_ARCH%%</id>
+      <activation>
+        <property>
+          <name>native</name>
+          <value>gtk.freebsd.%%ECLIPSE_ARCH%%</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version> 1.7 </version>
+            <executions>
+              <execution>
+                <id>compile-executable-natives</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <target>
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>bsf</groupId>
+                <artifactId>bsf</artifactId>
+                <version>2.4.0</version>
+              </dependency>
+              <dependency>
+                <groupId>rhino</groupId>
+                <artifactId>js</artifactId>
+                <version>1.7R2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-apache-bsf</artifactId>
+                <version>1.8.3</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant-nodeps</artifactId>
+                <version>1.8.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>build-native-launchers-win32.win32.x86_64</id>
       <activation>
         <property>
@@ -366,6 +473,7 @@
         </plugins>
       </build>
     </profile>
+-->
     <profile>
       <id>assemble-launchers</id>
       <activation>
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

 	<target name="rootFileslinux_gtk_x86">
 		<mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}"/>
 		<copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true">
@@ -243,6 +259,8 @@
 		<antcall target="rootFilesmacosx_carbon_x86"/>
 		<antcall target="rootFilesmacosx_cocoa_ppc"/>
 		<antcall target="rootFilesmacosx_cocoa_x86"/>

 		<antcall target="rootFileslinux_gtk_x86"/>
 		<antcall target="rootFileslinux_gtk_ppc"/>
 		<antcall target="rootFileslinux_gtk_ppc64"/>
@@ -279,4 +297,4 @@
 	<target name="gather.logs" depends="init">
 	</target>
 

 		//Initially the files are in: <root>/Eclipse.app/ 
 		//and they must appear in <root>/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 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 {
-	private static final int STATE_LICENSE = 18;
-	private static final int STATE_LICENSE_URL = 19;
-	private static final int STATE_LICENSE_TEXT = 20;
+	private static final int STATE_PROGRAM_ARGS_FREEBSD = 7;
+	private static final int STATE_PROGRAM_ARGS_LINUX = 8;
+	private static final int STATE_PROGRAM_ARGS_MAC = 9;
+	private static final int STATE_PROGRAM_ARGS_SOLARIS = 10;
+	private static final int STATE_PROGRAM_ARGS_WIN = 11;
+	private static final int STATE_VM_ARGS = 12;
+	private static final int STATE_VM_ARGS_FREEBSD = 13;
+	private static final int STATE_VM_ARGS_LINUX = 14;
+	private static final int STATE_VM_ARGS_MAC = 15;
+	private static final int STATE_VM_ARGS_SOLARIS = 16;
+	private static final int STATE_VM_ARGS_WIN = 17;
+	private static final int STATE_CONFIG_INI = 18;
+	private static final int STATE_CONFIGURATIONS = 19;
+	private static final int STATE_LICENSE = 20;
+	private static final int STATE_LICENSE_URL = 21;
+	private static final int STATE_LICENSE_TEXT = 22;
 
 	private static final String PI_PDEBUILD = "org.eclipse.pde.build"; //$NON-NLS-1$
 	private final static int EXCEPTION_PRODUCT_FORMAT = 23;
@@ -437,6 +442,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor {
 			key = VM_ARGS_MAC;
 		} else if (os.equals(OS_SOLARIS)) {
 			key = VM_ARGS_SOLARIS;

+			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;

+			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);

 				}
 				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_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_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_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_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_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));
 	}
 

 configs = win32, win32, x86 & \
-    linux, gtk, x86 &
+	linux, gtk, x86 & \
+	freebsd, gtk, x86
 #configs=win32, win32, x86 & \
 #	linux, gtk, ppc &\
 # linux, gtk, x86 & \

 configs = win32, win32, x86 & \
-    linux, gtk, x86
+	linux, gtk, x86 & \
+	freebsd, gtk, x86
 #configs=win32, win32, x86 & \
 #	linux, gtk, ppc &\
 # linux, gtk, x86 & \

               </excludes>
             </configuration>
           </execution>
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
@@ -54,18 +54,6 @@
           <executionEnvironment>J2SE-1.5</executionEnvironment>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <configuration>
-          <!--
-          Many (all?) bundles use java 5 generics, do not compile against libraries
-          of their respective execution environments and we force compilation against
-          SYSTEM JRE libraries that are guaranteed to be java5+
-          -->
-          <useJDK>BREE</useJDK>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
--- a/eclipse.platform/platform/org.eclipse.platform/plugin.xml.orig	2014-06-05 16:12:04.000000000 -0500
+++ b/eclipse.platform/platform/org.eclipse.platform/plugin.xml	2014-08-01 17:23:26.000000000 -0500
@@ -141,6 +141,12 @@
             basestylesheeturi="css/e4_default_gtk.css"
             id="org.eclipse.e4.ui.css.theme.e4_default"
             label="%theme.gtk"
+            os="freebsd">
+      </theme>
+      <theme
+            basestylesheeturi="css/e4_default_gtk.css"
+            id="org.eclipse.e4.ui.css.theme.e4_default"
+            label="%theme.gtk"
             os="linux">
       </theme>
       <theme
--- a/eclipse.platform.ua/org.eclipse.ui.intro.universal/plugin.xml.orig	2014-06-05 17:05:18.000000000 -0500
+++ b/eclipse.platform.ua/org.eclipse.ui.intro.universal/plugin.xml	2014-08-01 19:39:25.000000000 -0500
@@ -46,7 +46,7 @@
             <implementation
                   style="themes/shared/html/shared.css,$theme$/html/shared.css,$theme$/html/font-$fontStyle$.css,$theme$/html/$direction$.css"

             </implementation>
             <implementation
                   kind="swt">
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 @@
    <extension point="org.eclipse.ui.browser.browsers">
+      <!-- FreeBSD -->
+      <browser
+         id="org.eclipse.ui.browser.firefox"
+         name="%browserFirefox"
+         os="freebsd"
+         executable="firefox"
+         factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
+         <location>
+            usr/local/bin/firefox
+         </location>
+      </browser>
       <!-- Linux -->
       <browser
          id="org.eclipse.ui.browser.firefox"
          name="%browserFirefox"
-         os="linux,aix,hpux,solaris"
+         os="freebsd,linux,aix,hpux,solaris"
          executable="firefox"
          factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
          <location>
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
          </description>
          <fontValue
-               os="linux"
+               os="freebsd,linux"
+               ws="gtk">
+         </fontValue>
+         <fontValue
                os="linux"
                value="Monospace-regular-10"
                ws="gtk">
          </fontValue>
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">
     </theme>
     <theme
+        basestylesheeturi="css/e4-dark.css"
+        id="org.eclipse.e4.ui.css.theme.e4_dark"
+        label="%theme.dark"
+        os="freebsd">
+    </theme>
+    <theme
         basestylesheeturi="css/e4-dark_win.css"
         id="org.eclipse.e4.ui.css.theme.e4_dark"
         label="%theme.dark"
@@ -38,6 +44,12 @@
             label="%theme.gtk"
             os="linux">
       </theme>
+      <theme
+            basestylesheeturi="css/e4_default_gtk.css"
+            id="org.eclipse.e4.ui.css.theme.e4_default"
+            label="%theme.gtk"
+            os="freebsd">
+      </theme>
    <theme
          basestylesheeturi="css/e4_classic_winxp.css"
          id="org.eclipse.e4.ui.css.theme.e4_default"
diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml
index 9b2fce9..68e15bc 100644
--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml
+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests.reconciler.product/pom.xml
@@ -38,6 +38,7 @@
 						</goals>
 						<configuration>
 							<formats>
+								<freebsd>tar.gz</freebsd>
 								<linux>tar.gz</linux>
 							</formats>
 						</configuration>
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 @@
       <plugin id="org.eclipse.core.expressions"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.net"/>
+      <plugin id="org.eclipse.core.net.freebsd.%%ECLIPSE_ARCH%%" fragment="true"/>
+<!--
       <plugin id="org.eclipse.core.net.linux.x86_64" fragment="true"/>
+-->
       <plugin id="org.eclipse.core.runtime"/>
       <plugin id="org.eclipse.core.runtime.compatibility"/>
       <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
@@ -128,11 +131,14 @@
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.util"/>
       <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%" fragment="true"/>
+<!--
       <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
+-->
       <plugin id="org.eclipse.ui"/>
       <plugin id="org.eclipse.ui.workbench"/>
       <plugin id="org.eclipse.update.configurator"/>
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 @@
             <configuration>
               <excludes>
                 <plugin id="org.eclipse.rcp"/>
+                <plugin id="org.eclipse.ui.cocoa"/>
               </excludes>
             </configuration>
           </execution>
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"/>
 
    <plugin
+         id="org.eclipse.core.net.freebsd.%%ECLIPSE_ARCH%%"
+         os="freebsd"
+         arch="%%ECLIPSE_ARCH%%"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.core.net.linux.x86_64"
          os="linux"
          arch="x86_64"
@@ -397,6 +417,16 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.core.filesystem.freebsd.%%ECLIPSE_ARCH%%"
+         os="freebsd"
+         arch="%%ECLIPSE_ARCH%%"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.core.filesystem.linux.x86"
          os="linux"
          arch="x86"




  cp -p "$1" "${d}/make_freebsd.mak"
}

for d in \
	${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x* \
	${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x* \
	${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux \
	${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux \

  mkdir -p `echo $d | sed -e 's/linux/freebsd/'`
  [ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
done
# "fragments" pieces
for d in \
	${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x*
do
  mkdir -p `echo $d | sed -e 's/linux/freebsd/'`
  [ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
done
for d in \
	${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x*
do
  mkdir -p `dirname $d`/`basename $d | sed -e 's/\.linux.*$//'`/fragments/`basename $d | sed -e 's/linux/freebsd/'`
  [ -d $d ] && ( cd $d; tar cf - . ) | ( cd `dirname $d`/`basename $d | sed -e 's/\.linux.*$//'`/fragments/`basename $d | sed -e 's/linux/freebsd/'`; tar xf - )
done


for d in `find ${WRKSRC} -type d -name \*freebsd\*`
do
  for f in `find $d -name \*linux\*`

Return to bug 195985

Lines 2-9 Link Here

(-)Makefile (-6 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= eclipse	4	PORTNAME= eclipse
5	PORTVERSION= 4.3.2	5	PORTVERSION= 4.4.2
6	PORTREVISION= 3
7	CATEGORIES= java devel	6	CATEGORIES= java devel
8	MASTER_SITES= https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/	7	MASTER_SITES= https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/
9	DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \	8	DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
Lines 11-17 Link Here
11	DIST_SUBDIR= eclipse	10	DIST_SUBDIR= eclipse
12		11
13	MAINTAINER= ljboiler@gmail.com	12	MAINTAINER= ljboiler@gmail.com
14	COMMENT= Eclipse Kepler SR-2	13	COMMENT= Eclipse Luna SR-2
15		14
16	LICENSE= EPL	15	LICENSE= EPL
17		16
Lines 27-37 Link Here
27	USE_GNOME= gconf2 gtk20 gnomevfs2 libgnome libgnomeui	26	USE_GNOME= gconf2 gtk20 gnomevfs2 libgnome libgnomeui
28	USE_JAVA= yes	27	USE_JAVA= yes
29	JAVA_OS= native	28	JAVA_OS= native
30	JAVA_VERSION= 1.7	29	JAVA_VERSION= 1.8
31	JAVA_VENDOR= openjdk	30	JAVA_VENDOR= openjdk
32	JAVA_BUILD= yes	31	JAVA_BUILD= yes
33	JAVA_RUN= yes	32	JAVA_RUN= yes
34		33
		34	OPTIONS_DEFINE= SWT_GTK3_SUPPORT
		35	SWT_GTK3_SUPPORT_DESC= Enable GTK3 support in SWT (GUI)
35	OPTIONS_SINGLE= INSTALLPKG	36	OPTIONS_SINGLE= INSTALLPKG
36	OPTIONS_SINGLE_INSTALLPKG= FULL_SDK PLATFORM_SDK PLATFORM	37	OPTIONS_SINGLE_INSTALLPKG= FULL_SDK PLATFORM_SDK PLATFORM
37	FULL_SDK_DESC= Full SDK (JDT, PDE, source, API docs)	38	FULL_SDK_DESC= Full SDK (JDT, PDE, source, API docs)
Lines 48-53 Link Here
48	.endif	49	.endif
49	PATCH_STRIP= -p1	50	PATCH_STRIP= -p1
50		51
		52	.if ${PORT_OPTIONS:MSWT_GTK3_SUPPORT}
		53	USE_GNOME+= gtk30
		54	LIB_DEPENDS+= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
		55	MVN_SETTINGS+= -Dmachine_gtk3=1
		56	.endif
		57
51	WRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION}	58	WRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION}
52	GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator	59	GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator
53		60
Lines 57-63 Link Here
57	ECLIPSE_WS= gtk	64	ECLIPSE_WS= gtk
58	ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/}	65	ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/}
59	E_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//}	66	E_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//}
60	ECLIPSE_BUILDID=M20140224-0627	67	ECLIPSE_BUILDID=M20150204-1700
61	SCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \	68	SCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \
62	E_SHORTARCH=${E_SHORTARCH}	69	E_SHORTARCH=${E_SHORTARCH}
63	PORTDESTDIR= ${PREFIX}/lib/eclipse	70	PORTDESTDIR= ${PREFIX}/lib/eclipse
Lines 88-94 Link Here
88	do-build:	95	do-build:
89	@(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} M2_HOME=${LOCALBASE}/share/java/maven31 ${MVN_OPTS} \	96	@(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} M2_HOME=${LOCALBASE}/share/java/maven31 ${MVN_OPTS} \
90	mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \	97	mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \
91	-DbuildId=${ECLIPSE_BUILDID} -Pupdate-branding-plugins)	98	-DbuildId=${ECLIPSE_BUILDID})
92		99
93	do-install:	100	do-install:
94	@${RM} -rf ${STAGEDIR}${PORTDESTDIR}	101	@${RM} -rf ${STAGEDIR}${PORTDESTDIR}

Lines 12-19 Link Here

(-)scripts/pre-patch (-2 / +15 lines)
12	cp -p "$1" "${d}/make_freebsd.mak"	12	cp -p "$1" "${d}/make_freebsd.mak"
13	}	13	}
14		14
15	for d in ${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x* \	15	for d in \
16	${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x* \
17	${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x* \	16	${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x* \
18	${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux \	17	${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux \
19	${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux \	18	${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux \
Lines 25-31 Link Here
25	mkdir -p `echo $d \| sed -e 's/linux/freebsd/'`	24	mkdir -p `echo $d \| sed -e 's/linux/freebsd/'`
26	[ -d $d ] && ( cd $d; tar cf - . ) \| ( cd `echo $d \| sed -e 's/linux/freebsd/'`; tar xf - )	25	[ -d $d ] && ( cd $d; tar cf - . ) \| ( cd `echo $d \| sed -e 's/linux/freebsd/'`; tar xf - )
27	done	26	done
		27	# "fragments" pieces
		28	for d in \
		29	${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x*
		30	do
		31	mkdir -p `echo $d \| sed -e 's/linux/freebsd/'`
		32	[ -d $d ] && ( cd $d; tar cf - . ) \| ( cd `echo $d \| sed -e 's/linux/freebsd/'`; tar xf - )
		33	done
		34	for d in \
		35	${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x*
		36	do
		37	mkdir -p `dirname $d`/`basename $d \| sed -e 's/\.linux.*$//'`/fragments/`basename $d \| sed -e 's/linux/freebsd/'`
		38	[ -d $d ] && ( cd $d; tar cf - . ) \| ( cd `dirname $d`/`basename $d \| sed -e 's/\.linux.*$//'`/fragments/`basename $d \| sed -e 's/linux/freebsd/'`; tar xf - )
		39	done
28		40
		41
29	for d in `find ${WRKSRC} -type d -name \freebsd\`	42	for d in `find ${WRKSRC} -type d -name \freebsd\`
30	do	43	do
31	for f in `find $d -name \linux\`	44	for f in `find $d -name \linux\`