View | Details | Raw Unified | Return to bug 211764 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/local/poudriere/ports/default/java/eclipse/Makefile (-4 / +12 lines)
Lines 2-16 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	eclipse
4
PORTNAME=	eclipse
5
PORTVERSION=	4.5.2
5
PORTVERSION=	4.6
6
CATEGORIES=	java devel
6
CATEGORIES=	java devel
7
MASTER_SITES=	https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/
7
MASTER_SITES=	https://s3.amazonaws.com/freebsd-eclipse-dist/
8
DISTFILES=	eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
8
DISTFILES=	eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
9
		${PORTNAME}-maven-repo-${PORTVERSION}.xz
9
		${PORTNAME}-maven-repo-${PORTVERSION}.xz
10
DIST_SUBDIR=	eclipse
10
DIST_SUBDIR=	eclipse
11
11
12
MAINTAINER=	ljboiler@gmail.com
12
MAINTAINER=	ljboiler@gmail.com
13
COMMENT=	Eclipse Mars.2
13
COMMENT=	Eclipse Neon
14
14
15
LICENSE=	EPL
15
LICENSE=	EPL
16
16
Lines 68-78 Link Here
68
ECLIPSE_WS=	gtk
68
ECLIPSE_WS=	gtk
69
ECLIPSE_ARCH=	x86${ARCH:C/^i.86//:C/^amd/_/}
69
ECLIPSE_ARCH=	x86${ARCH:C/^i.86//:C/^amd/_/}
70
E_SHORTARCH=	${ARCH:C/^i.86//:C/^amd//}
70
E_SHORTARCH=	${ARCH:C/^i.86//:C/^amd//}
71
ECLIPSE_BUILDID=M20160212-1500
71
ECLIPSE_BUILDID=I20160606-1100
72
SCRIPTS_ENV+=	ECLIPSE_ARCH=${ECLIPSE_ARCH} \
72
SCRIPTS_ENV+=	ECLIPSE_ARCH=${ECLIPSE_ARCH} \
73
		E_SHORTARCH=${E_SHORTARCH}
73
		E_SHORTARCH=${E_SHORTARCH}
74
PORTDESTDIR=	${PREFIX}/lib/eclipse
74
PORTDESTDIR=	${PREFIX}/lib/eclipse
75
75
76
.if ${ARCH}=="i386"
77
EXTRA_PATCHES=  ${FILESDIR}/i386-patch-freebsd_natives
78
.endif
79
80
.if ${ARCH}=="amd64"
81
EXTRA_PATCHES=  ${FILESDIR}/amd64-patch-freebsd_natives
82
.endif
83
76
#  Someday it would be nice to see about moving the product selection into the patch phase (and only build the
84
#  Someday it would be nice to see about moving the product selection into the patch phase (and only build the
77
#  product the user wants), but that may prove to be difficult if not impossible with the way the eclipse tycho
85
#  product the user wants), but that may prove to be difficult if not impossible with the way the eclipse tycho
78
#  builder is a "all-or-nothing" thing right now.
86
#  builder is a "all-or-nothing" thing right now.
(-)/usr/local/poudriere/ports/default/java/eclipse/distinfo (-4 / +5 lines)
Lines 1-4 Link Here
1
SHA256 (eclipse/eclipse.platform.releng.aggregator-4.5.2.xz) = 71e46eadfcc7c8fd0c758585a228cdee5810bfbea3190a27b577e3e972b662b2
1
TIMESTAMP = 1466985570
2
SIZE (eclipse/eclipse.platform.releng.aggregator-4.5.2.xz) = 187185556
2
SHA256 (eclipse/eclipse.platform.releng.aggregator-4.6.xz) = 916df36f28bd53dd17c9f059b19bad2f58c58865705c1d81ca59bf128bda32f7
3
SHA256 (eclipse/eclipse-maven-repo-4.5.2.xz) = 038fe0c5a2bed3e2d10611e79fb327a171ec4efe10f0dcbcf84630d0273d9eac
3
SIZE (eclipse/eclipse.platform.releng.aggregator-4.6.xz) = 215088004
4
SIZE (eclipse/eclipse-maven-repo-4.5.2.xz) = 138007292
4
SHA256 (eclipse/eclipse-maven-repo-4.6.xz) = 5f6e816b012158a5c7e4b5bc7ecc1b12d1cae91e530ec503e8cd9910ab28a624
5
SIZE (eclipse/eclipse-maven-repo-4.6.xz) = 135692066
(-)/usr/local/poudriere/ports/default/java/eclipse/files/patch-aggregator (-42 / +25 lines)
Lines 2-7 Link Here
2
index 71a6610..cc260cd 100644
2
index 71a6610..cc260cd 100644
3
--- a/eclipse-platform-parent/pom.xml
3
--- a/eclipse-platform-parent/pom.xml
4
+++ b/eclipse-platform-parent/pom.xml
4
+++ b/eclipse-platform-parent/pom.xml
5
@@ -80,7 +80,7 @@
6
       The tycho-eclipserun-plugin will create its instance of Eclipse from this
7
       'eclipiserun-repo' repository, such as for computing .api-descriptions.
8
     -->
9
-    <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6RC2-201605191730/</eclipserun-repo>
10
+    <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.6/R-4.6-201606061100/</eclipserun-repo>
11
 
12
     <comparator.repo>http://download.eclipse.org/eclipse/updates/4.6-I-builds</comparator.repo>
13
 
5
@@ -253,6 +253,11 @@
14
@@ -253,6 +253,11 @@
6
           </target>
15
           </target>
7
           <environments>
16
           <environments>
Lines 17-29 Link Here
17
@@ -480,13 +485,13 @@
26
@@ -480,13 +485,13 @@
18
           <configuration>
27
           <configuration>
19
             <strictBinIncludes>false</strictBinIncludes>
28
             <strictBinIncludes>false</strictBinIncludes>
20
             <format>'v'yyyyMMdd-HHmm</format>
29
             <format>${qualifier.format}</format>
21
-            <timestampProvider>jgit</timestampProvider>
30
-            <timestampProvider>jgit</timestampProvider>
22
+            <!-- timestampProvider>jgit</timestampProvider -->
31
+            <!-- timestampProvider>jgit</timestampProvider -->
23
             <jgit.ignore>
32
             <jgit.ignore>
24
               pom.xml
33
               pom.xml
25
             </jgit.ignore>
34
             </jgit.ignore>
26
             <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
35
             <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
27
             <sourceReferences>
36
             <sourceReferences>
28
-              <generate>true</generate>
37
-              <generate>true</generate>
29
+              <generate>false</generate>
38
+              <generate>false</generate>
Lines 247-256 Link Here
247
   </build>
256
   </build>
248
 </project>
257
 </project>
249
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
258
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
250
index 29dfebb..2783e4e 100644
259
index f34ae99..6293698 100644
251
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
260
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
252
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
261
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
253
@@ -9,55 +9,8 @@
262
@@ -9,56 +9,8 @@
254
 #     IBM Corporation - initial API and implementation
263
 #     IBM Corporation - initial API and implementation
255
 ###############################################################################
264
 ###############################################################################
256
 
265
 
Lines 284-293 Link Here
284
-root.hpux.gtk.ia64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/hpux/ia64
293
-root.hpux.gtk.ia64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/hpux/ia64
285
-root.hpux.gtk.ia64.permissions.755=eclipse
294
-root.hpux.gtk.ia64.permissions.755=eclipse
286
-
295
-
287
-root.solaris.gtk.sparc=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/sparc
296
-root.solaris.gtk.sparcv9=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/sparcv9
288
-root.solaris.gtk.sparc.permissions.755=eclipse
297
-root.solaris.gtk.sparcv9.permissions.755=eclipse
289
-root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
298
-root.solaris.gtk.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86_64
290
-root.solaris.gtk.x86.permissions.755=eclipse
299
-root.solaris.gtk.x86_64.permissions.755=eclipse
291
-
300
-
292
-root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
301
-root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
293
-root.linux.gtk.x86.permissions.755=eclipse
302
-root.linux.gtk.x86.permissions.755=eclipse
Lines 304-313 Link Here
304
-root.linux.gtk.s390.permissions.755=eclipse
313
-root.linux.gtk.s390.permissions.755=eclipse
305
-
314
-
306
+root.freebsd.gtk.%%ECLIPSE_ARCH%%=rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/%%ECLIPSE_ARCH%%
315
+root.freebsd.gtk.%%ECLIPSE_ARCH%%=rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/%%ECLIPSE_ARCH%%
307
+root.freebsd.gtk.%%ECLIPSE_ARCH%%.permissions.755=libcairo-swt.so,eclipse
316
+root.freebsd.gtk.%%ECLIPSE_ARCH%%.permissions.755=eclipse
308
 
317
 
309
 bin.includes = feature.properties
318
 bin.includes = feature.properties
310
 
319
 
320
-
311
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
321
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
312
index 29be78c..207a934 100644
322
index 29be78c..207a934 100644
313
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
323
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
Lines 341-382 Link Here
341
     </plugins>
351
     </plugins>
342
   </build>
352
   </build>
343
 
353
 
344
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
345
index 6b59ed2..64975ba 100644
346
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
347
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
348
@@ -89,6 +89,23 @@ units.5.touchpoint.version=1.0.0
349
 units.5.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
350
 units.5.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
351
 
352
+requires.6.namespace=org.eclipse.equinox.p2.iu
353
+requires.6.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
354
+requires.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk))
355
+requires.6.range=[1.0.0,1.0.0]
356
+requires.6.greedy=true
357
+
358
+units.6.id=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
359
+units.6.version=1.0.0
360
+units.6.provides.1.namespace=org.eclipse.equinox.p2.iu
361
+units.6.provides.1.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
362
+units.6.provides.1.version=1.0.0
363
+units.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk))
364
+units.6.touchpoint.id=org.eclipse.equinox.p2.osgi
365
+units.6.touchpoint.version=1.0.0
366
+units.6.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
367
+units.6.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
368
+
369
 # Restrict range so we are not an automatic update for 3.x.
