++
+
+
+
+@@ -252,7 +250,7 @@
+
+
+
+-
++
+
+
+
Index: eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java
--- eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java 16 Feb 2009 04:21:49 -0000
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2008-08-09 09:17:56.822774634 -0400
-+++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2008-08-09 09:17:33.922680697 -0400
+--- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2009-02-15 19:26:27.391641089 -0500
++++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2009-02-15 20:39:45.324834833 -0500
@@ -204,6 +204,17 @@
public static final String OS_LINUX = "linux";//$NON-NLS-1$
@@ -18,12 +18,3 @@
* Constant string (value "aix") indicating the platform is running on an
* AIX-based operating system.
*
-@@ -329,7 +340,7 @@
- * @deprecated use ARCH_X86_64
instead. Note the values
- * has been changed to be the value of the ARCH_X86_64
constant.
- */
-- public static final String ARCH_AMD64 = ARCH_X86_64;
-+ public static final String ARCH_AMD64 = "amd64";//$NON-NLS-1$
-
- /**
- * Constant string (value "ia64") indicating the platform is running on an
Index: eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java
--- eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java 16 Feb 2009 03:58:57 -0000
@@ -18,13 +18,3 @@
if (osName.equalsIgnoreCase(Constants.INTERNAL_OS_QNX))
return Constants.OS_QNX;
if (osName.equalsIgnoreCase(Constants.INTERNAL_OS_AIX))
-@@ -334,9 +338,6 @@
- // Map i386 architecture to x86
- if (name.equalsIgnoreCase(Constants.INTERNAL_ARCH_I386))
- return Constants.ARCH_X86;
-- // Map amd64 architecture to x86_64
-- else if (name.equalsIgnoreCase(Constants.INTERNAL_AMD64))
-- return Constants.ARCH_X86_64;
-
- return name;
- }
Index: eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java
===================================================================
RCS file: eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java
diff -N eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java
--- eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java 15 Feb 2009 03:19:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
---- plugins/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java.orig 2008-08-09 14:32:49.360935838 -0400
-+++ plugins/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java 2008-08-09 14:32:30.730855758 -0400
-@@ -209,9 +209,6 @@
- // Map i386 architecture to x86
- if (name.equalsIgnoreCase(INTERNAL_ARCH_I386))
- arch = org.eclipse.osgi.service.environment.Constants.ARCH_X86;
-- // Map amd64 architecture to x86_64
-- else if (name.equalsIgnoreCase(INTERNAL_AMD64))
-- arch = org.eclipse.osgi.service.environment.Constants.ARCH_X86_64;
- else
- arch = name;
- platformProperties.setProperty("osgi.arch", arch); //$NON-NLS-1$
Index: eclipse/files/patch-plugins-org.eclipse.osgi-build.xml
===================================================================
RCS file: eclipse/files/patch-plugins-org.eclipse.osgi-build.xml
diff -N eclipse/files/patch-plugins-org.eclipse.osgi-build.xml
--- eclipse/files/patch-plugins-org.eclipse.osgi-build.xml 15 Feb 2009 03:19:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
---- plugins/org.eclipse.osgi/build.xml.orig 2008-09-29 19:38:37.000000000 -0400
-+++ plugins/org.eclipse.osgi/build.xml 2008-09-29 19:39:37.000000000 -0400
-@@ -16,7 +16,13 @@
-
-
-
--
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -37,6 +43,7 @@
-
-
-
-+
-
-
-
Index: eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java
--- eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java 16 Feb 2009 03:58:57 -0000
@@ -5,7 +5,7 @@
if ("iw".equals(lang) || "he".equals(lang) || "ar".equals(lang) || "fa".equals(lang) || "ur".equals(lang)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
- if (osName.startsWith("windows") || osName.startsWith("linux")) { //$NON-NLS-1$ //$NON-NLS-2$
-+ if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("freebsd")) { //$NON-NLS-1$ //$NON-NLS-2$
++ if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("freebsd")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
IS_PROCESSING_NEEDED = true;
}
}
Index: eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java
--- eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java 16 Feb 2009 04:22:29 -0000
@@ -1,5 +1,5 @@
---- ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java.orig 2008-08-08 23:54:36.137941647 -0400
-+++ ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java 2008-08-08 23:52:33.527433817 -0400
+--- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java.orig 2009-02-15 19:25:53.501501141 -0500
++++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java 2009-02-15 20:52:03.177887665 -0500
@@ -33,6 +33,7 @@
// this internally to be Solaris.
private static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$
@@ -8,27 +8,7 @@
private static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$
private static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$
private static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$
-@@ -41,9 +42,6 @@
- // While we recognize the i386 architecture, we change
- // this internally to be x86.
- private static final String INTERNAL_ARCH_I386 = "i386"; //$NON-NLS-1$
-- // While we recognize the amd64 architecture, we change
-- // this internally to be x86_64.
-- private static final String INTERNAL_AMD64 = "amd64"; //$NON-NLS-1$
-
- private EclipseEnvironmentInfo() {
- super();
-@@ -159,9 +157,6 @@
- // Map i386 architecture to x86
- if (name.equalsIgnoreCase(INTERNAL_ARCH_I386))
- arch = Constants.ARCH_X86;
-- // Map amd64 architecture to x86_64
-- else if (name.equalsIgnoreCase(INTERNAL_AMD64))
-- arch = Constants.ARCH_X86_64;
- else
- arch = name;
- FrameworkProperties.setProperty("osgi.arch", arch); //$NON-NLS-1$
-@@ -189,6 +184,8 @@
+@@ -189,6 +190,8 @@
return Constants.WS_WIN32;
if (os.equals(Constants.OS_LINUX))
return Constants.WS_GTK;
@@ -37,7 +17,7 @@
if (os.equals(Constants.OS_MACOSX))
return Constants.WS_CARBON;
if (os.equals(Constants.OS_HPUX))
-@@ -212,6 +209,8 @@
+@@ -212,6 +215,8 @@
return Constants.OS_SOLARIS;
if (osName.equalsIgnoreCase(INTERNAL_OS_LINUX))
return Constants.OS_LINUX;
Index: eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java
--- eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java 16 Feb 2009 03:58:57 -0000
@@ -13,12 +13,3 @@
* Constant string (value "aix") indicating the platform is running on an
* AIX-based operating system.
*/
-@@ -115,7 +121,7 @@
- * @deprecated use ARCH_X86_64
instead. Note the values
- * has been changed to be the value of the ARCH_X86_64
constant.
- */
-- public static final String ARCH_AMD64 = ARCH_X86_64;
-+ public static final String ARCH_AMD64 = "amd64";//$NON-NLS-1$
-
- /**
- * Constant string (value "ia64") indicating the platform is running on an
Index: eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml
===================================================================
RCS file: eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml
diff -N eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml 16 Feb 2009 04:22:52 -0000
@@ -0,0 +1,23 @@
+--- plugins/org.eclipse.pde.build/build.xml.orig 2009-02-15 14:54:04.518255168 -0500
++++ plugins/org.eclipse.pde.build/build.xml 2009-02-15 14:53:17.438264370 -0500
+@@ -26,14 +26,14 @@
+
+
+
+-
+-
++
++
+
+-
+-
++
++
+
+-
+-
++
++
+
+
+
Index: eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml
--- eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml 16 Feb 2009 03:58:57 -0000
@@ -11,9 +11,9 @@
+
+
+
-+
++
+
-+
++
+
+
Index: eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties
--- eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties 16 Feb 2009 03:58:57 -0000
@@ -5,7 +5,7 @@
# linux, gtk, x86_64 & \
# linux, motif, x86 & \
+# freebsd, gtk, x86 & \
-+# freebsd, gtk, amd64 & \
++# freebsd, gtk, x86_64 & \
# solaris, motif, sparc & \
# solaris, gtk, sparc & \
# aix, motif, ppc & \
@@ -14,7 +14,7 @@
# linux, gtk, x86_64 - antZip& \
# linux, motif, x86 - antZip& \
+# freebsd, gtk, x86 - antZip & \
-+# freebsd, gtk, amd64 - antZip & \
++# freebsd, gtk, x86_64 - antZip & \
# solaris, motif, sparc - antZip& \
# solaris, gtk, sparc - antZip& \
# aix, motif, ppc - antZip& \
Index: eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml
--- eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml 16 Feb 2009 03:58:57 -0000
@@ -18,9 +18,9 @@
+
-+
++
+
-+
++
+
+
Index: eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties
--- eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties 16 Feb 2009 03:58:57 -0000
@@ -5,7 +5,7 @@
# linux, gtk, x86_64 & \
# linux, motif, x86 & \
+# freebsd, gtk, x86 & \
-+# freebsd, gtk, amd64 & \
++# freebsd, gtk, x86_64 & \
# solaris, motif, sparc & \
# solaris, gtk, sparc & \
# aix, motif, ppc & \
@@ -14,7 +14,7 @@
# linux, gtk, x86_64 - antZip& \
# linux, motif, x86 - antZip& \
+# freebsd, gtk, x86 - antZip& \
-+# freebsd, gtk, amd64 - antZip& \
++# freebsd, gtk, x86_64 - antZip& \
# solaris, motif, sparc - antZip& \
# solaris, gtk, sparc - antZip& \
# aix, motif, ppc - antZip& \
Index: eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties
--- eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties 16 Feb 2009 03:58:57 -0000
@@ -5,7 +5,7 @@
root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
root.linux.gtk.ppc=eclipse
+root.freebsd.gtk.x86=eclipse,about_files/,about.html,icon.xpm
-+root.freebsd.gtk.amd64=eclipse,about_files/,about.html,icon.xpm
++root.freebsd.gtk.x86_64=eclipse,about_files/,about.html,icon.xpm
root.macosx.carbon.ppc=eclipse,Eclipse.app/
root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
root.aix.motif.ppc=eclipse
Index: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml
===================================================================
RCS file: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml
diff -N eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml
--- eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml 15 Feb 2009 03:19:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,64 +0,0 @@
---- plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig 2008-08-02 20:56:10.950055571 -0400
-+++ plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml 2008-08-02 20:58:39.830970324 -0400
-@@ -273,6 +273,9 @@
-
-
-
-+
-+
-+
-
-
-
-@@ -287,21 +290,27 @@
-
-
-
--
--
--
--
--
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-+
-+
-
-+
-+
-+
-+
-+
-+
-+
-
-
-
Index: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF
===================================================================
RCS file: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF
diff -N eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF
--- eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF 15 Feb 2009 03:19:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF.orig 2008-09-25 20:44:00.000000000 -0400
-+++ plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF 2008-09-25 20:46:29.000000000 -0400
-@@ -6,7 +6,6 @@
- Bundle-ManifestVersion: 2
- Bundle-Localization: fragment
- Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64.source
--Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x8
-- 6_64))
-+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))
- Bundle-Version: 3.4.1.v3449c
-
Index: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml
--- eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml 16 Feb 2009 04:26:44 -0000
@@ -1,30 +1,18 @@
---- plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2008-08-02 16:19:48.000000000 -0400
-+++ plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 2008-08-02 16:20:07.000000000 -0400
-@@ -142,12 +142,13 @@
-
-
-
--
--
-+
-+
-
-
+--- plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2009-02-15 09:49:28.812369523 -0500
++++ plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 2009-02-15 09:59:58.545568057 -0500
+@@ -149,13 +149,14 @@
-+
++
-@@ -156,9 +157,9 @@
+
+
-
--
-+
+-
++
+
--
-+
-
-
-
+
Index: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml
===================================================================
RCS file: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml
diff -N eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml 16 Feb 2009 04:23:31 -0000
@@ -0,0 +1,50 @@
+--- plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2009-02-15 09:36:21.377637363 -0500
++++ plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2009-02-15 10:02:04.923231253 -0500
+@@ -272,7 +272,12 @@
+
+
+
+-
++
++
++
++
++
++
+
+
+
+@@ -294,6 +299,7 @@
+
+
+
++
+
+
+
+@@ -302,21 +308,11 @@
+
+
+
+-
+-
+-
+-
+-
+-
++
++
++
++
+
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
Index: eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml
===================================================================
RCS file: eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml
diff -N eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml 16 Feb 2009 04:23:50 -0000
@@ -0,0 +1,11 @@
+--- plugins/org.eclipse.swt.tools/build.xml.orig 2009-02-15 08:51:01.911768069 -0500
++++ plugins/org.eclipse.swt.tools/build.xml 2009-02-15 08:51:54.966137634 -0500
+@@ -80,6 +80,8 @@
+
+
+
++
++
+
+
+
Index: eclipse/files/post-patch-packager-customTargets.xml
===================================================================
RCS file: eclipse/files/post-patch-packager-customTargets.xml
diff -N eclipse/files/post-patch-packager-customTargets.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ eclipse/files/post-patch-packager-customTargets.xml 24 Feb 2009 01:17:33 -0000
@@ -0,0 +1,11 @@
+--- packager/customTargets.xml.orig 2009-02-23 20:09:35.539631847 -0500
++++ packager/customTargets.xml 2009-02-22 10:21:35.186241128 -0500
+@@ -5,7 +5,7 @@
+
+
+-
++
+
+
+
Index: eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh,v
retrieving revision 1.1
diff -u -r1.1 post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh
--- eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh 15 Feb 2009 03:19:42 -0000 1.1
+++ eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh 16 Feb 2009 04:24:04 -0000
@@ -1,5 +1,5 @@
---- gtk/library/build.sh.orig 2008-09-11 21:18:02.725614374 -0400
-+++ gtk/library/build.sh 2008-09-11 21:18:07.455632295 -0400
+--- gtk/library/build.sh.orig 2009-02-15 12:44:50.966087957 -0500
++++ gtk/library/build.sh 2009-02-15 12:45:01.414490300 -0500
@@ -50,6 +50,10 @@
fi
fi
@@ -20,32 +20,28 @@
SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
export SWT_PTR_CFLAGS
if [ -d /lib64 ]; then
-@@ -74,47 +78,44 @@
+@@ -74,45 +78,36 @@
fi
fi
-if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
-- echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
++if [ x${MAKE_GNOME} = "xmake_gnome" -a x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
+ echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
- MAKE_GNOME=make_gnome
--else
-- echo "libgnome-2.0 and libgnomeui-2.0 not found:"
-- echo " *** SWT Program support for GNOME will not be compiled."
--fi
--
++ INTERNAL_MAKE_GNOME=make_gnome
+ else
+ echo "libgnome-2.0 and libgnomeui-2.0 not found:"
+ echo " *** SWT Program support for GNOME will not be compiled."
+ fi
+
-if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
-- echo "Cairo found, compiling SWT support for the cairo graphics library."
++if [ x${MAKE_CAIRO} = "xmake_cairo" -a x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
+ echo "Cairo found, compiling SWT support for the cairo graphics library."
- MAKE_CAIRO=make_cairo
--else
-- echo "Cairo not found:"
-- echo " *** Advanced graphics support using cairo will not be compiled."
-+if [ x${MAKE_GNOME} = "xmake_gnome" ]; then
-+ if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
-+ echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
-+ _MAKE_GNOME=make_gnome
-+ else
-+ echo "libgnome-2.0 and libgnomeui-2.0 not found:"
-+ echo " *** SWT Program support for GNOME will not be compiled."
-+ fi
++ INTERNAL_MAKE_CAIRO=make_cairo
+ else
+ echo "Cairo not found:"
+ echo " *** Advanced graphics support using cairo will not be compiled."
fi
-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
@@ -67,43 +63,31 @@
- export MOZILLA_INCLUDES
- export MOZILLA_LIBS
- MAKE_MOZILLA=make_mozilla
-+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then
-+ if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
-+ echo "Cairo found, compiling SWT support for the cairo graphics library."
-+ _MAKE_CAIRO=make_cairo
- else
+- else
- echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
- echo " *** Mozilla embedding support will not be compiled."
-+ echo "Cairo not found:"
-+ echo " *** Advanced graphics support using cairo will not be compiled."
- fi
- fi
-
-+if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then
-+ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
+- fi
++if [ x${MAKE_MOZILLA} = "xmake_mozilla" -a -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
+ case ${BROWSER} in
+ "firefox" | "mozilla" | "seamonkey" | "xulrunner")
+ MOZILLA_INCLUDES=`pkg-config --cflags ${BROWSER}-xpcom`
+ MOZILLA_LIBS=`pkg-config --libs ${BROWSER}-xpcom`
+ export MOZILLA_INCLUDES
+ export MOZILLA_LIBS
-+ _MAKE_MOZILLA=make_mozilla
++ INTERNAL_MAKE_MOZILLA=make_mozilla
+ ;;
+ *)
+ echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
+ echo " *** Mozilla embedding support will not be compiled."
-+ ;;
++ ;;
+ esac
-+ fi
-+fi
-+
+ fi
+
# Find AWT if available
- if [ -z "${AWT_LIB_PATH}" ]; then
- if [ -d ${JAVA_HOME}/jre/lib/${AWT_ARCH} ]; then
-@@ -142,5 +143,5 @@
+@@ -142,5 +137,5 @@
if [ "x${1}" = "xclean" ]; then
make -f $MAKEFILE clean
else
- make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
-+ make -f $MAKEFILE all $_MAKE_GNOME $_MAKE_CAIRO $MAKE_AWT $_MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
++ make -f $MAKEFILE all $INTERNAL_MAKE_GNOME $INTERNAL_MAKE_CAIRO $MAKE_AWT $INTERNAL_MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
fi
Index: eclipse/scripts/pre-patch
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/scripts/pre-patch,v
retrieving revision 1.6
diff -u -r1.6 pre-patch
--- eclipse/scripts/pre-patch 15 Feb 2009 03:19:44 -0000 1.6
+++ eclipse/scripts/pre-patch 16 Feb 2009 04:33:56 -0000
@@ -5,7 +5,7 @@
{
srcfile="$1"
dstfile="$2"
-
+
case $distfile in
*.zip)
#We may not want to push all files through sed echo "zip file"
@@ -13,7 +13,7 @@
;;
*)
rm -f $dstfile
- cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' > "$dstfile"
+ cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g' > "$dstfile"
;;
esac
}
@@ -31,9 +31,10 @@
find "$dstdir" -name \*.so -delete
find "$dstdir" -name \*.so.\* -delete
find "$dstdir" -type f -print0 | \
- xargs -0 sed -i '.bak' 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'
- find "$dstdir" -name \*.bak -delete
- fi
+ xargs -0 sed -i '.bak' 's/linux/freebsd/g; s/Linux/FreeBSD/g'
+ find "$dstdir" -name \*.bak -delete
+ find "$dstdir" -type d -name "linux" -delete
+ fi
}
prepare_files()
@@ -43,7 +44,7 @@
# Copy the files and rename/change them appropriately
for src in $COPY_LIST
do
- dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'`
+ dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g'`
echo Copying $src into $dst
if [ -d ${WRKSRC}/$src ]
then
@@ -55,14 +56,20 @@
# Files with spaces in their path...
src="${SWTGTK}/make_linux.mak"
- dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'`
+ dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g'`
echo Copying $src into $dst
copy_file "${WRKSRC}/$src" "${WRKSRC}/$dst"
+ # New x86_64 fragment
+ src="plugins/org.eclipse.core.net.freebsd.x86"
+ dst="plugins/org.eclipse.core.net.freebsd.x86_64"
+ echo Copying $src into $dst
+ copy_dir "${WRKSRC}/$src" "${WRKSRC}/$dst"
+
find ${WRKSRC} -name \*.so -delete
find ${WRKSRC} -name \*.so.\* -delete
}
-#features/org.eclipse.platform.launchers/library/gtk/make_linux.mak
+
COPY_LIST="
assemble.org.eclipse.sdk.linux.gtk.x86.xml
assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
@@ -104,4 +111,6 @@
SWTGTK="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
prepare_files
+
+
exit 0