Update to 3.0.2.

4 files changed, 263 insertions, 100 deletions

diff --git a/editors/jext/Makefile b/editors/jext/Makefile
index d75728595df2..a654cedd1b1b 100644
--- a/editors/jext/Makefile
+++ b/editors/jext/Makefile
@@ -6,20 +6,16 @@
 #
 
 PORTNAME=	jext
-PORTVERSION=	2.8.1.2
+PORTVERSION=	3.0.2
 CATEGORIES=	editors java
-MASTER_SITES=	http://www.jext.org/ \
-		ftp://jext.sourceforge.net/pub/jext/archives/ \
-		http://members.nbci.com/romainguy/ \
-		http://members.xoom.com/romainguy/
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} swingall.jar
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	jext
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 RUN_DEPENDS=	${JAVAVM}:${PORTSDIR}/java/javavmwrapper \
-		${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jre
+		${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jdk13
 
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 WRKSRC=		${WRKDIR}
 USE_XLIB=	yes
 NO_BUILD=	yes
@@ -28,25 +24,21 @@ JAVAVM?=	${LOCALBASE}/bin/javavm
 
 INSTSBDR=	${PREFIX}/share/java/jext
 
-pre-patch:
-	@${PERL} -pi -e 's.\x0D..' ${WRKSRC}/bin/jext.sh
-
 do-configure:
-	@${PERL} -pi -e 's|%%JAVAVM%%|${JAVAVM}|g			; \
-			 s|%%JEXT_HOME%%|${INSTSBDR}|g			; \
-			 s|%%JFC%%|${INSTSBDR}/lib/swingall.jar|g'	  \
-			 ${WRKSRC}/bin/jext.sh
+	@${PERL} -pi -e 's|%%JAVAVM%%|${JAVAVM}|g ; \
+			 s|%%JEXT_HOME%%|${INSTSBDR}|g'	${WRKSRC}/bin/jext
 
 do-install:
 	@${MKDIR} ${INSTSBDR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/bin/jext.sh ${PREFIX}/bin/jext
-	@(cd ${WRKSRC} && ${TAR} -c -f - LICENSE README bin lib) \
-		| (cd ${INSTSBDR} && ${TAR} --unlink -x -f -)
-	@${INSTALL_DATA} ${DISTDIR}/swingall.jar ${INSTSBDR}/lib
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/java/jext
-	@(cd ${WRKSRC}/docs && ${TAR} -c -f - * ) \
-		| (cd ${PREFIX}/share/doc/java/jext && ${TAR} --unlink -x -f -)
-.endif
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/jext ${PREFIX}/bin/jext
+	@(cd ${WRKSRC} && ${TAR} -c -f - Jython-LICENSE LICENSE README \
+		History.txt Names.txt bin lib) | \
+		(cd ${INSTSBDR} && ${TAR} --unlink -x -f -)
+
+post-install:
+	@${ECHO_MSG} "--------------------------------------------------------------------------------"
+	@${ECHO_MSG} " Please note that Java2 platform (jdk/jre-1.2.x or later) is required to run"
+	@${ECHO_MSG} " this program."
+	@${ECHO_MSG} "--------------------------------------------------------------------------------"
 
 .include <bsd.port.mk>
diff --git a/editors/jext/distinfo b/editors/jext/distinfo
index eeda5e21c501..5dd90b2dceaf 100644
--- a/editors/jext/distinfo
+++ b/editors/jext/distinfo
@@ -1,2 +1 @@
-MD5 (jext-2.8.1.2.tar.gz) = 155173c920f89495bcb1934c46faf626
-MD5 (swingall.jar) = 356f8091f94afcb128a3477dec5e8755
+MD5 (jext-3.0.2.tar.gz) = ea53e7e1c2f14b0a0c1c2d93de7df081
diff --git a/editors/jext/files/patch-aa b/editors/jext/files/patch-aa
index 090d1822726f..40c1af123b66 100644
--- a/editors/jext/files/patch-aa
+++ b/editors/jext/files/patch-aa
@@ -1,19 +1,33 @@
---- bin/jext.sh.orig	Tue Aug 22 00:07:57 2000
-+++ bin/jext.sh	Tue Aug 22 00:08:38 2000
-@@ -5,11 +5,15 @@
- # Set the JEXT_HOME to /usr/local/jext and add this to your PATH.
- # Norbert Seidel
+
+$FreeBSD$
+
+--- bin/jext	2002/03/05 12:28:20	1.1
++++ bin/jext	2002/03/05 12:31:15
+@@ -26,6 +26,10 @@
+     exit 0
+ fi
  
 +JEXT_HOME=%%JEXT_HOME%%
-+CLASSPATH=$CLASSPATH:%%JFC%%:$JEXT_HOME/lib/jext.jar
-+export CLASSPATH
 +export JEXT_HOME
- # Add links to plugins
- if [ ! -d "$HOME/.jext" ]; then
-    mkdir -p $HOME/.jext/xinsert
-    ln -s $JEXT_HOME/bin/plugins $HOME/.jext
- fi
- 
--java -classpath $JEXT_HOME/lib/jext.jar com.chez.powerteam.jext.Jext $* &
-+exec %%JAVAVM%% com.chez.powerteam.jext.Jext $*
++JAVA_CMD=%%JAVAVM%%
++
+ # Guess for JEXT_HOME if not set already
+ if [ -z "$JEXT_HOME" ] ; then
+     # strip "/bin/sometext" from script path
+@@ -59,11 +63,11 @@
+ # Directories are done
+ ##
+      
+-if [ "$JAVA_HOME" = "" ] ; then
+-    echo "You have not set the JAVA_HOME environment variable."
+-    echo "I'll still load Jext but you may encounter font warnings"
+-    echo "and other nasties."
+-fi
++#if [ "$JAVA_HOME" = "" ] ; then
++#    echo "You have not set the JAVA_HOME environment variable."
++#    echo "I'll still load Jext but you may encounter font warnings"
++#    echo "and other nasties."
++#fi
  
+ # Allows for those with varying JDKs and standard calls to java
+ if [ -z "$JAVA_CMD" ] ; then
diff --git a/editors/jext/pkg-plist b/editors/jext/pkg-plist
index 6695473bc16c..279165624cf3 100644
--- a/editors/jext/pkg-plist
+++ b/editors/jext/pkg-plist
@@ -1,76 +1,234 @@
 bin/jext
-share/doc/java/jext/History.txt
-share/doc/java/jext/Perl5-Syntax.html
-share/doc/java/jext/index.html
-share/doc/java/jext/jext-console.html
-share/doc/java/jext/jext-editor.html
-share/doc/java/jext/jext-menus-edit.html
-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-search.html
-share/doc/java/jext/jext-xinsert.html
-share/doc/java/jext/jext.gif
-share/doc/java/jext/stylesheet.css
+share/java/jext/History.txt
+share/java/jext/Jython-LICENSE
 share/java/jext/LICENSE
+share/java/jext/Names.txt
 share/java/jext/README
+share/java/jext/bin/Jext.exe
+share/java/jext/bin/MouseWheel.dll
+share/java/jext/bin/dawn.bat
 share/java/jext/bin/icons/jext.ico
 share/java/jext/bin/icons/jext.xpm
+share/java/jext/bin/jext
 share/java/jext/bin/jext.bat
 share/java/jext/bin/jext.js
 share/java/jext/bin/jext.ncf
-share/java/jext/bin/jext.sh
-share/java/jext/bin/jext.sh.orig
-share/java/jext/bin/plugins/CodeMaster.jar
-share/java/jext/bin/plugins/DnD.jar
-share/java/jext/bin/plugins/FastFind.jar
-share/java/jext/bin/plugins/FastSyntax.jar
+share/java/jext/bin/jext.orig
+share/java/jext/bin/jextlauncher.ini
+share/java/jext/bin/lang/Français_pack.jar
+share/java/jext/bin/plugins/FindAll.jar
 share/java/jext/bin/plugins/HTML.jar
 share/java/jext/bin/plugins/HyperTyper.jar
 share/java/jext/bin/plugins/Java.jar
-share/java/jext/bin/plugins/Print.jar
-share/java/jext/bin/plugins/QuickMake.jar
-share/java/jext/bin/scripts/CopyFile.jext-script
-share/java/jext/bin/scripts/HelloWorld.jext-script
-share/java/jext/bin/scripts/JavaCounter.jext-script
-share/java/jext/bin/scripts/Rot13.jext-script
-share/java/jext/bin/scripts/ScriptLoader.jext-script
-share/java/jext/bin/scripts/help-summary
-share/java/jext/bin/scripts/help-summary-jext-only
-share/java/jext/bin/scripts/lang/err/error
-share/java/jext/bin/scripts/lang/javaccess/swing.jext-script
-share/java/jext/bin/scripts/lang/loop/do
-share/java/jext/bin/scripts/lang/loop/loops
-share/java/jext/bin/scripts/lang/loop/subvariable
-share/java/jext/bin/scripts/lang/misc/global
-share/java/jext/bin/scripts/lang/misc/misc
-share/java/jext/bin/scripts/lang/misc/package
-share/java/jext/bin/scripts/lang/naming/naming
-share/java/jext/bin/scripts/lang/stack/roll
-share/java/jext/bin/scripts/lang/string/string
-share/java/jext/bin/scripts/lang/test/if
-share/java/jext/bin/scripts/lang/test/types
-share/java/jext/bin/scripts/lang/util/random
-share/java/jext/bin/scripts/lang/util/time
+share/java/jext/bin/plugins/KLNF.jar
+share/java/jext/bin/plugins/PHPBrowse.jar
+share/java/jext/bin/plugins/PyBrowse.jar
+share/java/jext/bin/plugins/WheelMouse.jar
+share/java/jext/bin/plugins/XMLBrowse.jar
+share/java/jext/bin/templates/JSP/JSP.jsp
+share/java/jext/bin/templates/JSP/UseBean.jsp
+share/java/jext/bin/templates/Java/Class.java
+share/java/jext/bin/templates/Java/Interface.java
+share/java/jext/bin/templates/Java/Main.java
+share/java/jext/bin/templates/Jext/Action.java
+share/java/jext/bin/templates/Jext/OneClickAction.java
+share/java/jext/bin/templates/Jext/Plugin.java
+share/java/jext/bin/templates/Jext/Properties.props.xml
+share/java/jext/bin/templates/Jext/XInsert.insert.xml
+share/java/jext/lib/Lib/BaseHTTPServer.py
+share/java/jext/lib/Lib/CGIHTTPServer.py
+share/java/jext/lib/Lib/ConfigParser.py
+share/java/jext/lib/Lib/Cookie.py
+share/java/jext/lib/Lib/MimeWriter.py
+share/java/jext/lib/Lib/Queue.py
+share/java/jext/lib/Lib/SimpleHTTPServer.py
+share/java/jext/lib/Lib/SocketServer.py
+share/java/jext/lib/Lib/StringIO.py
+share/java/jext/lib/Lib/UserDict.py
+share/java/jext/lib/Lib/UserList.py
+share/java/jext/lib/Lib/UserString.py
+share/java/jext/lib/Lib/__future__.py
+share/java/jext/lib/Lib/anydbm.py
+share/java/jext/lib/Lib/atexit.py
+share/java/jext/lib/Lib/base64.py
+share/java/jext/lib/Lib/bdb.py
+share/java/jext/lib/Lib/binhex.py
+share/java/jext/lib/Lib/bisect.py
+share/java/jext/lib/Lib/calendar.py
+share/java/jext/lib/Lib/cgi.py
+share/java/jext/lib/Lib/cmd.py
+share/java/jext/lib/Lib/code.py
+share/java/jext/lib/Lib/codecs.py
+share/java/jext/lib/Lib/colorsys.py
+share/java/jext/lib/Lib/commands.py
+share/java/jext/lib/Lib/compileall.py
+share/java/jext/lib/Lib/copy.py
+share/java/jext/lib/Lib/copy_reg.py
+share/java/jext/lib/Lib/dircache.py
+share/java/jext/lib/Lib/dospath.py
+share/java/jext/lib/Lib/dumbdbm.py
+share/java/jext/lib/Lib/encodings/__init__.py
+share/java/jext/lib/Lib/encodings/aliases.py
+share/java/jext/lib/Lib/encodings/ascii.py
+share/java/jext/lib/Lib/encodings/charmap.py
+share/java/jext/lib/Lib/encodings/cp037.py
+share/java/jext/lib/Lib/encodings/cp1006.py
+share/java/jext/lib/Lib/encodings/cp1026.py
+share/java/jext/lib/Lib/encodings/cp1250.py
+share/java/jext/lib/Lib/encodings/cp1251.py
+share/java/jext/lib/Lib/encodings/cp1252.py
+share/java/jext/lib/Lib/encodings/cp1253.py
+share/java/jext/lib/Lib/encodings/cp1254.py
+share/java/jext/lib/Lib/encodings/cp1255.py
+share/java/jext/lib/Lib/encodings/cp1256.py
+share/java/jext/lib/Lib/encodings/cp1257.py
+share/java/jext/lib/Lib/encodings/cp1258.py
+share/java/jext/lib/Lib/encodings/cp424.py
+share/java/jext/lib/Lib/encodings/cp437.py
+share/java/jext/lib/Lib/encodings/cp500.py
+share/java/jext/lib/Lib/encodings/cp737.py
+share/java/jext/lib/Lib/encodings/cp775.py
+share/java/jext/lib/Lib/encodings/cp850.py
+share/java/jext/lib/Lib/encodings/cp852.py
+share/java/jext/lib/Lib/encodings/cp855.py
+share/java/jext/lib/Lib/encodings/cp856.py
+share/java/jext/lib/Lib/encodings/cp857.py
+share/java/jext/lib/Lib/encodings/cp860.py
+share/java/jext/lib/Lib/encodings/cp861.py
+share/java/jext/lib/Lib/encodings/cp862.py
+share/java/jext/lib/Lib/encodings/cp863.py
+share/java/jext/lib/Lib/encodings/cp864.py
+share/java/jext/lib/Lib/encodings/cp865.py
+share/java/jext/lib/Lib/encodings/cp866.py
+share/java/jext/lib/Lib/encodings/cp869.py
+share/java/jext/lib/Lib/encodings/cp874.py
+share/java/jext/lib/Lib/encodings/cp875.py
+share/java/jext/lib/Lib/encodings/iso8859_1.py
+share/java/jext/lib/Lib/encodings/iso8859_10.py
+share/java/jext/lib/Lib/encodings/iso8859_13.py
+share/java/jext/lib/Lib/encodings/iso8859_14.py
+share/java/jext/lib/Lib/encodings/iso8859_15.py
+share/java/jext/lib/Lib/encodings/iso8859_2.py
+share/java/jext/lib/Lib/encodings/iso8859_3.py
+share/java/jext/lib/Lib/encodings/iso8859_4.py
+share/java/jext/lib/Lib/encodings/iso8859_5.py
+share/java/jext/lib/Lib/encodings/iso8859_6.py
+share/java/jext/lib/Lib/encodings/iso8859_7.py
+share/java/jext/lib/Lib/encodings/iso8859_8.py
+share/java/jext/lib/Lib/encodings/iso8859_9.py
+share/java/jext/lib/Lib/encodings/koi8_r.py
+share/java/jext/lib/Lib/encodings/latin_1.py
+share/java/jext/lib/Lib/encodings/mac_cyrillic.py
+share/java/jext/lib/Lib/encodings/mac_greek.py
+share/java/jext/lib/Lib/encodings/mac_iceland.py
+share/java/jext/lib/Lib/encodings/mac_latin2.py
+share/java/jext/lib/Lib/encodings/mac_roman.py
+share/java/jext/lib/Lib/encodings/mac_turkish.py
+share/java/jext/lib/Lib/encodings/mbcs.py
+share/java/jext/lib/Lib/encodings/raw_unicode_escape.py
+share/java/jext/lib/Lib/encodings/undefined.py
+share/java/jext/lib/Lib/encodings/unicode_escape.py
+share/java/jext/lib/Lib/encodings/unicode_internal.py
+share/java/jext/lib/Lib/encodings/utf_16.py
+share/java/jext/lib/Lib/encodings/utf_16_be.py
+share/java/jext/lib/Lib/encodings/utf_16_le.py
+share/java/jext/lib/Lib/encodings/utf_8.py
+share/java/jext/lib/Lib/exceptions.py
+share/java/jext/lib/Lib/fileinput.py
+share/java/jext/lib/Lib/fnmatch.py
+share/java/jext/lib/Lib/formatter.py
+share/java/jext/lib/Lib/fpformat.py
+share/java/jext/lib/Lib/ftplib.py
+share/java/jext/lib/Lib/getopt.py
+share/java/jext/lib/Lib/glob.py
+share/java/jext/lib/Lib/gopherlib.py
+share/java/jext/lib/Lib/gzip.py
+share/java/jext/lib/Lib/htmlentitydefs.py
+share/java/jext/lib/Lib/htmllib.py
+share/java/jext/lib/Lib/httplib.py
+share/java/jext/lib/Lib/imaplib.py
+share/java/jext/lib/Lib/imghdr.py
+share/java/jext/lib/Lib/javaos.py
+share/java/jext/lib/Lib/javapath.py
+share/java/jext/lib/Lib/jreload.py
+share/java/jext/lib/Lib/keyword.py
+share/java/jext/lib/Lib/license
+share/java/jext/lib/Lib/linecache.py
+share/java/jext/lib/Lib/macpath.py
+share/java/jext/lib/Lib/macurl2path.py
+share/java/jext/lib/Lib/mailbox.py
+share/java/jext/lib/Lib/mailcap.py
+share/java/jext/lib/Lib/marshal.py
+share/java/jext/lib/Lib/mhlib.py
+share/java/jext/lib/Lib/mimetools.py
+share/java/jext/lib/Lib/mimetypes.py
+share/java/jext/lib/Lib/mimify.py
+share/java/jext/lib/Lib/multifile.py
+share/java/jext/lib/Lib/mutex.py
+share/java/jext/lib/Lib/nntplib.py
+share/java/jext/lib/Lib/ntpath.py
+share/java/jext/lib/Lib/nturl2path.py
+share/java/jext/lib/Lib/pdb.py
+share/java/jext/lib/Lib/pickle.py
+share/java/jext/lib/Lib/pipes.py
+share/java/jext/lib/Lib/popen2.py
+share/java/jext/lib/Lib/poplib.py
+share/java/jext/lib/Lib/posixfile.py
+share/java/jext/lib/Lib/posixpath.py
+share/java/jext/lib/Lib/pprint.py
+share/java/jext/lib/Lib/profile.py
+share/java/jext/lib/Lib/pstats.py
+share/java/jext/lib/Lib/pyclbr.py
+share/java/jext/lib/Lib/quopri.py
+share/java/jext/lib/Lib/random.py
+share/java/jext/lib/Lib/re.py
+share/java/jext/lib/Lib/reconvert.py
+share/java/jext/lib/Lib/repr.py
+share/java/jext/lib/Lib/rfc822.py
+share/java/jext/lib/Lib/sched.py
+share/java/jext/lib/Lib/sgmllib.py
+share/java/jext/lib/Lib/shelve.py
+share/java/jext/lib/Lib/shutil.py
+share/java/jext/lib/Lib/site.py
+share/java/jext/lib/Lib/smtplib.py
+share/java/jext/lib/Lib/sndhdr.py
+share/java/jext/lib/Lib/socket.py
+share/java/jext/lib/Lib/sre.py
+share/java/jext/lib/Lib/sre_compile.py
+share/java/jext/lib/Lib/sre_constants.py
+share/java/jext/lib/Lib/sre_parse.py
+share/java/jext/lib/Lib/stat.py
+share/java/jext/lib/Lib/string.py
+share/java/jext/lib/Lib/symbol.py
+share/java/jext/lib/Lib/telnetlib.py
+share/java/jext/lib/Lib/tempfile.py
+share/java/jext/lib/Lib/threading.py
+share/java/jext/lib/Lib/token.py
+share/java/jext/lib/Lib/tokenize.py
+share/java/jext/lib/Lib/traceback.py
+share/java/jext/lib/Lib/tzparse.py
+share/java/jext/lib/Lib/urllib.py
+share/java/jext/lib/Lib/urlparse.py
+share/java/jext/lib/Lib/user.py
+share/java/jext/lib/Lib/warnings.py
+share/java/jext/lib/Lib/whichdb.py
+share/java/jext/lib/Lib/whrandom.py
+share/java/jext/lib/Lib/xdrlib.py
+share/java/jext/lib/Lib/xmllib.py
+share/java/jext/lib/Lib/zipfile.py
+share/java/jext/lib/Lib/zlib.py
+share/java/jext/lib/dawn.jar
 share/java/jext/lib/jext.jar
-share/java/jext/lib/swingall.jar
+share/java/jext/lib/jython.jar
+@dirrm share/java/jext/lib/Lib/encodings
+@dirrm share/java/jext/lib/Lib
 @dirrm share/java/jext/lib
-@dirrm share/java/jext/bin/scripts/lang/util
-@dirrm share/java/jext/bin/scripts/lang/test
-@dirrm share/java/jext/bin/scripts/lang/string
-@dirrm share/java/jext/bin/scripts/lang/stack
-@dirrm share/java/jext/bin/scripts/lang/naming
-@dirrm share/java/jext/bin/scripts/lang/misc
-@dirrm share/java/jext/bin/scripts/lang/loop
-@dirrm share/java/jext/bin/scripts/lang/javaccess
-@dirrm share/java/jext/bin/scripts/lang/err
-@dirrm share/java/jext/bin/scripts/lang
-@dirrm share/java/jext/bin/scripts
+@dirrm share/java/jext/bin/templates/Jext
+@dirrm share/java/jext/bin/templates/Java
+@dirrm share/java/jext/bin/templates/JSP
+@dirrm share/java/jext/bin/templates
 @dirrm share/java/jext/bin/plugins
+@dirrm share/java/jext/bin/lang
 @dirrm share/java/jext/bin/icons
 @dirrm share/java/jext/bin
 @dirrm share/java/jext
-@dirrm share/doc/java/jext