- Update to 1.5.0.53.38

PR:		ports/123759
Submitted by:	Jose Garcia Juanino <jjuanino@gmail.com>

5 files changed, 20 insertions, 106 deletions

diff --git a/databases/sqldeveloper/files/patch-ide_bin_launcher.sh b/databases/sqldeveloper/files/patch-ide_bin_launcher.sh
deleted file mode 100644
index a521dfeb8f57..000000000000
--- a/databases/sqldeveloper/files/patch-ide_bin_launcher.sh
+++ /dev/null
@@ -1,62 +0,0 @@
---- ide/bin/launcher.sh.orig	Tue Jan 15 21:35:22 2008
-+++ ide/bin/launcher.sh	Tue Jan 15 21:43:52 2008
-@@ -191,12 +191,12 @@
- #-----------------------------------------------------------------------------
- AddVMOption()
- {
--  NEWOPD=`expr "$1" : '[^\=]*\=\(.*\)'`
-+  NEWOPD=`expr -- "$1" : '[^\=]*\=\(.*\)'`
-   if [ "X$NEWOPD" != "X" ]
-   then
--    if [ "X`expr "$NEWOPD" : '.*\( \).*'`" != "X" ]
-+    if [ "X`expr -- "$NEWOPD" : '.*\( \).*'`" != "X" ]
-     then
--      NEWARG=`expr "$1" : '\([^\=]*\)\=.*'`
-+      NEWARG=`expr -- "$1" : '\([^\=]*\)\=.*'`
-       NEWARG="$NEWARG=\"$NEWOPD\""
-     else
-       NEWARG=$1
-@@ -329,15 +329,15 @@
-     while [ -h "$tmpvar" ]
-     do
-         tmpvar2=`ls -ls "$tmpvar"`
--        tmpvar2=`expr "$tmpvar2" : '.*-> \(.*\)$'`
--        if [ `expr "$tmpvar2" : "\.\/"` -gt 0 -o `expr "$tmpvar2" : "\.\.\/"` -gt 0 -o `expr "$tmpvar2" : ".*/.*"` -le 0 ]
-+        tmpvar2=`expr -- "$tmpvar2" : '.*-> \(.*\)$'`
-+        if [ `expr -- "$tmpvar2" : "\.\/"` -gt 0 -o `expr -- "$tmpvar2" : "\.\.\/"` -gt 0 -o `expr -- "$tmpvar2" : ".*/.*"` -le 0 ]
-         then
-           tmpvar="`dirname $tmpvar`/$tmpvar2"
-         else
-           tmpvar="$tmpvar2"
-         fi
-     done
--    tmpvar=`expr "$tmpvar" : '\(.*\)\/bin\/[^\/]*$'`
-+    tmpvar=`expr -- "$tmpvar" : '\(.*\)\/bin\/[^\/]*$'`
-     SetJavaHome "$tmpvar"
-   fi
- }
-@@ -610,8 +610,8 @@
-         case $1 in 
-           --*)
-             NEWARG=`echo $1 | sed -e s/--//g`
--            NEWOPD=`expr "$NEWARG" : '[^\=]*\=\(.*\)'`
--            NEWARG=`expr "$NEWARG" : '\([^\=]*\)\=.*'`
-+            NEWOPD=`expr -- "$NEWARG" : '[^\=]*\=\(.*\)'`
-+            NEWARG=`expr -- "$NEWARG" : '\([^\=]*\)\=.*'`
-             NEWARG=`echo $NEWARG | tr "[:upper:]" "[:lower:]"`
-             case $NEWARG in
-               setjavahome)         NEWARG="SetJavaHome" ;;
-@@ -697,11 +697,11 @@
-     if [ $? -gt 0 ]
-     then
-             s=`${JAVA} -version 2>&1`
--            if [ `expr "$s" : 'java version \"1\.[0-3]'` -gt 0 ]
-+            if [ `expr -- "$s" : 'java version \"1\.[0-3]'` -gt 0 ]
-             then
-                     echo "Error: `GetShortProductName` doesn't run with JDK version prior to 1.4.x" 
-             fi
--            if [ `expr "$s" : 'java version \"1\.[0-5].*\"'` -le 0 ]
-+            if [ `expr -- "$s" : 'java version \"1\.[0-5].*\"'` -le 0 ]
-             then
-                     echo "Error: `GetShortProductName` can't recognize the JDK version"
-             fi
diff --git a/databases/sqldeveloper/files/patch-sqlcli b/databases/sqldeveloper/files/patch-sqlcli
index 6396ee146908..b9a80590ea0e 100644
--- a/databases/sqldeveloper/files/patch-sqlcli
+++ b/databases/sqldeveloper/files/patch-sqlcli
@@ -1,5 +1,5 @@
---- sqlcli.orig	Wed Jan 16 09:44:47 2008
-+++ sqlcli	Wed Jan 16 09:45:32 2008
+--- sqlcli.orig	2008-04-21 08:33:48.000000000 +0200
++++ sqlcli	2008-05-15 11:44:13.000000000 +0200
 @@ -1,15 +1,15 @@
  #!/bin/bash
 -CP=jdbc/lib/ojdbc14.jar
