Update to version 2.8.0.2. Also use a runtime only version of the JFC.

PR:		18408
Submitted by:	maintainer

3 files changed, 47 insertions, 95 deletions

diff --git a/editors/jext/Makefile b/editors/jext/Makefile
index 106095e263c0..e75bf200e1fd 100644
--- a/editors/jext/Makefile
+++ b/editors/jext/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	jext
-PORTVERSION=	2.7.0.6
+PORTVERSION=	2.8.0.2
 CATEGORIES=	editors java
 MASTER_SITES=	http://members.xoom.com/romainguy/
-DISTNAME=	${PORTNAME}
+DISTFILES=	${PORTNAME}${EXTRACT_SUFX} swingall.jar
 
 MAINTAINER=	sobomax@altavista.net
 
-RUN_DEPENDS=	${JAVAVM}:${PORTSDIR}/java/jdk \
-		${JFC}:${PORTSDIR}/java/jfc
+RUN_DEPENDS=	${JAVAVM}:${PORTSDIR}/java/jdk
 
 FETCH_BEFORE_ARGS=	-b
 
+EXTRACT_ONLY=	${PORTNAME}${EXTRACT_SUFX}
 WRKSRC=		${WRKDIR}
 USE_ZIP=	yes
 USE_XLIB=	yes
 NO_BUILD=	yes
 
 JDK_VERSION=	1.1.8
-JFC_VERSION=	1.1.1
 JAVAVM=		${LOCALBASE}/jdk${JDK_VERSION}/bin/java
-JFC=		${LOCALBASE}/share/java/classes/jfc-${JFC_VERSION}/swing.jar
 
 .if defined(USE_JIT)
 RUN_DEPENDS+=	${LOCALBASE}/jdk${JDK_VERSION}/lib/${ARCH}/green_threads/libshujit.so:${PORTSDIR}/java/shujit
@@ -41,17 +39,18 @@ DATATARG=	jext.jar icons plugins scripts xtools
 post-extract:
 		@${PERL} -pi -e "s.\x0D.." ${WRKSRC}/jext
 
-pre-install:
+do-configure:
 		@${PERL} -pi -e "s|%JAVAVM%|${JAVAVM}|g" ${WRKSRC}/jext
 		@${PERL} -pi -e "s|%JEXT_HOME%|${INSTSBDR}|g" ${WRKSRC}/jext
 		@${PERL} -pi -e "s|%JAVAJIT%|${JAVAJIT}|g" ${WRKSRC}/jext
-		@${PERL} -pi -e "s|%JFC%|${JFC}|g" ${WRKSRC}/jext
+		@${PERL} -pi -e "s|%JFC%|${INSTSBDR}/swingall.jar|g" ${WRKSRC}/jext
 
 do-install:
 		@${MKDIR} ${INSTSBDR}
 		@${INSTALL_SCRIPT} ${WRKSRC}/jext ${PREFIX}/bin
 		@(cd ${WRKSRC} && ${TAR} -c -f - ${DATATARG}) \
 			| (cd ${INSTSBDR} && ${TAR} --unlink -x -f -)
+		@${INSTALL_DATA} ${DISTDIR}/swingall.jar ${INSTSBDR}
 .if !defined(NOPORTDOCS)
 		@${MKDIR} ${PREFIX}/share/doc/java/jext
 		@(cd ${WRKSRC}/doc && ${TAR} -c -f - * ) \
diff --git a/editors/jext/distinfo b/editors/jext/distinfo
index 8bbd3ed484b4..2ff9e0e90c3c 100644
--- a/editors/jext/distinfo
+++ b/editors/jext/distinfo
@@ -1 +1,2 @@
-MD5 (jext.zip) = 7c35664e7fa3dc0f783b9a1e34c4410d
+MD5 (jext.zip) = 0261905715631564adcb48bc613c8d43
+MD5 (swingall.jar) = 356f8091f94afcb128a3477dec5e8755
diff --git a/editors/jext/pkg-plist b/editors/jext/pkg-plist
index 633f92ed5713..adb3edea1a7a 100644
--- a/editors/jext/pkg-plist
+++ b/editors/jext/pkg-plist
@@ -1,8 +1,6 @@
 bin/jext
 share/doc/java/jext/Copying.txt
 share/doc/java/jext/History.txt
