2 files changed, 137 insertions, 137 deletions

diff --git a/java/netrexx/Makefile b/java/netrexx/Makefile
index a7583c1096d3..e1335429a622 100644
--- a/java/netrexx/Makefile
+++ b/java/netrexx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	NetRexx
 PORTVERSION=	2.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java lang
 MASTER_SITES=	http://www2.hursley.ibm.com/netrexx/
 DISTNAME=	NetRexx
diff --git a/java/netrexx/pkg-plist b/java/netrexx/pkg-plist
index 7d1c3183bf6d..f27169775f57 100644
--- a/java/netrexx/pkg-plist
+++ b/java/netrexx/pkg-plist
@@ -2,141 +2,141 @@ bin/NetRexxC.sh
 bin/nrc
 bin/NetRexxC.rexx
 bin/nrc.rexx
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/RexxWords.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/BadColumnException.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/BadNumericException.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/DivideException.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/ExponentOverflowException.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/NoOtherwiseException.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/NotCharacterException.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/NotLogicException.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/Rexx.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/RexxIO.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/RexxNode.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/RexxOperators.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/RexxParse.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/RexxSet.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/RexxTrace.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/RexxUtil.class
-%%PORTDOCS%%share/doc/NetRexx/netrexx/lang/BadArgumentException.class
-%%PORTDOCS%%share/doc/NetRexx/welclip.au
-%%PORTDOCS%%share/doc/NetRexx/updated.gif
-%%PORTDOCS%%share/doc/NetRexx/tablet2.gif
-%%PORTDOCS%%share/doc/NetRexx/tablet1.gif
-%%PORTDOCS%%share/doc/NetRexx/tablet.zip
-%%PORTDOCS%%share/doc/NetRexx/tablet.html
-%%PORTDOCS%%share/doc/NetRexx/tablet.gif
-%%PORTDOCS%%share/doc/NetRexx/spectrum.html
-%%PORTDOCS%%share/doc/NetRexx/scribble.html
-%%PORTDOCS%%share/doc/NetRexx/redballw.gif
-%%PORTDOCS%%share/doc/NetRexx/qtime.nrx
-%%PORTDOCS%%share/doc/NetRexx/qtime.html
-%%PORTDOCS%%share/doc/NetRexx/qtime.class
-%%PORTDOCS%%share/doc/NetRexx/pinger.zip
-%%PORTDOCS%%share/doc/NetRexx/pinger.html
-%%PORTDOCS%%share/doc/NetRexx/pinger.gif
-%%PORTDOCS%%share/doc/NetRexx/nrwhat.html
-%%PORTDOCS%%share/doc/NetRexx/nrvmesa.pdf
-%%PORTDOCS%%share/doc/NetRexx/nruuse.html
-%%PORTDOCS%%share/doc/NetRexx/nrusers.html
-%%PORTDOCS%%share/doc/NetRexx/nrurestr.html
-%%PORTDOCS%%share/doc/NetRexx/nruprom.html
-%%PORTDOCS%%share/doc/NetRexx/nruiunix.html
-%%PORTDOCS%%share/doc/NetRexx/nruitest.html
-%%PORTDOCS%%share/doc/NetRexx/nruiscp.html
-%%PORTDOCS%%share/doc/NetRexx/nruirun.html
-%%PORTDOCS%%share/doc/NetRexx/nruiprob.html
-%%PORTDOCS%%share/doc/NetRexx/nruipack.html
-%%PORTDOCS%%share/doc/NetRexx/nruintro.html
-%%PORTDOCS%%share/doc/NetRexx/nruinter.html
-%%PORTDOCS%%share/doc/NetRexx/nruinst.html
-%%PORTDOCS%%share/doc/NetRexx/nruijpp.html
-%%PORTDOCS%%share/doc/NetRexx/nruij12.html
-%%PORTDOCS%%share/doc/NetRexx/nruij11.html
-%%PORTDOCS%%share/doc/NetRexx/nruiexec.html
-%%PORTDOCS%%share/doc/NetRexx/nruiebc.html
-%%PORTDOCS%%share/doc/NetRexx/nruidoc.html
-%%PORTDOCS%%share/doc/NetRexx/nrucomp.html
-%%PORTDOCS%%share/doc/NetRexx/nruappl.html
-%%PORTDOCS%%share/doc/NetRexx/nruapi.html
-%%PORTDOCS%%share/doc/NetRexx/nrsample.html
-%%PORTDOCS%%share/doc/NetRexx/nrsamp.html
-%%PORTDOCS%%share/doc/NetRexx/nrotrace.html
-%%PORTDOCS%%share/doc/NetRexx/new.gif
-%%PORTDOCS%%share/doc/NetRexx/nrosumma.html
-%%PORTDOCS%%share/doc/NetRexx/nrostrin.html
-%%PORTDOCS%%share/doc/NetRexx/nroprogs.html
-%%PORTDOCS%%share/doc/NetRexx/nroparse.html
-%%PORTDOCS%%share/doc/NetRexx/nroobjec.html
-%%PORTDOCS%%share/doc/NetRexx/nroindex.html
-%%PORTDOCS%%share/doc/NetRexx/nroexten.html
-%%PORTDOCS%%share/doc/NetRexx/nroexprs.html
-%%PORTDOCS%%share/doc/NetRexx/nroexcep.html
-%%PORTDOCS%%share/doc/NetRexx/nrocontr.html
-%%PORTDOCS%%share/doc/NetRexx/nrobinar.html
-%%PORTDOCS%%share/doc/NetRexx/nroarray.html
-%%PORTDOCS%%share/doc/NetRexx/nroarith.html
-%%PORTDOCS%%share/doc/NetRexx/nrmlist.html
-%%PORTDOCS%%share/doc/NetRexx/nrminor.html
-%%PORTDOCS%%share/doc/NetRexx/nrlinks.html
-%%PORTDOCS%%share/doc/NetRexx/nrlerr.html
-%%PORTDOCS%%share/doc/NetRexx/nrlcoveh.gif
-%%PORTDOCS%%share/doc/NetRexx/nrl.html
-%%PORTDOCS%%share/doc/NetRexx/nrfaq.html
-%%PORTDOCS%%share/doc/NetRexx/nrexx32.gif
-%%PORTDOCS%%share/doc/NetRexx/nredbook.html
-%%PORTDOCS%%share/doc/NetRexx/nrdown.html
-%%PORTDOCS%%share/doc/NetRexx/nrdocs.html
-%%PORTDOCS%%share/doc/NetRexx/nrchange0.html
-%%PORTDOCS%%share/doc/NetRexx/nrchange.html
-%%PORTDOCS%%share/doc/NetRexx/nrbanner.gif
-%%PORTDOCS%%share/doc/NetRexx/netrexxo.html
-%%PORTDOCS%%share/doc/NetRexx/netrexx.html
-%%PORTDOCS%%share/doc/NetRexx/netrexx.gif
-%%PORTDOCS%%share/doc/NetRexx/nervous.html
-%%PORTDOCS%%share/doc/NetRexx/linecomment.nrx
-%%PORTDOCS%%share/doc/NetRexx/linecomment.class
-%%PORTDOCS%%share/doc/NetRexx/linecomm.html
-%%PORTDOCS%%share/doc/NetRexx/license.txt
-%%PORTDOCS%%share/doc/NetRexx/helloapp.html
-%%PORTDOCS%%share/doc/NetRexx/hello.nrx
-%%PORTDOCS%%share/doc/NetRexx/hello.html
-%%PORTDOCS%%share/doc/NetRexx/hello.class
-%%PORTDOCS%%share/doc/NetRexx/cubit.nrx
-%%PORTDOCS%%share/doc/NetRexx/comment.txt
-%%PORTDOCS%%share/doc/NetRexx/buttons.html
-%%PORTDOCS%%share/doc/NetRexx/blueballw.gif
-%%PORTDOCS%%share/doc/NetRexx/archtext.html
-%%PORTDOCS%%share/doc/NetRexx/WordClock.nrx
-%%PORTDOCS%%share/doc/NetRexx/WordClock.class
-%%PORTDOCS%%share/doc/NetRexx/Tablet.nrx
-%%PORTDOCS%%share/doc/NetRexx/Tablet.class
-%%PORTDOCS%%share/doc/NetRexx/Spectrum.nrx
-%%PORTDOCS%%share/doc/NetRexx/Spectrum.class
-%%PORTDOCS%%share/doc/NetRexx/Scribble.nrx
-%%PORTDOCS%%share/doc/NetRexx/Scribble.class
-%%PORTDOCS%%share/doc/NetRexx/PlayClip.nrx
-%%PORTDOCS%%share/doc/NetRexx/PlayClip.class
-%%PORTDOCS%%share/doc/NetRexx/Pinger.nrx
-%%PORTDOCS%%share/doc/NetRexx/Pinger.au
-%%PORTDOCS%%share/doc/NetRexx/NervousTexxt.nrx
-%%PORTDOCS%%share/doc/NetRexx/NervousTexxt.class
-%%PORTDOCS%%share/doc/NetRexx/IBMsw.gif
-%%PORTDOCS%%share/doc/NetRexx/HelloApplet.nrx
-%%PORTDOCS%%share/doc/NetRexx/HelloApplet.class
-%%PORTDOCS%%share/doc/NetRexx/GifShow.nrx
-%%PORTDOCS%%share/doc/NetRexx/GifShow.class
-%%PORTDOCS%%share/doc/NetRexx/Buttons.nrx
-%%PORTDOCS%%share/doc/NetRexx/Buttons.class
-%%PORTDOCS%%share/doc/NetRexx/Buttons$Right.class
-%%PORTDOCS%%share/doc/NetRexx/Buttons$Left.class
-%%PORTDOCS%%share/doc/NetRexx/ArchText.nrx
-%%PORTDOCS%%share/doc/NetRexx/wordclock.html
-%%PORTDOCS%%share/doc/NetRexx/ArchText.class
-%%PORTDOCS%%share/examples/NetRexx/hello.nrx
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/RexxWords.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/BadColumnException.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/BadNumericException.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/DivideException.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/ExponentOverflowException.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/NoOtherwiseException.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/NotCharacterException.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/NotLogicException.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/Rexx.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/RexxIO.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/RexxNode.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/RexxOperators.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/RexxParse.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/RexxSet.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/RexxTrace.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/RexxUtil.class
+%%PORTDOCS%%%%DOCSDIR%%/netrexx/lang/BadArgumentException.class
+%%PORTDOCS%%%%DOCSDIR%%/welclip.au
+%%PORTDOCS%%%%DOCSDIR%%/updated.gif
+%%PORTDOCS%%%%DOCSDIR%%/tablet2.gif
+%%PORTDOCS%%%%DOCSDIR%%/tablet1.gif
+%%PORTDOCS%%%%DOCSDIR%%/tablet.zip
+%%PORTDOCS%%%%DOCSDIR%%/tablet.html
+%%PORTDOCS%%%%DOCSDIR%%/tablet.gif
+%%PORTDOCS%%%%DOCSDIR%%/spectrum.html
+%%PORTDOCS%%%%DOCSDIR%%/scribble.html
+%%PORTDOCS%%%%DOCSDIR%%/redballw.gif
+%%PORTDOCS%%%%DOCSDIR%%/qtime.nrx
+%%PORTDOCS%%%%DOCSDIR%%/qtime.html
+%%PORTDOCS%%%%DOCSDIR%%/qtime.class
+%%PORTDOCS%%%%DOCSDIR%%/pinger.zip
+%%PORTDOCS%%%%DOCSDIR%%/pinger.html
+%%PORTDOCS%%%%DOCSDIR%%/pinger.gif
+%%PORTDOCS%%%%DOCSDIR%%/nrwhat.html
+%%PORTDOCS%%%%DOCSDIR%%/nrvmesa.pdf
+%%PORTDOCS%%%%DOCSDIR%%/nruuse.html
+%%PORTDOCS%%%%DOCSDIR%%/nrusers.html
+%%PORTDOCS%%%%DOCSDIR%%/nrurestr.html
+%%PORTDOCS%%%%DOCSDIR%%/nruprom.html
+%%PORTDOCS%%%%DOCSDIR%%/nruiunix.html
+%%PORTDOCS%%%%DOCSDIR%%/nruitest.html
+%%PORTDOCS%%%%DOCSDIR%%/nruiscp.html
+%%PORTDOCS%%%%DOCSDIR%%/nruirun.html
+%%PORTDOCS%%%%DOCSDIR%%/nruiprob.html
+%%PORTDOCS%%%%DOCSDIR%%/nruipack.html
+%%PORTDOCS%%%%DOCSDIR%%/nruintro.html
+%%PORTDOCS%%%%DOCSDIR%%/nruinter.html
+%%PORTDOCS%%%%DOCSDIR%%/nruinst.html
+%%PORTDOCS%%%%DOCSDIR%%/nruijpp.html
+%%PORTDOCS%%%%DOCSDIR%%/nruij12.html
+%%PORTDOCS%%%%DOCSDIR%%/nruij11.html
+%%PORTDOCS%%%%DOCSDIR%%/nruiexec.html
+%%PORTDOCS%%%%DOCSDIR%%/nruiebc.html
+%%PORTDOCS%%%%DOCSDIR%%/nruidoc.html
+%%PORTDOCS%%%%DOCSDIR%%/nrucomp.html
+%%PORTDOCS%%%%DOCSDIR%%/nruappl.html
+%%PORTDOCS%%%%DOCSDIR%%/nruapi.html
+%%PORTDOCS%%%%DOCSDIR%%/nrsample.html
+%%PORTDOCS%%%%DOCSDIR%%/nrsamp.html
+%%PORTDOCS%%%%DOCSDIR%%/nrotrace.html
+%%PORTDOCS%%%%DOCSDIR%%/new.gif
+%%PORTDOCS%%%%DOCSDIR%%/nrosumma.html
+%%PORTDOCS%%%%DOCSDIR%%/nrostrin.html
+%%PORTDOCS%%%%DOCSDIR%%/nroprogs.html
+%%PORTDOCS%%%%DOCSDIR%%/nroparse.html
+%%PORTDOCS%%%%DOCSDIR%%/nroobjec.html
+%%PORTDOCS%%%%DOCSDIR%%/nroindex.html
+%%PORTDOCS%%%%DOCSDIR%%/nroexten.html
+%%PORTDOCS%%%%DOCSDIR%%/nroexprs.html
+%%PORTDOCS%%%%DOCSDIR%%/nroexcep.html
+%%PORTDOCS%%%%DOCSDIR%%/nrocontr.html
+%%PORTDOCS%%%%DOCSDIR%%/nrobinar.html
+%%PORTDOCS%%%%DOCSDIR%%/nroarray.html
+%%PORTDOCS%%%%DOCSDIR%%/nroarith.html
+%%PORTDOCS%%%%DOCSDIR%%/nrmlist.html
+%%PORTDOCS%%%%DOCSDIR%%/nrminor.html
+%%PORTDOCS%%%%DOCSDIR%%/nrlinks.html
+%%PORTDOCS%%%%DOCSDIR%%/nrlerr.html
+%%PORTDOCS%%%%DOCSDIR%%/nrlcoveh.gif
+%%PORTDOCS%%%%DOCSDIR%%/nrl.html
+%%PORTDOCS%%%%DOCSDIR%%/nrfaq.html
+%%PORTDOCS%%%%DOCSDIR%%/nrexx32.gif
+%%PORTDOCS%%%%DOCSDIR%%/nredbook.html
+%%PORTDOCS%%%%DOCSDIR%%/nrdown.html
+%%PORTDOCS%%%%DOCSDIR%%/nrdocs.html
+%%PORTDOCS%%%%DOCSDIR%%/nrchange0.html
+%%PORTDOCS%%%%DOCSDIR%%/nrchange.html
+%%PORTDOCS%%%%DOCSDIR%%/nrbanner.gif
+%%PORTDOCS%%%%DOCSDIR%%/netrexxo.html
+%%PORTDOCS%%%%DOCSDIR%%/netrexx.html
+%%PORTDOCS%%%%DOCSDIR%%/netrexx.gif
+%%PORTDOCS%%%%DOCSDIR%%/nervous.html
+%%PORTDOCS%%%%DOCSDIR%%/linecomment.nrx
+%%PORTDOCS%%%%DOCSDIR%%/linecomment.class
+%%PORTDOCS%%%%DOCSDIR%%/linecomm.html
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/helloapp.html
+%%PORTDOCS%%%%DOCSDIR%%/hello.nrx
+%%PORTDOCS%%%%DOCSDIR%%/hello.html
+%%PORTDOCS%%%%DOCSDIR%%/hello.class
+%%PORTDOCS%%%%DOCSDIR%%/cubit.nrx
+%%PORTDOCS%%%%DOCSDIR%%/comment.txt
+%%PORTDOCS%%%%DOCSDIR%%/buttons.html
+%%PORTDOCS%%%%DOCSDIR%%/blueballw.gif
+%%PORTDOCS%%%%DOCSDIR%%/archtext.html
+%%PORTDOCS%%%%DOCSDIR%%/WordClock.nrx
+%%PORTDOCS%%%%DOCSDIR%%/WordClock.class
+%%PORTDOCS%%%%DOCSDIR%%/Tablet.nrx
+%%PORTDOCS%%%%DOCSDIR%%/Tablet.class
+%%PORTDOCS%%%%DOCSDIR%%/Spectrum.nrx
+%%PORTDOCS%%%%DOCSDIR%%/Spectrum.class
+%%PORTDOCS%%%%DOCSDIR%%/Scribble.nrx
+%%PORTDOCS%%%%DOCSDIR%%/Scribble.class
+%%PORTDOCS%%%%DOCSDIR%%/PlayClip.nrx
+%%PORTDOCS%%%%DOCSDIR%%/PlayClip.class
+%%PORTDOCS%%%%DOCSDIR%%/Pinger.nrx
+%%PORTDOCS%%%%DOCSDIR%%/Pinger.au
+%%PORTDOCS%%%%DOCSDIR%%/NervousTexxt.nrx
+%%PORTDOCS%%%%DOCSDIR%%/NervousTexxt.class
+%%PORTDOCS%%%%DOCSDIR%%/IBMsw.gif
+%%PORTDOCS%%%%DOCSDIR%%/HelloApplet.nrx
+%%PORTDOCS%%%%DOCSDIR%%/HelloApplet.class
+%%PORTDOCS%%%%DOCSDIR%%/GifShow.nrx
+%%PORTDOCS%%%%DOCSDIR%%/GifShow.class
+%%PORTDOCS%%%%DOCSDIR%%/Buttons.nrx
+%%PORTDOCS%%%%DOCSDIR%%/Buttons.class
+%%PORTDOCS%%%%DOCSDIR%%/Buttons$Right.class
+%%PORTDOCS%%%%DOCSDIR%%/Buttons$Left.class
+%%PORTDOCS%%%%DOCSDIR%%/ArchText.nrx
+%%PORTDOCS%%%%DOCSDIR%%/wordclock.html
+%%PORTDOCS%%%%DOCSDIR%%/ArchText.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/hello.nrx
 share/java/classes/NetRexxC.jar
 share/java/classes/NetRexxR.jar
-%%PORTDOCS%%@dirrm share/doc/NetRexx/netrexx/lang
-%%PORTDOCS%%@dirrm share/doc/NetRexx/netrexx
-%%PORTDOCS%%@dirrm share/doc/NetRexx
-%%PORTDOCS%%@dirrm share/examples/NetRexx
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/netrexx/lang
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/netrexx
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%