3 files changed, 76 insertions, 24 deletions

diff --git a/java/jde/Makefile b/java/jde/Makefile
index a5c60d10d2b1..dccca0d5ee01 100644
--- a/java/jde/Makefile
+++ b/java/jde/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	jde
-PORTVERSION=	2.2.9
-PORTREVISION=	1
+PORTVERSION=	2.3.3
+PORTREVISION=	0
 CATEGORIES=	java elisp
 MASTER_SITES=	http://jdee.sunsite.dk/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -52,6 +52,7 @@ do-install:
 
 post-install:
 	${LN} -sf ${JAVADIR} ${LISPDIR}/java
+	${LN} -sf ${JAVADIR} ${LISPDIR}/../java
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in ReleaseNotes.txt ChangeLog
diff --git a/java/jde/distinfo b/java/jde/distinfo
index 92c0e3cce3b5..3b800ce350f1 100644
--- a/java/jde/distinfo
+++ b/java/jde/distinfo
@@ -1,2 +1 @@
-MD5 (jde-2.2.9.tar.gz) = df82cb528e2cf0d7cddaa1a430bce471
-SIZE (jde-2.2.9.tar.gz) = 2168080
+MD5 (jde-2.3.3.tar.gz) = 070b2a4c0e106dbe23343f6f1a659b41
diff --git a/java/jde/pkg-plist b/java/jde/pkg-plist
index 5c2eb0a33594..11d1af25c4d0 100644
--- a/java/jde/pkg-plist
+++ b/java/jde/pkg-plist
@@ -1,6 +1,8 @@
 bin/jtags
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/beanshell.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/beanshell.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/efc-xemacs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/efc-xemacs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/efc.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/efc.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/java.bnf
@@ -12,6 +14,8 @@ bin/jtags
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-bug.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-checkstyle.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-checkstyle.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-class.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-class.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-compat.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-compat.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-compile.el
@@ -24,6 +28,8 @@ bin/jtags
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-dbo.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-dbs.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-dbs.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-ejb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-ejb.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-gen.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-gen.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-help.el
@@ -48,8 +54,12 @@ bin/jtags
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-open-source.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-package.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-package.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-parse-class.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-parse-class.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-parse.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-plugins.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-plugins.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-run.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-run.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-stat.el
@@ -62,35 +72,45 @@ bin/jtags
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-widgets.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-wiz.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-wiz.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-xemacs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-xref.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-xref.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/setnu.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/setnu.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/tree-widget.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/tree-widget.elc
+@exec ln -sf %D/share/java/jde %D/%%EMACS_VERSION_SITE_LISPDIR%%/java
 @exec ln -sf %D/share/java/jde %D/%%EMACS_VERSION_SITE_LISPDIR%%/jde/java
-share/java/jde/bsh-commands/bsh/commands/browseClassName.bsh
+share/java/jde/bsh-commands/bsh/commands/beanInfoMaker.bsh
+share/java/jde/bsh-commands/bsh/commands/exploreClass.bsh
 share/java/jde/bsh-commands/bsh/commands/whichClass.bsh
+share/java/jde/lib/LICENSE.apache
 share/java/jde/lib/LICENSE.checkstyle
+share/java/jde/lib/RIGHTS.antlr
 share/java/jde/lib/bsh.jar
 share/java/jde/lib/checkstyle-all.jar
 share/java/jde/lib/jde.jar
+share/java/jde/lib/sun_checks.xml
 share/java/jde/src/jde/debugger/CommandStream.java
-share/java/jde/src/jde/debugger/Debug.java
-share/java/jde/src/jde/debugger/DebuggeeProcess.java
 share/java/jde/src/jde/debugger/DebuggeeSIO.java
+share/java/jde/src/jde/debugger/Debugger.java
+share/java/jde/src/jde/debugger/DisplayableValue.java
 share/java/jde/src/jde/debugger/Etc.java
 share/java/jde/src/jde/debugger/EventHandler.java
 share/java/jde/src/jde/debugger/JDE.java
 share/java/jde/src/jde/debugger/JDEException.java
 share/java/jde/src/jde/debugger/JDENumberFormatException.java
-share/java/jde/src/jde/debugger/Jdebug.java
-share/java/jde/src/jde/debugger/LispForm.java
+share/java/jde/src/jde/debugger/JDEbug.java
 share/java/jde/src/jde/debugger/Main.java
 share/java/jde/src/jde/debugger/ObjectStore.java
 share/java/jde/src/jde/debugger/ProcessRegistry.java
 share/java/jde/src/jde/debugger/Protocol.java
 share/java/jde/src/jde/debugger/Rep.java
