4 files changed, 40 insertions, 25 deletions

diff --git a/databases/adstudio/Makefile b/databases/adstudio/Makefile
index 04302bba0116..08a556d52626 100644
--- a/databases/adstudio/Makefile
+++ b/databases/adstudio/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	adstudio
-PORTVERSION=	4.7.2
-PORTREVISION=	1
+PORTVERSION=	6.5.9
 CATEGORIES=	databases devel java
-MASTER_SITES=	http://download.aquafold.com/download/v${PORTVERSION}/linux/
-DISTNAME=	ads-linux-novm-${PORTVERSION}
+MASTER_SITES=	http://download.aquafold.com/download/v${PORTVERSION:R}.0/java/
+DISTNAME=	ads-java-novm-${PORTVERSION}
 
-MAINTAINER=	thierry@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A database query and administration tool
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
@@ -28,15 +27,19 @@ WRKSRC=		${WRKDIR}/datastudio
 
 INSTFILES=	License.txt PAD_FILE.XML changelog.txt datastudio.gif	\
 		datastudio.ico lib license
+EXTRACT_AFTER_ARGS=|${TAR} -xpf - ./datastudio/datastudio.sh
 
 pre-configure:
 	${REINPLACE_CMD} -e "s|%%ADS_HOME%%|${DATADIR}|"	\
-		-e "s|^java |JAVA_VERSION=${JAVA_VERSION} ${LOCALBASE}/bin/java -Xmx256M |"	\
+		-e "s|^java |JAVA_VERSION=${JAVA_VERSION} exec ${LOCALBASE}/bin/java -Xmx256M |"	\
 		${WRKSRC}/datastudio.sh
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${CP} -R ${INSTFILES:S|^|${WRKSRC}/|} ${DATADIR}
+	${TAR} -C ${DATADIR} -xpf ${DISTDIR}/${_DISTFILES}	\
+		${INSTFILES:S|^|./datastudio/|}
+	${MV} ${DATADIR}/datastudio/* ${DATADIR}
+	${RMDIR} ${DATADIR}/datastudio
 	${INSTALL_SCRIPT} ${WRKSRC}/datastudio.sh ${PREFIX}/bin
 
 post-install:
diff --git a/databases/adstudio/distinfo b/databases/adstudio/distinfo
index 65f04c4071d8..174b48a9a5e4 100644
--- a/databases/adstudio/distinfo
+++ b/databases/adstudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (ads-linux-novm-4.7.2.tar.gz) = d3dbbb065bf1548a5a5a997538f458d5
-SHA256 (ads-linux-novm-4.7.2.tar.gz) = c6c7dc430781feb33a7c0720a7534426fd65b128a9dcd5d1df6fe11c5c0daf1f
-SIZE (ads-linux-novm-4.7.2.tar.gz) = 15024573
+MD5 (ads-java-novm-6.5.9.tar.gz) = 1f186fde62bccaa549201339eb5d339b
+SHA256 (ads-java-novm-6.5.9.tar.gz) = 6fe91b715d0ac997728af00fe02b921873afb03d64ab4000d9b74c157bcad602
+SIZE (ads-java-novm-6.5.9.tar.gz) = 34193467
diff --git a/databases/adstudio/files/patch-datastudio.sh b/databases/adstudio/files/patch-datastudio.sh
index 154cbb297567..6438cfce7b0b 100644
--- a/databases/adstudio/files/patch-datastudio.sh
+++ b/databases/adstudio/files/patch-datastudio.sh
@@ -1,4 +1,4 @@
---- datastudio.sh.orig	Wed Aug  4 15:15:16 2004
+--- datastudio.sh	Wed Aug  4 15:15:16 2004
 +++ datastudio.sh	Fri Feb 11 16:08:59 2005
 @@ -1,7 +1,7 @@
  #!/bin/sh
@@ -9,9 +9,3 @@
  
  CLASSES=$ADS_HOME/lib/datastudio.jar
  CLASSES=$ADS_HOME/lib/oracle.jar:$CLASSES
-@@ -20,4 +20,4 @@
- CLASSES=$ADS_HOME/lib/mail.jar:$CLASSES
- CLASSES=$ADS_HOME/lib/activation.jar:$CLASSES
- 
--java -cp $CLASSES com.aquafold.datastudio.DataStudio
-+java -cp $CLASSES com.aquafold.datastudio.DataStudio &
diff --git a/databases/adstudio/pkg-plist b/databases/adstudio/pkg-plist
index 82f2209b5f0a..21f5d53a4e73 100644
--- a/databases/adstudio/pkg-plist
+++ b/databases/adstudio/pkg-plist
@@ -5,34 +5,52 @@ bin/datastudio.sh
 %%DATADIR%%/datastudio.gif
 %%DATADIR%%/datastudio.ico
 %%DATADIR%%/lib/ads.jar
+%%DATADIR%%/lib/activation.jar
+%%DATADIR%%/lib/aqua2.jar
 %%DATADIR%%/lib/aqua-lib.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/jconnect55.jar
-%%DATADIR%%/lib/jconnect60-exclude.jar
-%%DATADIR%%/lib/jnlp.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/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/swingx-src.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-POI.txt
+%%DATADIR%%/license/Apache-2.txt
 %%DATADIR%%/license/DB2-JDBC-LICENSE.txt
+%%DATADIR%%/license/CDDL-LICENSE.txt
+%%DATADIR%%/license/EPL-LICENSE.txt
 %%DATADIR%%/license/JGoodies-LICENSE.txt
-%%DATADIR%%/license/L2FProd-LICENSE.txt
 %%DATADIR%%/license/MySQL-JDBC-LICENSE.txt
 %%DATADIR%%/license/Oracle-JDBC-LICENSE.txt
 %%DATADIR%%/license/Postgresql-JDBC-LICENSE.txt
-%%DATADIR%%/license/SUN-SPL-LICENSE.txt
-%%DATADIR%%/license/SwingX-LICENSE.txt
 %%DATADIR%%/license/jConnect-LICENSE.txt
 %%DATADIR%%/license/jTDS-LICENSE.txt
 @dirrm %%DATADIR%%/lib