From d19e312bf8209421bf68a8ce8b98de2e5722efa1 Mon Sep 17 00:00:00 2001
From: Palle Girgensohn <girgen@FreeBSD.org>
Date: Tue, 7 Nov 2006 11:04:47 +0000
Subject: Update to 3.1.1, which is compatibale with Eclipse 3.2.1

---
 java/eclipse-cdt/files/patch-cdt-feature.xml       | 14 ++--
 java/eclipse-cdt/files/patch-cdt.core-Makefile     |  6 +-
 java/eclipse-cdt/files/patch-cdt.core-fragment.xml | 23 ++-----
 java/eclipse-cdt/files/patch-cdt.core-openpty.c    |  4 +-
 .../files/patch-cdt.core.x86-fragment.xml          | 11 ----
 .../eclipse-cdt/files/patch-cdt.source-feature.xml | 14 ++--
 .../patch-managedbuilder.gnu-plugin.properties     | 16 ++---
 .../files/patch-managedbuilder.gnu-plugin.xml      | 76 +++++++++++-----------
 java/eclipse-cdt/files/patch-plugin.properties     |  4 +-
 java/eclipse-cdt/files/patch-source-fragment.xml   | 11 ----
 10 files changed, 74 insertions(+), 105 deletions(-)
 delete mode 100644 java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml
 delete mode 100644 java/eclipse-cdt/files/patch-source-fragment.xml

(limited to 'java/eclipse-cdt/files')

diff --git a/java/eclipse-cdt/files/patch-cdt-feature.xml b/java/eclipse-cdt/files/patch-cdt-feature.xml
index 6d7f78e500cf..5c6eacdaa55c 100644
--- a/java/eclipse-cdt/files/patch-cdt-feature.xml
+++ b/java/eclipse-cdt/files/patch-cdt-feature.xml
@@ -1,6 +1,6 @@
---- eclipse/features/org.eclipse.cdt_3.0.2/feature.xml.orig	Tue Mar 28 22:33:44 2006
-+++ eclipse/features/org.eclipse.cdt_3.0.2/feature.xml	Tue Mar 28 22:36:03 2006
-@@ -112,6 +112,14 @@
+--- eclipse/features/org.eclipse.cdt_3.1.1.200609270800/feature.xml.orig	Wed Sep 27 10:15:13 2006
++++ eclipse/features/org.eclipse.cdt_3.1.1.200609270800/feature.xml	Mon Nov  6 13:18:34 2006
+@@ -121,6 +121,14 @@
           fragment="true"/>
  
     <plugin
@@ -8,21 +8,21 @@
 +         os="freebsd"
 +         download-size="0"
 +         install-size="0"
-+         version="3.0.2"
++         version="3.1.1"
 +         fragment="true"/>
 +
 +   <plugin
           id="org.eclipse.cdt.core.qnx"
           os="qnx"
           download-size="0"
-@@ -197,6 +205,24 @@
+@@ -210,6 +218,24 @@
     <plugin
           id="org.eclipse.cdt.core.linux.x86"
           os="linux"
 +         arch="x86"
 +         download-size="0"
 +         install-size="0"
-+         version="3.0.2"
++         version="3.1.1"
 +         fragment="true"/>
 +
 +   <plugin
@@ -31,7 +31,7 @@
 +         arch="amd64"
 +         download-size="0"
 +         install-size="0"
-+         version="3.0.2"
++         version="3.1.1"
 +         fragment="true"/>
 +
 +   <plugin
diff --git a/java/eclipse-cdt/files/patch-cdt.core-Makefile b/java/eclipse-cdt/files/patch-cdt.core-Makefile
index 6b46f6004fdd..3dbd7439baae 100644
--- a/java/eclipse-cdt/files/patch-cdt.core-Makefile
+++ b/java/eclipse-cdt/files/patch-cdt.core-Makefile
@@ -1,5 +1,5 @@
---- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.0.2/src/org.eclipse.cdt.core.freebsd_3.0.2/library/Makefile.orig	Tue Mar 28 22:42:53 2006
-+++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.0.2/src/org.eclipse.cdt.core.freebsd_3.0.2/library/Makefile	Tue Mar 28 22:51:40 2006
+--- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.1.200609270800/src/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/library/Makefile.orig	Tue Mar 28 22:42:53 2006
++++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.1.200609270800/src/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/library/Makefile	Tue Mar 28 22:51:40 2006
 @@ -5,17 +5,17 @@
  endif
  
