- Update to 1.5.1.54.40

  http://www.oracle.com/technology/products/database/sql_developer/files/relnotes_v151.html
- MySQL dependency is removed due to databases/mysql-connector-odbc is updated
  to 5.1 and this port only supports 5.0 (see pkg-message for details)

PR:		ports/125724
Submitted by:	José García Juanino <jjuanino at gmail.com> (maintainer)

6 files changed, 16 insertions, 31 deletions

diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index 41c471b3636e..dd273b7f8edb 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	sqldeveloper
-PORTVERSION=	1.5.0.53.38
+PORTVERSION=	1.5.1.54.40
 DISTVERSIONSUFFIX=-no-jre
-PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	#http://www.oracle.com/technology/software/products/sql/index.html
-DISTNAME=	${PORTNAME}-5338${DISTVERSIONSUFFIX}
+DISTNAME=	${PORTNAME}-5440${DISTVERSIONSUFFIX}
 DIST_SUBDIR=	oracle
 
 MAINTAINER=	jjuanino@gmail.com
@@ -32,14 +31,8 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SUB_FILES=	pkg-message
 
-OPTIONS=	MYSQL "Enable connection to MySQL databases" off
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MYSQL)
-RUN_DEPENDS+=	${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java
-.endif
-
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
 ECHO_MSG=		${PRINTF} %b
 
@@ -63,7 +56,7 @@ do-install:
 			  -e 's|%JAVA_HOME%|${JAVA_HOME}|' \
 	    ${WRKSRC}/sqldeveloper.sh \
 	    ${WRKSRC}/sqlcli
-	@${REINPLACE_CMD} -e 's|/bin/bash|/usr/local/bin/bash|' \
+	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
 	    ${WRKSRC}/sqldeveloper.sh \
 	    ${WRKSRC}/sqlcli \
 	    ${WRKSRC}/ide/bin/launcher.sh \
diff --git a/databases/sqldeveloper/distinfo b/databases/sqldeveloper/distinfo
index 9a9994e82ef4..eb7096527ed6 100644
--- a/databases/sqldeveloper/distinfo
+++ b/databases/sqldeveloper/distinfo
@@ -1,3 +1,3 @@
-MD5 (oracle/sqldeveloper-5338-no-jre.zip) = 982fc589cf3e46edfe90e414983b09dd
-SHA256 (oracle/sqldeveloper-5338-no-jre.zip) = b6830bd63c444d38f7bdfbf8b9732a51b5f4610f944d68b10dab828c26e0e0a9
-SIZE (oracle/sqldeveloper-5338-no-jre.zip) = 75622061
+MD5 (oracle/sqldeveloper-5440-no-jre.zip) = b2152913b4c1cb8de19f95d0099cf9dc
+SHA256 (oracle/sqldeveloper-5440-no-jre.zip) = 61ac89a31cf3784d5cc3d921ebb51281cfbb3ad8055b29e3da0d49cff73173f1
+SIZE (oracle/sqldeveloper-5440-no-jre.zip) = 67831791
diff --git a/databases/sqldeveloper/files/patch-sqlcli b/databases/sqldeveloper/files/patch-sqlcli
index b9a80590ea0e..8c3542d92c76 100644
--- a/databases/sqldeveloper/files/patch-sqlcli
+++ b/databases/sqldeveloper/files/patch-sqlcli
@@ -1,5 +1,5 @@
---- sqlcli.orig	2008-04-21 08:33:48.000000000 +0200
-+++ sqlcli	2008-05-15 11:44:13.000000000 +0200
+--- sqlcli.orig	2008-07-16 21:07:00.000000000 +0200
++++ sqlcli	2008-07-16 21:08:01.000000000 +0200
 @@ -1,15 +1,15 @@
  #!/bin/bash
 -CP=jdbc/lib/ojdbc14.jar
@@ -27,4 +27,5 @@
 +CP=${CP}:%DATADIR%/jlib/jdev-cm.jar
 +CP=${CP}:%DATADIR%/ide/lib/dbapi.jar
  
- java -cp ${CP} oracle.dbtools.raptor.scriptrunner.utils.SqlCli $*
+-java -cp ${CP} oracle.dbtools.raptor.scriptrunner.utils.SqlCli $*
++exec java -cp ${CP} oracle.dbtools.raptor.scriptrunner.utils.SqlCli $*
diff --git a/databases/sqldeveloper/files/patch-sqldeveloper.sh b/databases/sqldeveloper/files/patch-sqldeveloper.sh
index 18e10d8c3b67..d6d38fd3e9df 100644
--- a/databases/sqldeveloper/files/patch-sqldeveloper.sh
+++ b/databases/sqldeveloper/files/patch-sqldeveloper.sh
@@ -1,6 +1,6 @@
---- sqldeveloper.sh.orig	2008-04-21 08:33:48.000000000 +0200
-+++ sqldeveloper.sh	2008-05-15 12:02:13.000000000 +0200
+--- sqldeveloper.sh.orig	2008-07-16 21:07:00.000000000 +0200
++++ sqldeveloper.sh	2008-07-16 21:10:20.000000000 +0200
 @@ -1,2 +1,2 @@
  #!/bin/bash
 -cd "`dirname $0`"/sqldeveloper/bin && bash sqldeveloper $*
-+cd %DATADIR%/sqldeveloper/bin && JAVA_HOME=%JAVA_HOME% bash sqldeveloper $*
++cd %DATADIR%/sqldeveloper/bin && JAVA_HOME=%JAVA_HOME% exec bash sqldeveloper $*
diff --git a/databases/sqldeveloper/files/pkg-message.in b/databases/sqldeveloper/files/pkg-message.in
index bf3c9e8c2582..40c8c4cffff0 100644
--- a/databases/sqldeveloper/files/pkg-message.in
+++ b/databases/sqldeveloper/files/pkg-message.in
@@ -19,8 +19,8 @@ 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.
+    menu, select Database -> Third Party JDBC Drivers and add the proper jar.
+    Do not install 5.1 version of mysql jdbc connector; see note 7 of
+    http://www.oracle.com/technology/products/database/sql_developer/files/relnotes_v151.html#sec1
 
 ************************************************************************
diff --git a/databases/sqldeveloper/pkg-plist b/databases/sqldeveloper/pkg-plist
index b7ab8034537a..4383a70bec52 100644
--- a/databases/sqldeveloper/pkg-plist
+++ b/databases/sqldeveloper/pkg-plist
@@ -65,7 +65,6 @@ bin/sqldeveloper
 %%DATADIR%%/ide/themes/creating_themes.html
 %%DATADIR%%/ide/themes/fusionblue.jar
 %%DATADIR%%/ide/themes/sizingmargins.png
-%%DATADIR%%/j2ee/home/lib/activation.jar
 %%DATADIR%%/j2ee/home/lib/el-ri.jar
 %%DATADIR%%/j2ee/home/lib/pcl.jar
 %%DATADIR%%/j2ee/home/lib/servlet.jar
@@ -116,13 +115,8 @@ bin/sqldeveloper
 %%DATADIR%%/jlib/share.jar
 %%DATADIR%%/jlib/xmlef.jar
 %%DATADIR%%/lib/classgen.jar
-%%DATADIR%%/lib/java/api/jaxb-api.jar
-%%DATADIR%%/lib/java/api/jsr173_api.jar
 %%DATADIR%%/lib/java/shared/oracle.javatools/11.1.1.0.0/javamodel-rt.jar
 %%DATADIR%%/lib/java/shared/oracle.javatools/11.1.1.0.0/javatools-nodeps.jar
-%%DATADIR%%/lib/java/shared/sun.jaxb/2.0/jaxb-impl.jar
-%%DATADIR%%/lib/java/shared/sun.jaxb/2.0/jaxb-xjc.jar
-%%DATADIR%%/lib/java/shared/sun.jaxb/2.0/jaxb1-impl.jar
 %%DATADIR%%/lib/oraclexsql.jar
 %%DATADIR%%/lib/xml.jar
 %%DATADIR%%/lib/xmlcomp.jar
@@ -211,12 +205,9 @@ bin/sqldeveloper
 @dirrm %%DATADIR%%/sqldeveloper
 @dirrm %%DATADIR%%/rdbms/jlib
 @dirrm %%DATADIR%%/rdbms
-@dirrm %%DATADIR%%/lib/java/shared/sun.jaxb/2.0
-@dirrm %%DATADIR%%/lib/java/shared/sun.jaxb
 @dirrm %%DATADIR%%/lib/java/shared/oracle.javatools/11.1.1.0.0
 @dirrm %%DATADIR%%/lib/java/shared/oracle.javatools
 @dirrm %%DATADIR%%/lib/java/shared
-@dirrm %%DATADIR%%/lib/java/api
 @dirrm %%DATADIR%%/lib/java
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/jlib