370
 update.id= org.eclipse.sdk.ide
371
 update.range = [4.0,$version$)
372
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
354
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
373
--- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
355
--- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
374
+++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
356
+++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
375
@@ -35,6 +35,6 @@
357
@@ -35,6 +35,6 @@
376
       <module>platform.sdk</module>
358
     <module>platform.sdk</module>
377
       <module>sdk</module>
359
     <module>sdk</module>
378
       <module>eclipse-junit-tests</module>
360
-    <module>eclipse-junit-tests</module>
379
-      <module>eclipse.platform.repository</module>
361
+    <!-- module>eclipse-junit-tests</module -->
380
+      <!-- module>eclipse.platform.repository</module -->
362
-    <module>eclipse.platform.repository</module>
363
+    <!-- module>eclipse.platform.repository</module -->
381
   </modules>
364
   </modules>
382
 </project>
365
 </project>
(-)/usr/local/poudriere/ports/default/java/eclipse/files/patch-freebsd_natives (-621 lines)
Lines 28-530 Link Here
28
-install: core
28
-install: core
29
-	rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so
29
-	rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so
30
-	mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/
30
-	mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/
31
--- ./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
32
+++ ./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
33
@@ -1,9 +1,9 @@
34
 Manifest-Version: 1.0
35
 Bundle-ManifestVersion: 2
36
 Bundle-Name: %fragmentName
37
-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true
38
+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86; singleton:=true
39
 Bundle-Version: 1.4.200.qualifier
40
 Bundle-Vendor: %providerName
41
 Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
42
 Bundle-Localization: fragment
43
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
44
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
45
--- ./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
46
+++ ./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
47
@@ -15,10 +15,10 @@
48
     <artifactId>eclipse.platform.resources</artifactId>
49
     <groupId>eclipse.platform.resources</groupId>
50
     <version>4.5.2-SNAPSHOT</version>
51
-    <relativePath>../../</relativePath>
52
+    <relativePath>../../../../</relativePath>
53
   </parent>
54
   <groupId>org.eclipse.core</groupId>
55
-  <artifactId>org.eclipse.core.filesystem.linux.x86</artifactId>
56
+  <artifactId>org.eclipse.core.filesystem.freebsd.x86</artifactId>
57
   <version>1.4.200-SNAPSHOT</version>
58
   <packaging>eclipse-plugin</packaging>
59
 
60
@@ -33,7 +33,7 @@
61
           <resolver>p2</resolver>
62
           <environments>
63
             <environment>
64
-              <os>linux</os>
65
+              <os>freebsd</os>
66
               <ws>gtk</ws>
67
               <arch>x86</arch>
68
             </environment>
69
@@ -50,7 +50,7 @@
70
         <property>
71
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
72
           <name>native</name>
