- Update to 1.5.0.53.38

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

8 files changed, 143 insertions, 161 deletions

diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index 2841b6a320b5..04f00d631fdc 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -1,27 +1,27 @@
 # New ports collection makefile for:	sqldeveloper
-# Date created:	       			16 January 2008
-# Whom:		       			jjuanino@gmail.com
+# Date created:				16 January 2008
+# Whom:					jjuanino@gmail.com
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sqldeveloper
-PORTVERSION=	1.2.1.3213
+PORTVERSION=	1.5.0.53.38
+DISTVERSIONSUFFIX=-no-jre
 CATEGORIES=	databases java
 MASTER_SITES=	#http://www.oracle.com/technology/software/products/sql/index.html
-PKGNAMESUFFIX=	-no-jre
-DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
+DISTNAME=	${PORTNAME}-5338${DISTVERSIONSUFFIX}
 DIST_SUBDIR=	oracle
 
 MAINTAINER=	jjuanino@gmail.com
 COMMENT=	Graphical tool for database development
 
-RUN_DEPENDS=	classpath:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_ZIP=	yes
 USE_JAVA=	yes
 
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.5
 
 NO_BUILD=	yes
 
@@ -31,15 +31,21 @@ 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
 
 IGNORE+=		\n\n-=< MARKED AS IGNORED: >=-\n
 IGNORE+=		\n
 IGNORE+=		Due to Oracle license restrictions, you must fetch the source \n
-IGNORE+=		distribution manually.  Please access  \n
+IGNORE+=		distribution manually.	Please access  \n
 IGNORE+=		http://www.oracle.com/technology/software/products/sql/index.html \n
 IGNORE+=		with a web browser and follow the link for the \n
 IGNORE+=		\"${DISTFILES}\".  \n
@@ -53,9 +59,10 @@ IGNORE+=		and then restart this installation\n\n
 
 do-install:
 	@${REINPLACE_CMD} -e 's|%DATADIR%|${DATADIR}|' \
+			  -e 's|%JAVA_HOME%|${JAVA_HOME}|' \
 	    ${WRKSRC}/sqldeveloper.sh \
 	    ${WRKSRC}/sqlcli
-	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
+	@${REINPLACE_CMD} -e 's|/bin/bash|/usr/local/bin/bash|' \
 	    ${WRKSRC}/sqldeveloper.sh \
 	    ${WRKSRC}/sqlcli \
 	    ${WRKSRC}/ide/bin/launcher.sh \
@@ -66,14 +73,18 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/sqlcli ${PREFIX}/bin/sqlcli
 	@${ECHO_MSG} " [ DONE ]"
 
-.for d in ide j2ee jdbc jdev jlib lib rdbms sqldeveloper
+.for d in BC4J dvt ide j2ee jdbc jdev jlib lib rdbms sqldeveloper timingframework
 	@${ECHO_MSG} -n ">> Installing data directory '${d}'..."
-	@cd ${WRKSRC} && ${FIND} ${d} -type d -exec ${MKDIR} ${DATADIR}/\{} \;
+	@cd ${WRKSRC} && ${FIND} ${d} -type d \
+		-not -path "jdev/extensions/oracle.jdeveloper.subversion/licenses" \
+		-exec ${MKDIR} ${DATADIR}/\{} \;
 	@cd ${WRKSRC} && ${FIND} ${d} -type f \
-	    	-not -name "*.orig" \
-	    	-not -name "*.exe" \
-	    	-not -name "*.bat" \
-	    	-not -name "*.bak" \
+		-not -name "*.orig" \
+		-not -name "*.exe" \
+		-not -name "*.bat" \
+		-not -name "*.bak" \
+		-not -name "*.dll" \
+		-not -path "jdev/extensions/oracle.jdeveloper.subversion/licenses/*" \
 		-exec ${INSTALL_DATA} \{} ${DATADIR}/\{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
@@ -82,6 +93,13 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/icon.png ${DATADIR}/icon.png
 	@${ECHO_MSG} " [ DONE ]"
 
+.if !defined(NOPORTDOCS)
+	@${ECHO_MSG} -n ">> Installing port docs ..."
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_MAN} ${WRKSRC}/readme.txt ${DOCSDIR}
+	@${ECHO_MSG} " [ DONE ]"
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/databases/sqldeveloper/distinfo b/databases/sqldeveloper/distinfo
index c0bf7294b4de..9a9994e82ef4 100644
--- a/databases/sqldeveloper/distinfo
+++ b/databases/sqldeveloper/distinfo
@@ -1,3 +1,3 @@
-MD5 (oracle/sqldeveloper-1.2.1.3213-no-jre.zip) = 0f5a31733c77ff05c71081aa4e5a2502
-SHA256 (oracle/sqldeveloper-1.2.1.3213-no-jre.zip) = 462abc7f3003c6e8b228bc9f5976bf499ff4a190a8468fed86f00d1b253efdff
-SIZE (oracle/sqldeveloper-1.2.1.3213-no-jre.zip) = 48290446
+MD5 (oracle/sqldeveloper-5338-no-jre.zip) = 982fc589cf3e46edfe90e414983b09dd
+SHA256 (oracle/sqldeveloper-5338-no-jre.zip) = b6830bd63c444d38f7bdfbf8b9732a51b5f4610f944d68b10dab828c26e0e0a9
+SIZE (oracle/sqldeveloper-5338-no-jre.zip) = 75622061
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.
+
 ************************************************************************
