- Update to 13.0

PR:		143066
Submitted by:	"Pedro F. Giffuni" <giffunip@tutopia.com>

12 files changed, 286 insertions, 152 deletions

diff --git a/cad/z88/Makefile b/cad/z88/Makefile
index b8c2e835d3d6..8fbdd4a303ab 100644
--- a/cad/z88/Makefile
+++ b/cad/z88/Makefile
@@ -6,50 +6,55 @@
 #
 
 PORTNAME=	z88
-PORTVERSION=	11.0
-PORTREVISION=	1
+PORTVERSION=	13.0
 CATEGORIES=	cad
-MASTER_SITES=	ftp://ftp.uni-bayreuth.de/pub/uni-bayreuth/LS-CAD/Version11/unix/:srcs \
-		ftp://ftp.uni-bayreuth.de/pub/uni-bayreuth/LS-CAD/Version11/manual//:dcs
-DISTFILES=	${PORTNAME}src${EXTRACT_SUFX}:srcs ${PORTNAME}mane.pdf:dcs
+MASTER_SITES=	http://www.z88.uni-bayreuth.de/download/
+DISTFILES=	${PORTNAME}130${EXTRACT_SUFX} ${PORTNAME}mane.pdf
 DIST_SUBDIR=	z88
-EXTRACT_ONLY=	${PORTNAME}src${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}130${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A compact Finite Element Analysis System
 
+LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
+
 NO_WRKSUBDIR=	yes
-USE_GL=		glu glw
-USE_MOTIF=	yes
+USE_GL=		glu
+USE_GNOME=	gtk20
 
 #These defaults can be changed in z88.fcd too
-BROWSER?=	mozilla
-XEDITOR?=	nedit
+BROWSER?=	firefox3
+XEDITOR?=	gedit
 
 Z88_BINS=	z88f z88i1 z88i2 z88com z88d z88e z88g z88h z88n z88o	\
-		z88p z88v  z88x laserj88 pxon88
+		z88x z88v
 Z88_DATA=	z88.fcd z88.dyn *.dxf *.txt
 
 post-patch:
 	@${CP} ${WRKSRC}/z88.fcd.linux ${WRKSRC}/z88.fcd
-	@${CP} ${WRKSRC}/z88.mk.kernel.linux ${WRKSRC}/z88kernel.mk
-	@${CP} ${WRKSRC}/z88.mk.other.linux ${WRKSRC}/z88other.mk
+	@${CP} ${WRKSRC}/z88.mk.kernel.gcc32 ${WRKSRC}/z88.kernel.mk
+	@${CP} ${WRKSRC}/z88.mk.other.gcc32 ${WRKSRC}/z88.other.mk
+	@${CP} ${WRKSRC}/z88.mk.gtk.gcc32 ${WRKSRC}/z88.gtk.mk
+	@${CP} ${FILESDIR}/z88.sh ${WRKSRC}/z88.sh
 	@${CP} ${FILESDIR}/z88.sh ${WRKSRC}/z88.sh
 	@${REINPLACE_CMD} -e 's+%%DOCSDIR%%+${DOCSDIR}+g; \
-	s+mozilla+${BROWSER}+ ; \
-	s+nedit+${XEDITOR}+ ;' \
+	s+firefox+${BROWSER}+ ; \
+	s+joe+${XEDITOR}+ ;' \
 		${WRKSRC}/z88.fcd
 	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g ; s+%%CFLAGS%%+${CFLAGS}+g' \
-		${WRKSRC}/z88kernel.mk
+		${WRKSRC}/z88.kernel.mk
 	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g ; s+%%CFLAGS%%+${CFLAGS}+g ; \
 	s+%%LOCALBASE%%+${LOCALBASE}+g;' \
-		${WRKSRC}/z88other.mk
+		${WRKSRC}/z88.other.mk
+	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g ; s+%%CFLAGS%%+${CFLAGS}+g' \
+		${WRKSRC}/z88.gtk.mk
 	@${REINPLACE_CMD} -e 's+%%PREFIX%%+${PREFIX}+g; ' \
 		${WRKSRC}/z88.sh
 
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} -f z88kernel.mk kernel)
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} -f z88other.mk other clean)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} -f z88.kernel.mk kernel)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} -f z88.other.mk other clean)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} -f z88.gtk.mk gtk)
 
 do-install:
 	@${MKDIR} ${PREFIX}/bin