-share/doc/java/jext/Jext-fr.txt
-share/doc/java/jext/Scripts.txt
 share/doc/java/jext/index.html
 share/doc/java/jext/jext-console.html
 share/doc/java/jext/jext-editor.html
@@ -11,102 +9,56 @@ share/doc/java/jext/jext-menus-file.html
 share/doc/java/jext/jext-menus-jext.html
 share/doc/java/jext/jext-menus-plugins.html
 share/doc/java/jext/jext-menus-search.html
+share/doc/java/jext/jext-menus-tools.html
 share/doc/java/jext/jext-menus.html
 share/doc/java/jext/jext.gif
-share/doc/java/jext/source/bin/bin.txt
-share/doc/java/jext/source/dtd/xtiny-doc-page.dtd
-share/doc/java/jext/source/dtd/xtiny-doc.dtd
-share/doc/java/jext/source/gaia-batch
-share/doc/java/jext/source/gaia.bat
-share/doc/java/jext/source/xml/index.xml
-share/doc/java/jext/source/xml/jext-console.xml
-share/doc/java/jext/source/xml/jext-editor.xml
-share/doc/java/jext/source/xml/jext-menus-edit.xml
-share/doc/java/jext/source/xml/jext-menus-file.xml
-share/doc/java/jext/source/xml/jext-menus-jext.xml
-share/doc/java/jext/source/xml/jext-menus-plugins.xml
-share/doc/java/jext/source/xml/jext-menus-search.xml
-share/doc/java/jext/source/xml/jext-menus.xml
-share/doc/java/jext/source/xsl/xtiny-doc-page.xsl
-share/doc/java/jext/source/xsl/xtiny-doc.xsl
 share/doc/java/jext/stylesheet.css
 share/java/jext/icons/jext.ico
 share/java/jext/icons/jext.xpm
 share/java/jext/jext.jar
+share/java/jext/plugins/DawnServer.jar
 share/java/jext/plugins/DnD.jar
-share/java/jext/plugins/DnD/DnD.props.xml
-share/java/jext/plugins/DnD/DnDHandler.java
-share/java/jext/plugins/DnD/DnDPlugin.java
 share/java/jext/plugins/FastFind.jar
-share/java/jext/plugins/FastFind/FastFind.java
-share/java/jext/plugins/FastFind/FastFind.props.xml
-share/java/jext/plugins/FastFind/FastFindOptions.java
-share/java/jext/plugins/FastFind/FastFindPlugin.java
 share/java/jext/plugins/FastSyntax.jar
-share/java/jext/plugins/FastSyntax/FastSyntax.java
-share/java/jext/plugins/FastSyntax/FastSyntax.props.xml
-share/java/jext/plugins/FastSyntax/FastSyntaxOptions.java
-share/java/jext/plugins/FastSyntax/FastSyntaxPlugin.java
 share/java/jext/plugins/HTML.jar
-share/java/jext/plugins/HTML/HTML.props.xml
-share/java/jext/plugins/HTML/HTMLIndenter.java
-share/java/jext/plugins/HTML/HTMLPlugin.java
-share/java/jext/plugins/HTML/IndenterOptionPane.java
-share/java/jext/plugins/HTML/NextTag.java
-share/java/jext/plugins/HTML/PreviousTag.java
-share/java/jext/plugins/HTML/ToAccents.java
-share/java/jext/plugins/HTML/ToEntities.java
 share/java/jext/plugins/HyperTyper.jar
-share/java/jext/plugins/HyperTyper/HyperTyper.props.xml
-share/java/jext/plugins/HyperTyper/hyperTyper/HyperTyperAction.java
-share/java/jext/plugins/HyperTyper/hyperTyper/HyperTyperHotkey.java
-share/java/jext/plugins/HyperTyper/hyperTyper/HyperTyperMapping.java
-share/java/jext/plugins/HyperTyper/hyperTyper/HyperTyperMappingGrid.java
-share/java/jext/plugins/HyperTyper/hyperTyper/HyperTyperObjectManager.java
-share/java/jext/plugins/HyperTyper/hyperTyper/HyperTyperOption.java
-share/java/jext/plugins/HyperTyper/hyperTyper/HyperTyperPlugin.java
-share/java/jext/plugins/HyperTyper/hyperTyper/HyperTyperSequenceList.java
-share/java/jext/plugins/HyperTyper/hyperTyper/HyperTyperWindowGUI.java
-share/java/jext/plugins/HyperTyper/hyperTyper/Sequence.java
-share/java/jext/plugins/HyperTyper/hyperTyper/SequenceChangedEvent.java
-share/java/jext/plugins/HyperTyper/hyperTyper/SequenceChangedListener.java
+share/java/jext/plugins/JCompile.jar
 share/java/jext/plugins/Java.jar