diff --git a/databases/sqldeveloper/pkg-plist b/databases/sqldeveloper/pkg-plist
index e8b01ff595ab..b7ab8034537a 100644
--- a/databases/sqldeveloper/pkg-plist
+++ b/databases/sqldeveloper/pkg-plist
@@ -1,10 +1,17 @@
 @comment $FreeBSD$
 bin/sqlcli
 bin/sqldeveloper
+%%DATADIR%%/BC4J/lib/adf-share-base.jar
+%%DATADIR%%/BC4J/lib/adf-share-ca.jar
+%%DATADIR%%/BC4J/lib/db-ca.jar
+%%DATADIR%%/dvt/lib/dvt-jclient.jar
+%%DATADIR%%/dvt/lib/dvt-utils.jar
 %%DATADIR%%/icon.png
 %%DATADIR%%/ide/bin/edt.properties
 %%DATADIR%%/ide/bin/encodings.xml
-%%DATADIR%%/ide/bin/launcher.dll
+%%DATADIR%%/ide/bin/ide.boot
+%%DATADIR%%/ide/bin/ide.conf
+%%DATADIR%%/ide/bin/jdk.conf
 %%DATADIR%%/ide/bin/launcher.sh
 %%DATADIR%%/ide/bin/product-launcher.template
 %%DATADIR%%/ide/doc/extension/bundle.xsd
@@ -14,6 +21,8 @@ bin/sqldeveloper
 %%DATADIR%%/ide/doc/extension/update.xsd
 %%DATADIR%%/ide/extensions/oracle.ide.ceditor.jar
 %%DATADIR%%/ide/extensions/oracle.ide.db.jar
+%%DATADIR%%/ide/extensions/oracle.ide.dependency.jar
+%%DATADIR%%/ide/extensions/oracle.ide.diffmerge.jar
 %%DATADIR%%/ide/extensions/oracle.ide.externaltools.jar
 %%DATADIR%%/ide/extensions/oracle.ide.files.jar
 %%DATADIR%%/ide/extensions/oracle.ide.gallery.jar
@@ -23,21 +32,25 @@ bin/sqldeveloper
 %%DATADIR%%/ide/extensions/oracle.ide.jar
 %%DATADIR%%/ide/extensions/oracle.ide.log.jar
 %%DATADIR%%/ide/extensions/oracle.ide.navigator.jar
+%%DATADIR%%/ide/extensions/oracle.ide.peek.jar
 %%DATADIR%%/ide/extensions/oracle.ide.replace.jar
 %%DATADIR%%/ide/extensions/oracle.ide.runner.jar
+%%DATADIR%%/ide/extensions/oracle.ide.searchbar.jar
+%%DATADIR%%/ide/extensions/oracle.ide.vhv.jar
 %%DATADIR%%/ide/extensions/oracle.ide.webbrowser.jar
 %%DATADIR%%/ide/extensions/oracle.ide.webupdate.jar
 %%DATADIR%%/ide/extensions/oracle.ideimpl.apple.jar
+%%DATADIR%%/ide/lib/annotations.jar
 %%DATADIR%%/ide/lib/audit-boot.jar
 %%DATADIR%%/ide/lib/dafjava.jar
-%%DATADIR%%/ide/lib/dafrt.jar
+%%DATADIR%%/ide/lib/dbapi-impl.jar
 %%DATADIR%%/ide/lib/dbapi.jar
 %%DATADIR%%/ide/lib/dbtransfer.jar
+%%DATADIR%%/ide/lib/deploy-rt-boot.jar
 %%DATADIR%%/ide/lib/expression-builder.jar
+%%DATADIR%%/ide/lib/google-collect-snapshot-20071022.jar
 %%DATADIR%%/ide/lib/ide-boot.jar
-%%DATADIR%%/ide/lib/ide.jar
 %%DATADIR%%/ide/lib/ideimpl.jar
-%%DATADIR%%/ide/lib/idenative.dll
 %%DATADIR%%/ide/lib/idert.jar
 %%DATADIR%%/ide/lib/indexing-migrator-boot.jar
 %%DATADIR%%/ide/lib/indexing-rt-boot.jar
