Maintainer update to version 2.2.9

PR:		ports/45231
Submitted by:	Kimura Fuyuki <fuyuki@hadaly.org>

6 files changed, 43 insertions, 57 deletions

diff --git a/java/jde/Makefile b/java/jde/Makefile
index f2772402183a..8980cb3f9fc2 100644
--- a/java/jde/Makefile
+++ b/java/jde/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	jde
-PORTVERSION=	2.2.8
-PORTREVISION=	1
+PORTVERSION=	2.2.9
 CATEGORIES=	java elisp
 MASTER_SITES=	http://jdee.sunsite.dk/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	${PORTNAME}-latest
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 
 EMACS_PORT_NAME?=	emacs21
 
@@ -35,11 +33,9 @@ LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/jde
 JAVADIR=	${PREFIX}/share/java/jde
 
 post-patch:
-# An ugly patch for a troublesome varname change in the browse-url.
-.if ${EMACS_PORT_NAME} == "emacs21"
-	${REINPLACE_CMD} -e 's/browse-url-new-window-p/browse-url-new-window-flag/' \
-		${BUILD_WRKSRC}/*.el
-.endif
+	${REINPLACE_CMD} -e '/test -d/d' ${BUILD_WRKSRC}/${MAKEFILE}
+	${REINPLACE_CMD} -e 's|^      dir|"${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/jde/"|' \
+		${BUILD_WRKSRC}/jde.el
 
 do-install:
 	${MKDIR} ${LISPDIR}
@@ -48,7 +44,7 @@ do-install:
 .endfor
 	${MKDIR} ${JAVADIR}
 .for i in bsh-commands lib src
-	${CP} -pR ${WRKSRC}/java/${i} ${JAVADIR}
+	${CP} -R ${WRKSRC}/java/${i} ${JAVADIR}
 .endfor
 	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/jtags ${PREFIX}/bin
 
@@ -60,7 +56,7 @@ post-install:
 	${CP} ${BUILD_WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .for i in html tli_rbl
-	${CP} -pR ${WRKSRC}/doc/${i} ${DOCSDIR}
+	${CP} -R ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 	${LN} -sf ${DOCSDIR} ${LISPDIR}/doc
 .endif
diff --git a/java/jde/distinfo b/java/jde/distinfo
index c34d3fbe6516..6ec0620b660d 100644
--- a/java/jde/distinfo
+++ b/java/jde/distinfo
@@ -1 +1 @@
-MD5 (jde-latest.tar.gz) = 072b1f25d0198621fa46178776aa817b
+MD5 (jde-2.2.9.tar.gz) = df82cb528e2cf0d7cddaa1a430bce471
diff --git a/java/jde/files/patch-aa b/java/jde/files/patch-aa
deleted file mode 100644
index 798b0ab5e8fe..000000000000
--- a/java/jde/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- lisp/jde.el.orig	Thu Dec 13 17:37:42 2001
-+++ lisp/jde.el	Thu Jan 10 17:59:35 2002
-@@ -1672,8 +1672,6 @@
-       (setq dir (file-name-directory (locate-library "jde"))))
-     (if dir
- 	(nsubstitute ?/ ?\\ dir))
--    (if (not jde-xemacsp)
--	(setq dir (substring dir 0 (- (length dir) 5))))
-     dir))
-
- (defun jde-find-jde-doc-directory ()
diff --git a/java/jde/files/patch-ab b/java/jde/files/patch-ab
deleted file mode 100644
index a40a9fd7357f..000000000000
--- a/java/jde/files/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
---- lisp/jde-db.el.orig	Mon Jan  7 17:18:11 2002
-+++ lisp/jde-db.el	Tue Jan  8 14:03:16 2002
-@@ -728,6 +728,10 @@
- 			   (jde-db-pkg-to-path package) curr-dir)))))
- 	(setq n (1+ n))))))
-
-+(defun gud-new-keymap (map)
-+  "Return a new keymap which inherits from MAP and has name `Gud'."
-+  (nconc (make-sparse-keymap "Gud") map))
-+
- ;; Fixes a bug in gud-make-debug-menu
- (defun jde-db-make-debug-menu ()
-   "Make sure the current local map has a [menu-bar debug] submap.
-@@ -748,7 +752,7 @@
- 	 (jde-db-search-src-dirs f jde-db-last-package)))
-     (if source-dir
- 	(let ((source-file
--	       (concat source-dir f)))	
-+	       (expand-file-name f source-dir)))
- 	  (save-excursion
- 	    (let ((buf (find-file-noselect source-file)))
- 	      (set-buffer buf)
-@@ -760,6 +764,8 @@
- 			(add-menu nil "Jdb" jde-db-xemacs-menu)))
- 		(progn
- 		  (jde-db-make-debug-menu)
-+		  (local-set-key [menu-bar debug finish] nil)
-+		  (local-set-key [menu-bar debug tbreak] nil)
- 		  (local-set-key [menu-bar debug refresh] nil)
- 		  (local-set-key [menu-bar debug stepi] nil)
- 		  (local-set-key [menu-bar debug up] '("Up Stack" . gud-up))
diff --git a/java/jde/pkg-descr b/java/jde/pkg-descr
index 6fb303be4843..dfe50bad84c3 100644
--- a/java/jde/pkg-descr
+++ b/java/jde/pkg-descr
@@ -14,6 +14,3 @@ JavaSoft's JDK). JDEE features include:
   - Java source interpreter (Pat Neimeyer's BeanShell)
 
 WWW: http://jdee.sunsite.dk/
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/java/jde/pkg-plist b/java/jde/pkg-plist
index 8715e26f3b51..5c2eb0a33594 100644
--- a/java/jde/pkg-plist
+++ b/java/jde/pkg-plist
@@ -1,11 +1,19 @@
 bin/jtags
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/beanshell.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/beanshell.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/efc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/efc.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/java.bnf
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-ant.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-ant.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-autoload.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-autoload.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-bug.el
 %%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-compat.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-compat.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-compile.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-compile.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-complete.el
@@ -32,8 +40,12 @@ bin/jtags
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-javadoc-gen.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-javadoc.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-javadoc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-jdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-jdb.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-make.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-make.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-open-source.el
+%%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.el
@@ -42,6 +54,8 @@ bin/jtags
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-run.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-stat.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-stat.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-util.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-which-method.el
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-which-method.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/jde/jde-widgets.el
@@ -57,7 +71,9 @@ bin/jtags
 @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/whichClass.bsh
+share/java/jde/lib/LICENSE.checkstyle
 share/java/jde/lib/bsh.jar
+share/java/jde/lib/checkstyle-all.jar
 share/java/jde/lib/jde.jar
 share/java/jde/src/jde/debugger/CommandStream.java
 share/java/jde/src/jde/debugger/Debug.java
@@ -87,6 +103,7 @@ share/java/jde/src/jde/debugger/command/DebugCommand.java
 share/java/jde/src/jde/debugger/command/DebugCommandFactory.java
 share/java/jde/src/jde/debugger/command/DebugProcessCommand.java
 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/GetArray.java
@@ -135,9 +152,17 @@ 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/ClassInfo.java
+share/java/jde/src/jde/util/ClassPathDir.java
+share/java/jde/src/jde/util/ClassPathEntry.java
+share/java/jde/src/jde/util/ClassPathZip.java
+share/java/jde/src/jde/util/CompileServer.java
 share/java/jde/src/jde/util/Completion.java
 share/java/jde/src/jde/util/DynamicClassLoader.java
+share/java/jde/src/jde/util/ImmutableClassPathEntry.java
 share/java/jde/src/jde/util/JdeUtilities.java
+share/java/jde/src/jde/util/MultiValueMap.java
+share/java/jde/src/jde/util/ProjectClasses.java
 share/java/jde/src/jde/wizards/AbstractClassFactory.java
 share/java/jde/src/jde/wizards/ClassRegistry.java
 share/java/jde/src/jde/wizards/DefaultNameFactory.java
@@ -166,8 +191,18 @@ share/java/jde/src/jde/wizards/Signature.java
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/TemplateList.gif
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/WorkingDirectory.gif
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/classes_menu1.gif
+%%PORTDOCS%%share/doc/jde/html/jde-ug/images/compile_buffer.gif
+%%PORTDOCS%%share/doc/jde/html/jde-ug/images/completion_sel_method.gif
+%%PORTDOCS%%share/doc/jde/html/jde-ug/images/find_minibuf_prompt_dirs.gif
+%%PORTDOCS%%share/doc/jde/html/jde-ug/images/find_minibuf_prompt_regex.gif
+%%PORTDOCS%%share/doc/jde/html/jde-ug/images/find_minibuf_result.gif
+%%PORTDOCS%%share/doc/jde/html/jde-ug/images/find_options_buffer.gif
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/jdemenu.gif
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/keybindings.gif
+%%PORTDOCS%%share/doc/jde/html/jde-ug/images/regjdk1.gif
+%%PORTDOCS%%share/doc/jde/html/jde-ug/images/regjdk2.gif
+%%PORTDOCS%%share/doc/jde/html/jde-ug/images/regjdk3.gif
+%%PORTDOCS%%share/doc/jde/html/jde-ug/images/seljdk1.gif
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/speedbar1.gif
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/speedbar2.gif
 %%PORTDOCS%%share/doc/jde/html/jde-ug/images/speedbar3.gif