-share/java/jext/plugins/Java/Beautifier.java
-share/java/jext/plugins/Java/ClassBrowser.java
-share/java/jext/plugins/Java/ClassBrowserGUI.java
-share/java/jext/plugins/Java/HTMLViewer.java
-share/java/jext/plugins/Java/JSBeautifier.java
-share/java/jext/plugins/Java/JSFormatter.java
-share/java/jext/plugins/Java/JSLineBreaker.java
-share/java/jext/plugins/Java/Java.props.xml
-share/java/jext/plugins/Java/JavaPlugin.java
-share/java/jext/plugins/Java/MethodsSeeker.java
-share/java/jext/plugins/Java/Seeker.java
-share/java/jext/plugins/TextMode.jar
-share/java/jext/plugins/TextMode/Text.props.xml
-share/java/jext/plugins/TextMode/TextMode.java
-share/java/jext/plugins/TextMode/TextModePlugin.java
-share/java/jext/plugins/TextMode/syntax/TextTokenMarker.java
-share/java/jext/scripts/insert_date_at_anchor.jext-script
-share/java/jext/scripts/os.jext-script
+share/java/jext/plugins/Print.jar
+share/java/jext/scripts/CopyFile.jext-script
+share/java/jext/scripts/HelloWorld.jext-script
+share/java/jext/scripts/JavaCounter.jext-script
+share/java/jext/scripts/Rot13.jext-script
+share/java/jext/scripts/help-summary
+share/java/jext/scripts/help-summary-jext-only
+share/java/jext/scripts/lang/err/error
+share/java/jext/scripts/lang/loop/do
+share/java/jext/scripts/lang/loop/loops
+share/java/jext/scripts/lang/loop/subvariable
+share/java/jext/scripts/lang/misc/global
+share/java/jext/scripts/lang/misc/misc
+share/java/jext/scripts/lang/misc/package
+share/java/jext/scripts/lang/naming/naming
+share/java/jext/scripts/lang/stack/roll
+share/java/jext/scripts/lang/string/string
+share/java/jext/scripts/lang/test/if
+share/java/jext/scripts/lang/test/types
+share/java/jext/scripts/lang/util/random
+share/java/jext/scripts/lang/util/time
+share/java/jext/swingall.jar
 share/java/jext/xtools/xinsert.dtd
-@dirrm share/doc/java/jext/source/bin
-@dirrm share/doc/java/jext/source/dtd
-@dirrm share/doc/java/jext/source/xml
-@dirrm share/doc/java/jext/source/xsl
-@dirrm share/doc/java/jext/source
-@dirrm share/doc/java/jext
-@dirrm share/java/jext/icons
-@dirrm share/java/jext/plugins/DnD
-@dirrm share/java/jext/plugins/FastFind
-@dirrm share/java/jext/plugins/FastSyntax
-@dirrm share/java/jext/plugins/HTML
-@dirrm share/java/jext/plugins/HyperTyper/hyperTyper
-@dirrm share/java/jext/plugins/HyperTyper
-@dirrm share/java/jext/plugins/Java
-@dirrm share/java/jext/plugins/TextMode/syntax
-@dirrm share/java/jext/plugins/TextMode
-@dirrm share/java/jext/plugins
-@dirrm share/java/jext/scripts
 @dirrm share/java/jext/xtools
+@dirrm share/java/jext/scripts/lang/util
+@dirrm share/java/jext/scripts/lang/test
+@dirrm share/java/jext/scripts/lang/string
+@dirrm share/java/jext/scripts/lang/stack
+@dirrm share/java/jext/scripts/lang/naming
+@dirrm share/java/jext/scripts/lang/misc
+@dirrm share/java/jext/scripts/lang/loop
+@dirrm share/java/jext/scripts/lang/err
+@dirrm share/java/jext/scripts/lang
+@dirrm share/java/jext/scripts
+@dirrm share/java/jext/plugins
+@dirrm share/java/jext/icons
 @dirrm share/java/jext
+@dirrm share/doc/java/jext