netbeans bumped to version 6.8_rc1

Package-Manager: portage-2.1.7.7/cvs/Linux x86_64

5 files changed, 4 insertions, 92 deletions

diff --git a/dev-util/netbeans/files/5.5-r2/jdbcstorage-build.xml-comments.patch b/dev-util/netbeans/files/5.5-r2/jdbcstorage-build.xml-comments.patch
deleted file mode 100644
index 500173aeb3cc..000000000000
--- a/dev-util/netbeans/files/5.5-r2/jdbcstorage-build.xml-comments.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur netbeans-src.old/mdr/extras/jdbcstorage/build.xml netbeans-src/mdr/extras/jdbcstorage/build.xml
---- netbeans-src.old/mdr/extras/jdbcstorage/build.xml	2006-12-06 23:46:13.000000000 +0200
-+++ netbeans-src/mdr/extras/jdbcstorage/build.xml	2006-12-06 23:53:28.000000000 +0200
-@@ -1,20 +1,22 @@
- <?xml version="1.0" encoding="UTF-8"?>
- 
--<!-- The contents of this file are subject to the terms of the Common Development
--<!-- and Distribution License (the License). You may not use this file except in
--<!-- compliance with the License.
-- 
--<!-- You can obtain a copy of the License at http://www.netbeans.org/cddl.html
--<!-- or http://www.netbeans.org/cddl.txt.
- <!-- 
--<!-- When distributing Covered Code, include this CDDL Header Notice in each file
--<!-- and include the License file at http://www.netbeans.org/cddl.txt.
--<!-- If applicable, add the following below the CDDL Header, with the fields
--<!-- enclosed by brackets [] replaced by your own identifying information:
--<!-- "Portions Copyrighted [year] [name of copyright owner]"
-+
-+The contents of this file are subject to the terms of the Common Development
-+and Distribution License (the License). You may not use this file except in 
-+compliance with the License. 
-+ 
-+You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-+or http://www.netbeans.org/cddl.txt. 
-+
-+When distributing Covered Code, include this CDDL Header Notice in each file
-+and include the License file at http://www.netbeans.org/cddl.txt.
-+If applicable, add the following below the CDDL Header, with the fields
-+enclosed by brackets [] replaced by your own identifying information:
-+"Portions Copyrighted [year] [name of copyright owner]"
-  
- The Original Software is NetBeans. The Initial Developer of the Original
--<!-- Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- Microsystems, Inc. All Rights Reserved.
- -->
- 
diff --git a/dev-util/netbeans/files/5.5-r2/jspparser-build.xml.patch b/dev-util/netbeans/files/5.5-r2/jspparser-build.xml.patch
deleted file mode 100644
index 1bcdc63c5dd1..000000000000
--- a/dev-util/netbeans/files/5.5-r2/jspparser-build.xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- netbeans-src.original/web/jspparser/build.xml	2007-04-27 22:15:13.000000000 +0200
-+++ netbeans-src/web/jspparser/build.xml	2007-04-27 23:06:41.000000000 +0200
-@@ -33,7 +33,7 @@
-     
-     <target name="ext-compile">
-         <mkdir dir="build/extclasses"/>
--        <javac srcdir="extsrc" destdir="build/extclasses" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.5">
-+        <javac srcdir="extsrc" destdir="build/extclasses" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.5" target="1.5">
-             <classpath>
-                 <path path="${module.classpath}"/>
-                 <path location="${cluster}/${module.jar}"/>
diff --git a/dev-util/netbeans/files/5.5-r2/mdrant-build.xml-comments.patch b/dev-util/netbeans/files/5.5-r2/mdrant-build.xml-comments.patch
deleted file mode 100644
index 36e9ad19aa8a..000000000000
--- a/dev-util/netbeans/files/5.5-r2/mdrant-build.xml-comments.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur netbeans-src.old/mdr/extras/mdrant/build.xml netbeans-src/mdr/extras/mdrant/build.xml
---- netbeans-src.old/mdr/extras/mdrant/build.xml	2006-12-07 00:14:08.000000000 +0200
-+++ netbeans-src/mdr/extras/mdrant/build.xml	2006-12-07 00:18:35.000000000 +0200
-@@ -1,20 +1,21 @@
- <?xml version="1.0" encoding="UTF-8"?>
- 
--<!-- The contents of this file are subject to the terms of the Common Development
--<!-- and Distribution License (the License). You may not use this file except in
--<!-- compliance with the License.
-- 
--<!-- You can obtain a copy of the License at http://www.netbeans.org/cddl.html
--<!-- or http://www.netbeans.org/cddl.txt.
- <!-- 
--<!-- When distributing Covered Code, include this CDDL Header Notice in each file
--<!-- and include the License file at http://www.netbeans.org/cddl.txt.
--<!-- If applicable, add the following below the CDDL Header, with the fields
--<!-- enclosed by brackets [] replaced by your own identifying information:
--<!-- "Portions Copyrighted [year] [name of copyright owner]"
-+The contents of this file are subject to the terms of the Common Development
-+and Distribution License (the License). You may not use this file except in
-+compliance with the License.
-+ 
-+You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-+or http://www.netbeans.org/cddl.txt.
-+ 
-+When distributing Covered Code, include this CDDL Header Notice in each file
-+and include the License file at http://www.netbeans.org/cddl.txt.
-+If applicable, add the following below the CDDL Header, with the fields
-+enclosed by brackets [] replaced by your own identifying information:
-+"Portions Copyrighted [year] [name of copyright owner]"
-  
- The Original Software is NetBeans. The Initial Developer of the Original
--<!-- Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- Microsystems, Inc. All Rights Reserved.
- -->
- 
diff --git a/dev-util/netbeans/files/5.5-r2/startscript.sh b/dev-util/netbeans/files/5.5-r2/startscript.sh
deleted file mode 100644
index 974bfc8e23db..000000000000
--- a/dev-util/netbeans/files/5.5-r2/startscript.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/usr/share/netbeans-5.5/bin/netbeans "$@"
diff --git a/dev-util/netbeans/files/6.8/nbbuild_templates_projectized.xml.patch b/dev-util/netbeans/files/6.8/nbbuild_templates_projectized.xml.patch
index 672446577b3b..3387c1399cb8 100644
--- a/dev-util/netbeans/files/6.8/nbbuild_templates_projectized.xml.patch
+++ b/dev-util/netbeans/files/6.8/nbbuild_templates_projectized.xml.patch
@@ -1,9 +1,9 @@
---- nbbuild/templates/projectized.xml.orig	2009-04-30 11:09:18.049017661 +0200
-+++ nbbuild/templates/projectized.xml	2009-04-30 11:09:29.295016465 +0200
-@@ -71,12 +71,6 @@
+--- nbbuild/templates/projectized.xml.orig	2009-11-28 12:38:34.000000000 +0100
++++ nbbuild/templates/projectized.xml	2009-11-28 12:39:09.000000000 +0100
+@@ -81,12 +81,6 @@
      </target>
  
-     <target name="build-init" depends="basic-init,jdk-5-check">
+     <target name="build-init" depends="basic-init,jdk-5-check,set-buildnumber">
 -        <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="${nb_all}/nbbuild/nbantext.jar"/>
 -        <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
 -            <manifest dir=".">