4 files changed, 88 insertions, 88 deletions

diff --git a/editors/jext/Makefile b/editors/jext/Makefile
index be96093a7d11..2812e0d506f3 100644
--- a/editors/jext/Makefile
+++ b/editors/jext/Makefile
@@ -6,57 +6,45 @@
 #
 
 PORTNAME=	jext
-PORTVERSION=	2.8.0.3
+PORTVERSION=	2.8.1.1
 CATEGORIES=	editors java
 MASTER_SITES=	http://www.jext.org/ \
 		http://members.xoom.com/romainguy/
-DISTFILES=	${PORTNAME}${EXTRACT_SUFX} swingall.jar
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} swingall.jar
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 RUN_DEPENDS=	${JAVAVM}:${PORTSDIR}/java/javavmwrapper \
 		${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jre
 
-FETCH_BEFORE_ARGS=	-b
-
-EXTRACT_ONLY=	${PORTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 WRKSRC=		${WRKDIR}
-USE_ZIP=	yes
 USE_XLIB=	yes
 NO_BUILD=	yes
 
-JDK_VERSION=	1.1.8
 JAVAVM?=	${LOCALBASE}/bin/javavm
 
-.if defined(USE_JIT)
-RUN_DEPENDS+=	${LOCALBASE}/jdk${JDK_VERSION}/lib/${ARCH}/green_threads/libshujit.so:${PORTSDIR}/java/shujit
-JAVAJIT=	shujit
-.else
-JAVAJIT=
-.endif
-
 INSTSBDR=	${PREFIX}/share/java/jext
-DATATARG=	jext.jar icons plugins scripts xtools
 
-post-extract:
-		@${PERL} -pi -e "s.\x0D.." ${WRKSRC}/jext
+pre-patch:
+	@${PERL} -pi -e 's.\x0D..' ${WRKSRC}/bin/jext.sh
 
 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%|${INSTSBDR}/swingall.jar|g" ${WRKSRC}/jext
+	@${PERL} -pi -e 's|%%JAVAVM%%|${JAVAVM}|g			; \
+			 s|%%JEXT_HOME%%|${INSTSBDR}|g			; \
+			 s|%%JFC%%|${INSTSBDR}/lib/swingall.jar|g'	  \
+			 ${WRKSRC}/bin/jext.sh
 
 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}
+	@${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}/doc && ${TAR} -c -f - * ) \
-			| (cd ${PREFIX}/share/doc/java/jext && ${TAR} --unlink -x -f -)
+	@${MKDIR} ${PREFIX}/share/doc/java/jext
+	@(cd ${WRKSRC}/docs && ${TAR} -c -f - * ) \
+		| (cd ${PREFIX}/share/doc/java/jext && ${TAR} --unlink -x -f -)
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/jext/distinfo b/editors/jext/distinfo
index fb9a89514e91..7ab971af4885 100644
--- a/editors/jext/distinfo
+++ b/editors/jext/distinfo
@@ -1,2 +1,2 @@
-MD5 (jext.zip) = 01e251f9e867af537fa3f025301556de
+MD5 (jext-2.8.1.1.tar.gz) = 482b928afc18c63cea5997db90ab89d2
 MD5 (swingall.jar) = 356f8091f94afcb128a3477dec5e8755
diff --git a/editors/jext/files/patch-aa b/editors/jext/files/patch-aa
index b65732895edb..090d1822726f 100644
--- a/editors/jext/files/patch-aa
+++ b/editors/jext/files/patch-aa
@@ -1,19 +1,19 @@
---- jext.orig	Wed Mar  1 22:40:49 2000
-+++ jext	Wed Mar  1 22:41:16 2000
-@@ -4,11 +4,14 @@
- # This version allows for an install in a central area like /usr/local/jext.
+--- 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
--
-+JEXT_HOME=%JEXT_HOME%
-+CLASSPATH=$CLASSPATH:%JFC%:$JEXT_HOME/jext.jar
+ 
++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/plugins $HOME/.jext
+    ln -s $JEXT_HOME/bin/plugins $HOME/.jext
  fi
  
--java -ms4m -mx16m -classpath $JEXT_HOME/jext.jar com.chez.powerteam.jext.Jext $* &
-+%JAVAVM% -ms4m -mx16m -Djava.compiler=%JAVAJIT% com.chez.powerteam.jext.Jext $*
+-java -classpath $JEXT_HOME/lib/jext.jar com.chez.powerteam.jext.Jext $* &
++exec %%JAVAVM%% com.chez.powerteam.jext.Jext $*
+ 
diff --git a/editors/jext/pkg-plist b/editors/jext/pkg-plist
index adb3edea1a7a..6695473bc16c 100644
--- a/editors/jext/pkg-plist
+++ b/editors/jext/pkg-plist
@@ -1,6 +1,6 @@
 bin/jext
-share/doc/java/jext/Copying.txt
 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
@@ -11,54 +11,66 @@ 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/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/FastFind.jar
-share/java/jext/plugins/FastSyntax.jar
-share/java/jext/plugins/HTML.jar
-share/java/jext/plugins/HyperTyper.jar
-share/java/jext/plugins/JCompile.jar
-share/java/jext/plugins/Java.jar
-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/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
+share/java/jext/LICENSE
+share/java/jext/README
+share/java/jext/bin/icons/jext.ico
+share/java/jext/bin/icons/jext.xpm
+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/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/lib/jext.jar
+share/java/jext/lib/swingall.jar
+@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/plugins
+@dirrm share/java/jext/bin/icons
+@dirrm share/java/jext/bin
 @dirrm share/java/jext
 @dirrm share/doc/java/jext