- Update to 7.0

  Release information: http://netbeans.org/community/releases/70/

1 files changed, 29 insertions, 31 deletions

diff --git a/java/netbeans/files/patch-platform-lib_nbexec b/java/netbeans/files/patch-platform-lib_nbexec
index adc8d29c7030..77560f5ebec4 100644
--- a/java/netbeans/files/patch-platform-lib_nbexec
+++ b/java/netbeans/files/patch-platform-lib_nbexec
@@ -1,25 +1,6 @@
---- platform/lib/nbexec.orig	2010-10-08 19:29:48.000000000 +0300
-+++ platform/lib/nbexec	2010-10-08 19:40:15.000000000 +0300
-@@ -153,15 +153,15 @@
-         Darwin*)
-         jdkhome="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
-         java_bin=`which java 2>&1`
--        if [ $? -ne 0 ] || [ -n "`echo \"$java_bin\" | grep \"no java in\"`" ] ; then
-+        if [ $? -ne 0 ] || [ -n "`echo \"$java_bin\" | %%GREP%% \"no java in\"`" ] ; then
-             # no java in path... strange
-             java_bin=/usr/bin/java
-         fi
-         if [ -f "$java_bin" ] ; then
-             java_version=`"$java_bin" -fullversion 2>&1`
--            if [ $? -eq 0 ] && [ -n "`echo \"$java_version\" | grep 1.6.0`" ] ; then
-+            if [ $? -eq 0 ] && [ -n "`echo \"$java_version\" | %%GREP%% 1.6.0`" ] ; then
-                 # don`t use Developer Preview versions
--                if [ -z "`echo \"$java_version\" | grep \"1.6.0_b\|1.6.0-b\|1.6.0_01\|1.6.0_04\|-dp\"`" ] ; then
-+                if [ -z "`echo \"$java_version\" | %%GREP%% \"1.6.0_b\|1.6.0-b\|1.6.0_01\|1.6.0_04\|-dp\"`" ] ; then
-                     if [ -f "/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/bin/java" ] ; then
-                         jdkhome="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home"
-                     elif [ -f "/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/bin/java" ] ; then
-@@ -194,7 +194,7 @@
+--- platform/lib/nbexec.orig	2011-05-25 09:06:02.000000000 +0200
++++ platform/lib/nbexec	2011-05-25 09:11:16.000000000 +0200
+@@ -182,7 +182,7 @@
  # if heap dump on OOME is supported enable it
  if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError > /dev/null 2>&1 ; then
     jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError"
@@ -28,16 +9,16 @@
        jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\""
     fi
  fi
-@@ -213,7 +213,7 @@
+@@ -201,7 +201,7 @@
          if [ "`echo "${dir}"/*.$ex`" != "${dir}/*.$ex" ] ; then
              for x in "${dir}"/*.$ex ; do
                  subx=`basename "$x"`
 -                if echo "$paths" | fgrep -v "$subpath$subx" > /dev/null ; then
-+                if echo "$paths" | %%FGREP%% -v "$subpath$subx" > /dev/null ; then
++                if echo "$paths" | %%GREP%% -v "$subpath$subx" > /dev/null ; then
                      if [ ! -z "$cp" ] ; then cp="$cp:" ; fi
                      cp="$cp$x"
                      if [ ! -z "$paths" ] ; then paths="$paths:" ; fi
-@@ -357,7 +357,7 @@
+@@ -345,7 +345,7 @@
  }
  
  detect_gnome_proxy () {
@@ -46,7 +27,7 @@
      if [ -x  $gconftool ] ; then
          proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
          if [ "$proxy_mode" = "manual" ] ; then
-@@ -366,7 +366,7 @@
+@@ -354,7 +354,7 @@
              http_proxy_tmp=$http_proxy_host:$http_proxy_port
              http_non_proxy_hosts=`$gconftool --get /system/http_proxy/ignore_hosts 2>/dev/null`
              if [ $? ] ; then
@@ -55,7 +36,7 @@
              fi
              socks_proxy_host=`$gconftool --get /system/proxy/socks_host 2>/dev/null`
              socks_proxy_port=`$gconftool --get /system/proxy/socks_port 2>/dev/null`
-@@ -389,18 +389,18 @@
+@@ -386,26 +386,26 @@
  detect_kde_proxy () {
      kioslaverc="${HOME}/.kde/share/config/kioslaverc"
      if [ -f $kioslaverc ] ; then
@@ -80,13 +61,30 @@
                  detect_system_proxy
                  if [ -z "$http_proxy_tmp" ]; then
                      http_proxy_tmp="DIRECT"
-@@ -424,14 +424,14 @@
+                 fi
+                 return 0
+             else
+-                if /bin/grep 'ProxyType=2' "$kioslaverc" >/dev/null 2>&1; then
+-                    pac_file=`grep "Proxy Config Script=" $kioslaverc  | cut -f 2 -d =`
++                if %%GREP%% 'ProxyType=2' "$kioslaverc" >/dev/null 2>&1; then
++                    pac_file=`%%GREP%% "Proxy Config Script=" $kioslaverc  | cut -f 2 -d =`
+                     http_proxy_tmp="PAC "$pac_file
+                     return 0
+                 fi
+@@ -427,9 +427,9 @@
  close
  EOF
  
 -    if /usr/bin/grep "ProxyAuto.*: *1" ${scutil_out} >/dev/null 2>&1; then
+-        if  /usr/bin/grep "ProxyAutoConfigEnable.*: *1" ${scutil_out} >/dev/null 2>&1; then
+-            http_proxy_tmp="PAC `/usr/bin/grep ProxyAutoConfigURLString ${scutil_out} | /usr/bin/awk '{print $3}'`"
 +    if %%GREP%% "ProxyAuto.*: *1" ${scutil_out} >/dev/null 2>&1; then
-         rm ${scutil_out}
++        if  %%GREP%% "ProxyAutoConfigEnable.*: *1" ${scutil_out} >/dev/null 2>&1; then
++            http_proxy_tmp="PAC `%%GREP%% ProxyAutoConfigURLString ${scutil_out} | /usr/bin/awk '{print $3}'`"
+             rm ${scutil_out}
+             return 0
+         fi
+@@ -438,9 +438,9 @@
          return 1
      fi
  
@@ -94,8 +92,8 @@
 -	http_proxy_host=`/usr/bin/grep HTTPProxy ${scutil_out} | /usr/bin/awk '{print $3}'`
 -	http_proxy_port=`/usr/bin/grep HTTPPort ${scutil_out} | /usr/bin/awk '{print $3} '`
 +    if %%GREP%% "HTTPEnable *: *1" ${scutil_out} >/dev/null 2>&1; then
-+	http_proxy_host=`%%GREP%% HTTPProxy ${scutil_out} | %%AWK%% '{print $3}'`
-+	http_proxy_port=`%%GREP%% HTTPPort ${scutil_out} | %%AWK%% '{print $3} '`
++	http_proxy_host=`%%GREP%% HTTPProxy ${scutil_out} | /usr/bin/awk '{print $3}'`
++	http_proxy_port=`%%GREP%% HTTPPort ${scutil_out} | /usr/bin/awk '{print $3} '`
          http_proxy_tmp=$http_proxy_host:$http_proxy_port
          rm ${scutil_out}
          return 0