@@ -18,7 +18,7 @@
  CFLAGS +=-fpic -D_REENTRANT -D_GNU_SOURCE
  
 -INSTALL_DIR = ../../org.eclipse.cdt.core.linux.$(ARCH)/os/$(OS)/$(ARCH)
-+INSTALL_DIR = ../../../../org.eclipse.cdt.core.freebsd.$(ECLIPSE_ARCH)_${PORTVERSION}/os/$(ECLIPSE_OS)/$(ECLIPSE_ARCH)
++INSTALL_DIR = ../../../../org.eclipse.cdt.core.freebsd.$(ECLIPSE_ARCH)_${PORTVERSION_TS}/os/$(ECLIPSE_OS)/$(ECLIPSE_ARCH)
  
  LIB_NAME_SPAWNER = libspawner.so
  LIB_NAME_FULL_SPAWNER = $(INSTALL_DIR)/libspawner.so
diff --git a/java/eclipse-cdt/files/patch-cdt.core-fragment.xml b/java/eclipse-cdt/files/patch-cdt.core-fragment.xml
index 22b52de29d41..7b925a65ea1b 100644
--- a/java/eclipse-cdt/files/patch-cdt.core-fragment.xml
+++ b/java/eclipse-cdt/files/patch-cdt.core-fragment.xml
@@ -1,22 +1,13 @@
---- eclipse/plugins/org.eclipse.cdt.core.freebsd_3.0.2/fragment.xml.orig	Tue Mar 28 22:55:21 2006
-+++ eclipse/plugins/org.eclipse.cdt.core.freebsd_3.0.2/fragment.xml	Tue Mar 28 22:56:00 2006
-@@ -1,8 +1,8 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <?eclipse version="3.0"?>
- <fragment
--   id="org.eclipse.cdt.core.linux"
--   name="%fragmentName.linux"
-+   id="org.eclipse.cdt.core.freebsd"
-+   name="%fragmentName.freebsd"
-    version="3.0.2"
-    provider-name="%providerName"
-    plugin-id="org.eclipse.cdt.core"
-@@ -16,7 +16,7 @@
-    <extension
+--- eclipse/plugins/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/fragment.xml.orig	Mon Nov  6 13:53:49 2006
++++ eclipse/plugins/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/fragment.xml	Mon Nov  6 13:54:04 2006
+@@ -5,8 +5,8 @@
+     <extension
           point="org.eclipse.cdt.core.ProcessList">
        <processList
 -      		platform="linux"
+-            class="org.eclipse.cdt.internal.core.linux.ProcessList">
 +      		platform="freebsd"
-             class="org.eclipse.cdt.internal.core.linux.ProcessList">
++            class="org.eclipse.cdt.internal.core.freebsd.ProcessList">
        </processList>
     </extension>
+ </fragment>
diff --git a/java/eclipse-cdt/files/patch-cdt.core-openpty.c b/java/eclipse-cdt/files/patch-cdt.core-openpty.c
index 08ae30326bfc..829decdfdf52 100644
--- a/java/eclipse-cdt/files/patch-cdt.core-openpty.c
+++ b/java/eclipse-cdt/files/patch-cdt.core-openpty.c
@@ -1,5 +1,5 @@
---- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.0.2/src/org.eclipse.cdt.core.freebsd_3.0.2/library/openpty.c.orig	Thu Mar 30 19:18:06 2006
-+++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.0.2/src/org.eclipse.cdt.core.freebsd_3.0.2/library/openpty.c	Thu Mar 30 19:18:47 2006
+--- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.1.200609270800/src/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/library/openpty.c.orig	Thu Mar 30 19:18:06 2006
++++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.1.200609270800/src/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/library/openpty.c	Thu Mar 30 19:18:47 2006
 @@ -20,7 +20,6 @@
  #include <grp.h>
  