+share/java/jde/src/jde/debugger/SessionManager.java
+share/java/jde/src/jde/debugger/VMUtil.java
+share/java/jde/src/jde/debugger/command/ArrayModel.java
 share/java/jde/src/jde/debugger/command/AttachShmem.java
 share/java/jde/src/jde/debugger/command/AttachSocket.java
 share/java/jde/src/jde/debugger/command/Break.java
@@ -106,6 +126,7 @@ share/java/jde/src/jde/debugger/command/DebugSessionCommand.java
 share/java/jde/src/jde/debugger/command/DebugThread.java
 share/java/jde/src/jde/debugger/command/EvaluateExpression.java
 share/java/jde/src/jde/debugger/command/Finish.java
+share/java/jde/src/jde/debugger/command/GUI.java
 share/java/jde/src/jde/debugger/command/GetArray.java
 share/java/jde/src/jde/debugger/command/GetLoadedClasses.java
 share/java/jde/src/jde/debugger/command/GetLocals.java
@@ -118,10 +139,17 @@ share/java/jde/src/jde/debugger/command/GetThread.java
 share/java/jde/src/jde/debugger/command/GetThreads.java
 share/java/jde/src/jde/debugger/command/Interrupt.java
 share/java/jde/src/jde/debugger/command/KillThread.java
+share/java/jde/src/jde/debugger/command/LVTreeNode.java
 share/java/jde/src/jde/debugger/command/LaunchApplication.java
 share/java/jde/src/jde/debugger/command/ListenShmem.java
 share/java/jde/src/jde/debugger/command/ListenSocket.java
+share/java/jde/src/jde/debugger/command/LocalVariableDisplay.java
+share/java/jde/src/jde/debugger/command/NullModel.java
+share/java/jde/src/jde/debugger/command/ObjectModel.java
+share/java/jde/src/jde/debugger/command/PrimitiveTreeNode.java
 share/java/jde/src/jde/debugger/command/Quit.java
+share/java/jde/src/jde/debugger/command/ReferenceModel.java
+share/java/jde/src/jde/debugger/command/ReferenceTreeNode.java
 share/java/jde/src/jde/debugger/command/Resume.java
 share/java/jde/src/jde/debugger/command/Run.java
 share/java/jde/src/jde/debugger/command/Step.java
@@ -152,6 +180,7 @@ share/java/jde/src/jde/debugger/spec/PatternReferenceTypeSpec.java
 share/java/jde/src/jde/debugger/spec/ReferenceTypeSpec.java
 share/java/jde/src/jde/debugger/spec/SourceNameReferenceTypeSpec.java
 share/java/jde/src/jde/debugger/spec/WatchpointSpec.java
+share/java/jde/src/jde/util/AntServer.java
 share/java/jde/src/jde/util/ClassInfo.java
 share/java/jde/src/jde/util/ClassPathDir.java
 share/java/jde/src/jde/util/ClassPathEntry.java
@@ -173,6 +202,8 @@ share/java/jde/src/jde/wizards/MethodFactory.java
 share/java/jde/src/jde/wizards/MethodOverrideFactory.java
 share/java/jde/src/jde/wizards/NameFactory.java
 share/java/jde/src/jde/wizards/Signature.java
+share/java/jde/src/jde/wizards/SignatureContainer.java
+share/java/jde/src/jde/wizards/SignatureVisitor.java
 %%PORTDOCS%%@exec ln -sf %D/share/doc/jde %D/%%EMACS_VERSION_SITE_LISPDIR%%/jde/doc
 %%PORTDOCS%%share/doc/jde/ChangeLog
 %%PORTDOCS%%share/doc/jde/ReleaseNotes.txt
@@ -181,7 +212,23 @@ share/java/jde/src/jde/wizards/Signature.java
 %%PORTDOCS%%share/doc/jde/html/bsh-ug/bsh-ug.html
 %%PORTDOCS%%share/doc/jde/html/bsh-ug/images/BeanShellBuffer.gif
 %%PORTDOCS%%share/doc/jde/html/bsh-ug/images/BshMultiLineEx.gif
+%%PORTDOCS%%share/doc/jde/html/bsh-ug/images/bshclassloading.gif
 %%PORTDOCS%%share/doc/jde/html/css/jde_style.css
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/breakpoint.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/debug1.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/debug2.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/debug_cursor.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/display_locals.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/display_obj.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/display_var1.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/display_var2.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/set_var1.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/set_var2.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/set_var3.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/images/set_var4.gif
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/jdb-ug-frame.html
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/jdb-ug-toc.html
+%%PORTDOCS%%share/doc/jde/html/jdb-ug/jdb-ug.html
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/OverrideMeth1.gif
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/OverrideMeth2.gif
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/OverrideMeth3.gif
@@ -213,6 +260,7 @@ share/java/jde/src/jde/wizards/Signature.java
 %%PORTDOCS%%share/doc/jde/html/jde-ug/jde-ug.html
 %%PORTDOCS%%share/doc/jde/html/jdebug-ug/images/enable_jdebug.gif
 %%PORTDOCS%%share/doc/jde/html/jdebug-ug/images/jdebug_menu.gif
