svn commit: r423439 - in head/java/eclipse: . files scripts
Kurt Jaeger
pi at FreeBSD.org
Thu Oct 6 20:05:08 UTC 2016
Author: pi
Date: Thu Oct 6 20:05:06 2016
New Revision: 423439
URL: https://svnweb.freebsd.org/changeset/ports/423439
Log:
java/eclipse: 4.5.2 -> 4.6
- new MASTER_SITE
PR: 211764
Changes: http://www.eclipse.org/neon/noteworthy/
https://www.eclipse.org/eclipse/development/readme_eclipse_4.6.php
Submitted by: Jimmy Kelley <ljboiler at gmail.com> (maintainer)
Reviewed by: Michael Zhilin <mizhka at gmail.com>, kappei84 at gmail.com
Added:
head/java/eclipse/files/amd64-patch-freebsd_natives (contents, props changed)
head/java/eclipse/files/i386-patch-freebsd_natives (contents, props changed)
Modified:
head/java/eclipse/Makefile
head/java/eclipse/distinfo
head/java/eclipse/files/patch-aggregator
head/java/eclipse/files/patch-freebsd_natives
head/java/eclipse/files/patch-submodules
head/java/eclipse/scripts/pre-patch
Modified: head/java/eclipse/Makefile
==============================================================================
--- head/java/eclipse/Makefile Thu Oct 6 19:57:07 2016 (r423438)
+++ head/java/eclipse/Makefile Thu Oct 6 20:05:06 2016 (r423439)
@@ -2,15 +2,15 @@
# $FreeBSD$
PORTNAME= eclipse
-PORTVERSION= 4.5.2
+PORTVERSION= 4.6
CATEGORIES= java devel
-MASTER_SITES= https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/
+MASTER_SITES= https://s3.amazonaws.com/freebsd-eclipse-dist/
DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
${PORTNAME}-maven-repo-${PORTVERSION}.xz
DIST_SUBDIR= eclipse
MAINTAINER= ljboiler at gmail.com
-COMMENT= Eclipse Mars.2
+COMMENT= Eclipse Neon
LICENSE= EPL
@@ -68,11 +68,19 @@ MVN_OPTS?= MAVEN_OPTS='-Xmx1024m'
ECLIPSE_WS= gtk
ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/}
E_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//}
-ECLIPSE_BUILDID=M20160212-1500
+ECLIPSE_BUILDID=I20160606-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.
Modified: head/java/eclipse/distinfo
==============================================================================
--- head/java/eclipse/distinfo Thu Oct 6 19:57:07 2016 (r423438)
+++ head/java/eclipse/distinfo Thu Oct 6 20:05:06 2016 (r423439)
@@ -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
Added: head/java/eclipse/files/amd64-patch-freebsd_natives
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/eclipse/files/amd64-patch-freebsd_natives Thu Oct 6 20:05:06 2016 (r423439)
@@ -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 @@
+ <artifactId>eclipse.platform.resources</artifactId>
+ <groupId>eclipse.platform.resources</groupId>
+ <version>4.6.0-SNAPSHOT</version>
+- <relativePath>../../</relativePath>
++ <relativePath>../../../../</relativePath>
+ </parent>
+ <groupId>org.eclipse.core</groupId>
+- <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId>
++ <artifactId>org.eclipse.core.filesystem.freebsd.x86_64</artifactId>
+ <version>1.2.200-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+@@ -33,7 +33,7 @@
+ <resolver>p2</resolver>
+ <environments>
+ <environment>
+- <os>linux</os>
++ <os>freebsd</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+@@ -50,7 +50,7 @@
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
+- <value>gtk.linux.x86_64</value>
++ <value>gtk.freebsd.x86_64</value>
+ </property>
+ </activation>
+ <build>
+@@ -64,13 +64,13 @@
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+- <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
+- <mkdir dir="os/linux/x86_64/"/>
+- <copy todir="os/linux/x86_64/">
+- <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
+- <include name="libunixfile_*.so"/>
+- </fileset>
+- </copy>
++ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
++ <mkdir dir="os/freebsd/x86_64/"/>
++ <copy todir="os/freebsd/x86_64/">
++ <fileset dir="../../natives/unix/freebsd/">
++ <include name="libunixfile_*.so"/>
++ </fileset>
++ </copy>
+ </target>
+ </configuration>
+ <goals>
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties 2014-04-16 07:20:05.000000000 -0500
+@@ -8,5 +8,5 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
+-fragmentName = Core File System for Linux
++fragmentName = Core File System for FreeBSD
+ providerName = Eclipse.org
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project 2014-04-16 07:19:20.000000000 -0500
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <projectDescription>
+- <name>org.eclipse.core.filesystem.linux.x86_64</name>
++ <name>org.eclipse.core.filesystem.freebsd.x86_64</name>
+ <comment></comment>
+ <projects>
+ </projects>
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_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 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<project name="org.eclipse.swt.gtk.linux.x86_64" default="build.jars" basedir=".">
++<project name="org.eclipse.swt.gtk.freebsd.x86_64" default="build.jars" basedir=".">
+
+ <property name="swt.ws" value="gtk" />
+- <property name="swt.os" value="linux" />
++ <property name="swt.os" value="freebsd" />
+ <property name="swt.arch" value="x86_64" />
+- <property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
++ <property name="targets" value="install"/>
+
+ <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
+ <property name="version.suffix" value="3.104.0" />
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml.orig 2014-04-15 21:26:16.000000000 -0500
++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml 2014-04-16 07:36:13.000000000 -0500
+@@ -20,12 +20,12 @@
+ <relativePath>../binaries-parent/</relativePath>
+ </parent>
+ <groupId>org.eclipse.swt</groupId>
+- <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
++ <artifactId>org.eclipse.swt.gtk.freebsd.x86_64</artifactId>
+ <version>3.105.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <properties>
+- <os>linux</os>
++ <os>freebsd</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ <buildid>${buildId}</buildid>
+@@ -61,7 +61,7 @@
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
+- <value>gtk.linux.x86_64</value>
++ <value>gtk.freebsd.x86_64</value>
+ </property>
+ </activation>
+ <build>
+@@ -74,7 +74,7 @@
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+- <property name="machine_gtk3" value="1"/>
++ <!-- property name="machine_gtk3" value="1"/ -->
+ <property name="targets" value="install" />
+ <ant antfile="build.xml" target="build_libraries"/>
+ </target>
+--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project.orig 2014-04-15 21:26:16.000000000 -0500
++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project 2014-04-16 07:36:05.000000000 -0500
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <projectDescription>
+- <name>org.eclipse.swt.gtk.linux.x86_64</name>
++ <name>org.eclipse.swt.gtk.freebsd.x86_64</name>
+ <comment></comment>
+ <projects>
+ </projects>
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_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 @@
+ <relativePath>../../../../</relativePath>
+ </parent>
+ <groupId>org.eclipse.core</groupId>
+- <artifactId>org.eclipse.core.net.linux.x86_64</artifactId>
++ <artifactId>org.eclipse.core.net.freebsd.x86_64</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+@@ -31,7 +31,7 @@
+ <configuration>
+ <environments>
+ <environment>
+- <os>linux</os>
++ <os>freebsd</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+@@ -48,7 +48,7 @@
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
+- <value>gtk.linux.x86_64</value>
++ <value>gtk.freebsd.x86_64</value>
+ </property>
+ </activation>
+ <build>
+@@ -62,12 +62,12 @@
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+- <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
+- <copy todir=".">
+- <fileset dir="../../natives/unix/linux/">
+- <include name="libgnomeproxy-*.so"/>
+- </fileset>
+- </copy>
++ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
++ <copy todir=".">
++ <fileset dir="../../natives/unix/freebsd/">
++ <include name="libgnomeproxy-*.so"/>
++ </fileset>
++ </copy>
+ </target>
+ </configuration>
+ <goals>
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties 2014-04-16 07:28:39.000000000 -0500
+@@ -8,5 +8,5 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
+-fragmentName = Proxy for Linux x86_64
++fragmentName = Proxy for FreeBSD x86_64
+ providerName = Eclipse.org
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/.project.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/.project 2014-04-16 07:28:03.000000000 -0500
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <projectDescription>
+- <name>org.eclipse.core.net.linux.x86_64</name>
++ <name>org.eclipse.core.net.freebsd.x86_64</name>
+ <comment></comment>
+ <projects>
+ </projects>
+--- ./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 @@
+ <relativePath>../../launcher-binary-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.equinox</groupId>
+- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
++ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.x86_64</artifactId>
+ <version>1.1.400-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <properties>
+- <os>linux</os>
++ <os>freebsd</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </properties>
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties.orig 2014-07-25 19:31:29.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties 2014-07-25 20:04:21.000000000 -0500
+@@ -8,5 +8,5 @@
+ # Contributors:
+ # IBM Corporation - initial API and implementation
+ ###############################################################################
+-pluginName = Equinox Launcher Linux X86_64 Fragment
++pluginName = Equinox Launcher FreeBSD X86_64 Fragment
+ providerName = Eclipse.org - Equinox
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project.orig 2014-04-15 21:32:54.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project 2014-04-16 07:51:09.000000000 -0500
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <projectDescription>
+- <name>org.eclipse.equinox.launcher.gtk.linux.x86_64</name>
++ <name>org.eclipse.equinox.launcher.gtk.freebsd.x86_64</name>
+ <comment></comment>
+ <projects>
+ </projects>
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties.orig 2014-07-25 19:35:37.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties 2014-07-25 20:07:49.000000000 -0500
+@@ -10,7 +10,7 @@
+ ###############################################################################
+ bin.includes = META-INF/,\
+- launcher.gtk.linux.x86_64.properties,\
++ launcher.gtk.freebsd.x86_64.properties,\
+ about.html
+
+ customBuildCallbacks=customBuildCallbacks.xml
+ generateSourceBundle=false
Added: head/java/eclipse/files/i386-patch-freebsd_natives
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/eclipse/files/i386-patch-freebsd_natives Thu Oct 6 20:05:06 2016 (r423439)
@@ -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 @@
+ <artifactId>eclipse.platform.resources</artifactId>
+ <groupId>eclipse.platform.resources</groupId>
+ <version>4.6.0-SNAPSHOT</version>
+- <relativePath>../../</relativePath>
++ <relativePath>../../../../</relativePath>
+ </parent>
+ <groupId>org.eclipse.core</groupId>
+- <artifactId>org.eclipse.core.filesystem.linux.x86</artifactId>
++ <artifactId>org.eclipse.core.filesystem.freebsd.x86</artifactId>
+ <version>1.4.200-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+@@ -33,7 +33,7 @@
+ <resolver>p2</resolver>
+ <environments>
+ <environment>
+- <os>linux</os>
++ <os>freebsd</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+@@ -50,7 +50,7 @@
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
+- <value>gtk.linux.x86</value>
++ <value>gtk.freebsd.x86</value>
+ </property>
+ </activation>
+ <build>
+@@ -63,12 +63,13 @@
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+- <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
+- <copy todir="os/linux/x86">
+- <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
+- <include name="libunixfile_*.so"/>
+- </fileset>
+- </copy>
++ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
++ <mkdir dir="os/freebsd/x86"/>
++ <copy todir="os/freebsd/x86">
++ <fileset dir="../../natives/unix/freebsd/">
++ <include name="libunixfile_*.so"/>
++ </fileset>
++ </copy>
+ </target>
+ </configuration>
+ <goals>
+--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500
++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties 2014-04-16 07: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 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <projectDescription>
+- <name>org.eclipse.core.filesystem.linux.x86</name>
++ <name>org.eclipse.core.filesystem.freebsd.x86</name>
+ <comment></comment>
+ <projects>
+ </projects>
+--- ./eclipse.platform.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 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<project name="org.eclipse.swt.gtk.linux.x86" default="build.jars" basedir=".">
++<project name="org.eclipse.swt.gtk.freebsd.x86" default="build.jars" basedir=".">
+
+ <property name="swt.ws" value="gtk" />
+- <property name="swt.os" value="linux" />
++ <property name="swt.os" value="freebsd" />
+ <property name="swt.arch" value="x86" />
+- <property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
++ <property name="targets" value="install"/>
+
+ <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
+ <property name="version.suffix" value="3.104.0" />
+--- ./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 @@
+ <relativePath>../binaries-parent/</relativePath>
+ </parent>
+ <groupId>org.eclipse.swt</groupId>
+- <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
++ <artifactId>org.eclipse.swt.gtk.freebsd.x86</artifactId>
+ <version>3.105.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <properties>
+- <os>linux</os>
++ <os>freebsd</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ <buildid>${buildId}</buildid>
+@@ -61,7 +61,7 @@
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
+- <value>gtk.linux.x86</value>
++ <value>gtk.freebsd.x86</value>
+ </property>
+ </activation>
+ <build>
+@@ -74,7 +74,7 @@
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+- <property name="machine_gtk3" value="1"/>
++ <!-- property name="machine_gtk3" value="1"/ -->
+ <property name="targets" value="install" />
+ <ant antfile="build.xml" target="build_libraries"/>
+ </target>
+--- ./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 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <projectDescription>
+- <name>org.eclipse.swt.gtk.linux.x86</name>
++ <name>org.eclipse.swt.gtk.freebsd.x86</name>
+ <comment></comment>
+ <projects>
+ </projects>
+--- ./eclipse.platform.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 @@
+ <relativePath>../../../../</relativePath>
+ </parent>
+ <groupId>org.eclipse.core</groupId>
+- <artifactId>org.eclipse.core.net.linux.x86</artifactId>
++ <artifactId>org.eclipse.core.net.freebsd.x86</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+@@ -31,7 +31,7 @@
+ <configuration>
+ <environments>
+ <environment>
+- <os>linux</os>
++ <os>freebsd</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+@@ -48,7 +48,7 @@
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
+- <value>gtk.linux.x86</value>
++ <value>gtk.freebsd.x86</value>
+ </property>
+ </activation>
+ <build>
+@@ -62,12 +62,12 @@
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+- <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
+- <copy todir=".">
+- <fileset dir="../../natives/unix/linux/">
+- <include name="libgnomeproxy-*.so"/>
+- </fileset>
+- </copy>
++ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
++ <copy todir=".">
++ <fileset dir="../../natives/unix/freebsd/">
++ <include name="libgnomeproxy-*.so"/>
++ </fileset>
++ </copy>
+ </target>
+ </configuration>
+ <goals>
+--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties.orig 2014-04-15 21:27:02.000000000 -0500
++++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties 2014-04-16 07: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 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <projectDescription>
+- <name>org.eclipse.core.net.linux.x86</name>
++ <name>org.eclipse.core.net.freebsd.x86</name>
+ <comment></comment>
+ <projects>
+ </projects>
+--- ./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 @@
+ <relativePath>../../launcher-binary-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.equinox</groupId>
+- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
++ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.x86</artifactId>
+ <version>1.1.400-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <properties>
+- <os>linux</os>
++ <os>freebsd</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </properties>
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties.orig 2014-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 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <projectDescription>
+- <name>org.eclipse.equinox.launcher.gtk.linux.x86</name>
++ <name>org.eclipse.equinox.launcher.gtk.freebsd.x86</name>
+ <comment></comment>
+ <projects>
+ </projects>
+--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties.orig 2014-07-25 19:35:37.000000000 -0500
++++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties 2014-07-25 20: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
Modified: head/java/eclipse/files/patch-aggregator
==============================================================================
--- head/java/eclipse/files/patch-aggregator Thu Oct 6 19:57:07 2016 (r423438)
+++ head/java/eclipse/files/patch-aggregator Thu Oct 6 20:05:06 2016 (r423439)
@@ -2,6 +2,15 @@ diff --git a/eclipse-platform-parent/pom
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.
+ -->
+- <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6RC2-201605191730/</eclipserun-repo>
++ <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.6/R-4.6-201606061100/</eclipserun-repo>
+
+ <comparator.repo>http://download.eclipse.org/eclipse/updates/4.6-I-builds</comparator.repo>
+
@@ -253,6 +253,11 @@
</target>
<environments>
@@ -17,13 +26,13 @@ index 71a6610..cc260cd 100644
@@ -480,13 +485,13 @@
<configuration>
<strictBinIncludes>false</strictBinIncludes>
- <format>'v'yyyyMMdd-HHmm</format>
+ <format>${qualifier.format}</format>
- <timestampProvider>jgit</timestampProvider>
+ <!-- timestampProvider>jgit</timestampProvider -->
<jgit.ignore>
pom.xml
</jgit.ignore>
- <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
+ <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
<sourceReferences>
- <generate>true</generate>
+ <generate>false</generate>
@@ -247,10 +256,10 @@ index a8a32d0..2ab8a62 100644
</build>
</project>
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 @@ index 29dfebb..2783e4e 100644
-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 @@ index 29dfebb..2783e4e 100644
-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 @@ index 29be78c..207a934 100644
</plugins>
</build>
-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 @@
- <module>platform.sdk</module>
- <module>sdk</module>
- <module>eclipse-junit-tests</module>
-- <module>eclipse.platform.repository</module>
-+ <!-- module>eclipse.platform.repository</module -->
+ <module>platform.sdk</module>
+ <module>sdk</module>
+- <module>eclipse-junit-tests</module>
++ <!-- module>eclipse-junit-tests</module -->
+- <module>eclipse.platform.repository</module>
++ <!-- module>eclipse.platform.repository</module -->
</modules>
</project>
Modified: head/java/eclipse/files/patch-freebsd_natives
==============================================================================
--- head/java/eclipse/files/patch-freebsd_natives Thu Oct 6 19:57:07 2016 (r423438)
+++ head/java/eclipse/files/patch-freebsd_natives Thu Oct 6 20:05:06 2016 (r423439)
@@ -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 @@
- <artifactId>eclipse.platform.resources</artifactId>
- <groupId>eclipse.platform.resources</groupId>
- <version>4.5.2-SNAPSHOT</version>
-- <relativePath>../../</relativePath>
-+ <relativePath>../../../../</relativePath>
- </parent>
- <groupId>org.eclipse.core</groupId>
-- <artifactId>org.eclipse.core.filesystem.linux.x86</artifactId>
-+ <artifactId>org.eclipse.core.filesystem.freebsd.x86</artifactId>
- <version>1.4.200-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
-@@ -33,7 +33,7 @@
- <resolver>p2</resolver>
- <environments>
- <environment>
-- <os>linux</os>
-+ <os>freebsd</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
-@@ -50,7 +50,7 @@
- <property>
- <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
- <name>native</name>
-- <value>gtk.linux.x86</value>
-+ <value>gtk.freebsd.x86</value>
- </property>
- </activation>
- <build>
-@@ -64,12 +64,13 @@
- <phase>process-resources</phase>
- <configuration>
- <target>
-- <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
-- <copy todir="os/linux/x86">
-- <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
-- <include name="libunixfile_*.so"/>
-- </fileset>
-- </copy>
-+ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
-+ <mkdir dir="os/freebsd/x86"/>
-+ <copy todir="os/freebsd/x86">
-+ <fileset dir="../../natives/unix/freebsd/">
-+ <include name="libunixfile_*.so"/>
-+ </fileset>
-+ </copy>
- </target>
- </configuration>
- <goals>
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties 2014-04-16 07:17:34.000000000 -0500
-@@ -8,5 +8,5 @@
- # Contributors:
- # IBM Corporation - initial API and implementation
- ###############################################################################
--fragmentName = Core File System for Linux
-+fragmentName = Core File System for FreeBSD
- providerName = Eclipse.org
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project 2014-04-16 07:16:45.000000000 -0500
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <projectDescription>
-- <name>org.eclipse.core.filesystem.linux.x86</name>
-+ <name>org.eclipse.core.filesystem.freebsd.x86</name>
- <comment></comment>
- <projects>
- </projects>
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:20:17.000000000 -0500
-@@ -1,9 +1,9 @@
- Manifest-Version: 1.0
- Bundle-ManifestVersion: 2
- Bundle-Name: %fragmentName
--Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true
-+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86_64; singleton:=true
- Bundle-Version: 1.2.200.qualifier
- Bundle-Vendor: %providerName
- Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
- Bundle-Localization: fragment
--Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
-+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 2014-04-16 07:19:54.000000000 -0500
-@@ -15,10 +15,10 @@
- <artifactId>eclipse.platform.resources</artifactId>
- <groupId>eclipse.platform.resources</groupId>
- <version>4.5.2-SNAPSHOT</version>
-- <relativePath>../../</relativePath>
-+ <relativePath>../../../../</relativePath>
- </parent>
- <groupId>org.eclipse.core</groupId>
-- <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId>
-+ <artifactId>org.eclipse.core.filesystem.freebsd.x86_64</artifactId>
- <version>1.2.200-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
-@@ -33,7 +33,7 @@
- <resolver>p2</resolver>
- <environments>
- <environment>
-- <os>linux</os>
-+ <os>freebsd</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
-@@ -50,7 +50,7 @@
- <property>
- <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
- <name>native</name>
-- <value>gtk.linux.x86_64</value>
-+ <value>gtk.freebsd.x86_64</value>
- </property>
- </activation>
- <build>
-@@ -64,13 +64,13 @@
- <phase>process-resources</phase>
- <configuration>
- <target>
-- <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
-- <mkdir dir="os/linux/x86_64/"/>
-- <copy todir="os/linux/x86_64/">
-- <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
-- <include name="libunixfile_*.so"/>
-- </fileset>
-- </copy>
-+ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
-+ <mkdir dir="os/freebsd/x86_64/"/>
-+ <copy todir="os/freebsd/x86_64/">
-+ <fileset dir="../../natives/unix/freebsd/">
-+ <include name="libunixfile_*.so"/>
-+ </fileset>
-+ </copy>
- </target>
- </configuration>
- <goals>
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties 2014-04-16 07:20:05.000000000 -0500
-@@ -8,5 +8,5 @@
- # Contributors:
- # IBM Corporation - initial API and implementation
- ###############################################################################
--fragmentName = Core File System for Linux
-+fragmentName = Core File System for FreeBSD
- providerName = Eclipse.org
---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project.orig 2014-04-15 21:04:15.000000000 -0500
-+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project 2014-04-16 07:19:20.000000000 -0500
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <projectDescription>
-- <name>org.eclipse.core.filesystem.linux.x86_64</name>
-+ <name>org.eclipse.core.filesystem.freebsd.x86_64</name>
- <comment></comment>
- <projects>
- </projects>
---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:26:16.000000000 -0500
-+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:31:38.000000000 -0500
-@@ -2,7 +2,7 @@
- Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
- Bundle-Name: %fragmentName
- Bundle-Vendor: %providerName
--Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true
-+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true
- Bundle-Version: 3.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))
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list