diff --git a/java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml b/java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml
deleted file mode 100644
index b9310ec7fd3a..000000000000
--- a/java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.2/fragment.xml.orig	Thu Mar 30 19:49:21 2006
-+++ eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.2/fragment.xml	Thu Mar 30 19:49:46 2006
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <?eclipse version="3.0"?>
- <fragment
--   id="org.eclipse.cdt.core.linux.x86"
-+   id="org.eclipse.cdt.core.freebsd.x86"
-    name="X86 Fragment"
-    version="3.0.2"
-    provider-name="Eclipse.org"
diff --git a/java/eclipse-cdt/files/patch-cdt.source-feature.xml b/java/eclipse-cdt/files/patch-cdt.source-feature.xml
index f20a9c2e63d2..1611e3c1d167 100644
--- a/java/eclipse-cdt/files/patch-cdt.source-feature.xml
+++ b/java/eclipse-cdt/files/patch-cdt.source-feature.xml
@@ -1,9 +1,9 @@
---- eclipse/features/org.eclipse.cdt.source_3.0.2/feature.xml.orig	Thu Mar 30 19:51:01 2006
-+++ eclipse/features/org.eclipse.cdt.source_3.0.2/feature.xml	Thu Mar 30 19:52:13 2006
+--- eclipse/features/org.eclipse.cdt.source_3.1.1.200609270800/feature.xml.orig	Thu Mar 30 19:51:01 2006
++++ eclipse/features/org.eclipse.cdt.source_3.1.1.200609270800/feature.xml	Thu Mar 30 19:52:13 2006
 @@ -22,4 +22,6 @@
- 	<plugin ws="win32"  os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.win32.win32.x86" version="3.0.2"/>
- 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.cdt.source.solaris.motif.sparc" version="3.0.2"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="x86_64" download-size="0" install-size="0" id="org.eclipse.cdt.source.linux.gtk.x86_64" version="3.0.2"/>
-+	<plugin ws="gtk"  os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.x86" version="3.0.2"/>
-+	<plugin ws="gtk"  os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.amd64" version="3.0.2"/>
+ 	<plugin ws="win32"  os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.win32.win32.x86" version="3.1.1"/>
+ 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.cdt.source.solaris.motif.sparc" version="3.1.1"/>
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="x86_64" download-size="0" install-size="0" id="org.eclipse.cdt.source.linux.gtk.x86_64" version="3.1.1"/>
++	<plugin ws="gtk"  os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.x86" version="3.1.1"/>
++	<plugin ws="gtk"  os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.amd64" version="3.1.1"/>
  </feature>
diff --git a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties
index 70da5d31c683..2fafe8c91148 100644
--- a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties
+++ b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties
@@ -1,13 +1,13 @@
---- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.2/plugin.properties.orig	Thu Mar 30 19:56:24 2006
-+++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.2/plugin.properties	Thu Mar 30 19:57:25 2006
-@@ -36,6 +36,10 @@
- TargetName.solaris.exe=Solaris Executable
- TargetName.solaris.so=Solaris Shared Library
- TargetName.solaris.lib=Solaris Static Library
+--- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.properties.orig	Mon Nov  6 14:44:11 2006
++++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.properties	Mon Nov  6 14:45:02 2006
+@@ -27,6 +27,10 @@
+ TargetName.solaris.exe=Executable (Gnu on Solaris)
+ TargetName.solaris.so=Shared Library (Gnu on Solaris)
+ TargetName.solaris.lib=Static Library (Gnu on Solaris)
 +TargetName.freebsd=FreeBSD
 +TargetName.freebsd.exe=FreeBSD Executable
 +TargetName.freebsd.so=FreeBSD Shared Library
 +TargetName.freebsd.lib=FreeBSD Static Library
  
- # Default Configuration Names
- ConfigName.Rel=Release
+ # No longer needed post-2.0
+ TargetName.cygw=Cygwin
diff --git a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml
index 77e64879709a..93cdcf15a91c 100644
--- a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml
+++ b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml
@@ -1,110 +1,110 @@
---- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.2/plugin.xml.orig	Thu Mar 30 20:02:27 2006
-+++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.2/plugin.xml	Thu Mar 30 20:05:59 2006
-@@ -1334,7 +1334,7 @@
+--- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.xml~	Mon Nov  6 14:38:36 2006
++++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.xml	Mon Nov  6 14:42:23 2006
+@@ -1317,7 +1317,7 @@
  			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser">
                 <toolChain
                       archList="all"
--                     osList="solaris,linux,hpux,aix,qnx"
-+                     osList="solaris,linux,hpux,aix,qnx,freebsd"
+-                     osList="linux,hpux,aix,qnx"
++                     osList="linux,hpux,aix,qnx,freebsd"
                       name="%ToolChainName.Dbg"
                       targetTool="cdt.managedbuild.tool.gnu.c.linker.exe.debug;cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"
                       scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
