3 files changed, 98 insertions, 13 deletions

diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile
index 811dc1716b91..a814b32cdfa4 100644
--- a/editors/jedit/Makefile
+++ b/editors/jedit/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	jedit
-PORTVERSION=	3.0.2
+PORTVERSION=	3.1.0
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://members.nbci.com/romainguy/ \
 		http://members.xoom.com/romainguy/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${PORTNAME}${PORTVERSION:S/.//g}install.jar swingall.jar
+_DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}install
+DISTNAME=	${_DISTNAME:S/0install$/install/}
+DISTFILES=	${DISTNAME}.jar swingall.jar
 EXTRACT_ONLY=	
 
 MAINTAINER=	sobomax@FreeBSD.org
@@ -31,7 +33,7 @@ do-configure:
 
 do-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}| ; s|%%WRKDIR%%|${WRKDIR}|" ${FILESDIR}/instscript | \
-		${SETENV} CLASSPATH=${DISTDIR}/${PORTNAME}${PORTVERSION:S/.//g}install.jar:${DISTDIR}/swingall.jar \
+		${SETENV} CLASSPATH=${DISTDIR}/${DISTNAME}.jar:${DISTDIR}/swingall.jar \
 		${LOCALBASE}/bin/javavm installer.Install text
 	@${INSTALL_DATA} ${DISTDIR}/swingall.jar ${PREFIX}/share/java/jedit
 	@${INSTALL_SCRIPT} ${WRKDIR}/jedit.sh ${PREFIX}/bin/jedit
diff --git a/editors/jedit/distinfo b/editors/jedit/distinfo
index 0f1acfabaff8..f14f6de76eb1 100644
--- a/editors/jedit/distinfo
+++ b/editors/jedit/distinfo
@@ -1,2 +1,2 @@
-MD5 (jedit302install.jar) = e5e1d9493f0e7e706c66cd0874960b16
+MD5 (jedit31install.jar) = 72823aa3e836d878c42bc55bd18248b4
 MD5 (swingall.jar) = 356f8091f94afcb128a3477dec5e8755
diff --git a/editors/jedit/pkg-plist b/editors/jedit/pkg-plist
index 442cc8755dbb..0e316f955a5f 100644
--- a/editors/jedit/pkg-plist
+++ b/editors/jedit/pkg-plist
@@ -1,41 +1,68 @@
 bin/jedit
 share/java/jedit/doc/CHANGES.txt
+share/java/jedit/doc/COPYING.DOC.txt
 share/java/jedit/doc/COPYING.txt
 share/java/jedit/doc/ICONS.LICENSE.txt
 share/java/jedit/doc/NEWS.txt
 share/java/jedit/doc/README.txt
 share/java/jedit/doc/TODO.txt
 share/java/jedit/doc/users-guide/activity-log.html
+share/java/jedit/doc/users-guide/add-prefix-and-suffix.html
+share/java/jedit/doc/users-guide/api-guide.html
 share/java/jedit/doc/users-guide/basics.html
-share/java/jedit/doc/users-guide/beanshell-expr.html
 share/java/jedit/doc/users-guide/bracket-matching.html
 share/java/jedit/doc/users-guide/buffer-local.html
 share/java/jedit/doc/users-guide/buffers.html
+share/java/jedit/doc/users-guide/class-beanshell.html
+share/java/jedit/doc/users-guide/class-buffer.html
+share/java/jedit/doc/users-guide/class-dockablewindowmanager.html
+share/java/jedit/doc/users-guide/class-guiutilities.html
+share/java/jedit/doc/users-guide/class-jedittextarea.html
+share/java/jedit/doc/users-guide/class-macros.html
+share/java/jedit/doc/users-guide/class-miscutilities.html
+share/java/jedit/doc/users-guide/class-searchandreplace.html
+share/java/jedit/doc/users-guide/class-textutilities.html
+share/java/jedit/doc/users-guide/class-view.html
 share/java/jedit/doc/users-guide/cli-usage.html
 share/java/jedit/doc/users-guide/clipboard.html
 share/java/jedit/doc/users-guide/closing-exiting.html
 share/java/jedit/doc/users-guide/commenting.html
 share/java/jedit/doc/users-guide/customizing.html
+share/java/jedit/doc/users-guide/dialog-macro.html
 share/java/jedit/doc/users-guide/editing.html
 share/java/jedit/doc/users-guide/entering-text.html
 share/java/jedit/doc/users-guide/files.html
+share/java/jedit/doc/users-guide/folding.html
 share/java/jedit/doc/users-guide/global-opts.html
 share/java/jedit/doc/users-guide/globs.html
+share/java/jedit/doc/users-guide/helpful-methods.html
 share/java/jedit/doc/users-guide/history.html
 share/java/jedit/doc/users-guide/indent.html
 share/java/jedit/doc/users-guide/index.html
