FreeBSD Bugzilla – Attachment 88871 Details for
Bug 125724
[maintainer update] databases/sqldeveloper version update from 1.5.0.53.38 to 1.5.1.54.40
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 5.87 KB, created by
Jose G. Juanino
on 2008-07-17 20:50:03 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Jose G. Juanino
Created:
2008-07-17 20:50:03 UTC
Size:
5.87 KB
patch
obsolete
>diff -uNr sqldeveloper.orig/Makefile sqldeveloper/Makefile >--- sqldeveloper.orig/Makefile 2008-07-16 21:02:35.000000000 +0200 >+++ sqldeveloper/Makefile 2008-07-17 19:14:53.000000000 +0200 >@@ -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 @@ > 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 @@ > -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|${PREFIX}/bin/bash|' \ > ${WRKSRC}/sqldeveloper.sh \ > ${WRKSRC}/sqlcli \ > ${WRKSRC}/ide/bin/launcher.sh \ >diff -uNr sqldeveloper.orig/distinfo sqldeveloper/distinfo >--- sqldeveloper.orig/distinfo 2008-07-16 21:02:35.000000000 +0200 >+++ sqldeveloper/distinfo 2008-07-16 21:06:20.000000000 +0200 >@@ -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 -uNr sqldeveloper.orig/files/patch-sqlcli sqldeveloper/files/patch-sqlcli >--- sqldeveloper.orig/files/patch-sqlcli 2008-07-16 21:02:35.000000000 +0200 >+++ sqldeveloper/files/patch-sqlcli 2008-07-16 21:09:02.000000000 +0200 >@@ -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 -uNr sqldeveloper.orig/files/patch-sqldeveloper.sh sqldeveloper/files/patch-sqldeveloper.sh >--- sqldeveloper.orig/files/patch-sqldeveloper.sh 2008-07-16 21:02:35.000000000 +0200 >+++ sqldeveloper/files/patch-sqldeveloper.sh 2008-07-16 21:22:19.000000000 +0200 >@@ -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 -uNr sqldeveloper.orig/files/pkg-message.in sqldeveloper/files/pkg-message.in >--- sqldeveloper.orig/files/pkg-message.in 2008-07-16 21:02:35.000000000 +0200 >+++ sqldeveloper/files/pkg-message.in 2008-07-17 18:55:50.000000000 +0200 >@@ -19,8 +19,8 @@ > > 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 -uNr sqldeveloper.orig/pkg-plist sqldeveloper/pkg-plist >--- sqldeveloper.orig/pkg-plist 2008-07-16 21:02:35.000000000 +0200 >+++ sqldeveloper/pkg-plist 2008-07-16 21:42:05.000000000 +0200 >@@ -65,7 +65,6 @@ > %%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 @@ > %%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 @@ > @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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 125724
: 88871