- Update netbeans to version 8.0

  Release notes: https://netbeans.org/community/releases/80/relnotes.html
  New and noteworthy: http://wiki.netbeans.org/NewAndNoteworthyNB80
- IGNORE netbeans-devel

2 files changed, 14 insertions, 25 deletions

diff --git a/java/netbeans/files/patch-bin_netbeans b/java/netbeans/files/patch-bin_netbeans
index 504421655ad4..687609889341 100644
--- a/java/netbeans/files/patch-bin_netbeans
+++ b/java/netbeans/files/patch-bin_netbeans
@@ -1,13 +1,22 @@
---- bin/netbeans.orig	2013-10-11 15:56:12.000000000 +0200
-+++ bin/netbeans	2013-10-30 09:25:19.000000000 +0100
+--- bin/netbeans.orig	2014-03-10 17:32:04.000000000 +0100
++++ bin/netbeans	2014-04-11 09:48:06.000000000 +0200
+@@ -152,7 +152,7 @@
+ heap_size () {
+     mem=640
+     case "`uname`" in
+-        Linux*)
++    Linux*)
+         mem=`cat /proc/meminfo | grep MemTotal | tr -d [:space:][:alpha:]:`
+         mem=`expr $mem / 1024`
+         ;;
 @@ -163,6 +163,10 @@
          mem=`/usr/sbin/sysctl hw.memsize | tr -d [:alpha:][:space:].:`
          mem=`expr $mem / 1048576`
          ;;
 +    FreeBSD*)
-+		  mem=`/sbin/sysctl -n hw.realmem`
-+		  mem=`expr $mem / 1048576`
-+		  ;;
++        mem=`/sbin/sysctl -n hw.realmem`
++        mem=`expr $mem / 1048576`
++		;;
          *) 
          ;;
      esac
diff --git a/java/netbeans/files/patch-platform-lib_nbexec b/java/netbeans/files/patch-platform-lib_nbexec
deleted file mode 100644
index adbcbb99ff21..000000000000
--- a/java/netbeans/files/patch-platform-lib_nbexec
+++ /dev/null
@@ -1,20 +0,0 @@
---- platform/lib/nbexec.orig	2013-10-30 09:45:15.000000000 +0100
-+++ platform/lib/nbexec	2013-10-30 09:45:20.000000000 +0100
-@@ -213,7 +213,7 @@
- # if the Java option for heap dump on OOME is supported enable it
- if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError -cp "${progdir}/boot.jar" org.netbeans.NbExecJavaStartTry > /dev/null 2>&1 ; then
-    jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError"
--   if [ -z "`echo $jargs | grep -- "-XX:HeapDumpPath="`" ] ; then
-+   if [ -z "`echo $jargs | %%GREP%% -- "-XX:HeapDumpPath="`" ] ; then
-       jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\""
-    fi
-    # rename old heap dump to .old
-@@ -244,7 +244,7 @@
-         if [ "`echo "${dir}"/*.$ex`" != "${dir}/*.$ex" ] ; then
-             for x in "${dir}"/*.$ex ; do
-                 subx=`basename "$x"`
--                if [ -z "`echo "$paths" | egrep "$subpath$subx"`" ] ; then
-+                if [ -z "`echo "$paths" | %%GREP%% "$subpath$subx"`" ] ; then
-                     if [ ! -z "$cp" ] ; then cp="$cp:" ; fi
-                     cp="$cp$x"
-                     if [ ! -z "$paths" ] ; then paths="$paths:" ; fi