Index: Makefile
===================================================================
--- Makefile (revision 418813)
+++ Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= eclipse
-PORTVERSION= 4.5.2
+PORTVERSION= 4.6
CATEGORIES= java devel
MASTER_SITES= https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/
DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
@@ -10,7 +10,7 @@
DIST_SUBDIR= eclipse
MAINTAINER= ljboiler@gmail.com
-COMMENT= Eclipse Mars.2
+COMMENT= Eclipse Neon
LICENSE= EPL
@@ -68,11 +68,19 @@
ECLIPSE_WS= gtk
ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/}
E_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//}
-ECLIPSE_BUILDID=M20160212-1500
+ECLIPSE_BUILDID=20160606-1100
SCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \
E_SHORTARCH=${E_SHORTARCH}
PORTDESTDIR= ${PREFIX}/lib/eclipse
+.if ${ARCH}=="i386"
+EXTRA_PATCHES= ${FILESDIR}/i386-patch-freebsd_natives
+.endif
+
+.if ${ARCH}=="amd64"
+EXTRA_PATCHES= ${FILESDIR}/amd64-patch-freebsd_natives
+.endif
+
# Someday it would be nice to see about moving the product selection into the patch phase (and only build the
# product the user wants), but that may prove to be difficult if not impossible with the way the eclipse tycho
# builder is a "all-or-nothing" thing right now.
Index: distinfo
===================================================================
--- distinfo (revision 418813)
+++ distinfo (working copy)
@@ -1,4 +1,5 @@
-SHA256 (eclipse/eclipse.platform.releng.aggregator-4.5.2.xz) = 71e46eadfcc7c8fd0c758585a228cdee5810bfbea3190a27b577e3e972b662b2
-SIZE (eclipse/eclipse.platform.releng.aggregator-4.5.2.xz) = 187185556
-SHA256 (eclipse/eclipse-maven-repo-4.5.2.xz) = 038fe0c5a2bed3e2d10611e79fb327a171ec4efe10f0dcbcf84630d0273d9eac
-SIZE (eclipse/eclipse-maven-repo-4.5.2.xz) = 138007292
+TIMESTAMP = 1466985570
+SHA256 (eclipse/eclipse.platform.releng.aggregator-4.6.xz) = 916df36f28bd53dd17c9f059b19bad2f58c58865705c1d81ca59bf128bda32f7
+SIZE (eclipse/eclipse.platform.releng.aggregator-4.6.xz) = 215088004
+SHA256 (eclipse/eclipse-maven-repo-4.6.xz) = 5f6e816b012158a5c7e4b5bc7ecc1b12d1cae91e530ec503e8cd9910ab28a624
+SIZE (eclipse/eclipse-maven-repo-4.6.xz) = 135692066
Index: files/amd64-patch-freebsd_natives
===================================================================
--- files/amd64-patch-freebsd_natives (nonexistent)
+++ files/amd64-patch-freebsd_natives (working copy)
@@ -0,0 +1,311 @@
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:20:17.000000000 -0500
+@@ -1,9 +1,9 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %fragmentName
+-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true
++Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86_64; singleton:=true
+ Bundle-Version: 1.2.200.qualifier
+ Bundle-Vendor: %providerName
+ Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
+ Bundle-Localization: fragment
+-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 2014-04-16 07:19:54.000000000 -0500
+@@ -15,10 +15,10 @@
+ eclipse.platform.resources
+ eclipse.platform.resources
+ 4.6.0-SNAPSHOT
+- ../../
++ ../../../../
+
+ org.eclipse.core
+- org.eclipse.core.filesystem.linux.x86_64
++ org.eclipse.core.filesystem.freebsd.x86_64
+ 1.2.200-SNAPSHOT
+ eclipse-plugin
+
+@@ -33,7 +33,7 @@
+ p2
+
+
+- linux
++ freebsd
+ gtk
+ x86_64
+
+@@ -50,7 +50,7 @@
+
+
+ native
+- gtk.linux.x86_64
++ gtk.freebsd.x86_64
+
+
+
+@@ -64,13 +64,13 @@
+ process-resources
+
+
+-
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
++
+
+
+
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties 2014-04-16 07:20:05.000000000 -0500
+@@ -8,5 +8,5 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
+-fragmentName = Core File System for Linux
++fragmentName = Core File System for FreeBSD
+ providerName = Eclipse.org
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project 2014-04-16 07:19:20.000000000 -0500
+@@ -1,6 +1,6 @@
+
+
+- org.eclipse.core.filesystem.linux.x86_64
++ org.eclipse.core.filesystem.freebsd.x86_64
+
+
+
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:26:16.000000000 -0500
++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:36:19.000000000 -0500
+@@ -2,7 +2,7 @@
+ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+ Bundle-Name: %fragmentName
+ Bundle-Vendor: %providerName
+-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
++Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true
+ Bundle-Version: 3.105.0.qualifier
+ Bundle-ManifestVersion: 2
+ Bundle-Localization: fragment
+@@ -30,7 +30,7 @@
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.mozilla; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
+-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
++Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
+ SWT-WS: gtk
+-SWT-OS: linux
++SWT-OS: freebsd
+ SWT-Arch: x86_64
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2014-04-15 21:26:16.000000000 -0500
++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2014-04-16 07:35:58.000000000 -0500
+@@ -1,10 +1,10 @@
+
+-
++
+
+
+-
++
+
+-
++
+
+
+
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml.orig 2014-04-15 21:26:16.000000000 -0500
++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml 2014-04-16 07:36:13.000000000 -0500
+@@ -20,12 +20,12 @@
+ ../binaries-parent/
+
+ org.eclipse.swt
+- org.eclipse.swt.gtk.linux.x86_64
++ org.eclipse.swt.gtk.freebsd.x86_64
+ 3.105.0-SNAPSHOT
+ eclipse-plugin
+
+
+- linux
++ freebsd
+ gtk
+ x86_64
+ ${buildId}
+@@ -61,7 +61,7 @@
+
+
+ native
+- gtk.linux.x86_64
++ gtk.freebsd.x86_64
+
+
+
+@@ -74,7 +74,7 @@
+ process-resources
+
+
+-
++
+
+
+
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project.orig 2014-04-15 21:26:16.000000000 -0500
++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project 2014-04-16 07:36:05.000000000 -0500
+@@ -1,6 +1,6 @@
+
+
+- org.eclipse.swt.gtk.linux.x86_64
++ org.eclipse.swt.gtk.freebsd.x86_64
+
+
+
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:28:07.000000000 -0500
+@@ -3,8 +3,8 @@
+ Bundle-Name: %fragmentName
+ Bundle-Vendor: %providerName
+ Bundle-Localization: fragment
+-Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true
++Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86_64;singleton:=true
+ Bundle-Version: 1.2.0.qualifier
+ Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
+-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml 2014-04-16 07:28:28.000000000 -0500
+@@ -18,7 +18,7 @@
+ ../../../../
+
+ org.eclipse.core
+- org.eclipse.core.net.linux.x86_64
++ org.eclipse.core.net.freebsd.x86_64
+ 1.2.0-SNAPSHOT
+ eclipse-plugin
+
+@@ -31,7 +31,7 @@
+
+
+
+- linux
++ freebsd
+ gtk
+ x86_64
+
+@@ -48,7 +48,7 @@
+
+
+ native
+- gtk.linux.x86_64
++ gtk.freebsd.x86_64
+
+
+
+@@ -62,12 +62,12 @@
+ process-resources
+
+
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
+
+
+
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties 2014-04-16 07:28:39.000000000 -0500
+@@ -8,5 +8,5 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
+-fragmentName = Proxy for Linux x86_64
++fragmentName = Proxy for FreeBSD x86_64
+ providerName = Eclipse.org
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/.project.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/.project 2014-04-16 07:28:03.000000000 -0500
+@@ -1,6 +1,6 @@
+
+
+- org.eclipse.core.net.linux.x86_64
++ org.eclipse.core.net.freebsd.x86_64
+
+
+
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:32:54.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:51:22.000000000 -0500
+@@ -2,9 +2,9 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %pluginName
+ Bundle-Vendor: %providerName
+-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
++Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true
+ Bundle-Version: 1.1.400.qualifier
+ Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
+-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
+-Bundle-Localization: launcher.gtk.linux.x86_64
++Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
++Bundle-Localization: launcher.gtk.freebsd.x86_64
+ Eclipse-BundleShape: dir
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml.orig 2014-04-23 07:51:42.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml 2014-04-23 10:08:46.000000000 -0500
+@@ -18,12 +18,12 @@
+ ../../launcher-binary-parent
+
+ org.eclipse.equinox
+- org.eclipse.equinox.launcher.gtk.linux.x86_64
++ org.eclipse.equinox.launcher.gtk.freebsd.x86_64
+ 1.1.400-SNAPSHOT
+ eclipse-plugin
+
+
+- linux
++ freebsd
+ gtk
+ x86_64
+
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties.orig 2014-07-25 19:31:29.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties 2014-07-25 20:04:21.000000000 -0500
+@@ -8,5 +8,5 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
+-pluginName = Equinox Launcher Linux X86_64 Fragment
++pluginName = Equinox Launcher FreeBSD X86_64 Fragment
+ providerName = Eclipse.org - Equinox
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project.orig 2014-04-15 21:32:54.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project 2014-04-16 07:51:09.000000000 -0500
+@@ -1,6 +1,6 @@
+
+
+- org.eclipse.equinox.launcher.gtk.linux.x86_64
++ org.eclipse.equinox.launcher.gtk.freebsd.x86_64
+
+
+
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties.orig 2014-07-25 19:35:37.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties 2014-07-25 20:07:49.000000000 -0500
+@@ -10,7 +10,7 @@
+ ###############################################################################
+ bin.includes = META-INF/,\
+- launcher.gtk.linux.x86_64.properties,\
++ launcher.gtk.freebsd.x86_64.properties,\
+ about.html
+
+ customBuildCallbacks=customBuildCallbacks.xml
+ generateSourceBundle=false
Property changes on: files/amd64-patch-freebsd_natives
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/i386-patch-freebsd_natives
===================================================================
--- files/i386-patch-freebsd_natives (nonexistent)
+++ files/i386-patch-freebsd_natives (working copy)
@@ -0,0 +1,310 @@
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:20:17.000000000 -0500
+@@ -1,9 +1,9 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %fragmentName
+-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true
++Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86; singleton:=true
+ Bundle-Version: 1.4.200.qualifier
+ Bundle-Vendor: %providerName
+ Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
+ Bundle-Localization: fragment
+-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/pom.xml.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/pom.xml 2014-04-16 07:19:54.000000000 -0500
+@@ -15,10 +15,10 @@
+ eclipse.platform.resources
+ eclipse.platform.resources
+ 4.6.0-SNAPSHOT
+- ../../
++ ../../../../
+
+ org.eclipse.core
+- org.eclipse.core.filesystem.linux.x86
++ org.eclipse.core.filesystem.freebsd.x86
+ 1.4.200-SNAPSHOT
+ eclipse-plugin
+
+@@ -33,7 +33,7 @@
+ p2
+
+
+- linux
++ freebsd
+ gtk
+ x86
+
+@@ -50,7 +50,7 @@
+
+
+ native
+- gtk.linux.x86
++ gtk.freebsd.x86
+
+
+
+@@ -63,12 +63,13 @@
+ process-resources
+
+
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
++
+
+
+
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties 2014-04-16 07:20:05.000000000 -0500
+@@ -8,5 +8,5 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
+-fragmentName = Core File System for Linux
++fragmentName = Core File System for FreeBSD
+ providerName = Eclipse.org
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project 2014-04-16 07:19:20.000000000 -0500
+@@ -1,6 +1,6 @@
+
+
+- org.eclipse.core.filesystem.linux.x86
++ org.eclipse.core.filesystem.freebsd.x86
+
+
+
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:26:16.000000000 -0500
++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:36:19.000000000 -0500
+@@ -2,7 +2,7 @@
+ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+ Bundle-Name: %fragmentName
+ Bundle-Vendor: %providerName
+-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true
++Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true
+ Bundle-Version: 3.105.0.qualifier
+ Bundle-ManifestVersion: 2
+ Bundle-Localization: fragment
+@@ -30,7 +30,7 @@
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.mozilla; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
+-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
++Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
+ SWT-WS: gtk
+-SWT-OS: linux
++SWT-OS: freebsd
+ SWT-Arch: x86
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2014-04-15 21:26:16.000000000 -0500
++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml 2014-04-16 07:35:58.000000000 -0500
+@@ -1,10 +1,10 @@
+
+-
++
+
+
+-
++
+
+-
++
+
+
+
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml.orig 2014-04-15 21:26:16.000000000 -0500
++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml 2014-04-16 07:36:13.000000000 -0500
+@@ -20,12 +20,12 @@
+ ../binaries-parent/
+
+ org.eclipse.swt
+- org.eclipse.swt.gtk.linux.x86
++ org.eclipse.swt.gtk.freebsd.x86
+ 3.105.0-SNAPSHOT
+ eclipse-plugin
+
+
+- linux
++ freebsd
+ gtk
+ x86
+ ${buildId}
+@@ -61,7 +61,7 @@
+
+
+ native
+- gtk.linux.x86
++ gtk.freebsd.x86
+
+
+
+@@ -74,7 +74,7 @@
+ process-resources
+
+
+-
++
+
+
+
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/.project.orig 2014-04-15 21:26:16.000000000 -0500
++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/.project 2014-04-16 07:36:05.000000000 -0500
+@@ -1,6 +1,6 @@
+
+
+- org.eclipse.swt.gtk.linux.x86
++ org.eclipse.swt.gtk.freebsd.x86
+
+
+
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:28:07.000000000 -0500
+@@ -3,8 +3,8 @@
+ Bundle-Name: %fragmentName
+ Bundle-Vendor: %providerName
+ Bundle-Localization: fragment
+-Bundle-SymbolicName: org.eclipse.core.net.linux.x86;singleton:=true
++Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86;singleton:=true
+ Bundle-Version: 1.2.0.qualifier
+ Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
+-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml 2014-04-16 07:28:28.000000000 -0500
+@@ -18,7 +18,7 @@
+ ../../../../
+
+ org.eclipse.core
+- org.eclipse.core.net.linux.x86
++ org.eclipse.core.net.freebsd.x86
+ 1.2.0-SNAPSHOT
+ eclipse-plugin
+
+@@ -31,7 +31,7 @@
+
+
+
+- linux
++ freebsd
+ gtk
+ x86
+
+@@ -48,7 +48,7 @@
+
+
+ native
+- gtk.linux.x86
++ gtk.freebsd.x86
+
+
+
+@@ -62,12 +62,12 @@
+ process-resources
+
+
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
+
+
+
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties 2014-04-16 07:28:39.000000000 -0500
+@@ -8,5 +8,5 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
+-fragmentName = Proxy for Linux
++fragmentName = Proxy for FreeBSD
+ providerName = Eclipse.org
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/.project.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/.project 2014-04-16 07:28:03.000000000 -0500
+@@ -1,6 +1,6 @@
+
+
+- org.eclipse.core.net.linux.x86
++ org.eclipse.core.net.freebsd.x86
+
+
+
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:32:54.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:51:22.000000000 -0500
+@@ -2,9 +2,9 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %pluginName
+ Bundle-Vendor: %providerName
+-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true
++Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86;singleton:=true
+ Bundle-Version: 1.1.400.qualifier
+ Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
+-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
+-Bundle-Localization: launcher.gtk.linux.x86
++Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
++Bundle-Localization: launcher.gtk.freebsd.x86
+ Eclipse-BundleShape: dir
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml.orig 2014-04-23 07:51:42.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml 2014-04-23 10:08:46.000000000 -0500
+@@ -18,12 +18,12 @@
+ ../../launcher-binary-parent
+
+ org.eclipse.equinox
+- org.eclipse.equinox.launcher.gtk.linux.x86
++ org.eclipse.equinox.launcher.gtk.freebsd.x86
+ 1.1.400-SNAPSHOT
+ eclipse-plugin
+
+
+- linux
++ freebsd
+ gtk
+ x86
+
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties.orig 2014-07-25 19:31:29.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 2014-07-25 20:04:21.000000000 -0500
+@@ -8,5 +8,5 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
+-pluginName = Equinox Launcher Linux X86 Fragment
++pluginName = Equinox Launcher FreeBSD X86 Fragment
+ providerName = Eclipse.org - Equinox
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project.orig 2014-04-15 21:32:54.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project 2014-04-16 07:51:09.000000000 -0500
+@@ -1,6 +1,6 @@
+
+
+- org.eclipse.equinox.launcher.gtk.linux.x86
++ org.eclipse.equinox.launcher.gtk.freebsd.x86
+
+
+
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties.orig 2014-07-25 19:35:37.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties 2014-07-25 20:07:49.000000000 -0500
+@@ -10,7 +10,7 @@
+ ###############################################################################
+ bin.includes = META-INF/,\
+- launcher.gtk.linux.x86.properties,\
++ launcher.gtk.freebsd.x86.properties,\
+ about.html
+
+ customBuildCallbacks=customBuildCallbacks.xml
+ generateSourceBundle=false
Property changes on: files/i386-patch-freebsd_natives
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-aggregator
===================================================================
--- files/patch-aggregator (revision 418813)
+++ files/patch-aggregator (working copy)
@@ -2,6 +2,15 @@
index 71a6610..cc260cd 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
+@@ -80,7 +80,7 @@
+ The tycho-eclipserun-plugin will create its instance of Eclipse from this
+ 'eclipiserun-repo' repository, such as for computing .api-descriptions.
+ -->
+- http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6RC2-201605191730/
++ http://download.eclipse.org/eclipse/updates/4.6/R-4.6-201606061100/
+
+ http://download.eclipse.org/eclipse/updates/4.6-I-builds
+
@@ -253,6 +253,11 @@
@@ -17,13 +26,13 @@
@@ -480,13 +485,13 @@
false
- 'v'yyyyMMdd-HHmm
+ ${qualifier.format}
- jgit
+
pom.xml
- ${jgit.dirtyWorkingTree}
+ ${jgit.dirtyWorkingTree-platformDefault}
- true
+ false
@@ -247,10 +256,10 @@
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-index 29dfebb..2783e4e 100644
+index f34ae99..6293698 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-@@ -9,55 +9,8 @@
+@@ -9,56 +9,8 @@
# IBM Corporation - initial API and implementation
###############################################################################
@@ -284,10 +293,10 @@
-root.hpux.gtk.ia64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/hpux/ia64
-root.hpux.gtk.ia64.permissions.755=eclipse
-
--root.solaris.gtk.sparc=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/sparc
--root.solaris.gtk.sparc.permissions.755=eclipse
--root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
--root.solaris.gtk.x86.permissions.755=eclipse
+-root.solaris.gtk.sparcv9=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/sparcv9
+-root.solaris.gtk.sparcv9.permissions.755=eclipse
+-root.solaris.gtk.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86_64
+-root.solaris.gtk.x86_64.permissions.755=eclipse
-
-root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
-root.linux.gtk.x86.permissions.755=eclipse
@@ -304,10 +313,11 @@
-root.linux.gtk.s390.permissions.755=eclipse
-
+root.freebsd.gtk.%%ECLIPSE_ARCH%%=rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/%%ECLIPSE_ARCH%%
-+root.freebsd.gtk.%%ECLIPSE_ARCH%%.permissions.755=libcairo-swt.so,eclipse
++root.freebsd.gtk.%%ECLIPSE_ARCH%%.permissions.755=eclipse
bin.includes = feature.properties
+-
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
index 29be78c..207a934 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
@@ -341,42 +351,15 @@
-diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
-index 6b59ed2..64975ba 100644
---- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
-@@ -89,6 +89,23 @@ units.5.touchpoint.version=1.0.0
- units.5.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
- units.5.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
-
-+requires.6.namespace=org.eclipse.equinox.p2.iu
-+requires.6.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
-+requires.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk))
-+requires.6.range=[1.0.0,1.0.0]
-+requires.6.greedy=true
-+
-+units.6.id=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
-+units.6.version=1.0.0
-+units.6.provides.1.namespace=org.eclipse.equinox.p2.iu
-+units.6.provides.1.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
-+units.6.provides.1.version=1.0.0
-+units.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk))
-+units.6.touchpoint.id=org.eclipse.equinox.p2.osgi
-+units.6.touchpoint.version=1.0.0
-+units.6.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
-+units.6.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
-+
- # Restrict range so we are not an automatic update for 3.x.
- update.id= org.eclipse.sdk.ide
- update.range = [4.0,$version$)
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
--- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
@@ -35,6 +35,6 @@
- platform.sdk
- sdk
- eclipse-junit-tests
-- eclipse.platform.repository
-+
+ platform.sdk
+ sdk
+- eclipse-junit-tests
++
+- eclipse.platform.repository
++
Index: files/patch-freebsd_natives
===================================================================
--- files/patch-freebsd_natives (revision 418813)
+++ files/patch-freebsd_natives (working copy)
@@ -28,503 +28,6 @@
-install: core
- rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so
- mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:17:42.000000000 -0500
-@@ -1,9 +1,9 @@
- Manifest-Version: 1.0
- Bundle-ManifestVersion: 2
- Bundle-Name: %fragmentName
--Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true
-+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86; singleton:=true
- Bundle-Version: 1.4.200.qualifier
- Bundle-Vendor: %providerName
- Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
- Bundle-Localization: fragment
--Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
-+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/pom.xml.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/pom.xml 2014-04-16 07:17:22.000000000 -0500
-@@ -15,10 +15,10 @@
- eclipse.platform.resources
- eclipse.platform.resources
- 4.5.2-SNAPSHOT
-- ../../
-+ ../../../../
-
- org.eclipse.core
-- org.eclipse.core.filesystem.linux.x86
-+ org.eclipse.core.filesystem.freebsd.x86
- 1.4.200-SNAPSHOT
- eclipse-plugin
-
-@@ -33,7 +33,7 @@
- p2
-
-
-- linux
-+ freebsd
- gtk
- x86
-
-@@ -50,7 +50,7 @@
-
-
- native
-- gtk.linux.x86
-+ gtk.freebsd.x86
-
-
-
-@@ -64,12 +64,13 @@
- process-resources
-
-
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-
-
-
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties 2014-04-16 07:17:34.000000000 -0500
-@@ -8,5 +8,5 @@
- # Contributors:
- # IBM Corporation - initial API and implementation
- ###############################################################################
--fragmentName = Core File System for Linux
-+fragmentName = Core File System for FreeBSD
- providerName = Eclipse.org
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project 2014-04-16 07:16:45.000000000 -0500
-@@ -1,6 +1,6 @@
-
-
-- org.eclipse.core.filesystem.linux.x86
-+ org.eclipse.core.filesystem.freebsd.x86
-
-
-
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:20:17.000000000 -0500
-@@ -1,9 +1,9 @@
- Manifest-Version: 1.0
- Bundle-ManifestVersion: 2
- Bundle-Name: %fragmentName
--Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true
-+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86_64; singleton:=true
- Bundle-Version: 1.2.200.qualifier
- Bundle-Vendor: %providerName
- Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
- Bundle-Localization: fragment
--Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
-+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 2014-04-16 07:19:54.000000000 -0500
-@@ -15,10 +15,10 @@
- eclipse.platform.resources
- eclipse.platform.resources
- 4.5.2-SNAPSHOT
-- ../../
-+ ../../../../
-
- org.eclipse.core
-- org.eclipse.core.filesystem.linux.x86_64
-+ org.eclipse.core.filesystem.freebsd.x86_64
- 1.2.200-SNAPSHOT
- eclipse-plugin
-
-@@ -33,7 +33,7 @@
- p2
-
-
-- linux
-+ freebsd
- gtk
- x86_64
-
-@@ -50,7 +50,7 @@
-
-
- native
-- gtk.linux.x86_64
-+ gtk.freebsd.x86_64
-
-
-
-@@ -64,13 +64,13 @@
- process-resources
-
-
--
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-
-
-
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties 2014-04-16 07:20:05.000000000 -0500
-@@ -8,5 +8,5 @@
- # Contributors:
- # IBM Corporation - initial API and implementation
- ###############################################################################
--fragmentName = Core File System for Linux
-+fragmentName = Core File System for FreeBSD
- providerName = Eclipse.org
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project 2014-04-16 07:19:20.000000000 -0500
-@@ -1,6 +1,6 @@
-
-
-- org.eclipse.core.filesystem.linux.x86_64
-+ org.eclipse.core.filesystem.freebsd.x86_64
-
-
-
---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:26:16.000000000 -0500
-+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:31:38.000000000 -0500
-@@ -2,7 +2,7 @@
- Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
- Bundle-Name: %fragmentName
- Bundle-Vendor: %providerName
--Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true
-+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true
- Bundle-Version: 3.104.2.qualifier
- Bundle-ManifestVersion: 2
- Bundle-Localization: fragment
-@@ -30,7 +30,7 @@
- org.eclipse.swt.internal.gtk; x-internal:=true,
- org.eclipse.swt.internal.mozilla; x-internal:=true,
- org.eclipse.swt.internal.opengl.glx; x-internal:=true
--Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
-+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
- SWT-WS: gtk
--SWT-OS: linux
-+SWT-OS: freebsd
- SWT-Arch: x86
---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml.orig 2014-04-15 21:26:16.000000000 -0500
-+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml 2014-04-16 07:31:27.000000000 -0500
-@@ -20,12 +20,12 @@
- ../binaries-parent/
-
- org.eclipse.swt
-- org.eclipse.swt.gtk.linux.x86
-+ org.eclipse.swt.gtk.freebsd.x86
- 3.104.2-SNAPSHOT
- eclipse-plugin
-
-
-- linux
-+ freebsd
- gtk
- x86
- ${buildId}
-@@ -61,7 +61,7 @@
-
-
- native
-- gtk.linux.x86
-+ gtk.freebsd.x86
-
-
-
-@@ -74,7 +74,7 @@
- process-resources
-
-
--
-+
-
-
-
---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2014-04-15 21:26:16.000000000 -0500
-+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml 2014-04-16 07:31:05.000000000 -0500
-@@ -1,10 +1,10 @@
-
--
-+
-
-
--
-+
-
--
-+
-
-
-
---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/.project.orig 2014-04-15 21:26:16.000000000 -0500
-+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/.project 2014-04-16 07:31:14.000000000 -0500
-@@ -1,6 +1,6 @@
-
-
-- org.eclipse.swt.gtk.linux.x86
-+ org.eclipse.swt.gtk.freebsd.x86
-
-
-
---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:26:16.000000000 -0500
-+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:36:19.000000000 -0500
-@@ -2,7 +2,7 @@
- Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
- Bundle-Name: %fragmentName
- Bundle-Vendor: %providerName
--Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
-+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true
- Bundle-Version: 3.104.2.qualifier
- Bundle-ManifestVersion: 2
- Bundle-Localization: fragment
-@@ -30,7 +30,7 @@
- org.eclipse.swt.internal.gtk; x-internal:=true,
- org.eclipse.swt.internal.mozilla; x-internal:=true,
- org.eclipse.swt.internal.opengl.glx; x-internal:=true
--Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
-+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
- SWT-WS: gtk
--SWT-OS: linux
-+SWT-OS: freebsd
- SWT-Arch: x86_64
---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2014-04-15 21:26:16.000000000 -0500
-+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2014-04-16 07:35:58.000000000 -0500
-@@ -1,10 +1,10 @@
-
--
-+
-
-
--
-+
-
--
-+
-
-
-
---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml.orig 2014-04-15 21:26:16.000000000 -0500
-+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml 2014-04-16 07:36:13.000000000 -0500
-@@ -20,12 +20,12 @@
- ../binaries-parent/
-
- org.eclipse.swt
-- org.eclipse.swt.gtk.linux.x86_64
-+ org.eclipse.swt.gtk.freebsd.x86_64
- 3.104.2-SNAPSHOT
- eclipse-plugin
-
-
-- linux
-+ freebsd
- gtk
- x86_64
- ${buildId}
-@@ -61,7 +61,7 @@
-
-
- native
-- gtk.linux.x86_64
-+ gtk.freebsd.x86_64
-
-
-
-@@ -74,7 +74,7 @@
- process-resources
-
-
--
-+
-
-
-
---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project.orig 2014-04-15 21:26:16.000000000 -0500
-+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project 2014-04-16 07:36:05.000000000 -0500
-@@ -1,6 +1,6 @@
-
-
-- org.eclipse.swt.gtk.linux.x86_64
-+ org.eclipse.swt.gtk.freebsd.x86_64
-
-
-
---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:27:02.000000000 -0500
-+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:26:24.000000000 -0500
-@@ -3,8 +3,8 @@
- Bundle-Name: %fragmentName
- Bundle-Vendor: %providerName
- Bundle-Localization: fragment
--Bundle-SymbolicName: org.eclipse.core.net.linux.x86;singleton:=true
-+Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86;singleton:=true
- Bundle-Version: 1.1.300.qualifier
- Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
--Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
-+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml.orig 2014-04-15 21:27:02.000000000 -0500
-+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml 2014-04-16 07:27:00.000000000 -0500
-@@ -18,7 +18,7 @@
- ../../../../
-
- org.eclipse.core
-- org.eclipse.core.net.linux.x86
-+ org.eclipse.core.net.freebsd.x86
- 1.1.300-SNAPSHOT
- eclipse-plugin
-
-@@ -30,7 +30,7 @@
-
-
-
-- linux
-+ freebsd
- gtk
- x86
-
-@@ -47,7 +47,7 @@
-
-
- native
-- gtk.linux.x86
-+ gtk.freebsd.x86
-
-
-
-@@ -61,12 +61,12 @@
- process-resources
-
-
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-
-
-
---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties.orig 2014-04-15 21:27:02.000000000 -0500
-+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties 2014-04-16 07:27:11.000000000 -0500
-@@ -8,5 +8,5 @@
- # Contributors:
- # IBM Corporation - initial API and implementation
- ###############################################################################
--fragmentName = Proxy for Linux
-+fragmentName = Proxy for FreeBSD
- providerName = Eclipse.org
---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/.project.orig 2014-04-15 21:27:02.000000000 -0500
-+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/.project 2014-04-16 07:26:18.000000000 -0500
-@@ -1,6 +1,6 @@
-
-
-- org.eclipse.core.net.linux.x86
-+ org.eclipse.core.net.freebsd.x86
-
-
-
---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:27:02.000000000 -0500
-+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:28:07.000000000 -0500
-@@ -3,8 +3,8 @@
- Bundle-Name: %fragmentName
- Bundle-Vendor: %providerName
- Bundle-Localization: fragment
--Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true
-+Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86_64;singleton:=true
- Bundle-Version: 1.1.100.qualifier
- Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
--Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
-+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml.orig 2014-04-15 21:27:02.000000000 -0500
-+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml 2014-04-16 07:28:28.000000000 -0500
-@@ -18,7 +18,7 @@
- ../../../../
-
- org.eclipse.core
-- org.eclipse.core.net.linux.x86_64
-+ org.eclipse.core.net.freebsd.x86_64
- 1.1.100-SNAPSHOT
- eclipse-plugin
-
-@@ -31,7 +31,7 @@
-
-
-
-- linux
-+ freebsd
- gtk
- x86_64
-
-@@ -48,7 +48,7 @@
-
-
- native
-- gtk.linux.x86_64
-+ gtk.freebsd.x86_64
-
-
-
-@@ -62,12 +62,12 @@
- process-resources
-
-
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-
-
-
---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:27:02.000000000 -0500
-+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties 2014-04-16 07:28:39.000000000 -0500
-@@ -8,5 +8,5 @@
- # Contributors:
- # IBM Corporation - initial API and implementation
- ###############################################################################
--fragmentName = Proxy for Linux x86_64
-+fragmentName = Proxy for FreeBSD x86_64
- providerName = Eclipse.org
---- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/.project.orig 2014-04-15 21:27:02.000000000 -0500
-+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/.project 2014-04-16 07:28:03.000000000 -0500
-@@ -1,6 +1,6 @@
-
-
-- org.eclipse.core.net.linux.x86_64
-+ org.eclipse.core.net.freebsd.x86_64
-
-
-
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile.orig 2014-04-15 21:27:02.000000000 -0500
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile 2014-04-16 07:45:00.000000000 -0500
@@ -18,7 +18,7 @@
@@ -556,100 +59,6 @@
@echo "Finished building target: $(LIB_NAME_FULL)"
@echo " "
---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:32:54.000000000 -0500
-+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:49:58.000000000 -0500
-@@ -2,9 +2,9 @@
- Bundle-ManifestVersion: 2
- Bundle-Name: %pluginName
- Bundle-Vendor: %providerName
--Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true
-+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86;singleton:=true
- Bundle-Version: 1.1.300.qualifier
- Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
--Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
--Bundle-Localization: launcher.gtk.linux.x86
-+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
-+Bundle-Localization: launcher.gtk.freebsd.x86
- Eclipse-BundleShape: dir
---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml.orig 2014-04-23 07:51:42.000000000 -0500
-+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml 2014-04-23 10:04:13.000000000 -0500
-@@ -18,12 +18,12 @@
- ../../launcher-binary-parent
-
- org.eclipse.equinox
-- org.eclipse.equinox.launcher.gtk.linux.x86
-+ org.eclipse.equinox.launcher.gtk.freebsd.x86
- 1.1.300-SNAPSHOT
- eclipse-plugin
-
-
-- linux
-+ freebsd
- gtk
- x86
-
---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties.orig 2014-04-15 21:32:54.000000000 -0500
-+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 2014-04-16 07:50:08.000000000 -0500
-@@ -8,5 +8,5 @@
- # Contributors:
- # IBM Corporation - initial API and implementation
- ###############################################################################
--pluginName = Equinox Launcher Linux X86 Fragment
-+pluginName = Equinox Launcher FreeBSD X86 Fragment
- providerName = Eclipse.org - Equinox
---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project.orig 2014-04-15 21:32:54.000000000 -0500
-+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project 2014-04-16 07:49:39.000000000 -0500
-@@ -1,6 +1,6 @@
-
-
-- org.eclipse.equinox.launcher.gtk.linux.x86
-+ org.eclipse.equinox.launcher.gtk.freebsd.x86
-
-
-
---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties.orig 2014-07-25 19:35:37.000000000 -0500
-+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties 2014-07-25 20:10:23.000000000 -0500
-@@ -10,7 +10,7 @@
- ###############################################################################
- bin.includes = META-INF/,\
- eclipse_*.so,\
-- launcher.gtk.linux.x86.properties,\
-+ launcher.gtk.freebsd.x86.properties,\
- about.html
-
- customBuildCallbacks=customBuildCallbacks.xml
---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:32:54.000000000 -0500
-+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:51:22.000000000 -0500
-@@ -2,9 +2,9 @@
- Bundle-ManifestVersion: 2
- Bundle-Name: %pluginName
- Bundle-Vendor: %providerName
--Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
-+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true
- Bundle-Version: 1.1.300.qualifier
- Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
--Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
--Bundle-Localization: launcher.gtk.linux.x86_64
-+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
-+Bundle-Localization: launcher.gtk.freebsd.x86_64
- Eclipse-BundleShape: dir
---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml.orig 2014-04-23 07:51:42.000000000 -0500
-+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml 2014-04-23 10:08:46.000000000 -0500
-@@ -18,12 +18,12 @@
- ../../launcher-binary-parent
-
- org.eclipse.equinox
-- org.eclipse.equinox.launcher.gtk.linux.x86_64
-+ org.eclipse.equinox.launcher.gtk.freebsd.x86_64
- 1.1.300-SNAPSHOT
- eclipse-plugin
-
-
-- linux
-+ freebsd
- gtk
- x86_64
-
--- ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak.orig 2014-04-15 21:32:58.000000000 -0500
+++ ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak 2014-04-16 07:57:53.000000000 -0500
@@ -42,15 +42,15 @@
@@ -693,33 +102,3 @@
install: all
cp $(EXEC) $(OUTPUT_DIR)
---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties.orig 2014-07-25 19:31:29.000000000 -0500
-+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties 2014-07-25 20:04:21.000000000 -0500
-@@ -8,5 +8,5 @@
- # Contributors:
- # IBM Corporation - initial API and implementation
- ###############################################################################
--pluginName = Equinox Launcher Linux X86_64 Fragment
-+pluginName = Equinox Launcher FreeBSD X86_64 Fragment
- providerName = Eclipse.org - Equinox
---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project.orig 2014-04-15 21:32:54.000000000 -0500
-+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project 2014-04-16 07:51:09.000000000 -0500
-@@ -1,6 +1,6 @@
-
-
-- org.eclipse.equinox.launcher.gtk.linux.x86_64
-+ org.eclipse.equinox.launcher.gtk.freebsd.x86_64
-
-
-
---- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties.orig 2014-07-25 19:35:37.000000000 -0500
-+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties 2014-07-25 20:07:49.000000000 -0500
-@@ -10,7 +10,7 @@
- ###############################################################################
- bin.includes = META-INF/,\
- eclipse_*.so,\
-- launcher.gtk.linux.x86_64.properties,\
-+ launcher.gtk.freebsd.x86_64.properties,\
- about.html
-
- customBuildCallbacks=customBuildCallbacks.xml
Index: files/patch-submodules
===================================================================
--- files/patch-submodules (revision 418813)
+++ files/patch-submodules (working copy)
@@ -499,7 +499,7 @@
parseLinux((Element) child);
} else if (name.equals("macosx")) { //$NON-NLS-1$
parseMac((Element) child);
-@@ -122,12 +124,17 @@ public class LauncherInfo extends ProductObject implements ILauncherInfo {
+@@ -122,13 +124,18 @@ public class LauncherInfo extends ProductObject implements ILauncherInfo {
fIcons.put(LINUX_ICON, element.getAttribute("icon")); //$NON-NLS-1$
}
@@ -507,6 +507,7 @@
+ fIcons.put(FREEBSD_ICON, element.getAttribute("icon")); //$NON-NLS-1$
+ }
+
+ @Override
public void write(String indent, PrintWriter writer) {
writer.print(indent + " 0)
@@ -725,7 +726,7 @@
@@ -106,7 +106,7 @@ public class PropertiesSection extends TableSection {
private IConfigurationProperty fEdit;
private Set fExistingNames;
-
+
- private String[] COMBO_OSLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32};
+ private String[] COMBO_OSLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32, Platform.OS_FREEBSD};
private String[] COMBO_ARCHLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.ARCH_X86, Platform.ARCH_X86_64, Platform.ARCH_PPC, Platform.ARCH_IA64, Platform.ARCH_IA64_32, Platform.ARCH_PA_RISC, Platform.ARCH_SPARC};
@@ -806,27 +807,6 @@
assertTrue(haveSymlinks());
} else {
assertFalse(haveSymlinks());
-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
-index 652119f..30482b0 100644
---- 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
-@@ -94,6 +94,16 @@ public final class BootLoader {
- public static final String OS_HPUX = "hpux";//$NON-NLS-1$
-
- /**
-+ * Constant string (value "freebsd") indicating the platform is running on an
-+ * FreeBSD-based operating system.
-+ * Note: This constant is not officially supported by the eclipse project
-+ * and is only available on eclipse versions built from the FreeBSD ports
-+ * tree.
-+ * @deprecated Replaced by {@link Platform#OS_FREEBSD.
-+ */
-+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$
-+
-+ /**
- * Constant string (value "qnx") indicating the platform is running on a
- * QNX-based operating system.
- * @deprecated Replaced by {@link Platform#OS_QNX}.
diff --git a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
index 8ace8e8..21ba40f 100644
--- a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
@@ -1274,31 +1254,30 @@
+requires.18.range = 0.0.0
+requires.18.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%))
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
-index 681fc0b..957a23f 100644
+index 98517c0..6f17162 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
-@@ -85,3 +85,8 @@ requires.17.namespace = org.eclipse.equinox.p2.iu
- requires.17.name = org.eclipse.swt.gtk.hpux.ia64
- requires.17.range = [$version$,$version$]
- requires.17.filter = (&(osgi.os=hpux)(osgi.ws=gtk)(osgi.arch=ia64)(!(org.eclipse.swt.buildtime=true)))
+@@ -95,3 +95,8 @@ requires.19.namespace = org.eclipse.equinox.p2.iu
+ requires.19.name = org.eclipse.swt.gtk.linux.aarch64
+ requires.19.range = [$version$,$version$]
+ requires.19.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
+
-+requires.18.namespace = org.eclipse.equinox.p2.iu
-+requires.18.name = org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%
-+requires.18.range = [$version$,$version$]
-+requires.18.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%)(!(org.eclipse.swt.buildtime=true)))
++requires.20.namespace = org.eclipse.equinox.p2.iu
++requires.20.name = org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%
++requires.20.range = [$version$,$version$]
++requires.20.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%)(!(org.eclipse.swt.buildtime=true)))
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
index cc8d6f7..46c8f5a 100644
--- a/eclipse.platform.swt.binaries/pom.xml
+++ b/eclipse.platform.swt.binaries/pom.xml
-@@ -55,7 +56,8 @@
+@@ -91,6 +91,7 @@
bundles/org.eclipse.swt.gtk.linux.s390x
bundles/org.eclipse.swt.gtk.linux.x86
bundles/org.eclipse.swt.gtk.linux.x86_64
+ bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%
- bundles/org.eclipse.swt.gtk.solaris.sparc
- bundles/org.eclipse.swt.gtk.solaris.x86
+ bundles/org.eclipse.swt.gtk.solaris.sparcv9
+ bundles/org.eclipse.swt.gtk.solaris.x86_64
bundles/org.eclipse.swt.win32.win32.x86
- bundles/org.eclipse.swt.win32.win32.x86_64
diff --git a/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c b/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c
index 2417b4e..c665afe 100644
--- a/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c
@@ -1745,9 +1724,9 @@
+
-
-
+
+
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
index 0f30a87..36382de 100644
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
@@ -1800,13 +1779,6 @@
-@@ -279,4 +297,4 @@
-
-
-
--
-\ No newline at end of file
-+
diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
index b46cdc6..d46c81d 100644
--- a/rt.equinox.framework/pom.xml
@@ -1816,9 +1788,9 @@
bundles/org.eclipse.equinox.launcher.gtk.linux.x86
bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64
+ bundles/org.eclipse.equinox.launcher.gtk.freebsd.%%ECLIPSE_ARCH%%
- bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc
- bundles/org.eclipse.equinox.launcher.gtk.solaris.x86
- bundles/org.eclipse.equinox.launcher.motif.aix.ppc
+ bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64
+ bundles/org.eclipse.equinox.launcher.win32.win32.x86
+ bundles/org.eclipse.equinox.launcher.win32.win32.x86_64
diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
index 3cf2fe1..53f82b3 100644
--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
@@ -2145,11 +2117,11 @@
+
+
@@ -2204,3 +2176,35 @@
id="org.eclipse.core.filesystem.linux.x86"
os="linux"
arch="x86"
+diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/pom.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/pom.xml
+index 01db883..22c1314 100644
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/pom.xml
++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/pom.xml
+@@ -20,9 +20,9 @@
+ org.eclipse.swt
+ 3.105.0-SNAPSHOT
+ eclipse-plugin
+-
++
+
+
+
+diff --git a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml
+index 73c4197..4493f7c 100644
+--- a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml
++++ b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml
+@@ -21,9 +21,9 @@
+ binaries-parent
+ 4.6.0-SNAPSHOT
+ pom
+-
++
+
+
+
Index: scripts/pre-patch
===================================================================
--- scripts/pre-patch (revision 418813)
+++ scripts/pre-patch (working copy)
@@ -13,12 +13,12 @@
}
for d in \
- ${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x* \
+ ${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.${ECLIPSE_ARCH} \
${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux \
${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux \
- ${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.x* \
- ${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x* \
- ${WRKSRC}/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x*
+ ${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.${ECLIPSE_ARCH} \
+ ${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/${ECLIPSE_ARCH} \
+ ${WRKSRC}/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.${ECLIPSE_ARCH}
do
mkdir -p `echo $d | sed -e 's/linux/freebsd/'`
[ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
@@ -25,13 +25,13 @@
done
# "fragments" pieces
for d in \
- ${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x*
+ ${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${ECLIPSE_ARCH}
do
mkdir -p `echo $d | sed -e 's/linux/freebsd/'`
[ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
done
for d in \
- ${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x*
+ ${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.${ECLIPSE_ARCH}
do
mkdir -p `dirname $d`/`basename $d | sed -e 's/\.linux.*$//'`/fragments/`basename $d | sed -e 's/linux/freebsd/'`
[ -d $d ] && ( cd $d; tar cf - . ) | ( cd `dirname $d`/`basename $d | sed -e 's/\.linux.*$//'`/fragments/`basename $d | sed -e 's/linux/freebsd/'`; tar xf - )