73
-          <value>gtk.linux.x86</value>
74
+          <value>gtk.freebsd.x86</value>
75
         </property>
76
       </activation>
77
       <build>
78
@@ -64,12 +64,13 @@
79
                 <phase>process-resources</phase>
80
                 <configuration>
81
                   <target>
82
-                    <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
83
-           <copy todir="os/linux/x86">
84
-           <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
85
-               <include name="libunixfile_*.so"/>
86
-           </fileset>
87
-           </copy>
88
+                    <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
89
+                    <mkdir dir="os/freebsd/x86"/>
90
+                    <copy todir="os/freebsd/x86">
91
+                      <fileset dir="../../natives/unix/freebsd/">
92
+                        <include name="libunixfile_*.so"/>
93
+                      </fileset>
94
+                    </copy>
95
                   </target>
96
                 </configuration>
97
                 <goals>
98
--- ./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
99
+++ ./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
100
@@ -8,5 +8,5 @@
101
 # Contributors:
102
 #     IBM Corporation - initial API and implementation
103
 ###############################################################################
104
-fragmentName = Core File System for Linux
105
+fragmentName = Core File System for FreeBSD
106
 providerName = Eclipse.org
107
--- ./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
108
+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project	2014-04-16 07:16:45.000000000 -0500
109
@@ -1,6 +1,6 @@
110
 <?xml version="1.0" encoding="UTF-8"?>
111
 <projectDescription>
112
-	<name>org.eclipse.core.filesystem.linux.x86</name>
113
+	<name>org.eclipse.core.filesystem.freebsd.x86</name>
114
 	<comment></comment>
115
 	<projects>
116
 	</projects>
117
--- ./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
118
+++ ./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
119
@@ -1,9 +1,9 @@
120
 Manifest-Version: 1.0
121
 Bundle-ManifestVersion: 2
122
 Bundle-Name: %fragmentName
123
-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true
124
+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86_64; singleton:=true
125
 Bundle-Version: 1.2.200.qualifier
126
 Bundle-Vendor: %providerName
127
 Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
128
 Bundle-Localization: fragment
129
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
130
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
131
--- ./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
132
+++ ./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
133
@@ -15,10 +15,10 @@
134
     <artifactId>eclipse.platform.resources</artifactId>
135
     <groupId>eclipse.platform.resources</groupId>
136
     <version>4.5.2-SNAPSHOT</version>
137
-    <relativePath>../../</relativePath>
138
+    <relativePath>../../../../</relativePath>
139
   </parent>
140
   <groupId>org.eclipse.core</groupId>
141
-  <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId>
142
+  <artifactId>org.eclipse.core.filesystem.freebsd.x86_64</artifactId>
143
   <version>1.2.200-SNAPSHOT</version>
144
   <packaging>eclipse-plugin</packaging>
145
 
146
@@ -33,7 +33,7 @@
147
           <resolver>p2</resolver>
148
           <environments>
149
             <environment>
150
-              <os>linux</os>
151
+              <os>freebsd</os>
152
               <ws>gtk</ws>
153
               <arch>x86_64</arch>
154
             </environment>
155
@@ -50,7 +50,7 @@
156
         <property>
157
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
158
           <name>native</name>
159
-          <value>gtk.linux.x86_64</value>
160
+          <value>gtk.freebsd.x86_64</value>
161
         </property>
162
       </activation>
163
       <build>
164
@@ -64,13 +64,13 @@
165
                 <phase>process-resources</phase>
166
                 <configuration>
167
                   <target>
168
-                    <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
169
-           <mkdir dir="os/linux/x86_64/"/>
170
-           <copy todir="os/linux/x86_64/">
171
-           <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
172
-               <include name="libunixfile_*.so"/>
173
-           </fileset>
174
-           </copy>
175
+                    <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
176
+                    <mkdir dir="os/freebsd/x86_64/"/>
177
+                    <copy todir="os/freebsd/x86_64/">
178
+                      <fileset dir="../../natives/unix/freebsd/">
179
+                        <include name="libunixfile_*.so"/>
180
+                      </fileset>
181
+                    </copy>
182
                   </target>
183
                 </configuration>
184
                 <goals>
185
--- ./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
186
+++ ./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
187
@@ -8,5 +8,5 @@
188
 # Contributors:
189
 #     IBM Corporation - initial API and implementation
190
 ###############################################################################
191
-fragmentName = Core File System for Linux
192
+fragmentName = Core File System for FreeBSD
193
 providerName = Eclipse.org
194
--- ./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
195
+++ ./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
196
@@ -1,6 +1,6 @@
197
 <?xml version="1.0" encoding="UTF-8"?>
198
 <projectDescription>
199
-	<name>org.eclipse.core.filesystem.linux.x86_64</name>
200
+	<name>org.eclipse.core.filesystem.freebsd.x86_64</name>
201
 	<comment></comment>
202
 	<projects>
203
 	</projects>
204
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig	2014-04-15 21:26:16.000000000 -0500
205
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF	2014-04-16 07:31:38.000000000 -0500
206
@@ -2,7 +2,7 @@
207
 Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
208
 Bundle-Name: %fragmentName
209
 Bundle-Vendor: %providerName
210
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true
211
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true
212
 Bundle-Version: 3.104.2.qualifier
213
 Bundle-ManifestVersion: 2
214
 Bundle-Localization: fragment
215
@@ -30,7 +30,7 @@
216
  org.eclipse.swt.internal.gtk; x-internal:=true,
217
  org.eclipse.swt.internal.mozilla; x-internal:=true,
218
  org.eclipse.swt.internal.opengl.glx; x-internal:=true
219
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
220
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
221
 SWT-WS: gtk
222
-SWT-OS: linux
223
+SWT-OS: freebsd
224
 SWT-Arch: x86
225
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml.orig	2014-04-15 21:26:16.000000000 -0500
226
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml	2014-04-16 07:31:27.000000000 -0500
227
@@ -20,12 +20,12 @@
228
     <relativePath>../binaries-parent/</relativePath>
229
   </parent>
230
   <groupId>org.eclipse.swt</groupId>
231
-  <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
232
+  <artifactId>org.eclipse.swt.gtk.freebsd.x86</artifactId>
233
   <version>3.104.2-SNAPSHOT</version>
234
   <packaging>eclipse-plugin</packaging>
235
 
236
   <properties>
237
-    <os>linux</os>
238
+    <os>freebsd</os>
239
     <ws>gtk</ws>
240
     <arch>x86</arch>