-@@ -1343,7 +1343,7 @@
+@@ -1326,7 +1326,7 @@
  		              id="cdt.managedbuild.target.gnu.platform.exe.debug"
  		              name="%PlatformName.Dbg"
  		              binaryParser="org.eclipse.cdt.core.ELF"
--		              osList="solaris,linux,hpux,aix,qnx"
-+		              osList="solaris,linux,hpux,aix,qnx,freebsd"
+-		              osList="linux,hpux,aix,qnx"
++		              osList="linux,hpux,aix,qnx,freebsd"
  		              archList="all">
  	              </targetPlatform>
  				  <builder
-@@ -1403,7 +1403,7 @@
+@@ -1386,7 +1386,7 @@
  			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser">               
                 <toolChain
                       archList="all"
--                     osList="solaris,linux,hpux,aix,qnx"
-+                     osList="solaris,linux,hpux,aix,qnx,freebsd"
+-                     osList="linux,hpux,aix,qnx"
++                     osList="linux,hpux,aix,qnx,freebsd"
                       name="%ToolChainName.Rel"
                       targetTool="cdt.managedbuild.tool.gnu.c.linker.exe.release;cdt.managedbuild.tool.gnu.cpp.linker.exe.release"
                       scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
-@@ -1412,7 +1412,7 @@
+@@ -1395,7 +1395,7 @@
  		              id="cdt.managedbuild.target.gnu.platform.exe.release"
  		              name="%PlatformName.Rel"		             
  		              binaryParser="org.eclipse.cdt.core.ELF"
--		              osList="solaris,linux,hpux,aix,qnx"
-+		              osList="solaris,linux,hpux,aix,qnx,freebsd"
+-		              osList="linux,hpux,aix,qnx"
++		              osList="linux,hpux,aix,qnx,freebsd"
  		              archList="all">		              
  		          </targetPlatform>
  				  <builder
-@@ -1480,7 +1480,7 @@
+@@ -1463,7 +1463,7 @@
                 id="cdt.managedbuild.config.gnu.so.debug">
                 <toolChain
                       archList="all"
--                     osList="solaris,linux,hpux,aix,qnx"
-+                     osList="solaris,linux,hpux,aix,qnx,freebsd"
+-                     osList="linux,hpux,aix,qnx"
++                     osList="linux,hpux,aix,qnx,freebsd"
                       name="%ToolChainName.Dbg"
                       targetTool="cdt.managedbuild.tool.gnu.c.linker.so.debug;cdt.managedbuild.tool.gnu.cpp.linker.so.debug"
                       scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
-@@ -1489,7 +1489,7 @@
+@@ -1472,7 +1472,7 @@
  		              id="cdt.managedbuild.target.gnu.platform.so.debug"
  		              name="%PlatformName.Dbg"
  		              binaryParser="org.eclipse.cdt.core.ELF"		            
--		              osList="solaris,linux,hpux,aix,qnx"
-+		              osList="solaris,linux,hpux,aix,qnx,freebsd"
+-		              osList="linux,hpux,aix,qnx"
++		              osList="linux,hpux,aix,qnx,freebsd"
  		              archList="all">
  		          </targetPlatform>
  				  <builder
-@@ -1574,7 +1574,7 @@
+@@ -1557,7 +1557,7 @@
                 id="cdt.managedbuild.config.gnu.so.release">
                 <toolChain
                       archList="all"
--                     osList="solaris,linux,hpux,aix,qnx"
-+                     osList="solaris,linux,hpux,aix,qnx,freebsd"
+-                     osList="linux,hpux,aix,qnx"
++                     osList="linux,hpux,aix,qnx,freebsd"
                       name="%ToolChainName.Rel"
                       targetTool="cdt.managedbuild.tool.gnu.c.linker.so.release;cdt.managedbuild.tool.gnu.cpp.linker.so.release"
                       scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
-@@ -1583,7 +1583,7 @@
+@@ -1566,7 +1566,7 @@
  		              id="cdt.managedbuild.target.gnu.platform.so.release"
  		              name="%PlatformName.Rel"
  		              binaryParser="org.eclipse.cdt.core.ELF"		            
--		              osList="solaris,linux,hpux,aix,qnx"
-+		              osList="solaris,linux,hpux,aix,qnx,freebsd"
+-		              osList="linux,hpux,aix,qnx"
++		              osList="linux,hpux,aix,qnx,freebsd"
  		              archList="all">
  		          </targetPlatform>
  				  <builder
