5 files changed, 146 insertions, 50 deletions

diff --git a/databases/adstudio/Makefile b/databases/adstudio/Makefile
index f8e4df640aef..d5f19df01c11 100644
--- a/databases/adstudio/Makefile
+++ b/databases/adstudio/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	adstudio
-PORTVERSION=	6.5.12
+PORTVERSION=	7.0.0
 CATEGORIES=	databases devel java
 MASTER_SITES=	http://download.aquafold.com/download/v${PORTVERSION:R}.0/java/
 DISTNAME=	ads-java-novm-${PORTVERSION}
@@ -14,10 +14,11 @@ DISTNAME=	ads-java-novm-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A database query and administration tool
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper	\
+		${LOCALBASE}/lib/libjogl.so:${PORTSDIR}/graphics/jogl
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 RESTRICTED=	See <http://www.aquafold.com/licensing.html>
@@ -25,14 +26,15 @@ NO_CDROM=	${RESTRICTED}
 
 WRKSRC=		${WRKDIR}/datastudio
 
-INSTFILES=	License.txt PAD_FILE.XML changelog.txt datastudio.gif	\
+INSTFILES=	License.txt changelog.txt datastudio-*.png datastudio.gif	\
 		datastudio.ico lib license
-EXTRACT_AFTER_ARGS=|${TAR} -xpf - ./datastudio/datastudio.sh
+INSTSCRIPTS=	datastudio runscript
+EXTRACT_AFTER_ARGS=|${TAR} -xpf - ${INSTSCRIPTS:S|^|./datastudio/|:S|$|.sh|}
 
 pre-configure:
 	${REINPLACE_CMD} -e "s|%%ADS_HOME%%|${DATADIR}|"	\
 		-e "s|^java |JAVA_VERSION=${JAVA_VERSION} exec ${LOCALBASE}/bin/java -Xmx256M |"	\
-		${WRKSRC}/datastudio.sh
+		${INSTSCRIPTS:S|^|${WRKSRC}/|:S|$|.sh|}
 
 do-install:
 	${MKDIR} ${DATADIR}
