8 files changed, 55 insertions, 34 deletions

diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile
index c1d84e4280e7..5012f2f18faf 100644
--- a/lang/linux-j/Makefile
+++ b/lang/linux-j/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	linux-j
-PORTVERSION=	501a
+PORTVERSION=	501b
 CATEGORIES=	lang linux
 MASTER_SITES=	http://www.jsoftware.com/download/
-DISTNAME=	j501a_linux
+DISTNAME=	j${PORTVERSION}_linux
 DIST_SUBDIR=    ${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	js@jeannot.org
 
 USE_LINUX=	yes
+USE_JAVA=	1.3+
 
 ONLY_FOR_ARCHS= i386
 
@@ -23,14 +24,18 @@ NO_WRKSUBDIR=	yes
 MAN1=           jconsole.1
 
 do-build:
-	@sed "s:PREFIX:$(PREFIX):" < ${FILESDIR}/jconsole > ${WRKSRC}/jconsole
+	@${SED} "s:PREFIX:$(PREFIX):g" < ${FILESDIR}/jconsole > ${WRKSRC}/jconsole
+	@${SED} "s:PREFIX:$(PREFIX):g" < ${FILESDIR}/jw > ${WRKSRC}/jw
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/jconsole ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/j501a/system/extras/help/man/${MAN1} ${PREFIX}/man/man1
+	@${INSTALL_SCRIPT} ${WRKSRC}/jw ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/j501b/system/extras/help/man/${MAN1} ${PREFIX}/man/man1
 	@${MKDIR} ${PREFIX}/lib/j
-	@cd ${WRKSRC}/j501a && tar -cf - system user profile.ijs readme.txt | tar -xf - -C ${PREFIX}/lib/j
-	@${INSTALL_PROGRAM} ${WRKSRC}/j501a/jconsole ${PREFIX}/lib/j/jconsole
+	@cd ${WRKSRC}/j501b && \
+		${TAR} -cf - system user profile.ijs readme.txt j.jar | \
+			${TAR} -xf - -C ${PREFIX}/lib/j
+	@${INSTALL_PROGRAM} ${WRKSRC}/j501b/jconsole ${PREFIX}/lib/j/jconsole
 	@brandelf -t Linux ${PREFIX}/lib/j/jconsole
 
 post-install:
diff --git a/lang/linux-j/distinfo b/lang/linux-j/distinfo
index 7398eb0b058c..7e306717fae9 100644
--- a/lang/linux-j/distinfo
+++ b/lang/linux-j/distinfo
@@ -1 +1 @@
-MD5 (linux-j/501a/j501a_linux.tar.gz) = b8ef597e227217e356efe9e9358879c2
+MD5 (linux-j/501b/j501b_linux.tar.gz) = 051aa2197802a42fe749b6b57112b00b
diff --git a/lang/linux-j/files/jconsole b/lang/linux-j/files/jconsole
index c39b9f18bb23..82689fecdebe 100644
--- a/lang/linux-j/files/jconsole
+++ b/lang/linux-j/files/jconsole
@@ -1,8 +1,8 @@
 #!/bin/sh
-JPATHj501a=PREFIX/lib/j
-export JPATHj501a
+JPATHj501b=PREFIX/lib/j
+export JPATHj501b
 if [ ! -d $HOME/J ]
 then
-	cp -r $JPATHj501a/user $HOME/J
+	cp -r $JPATHj501b/user $HOME/J
 fi
 exec PREFIX/lib/j/jconsole "$@"
diff --git a/lang/linux-j/files/jw b/lang/linux-j/files/jw
new file mode 100644
index 000000000000..b97d013519e5
--- /dev/null
+++ b/lang/linux-j/files/jw
@@ -0,0 +1,8 @@
+#!/bin/sh
+JPATHj501b=PREFIX/lib/j
+export JPATHj501b
+if [ ! -d $HOME/J ]
+then
+	cp -r $JPATHj501b/user $HOME/J
+fi
+exec PREFIX/bin/javavm -jar PREFIX/lib/j/j.jar "$@"
diff --git a/lang/linux-j/files/patch-j501a::profile.ijs b/lang/linux-j/files/patch-j501a::profile.ijs
deleted file mode 100644
index e9c9a8efee40..000000000000
--- a/lang/linux-j/files/patch-j501a::profile.ijs
+++ /dev/null
@@ -1,14 +0,0 @@
---- j501a/profile.ijs.orig	Tue Oct 22 18:08:47 2002
-+++ j501a/profile.ijs	Tue Oct 22 18:10:13 2002
-@@ -47,9 +47,9 @@
- NB. =========================================================
- NB. directory paths (no trailing path separator):
- SYSTEM_j_=: PROFILE{.~PROFILE i: PATHSEP_j_
--USER_j_=: SYSTEM_j_
-+USER_j_=: (2!:5'HOME'),'\J'
- ADDON_j_=: SYSTEM_j_,'\addons'
--TEMP_j_=: SYSTEM_j_
-+TEMP_j_=: USER_j_
- CONFIG_j_=: USER_j_, '\user\config'
- 
- NB. =========================================================
diff --git a/lang/linux-j/files/patch-j501b::profile.ijs b/lang/linux-j/files/patch-j501b::profile.ijs
new file mode 100644
index 000000000000..fac1869f2448
--- /dev/null
+++ b/lang/linux-j/files/patch-j501b::profile.ijs
@@ -0,0 +1,13 @@
+--- j501b/profile.ijs.orig	Sun Dec  8 18:47:18 2002
++++ j501b/profile.ijs	Sun Dec  8 18:50:14 2002
+@@ -52,8 +52,8 @@
+ 18!:4 <'j'
+ SYSTEM=: PROFILE {.~ PROFILE i: PATHSEP
+ ADDONS=: SYSTEM,PATHSEP,'addons'
+-TEMP=: SYSTEM,PATHSEP,'temp'
+-USER=: SYSTEM,PATHSEP,'user'
++USER=: (2!:5'HOME'),'\J\user'
++TEMP=: USER
+ CONFIG=: USER,PATHSEP,'config'
+ 18!:4 <'base'
+ 
diff --git a/lang/linux-j/pkg-message b/lang/linux-j/pkg-message
index 2d5214f0e88a..b32a45f28c31 100644
--- a/lang/linux-j/pkg-message
+++ b/lang/linux-j/pkg-message
@@ -1,3 +1,2 @@
-Try J by running "jconsole" then typing: jhelp 'netscape'
-(if netscape is your browser)
+Try J by running "jw"
 For more information see "man jconsole".
diff --git a/lang/linux-j/pkg-plist b/lang/linux-j/pkg-plist
index e157babb41a7..dc9cdcf89d41 100644
--- a/lang/linux-j/pkg-plist
+++ b/lang/linux-j/pkg-plist
@@ -1,7 +1,10 @@
 bin/jconsole
+bin/jw
+lib/j/j.jar
 lib/j/jconsole
 lib/j/profile.ijs
 lib/j/readme.txt
+lib/j/system/classes/classes.txt
 lib/j/system/classes/dict/dict.txt
 lib/j/system/classes/dict/dictdemo.ijs
 lib/j/system/classes/dict/jndict.ijs
@@ -142,7 +145,6 @@ lib/j/system/examples/graphics/isigraph/sines.ijs
 lib/j/system/examples/graphics/isigraph/smesser.ijs
 lib/j/system/examples/graphics/isigraph/spinner.ijs
 lib/j/system/examples/graphics/isigraph/spirals.ijs
-lib/j/system/examples/graphics/isigraph/star1.ijs
 lib/j/system/examples/graphics/isigraph/title.ijs
 lib/j/system/examples/graphics/misc/solid.ijs
 lib/j/system/examples/graphics/opengl/demo/basic1.ijs
@@ -281,7 +283,7 @@ lib/j/system/examples/ole/excel/excel.txt
 lib/j/system/examples/ole/excel/jdemo.xls
 lib/j/system/examples/ole/excel/jmacros.xls
 lib/j/system/examples/ole/excel/jsrvdemo.xls
-lib/j/system/examples/ole/excel/jsutil.xls
+lib/j/system/examples/ole/excel/jsutil.txt
 lib/j/system/examples/ole/excel/xldemo.ijs
 lib/j/system/examples/ole/excel/xlutil.ijs
 lib/j/system/examples/ole/ole.txt
@@ -369,6 +371,7 @@ lib/j/system/examples/socket/socklab.ijs
 lib/j/system/extras/config/colordef.ijs
 lib/j/system/extras/config/colorsmp.ijs
 lib/j/system/extras/config/config.txt
+lib/j/system/extras/config/pubschms.ijs
 lib/j/system/extras/config/scripts.ijs
 lib/j/system/extras/config/stdcfg.ijs
 lib/j/system/extras/help/box.jpg
@@ -669,6 +672,7 @@ lib/j/system/extras/help/jforc/_.htm
 lib/j/system/extras/help/jforc/a_first_look_at_j_programs.htm
 lib/j/system/extras/help/jforc/applied_mathematics_in_j.htm
 lib/j/system/extras/help/jforc/boxing_(structures).htm
+lib/j/system/extras/help/jforc/boxing_structures.htm
 lib/j/system/extras/help/jforc/calling_a_dll_under_windows.htm
 lib/j/system/extras/help/jforc/compound_verbs.htm
 lib/j/system/extras/help/jforc/contents.htm
@@ -677,6 +681,7 @@ lib/j/system/extras/help/jforc/control_structures.htm
 lib/j/system/extras/help/jforc/declarations.htm
 lib/j/system/extras/help/jforc/elementary_mathematics_in_j.htm
 lib/j/system/extras/help/jforc/empty_operands.htm
+lib/j/system/extras/help/jforc/error_messages.htm
 lib/j/system/extras/help/jforc/explicit-to-tacit_converter.htm
 lib/j/system/extras/help/jforc/first_look_at_forks.htm
 lib/j/system/extras/help/jforc/foreword.htm
@@ -700,6 +705,7 @@ lib/j/system/extras/help/jforc/loopless_code_iv.htm
 lib/j/system/extras/help/jforc/loopless_code_iverbs_have_ra.htm
 lib/j/system/extras/help/jforc/loopless_code_vi.htm
 lib/j/system/extras/help/jforc/loopless_code_vpartitions.htm
+lib/j/system/extras/help/jforc/modifying_an_array_m.htm
 lib/j/system/extras/help/jforc/modifying_an_array_m}.htm
 lib/j/system/extras/help/jforc/modular_code.htm
 lib/j/system/extras/help/jforc/more_verbs.htm
@@ -806,12 +812,13 @@ lib/j/system/extras/help/phrases/plotting.htm
 lib/j/system/extras/help/phrases/polynomials_rational.htm
 lib/j/system/extras/help/phrases/quadrature_simpson.htm
 lib/j/system/extras/help/phrases/random_numbers.htm
+lib/j/system/extras/help/phrases/rank.htm
 lib/j/system/extras/help/phrases/rank_class.htm
 lib/j/system/extras/help/phrases/references.htm
 lib/j/system/extras/help/phrases/representations.htm
 lib/j/system/extras/help/phrases/rotate_reflect.htm
 lib/j/system/extras/help/phrases/sorting.htm
-lib/j/system/extras/help/phrases/special_matrcies.htm
+lib/j/system/extras/help/phrases/special_matrices.htm
 lib/j/system/extras/help/phrases/specimens.htm
 lib/j/system/extras/help/phrases/structural.htm
 lib/j/system/extras/help/phrases/sums_means.htm
@@ -1056,6 +1063,7 @@ lib/j/system/extras/help/user/demo.htm
 lib/j/system/extras/help/user/design.htm
 lib/j/system/extras/help/user/devenv.htm
 lib/j/system/extras/help/user/dir_layout.htm
+lib/j/system/extras/help/user/dirpaths.htm
 lib/j/system/extras/help/user/dlls.htm
 lib/j/system/extras/help/user/enter_info.htm
 lib/j/system/extras/help/user/event_handlers.htm
@@ -1084,7 +1092,6 @@ lib/j/system/extras/help/user/grid_ctrl_prop.htm
 lib/j/system/extras/help/user/hints.htm
 lib/j/system/extras/help/user/input_log.htm
 lib/j/system/extras/help/user/installing_odbc.htm
-lib/j/system/extras/help/user/inti_scripts.htm
 lib/j/system/extras/help/user/isigraph_events.htm
 lib/j/system/extras/help/user/j_commands_events.htm
 lib/j/system/extras/help/user/j_java_applets.htm
@@ -1159,10 +1166,6 @@ lib/j/system/extras/help/user/relhigh.htm
 lib/j/system/extras/help/user/rich_text.htm
 lib/j/system/extras/help/user/richedit_control.htm
 lib/j/system/extras/help/user/running_labs.htm
-lib/j/system/extras/help/user/runtime.htm
-lib/j/system/extras/help/user/runtime_apps.htm
-lib/j/system/extras/help/user/runtime_overview.htm
-lib/j/system/extras/help/user/runtime_scripts.htm
 lib/j/system/extras/help/user/rxcopyright.htm
 lib/j/system/extras/help/user/script_bmp.htm
 lib/j/system/extras/help/user/script_colib.htm
@@ -1323,6 +1326,7 @@ lib/j/system/extras/labs/system/formedit.ijt
 lib/j/system/extras/labs/system/grid.ijt
 lib/j/system/extras/labs/system/gridexam.ijt
 lib/j/system/extras/labs/system/gridlow.ijt
+lib/j/system/extras/labs/system/lapack.ijt
 lib/j/system/extras/labs/system/mapfile.ijt
 lib/j/system/extras/labs/system/mappeddb.ijs
 lib/j/system/extras/labs/system/mappeddb.ijt
@@ -1357,10 +1361,12 @@ lib/j/system/extras/util/fiw.ijs
 lib/j/system/extras/util/formedit.ijs
 lib/j/system/extras/util/forms.ijs
 lib/j/system/extras/util/help.ijs
+lib/j/system/extras/util/helpndx.ijs
 lib/j/system/extras/util/jadecon.ijs
 lib/j/system/extras/util/jadefull.ijs
 lib/j/system/extras/util/jijs.ijs
 lib/j/system/extras/util/jpm.ijs
+lib/j/system/extras/util/jul.ijl
 lib/j/system/extras/util/lab.ijs
 lib/j/system/extras/util/lauthor.ijs
 lib/j/system/extras/util/newuser.ijs
@@ -1384,11 +1390,15 @@ lib/j/system/main/defs/build/hostdefs.sym
 lib/j/system/main/defs/build/netdefs.c
 lib/j/system/main/defs/build/netdefs.sym
 lib/j/system/main/defs/build/sym2ijs.ijs
+lib/j/system/main/defs/hostdefs_aix.ijs
 lib/j/system/main/defs/hostdefs_darwin.ijs
 lib/j/system/main/defs/hostdefs_linux.ijs
+lib/j/system/main/defs/hostdefs_sunos.ijs
 lib/j/system/main/defs/hostdefs_win32.ijs
+lib/j/system/main/defs/netdefs_aix.ijs
 lib/j/system/main/defs/netdefs_darwin.ijs
 lib/j/system/main/defs/netdefs_linux.ijs
+lib/j/system/main/defs/netdefs_sunos.ijs
 lib/j/system/main/defs/netdefs_win32.ijs
 lib/j/system/main/dir.ijs
 lib/j/system/main/dll.ijs