From 694b9167b2dacae57f19cfcb637afb2dfb6f7367 Mon Sep 17 00:00:00 2001
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Wed, 14 May 2008 21:16:57 +0000
Subject: Upgrade to version 6.1.

---
 java/netbeans/files/patch-platform7_lib_nbexec | 56 --------------------------
 java/netbeans/files/patch-platform8_lib_nbexec | 56 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 56 deletions(-)
 delete mode 100644 java/netbeans/files/patch-platform7_lib_nbexec
 create mode 100644 java/netbeans/files/patch-platform8_lib_nbexec

(limited to 'java/netbeans/files')

diff --git a/java/netbeans/files/patch-platform7_lib_nbexec b/java/netbeans/files/patch-platform7_lib_nbexec
deleted file mode 100644
index 2c73cee9eabc..000000000000
--- a/java/netbeans/files/patch-platform7_lib_nbexec
+++ /dev/null
@@ -1,56 +0,0 @@
-
-$FreeBSD$
-
---- platform7/lib/nbexec.orig
-+++ platform7/lib/nbexec
-@@ -253,7 +253,7 @@
- # detect system http proxy setting
- 
- detect_gnome_proxy () {
--    gconftool=/usr/bin/gconftool-2
-+    gconftool=%%GCONFTOOL%%
-     if [ -x  $gconftool ] ; then
-         proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
-         if [ "$proxy_mode" = "manual" ] ; then
-@@ -282,18 +282,18 @@
- detect_kde_proxy () {
-     kioslaverc="${HOME}/.kde/share/config/kioslaverc"
-     if [ -f $kioslaverc ] ; then
--        if /bin/grep -q 'ProxyType=1' "$kioslaverc" ; then
--            http_proxy_tmp=`/bin/grep 'httpProxy=http://' "$kioslaverc"`
-+        if %%GREP%% -q 'ProxyType=1' "$kioslaverc" ; then
-+            http_proxy_tmp=`%%GREP%% 'httpProxy=http://' "$kioslaverc"`
-             if [ $? ] ; then
-                 http_proxy_tmp=`echo $http_proxy_tmp | /bin/sed 's/httpProxy=http:\/\///'`
-                 return 0
-             fi
--            http_non_proxy_hosts=`/bin/grep 'NoProxyFor=' "$kioslaverc"`
-+            http_non_proxy_hosts=`%%GREP%% 'NoProxyFor=' "$kioslaverc"`
-             if [ $? ] ; then
-                 http_non_proxy_hosts=`echo $http_non_proxy_hosts | /bin/sed 's/NoProxyFor=//'`
-             fi
-         else
--            if /bin/grep -q 'ProxyType=0' "$kioslaverc" ; then
-+            if %%GREP%% -q 'ProxyType=0' "$kioslaverc" ; then
-                 http_proxy_tmp="DIRECT"
-                 return 0
-             fi
-@@ -314,14 +314,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
-         rm ${scutil_out}
-         return 1
-     fi
- 
--    if /usr/bin/grep -q "HTTPEnable *: *1" ${scutil_out} ; 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
-+	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
diff --git a/java/netbeans/files/patch-platform8_lib_nbexec b/java/netbeans/files/patch-platform8_lib_nbexec
new file mode 100644
index 000000000000..1a60b4a90ae2
--- /dev/null
+++ b/java/netbeans/files/patch-platform8_lib_nbexec
@@ -0,0 +1,56 @@
+
+$FreeBSD$
+
+--- platform8/lib/nbexec.orig
++++ platform8/lib/nbexec
+@@ -270,7 +270,7 @@
+ # detect system http proxy setting
+ 
+ detect_gnome_proxy () {
+-    gconftool=/usr/bin/gconftool-2
++    gconftool=%%GCONFTOOL%%
+     if [ -x  $gconftool ] ; then
+         proxy_mode=`$gconftool --get /system/proxy/mode 2>/dev/null`
+         if [ "$proxy_mode" = "manual" ] ; then
+@@ -299,18 +299,18 @@
+ detect_kde_proxy () {
+     kioslaverc="${HOME}/.kde/share/config/kioslaverc"
+     if [ -f $kioslaverc ] ; then
+-        if /bin/grep -q 'ProxyType=1' "$kioslaverc" ; then
+-            http_proxy_tmp=`/bin/grep 'httpProxy=http://' "$kioslaverc"`
++        if %%GREP%% -q 'ProxyType=1' "$kioslaverc" ; then
++            http_proxy_tmp=`%%GREP%% 'httpProxy=http://' "$kioslaverc"`
+             if [ $? ] ; then
+                 http_proxy_tmp=`echo $http_proxy_tmp | /bin/sed 's/httpProxy=http:\/\///'`
+                 return 0
+             fi
+-            http_non_proxy_hosts=`/bin/grep 'NoProxyFor=' "$kioslaverc"`
++            http_non_proxy_hosts=`%%GREP%% 'NoProxyFor=' "$kioslaverc"`
+             if [ $? ] ; then
+                 http_non_proxy_hosts=`echo $http_non_proxy_hosts | /bin/sed 's/NoProxyFor=//'`
+             fi
+         else
+-            if /bin/grep -q 'ProxyType=0' "$kioslaverc" ; then
++            if %%GREP%% -q 'ProxyType=0' "$kioslaverc" ; then
+                 http_proxy_tmp="DIRECT"
+                 return 0
+             fi
+@@ -331,14 +331,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
+         rm ${scutil_out}
+         return 1
+     fi
+ 
+-    if /usr/bin/grep -q "HTTPEnable *: *1" ${scutil_out} ; 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
++	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
-- 
cgit v1.2.3