diff -ruN --exclude=CVS /usr/ports/editors/drjava/Makefile /usr/ports/editors/drjava.update-20061025-1556/Makefile
--- /usr/ports/editors/drjava/Makefile	Sat Sep 23 18:03:19 2006
+++ /usr/ports/editors/drjava.update-20061025-1556/Makefile	Tue Nov  7 17:06:24 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	drjava
-PORTVERSION=	20060918.1737
+PORTVERSION=	20061025.1556
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,14 +23,15 @@
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	DRJAVAJAR=${DRJAVAJAR}
+PLIST_SUB=	DRJAVAJAR=${DRJAVAJAR}
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-DRJAVAJAR=	${DATADIR}/${DISTFILES}
+DRJAVAJAR=	${DISTFILES}
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${DRJAVAJAR}
+	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${DATADIR}/${DRJAVAJAR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/editors/drjava/distinfo /usr/ports/editors/drjava.update-20061025-1556/distinfo
--- /usr/ports/editors/drjava/distinfo	Sat Sep 23 18:03:19 2006
+++ /usr/ports/editors/drjava.update-20061025-1556/distinfo	Tue Nov  7 11:50:29 2006
@@ -1,3 +1,3 @@
-MD5 (drjava-stable-20060918-1737.jar) = c9d5b7486f0df95c012fb2c4b213e555
-SHA256 (drjava-stable-20060918-1737.jar) = a5b122de5319215d5244c8325a2af1397c870894d21fa6470fb7b17a3cba52c2
-SIZE (drjava-stable-20060918-1737.jar) = 6359472
+MD5 (drjava-stable-20061025-1556.jar) = e3b8254137bd9f0a13b840289426733c
+SHA256 (drjava-stable-20061025-1556.jar) = fbaf187be72be2a01247d56622e6e530d18e83360e1cc04869ad36e61fe43aa3
+SIZE (drjava-stable-20061025-1556.jar) = 6345250
diff -ruN --exclude=CVS /usr/ports/editors/drjava/files/drjava.in /usr/ports/editors/drjava.update-20061025-1556/files/drjava.in
--- /usr/ports/editors/drjava/files/drjava.in	Sat Jul  1 09:46:46 2006
+++ /usr/ports/editors/drjava.update-20061025-1556/files/drjava.in	Tue Nov  7 17:03:26 2006
@@ -1,4 +1,4 @@
 #!/bin/sh
 # $FreeBSD: ports/editors/drjava/files/drjava.in,v 1.1 2006/07/01 07:46:46 itetcu Exp $
 JAVA_VERSION="%%JAVA_VERSION%%"	\
-exec "%%LOCALBASE%%/bin/java" -jar %%DRJAVAJAR%% "$@"
+exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/%%DRJAVAJAR%% "$@"
diff -ruN --exclude=CVS /usr/ports/editors/drjava/pkg-plist /usr/ports/editors/drjava.update-20061025-1556/pkg-plist
--- /usr/ports/editors/drjava/pkg-plist	Sat Sep 23 18:03:19 2006
+++ /usr/ports/editors/drjava.update-20061025-1556/pkg-plist	Tue Nov  7 17:02:49 2006
@@ -1,4 +1,4 @@
 @comment $FreeBSD: ports/editors/drjava/pkg-plist,v 1.2 2006/09/23 16:03:19 rafan Exp $
 bin/drjava
-%%JAVASHAREDIR%%/drjava/drjava-stable-20060918-1737.jar
-@dirrm %%JAVASHAREDIR%%/drjava
+%%DATADIR%%/%%DRJAVAJAR%%
+@dirrm %%DATADIR%%