@@ -45,37 +58,53 @@ bin/sqldeveloper
 %%DATADIR%%/ide/lib/javax-ide.jar
 %%DATADIR%%/ide/lib/oicons.jar
 %%DATADIR%%/ide/lib/oj-compiler-boot.jar
-%%DATADIR%%/ide/lib/patches/idert-patch.jar
-%%DATADIR%%/ide/lib/resourcebundle.jar
+%%DATADIR%%/ide/lib/oj-formatter-boot.jar
 %%DATADIR%%/ide/lib/uic.jar
 %%DATADIR%%/ide/processor-plugins/oracle.jdbc-driver-locator.jar
 %%DATADIR%%/ide/src/javax-ide-src.zip
+%%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%%/jdbc/lib/ojdbc14.jar
-%%DATADIR%%/jdbc/lib/ojdbc14dms.jar
-%%DATADIR%%/jdev/bin/ide.boot
-%%DATADIR%%/jdev/bin/ide.conf
-%%DATADIR%%/jdev/bin/jdk.conf
+%%DATADIR%%/j2ee/home/lib/servlet.jar
+%%DATADIR%%/jdbc/lib/classes15.jar
+%%DATADIR%%/jdbc/lib/ojdbc5.jar
 %%DATADIR%%/jdev/bin/version.properties
 %%DATADIR%%/jdev/doc/extension/extension.xsd
-%%DATADIR%%/jdev/extensions/oracle.ide.audit.jar
 %%DATADIR%%/jdev/extensions/oracle.ide.db.explorer.jar
 %%DATADIR%%/jdev/extensions/oracle.ide.feedback.jar
-%%DATADIR%%/jdev/extensions/oracle.ide.xmlef.jar
 %%DATADIR%%/jdev/extensions/oracle.javacore.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.cvs.jar
 %%DATADIR%%/jdev/extensions/oracle.jdeveloper.db.connection.jar
-%%DATADIR%%/jdev/extensions/oracle.jdeveloper.db.sqlplus.jar
-%%DATADIR%%/jdev/extensions/oracle.onlinedb.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.db.debug.probe.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.history.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.subversion.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.subversion/jna.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.subversion/svnClientAdapter-src.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.subversion/svnClientAdapter.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.subversion/svnjavahl.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.subversion/svnkit.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.subversion/svnkitsrc.zip
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.subversion/trilead.jar
+%%DATADIR%%/jdev/extensions/oracle.jdeveloper.vcs.jar
+%%DATADIR%%/jdev/lib/javacore.jar
 %%DATADIR%%/jdev/lib/jdev-rt.jar
 %%DATADIR%%/jdev/lib/jdev.jar
 %%DATADIR%%/jdev/lib/jdkver.jar
 %%DATADIR%%/jdev/lib/jprof.jar
+%%DATADIR%%/jdev/lib/jsch.jar
+%%DATADIR%%/jdev/lib/ocvs.jar
 %%DATADIR%%/jdev/lib/ojc.jar
+%%DATADIR%%/jdev/lib/xml-compare.jar
 %%DATADIR%%/jdev/lib/xmleditor.jar
-%%DATADIR%%/jlib/help4.jar
+%%DATADIR%%/jlib/dbui4.jar
+%%DATADIR%%/jlib/help-share.jar
 %%DATADIR%%/jlib/inspect4.jar
 %%DATADIR%%/jlib/jdev-cm.jar
 %%DATADIR%%/jlib/jewt4.jar
+%%DATADIR%%/jlib/ohj.jar
 %%DATADIR%%/jlib/ojmisc.jar
 %%DATADIR%%/jlib/oracle_ice.jar
 %%DATADIR%%/jlib/orai18n-collation.jar
@@ -87,11 +116,14 @@ 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/mfcdao.dll
+%%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/registry.dll
 %%DATADIR%%/lib/xml.jar
 %%DATADIR%%/lib/xmlcomp.jar
 %%DATADIR%%/lib/xmlcomp2.jar
@@ -101,6 +133,7 @@ bin/sqldeveloper
 %%DATADIR%%/lib/xsqlserializers.jar
 %%DATADIR%%/lib/xsu12.jar
 %%DATADIR%%/rdbms/jlib/ojdi.jar
+%%DATADIR%%/rdbms/jlib/xdb.jar
 %%DATADIR%%/sqldeveloper/bin/jdk.conf
 %%DATADIR%%/sqldeveloper/bin/logging-debug.conf
 %%DATADIR%%/sqldeveloper/bin/logging.conf
@@ -114,38 +147,41 @@ bin/sqldeveloper
 %%DATADIR%%/sqldeveloper/bin/sqldeveloper.conf
 %%DATADIR%%/sqldeveloper/bin/version.properties
 %%DATADIR%%/sqldeveloper/doc/sqldeveloper_help.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbdev.oviewer.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbdev.snippet.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.migration.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.migration.msaccess.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.migration.mysql5.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.migration.sqlserver2005.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.sqlformatter.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.sqlworksheet.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.thirdparty.access.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.thirdparty.mysql.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.dbtools.thirdparty.sqlserver.jar