@@ -40,7 +42,7 @@ do-install:
 		${INSTFILES:S|^|./datastudio/|}
 	${MV} ${DATADIR}/datastudio/* ${DATADIR}
 	${RMDIR} ${DATADIR}/datastudio
-	${INSTALL_SCRIPT} ${WRKSRC}/datastudio.sh ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${INSTSCRIPTS:S|^|${WRKSRC}/|:S|$|.sh|} ${PREFIX}/bin
 
 post-install:
 	@${ECHO_MSG}
diff --git a/databases/adstudio/distinfo b/databases/adstudio/distinfo
index f20cc17feaab..4fff5cd0e6c9 100644
--- a/databases/adstudio/distinfo
+++ b/databases/adstudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (ads-java-novm-6.5.12.tar.gz) = 3619d4a2eee38a2988b93cb18bf719ec
-SHA256 (ads-java-novm-6.5.12.tar.gz) = 2830922fe93f2bf6f32e2805110b999bea115ba360977bcdd1f9d1173f48ebd8
-SIZE (ads-java-novm-6.5.12.tar.gz) = 34206078
+MD5 (ads-java-novm-7.0.0.tar.gz) = 8ef944e39dfe0d36fd597cba706dfbf4
+SHA256 (ads-java-novm-7.0.0.tar.gz) = fc51fb4588a3c4b77771a81dfdf7e2bd2ecf92dbbe4f810533a789570d3eeb30
+SIZE (ads-java-novm-7.0.0.tar.gz) = 50466934
diff --git a/databases/adstudio/files/patch-datastudio.sh b/databases/adstudio/files/patch-datastudio.sh
index 6438cfce7b0b..d0a65b6eaf33 100644
--- a/databases/adstudio/files/patch-datastudio.sh
+++ b/databases/adstudio/files/patch-datastudio.sh
@@ -1,11 +1,12 @@
---- datastudio.sh	Wed Aug  4 15:15:16 2004
-+++ datastudio.sh	Fri Feb 11 16:08:59 2005
+--- datastudio.sh.orig	2008-08-19 21:22:43.000000000 +0200
++++ datastudio.sh	2008-10-17 11:43:18.000000000 +0200
 @@ -1,7 +1,7 @@
- #!/bin/sh
+-#!/bin/bash
++#! /bin/sh
  #SET ADS_HOME to the root installation directory for DataStudio
  
 -ADS_HOME=`dirname $0`
 +ADS_HOME=%%ADS_HOME%%
  
- CLASSES=$ADS_HOME/lib/datastudio.jar
- CLASSES=$ADS_HOME/lib/oracle.jar:$CLASSES
+ CLASSES=$ADS_HOME/lib/activation.jar
+ CLASSES=$ADS_HOME/lib/ads.jar:$CLASSES
diff --git a/databases/adstudio/files/patch-runscript.sh b/databases/adstudio/files/patch-runscript.sh
new file mode 100644
index 000000000000..ae2ea3b604cf
--- /dev/null
+++ b/databases/adstudio/files/patch-runscript.sh
@@ -0,0 +1,12 @@
+--- runscript.sh.orig	2008-08-19 21:22:43.000000000 +0200
++++ runscript.sh	2008-10-17 12:12:29.000000000 +0200
+@@ -1,7 +1,7 @@
+-#!/bin/bash
++#! /bin/sh
+ #SET ADS_HOME to the root installation directory for DataStudio
+ 
+-ADS_HOME=`dirname $0`
++ADS_HOME=%%ADS_HOME%%
+ 
+ CLASSES=$ADS_HOME/lib/activation.jar
+ CLASSES=$ADS_HOME/lib/ads.jar:$CLASSES
diff --git a/databases/adstudio/pkg-plist b/databases/adstudio/pkg-plist
index 21f5d53a4e73..8b30ea56912f 100644
--- a/databases/adstudio/pkg-plist
+++ b/databases/adstudio/pkg-plist
@@ -1,58 +1,139 @@
 bin/datastudio.sh
+bin/runscript.sh
 %%DATADIR%%/License.txt
-%%DATADIR%%/PAD_FILE.XML
 %%DATADIR%%/changelog.txt
+%%DATADIR%%/datastudio-128x128.png
+%%DATADIR%%/datastudio-16x16.png
+%%DATADIR%%/datastudio-24x24.png
+%%DATADIR%%/datastudio-32x32.png
+%%DATADIR%%/datastudio-48x48.png
 %%DATADIR%%/datastudio.gif
 %%DATADIR%%/datastudio.ico
-%%DATADIR%%/lib/ads.jar
 %%DATADIR%%/lib/activation.jar
-%%DATADIR%%/lib/aqua2.jar
+%%DATADIR%%/lib/ads.jar
 %%DATADIR%%/lib/aqua-lib.jar
+%%DATADIR%%/lib/aqua2.jar
 %%DATADIR%%/lib/aspc.jar
-%%DATADIR%%/lib/db2java.jar
-%%DATADIR%%/lib/db2jcc.jar
-%%DATADIR%%/lib/db2jcc_license_cu.jar
-%%DATADIR%%/lib/derby.jar
-%%DATADIR%%/lib/derbyclient.jar
-%%DATADIR%%/lib/ifxjdbc.jar
-%%DATADIR%%/lib/jaxb1-impl.jar
-%%DATADIR%%/lib/jaxb-api.jar
-%%DATADIR%%/lib/jaxb-impl.jar
-%%DATADIR%%/lib/jaxb-xjc.jar
-%%DATADIR%%/lib/jconnect60.jar
-%%DATADIR%%/lib/jide-action.jar
-%%DATADIR%%/lib/jide-beaninfo.jar
-%%DATADIR%%/lib/jide-common.jar
-%%DATADIR%%/lib/jide-components.jar
-%%DATADIR%%/lib/jide-dialogs.jar
-%%DATADIR%%/lib/jide-dock.jar
-%%DATADIR%%/lib/jide-grids.jar
-%%DATADIR%%/lib/jide-pivot.jar
-%%DATADIR%%/lib/jide-shortcut.jar
-%%DATADIR%%/lib/jsr173_1.0_api.jar
-%%DATADIR%%/lib/jtds-src.jar
-%%DATADIR%%/lib/jtds.jar
+%%DATADIR%%/lib/drivers/db2java.jar
+%%DATADIR%%/lib/drivers/db2jcc.jar
+%%DATADIR%%/lib/drivers/db2jcc_license_cu.jar
+%%DATADIR%%/lib/drivers/derby.jar
+%%DATADIR%%/lib/drivers/derbyclient.jar
+%%DATADIR%%/lib/drivers/derbynet.jar
+%%DATADIR%%/lib/drivers/ifxjdbc.jar
+%%DATADIR%%/lib/drivers/jconnect60.jar
+%%DATADIR%%/lib/drivers/jt400.jar
+%%DATADIR%%/lib/drivers/jtds-src.jar
+%%DATADIR%%/lib/drivers/jtds.jar
+%%DATADIR%%/lib/drivers/mysql-src.jar
+%%DATADIR%%/lib/drivers/mysql.jar
+%%DATADIR%%/lib/drivers/nlscharset12.jar
+%%DATADIR%%/lib/drivers/oracle.jar
+%%DATADIR%%/lib/drivers/postgresql.jar
+%%DATADIR%%/lib/drivers/util400.jar
+%%DATADIR%%/lib/drivers/xdb.jar
+%%DATADIR%%/lib/drivers/xmlparserv2.jar
+%%DATADIR%%/lib/gluegen-rt.jar
+%%DATADIR%%/lib/infragistics.jar
+%%DATADIR%%/lib/jide/jide-action.jar
+%%DATADIR%%/lib/jide/jide-beaninfo.jar
+%%DATADIR%%/lib/jide/jide-common.jar
+%%DATADIR%%/lib/jide/jide-components.jar
+%%DATADIR%%/lib/jide/jide-dialogs.jar
+%%DATADIR%%/lib/jide/jide-dock.jar
+%%DATADIR%%/lib/jide/jide-grids.jar
+%%DATADIR%%/lib/jide/jide-pivot.jar
+%%DATADIR%%/lib/jide/jide-properties.jar
+%%DATADIR%%/lib/jide/jide-shortcut.jar
+%%DATADIR%%/lib/jinterop/j-interop.jar
+%%DATADIR%%/lib/jinterop/j-interopdeps.jar
+%%DATADIR%%/lib/jinterop/jcifs.jar
+%%DATADIR%%/lib/jna.jar
+%%DATADIR%%/lib/jogl.jar
 %%DATADIR%%/lib/mail.jar
-%%DATADIR%%/lib/mysql-src.jar
-%%DATADIR%%/lib/mysql.jar
-%%DATADIR%%/lib/nlscharset12.jar
-%%DATADIR%%/lib/oracle.jar
-%%DATADIR%%/lib/postgresql.jar
+%%DATADIR%%/lib/nb/eapi/org-netbeans-modules-editor-fold.jar
+%%DATADIR%%/lib/nb/eapi/org-netbeans-modules-editor-lib.jar
+%%DATADIR%%/lib/nb/eapi/org-netbeans-modules-editor-lib2.jar
+%%DATADIR%%/lib/nb/eapi/org-netbeans-modules-editor-plain-lib.jar
+%%DATADIR%%/lib/nb/eapi/org-netbeans-modules-editor-util.jar
+%%DATADIR%%/lib/nb/eapi/org-netbeans-modules-editor.jar
+%%DATADIR%%/lib/nb/gsf/org-netbeans-modules-gsf-api.jar
+%%DATADIR%%/lib/nb/gsf/org-netbeans-modules-gsf.jar
+%%DATADIR%%/lib/nb/gsf/org-netbeans-modules-gsfpath-api.jar
+%%DATADIR%%/lib/nb/gsf/org-netbeans-modules-javascript-editing.jar
+%%DATADIR%%/lib/nb/mlkup/org-netbeans-modules-editor-mimelookup.jar
+%%DATADIR%%/lib/nb/mlkup/org-netbeans-modules-editor-settings.jar
+%%DATADIR%%/lib/nb/msc/core.jar
+%%DATADIR%%/lib/nb/msc/org-netbeans-modules-diff.jar
+%%DATADIR%%/lib/nb/msc/org-netbeans-modules-editor-structure.jar
+%%DATADIR%%/lib/nb/msc/org-netbeans-modules-html-editor-lib.jar
+%%DATADIR%%/lib/nb/msc/org-netbeans-modules-html-editor.jar
+%%DATADIR%%/lib/nb/msc/org-netbeans-modules-html-lexer.jar
+%%DATADIR%%/lib/nb/msc/org-netbeans-modules-languages.jar
+%%DATADIR%%/lib/nb/msc/org-netbeans-modules-lexer.jar
+%%DATADIR%%/lib/nb/msc/org-netbeans-modules-xml-core.jar
+%%DATADIR%%/lib/nb/msc/org-openide-explorer.jar
+%%DATADIR%%/lib/nb/org-mozilla-rhino-aqua.jar
+%%DATADIR%%/lib/nb/org-netbeans-modules-editor-indent.jar
+%%DATADIR%%/lib/nb/org-netbeans-modules-editor-settings-storage.jar
+%%DATADIR%%/lib/nb/pcore/org-openide-actions.jar
+%%DATADIR%%/lib/nb/pcore/org-openide-awt.jar
+%%DATADIR%%/lib/nb/pcore/org-openide-dialogs.jar
+%%DATADIR%%/lib/nb/pcore/org-openide-filesystems.jar
+%%DATADIR%%/lib/nb/pcore/org-openide-loaders.jar
+%%DATADIR%%/lib/nb/pcore/org-openide-nodes.jar
+%%DATADIR%%/lib/nb/pcore/org-openide-options.jar
+%%DATADIR%%/lib/nb/pcore/org-openide-text.jar
+%%DATADIR%%/lib/nb/pcore/org-openide-util.jar
+%%DATADIR%%/lib/nb/pcore/org-openide-windows.jar
+%%DATADIR%%/lib/nb/ql/org-netbeans-api-xml.jar
+%%DATADIR%%/lib/nb/ql/org-netbeans-modules-db-sql-editor.jar
+%%DATADIR%%/lib/nb/ql/org-netbeans-modules-dbapi.jar
+%%DATADIR%%/lib/nb/tc/org-netbeans-core.jar
+%%DATADIR%%/lib/nb/tc/org-netbeans-modules-editor-bracesmatching.jar
+%%DATADIR%%/lib/nb/tc/org-netbeans-modules-editor-codetemplates.jar
+%%DATADIR%%/lib/nb/tc/org-netbeans-modules-editor-completion.jar
+%%DATADIR%%/lib/nb/tc/org-netbeans-modules-editor-errorstripe.jar
+%%DATADIR%%/lib/nb/tc/org-netbeans-modules-options-editor.jar
+%%DATADIR%%/lib/nb/tc/org-netbeans-spi-editor-hints.jar
+%%DATADIR%%/lib/nb/tc/swing-layout.jar
+%%DATADIR%%/lib/nb/v/org-netbeans-modules-editor-errorstripe-api.jar
+%%DATADIR%%/lib/nb/v/org-netbeans-modules-masterfs.jar
+%%DATADIR%%/lib/nb/v/org-netbeans-modules-queries.jar
+%%DATADIR%%/lib/nb/v/org-netbeans-modules-versioning.jar
+%%DATADIR%%/lib/nb/vapi/org-netbeans-api-visual.jar
+%%DATADIR%%/lib/nb/xed/org-netbeans-modules-xml-lexer.jar
+%%DATADIR%%/lib/nb/xed/org-netbeans-modules-xml-text.jar
+%%DATADIR%%/lib/ssh2/ssh2.jar
 %%DATADIR%%/lib/stringtemplate.jar
 %%DATADIR%%/lib/tools.jar
-%%DATADIR%%/lib/xdb.jar
-%%DATADIR%%/lib/xmlparserv2.jar
 %%DATADIR%%/license/ANTLR-LICENSE.txt
 %%DATADIR%%/license/Apache-2.txt
-%%DATADIR%%/license/DB2-JDBC-LICENSE.txt
 %%DATADIR%%/license/CDDL-LICENSE.txt
+%%DATADIR%%/license/DB2-JDBC-LICENSE.txt
 %%DATADIR%%/license/EPL-LICENSE.txt
 %%DATADIR%%/license/JGoodies-LICENSE.txt
 %%DATADIR%%/license/MySQL-JDBC-LICENSE.txt
 %%DATADIR%%/license/Oracle-JDBC-LICENSE.txt
 %%DATADIR%%/license/Postgresql-JDBC-LICENSE.txt
+%%DATADIR%%/license/TableLayout-LICENSE.txt
 %%DATADIR%%/license/jConnect-LICENSE.txt
 %%DATADIR%%/license/jTDS-LICENSE.txt
-@dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/license
+@dirrm %%DATADIR%%/lib/ssh2
+@dirrm %%DATADIR%%/lib/nb/xed
+@dirrm %%DATADIR%%/lib/nb/vapi
+@dirrm %%DATADIR%%/lib/nb/v
+@dirrm %%DATADIR%%/lib/nb/tc
+@dirrm %%DATADIR%%/lib/nb/ql
+@dirrm %%DATADIR%%/lib/nb/pcore
+@dirrm %%DATADIR%%/lib/nb/msc
+@dirrm %%DATADIR%%/lib/nb/mlkup
+@dirrm %%DATADIR%%/lib/nb/gsf
+@dirrm %%DATADIR%%/lib/nb/eapi
+@dirrm %%DATADIR%%/lib/nb
+@dirrm %%DATADIR%%/lib/jinterop
+@dirrm %%DATADIR%%/lib/jide
+@dirrm %%DATADIR%%/lib/drivers
+@dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%