diff --git a/databases/sqldeveloper/files/patch-sqldeveloper.sh b/databases/sqldeveloper/files/patch-sqldeveloper.sh
index c116da7aa044..18e10d8c3b67 100644
--- a/databases/sqldeveloper/files/patch-sqldeveloper.sh
+++ b/databases/sqldeveloper/files/patch-sqldeveloper.sh
@@ -1,6 +1,6 @@
---- sqldeveloper.sh.orig	Tue Jan 15 22:18:13 2008
-+++ sqldeveloper.sh	Tue Jan 15 22:18:30 2008
+--- sqldeveloper.sh.orig	2008-04-21 08:33:48.000000000 +0200
++++ sqldeveloper.sh	2008-05-15 12:02:13.000000000 +0200
 @@ -1,2 +1,2 @@
  #!/bin/bash
 -cd "`dirname $0`"/sqldeveloper/bin && bash sqldeveloper $*
-+cd %DATADIR%/sqldeveloper/bin && sh sqldeveloper $*
++cd %DATADIR%/sqldeveloper/bin && JAVA_HOME=%JAVA_HOME% bash sqldeveloper $*
diff --git a/databases/sqldeveloper/files/patch-sqldeveloper_bin_sqldeveloper b/databases/sqldeveloper/files/patch-sqldeveloper_bin_sqldeveloper
deleted file mode 100644
index 6e19e562949e..000000000000
--- a/databases/sqldeveloper/files/patch-sqldeveloper_bin_sqldeveloper
+++ /dev/null
@@ -1,22 +0,0 @@
---- sqldeveloper/bin/sqldeveloper.orig	Tue Jan 15 21:35:20 2008
-+++ sqldeveloper/bin/sqldeveloper	Tue Jan 15 21:44:22 2008
-@@ -19,7 +19,7 @@
-     local rawAbsPath
- 
-     #  Test if $arg starts with '/'.
--    if [ "X`expr \"${pathname}\" : '\(/\).*'`" = "X/" ]
-+    if [ "X`expr -- \"${pathname}\" : '\(/\).*'`" = "X/" ]
-     then
-     rawAbsPath="${pathname}"
-     else
-@@ -49,8 +49,8 @@
-     local pathname="$1"
-     while [ -h "$pathname" ] ; do
-         local ls=`ls -ld "$pathname"`
--        local link=`expr "$ls" : '.*-> \(.*\)$'`
--        if expr "$link" : '.*/.*' > /dev/null
-+        local link=`expr -- "$ls" : '.*-> \(.*\)$'`
-+        if expr -- "$link" : '.*/.*' > /dev/null
-         then
-             pathname="$link"
-         else
diff --git a/databases/sqldeveloper/files/pkg-message.in b/databases/sqldeveloper/files/pkg-message.in
index 30f2ec478b2e..bf3c9e8c2582 100644
--- a/databases/sqldeveloper/files/pkg-message.in
+++ b/databases/sqldeveloper/files/pkg-message.in
@@ -1,28 +1,26 @@
 ************************************************************************
 Note for ALL users:
 
-    The first time sqldeveloper is run, it shows a splash screen and a prompt
-    window behind, hidden. By mean of your window manager, grab the edge,
-    pull the window over (or move it), and answer the prompt as appropiate.
+    The first time this version of sqldeveloper is run, it shows a splash
+    screen and a hidden prompt window behind. By mean of your window manager,
+    grab the edge, pull the window over (or move it), and answer the prompt as
+    appropiate.
 
 
 Note for Oracle users:
 
     In order to connect in a simple way to an Oracle database, it is needed to
-    set ORACLE_HOME environment variable and then locate in
-    $ORACLE_HOME/network/admin a valid tnsnames.ora services file. After that
-    choose "TNS" as "Connection Type" when you are going to add a new
-    connection database.
+    set ORACLE_HOME environment variable and then locate in a
+    $ORACLE_HOME/network/admin/ folder a valid tnsnames.ora services file.
+    After that choose "TNS" as "Connection Type" when you are going to add a
+    new connection database.
 
-
-Note for MySQL and SQL Server users:
-
-    In order to connect to MySQL and SQL Server databases, it is needed to point
-    out to SQL Developer where the MySQL and SQL Server JDBC classes are. Go to
-    Tools -> Preferences menu, select Database -> Third Party JDBC Drivers
-    and choose the file
-    %%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.thirdparty.mysql.jar
-    and
-    %%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.thirdparty.sqlserver.jar
+Note for MySQL users:
+    
+    If you have enabled mysql support, it is needed to point out to SQL
+    Developer where the MySQL JDBC classes are. Go to Tools -> Preferences
+    menu, select Database -> Third Party JDBC Drivers and add
+    %%JAVALIBDIR%%/mysql-connector-java.jar
     in the browser.
+
 ************************************************************************