-share/java/jedit/doc/users-guide/installing-modes.html
 share/java/jedit/doc/users-guide/installing-plugins.html
 share/java/jedit/doc/users-guide/lines.html
-share/java/jedit/doc/users-guide/macro-record.html
-share/java/jedit/doc/users-guide/macro-temp.html
+share/java/jedit/doc/users-guide/macro-analysis.html
+share/java/jedit/doc/users-guide/macro-basics.html
+share/java/jedit/doc/users-guide/macro-index.html
+share/java/jedit/doc/users-guide/macro-tips-debugging.html
+share/java/jedit/doc/users-guide/macro-tips.html
+share/java/jedit/doc/users-guide/macros-console.html
+share/java/jedit/doc/users-guide/macros-java.html
+share/java/jedit/doc/users-guide/macros-misc.html
+share/java/jedit/doc/users-guide/macros-other-plugins.html
+share/java/jedit/doc/users-guide/macros-properties.html
+share/java/jedit/doc/users-guide/macros-search.html
+share/java/jedit/doc/users-guide/macros-text.html
 share/java/jedit/doc/users-guide/macros.html
 share/java/jedit/doc/users-guide/markers.html
+share/java/jedit/doc/users-guide/mode-catalog.html
 share/java/jedit/doc/users-guide/modes.html
 share/java/jedit/doc/users-guide/opening.html
+share/java/jedit/doc/users-guide/organizing-macros.html
 share/java/jedit/doc/users-guide/paragraphs.html
 share/java/jedit/doc/users-guide/plugins.html
 share/java/jedit/doc/users-guide/printing.html
+share/java/jedit/doc/users-guide/recording-macros.html
 share/java/jedit/doc/users-guide/regexps.html
 share/java/jedit/doc/users-guide/registers.html
 share/java/jedit/doc/users-guide/reloading.html
@@ -44,42 +71,92 @@ share/java/jedit/doc/users-guide/saving.html
 share/java/jedit/doc/users-guide/scrolling.html
 share/java/jedit/doc/users-guide/search-replace.html
 share/java/jedit/doc/users-guide/selection.html
-share/java/jedit/doc/users-guide/sessions.html
 share/java/jedit/doc/users-guide/settings-directory.html
 share/java/jedit/doc/users-guide/shortcuts.html
+share/java/jedit/doc/users-guide/simple-macros.html
+share/java/jedit/doc/users-guide/single-macros.html
+share/java/jedit/doc/users-guide/something-useful.html
 share/java/jedit/doc/users-guide/source-edit.html
 share/java/jedit/doc/users-guide/starting.html
+share/java/jedit/doc/users-guide/startup-macro.html
 share/java/jedit/doc/users-guide/syntax-hilite.html
 share/java/jedit/doc/users-guide/textarea.html
 share/java/jedit/doc/users-guide/threaded-io.html
+share/java/jedit/doc/users-guide/toc.xml
 share/java/jedit/doc/users-guide/undo-redo.html
 share/java/jedit/doc/users-guide/updating-plugins.html
+share/java/jedit/doc/users-guide/using-jedit.html
 share/java/jedit/doc/users-guide/vfs-browser.html
 share/java/jedit/doc/users-guide/views.html
 share/java/jedit/doc/users-guide/words.html
 share/java/jedit/doc/users-guide/writing-modes.html
-share/java/jedit/jars/EditBuddy.jar
+share/java/jedit/doc/welcome.html
 share/java/jedit/jars/Firewall.jar
 share/java/jedit/jars/LatestVersion.jar
 share/java/jedit/jars/PluginManager.jar
 share/java/jedit/jedit.jar
+share/java/jedit/macros/Console_Plugin/Display_Console_Output.bsh
+share/java/jedit/macros/Console_Plugin/Go_to_Console.bsh
+share/java/jedit/macros/Console_Plugin/Run_Last_Console_Command.bsh
+share/java/jedit/macros/Console_Plugin/Run_Perl_Script.bsh
 share/java/jedit/macros/Console_Plugin/Run_java.bsh
 share/java/jedit/macros/Console_Plugin/Run_javac.bsh
 share/java/jedit/macros/Console_Plugin/Run_jikes.bsh
 share/java/jedit/macros/Console_Plugin/Run_jmk.bsh
 share/java/jedit/macros/Console_Plugin/Run_make.bsh