241
     <buildid>${buildId}</buildid>
242
@@ -61,7 +61,7 @@
243
         <property>
244
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
245
           <name>native</name>
246
-          <value>gtk.linux.x86</value>
247
+          <value>gtk.freebsd.x86</value>
248
         </property>
249
       </activation>
250
       <build>
251
@@ -74,7 +74,7 @@
252
                 <phase>process-resources</phase>
253
                 <configuration>
254
                   <target>
255
-                    <property name="machine_gtk3" value="1"/>
256
+                    <!-- property name="machine_gtk3" value="1"/ -->
257
                     <property name="targets" value="install" />
258
                     <ant antfile="build.xml" target="build_libraries"/>
259
                   </target>
260
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig	2014-04-15 21:26:16.000000000 -0500
261
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml	2014-04-16 07:31:05.000000000 -0500
262
@@ -1,10 +1,10 @@
263
 <?xml version="1.0" encoding="UTF-8"?>
264
-<project name="org.eclipse.swt.gtk.linux.x86" default="build.jars" basedir=".">
265
+<project name="org.eclipse.swt.gtk.freebsd.x86" default="build.jars" basedir=".">
266
 
267
 	<property name="swt.ws" value="gtk" />
268
-	<property name="swt.os" value="linux" />
269
+	<property name="swt.os" value="freebsd" />
270
 	<property name="swt.arch" value="x86" />
271
-	<property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
272
+	<property name="targets" value="install"/>
273
 	
274
 	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
275
 	<property name="version.suffix" value="3.104.0" />
276
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/.project.orig	2014-04-15 21:26:16.000000000 -0500
277
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/.project	2014-04-16 07:31:14.000000000 -0500
278
@@ -1,6 +1,6 @@
279
 <?xml version="1.0" encoding="UTF-8"?>
280
 <projectDescription>
281
-	<name>org.eclipse.swt.gtk.linux.x86</name>
282
+	<name>org.eclipse.swt.gtk.freebsd.x86</name>
283
 	<comment></comment>
284
 	<projects>
285
 	</projects>
286
--- ./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
287
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF	2014-04-16 07:36:19.000000000 -0500
288
@@ -2,7 +2,7 @@
289
 Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
290
 Bundle-Name: %fragmentName
291
 Bundle-Vendor: %providerName
292
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
293
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true
294
 Bundle-Version: 3.104.2.qualifier
295
 Bundle-ManifestVersion: 2
296
 Bundle-Localization: fragment
297
@@ -30,7 +30,7 @@
298
  org.eclipse.swt.internal.gtk; x-internal:=true,
299
  org.eclipse.swt.internal.mozilla; x-internal:=true,
300
  org.eclipse.swt.internal.opengl.glx; x-internal:=true
301
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
302
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
303
 SWT-WS: gtk
304
-SWT-OS: linux
305
+SWT-OS: freebsd
306
 SWT-Arch: x86_64
307
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig	2014-04-15 21:26:16.000000000 -0500
308
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml	2014-04-16 07:35:58.000000000 -0500
309
@@ -1,10 +1,10 @@
310
 <?xml version="1.0" encoding="UTF-8"?>
311
-<project name="org.eclipse.swt.gtk.linux.x86_64" default="build.jars" basedir=".">
312
+<project name="org.eclipse.swt.gtk.freebsd.x86_64" default="build.jars" basedir=".">
313
 
314
 	<property name="swt.ws" value="gtk" />
315
-	<property name="swt.os" value="linux" />
316
+	<property name="swt.os" value="freebsd" />
317
 	<property name="swt.arch" value="x86_64" />
318
-	<property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
319
+	<property name="targets" value="install"/>
320
 	
321
 	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
322
 	<property name="version.suffix" value="3.104.0" />
323
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml.orig	2014-04-15 21:26:16.000000000 -0500
324
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml	2014-04-16 07:36:13.000000000 -0500
325
@@ -20,12 +20,12 @@
326
     <relativePath>../binaries-parent/</relativePath>
327
   </parent>
328
   <groupId>org.eclipse.swt</groupId>
329
-  <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
330
+  <artifactId>org.eclipse.swt.gtk.freebsd.x86_64</artifactId>
331
   <version>3.104.2-SNAPSHOT</version>
332
   <packaging>eclipse-plugin</packaging>
333
 
334
   <properties>
335
-    <os>linux</os>
336
+    <os>freebsd</os>
337
     <ws>gtk</ws>
338
     <arch>x86_64</arch>
339
     <buildid>${buildId}</buildid>
340
@@ -61,7 +61,7 @@
341
         <property>
342
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
343
           <name>native</name>
344
-          <value>gtk.linux.x86_64</value>
345
+          <value>gtk.freebsd.x86_64</value>
346
         </property>
347
       </activation>
348
       <build>
349
@@ -74,7 +74,7 @@
350
                 <phase>process-resources</phase>
351
                 <configuration>
352
                   <target>
353
-                    <property name="machine_gtk3" value="1"/>
354
+                    <!-- property name="machine_gtk3" value="1"/ -->
355
                     <property name="targets" value="install" />
356
                     <ant antfile="build.xml" target="build_libraries"/>
357
                   </target>
358
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project.orig	2014-04-15 21:26:16.000000000 -0500
359
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project	2014-04-16 07:36:05.000000000 -0500
360
@@ -1,6 +1,6 @@
361
 <?xml version="1.0" encoding="UTF-8"?>
362
 <projectDescription>
363
-	<name>org.eclipse.swt.gtk.linux.x86_64</name>
364
+	<name>org.eclipse.swt.gtk.freebsd.x86_64</name>
365
 	<comment></comment>
366
 	<projects>
367
 	</projects>
368
--- ./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
369
+++ ./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
370
@@ -3,8 +3,8 @@
371
 Bundle-Name: %fragmentName
372
 Bundle-Vendor: %providerName
373
 Bundle-Localization: fragment
374
-Bundle-SymbolicName: org.eclipse.core.net.linux.x86;singleton:=true
375
+Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86;singleton:=true
376
 Bundle-Version: 1.1.300.qualifier
377
 Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
378
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
379
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
380
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
381
--- ./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
382
+++ ./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
383
@@ -18,7 +18,7 @@
384
     <relativePath>../../../../</relativePath>
385
   </parent>
386
   <groupId>org.eclipse.core</groupId>
