1 files changed, 17 insertions, 17 deletions

diff --git a/java/netbeans/files/patch-platform11-lib_nbexec b/java/netbeans/files/patch-platform-lib_nbexec
index ce1f32d0e3fc..adc8d29c7030 100644
--- a/java/netbeans/files/patch-platform11-lib_nbexec
+++ b/java/netbeans/files/patch-platform-lib_nbexec
@@ -1,6 +1,6 @@
---- platform11/lib/nbexec.orig	2009-12-14 09:28:56.000000000 +0100
-+++ platform11/lib/nbexec	2009-12-14 09:36:27.000000000 +0100
-@@ -150,15 +150,15 @@
+--- 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`
@@ -19,7 +19,7 @@
                      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
-@@ -191,7 +191,7 @@
+@@ -194,7 +194,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,7 +28,7 @@
        jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\""
     fi
  fi
-@@ -210,7 +210,7 @@
+@@ -213,7 +213,7 @@
          if [ "`echo "${dir}"/*.$ex`" != "${dir}/*.$ex" ] ; then
              for x in "${dir}"/*.$ex ; do
                  subx=`basename "$x"`
@@ -37,7 +37,7 @@
                      if [ ! -z "$cp" ] ; then cp="$cp:" ; fi
                      cp="$cp$x"
                      if [ ! -z "$paths" ] ; then paths="$paths:" ; fi
-@@ -351,7 +351,7 @@
+@@ -357,7 +357,7 @@
  }
  
  detect_gnome_proxy () {
@@ -46,7 +46,7 @@
      if [ -x  $gconftool ] ; then
          proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
          if [ "$proxy_mode" = "manual" ] ; then
-@@ -360,7 +360,7 @@
+@@ -366,7 +366,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,13 +55,13 @@
              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`
-@@ -383,18 +383,18 @@
+@@ -389,18 +389,18 @@
  detect_kde_proxy () {
      kioslaverc="${HOME}/.kde/share/config/kioslaverc"
      if [ -f $kioslaverc ] ; then
--        if /bin/grep -q 'ProxyType=1' "$kioslaverc" ; then
+-        if /bin/grep 'ProxyType=1' "$kioslaverc" >/dev/null 2>&1; then
 -            http_proxy_tmp=`/bin/grep 'httpProxy=http://' "$kioslaverc"`
-+        if %%GREP%% -q 'ProxyType=1' "$kioslaverc" ; then
++        if %%GREP%% 'ProxyType=1' "$kioslaverc" >/dev/null 2>&1; then
 +            http_proxy_tmp=`%%GREP%% 'httpProxy=http://' "$kioslaverc"`
              if [ $? ] ; then
 -                http_proxy_tmp=`echo $http_proxy_tmp | /bin/sed 's/httpProxy=http:\/\///'`
@@ -75,25 +75,25 @@
 +                http_non_proxy_hosts=`echo $http_non_proxy_hosts | %%SED%% 's/NoProxyFor=//'`
              fi
          else
--            if /bin/grep -q 'ProxyType=0' "$kioslaverc" ; then
-+            if %%GREP%%-q 'ProxyType=0' "$kioslaverc" ; then
+-            if /bin/grep 'ProxyType=0' "$kioslaverc" >/dev/null 2>&1; then
++            if %%GREP%% 'ProxyType=0' "$kioslaverc" >/dev/null 2>&1; then
                  detect_system_proxy
                  if [ -z "$http_proxy_tmp" ]; then
                      http_proxy_tmp="DIRECT"
-@@ -418,14 +418,14 @@
+@@ -424,14 +424,14 @@
  close
  EOF
  
--    if /usr/bin/grep -q "ProxyAuto.*: *1" ${scutil_out} >/dev/null ; then
-+    if %%GREP%% -q "ProxyAuto.*: *1" ${scutil_out} >/dev/null ; then
+-    if /usr/bin/grep "ProxyAuto.*: *1" ${scutil_out} >/dev/null 2>&1; then
++    if %%GREP%% "ProxyAuto.*: *1" ${scutil_out} >/dev/null 2>&1; then
          rm ${scutil_out}
          return 1
      fi
  
--    if /usr/bin/grep -q "HTTPEnable *: *1" ${scutil_out} ; then
+-    if /usr/bin/grep "HTTPEnable *: *1" ${scutil_out} >/dev/null 2>&1; then
 -	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%% -q "HTTPEnable *: *1" ${scutil_out} ; then
++    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_tmp=$http_proxy_host:$http_proxy_port