+%%DATADIR%%/sqldeveloper/doc/sqldevtips.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.extras.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.filenavigator.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.msaccess.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.mysql5.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.sqlserver2005.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.sybase12.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.sybase15.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.core.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.gui.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.msaccess.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.mysql.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.sqlserver.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.sybase.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.oviewer.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.report.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.searchbar.jar
-%%DATADIR%%/sqldeveloper/lib/TimingFramework.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.snippet.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.sqlworksheet.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.thirdparty.access.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.thirdparty.mysql.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.thirdparty.sqlserver.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.thirdparty.sybase.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.timesten.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.tuning.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.xmlschema.jar
+%%DATADIR%%/sqldeveloper/lib/SQLinForm.jar
 %%DATADIR%%/sqldeveloper/lib/antlr.jar
-%%DATADIR%%/sqldeveloper/lib/bigraphbean-nls.zip
-%%DATADIR%%/sqldeveloper/lib/bigraphbean.jar
-%%DATADIR%%/sqldeveloper/lib/dbui4.jar
-%%DATADIR%%/sqldeveloper/lib/jdevnative.dll
 %%DATADIR%%/sqldeveloper/lib/jle2.jar
 %%DATADIR%%/sqldeveloper/lib/jline-0.9.9.jar
-%%DATADIR%%/sqldeveloper/lib/oracle.dbtools.logging.jar
+%%DATADIR%%/sqldeveloper/lib/oracle.sqldeveloper.utils.jar
 %%DATADIR%%/sqldeveloper/lib/poi-2.5.1-final-20040804.jar
 %%DATADIR%%/sqldeveloper/lib/stringtemplate.jar
-%%DATADIR%%/sqldeveloper/lib/xdb.jar
 %%DATADIR%%/sqldeveloper/searchengines/SQLDevForum.png
 %%DATADIR%%/sqldeveloper/searchengines/SQLDevForum.src
 %%DATADIR%%/sqldeveloper/searchengines/asktom.png
@@ -158,10 +194,15 @@ bin/sqldeveloper
 %%DATADIR%%/sqldeveloper/searchengines/oradocs.src
 %%DATADIR%%/sqldeveloper/searchengines/oradocs102vbook.png
 %%DATADIR%%/sqldeveloper/searchengines/oradocs102vbook.src
+%%DATADIR%%/sqldeveloper/searchengines/oradocs11vbook.png
+%%DATADIR%%/sqldeveloper/searchengines/oradocs11vbook.src
 %%DATADIR%%/sqldeveloper/searchengines/oradocs92vbook.png
 %%DATADIR%%/sqldeveloper/searchengines/oradocs92vbook.src
 %%DATADIR%%/sqldeveloper/searchengines/searchoraclecom.png
 %%DATADIR%%/sqldeveloper/searchengines/searchoraclecom.src
+%%DATADIR%%/timingframework/TimingFramework.jar
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+@dirrm %%DATADIR%%/timingframework
 @dirrm %%DATADIR%%/sqldeveloper/searchengines
 @dirrm %%DATADIR%%/sqldeveloper/lib
 @dirrm %%DATADIR%%/sqldeveloper/extensions
@@ -170,13 +211,17 @@ 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
 @dirrm %%DATADIR%%/jdev/lib
+@dirrm %%DATADIR%%/jdev/extensions/oracle.jdeveloper.subversion
 @dirrm %%DATADIR%%/jdev/extensions
 @dirrm %%DATADIR%%/jdev/doc/extension
 @dirrm %%DATADIR%%/jdev/doc
@@ -187,13 +232,18 @@ bin/sqldeveloper
 @dirrm %%DATADIR%%/j2ee/home/lib
 @dirrm %%DATADIR%%/j2ee/home
 @dirrm %%DATADIR%%/j2ee
+@dirrm %%DATADIR%%/ide/themes
 @dirrm %%DATADIR%%/ide/src
 @dirrm %%DATADIR%%/ide/processor-plugins
-@dirrm %%DATADIR%%/ide/lib/patches
 @dirrm %%DATADIR%%/ide/lib
 @dirrm %%DATADIR%%/ide/extensions
 @dirrm %%DATADIR%%/ide/doc/extension
 @dirrm %%DATADIR%%/ide/doc
 @dirrm %%DATADIR%%/ide/bin
 @dirrm %%DATADIR%%/ide
+@dirrm %%DATADIR%%/dvt/lib
+@dirrm %%DATADIR%%/dvt
+@dirrm %%DATADIR%%/BC4J/lib
+@dirrm %%DATADIR%%/BC4J
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%