387
-  <artifactId>org.eclipse.core.net.linux.x86</artifactId>
388
+  <artifactId>org.eclipse.core.net.freebsd.x86</artifactId>
389
   <version>1.1.300-SNAPSHOT</version>
390
   <packaging>eclipse-plugin</packaging>
391
 
392
@@ -30,7 +30,7 @@
393
         <configuration>
394
           <environments>
395
             <environment>
396
-              <os>linux</os>
397
+              <os>freebsd</os>
398
               <ws>gtk</ws>
399
               <arch>x86</arch>
400
             </environment>
401
@@ -47,7 +47,7 @@
402
         <property>
403
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
404
           <name>native</name>
405
-          <value>gtk.linux.x86</value>
406
+          <value>gtk.freebsd.x86</value>
407
         </property>
408
       </activation>
409
       <build>
410
@@ -61,12 +61,12 @@
411
                 <phase>process-resources</phase>
412
                 <configuration>
413
                   <target>
414
-                    <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
415
-           <copy todir=".">
416
-           <fileset dir="../../natives/unix/linux/">
417
-               <include name="libgnomeproxy-*.so"/>
418
-           </fileset>
419
-           </copy>
420
+                    <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
421
+                    <copy todir=".">
422
+                      <fileset dir="../../natives/unix/freebsd/">
423
+                        <include name="libgnomeproxy-*.so"/>
424
+                      </fileset>
425
+                    </copy>
426
                   </target>
427
                 </configuration>
428
                 <goals>
429
--- ./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
430
+++ ./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
431
@@ -8,5 +8,5 @@
432
 # Contributors:
433
 #     IBM Corporation - initial API and implementation
434
 ###############################################################################
435
-fragmentName = Proxy for Linux
436
+fragmentName = Proxy for FreeBSD
437
 providerName = Eclipse.org
438
--- ./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
439
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/.project	2014-04-16 07:26:18.000000000 -0500
440
@@ -1,6 +1,6 @@
441
 <?xml version="1.0" encoding="UTF-8"?>
442
 <projectDescription>
443
-	<name>org.eclipse.core.net.linux.x86</name>
444
+	<name>org.eclipse.core.net.freebsd.x86</name>
445
 	<comment></comment>
446
 	<projects>
447
 	</projects>
448
--- ./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
449
+++ ./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
450
@@ -3,8 +3,8 @@
451
 Bundle-Name: %fragmentName
452
 Bundle-Vendor: %providerName
453
 Bundle-Localization: fragment
454
-Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true
455
+Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86_64;singleton:=true
456
 Bundle-Version: 1.1.100.qualifier
457
 Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
458
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
459
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
460
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
461
--- ./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
462
+++ ./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
463
@@ -18,7 +18,7 @@
464
     <relativePath>../../../../</relativePath>
465
   </parent>
466
   <groupId>org.eclipse.core</groupId>
467
-  <artifactId>org.eclipse.core.net.linux.x86_64</artifactId>
468
+  <artifactId>org.eclipse.core.net.freebsd.x86_64</artifactId>
469
   <version>1.1.100-SNAPSHOT</version>
470
   <packaging>eclipse-plugin</packaging>
471
 
472
@@ -31,7 +31,7 @@
473
         <configuration>
474
           <environments>
475
             <environment>
476
-              <os>linux</os>
477
+              <os>freebsd</os>
478
               <ws>gtk</ws>
479
               <arch>x86_64</arch>
480
             </environment>
481
@@ -48,7 +48,7 @@
482
         <property>
483
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
484
           <name>native</name>
485
-          <value>gtk.linux.x86_64</value>
486
+          <value>gtk.freebsd.x86_64</value>
487
         </property>
488
       </activation>
489
       <build>
490
@@ -62,12 +62,12 @@
491
                 <phase>process-resources</phase>
492
                 <configuration>
493
                   <target>
494
-                    <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
495
-           <copy todir=".">
496
-           <fileset dir="../../natives/unix/linux/">
497
-               <include name="libgnomeproxy-*.so"/>
498
-           </fileset>
499
-           </copy>
500
+                    <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
501
+                    <copy todir=".">
502
+                      <fileset dir="../../natives/unix/freebsd/">
503
+                        <include name="libgnomeproxy-*.so"/>
504
+                      </fileset>
505
+                    </copy>
506
                   </target>
507
                 </configuration>
508
                 <goals>
509
--- ./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
510
+++ ./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
511
@@ -8,5 +8,5 @@
512
 # Contributors:
513
 #     IBM Corporation - initial API and implementation
514
 ###############################################################################
515
-fragmentName = Proxy for Linux x86_64
516
+fragmentName = Proxy for FreeBSD x86_64
517
 providerName = Eclipse.org
518
--- ./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
519
+++ ./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
520
@@ -1,6 +1,6 @@
521
 <?xml version="1.0" encoding="UTF-8"?>
522
 <projectDescription>
523
-	<name>org.eclipse.core.net.linux.x86_64</name>
524
+	<name>org.eclipse.core.net.freebsd.x86_64</name>
525
 	<comment></comment>
526
 	<projects>
527
 	</projects>
528
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile.orig	2014-04-15 21:27:02.000000000 -0500
31
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile.orig	2014-04-15 21:27:02.000000000 -0500
529
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile	2014-04-16 07:45:00.000000000 -0500
32
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile	2014-04-16 07:45:00.000000000 -0500
530
@@ -18,7 +18,7 @@
33
@@ -18,7 +18,7 @@
Lines 556-655 Link Here
556
 	@echo "Finished building target: $(LIB_NAME_FULL)"
59
 	@echo "Finished building target: $(LIB_NAME_FULL)"
557
 	@echo " "
60
 	@echo " "
558
 
61
 
559
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig	2014-04-15 21:32:54.000000000 -0500
560
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF	2014-04-16 07:49:58.000000000 -0500
561
@@ -2,9 +2,9 @@
562
 Bundle-ManifestVersion: 2
563
 Bundle-Name: %pluginName
564
 Bundle-Vendor: %providerName
565
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true
566
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86;singleton:=true
567
 Bundle-Version: 1.1.300.qualifier
568
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
569
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
570
-Bundle-Localization: launcher.gtk.linux.x86
571
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
572
+Bundle-Localization: launcher.gtk.freebsd.x86
573
 Eclipse-BundleShape: dir
574
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml.orig	2014-04-23 07:51:42.000000000 -0500
575
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml	2014-04-23 10:04:13.000000000 -0500
576
@@ -18,12 +18,12 @@
577
     <relativePath>../../launcher-binary-parent</relativePath>
