- Make fetchable again by upgrading to 4.5.1.

- Use javavmwrapper.

Reported by:	pointyhat via krion

databases/adstudio/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	adstudio
-PORTVERSION=	4.0
+PORTVERSION=	4.5.1
 CATEGORIES=	databases devel java
 MASTER_SITES=	http://aquafold.fileburst.com/download/linux/
 DISTNAME=	${PORTNAME}-novm
@@ -15,8 +15,10 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	A database query and administration tool
 
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
 USE_JAVA=	yes
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.4+
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
@@ -30,7 +32,8 @@ INSTFILES=	License.txt PAD_FILE.XML changelog.txt datastudio.gif	\
 
 pre-configure:
 	${REINPLACE_CMD} -e "s|%%ADS_HOME%%|${DATADIR}|"	\
-		-e "s|^java |${JAVA} -Xmx256M |" ${WRKSRC}/datastudio.sh
+		-e "s|^java |JAVA_VERSION=${JAVA_VERSION} ${LOCALBASE}/bin/java -Xmx256M |"	\
+		${WRKSRC}/datastudio.sh
 
 do-install:
 	${MKDIR} ${DATADIR}

databases/adstudio/distinfo

@@ -1,2 +1,2 @@
-MD5 (adstudio-4.0/adstudio-novm.tar.gz) = 4e4cd9289319f936473c796723b7ebd4
-SIZE (adstudio-4.0/adstudio-novm.tar.gz) = 16396028
+MD5 (adstudio-4.5.1/adstudio-novm.tar.gz) = 6687a53563d9697f8fb442532d57cbca
+SIZE (adstudio-4.5.1/adstudio-novm.tar.gz) = 16737544

databases/adstudio/pkg-plist

@@ -12,6 +12,7 @@ bin/datastudio.sh
 %%DATADIR%%/lib/ifxjdbc.jar
 %%DATADIR%%/lib/jconnect45.jar
 %%DATADIR%%/lib/jconnect55.jar
+%%DATADIR%%/lib/jconnect60.jar
 %%DATADIR%%/lib/jtds.jar
 %%DATADIR%%/lib/mail.jar
 %%DATADIR%%/lib/mysql-jdbc.zip
@@ -21,9 +22,9 @@ bin/datastudio.sh
 %%DATADIR%%/lib/postgresql.jar
 %%DATADIR%%/lib/xdb.jar
 %%DATADIR%%/lib/xmlparserv2.jar
+%%DATADIR%%/license/Apache-POI.txt
 %%DATADIR%%/license/DB2-JDBC-LICENSE.txt
 %%DATADIR%%/license/JGoodies-LICENSE.txt
-%%DATADIR%%/license/JGraph-LICENSE.txt
 %%DATADIR%%/license/L2FProd-LICENSE.txt
 %%DATADIR%%/license/MySQL-JDBC-LICENSE.txt
 %%DATADIR%%/license/Oracle-JDBC-LICENSE.txt