1diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF
2--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
3+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
4@@ -2,9 +2,9 @@
5 Bundle-ManifestVersion: 2
6 Bundle-Name: %pluginName
7 Bundle-Vendor: %providerName
8-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true
9+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true
10 Bundle-Version: 1.1.1200.qualifier
11 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
12-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
13-Bundle-Localization: launcher.gtk.linux.aarch64
14+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64))
15+Bundle-Localization: launcher.gtk.freebsd.aarch64
16 Eclipse-BundleShape: dir
17diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml
18--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
19+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64/pom.xml	0000-00-00 00:00:00.000000000 +0000
20@@ -18,12 +18,12 @@
21     <relativePath>../../launcher-binary-parent</relativePath>
22   </parent>
23   <groupId>org.eclipse.equinox</groupId>
24-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.aarch64</artifactId>
25+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.aarch64</artifactId>
26   <version>1.1.1200-SNAPSHOT</version>
27   <packaging>eclipse-plugin</packaging>
28
29   <properties>
30-    <os>linux</os>
31+    <os>freebsd</os>
32     <ws>gtk</ws>
33     <arch>aarch64</arch>
34     <skipAPIAnalysis>true</skipAPIAnalysis>
35diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project
36--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
37+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
38@@ -1,6 +1,6 @@
39 <?xml version="1.0" encoding="UTF-8"?>
40 <projectDescription>
41-	<name>org.eclipse.equinox.launcher.gtk.linux.x86_64</name>
42+	<name>org.eclipse.equinox.launcher.gtk.freebsd.amd64</name>
43 	<comment></comment>
44 	<projects>
45 	</projects>
46diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF
47--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
48+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
49@@ -2,9 +2,9 @@
50 Bundle-ManifestVersion: 2
51 Bundle-Name: %pluginName
52 Bundle-Vendor: %providerName
53-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
54+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true
55 Bundle-Version: 1.1.1200.qualifier
56 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
57-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
58-Bundle-Localization: launcher.gtk.linux.x86_64
59+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))
60+Bundle-Localization: launcher.gtk.freebsd.amd64
61 Eclipse-BundleShape: dir
62diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties
63--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties	0000-00-00 00:00:00.000000000 +0000
64+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/launcher.gtk.linux.x86_64.properties	0000-00-00 00:00:00.000000000 +0000
65@@ -11,5 +11,5 @@
66 # Contributors:
67 #     IBM Corporation - initial API and implementation
68 ###############################################################################
69-pluginName = Equinox Launcher Linux X86_64 Fragment
70+pluginName = Equinox Launcher FreeBSD/amd64 Fragment
71 providerName = Eclipse.org - Equinox
72diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml
73--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
74+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
75@@ -18,14 +18,14 @@
76     <relativePath>../../launcher-binary-parent</relativePath>
77   </parent>
78   <groupId>org.eclipse.equinox</groupId>
79-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
80+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.amd64</artifactId>
81   <version>1.1.1200-SNAPSHOT</version>
82   <packaging>eclipse-plugin</packaging>
83
84   <properties>
85-    <os>linux</os>
86+    <os>freebsd</os>
87     <ws>gtk</ws>
88-    <arch>x86_64</arch>
89+    <arch>amd64</arch>
90     <skipAPIAnalysis>true</skipAPIAnalysis>
91   </properties>
92 </project>
93diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project
94--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project	0000-00-00 00:00:00.000000000 +0000
95+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project	0000-00-00 00:00:00.000000000 +0000
96@@ -1,6 +1,6 @@
97 <?xml version="1.0" encoding="UTF-8"?>
98 <projectDescription>
99-	<name>org.eclipse.equinox.launcher.gtk.linux.ppc64le</name>
100+	<name>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</name>
101 	<comment></comment>
102 	<projects>
103 	</projects>
104diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF
105--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
106+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
107@@ -2,9 +2,9 @@
108 Bundle-ManifestVersion: 2
109 Bundle-Name: %pluginName
110 Bundle-Vendor: %providerName
111-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true
112+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true
113 Bundle-Version: 1.1.1200.qualifier
114 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
115-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
116-Bundle-Localization: launcher.gtk.linux.ppc64le
117+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=powerpc64))
118+Bundle-Localization: launcher.gtk.freebsd.powerpc64
119 Eclipse-BundleShape: dir
120diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml
121--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
122+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
123@@ -18,14 +18,14 @@
124     <relativePath>../../launcher-binary-parent</relativePath>
125   </parent>
126   <groupId>org.eclipse.equinox</groupId>
127-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId>
128+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</artifactId>
129   <version>1.1.1200-SNAPSHOT</version>
130   <packaging>eclipse-plugin</packaging>
131
132   <properties>
133-    <os>linux</os>
134+    <os>freebsd</os>
135     <ws>gtk</ws>
136-    <arch>ppc64le</arch>
137+    <arch>powerpc64</arch>
138     <skipAPIAnalysis>true</skipAPIAnalysis>
139   </properties>
140 </project>
141diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
142--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	0000-00-00 00:00:00.000000000 +0000
143+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	0000-00-00 00:00:00.000000000 +0000
144@@ -24,11 +24,11 @@
145 root.win32.win32.x86_64=bin/win32/win32/x86_64
146 root.win32.win32.x86_64.permissions.755=launcher.exe
147
148-root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
149-root.linux.gtk.ppc64le.permissions.755=launcher
150+root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root
151+root.freebsd.gtk.powerpc64.permissions.755=launcher
152
153 root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64
154 root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/launcher
155
156-root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
157-root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
158+root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root
159+root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so
160diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml
161--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
162+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml	0000-00-00 00:00:00.000000000 +0000
163@@ -33,20 +33,20 @@
164          fragment="true"/>
165
166    <plugin
167-         id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
168-         os="linux"
169+         id="org.eclipse.equinox.launcher.gtk.freebsd.powerpc64"
170+         os="freebsd"
171          ws="gtk"
172-         arch="ppc64le"
173+         arch="powerpc64"
174          download-size="0"
175          install-size="0"
176          version="0.0.0"
177          fragment="true"/>
178
179    <plugin
180-         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
181-         os="linux"
182+         id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"
183+         os="freebsd"
184          ws="gtk"
185-         arch="x86_64"
186+         arch="amd64"
187          download-size="0"
188          install-size="0"
189          version="0.0.0"
190diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
191--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	0000-00-00 00:00:00.000000000 +0000
192+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	0000-00-00 00:00:00.000000000 +0000
193@@ -112,8 +112,13 @@
194 				;;
195 		esac
196 		;;
197+	FreeBSD|freebsd)
198+		defaultOS="freebsd"
199+		defaultJava=DEFAULT_JAVA_EXEC
200+		makefile="make_linux.mak"
201+		;;
202 	*)
203-	echo "Unknown OS -- build aborted"
204+	echo "Unknown OS $defaultOS -- build aborted"
205 	;;
206 esac
207 export CC
208@@ -146,19 +151,20 @@
209
210 LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
211 OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
212+mkdir -p ${OUTPUT_DIR}
213
214 export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS DEFAULT_JAVA LIBRARY_DIR
215
216 # If the OS is supported (a makefile exists)
217 if [ "$makefile" != "" ]; then
218 	if [ "$extraArgs" != "" ]; then
219-		make -f $makefile $extraArgs
220+		gmake -f $makefile $extraArgs
221 	else
222 		echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS"
223-		make -f $makefile clean
224+		gmake -f $makefile clean
225 		case x$CC in
226-		  x*gcc*) make -f $makefile all PICFLAG=-fpic ;;
227-		  *)      make -f $makefile all ;;
228+		  x*gcc*) gmake -f $makefile all PICFLAG=-fpic ;;
229+		  *)      gmake -f $makefile all ;;
230 		esac
231 	fi
232 else
233diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
234--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
235+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
236@@ -81,10 +81,11 @@
237  -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
238  -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
239  -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
240-LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
241-CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
242+port_prefix=`pkg-config --variable=prefix gtk+-3.0`
243+LFLAGS = ${M_ARCH} -shared -fpic
244+CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\
245 	-fpic \
246-	-DLINUX \
247+	-DFREEBSD \
248 	-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
249 	-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
250 	-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
251@@ -92,7 +93,8 @@
252 	$(GTK_LIBS) \
253 	-I. \
254 	-I.. \
255-	-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
256+	-I$(port_prefix)/include \
257+	-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd \
258 	`pkg-config --cflags gtk+-3.0`
259
260 all: $(EXEC) $(DLL)
261@@ -130,11 +132,11 @@
262
263 $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
264 	$(info Linking and generating: $(EXEC))
265-	$(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
266+	$(CC) ${M_ARCH} -s -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
267
268 $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
269 	$(info Linking and generating: $(DLL))
270-	$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
271+	$(CC) $(LFLAGS) -s -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
272
273 install: all
274 	cp $(EXEC) $(OUTPUT_DIR)
275diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
276--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	0000-00-00 00:00:00.000000000 +0000
277+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	0000-00-00 00:00:00.000000000 +0000
278@@ -123,8 +123,8 @@
279                     <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
280                       <fileset dir="${rt.equinox.binaries.loc}/org.eclipse.equinox.executable/bin/">
281                         <include name="cocoa/macosx/x86_64/**/*"/>
282-                        <include name="gtk/linux/ppc64le/**/*"/>
283-                        <include name="gtk/linux/x86_64/**/*"/>
284+                        <include name="gtk/freebsd/powerpc64/**/*"/>
285+                        <include name="gtk/freebsd/amd64/**/*"/>
286                         <include name="win32/win32/x86_64/**/*"/>
287                       </fileset>
288                     </copy>
289diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
290--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties	0000-00-00 00:00:00.000000000 +0000
291+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties	0000-00-00 00:00:00.000000000 +0000
292@@ -20,12 +20,12 @@
293 root.win32.win32.x86_64=file:bin/win32/win32/x86_64/launcher.exe
294 root.win32.win32.x86_64.permissions.755=launcher.exe
295
296-root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
297-root.linux.gtk.ppc64le.permissions.755=launcher
298+root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root
299+root.freebsd.gtk.powerpc64.permissions.755=launcher
300
301 root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64
302 root.macosx.cocoa.x86_64.permissions.755=Contents/MacOS/${launcherName}
303
304-root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
305-root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
306+root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root
307+root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so
308
309diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml
310--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml	0000-00-00 00:00:00.000000000 +0000
311+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml	0000-00-00 00:00:00.000000000 +0000
312@@ -76,29 +76,29 @@
313 		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}" />
314 		<chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" />
315 	</target>
316-	<target name="rootFileslinux_gtk_ppc64le">
317-		<mkdir dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}"/>
318-		<copy todir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" failonerror="true" overwrite="true">
319-			<fileset dir="${basedir}/bin/gtk/linux/ppc64le" includes="**"			/>
320+	<target name="rootFilesfreebsd_gtk_powerpc64">
321+		<mkdir dir="${feature.base}/freebsd.gtk.powerpc64/${collectingFolder}"/>
322+		<copy todir="${feature.base}/freebsd.gtk.powerpc64/${collectingFolder}" failonerror="true" overwrite="true">
323+			<fileset dir="${basedir}/bin/gtk/freebsd/powerpc64" includes="**"			/>
324 			<fileset dir="${basedir}/gtk_root" includes="**"			/>
325 		</copy>
326-		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" includes="launcher" />
327+		<chmod perm="755" dir="${feature.base}/freebsd.gtk.powerpc64/${collectingFolder}" includes="launcher" />
328 	</target>
329-    <target name="rootFileslinux_gtk_aarch64">
330-		<mkdir dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}"/>
331-		<copy todir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true">
332-			<fileset dir="${basedir}/bin/gtk/linux/aarch64" includes="**"			/>
333+    <target name="rootFilesfreebsd_gtk_aarch64">
334+		<mkdir dir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}"/>
335+		<copy todir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true">
336+			<fileset dir="${basedir}/bin/gtk/freebsd/aarch64" includes="**"			/>
337 			<fileset dir="${basedir}/gtk_root" includes="**"			/>
338 		</copy>
339-		<chmod perm="755" dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" includes="launcher" />
340+		<chmod perm="755" dir="${feature.base}/freebsd.gtk.aarch64/${collectingFolder}" includes="launcher" />
341 	</target>
342-	<target name="rootFileslinux_gtk_x86_64">
343-		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
344-		<copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
345-			<fileset dir="${basedir}/bin/gtk/linux/x86_64" includes="**"			/>
346+	<target name="rootFilesfreebsd_gtk_amd64">
347+		<mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/>
348+		<copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true">
349+			<fileset dir="${basedir}/bin/gtk/freebsd/amd64" includes="**"			/>
350 			<fileset dir="${basedir}/gtk_root" includes="**"			/>
351 		</copy>
352-		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="launcher" />
353+		<chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="launcher" />
354 	</target>
355 	<target name="rootFileslinux_gtk_ia64">
356 		<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/>
357@@ -138,8 +138,8 @@
358 	<target name="rootFilesgroup_group_group">
359 		<antcall target="rootFileswin32_win32_x86_64"/>
360 		<antcall target="rootFilesmacosx_cocoa_x86_64"/>
361-		<antcall target="rootFileslinux_gtk_ppc64le"/>
362-		<antcall target="rootFileslinux_gtk_x86_64"/>
363+		<antcall target="rootFilesfreebsd_gtk_powerpc64"/>
364+		<antcall target="rootFilesfreebsd_gtk_amd64"/>
365 	</target>
366
367 	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.platform.launchers.">
368diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml
369--- rt.equinox.framework/pom.xml	0000-00-00 00:00:00.000000000 +0000
370+++ rt.equinox.framework/pom.xml	0000-00-00 00:00:00.000000000 +0000
371@@ -54,27 +54,27 @@
372       </repositories>
373     </profile>
374     <profile>
375-      <id>build-native-launchers-gtk.linux.arm</id>
376+      <id>build-native-launchers-gtk.freebsd.armv7</id>
377       <activation>
378 	<property>
379 	  <name>native</name>
380-	  <value>gtk.linux.arm</value>
381+	  <value>gtk.freebsd.armv7</value>
382         </property>
383       </activation>
384       <modules>
385-	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
386+	<module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7</module>
387       </modules>
388     </profile>
389     <profile>
390-      <id>build-native-launchers-gtk.linux.aarch64</id>
391+      <id>build-native-launchers-gtk.freebsd.aarch64</id>
392       <activation>
393 	<property>
394 	  <name>native</name>
395-	  <value>gtk.linux.aarch64</value>
396+	  <value>gtk.freebsd.aarch64</value>
397         </property>
398       </activation>
399       <modules>
400-	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
401+	<module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64</module>
402       </modules>
403     </profile>
404   </profiles>
405@@ -88,8 +88,8 @@
406
407     <module>bundles/org.eclipse.equinox.launcher</module>
408     <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module>
409-    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
410-    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
411+    <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</module>
412+    <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64</module>
413     <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module>
414
415     <module>bundles/org.eclipse.osgi.tests</module>
416diff -ru rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties
417--- rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties	0000-00-00 00:00:00.000000000 +0000
418+++ rt.equinox.framework/releng/org.eclipse.equinox.launcher.releng/launcher.properties	0000-00-00 00:00:00.000000000 +0000
419@@ -8,4 +8,4 @@
420 #j_linux.x86_64=/shared/common/jdk-1.6.0_10
421
422 #user names to use on each of the machines if different from the user running hudson, u_${os}.${arch}
423-u_linux.x86_64=swtbuild
424+u_freebsd.amd64=swtbuild
425