578
   </parent>
579
   <groupId>org.eclipse.equinox</groupId>
580
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
581
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.x86</artifactId>
582
   <version>1.1.300-SNAPSHOT</version>
583
   <packaging>eclipse-plugin</packaging>
584
 
585
   <properties>
586
-    <os>linux</os>
587
+    <os>freebsd</os>
588
     <ws>gtk</ws>
589
     <arch>x86</arch>
590
   </properties>
591
--- ./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
592
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties	2014-04-16 07:50:08.000000000 -0500
593
@@ -8,5 +8,5 @@
594
 # Contributors:
595
 #     IBM Corporation - initial API and implementation
596
 ###############################################################################
597
-pluginName = Equinox Launcher Linux X86 Fragment
598
+pluginName = Equinox Launcher FreeBSD X86 Fragment
599
 providerName = Eclipse.org - Equinox
600
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project.orig	2014-04-15 21:32:54.000000000 -0500
601
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project	2014-04-16 07:49:39.000000000 -0500
602
@@ -1,6 +1,6 @@
603
 <?xml version="1.0" encoding="UTF-8"?>
604
 <projectDescription>
605
-	<name>org.eclipse.equinox.launcher.gtk.linux.x86</name>
606
+	<name>org.eclipse.equinox.launcher.gtk.freebsd.x86</name>
607
 	<comment></comment>
608
 	<projects>
609
 	</projects>
610
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties.orig	2014-07-25 19:35:37.000000000 -0500
611
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties	2014-07-25 20:10:23.000000000 -0500
612
@@ -10,7 +10,7 @@
613
 ###############################################################################
614
 bin.includes = META-INF/,\
615
                eclipse_*.so,\
616
-               launcher.gtk.linux.x86.properties,\
617
+               launcher.gtk.freebsd.x86.properties,\
618
                about.html
619
                
620
 customBuildCallbacks=customBuildCallbacks.xml
621
--- ./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
622
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF	2014-04-16 07:51:22.000000000 -0500
623
@@ -2,9 +2,9 @@
624
 Bundle-ManifestVersion: 2
625
 Bundle-Name: %pluginName
626
 Bundle-Vendor: %providerName
627
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
628
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true
629
 Bundle-Version: 1.1.300.qualifier
630
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
631
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
632
-Bundle-Localization: launcher.gtk.linux.x86_64
633
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
634
+Bundle-Localization: launcher.gtk.freebsd.x86_64
635
 Eclipse-BundleShape: dir
636
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml.orig	2014-04-23 07:51:42.000000000 -0500
637
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml	2014-04-23 10:08:46.000000000 -0500
638
@@ -18,12 +18,12 @@
639
     <relativePath>../../launcher-binary-parent</relativePath>
640
   </parent>
641
   <groupId>org.eclipse.equinox</groupId>
642
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
643
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.x86_64</artifactId>
644
   <version>1.1.300-SNAPSHOT</version>
645
   <packaging>eclipse-plugin</packaging>
646
 
647
   <properties>
648
-    <os>linux</os>
649
+    <os>freebsd</os>
650
     <ws>gtk</ws>
651
     <arch>x86_64</arch>
652
   </properties>
653
--- ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak.orig	2014-04-15 21:32:58.000000000 -0500
62
--- ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak.orig	2014-04-15 21:32:58.000000000 -0500
654
+++ ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak	2014-04-16 07:57:53.000000000 -0500
63
+++ ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak	2014-04-16 07:57:53.000000000 -0500
655
@@ -42,15 +42,15 @@
64
@@ -42,15 +42,15 @@
Lines 693-725 Link Here
693
 
102
 
694
 install: all
103
 install: all
695
 	cp $(EXEC) $(OUTPUT_DIR)
104
 	cp $(EXEC) $(OUTPUT_DIR)
696
--- ./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
697
+++ ./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
698
@@ -8,5 +8,5 @@
699
 # Contributors:
700
 #     IBM Corporation - initial API and implementation
701
 ###############################################################################
702
-pluginName = Equinox Launcher Linux X86_64 Fragment
703
+pluginName = Equinox Launcher FreeBSD X86_64 Fragment
704
 providerName = Eclipse.org - Equinox
705
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project.orig	2014-04-15 21:32:54.000000000 -0500
706
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project	2014-04-16 07:51:09.000000000 -0500
707
@@ -1,6 +1,6 @@
708
 <?xml version="1.0" encoding="UTF-8"?>
709
 <projectDescription>
710
-	<name>org.eclipse.equinox.launcher.gtk.linux.x86_64</name>
711
+	<name>org.eclipse.equinox.launcher.gtk.freebsd.x86_64</name>
712
 	<comment></comment>
713
 	<projects>
714
 	</projects>
715
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties.orig	2014-07-25 19:35:37.000000000 -0500
716
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties	2014-07-25 20:07:49.000000000 -0500
717
@@ -10,7 +10,7 @@
718
 ###############################################################################
719
 bin.includes = META-INF/,\
720
                eclipse_*.so,\
721
-               launcher.gtk.linux.x86_64.properties,\
722
+               launcher.gtk.freebsd.x86_64.properties,\
723
                about.html
724
                
725
 customBuildCallbacks=customBuildCallbacks.xml
(-)/usr/local/poudriere/ports/default/java/eclipse/files/patch-submodules (-51 / +55 lines)
Lines 499-505 Link Here
499
 						parseLinux((Element) child);
499
 						parseLinux((Element) child);
500
 					} else if (name.equals("macosx")) { //$NON-NLS-1$
500
 					} else if (name.equals("macosx")) { //$NON-NLS-1$
501
 						parseMac((Element) child);
501
 						parseMac((Element) child);
502
@@ -122,12 +124,17 @@ public class LauncherInfo extends ProductObject implements ILauncherInfo {
502
@@ -122,13 +124,18 @@ public class LauncherInfo extends ProductObject implements ILauncherInfo {
503
 		fIcons.put(LINUX_ICON, element.getAttribute("icon")); //$NON-NLS-1$
503
 		fIcons.put(LINUX_ICON, element.getAttribute("icon")); //$NON-NLS-1$
504
 	}
504
 	}
505
 
505
 
Lines 507-512 Link Here
507
+		fIcons.put(FREEBSD_ICON, element.getAttribute("icon")); //$NON-NLS-1$
507
+		fIcons.put(FREEBSD_ICON, element.getAttribute("icon")); //$NON-NLS-1$
508
+	}
508
+	}
509
+
509
+
510
	@Override