-@@ -1675,7 +1675,7 @@
+@@ -1658,7 +1658,7 @@
  			   id="cdt.managedbuild.config.gnu.lib.debug">
                 <toolChain
                       archList="all"
--                     osList="solaris,linux,hpux,aix,qnx"
-+                     osList="solaris,linux,hpux,aix,qnx,freebsd"
+-                     osList="linux,hpux,aix,qnx"
++                     osList="linux,hpux,aix,qnx,freebsd"
                       name="%ToolChainName.Dbg"
                       targetTool="cdt.managedbuild.tool.gnu.archiver.lib.debug"
                       scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
-@@ -1684,7 +1684,7 @@
+@@ -1667,7 +1667,7 @@
  					  id="cdt.managedbuild.target.gnu.platform.lib.debug"
  				 	  name="%PlatformName.Dbg"
  					  binaryParser="org.eclipse.cdt.core.ELF"		            
--					  osList="solaris,linux,hpux,aix,qnx"
-+					  osList="solaris,linux,hpux,aix,qnx,freebsd"
+-					  osList="linux,hpux,aix,qnx"
++					  osList="linux,hpux,aix,qnx,freebsd"
  					  archList="all">
  				  </targetPlatform>
  			  	  <builder
-@@ -1741,7 +1741,7 @@
+@@ -1724,7 +1724,7 @@
                 id="cdt.managedbuild.config.gnu.lib.release">
                 <toolChain
                       archList="all"
--                     osList="solaris,linux,hpux,aix,qnx"
-+                     osList="solaris,linux,hpux,aix,qnx,freebsd"
+-                     osList="linux,hpux,aix,qnx"
++                     osList="linux,hpux,aix,qnx,freebsd"
                       name="%ToolChainName.Rel"
                       targetTool="cdt.managedbuild.tool.gnu.archiver.lib.release"
                       scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
-@@ -1750,7 +1750,7 @@
+@@ -1733,7 +1733,7 @@
  		              id="cdt.managedbuild.target.gnu.platform.lib.release"
  		              name="%PlatformName.Rel"
  		              binaryParser="org.eclipse.cdt.core.ELF"		            
--		              osList="solaris,linux,hpux,aix,qnx"
-+		              osList="solaris,linux,hpux,aix,qnx,freebsd"
+-		              osList="linux,hpux,aix,qnx"
++		              osList="linux,hpux,aix,qnx,freebsd"
  		              archList="all">
  		          </targetPlatform>
  				  <builder
diff --git a/java/eclipse-cdt/files/patch-plugin.properties b/java/eclipse-cdt/files/patch-plugin.properties
index aee4c5d9acdf..416ddd2cdffa 100644
--- a/java/eclipse-cdt/files/patch-plugin.properties
+++ b/java/eclipse-cdt/files/patch-plugin.properties
@@ -1,5 +1,5 @@
---- eclipse/plugins/org.eclipse.cdt.core_3.0.2/plugin.properties.orig	Thu Mar 30 20:15:52 2006
-+++ eclipse/plugins/org.eclipse.cdt.core_3.0.2/plugin.properties	Thu Mar 30 20:16:31 2006
+--- eclipse/plugins/org.eclipse.cdt.core_3.1.1.200609270800/plugin.properties.orig	Thu Mar 30 20:15:52 2006
++++ eclipse/plugins/org.eclipse.cdt.core_3.1.1.200609270800/plugin.properties	Thu Mar 30 20:16:31 2006
 @@ -56,6 +56,7 @@
  fragmentName.solaris = C/C++ Development Tools Core for Solaris
  fragmentName.win32 = C/C++ Development Tools Core for Windows
diff --git a/java/eclipse-cdt/files/patch-source-fragment.xml b/java/eclipse-cdt/files/patch-source-fragment.xml
deleted file mode 100644
index 00f667a43a65..000000000000
--- a/java/eclipse-cdt/files/patch-source-fragment.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.0.2/fragment.xml.orig	Thu Mar 30 20:17:30 2006
-+++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.0.2/fragment.xml	Thu Mar 30 20:17:52 2006
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <?eclipse version="3.0"?>
- <fragment
--   id="org.eclipse.cdt.source.linux.gtk.x86"
-+   id="org.eclipse.cdt.source.freebsd.gtk.x86"
-    name="%pluginName"
-    version="3.0.2"
-    provider-name="Eclipse.org"
-- 
cgit v1.2.3