-share/java/jedit/macros/Misc/Browse_Directory....bsh
-share/java/jedit/macros/Misc/Open_Path....bsh
-share/java/jedit/macros/Misc/Open_Selection.bsh
+share/java/jedit/macros/Files/Browse_Directory.bsh
+share/java/jedit/macros/Files/Close_All_Except_Active.bsh
+share/java/jedit/macros/Files/Open_Path.bsh
+share/java/jedit/macros/Files/Open_Selection.bsh
+share/java/jedit/macros/Java/Get_Class_Name.bsh
+share/java/jedit/macros/Java/Get_Package_Name.bsh
+share/java/jedit/macros/Java/Make_Get_and_Set_Methods.bsh
+share/java/jedit/macros/Java/Tidy_Block_Comments.bsh
+share/java/jedit/macros/Misc/Cascade_jEdit_Windows.bsh
+share/java/jedit/macros/Misc/Copy_Mode_Abbrevs.bsh
+share/java/jedit/macros/Misc/Display_Abbreviations.bsh
+share/java/jedit/macros/Misc/Display_Shortcuts.bsh
+share/java/jedit/macros/Misc/Evaluate_Buffer_in_BeanShell.bsh
+share/java/jedit/macros/Misc/Go_to_Text_Area.bsh
+share/java/jedit/macros/Misc/Notepad.bsh
+share/java/jedit/macros/Misc/Properties/Look_and_Feel_Properties.bsh
+share/java/jedit/macros/Misc/Properties/System_Properties.bsh
+share/java/jedit/macros/Misc/Properties/jEdit_Properties.bsh
+share/java/jedit/macros/Misc/Run_Macro_at_Caret.bsh
+share/java/jedit/macros/Misc/Show_Free_Memory.bsh
+share/java/jedit/macros/Other_Plugins/Go_to_Clipper.bsh
+share/java/jedit/macros/Other_Plugins/Go_to_File_System_Browser.bsh
+share/java/jedit/macros/Other_Plugins/List_Plugin_Internal_Names.bsh
+share/java/jedit/macros/Other_Plugins/Show_Dual_Diff.bsh
+share/java/jedit/macros/Search/Find_First_Occurrence.bsh
+share/java/jedit/macros/Search/Find_Last_Occurrence.bsh
+share/java/jedit/macros/Search/Find_Matching_File.bsh
+share/java/jedit/macros/Search/Find_Next_Occurrence.bsh
+share/java/jedit/macros/Search/Find_Occurrence.bsh
+share/java/jedit/macros/Search/Find_Previous_Occurrence.bsh
+share/java/jedit/macros/Search/Next_Char.bsh
+share/java/jedit/macros/Search/Return_From_Find.bsh
+share/java/jedit/macros/Search/Search_Buffer.bsh
+share/java/jedit/macros/Search/Search_Directory_Tree.bsh
+share/java/jedit/macros/Search/Write_HyperSearch_Results.bsh
+share/java/jedit/macros/Text/Add_Prefix_and_Suffix.bsh
+share/java/jedit/macros/Text/Delete_Marker_at_Caret.bsh
 share/java/jedit/macros/Text/Insert_Date.bsh
+share/java/jedit/macros/Text/Insert_Tag.bsh
+share/java/jedit/macros/Text/Make_Double_Box_Comment.bsh
 share/java/jedit/macros/Text/Reverse.bsh
 share/java/jedit/macros/Text/Rot13.bsh
+share/java/jedit/macros/Text/Write_File_Header.bsh
+share/java/jedit/modes/ada95.xml
 share/java/jedit/modes/asp.xml
 share/java/jedit/modes/assembly-x86.xml
 share/java/jedit/modes/awk.xml
+share/java/jedit/modes/b.xml
 share/java/jedit/modes/batch.xml
+share/java/jedit/modes/bcel.xml
 share/java/jedit/modes/beanshell.xml
 share/java/jedit/modes/c.xml
+share/java/jedit/modes/catalog
 share/java/jedit/modes/cobol.xml
 share/java/jedit/modes/coldfusion.xml
 share/java/jedit/modes/cplusplus.xml
@@ -90,6 +167,7 @@ share/java/jedit/modes/eiffel.xml
 share/java/jedit/modes/haskell.xml
 share/java/jedit/modes/html.xml
 share/java/jedit/modes/idl.xml
+share/java/jedit/modes/inform.xml
 share/java/jedit/modes/ini.xml
 share/java/jedit/modes/java.xml
 share/java/jedit/modes/javascript.xml
@@ -126,7 +204,12 @@ share/java/jedit/swingall.jar
 @dirrm share/java/jedit/site-props
 @dirrm share/java/jedit/modes
 @dirrm share/java/jedit/macros/Text
+@dirrm share/java/jedit/macros/Search
+@dirrm share/java/jedit/macros/Other_Plugins
+@dirrm share/java/jedit/macros/Misc/Properties
 @dirrm share/java/jedit/macros/Misc
+@dirrm share/java/jedit/macros/Java
+@dirrm share/java/jedit/macros/Files
 @dirrm share/java/jedit/macros/Console_Plugin
 @dirrm share/java/jedit/macros
 @dirrm share/java/jedit/jars