510
 	public void write(String indent, PrintWriter writer) {
511
 	public void write(String indent, PrintWriter writer) {
511
 		writer.print(indent + "<launcher"); //$NON-NLS-1$
512
 		writer.print(indent + "<launcher"); //$NON-NLS-1$
512
 		if (fLauncherName != null && fLauncherName.length() > 0)
513
 		if (fLauncherName != null && fLauncherName.length() > 0)
Lines 725-731 Link Here
725
@@ -106,7 +106,7 @@ public class PropertiesSection extends TableSection {
726
@@ -106,7 +106,7 @@ public class PropertiesSection extends TableSection {
726
		private IConfigurationProperty fEdit;
727
		private IConfigurationProperty fEdit;
727
		private Set<String> fExistingNames;
728
		private Set<String> fExistingNames;
728
		
729
729
-		private String[] COMBO_OSLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32};
730
-		private String[] COMBO_OSLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32};
730
+		private String[] COMBO_OSLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32, Platform.OS_FREEBSD};
731
+		private String[] COMBO_OSLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32, Platform.OS_FREEBSD};
731
		private String[] COMBO_ARCHLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.ARCH_X86, Platform.ARCH_X86_64, Platform.ARCH_PPC, Platform.ARCH_IA64, Platform.ARCH_IA64_32, Platform.ARCH_PA_RISC, Platform.ARCH_SPARC};
732
		private String[] COMBO_ARCHLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.ARCH_X86, Platform.ARCH_X86_64, Platform.ARCH_PPC, Platform.ARCH_IA64, Platform.ARCH_IA64_32, Platform.ARCH_PA_RISC, Platform.ARCH_SPARC};
Lines 806-832 Link Here
806
 			assertTrue(haveSymlinks());
807
 			assertTrue(haveSymlinks());