+%%PORTDOCS%%share/doc/jde/html/jdebug-ug/images/source_path.gif
 %%PORTDOCS%%share/doc/jde/html/jdebug-ug/images/window_config.gif
 %%PORTDOCS%%share/doc/jde/html/jdebug-ug/jdebug-ug-content.html
 %%PORTDOCS%%share/doc/jde/html/jdebug-ug/jdebug-ug-toc.html
@@ -224,33 +272,37 @@ share/java/jde/src/jde/wizards/Signature.java
 %%PORTDOCS%%share/doc/jde/tli_rbl/img/icon3.gif
 %%PORTDOCS%%share/doc/jde/tli_rbl/img/photo.gif
 %%PORTDOCS%%share/doc/jde/tli_rbl/tli_rbl.jar
+%%PORTDOCS%%share/doc/jde/tli_rbl/txt/jdb-ug-toc.txt
 %%PORTDOCS%%share/doc/jde/tli_rbl/txt/jde-ug-toc.txt
 %%PORTDOCS%%share/doc/jde/tli_rbl/txt/jdebug-ug-toc.txt
-@dirrm share/java/jde/bsh-commands/bsh/commands
-@dirrm share/java/jde/bsh-commands/bsh
-@dirrm share/java/jde/bsh-commands
-@dirrm share/java/jde/lib
-@dirrm share/java/jde/src/jde/debugger/command
-@dirrm share/java/jde/src/jde/debugger/expr
+@dirrm share/java/jde/src/jde/wizards
+@dirrm share/java/jde/src/jde/util
 @dirrm share/java/jde/src/jde/debugger/spec
+@dirrm share/java/jde/src/jde/debugger/expr
+@dirrm share/java/jde/src/jde/debugger/command
 @dirrm share/java/jde/src/jde/debugger
-@dirrm share/java/jde/src/jde/util
-@dirrm share/java/jde/src/jde/wizards
 @dirrm share/java/jde/src/jde
 @dirrm share/java/jde/src
+@dirrm share/java/jde/lib
+@dirrm share/java/jde/bsh-commands/bsh/commands
+@dirrm share/java/jde/bsh-commands/bsh
+@dirrm share/java/jde/bsh-commands
 @dirrm share/java/jde
 @unexec test -h %D/%%EMACS_VERSION_SITE_LISPDIR%%/jde/java && rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/jde/java
-%%PORTDOCS%%@dirrm share/doc/jde/html/bsh-ug/images
-%%PORTDOCS%%@dirrm share/doc/jde/html/bsh-ug
-%%PORTDOCS%%@dirrm share/doc/jde/html/css
-%%PORTDOCS%%@dirrm share/doc/jde/html/jde-ug/images
-%%PORTDOCS%%@dirrm share/doc/jde/html/jde-ug
+@unexec test -h %D/%%EMACS_VERSION_SITE_LISPDIR%%/java && rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/java
 %%PORTDOCS%%@dirrm share/doc/jde/html/jdebug-ug/images
 %%PORTDOCS%%@dirrm share/doc/jde/html/jdebug-ug
+%%PORTDOCS%%@dirrm share/doc/jde/html/jde-ug/images
+%%PORTDOCS%%@dirrm share/doc/jde/html/jde-ug
+%%PORTDOCS%%@dirrm share/doc/jde/html/jdb-ug/images
+%%PORTDOCS%%@dirrm share/doc/jde/html/jdb-ug
+%%PORTDOCS%%@dirrm share/doc/jde/html/css
+%%PORTDOCS%%@dirrm share/doc/jde/html/bsh-ug/images
+%%PORTDOCS%%@dirrm share/doc/jde/html/bsh-ug
 %%PORTDOCS%%@dirrm share/doc/jde/html
-%%PORTDOCS%%@dirrm share/doc/jde/tli_rbl/au
-%%PORTDOCS%%@dirrm share/doc/jde/tli_rbl/img
 %%PORTDOCS%%@dirrm share/doc/jde/tli_rbl/txt
+%%PORTDOCS%%@dirrm share/doc/jde/tli_rbl/img
+%%PORTDOCS%%@dirrm share/doc/jde/tli_rbl/au
 %%PORTDOCS%%@dirrm share/doc/jde/tli_rbl
 %%PORTDOCS%%@dirrm share/doc/jde
 %%PORTDOCS%%@unexec test -h %D/%%EMACS_VERSION_SITE_LISPDIR%%/jde/doc && rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/jde/doc