diff --git a/cad/z88/distinfo b/cad/z88/distinfo
index c0009846bc71..24c0b7ad30d9 100644
--- a/cad/z88/distinfo
+++ b/cad/z88/distinfo
@@ -1,6 +1,6 @@
-MD5 (z88/z88src.tar.gz) = 2ea0a8a7368a34ae54b41e21477bdeea
-SHA256 (z88/z88src.tar.gz) = 7842f33f95810c573374104e9a11ea085f28e0f17037dade568ed2318ccd9c27
-SIZE (z88/z88src.tar.gz) = 8138799
-MD5 (z88/z88mane.pdf) = eae5d70f1065f28cb3e3b0553b378545
-SHA256 (z88/z88mane.pdf) = bae37af7ccf085df1d978092ebeed3c9d86d4ebf4aa196e6873a5bb42822961d
-SIZE (z88/z88mane.pdf) = 8841182
+MD5 (z88/z88130.tar.gz) = 5810a578b2d493d976efb8ec7bfa44bf
+SHA256 (z88/z88130.tar.gz) = 17c2f7d74cc5c19d9fa9a8426d7db35d43ba51b59a4f1e3dcdb869a5ec041c1f
+SIZE (z88/z88130.tar.gz) = 42628037
+MD5 (z88/z88mane.pdf) = 74d0c8864225f5197ac86b336809e09b
+SHA256 (z88/z88mane.pdf) = 064ef65fea963a62c1bfae0f07853835d86d592557b0da6c311102df5d10606d
+SIZE (z88/z88mane.pdf) = 7329676
diff --git a/cad/z88/files/patch-cb88o.c b/cad/z88/files/patch-cb88o.c
new file mode 100644
index 000000000000..77f39ecdaafc
--- /dev/null
+++ b/cad/z88/files/patch-cb88o.c
@@ -0,0 +1,37 @@
+--- cb88o.c.orig	2010-01-19 10:23:29.000000000 +0000
++++ cb88o.c	2010-01-19 10:28:02.000000000 +0000
+@@ -1161,9 +1161,9 @@
+ /*---------------------------------------------------------------------------
+ * beim allerersten Start gehen fux, fuy & fuz mit je 100. rein
+ *--------------------------------------------------------------------------*/
+-gcvt(fux,idigit,cfux); 
+-gcvt(fuy,idigit,cfuy); 
+-gcvt(fuz,idigit,cfuz); 
++snprintf(cfux, idigit, "%g", fux);
++snprintf(cfuy, idigit, "%g", fuy);
++snprintf(cfuz, idigit, "%g",cfuz);
+ 
+ if(LANG == 1) strcpy(cstring,"VERGROESSERUNG VER.");
+ if(LANG == 2) strcpy(cstring,"MAGNIFICATION DEFL.");
+@@ -1231,9 +1231,9 @@
+ /*---------------------------------------------------------------------------
+ * beim allerersten Start gehen rotx, roty & rotz mit je 0. rein
+ *--------------------------------------------------------------------------*/
+-gcvt(rotx,idigit,crotx); 
+-gcvt(roty,idigit,croty); 
+-gcvt(rotz,idigit,crotz); 
++snprintf(crotx, idigit, "%g", rotx);
++snprintf(croty, idigit, "%g", roty);
++snprintf(crotz, idigit, "%g", rotz);
+ 
+ if(LANG == 1) strcpy(cstring,"ROTATIONEN 3-D");
+ if(LANG == 2) strcpy(cstring,"ROTATIONS 3-D");
+@@ -1306,7 +1306,7 @@
+ /*---------------------------------------------------------------------------
+ * beim allerersten Start geht zm mit -100. rein
+ *--------------------------------------------------------------------------*/
+-gcvt(zm,idigit,czm); 
++snprintf(czm, idigit, "%g", zm); 
+ 
+ if(LANG == 1) strcpy(cstring,"Z-Limit zum Betrachter");
+ if(LANG == 2) strcpy(cstring,"Z Limit towards you");
diff --git a/cad/z88/files/patch-vp88.c b/cad/z88/files/patch-vp88.c
deleted file mode 100644
index 757989743d93..000000000000
--- a/cad/z88/files/patch-vp88.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- vp88.c.orig	Wed Dec 29 20:06:45 2004
-+++ vp88.c	Wed Dec 29 21:04:35 2004
-@@ -530,9 +530,9 @@
- 
- if(ifansi== IDM_3DIM)
-   {
--  gcvt(rotx,idigit,crotx);
--  gcvt(roty,idigit,croty);
--  gcvt(rotz,idigit,crotz);
-+  snprintf(crotx, idigit, "%g", rotx);
-+  snprintf(croty, idigit, "%g", roty);
-+  snprintf(crotz, idigit, "%g", rotz);
-   strcpy(crx,"ROTX= ");
-   strcpy(cry,"ROTY= ");
-   strcpy(crz,"ROTZ= ");
diff --git a/cad/z88/files/patch-z88.fcd b/cad/z88/files/patch-z88.fcd
index 7edcc6c0e81d..784efee9c9af 100644
--- a/cad/z88/files/patch-z88.fcd
+++ b/cad/z88/files/patch-z88.fcd
@@ -1,7 +1,7 @@
---- z88.fcd.linux.orig	Tue Dec 28 21:32:30 2004
-+++ z88.fcd.linux	Tue Dec 28 21:33:46 2004
+--- z88.fcd.linux.orig	2008-11-23 16:23:32.000000000 +0000
++++ z88.fcd.linux	2010-01-19 10:12:57.000000000 +0000
 @@ -1,5 +1,5 @@
- Header file Z88.FCD for Prof.Dr. Frank Rieg's free FEA program Z88 V11.
+ Header file Z88.FCD for Prof.Dr. Frank Rieg's free FEA program Z88 V13.
 -This file fits well for the LINUX OS
 +This file fits well for the FreeBSD OS
  
@@ -11,8 +11,8 @@
  
      Your HTML-or Internet Browser's prefix
      Prefix fuer Ihren HTML- oder Internet Browser
--    CPREFIX      file:///home/rieg/z88v11/
+-    CPREFIX      file:///home/frank/z88130/
 +    CPREFIX      file://%%DOCSDIR%%/
  
-     Volume of alert bell
-     Warnton-Staerke
+   WINDOW END
+ 
diff --git a/cad/z88/files/patch-z88.mk.gtk.gcc32 b/cad/z88/files/patch-z88.mk.gtk.gcc32
new file mode 100644
index 000000000000..cddfcc2e2f40
--- /dev/null
+++ b/cad/z88/files/patch-z88.mk.gtk.gcc32
@@ -0,0 +1,11 @@
+--- z88.mk.gtk.gcc32.orig	2010-01-20 16:17:25.000000000 +0000
++++ z88.mk.gtk.gcc32	2010-01-20 16:19:30.000000000 +0000
+@@ -4,7 +4,7 @@
+ # at this moment. 
+ # 8.5.2008 Rieg
+ #############################################################################
+-CC= gcc -DFR_UNIX -DFR_LINUX -DFR_XDOUB -DFR_XLONG -I. -O3 -fomit-frame-pointer \
++CC= %%CC%% -DFR_UNIX -DFR_LINUX -DFR_XDOUB -DFR_XLONG -I. %%CFLAGS%% \
+ `pkg-config --cflags --libs gtk+-2.0 gdkglext-1.0 gdkglext-x11-1.0 gtkglext-1.0 gtkglext-x11-1.0`
+ 
+ OBJECTSO = z88o.o cb88o.o lan88o.o dyn88o.o wlog88o.o ale88o.o rcoo88.o\
diff --git a/cad/z88/files/patch-z88.mk.kernel b/cad/z88/files/patch-z88.mk.kernel
deleted file mode 100644
index 964170b4c2cb..000000000000
--- a/cad/z88/files/patch-z88.mk.kernel
+++ /dev/null
@@ -1,13 +0,0 @@
---- z88.mk.kernel.linux.orig	Tue Dec 28 21:35:53 2004
-+++ z88.mk.kernel.linux	Tue Dec 28 21:39:26 2004
-@@ -21,8 +21,8 @@
- # 3.2.2004 Rieg
- #############################################################################
- 
--CC = gcc
--CFLAGS = -mcpu=i486 -I. -DFR_UNIX -DFR_XDOUB -DFR_XLONG -O3 -fomit-frame-pointer
-+CC = %%CC%%
-+CFLAGS = %%CFLAGS%% -I. -DFR_UNIX -DFR_XDOUB -DFR_XLONG
- 
- LDLIBSOX = -lm -lc 
- 
diff --git a/cad/z88/files/patch-z88.mk.kernel.gcc32 b/cad/z88/files/patch-z88.mk.kernel.gcc32
new file mode 100644
index 000000000000..7a167f928470
--- /dev/null
+++ b/cad/z88/files/patch-z88.mk.kernel.gcc32
@@ -0,0 +1,14 @@
+--- z88.mk.kernel.gcc32.orig	2010-01-19 14:29:11.000000000 +0000
++++ z88.mk.kernel.gcc32	2010-01-19 14:38:10.000000000 +0000
+@@ -16,9 +16,8 @@
+ #  
+ # 18.6.2008 Rieg
+ #############################################################################
+-CC = gcc
+-CFLAGS = -I. -DFR_UNIX -DFR_LINUX -DFR_XDOUB -DFR_XINT \
+-         -O3 -fomit-frame-pointer 
++CC = %%CC%%
++CFLAGS = %%CFLAGS%% -I. -DFR_UNIX -DFR_LINUX -DFR_XDOUB -DFR_XINT
+ 
+ LDLIBSOM = -lm -lc
+ 
diff --git a/cad/z88/files/patch-z88.mk.other b/cad/z88/files/patch-z88.mk.other
deleted file mode 100644
index cf925d8e27a8..000000000000
--- a/cad/z88/files/patch-z88.mk.other
+++ /dev/null
@@ -1,23 +0,0 @@
---- z88.mk.other.linux.orig	Tue Dec 28 22:01:09 2004
-+++ z88.mk.other.linux	Tue Dec 28 22:03:12 2004
-@@ -17,15 +17,14 @@
- # 14.4.2004 Rieg
- #############################################################################
- 
--CC = gcc
--CFLAGS = -mcpu=i486 -I. -I/usr/X11R6/include -DFR_UNIX -DFR_XDOUB -DFR_XLONG -O3\
-- -fomit-frame-pointer
-+CC = %%CC%%
-+CFLAGS =%%CFLAGS%% -I. -I%%LOCALBASE%%/include -DFR_UNIX -DFR_XDOUB -DFR_XLONG
- 
- LDLIBSOM = -lc 
- LDLIBSOX = -lm -lc 
--LDLIBSNX = -L/usr/X11R6/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lc
--LDLIBSMX = -L/usr/X11R6/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc
--LDLIBSMO = -L/usr/X11R6/lib -lGLw -lGL -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc
-+LDLIBSNX = -L%%LOCALBASE%%/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lc
-+LDLIBSMX = -L%%LOCALBASE%%/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc
-+LDLIBSMO = -L%%LOCALBASE%%/lib -lGLw -lGL -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc
- 
- OBJECTSE = z88e.o ale88e.o dyn88e.o clr88.o m1.o m2.o stop88e.o cshe88.o\
-  hexa88.o lqua88.o qshe88.o isod88.o tetr88.o spur88.o spla88.o hpla88.o\
diff --git a/cad/z88/files/patch-z88.mk.other.gcc32 b/cad/z88/files/patch-z88.mk.other.gcc32
new file mode 100644
index 000000000000..df22f04626ad
--- /dev/null
+++ b/cad/z88/files/patch-z88.mk.other.gcc32
@@ -0,0 +1,15 @@
+--- z88.mk.other.gcc32.orig	2010-01-19 14:29:24.000000000 +0000
++++ z88.mk.other.gcc32	2010-01-19 14:37:36.000000000 +0000
+@@ -6,9 +6,9 @@
+ #  
+ # 8.5.2008 Rieg
+ #############################################################################
+-CC = gcc
+-CFLAGS = -march=i586 -I. -I/usr/X11R6/include -DFR_UNIX -DFR_XDOUB \
+-         -DFR_LINUX -O3 -fomit-frame-pointer
++CC = %%CC%%
++CFLAGS = %%CFLAGS%% -I. -I/usr/X11R6/include -DFR_UNIX -DFR_XDOUB \
++         -DFR_LINUX
+ 
+ LDLIBSOM = -lc 
+ LDLIBSOX = -lm -lc 
diff --git a/cad/z88/files/z88.sh b/cad/z88/files/z88.sh
index 2160ac144d9c..28ab5a1c445f 100644
--- a/cad/z88/files/z88.sh
+++ b/cad/z88/files/z88.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script checks for the existence of the three very important Z88
+# This script checks for the existence of the three very important Z88 
 # parameter files z88.fcd, z88.dyn and z88i4.txt and launches the
 # Z88 commander
 # This file was taken from the Z88 RPM distribution
@@ -16,7 +16,7 @@ fi
 
 if ! test -f z88i4.txt
   then
-    cp %%PREFIX%%/share/z88/b1_4.txt z88i4.txt
+    cp %%PREFIX%%/share/z88/z88i4.txt .
 fi
 
 if ! test -f z88i1.txt
@@ -34,8 +34,8 @@ if ! test -f z88i1.txt
               else
                 echo "A Z88 input file z88g.cos exists"
             fi
-          else
-            echo "A Z88 input file z88x.dxf exists"
+          else 
+            echo "A Z88 input file z88x.dxf exists" 
         fi
       else
         echo "A Z88 input file z88ni.txt exists"
@@ -44,9 +44,9 @@ if ! test -f z88i1.txt
     echo "A Z88 input file z88i1.txt exists"
 fi
 
-echo "For further information consult"
-echo "http://www.z88.org/ or "
-echo "%%PREFIX%%/share/doc/z88/z88mane.pdf (English)"
+echo "For further information consult" 
+echo "%%PREFIX%%/z88/README or"
+echo "%%PREFIX%%/doc/z88/z88mane.pdf (English)"
 echo "*** Starting the Z88 Finite Elements Analysis system ***"
 
-z88com &
+z88com
diff --git a/cad/z88/pkg-plist b/cad/z88/pkg-plist
index 0b64a31327e8..54bb893b3f7d 100644
--- a/cad/z88/pkg-plist
+++ b/cad/z88/pkg-plist
@@ -1,5 +1,3 @@
-bin/laserj88
-bin/pxon88
 bin/z88
 bin/z88com
 bin/z88d
@@ -11,29 +9,87 @@ bin/z88i1
 bin/z88i2
 bin/z88n
 bin/z88o
-bin/z88p
+bin/z88v
 bin/z88v
 bin/z88x
+%%DATADIR%%/b10_2.txt
+%%DATADIR%%/b10_3.txt
+%%DATADIR%%/b10_n.txt
+%%DATADIR%%/b12_1.txt
+%%DATADIR%%/b12_1e14.txt
+%%DATADIR%%/b12_2.txt
+%%DATADIR%%/b12_3.txt
+%%DATADIR%%/b12_q_1.txt
+%%DATADIR%%/b12_q_2.txt
+%%DATADIR%%/b12_q_3.txt
+%%DATADIR%%/b12_q_5.txt
+%%DATADIR%%/b16014_2.txt
+%%DATADIR%%/b16014_n.txt
+%%DATADIR%%/b16028_2.txt
+%%DATADIR%%/b16028_n.txt
+%%DATADIR%%/b16056_2.txt
+%%DATADIR%%/b16056_n.txt
+%%DATADIR%%/b16112_2.txt
+%%DATADIR%%/b16112_n.txt
+%%DATADIR%%/b16224_2.txt
+%%DATADIR%%/b16224_n.txt
+%%DATADIR%%/b16_2.txt
+%%DATADIR%%/b16_3.txt
 %%DATADIR%%/b18_2.txt
 %%DATADIR%%/b18_2rou.txt
-%%DATADIR%%/b18_x.dxf
 %%DATADIR%%/b1_2.txt
 %%DATADIR%%/b1_3.txt
 %%DATADIR%%/b1_4.txt
-%%DATADIR%%/b1_x.dxf
-%%DATADIR%%/b2_x.dxf
-%%DATADIR%%/b3_x.dxf
-%%DATADIR%%/b4_x.dxf
+%%DATADIR%%/b22_2.txt
+%%DATADIR%%/b22_3.txt
+%%DATADIR%%/b22_ni.txt
+%%DATADIR%%/b22_ni_r2.txt
+%%DATADIR%%/b22_ni_r3k5.txt
+%%DATADIR%%/b23_i2.txt
+%%DATADIR%%/b23_i3.txt
+%%DATADIR%%/b23_i5.txt
+%%DATADIR%%/b23_ni.txt
 %%DATADIR%%/b5_2.txt
 %%DATADIR%%/b5_3.txt
-%%DATADIR%%/b5_x.dxf
-%%DATADIR%%/b6_x.dxf
+%%DATADIR%%/b5_ele10_2.txt
+%%DATADIR%%/b5_ele10_3.txt
+%%DATADIR%%/b5_ele10_ni.txt
+%%DATADIR%%/b6_q_1.txt
+%%DATADIR%%/b6_q_2.txt
+%%DATADIR%%/b6_q_5.txt
 %%DATADIR%%/b7_2.txt
 %%DATADIR%%/b7_3.txt
-%%DATADIR%%/b7_x.dxf
+%%DATADIR%%/b7_e15_1.txt
+%%DATADIR%%/b7_e15_2.txt
+%%DATADIR%%/b7_e15_3.txt
+%%DATADIR%%/b9_1.txt
+%%DATADIR%%/b9_2.txt
+%%DATADIR%%/b9_3.txt
+%%DATADIR%%/b9_tf_2.txt
+%%DATADIR%%/b9_tf_3.txt
+%%DATADIR%%/b9_tf_ni.txt
 %%DATADIR%%/copying.txt
 %%DATADIR%%/z88.dyn
 %%DATADIR%%/z88.fcd
+%%DATADIR%%/b10_n.dxf
+%%DATADIR%%/b13_x.dxf
+%%DATADIR%%/b16_n.dxf
+%%DATADIR%%/b16step1.dxf
+%%DATADIR%%/b16step2.dxf
+%%DATADIR%%/b16step3.dxf
+%%DATADIR%%/b16step4.dxf
+%%DATADIR%%/b16step5.dxf
+%%DATADIR%%/b18_x.dxf
+%%DATADIR%%/b1_x.dxf
+%%DATADIR%%/b22_x.dxf
+%%DATADIR%%/b23_x.dxf
+%%DATADIR%%/b2_x.dxf
+%%DATADIR%%/b3_x.dxf
+%%DATADIR%%/b4_20ele_x.dxf
+%%DATADIR%%/b4_x.dxf
+%%DATADIR%%/b5_x.dxf
+%%DATADIR%%/b6_x.dxf
+%%DATADIR%%/b7_x.dxf
 %%DATADIR%%/z88x.dxf
 @dirrm %%DATADIR%%
 %%DOCSDIR%%/e88d.htm
@@ -87,6 +143,7 @@ bin/z88x
 %%DOCSDIR%%/e88i205.gif
 %%DOCSDIR%%/e88i3.htm
 %%DOCSDIR%%/e88i4.htm
+%%DOCSDIR%%/e88i5.htm
 %%DOCSDIR%%/e88ia.htm
 %%DOCSDIR%%/e88in.htm
 %%DOCSDIR%%/e88inu.jpg
@@ -94,7 +151,10 @@ bin/z88x
 %%DOCSDIR%%/e88ite.htm
 %%DOCSDIR%%/e88ite1.jpg
 %%DOCSDIR%%/e88ite2.jpg
+%%DOCSDIR%%/e88ite3.jpg
 %%DOCSDIR%%/e88ix.htm
+%%DOCSDIR%%/e88mr1.jpg
+%%DOCSDIR%%/e88mr2.jpg
 %%DOCSDIR%%/e88mru.htm
 %%DOCSDIR%%/e88mrw.htm
 %%DOCSDIR%%/e88n.htm
@@ -103,11 +163,14 @@ bin/z88x
 %%DOCSDIR%%/e88ni.htm
 %%DOCSDIR%%/e88ni01.gif
 %%DOCSDIR%%/e88o.htm
-%%DOCSDIR%%/e88o1.jpg
-%%DOCSDIR%%/e88o2.jpg
-%%DOCSDIR%%/e88o3.jpg
-%%DOCSDIR%%/e88o4.jpg
+%%DOCSDIR%%/e88o01.jpg
+%%DOCSDIR%%/e88o02.jpg
+%%DOCSDIR%%/e88o03.jpg
+%%DOCSDIR%%/e88o04.jpg
+%%DOCSDIR%%/e88o05.jpg
+%%DOCSDIR%%/e88o06.jpg
 %%DOCSDIR%%/e88p.htm
+%%DOCSDIR%%/e88s10.htm
 %%DOCSDIR%%/e88s1.htm
 %%DOCSDIR%%/e88s2.htm
 %%DOCSDIR%%/e88s3.htm
@@ -117,23 +180,7 @@ bin/z88x
 %%DOCSDIR%%/e88s6.htm
 %%DOCSDIR%%/e88s7.htm
 %%DOCSDIR%%/e88s8.htm
-%%DOCSDIR%%/e88s81.jpg
-%%DOCSDIR%%/e88s82.jpg
-%%DOCSDIR%%/e88s83.jpg
-%%DOCSDIR%%/e88s84.jpg
-%%DOCSDIR%%/e88s85.jpg
-%%DOCSDIR%%/e88s86.jpg
-%%DOCSDIR%%/e88s87.jpg
-%%DOCSDIR%%/e88s88.jpg
 %%DOCSDIR%%/e88s9.htm
-%%DOCSDIR%%/e88s92.jpg
-%%DOCSDIR%%/e88s93.jpg
-%%DOCSDIR%%/e88s94.jpg
-%%DOCSDIR%%/e88s95.jpg
-%%DOCSDIR%%/e88s96.jpg
-%%DOCSDIR%%/e88s97.jpg
-%%DOCSDIR%%/e88s98.jpg
-%%DOCSDIR%%/e88s99.jpg
 %%DOCSDIR%%/e88sa.htm
 %%DOCSDIR%%/e88v.htm
 %%DOCSDIR%%/e88v1.jpg
@@ -244,59 +291,28 @@ bin/z88x
 %%DOCSDIR%%/g88ni.htm
 %%DOCSDIR%%/g88ni01.gif
 %%DOCSDIR%%/g88o.htm
-%%DOCSDIR%%/g88o1.jpg
-%%DOCSDIR%%/g88o2.jpg
-%%DOCSDIR%%/g88o3.jpg
-%%DOCSDIR%%/g88o4.jpg
-%%DOCSDIR%%/g88p.htm
 %%DOCSDIR%%/g88s1.htm
 %%DOCSDIR%%/g88s101.gif
 %%DOCSDIR%%/g88s102.gif
 %%DOCSDIR%%/g88s103.gif
-%%DOCSDIR%%/g88s104.gif
-%%DOCSDIR%%/g88s105.gif
 %%DOCSDIR%%/g88s2.htm
 %%DOCSDIR%%/g88s201.gif
 %%DOCSDIR%%/g88s202.gif
 %%DOCSDIR%%/g88s3.htm
 %%DOCSDIR%%/g88s301.gif
-%%DOCSDIR%%/g88s302.gif
-%%DOCSDIR%%/g88s303.gif
-%%DOCSDIR%%/g88s304.gif
 %%DOCSDIR%%/g88s4.htm
 %%DOCSDIR%%/g88s401.gif
 %%DOCSDIR%%/g88s402.gif
 %%DOCSDIR%%/g88s5.htm
 %%DOCSDIR%%/g88s501.gif
 %%DOCSDIR%%/g88s502.gif
-%%DOCSDIR%%/g88s503.gif
 %%DOCSDIR%%/g88s6.htm
 %%DOCSDIR%%/g88s601.gif
-%%DOCSDIR%%/g88s602.gif
-%%DOCSDIR%%/g88s603.gif
 %%DOCSDIR%%/g88s7.htm
 %%DOCSDIR%%/g88s701.gif
 %%DOCSDIR%%/g88s702.gif
-%%DOCSDIR%%/g88s703.gif
 %%DOCSDIR%%/g88s8.htm
-%%DOCSDIR%%/g88s81.jpg
-%%DOCSDIR%%/g88s82.jpg
-%%DOCSDIR%%/g88s83.jpg
-%%DOCSDIR%%/g88s84.jpg
-%%DOCSDIR%%/g88s85.jpg
-%%DOCSDIR%%/g88s86.jpg
-%%DOCSDIR%%/g88s87.jpg
-%%DOCSDIR%%/g88s88.jpg
 %%DOCSDIR%%/g88s9.htm
-%%DOCSDIR%%/g88s91.jpg
-%%DOCSDIR%%/g88s92.jpg
-%%DOCSDIR%%/g88s93.jpg
-%%DOCSDIR%%/g88s94.jpg
-%%DOCSDIR%%/g88s95.jpg
-%%DOCSDIR%%/g88s96.jpg
-%%DOCSDIR%%/g88s97.jpg
-%%DOCSDIR%%/g88s98.jpg
-%%DOCSDIR%%/g88s99.jpg
 %%DOCSDIR%%/g88sa.htm
 %%DOCSDIR%%/g88v.htm
 %%DOCSDIR%%/g88v1.jpg
@@ -314,6 +330,93 @@ bin/z88x
 %%DOCSDIR%%/g88x10.gif
 %%DOCSDIR%%/g88x2.gif
 %%DOCSDIR%%/g88x3.gif
+%%DOCSDIR%%/e88s1004.jpg
+%%DOCSDIR%%/e88s104.jpg
+%%DOCSDIR%%/e88s105.jpg
+%%DOCSDIR%%/e88s106.jpg
+%%DOCSDIR%%/e88s203.jpg
+%%DOCSDIR%%/e88s303.jpg
+%%DOCSDIR%%/e88s404.jpg
+%%DOCSDIR%%/e88s503.jpg
+%%DOCSDIR%%/e88s504.jpg
+%%DOCSDIR%%/e88s602.jpg
+%%DOCSDIR%%/e88s603.jpg
+%%DOCSDIR%%/e88s701.jpg
+%%DOCSDIR%%/e88s703.jpg
+%%DOCSDIR%%/e88s801.jpg
+%%DOCSDIR%%/e88s802.jpg
+%%DOCSDIR%%/e88s803.jpg
+%%DOCSDIR%%/e88s804.jpg
+%%DOCSDIR%%/e88s805.jpg
+%%DOCSDIR%%/e88s806.jpg
+%%DOCSDIR%%/e88s807.jpg
+%%DOCSDIR%%/e88s808.jpg
+%%DOCSDIR%%/e88s809.jpg
+%%DOCSDIR%%/e88s904.jpg
+%%DOCSDIR%%/e88s905.jpg
+%%DOCSDIR%%/e88s906.jpg
+%%DOCSDIR%%/e88s907.jpg
+%%DOCSDIR%%/e88s908.jpg
+%%DOCSDIR%%/e88s909.jpg
+%%DOCSDIR%%/g88e1002.gif
+%%DOCSDIR%%/g88e102.gif
+%%DOCSDIR%%/g88e1102.gif
+%%DOCSDIR%%/g88e1202.gif
+%%DOCSDIR%%/g88e1402.gif
+%%DOCSDIR%%/g88e1502.gif
+%%DOCSDIR%%/g88e1602.gif
+%%DOCSDIR%%/g88e1702.gif
+%%DOCSDIR%%/g88e702.gif
+%%DOCSDIR%%/g88e802.gif
+%%DOCSDIR%%/g88i5.htm
+%%DOCSDIR%%/g88i501.gif
+%%DOCSDIR%%/g88i502.gif
+%%DOCSDIR%%/g88ite3.jpg
+%%DOCSDIR%%/g88mr9.jpg
+%%DOCSDIR%%/g88o01.jpg
+%%DOCSDIR%%/g88o02.jpg
+%%DOCSDIR%%/g88o03.jpg
+%%DOCSDIR%%/g88o04.jpg
+%%DOCSDIR%%/g88o05.jpg
+%%DOCSDIR%%/g88o06.jpg
+%%DOCSDIR%%/g88s10.htm
+%%DOCSDIR%%/g88s1001.jpg
+%%DOCSDIR%%/g88s1002.jpg
+%%DOCSDIR%%/g88s1003.jpg
+%%DOCSDIR%%/g88s1004.jpg
+%%DOCSDIR%%/g88s104.jpg
+%%DOCSDIR%%/g88s105.jpg
+%%DOCSDIR%%/g88s106.jpg
+%%DOCSDIR%%/g88s203.jpg
+%%DOCSDIR%%/g88s302.jpg
+%%DOCSDIR%%/g88s303.jpg
+%%DOCSDIR%%/g88s403.jpg
+%%DOCSDIR%%/g88s404.jpg
+%%DOCSDIR%%/g88s503.jpg
+%%DOCSDIR%%/g88s504.jpg
+%%DOCSDIR%%/g88s602.jpg
+%%DOCSDIR%%/g88s603.jpg
+%%DOCSDIR%%/g88s701.jpg
+%%DOCSDIR%%/g88s702.jpg
+%%DOCSDIR%%/g88s703.jpg
+%%DOCSDIR%%/g88s801.jpg
+%%DOCSDIR%%/g88s802.jpg
+%%DOCSDIR%%/g88s803.jpg
+%%DOCSDIR%%/g88s804.jpg
+%%DOCSDIR%%/g88s805.jpg
+%%DOCSDIR%%/g88s806.jpg
+%%DOCSDIR%%/g88s807.jpg
+%%DOCSDIR%%/g88s808.jpg
+%%DOCSDIR%%/g88s809.jpg
+%%DOCSDIR%%/g88s901.jpg
+%%DOCSDIR%%/g88s902.jpg
+%%DOCSDIR%%/g88s903.jpg
+%%DOCSDIR%%/g88s904.jpg
+%%DOCSDIR%%/g88s905.jpg
+%%DOCSDIR%%/g88s906.jpg
+%%DOCSDIR%%/g88s907.jpg
+%%DOCSDIR%%/g88s908.jpg
+%%DOCSDIR%%/g88s909.jpg
 %%DOCSDIR%%/pla1.gif
 %%PORTDOCS%%%%DOCSDIR%%/z88mane.pdf
 @dirrm %%DOCSDIR%%