807
 		} else {
808
 		} else {
808
 			assertFalse(haveSymlinks());
809
 			assertFalse(haveSymlinks());
809
diff --git a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java
810
index 652119f..30482b0 100644
811
--- a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java
812
+++ b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java
813
@@ -94,6 +94,16 @@ public final class BootLoader {
814
 	public static final String OS_HPUX = "hpux";//$NON-NLS-1$
815
 
816
 	/**
817
+	 * Constant string (value "freebsd") indicating the platform is running on an
818
+	 * FreeBSD-based operating system.
819
+	 * Note: This constant is not officially supported by the eclipse project
820
+	 * and is only available on eclipse versions built from the FreeBSD ports
821
+	 * tree.
822
+	 * @deprecated Replaced by {@link Platform#OS_FREEBSD.
823
+	 */
824
+	public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$
825
+
826
+	/**
827
 	 * Constant string (value "qnx") indicating the platform is running on a
828
 	 * QNX-based operating system.
829
 	 * @deprecated Replaced by {@link Platform#OS_QNX}.
830
diff --git a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
810
diff --git a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
831
index 8ace8e8..21ba40f 100644
811
index 8ace8e8..21ba40f 100644
832
--- a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
812
--- a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
Lines 1274-1304 Link Here
1274
+requires.18.range = 0.0.0
1254
+requires.18.range = 0.0.0
1275
+requires.18.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%))
1255
+requires.18.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%))
1276
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
1256
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
1277
index 681fc0b..957a23f 100644
1257
index 98517c0..6f17162 100644
1278
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
1258
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
1279
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
1259
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
1280
@@ -85,3 +85,8 @@ requires.17.namespace = org.eclipse.equinox.p2.iu
1260
@@ -95,3 +95,8 @@ requires.19.namespace = org.eclipse.equinox.p2.iu
1281
 requires.17.name = org.eclipse.swt.gtk.hpux.ia64
1261
 requires.19.name = org.eclipse.swt.gtk.linux.aarch64
1282
 requires.17.range = [$version$,$version$]
1262
 requires.19.range = [$version$,$version$]
1283
 requires.17.filter = (&(osgi.os=hpux)(osgi.ws=gtk)(osgi.arch=ia64)(!(org.eclipse.swt.buildtime=true)))
1263
 requires.19.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
1284
+
1264
+
1285
+requires.18.namespace = org.eclipse.equinox.p2.iu
1265
+requires.20.namespace = org.eclipse.equinox.p2.iu
1286
+requires.18.name = org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%
1266
+requires.20.name = org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%
1287
+requires.18.range = [$version$,$version$]
1267
+requires.20.range = [$version$,$version$]
1288
+requires.18.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%)(!(org.eclipse.swt.buildtime=true)))
1268
+requires.20.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%)(!(org.eclipse.swt.buildtime=true)))
1289
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
1269
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
1290
index cc8d6f7..46c8f5a 100644
1270
index cc8d6f7..46c8f5a 100644
1291
--- a/eclipse.platform.swt.binaries/pom.xml
1271
--- a/eclipse.platform.swt.binaries/pom.xml
1292
+++ b/eclipse.platform.swt.binaries/pom.xml
1272
+++ b/eclipse.platform.swt.binaries/pom.xml
1293
@@ -55,7 +56,8 @@
1273
@@ -91,6 +91,7 @@
1294
     <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
1274
     <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
1295
     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
1275
     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
1296
     <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
1276
     <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
1297
+    <module>bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%</module>
1277
+    <module>bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%</module>
1298
     <module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
1278
     <module>bundles/org.eclipse.swt.gtk.solaris.sparcv9</module>
1299
     <module>bundles/org.eclipse.swt.gtk.solaris.x86</module>
1279
     <module>bundles/org.eclipse.swt.gtk.solaris.x86_64</module>
1300
     <module>bundles/org.eclipse.swt.win32.win32.x86</module>
1280
     <module>bundles/org.eclipse.swt.win32.win32.x86</module>
1301
     <module>bundles/org.eclipse.swt.win32.win32.x86_64</module>
1302
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
1281
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
1303
index 2417b4e..c665afe 100644
1282
index 2417b4e..c665afe 100644
1304
--- a/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c
1283
--- a/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c
Lines 1745-1753 Link Here
1745
                         <include name="gtk/linux/x86/**/*"/>
1724
                         <include name="gtk/linux/x86/**/*"/>
1746
                         <include name="gtk/linux/x86_64/**/*"/>
1725
                         <include name="gtk/linux/x86_64/**/*"/>
1747
+                        <include name="gtk/freebsd/%%ECLIPSE_ARCH%%/**/*"/>
1726
+                        <include name="gtk/freebsd/%%ECLIPSE_ARCH%%/**/*"/>
1748
                         <include name="gtk/solaris/sparc/**/*"/>
1727
                         <include name="gtk/solaris/x86_64/**/*"/>
1749
                         <include name="gtk/solaris/x86/**/*"/>
1750
                         <include name="win32/win32/x86/**/*"/>
1728
                         <include name="win32/win32/x86/**/*"/>
1729
                         <include name="win32/win32/x86_64/**/*"/>
1751
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
1730
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
1752
index 0f30a87..36382de 100644
1731
index 0f30a87..36382de 100644
1753
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
1732
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
Lines 1800-1812 Link Here
1800
 		<antcall target="rootFileslinux_gtk_x86"/>
1779
 		<antcall target="rootFileslinux_gtk_x86"/>
1801
 		<antcall target="rootFileslinux_gtk_ppc"/>
1780
 		<antcall target="rootFileslinux_gtk_ppc"/>
1802
 		<antcall target="rootFileslinux_gtk_ppc64"/>
1781
 		<antcall target="rootFileslinux_gtk_ppc64"/>
1803
@@ -279,4 +297,4 @@
1804
 	<target name="gather.logs" depends="init">
1805
 	</target>
1806
 
1807
-</project>
1808
\ No newline at end of file
1809
+</project>
1810
diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
1782
diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
1811
index b46cdc6..d46c81d 100644
1783
index b46cdc6..d46c81d 100644
1812
--- a/rt.equinox.framework/pom.xml
1784
--- a/rt.equinox.framework/pom.xml
Lines 1816-1824 Link Here
1816
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86</module>
1788
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86</module>
1817
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
1789
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
1818
+    <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.%%ECLIPSE_ARCH%%</module>
1790
+    <module>bundles/org.eclipse.equinox.launcher.gtk.freebsd.%%ECLIPSE_ARCH%%</module>
1819
     <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc</module>
1791
     <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64</module>
1820
     <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86</module>
1792
     <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86</module>
1821
     <module>bundles/org.eclipse.equinox.launcher.motif.aix.ppc</module>
1793
     <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module>
1822
diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
1794
diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
1823
index 3cf2fe1..53f82b3 100644
1795
index 3cf2fe1..53f82b3 100644
1824
--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
1796
--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
Lines 2145-2155 Link Here
2145
       <plugin id="org.eclipse.swt"/>
2117
       <plugin id="org.eclipse.swt"/>
2146
+      <plugin id="org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%" fragment="true"/>
2118
+      <plugin id="org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%" fragment="true"/>
2147
+<!--
2119
+<!--
2120
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
2121
       <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
2148
       <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
2122
       <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
2149
       <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
2123
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
2150
       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
2124
       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
2151
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
2152
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
2153
+-->
2125
+-->
2154
       <plugin id="org.eclipse.ui"/>
2126
       <plugin id="org.eclipse.ui"/>
2155
       <plugin id="org.eclipse.ui.workbench"/>
2127
       <plugin id="org.eclipse.ui.workbench"/>
Lines 2204-2206 Link Here
2204
          id="org.eclipse.core.filesystem.linux.x86"
2176
          id="org.eclipse.core.filesystem.linux.x86"
2205
          os="linux"
2177
          os="linux"
2206
          arch="x86"
2178
          arch="x86"
2179
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/pom.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/pom.xml
2180
index 01db883..22c1314 100644
2181
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/pom.xml
2182
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/pom.xml
2183
@@ -20,9 +20,9 @@
2184
   <artifactId>org.eclipse.swt</artifactId>
2185
   <version>3.105.0-SNAPSHOT</version>
2186
   <packaging>eclipse-plugin</packaging>
2187
-  <properties>
2188
+  <!-- properties>
2189
     <forceContextQualifier>v20160603-0902</forceContextQualifier>
2190
-  </properties>
2191
+  </properties -->
2192
   <build>
2193
     <plugins>
2194
       <plugin>
2195
diff --git a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml
2196
index 73c4197..4493f7c 100644
2197
--- a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml
2198
+++ b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml
2199
@@ -21,9 +21,9 @@
2200
   <artifactId>binaries-parent</artifactId>
2201
   <version>4.6.0-SNAPSHOT</version>
2202
   <packaging>pom</packaging>
2203
-  <properties>
2204
+  <!-- properties>
2205
     <forceContextQualifier>v20160603-0902</forceContextQualifier>
2206
-  </properties>
2207
+  </properties -->
2208
   <build>
2209
     <plugins>
2210
       <plugin>
(-)/usr/local/poudriere/ports/default/java/eclipse/scripts/pre-patch (-6 / +6 lines)
Lines 13-24 Link Here
13
}
13
}
14
14
15
for d in \
15
for d in \
16
	${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x* \
16
	${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.${ECLIPSE_ARCH} \
17
	${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 \
18
	${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 \
19
	${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.x* \
19
	${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.${ECLIPSE_ARCH} \
20
	${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x* \
20
	${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/${ECLIPSE_ARCH} \
21
	${WRKSRC}/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x*
21
	${WRKSRC}/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.${ECLIPSE_ARCH}
22
do
22
do
23
  mkdir -p `echo $d | sed -e 's/linux/freebsd/'`
23
  mkdir -p `echo $d | sed -e 's/linux/freebsd/'`
24
  [ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
24
  [ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
Lines 25-37 Link Here
25
done
25
done
26
# "fragments" pieces
26
# "fragments" pieces
27
for d in \
27
for d in \
28
	${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x*
28
	${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${ECLIPSE_ARCH}
29
do
29
do
30
  mkdir -p `echo $d | sed -e 's/linux/freebsd/'`
30
  mkdir -p `echo $d | sed -e 's/linux/freebsd/'`
31
  [ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
31
  [ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
32
done
32
done
33
for d in \
33
for d in \
34
	${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x*
34
	${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.${ECLIPSE_ARCH}
35
do
35
do
36
  mkdir -p `dirname $d`/`basename $d | sed -e 's/\.linux.*$//'`/fragments/`basename $d | sed -e 's/linux/freebsd/'`
36
  mkdir -p `dirname $d`/`basename $d | sed -e 's/\.linux.*$//'`/fragments/`basename $d | sed -e 's/linux/freebsd/'`
37
  [ -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 - )
37
  [ -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 - )

Return to bug 211764