diff -urN databases/isql-viewer.orig/Makefile databases/isql-viewer/Makefile
--- databases/isql-viewer.orig/Makefile	Sun Jun 19 18:50:09 2005
+++ databases/isql-viewer/Makefile	Sun Jun 19 22:34:55 2005
@@ -16,20 +16,25 @@
 MAINTAINER=	stefan.schmidt@stadtbuch.de
 COMMENT=	JDBC 2.x compliant database front end
 
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 NO_BUILD=	yes
 
+JARFILE=	iSQL-Viewer.jar
+
+PLIST_FILES=	bin/iSQL-Viewer	\
+		%%JAVAJARDIR%%/${JARFILE}
+
 do-configure:
 	${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g' \
-	       -e 's|%%PORTVERSION%%|${PORTVERSION}|g' \
 	       -e 's|%%JAVA_VERSION%%|${JAVA_VERSION}|g' \
 	       ${FILESDIR}/iSQL-Viewer.sh > ${WRKDIR}/iSQL-Viewer
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/java/classes
 	@${INSTALL_DATA} ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
-		${JAVAJARDIR}/.
-	@${INSTALL_SCRIPT} ${WRKDIR}/iSQL-Viewer ${PREFIX}/bin/.
+		${JAVAJARDIR}/${JARFILE}
+	@${INSTALL_SCRIPT} ${WRKDIR}/iSQL-Viewer ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff -urN databases/isql-viewer.orig/files/iSQL-Viewer.sh databases/isql-viewer/files/iSQL-Viewer.sh
--- databases/isql-viewer.orig/files/iSQL-Viewer.sh	Thu Jun  9 22:32:24 2005
+++ databases/isql-viewer/files/iSQL-Viewer.sh	Sun Jun 19 22:35:25 2005
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 JAVA_VERSION=%%JAVA_VERSION%% \
-	java -jar %%JAVAJARDIR%%/iSQL-Viewer-%%PORTVERSION%%.jar
+	java -jar %%JAVAJARDIR%%/iSQL-Viewer.jar
diff -urN databases/isql-viewer.orig/pkg-plist databases/isql-viewer/pkg-plist
--- databases/isql-viewer.orig/pkg-plist	Thu Jun  9 22:27:02 2005
+++ databases/isql-viewer/pkg-plist	Thu Jan  1 01:00:00 1970
@@ -1,2 +0,0 @@
-bin/iSQL-Viewer
-%%JAVAJARDIR%%/iSQL-Viewer-2.1.8.jar