- Update to 3.2a.

- The maintainer is now a committer.

Reviewed by:	Kim Culhan <kimc@w8hd.org>

49 files changed, 1126 insertions, 743 deletions

diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
index a39d7b5b94d3..932069917950 100644
--- a/x11-toolkits/iv/Makefile
+++ b/x11-toolkits/iv/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	iv
-# Version required:	3.1
+# Version required:	3.2a
 # Date created:		23.sept.1994
 # Whom:			adam
 #
 # $FreeBSD$
 #
 
-DISTNAME=	3.1
-PKGNAME=	iv-3.1
+DISTNAME=	3.2a
+PKGNAME=	iv-3.2a
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://interviews.stanford.edu/pub/
+MASTER_SITES=	ftp://sgi.com/graphics/interviews/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	tanimura@naklab.dnj.ynu.ac.jp
+MAINTAINER=	tanimura@FreeBSD.org
 
 USE_XLIB=	yes
 
@@ -21,39 +21,44 @@ WRKSRC=		${WRKDIR}/iv
 MAKEFILE=	makefile
 
 MANPREFIX=	${PREFIX}/interviews
-MANN=		Adjuster.n Banner.n BasicDialog.n Border.n Box2_6.n \
-		BrushCmd.n Button2_6.n CGlue.n CSolver.n Catalog.n \
-		Clipboard.n ColorCmd.n Command.n CompletionEditor.n \
-		Component.n ComponentView.n ConnectTool.n Connector.n \
-		Control.n ControlInfo.n Creator.n Damage.n Data.n \
-		Deck2_6.n Dialog.n Dispatcher.n Editor.n EditorInfo.n \
+MANN=		Adjuster.n Banner.n BasicDialog.n Border.n \
+		Box2_6.n BrushCmd.n Button2_6.n CGlue.n \
+		CSolver.n Catalog.n Clipboard.n ColorCmd.n \
+		Command.n CompletionEditor.n Component.n ComponentView.n \
+		ConnectTool.n Connector.n Control.n ControlInfo.n \
+		Creator.n Damage.n Data.n Deck2_6.n \
+		Dialog.n Dispatcher.n Editor.n EditorInfo.n \
 		EllipseComp.n ExternView.n FileBrowser.n FileChooser.n \
-		FontCmd.n Frame.n GVUpdater.n Glue2_6.n Graphic.n \
-		GraphicBlock.n GraphicComp.n GraphicCompTool.n \
+		FontCmd.n Frame.n GVUpdater.n Glue2_6.n \
+		Graphic.n GraphicBlock.n GraphicComp.n GraphicCompTool.n \
 		GraphicView.n Grid.n IOCallback.n IOHandler.n \
 		ImportCmd.n Interactor.n Iterator.n KeyMap.n \
 		LineComp.n LinkComp.n MacroCmd.n MagnifyTool.n \
 		Manipulator.n MatchEditor.n Menu2_6.n Message.n \
-		MoveTool.n NOPCmd.n PadComp.n Page.n Painter.n \
-		Panner.n Path.n Pattern.n PatternCmd.n Perspective.n \
-		Picture.n PinComp.n PolygonComp.n PostScriptView.n \
-		RasterComp.n RasterRect.n RectComp.n Regexp.n ReqErr.n \
-		ReshapeTool.n Resource.n RotateTool.n RpcHdr.n \
-		RpcPeer.n RpcReader.n RpcRegistry.n RpcService.n \
-		RpcWriter.n Rubband.n ScaleTool.n Scene.n Scroller.n \
-		SelectTool.n Selection.n Sensor.n Shape.n SlotComp.n \
-		SplineComp.n StateVar.n StateVarView.n StencilComp.n \
-		StrBrowser.n StrChooser.n StretchTool.n StringEditor.n \
-		Subject.n TextBuffer.n TextComp.n TextDisplay.n \
-		TextEditor.n Tool.n TransferFunct.n Tray.n UArray.n \
-		UControl.n UHashTable.n ULabel.n UList.n UMap.n \
-		UStencil.n Unidraw.n UnidrawIntro.n Vertices.n \
-		VerticesComp.n Viewer.n Viewport.n World.n alert.n \
-		align.n catcmds.n classes.n datas.n dclock.n doc.n \
-		edit.n ellipses.n geomobjs.n globals.n ibuild.n \
-		iclass.n idraw.n ifb.n ifc.n iostreamb.n ivmkmf.n \
-		kybd.n lines.n logo.n mailbox.n manips.n polygons.n \
-		pspaint.n remind.n rpcbuf.n rpcstream.n splines.n \
+		MoveTool.n NOPCmd.n PadComp.n Page.n \
+		Painter.n Panner.n Path.n Pattern.n \
+		PatternCmd.n Perspective.n Picture.n PinComp.n \
+		PolygonComp.n PostScriptView.n RasterComp.n RasterRect.n \
+		RectComp.n Regexp.n ReqErr.n ReshapeTool.n \
+		Resource.n RotateTool.n RpcHdr.n RpcPeer.n \
+		RpcReader.n RpcRegistry.n RpcService.n RpcWriter.n \
+		Rubband.n ScaleTool.n Scene.n Scroller.n \
+		SelectTool.n Selection.n Sensor.n Shape.n \
+		SlotComp.n SplineComp.n StateVar.n StateVarView.n \
+		StencilComp.n StrBrowser.n StrChooser.n StretchTool.n \
+		StringEditor.n Subject.n TextBuffer.n TextComp.n \
+		TextDisplay.n TextEditor.n Tool.n TransferFunct.n \
+		Tray.n UArray.n UControl.n UHashTable.n \
+		ULabel.n UList.n UMap.n UStencil.n \
+		Unidraw.n UnidrawIntro.n Vertices.n VerticesComp.n \
+		Viewer.n Viewport.n World.n alert.n \
+		align.n catcmds.n classes.n datas.n \
+		dclock.n doc.n edit.n ellipses.n \
+		geomobjs.n globals.n ibuild.n iclass.n \
+		idraw.n ifb.n ifc.n iostreamb.n \
+		ivmkmf.n kybd.n lines.n logo.n \
+		mailbox.n manips.n polygons.n pspaint.n \
+		remind.n rpcbuf.n rpcstream.n splines.n \
 		statevars.n stateviews.n struct.n transfns.n \
 		transforms.n uctrls.n viewcmds.n
 
@@ -62,7 +67,7 @@ MANN=		Adjuster.n Banner.n BasicDialog.n Border.n Box2_6.n \
 .if ${PORTOBJFORMAT} == "elf"
 IV_LIB_VER=     3
 .else
-IV_LIB_VER=     3.1
+IV_LIB_VER=     3.2
 .endif
 
 .if ${OSVERSION} >= 400002
@@ -78,7 +83,10 @@ post-install:
 .if ${PORTOBJFORMAT} == "elf"
 	${LN} -fs libIV.so.${IV_LIB_VER} ${PREFIX}/lib/libIV.so
 	${LN} -fs libUnidraw.so.${IV_LIB_VER} ${PREFIX}/lib/libUnidraw.so
+	${LN} -fs libIV.so.${IV_LIB_VER} ${PREFIX}/interviews/lib/FREEBSD/libIV.so
+	${LN} -fs libUnidraw.so.${IV_LIB_VER} ${PREFIX}/interviews/lib/FREEBSD/libUnidraw.so
 .endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
+
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/iv/distinfo b/x11-toolkits/iv/distinfo
index 9320408051a4..4414a01ca4e3 100644
--- a/x11-toolkits/iv/distinfo
+++ b/x11-toolkits/iv/distinfo
@@ -1 +1 @@
-MD5 (iv/3.1.tar.Z) = 83707e13b4ca484e0d98c41bc76a6e64
+MD5 (iv/3.2a.tar.Z) = 8d51188de584f8fb7b7829a57575399b
diff --git a/x11-toolkits/iv/files/patch-aa b/x11-toolkits/iv/files/patch-aa
index fba69038531c..70f1a6b9fd09 100644
--- a/x11-toolkits/iv/files/patch-aa
+++ b/x11-toolkits/iv/files/patch-aa
@@ -1,6 +1,6 @@
---- src/bin/ibuild/ibcmds.c.orig	Fri Dec 11 22:33:25 1992
-+++ src/bin/ibuild/ibcmds.c	Tue Dec 28 23:53:30 1999
-@@ -86,13 +86,18 @@
+--- src/bin/ibuild/ibcmds.c.orig	Mon Jan  3 08:12:08 1994
++++ src/bin/ibuild/ibcmds.c	Sun Jan 23 20:09:14 2000
+@@ -86,13 +86,16 @@
  #undef FileChooser
  #define FileChooser _lib_iv(FileChooser)
  
@@ -13,13 +13,20 @@
  #include <string.h>
  #include <sys/stat.h>
  #include <sys/wait.h>
-+#ifdef __FreeBSD__
 +#include <unistd.h>
-+#endif
  
  #if defined(sgi) || defined(sco)
  /* not all vforks are alike */
-@@ -2407,12 +2412,13 @@
+@@ -175,7 +178,7 @@
+ 
+ static boolean Abort (Editor* ed, pid_t pid, const char* warning) {
+     boolean aborted;
+-    AbortDialog dialog(int(pid), warning);
++    AbortDialog dialog((int)pid, warning);
+     ed->InsertDialog(&dialog);
+     aborted = dialog.Abort();
+     ed->RemoveDialog(&dialog);
+@@ -2407,12 +2410,13 @@
  	EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
          EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
  
@@ -28,9 +35,9 @@
 -	    IBEditor* iEd = (IBEditor*) unidraw->GetEditor(i);
 +	Iterator ii;
 +	for (unidraw->First(ii); !unidraw->Done(ii); unidraw->Next(ii)) {
++	    int i;
 +	    IBEditor* iEd = (IBEditor*) unidraw->GetEditor(ii);
  	    ToolPanel* itoolpanel = iEd->GetToolPanel();
-+	    int i;
  
 -            for (int i = 0; i < installed->Count(); i++) {
 +            for (i = 0; i < installed->Count(); i++) {
diff --git a/x11-toolkits/iv/files/patch-ab b/x11-toolkits/iv/files/patch-ab
index 18ce2e39ad90..57cb57f70526 100644
--- a/x11-toolkits/iv/files/patch-ab
+++ b/x11-toolkits/iv/files/patch-ab
@@ -1,6 +1,6 @@
---- src/bin/iclass/dialogs.c.orig	Wed Sep 23 11:45:09 1992
-+++ src/bin/iclass/dialogs.c	Thu May 27 21:45:37 1999
-@@ -40,12 +40,14 @@
+--- src/bin/iclass/dialogs.c.orig	Tue Aug 24 06:52:20 1993
++++ src/bin/iclass/dialogs.c	Sun Sep  5 13:36:17 1999
+@@ -41,7 +41,9 @@
  
  #include <stdlib.h>
  #include <string.h>
@@ -8,11 +8,5 @@
  #include <osfcn.h>
 +#endif
  
- #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5)
+ #if !defined(AIXV3) && !defined(hpux) && !defined(sun) && !defined(sgi)
  /* sigh, not all systems have this prototype */
- extern "C" {
--    char* getcwd(char*, int);
-+    char* getcwd(char*, unsigned int);
- }
- #endif
- 
diff --git a/x11-toolkits/iv/files/patch-ag b/x11-toolkits/iv/files/patch-ag
index 559e8b51397b..60e37c5dc2f1 100644
--- a/x11-toolkits/iv/files/patch-ag
+++ b/x11-toolkits/iv/files/patch-ag
@@ -1,9 +1,17 @@
---- src/config/InterViews/arch.def.orig	Sat Dec 12 08:34:52 1992
-+++ src/config/InterViews/arch.def	Sun Jan 17 17:48:18 1999
-@@ -385,6 +385,16 @@
- #define MacroFile InterViews/iv-convex.cf
- #endif /* __convex__ */
+--- src/config/InterViews/arch.def.orig	Tue Jun 29 08:40:43 1993
++++ src/config/InterViews/arch.def	Sun Jan 23 17:28:56 2000
+@@ -404,6 +404,24 @@
+ #define MacroFile InterViews/iv-alpha.cf
+ #endif /* __alpha */
  
++/*
++ * XXX imake(1) seems to invoke /usr/libexec/cpp directly in certain
++ * cases, leaving some macros including __FreeBSD__ undefined.
++ */
++#if !defined(__FreeBSD__)
++#define __FreeBSD__
++#endif /* __FreeBSD__ */
++
 +#ifdef __FreeBSD__
 +#undef freebsd
 +#undef FREEBSD
diff --git a/x11-toolkits/iv/files/patch-ah b/x11-toolkits/iv/files/patch-ah
index 527323b07af5..d02d55694f9a 100644
--- a/x11-toolkits/iv/files/patch-ah
+++ b/x11-toolkits/iv/files/patch-ah
@@ -1,6 +1,6 @@
---- src/config/InterViews/local.def.orig	Wed Nov 25 05:08:51 1992
-+++ src/config/InterViews/local.def	Sun Jan 17 18:12:51 1999
-@@ -8,7 +8,14 @@
+--- src/config/InterViews/local.def.orig	Wed Aug 25 06:08:07 1993
++++ src/config/InterViews/local.def	Sun Sep  5 16:21:12 1999
+@@ -7,7 +7,14 @@
  /*
   * If you are using gcc/g++, then uncomment the include below.
   */
@@ -8,10 +8,10 @@
 +#include <InterViews/gcc.def>
 +
 +#if defined (FreeBSDArchitecture)
-+#undef HasSunOSSharedLibs
-+#define HasSunOSSharedLibs YES
-+#undef HasSunOSSharedLibraries
-+#define HasSunOSSharedLibraries YES
++#undef HasDynamicSharedLibs
++#define HasDynamicSharedLibs YES
++#undef HasDynamicSharedLibraries
++#define HasDynamicSharedLibraries YES
 +#endif
  
  /*
diff --git a/x11-toolkits/iv/files/patch-ai b/x11-toolkits/iv/files/patch-ai
index 745e1dfeeefe..a3ace6a294bb 100644
--- a/x11-toolkits/iv/files/patch-ai
+++ b/x11-toolkits/iv/files/patch-ai
@@ -1,37 +1,37 @@
---- src/config/InterViews/rules.def.orig	Fri Sep 25 07:06:33 1992
-+++ src/config/InterViews/rules.def	Mon Jan 18 21:43:45 1999
+--- src/config/InterViews/rules.def.orig	Wed Aug 25 07:47:08 1993
++++ src/config/InterViews/rules.def	Sun Sep  5 16:21:37 1999
 @@ -399,6 +399,30 @@
  /*
   * Make a shared library.
   */
 +#if defined(FreeBSDArchitecture)
-+#define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs)     @@\
-+AOUT = Concat(lib,libname.so.rev)                                      @@\
-+SHARED_CCFLAGS = SharedCCFlags                                         @@\
-+                                                                       @@\
-+AllTarget(Concat(lib,libname.so.rev))                                  @@\
-+                                                                       @@\
-+Concat(lib,libname.so.rev): depobjs                                    @@\
-+	@echo "building $@"                                             @@\
-+	$(RM) $@~                                                       @@\
-+.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")              @@\
-+	$(CC) -shared  -Wl,-soname,Concat(lib,libname.so.rev) -o $@~ ldobjs @@\
-+.else                                                                  @@\
-+	$(LD) -o $@~ -Bshareable ldobjs                                 @@\
-+.endif                                                                 @@\
-+	$(RM) $@                                                        @@\
-+	$(MV) $@~ $@                                                    @@\
-+.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")              @@\
-+	$(LN) $@ Concat(lib,libname.so)                                 @@\
-+.endif                                                                 @@\
-+                                                                       @@\
-+clean::                                                                        @@\
++#define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs)	@@\
++AOUT = Concat(lib,libname.so.rev)					@@\
++SHARED_CCFLAGS = SharedCCFlags						@@\
++									@@\
++AllTarget(Concat(lib,libname.so.rev))					@@\
++									@@\
++Concat(lib,libname.so.rev): depobjs					@@\
++	@echo "building $@"						@@\
++	$(RM) $@~							@@\
++.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")		@@\
++	$(CC) -shared  -Wl,-soname,Concat(lib,libname.so.rev) -o $@~ ldobjs	@@\
++.else									@@\
++	$(LD) -o $@~ -Bshareable ldobjs					@@\
++.endif									@@\
++	$(RM) $@							@@\
++	$(MV) $@~ $@							@@\
++.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")		@@\
++	$(LN) $@ Concat(lib,libname.so)					@@\
++.endif									@@\
++									@@\
++clean::									@@\
 +	$(RM) Concat(lib,libname.so.rev)
 +#else
- #ifndef NormalSunOSSharedLibraryTarget
- #if OSMajorVersion < 5
- #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs)	@@\
-@@ -434,6 +458,7 @@
+ #ifndef NormalDynamicSharedLibraryTarget
+ #if defined(sun) && OSMajorVersion < 5
+ #define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs)	@@\
+@@ -432,6 +456,7 @@
  									@@\
  clean::									@@\
  	$(RM) Concat(lib,libname.so.rev)
diff --git a/x11-toolkits/iv/files/patch-aj b/x11-toolkits/iv/files/patch-aj
index 41563d3fcf9f..300994ea6eeb 100644
--- a/x11-toolkits/iv/files/patch-aj
+++ b/x11-toolkits/iv/files/patch-aj
@@ -1,6 +1,6 @@
 --- src/config/InterViews/iv-freebsd.cf.orig	Sun Jan 17 18:54:17 1999
 +++ src/config/InterViews/iv-freebsd.cf	Sun Jan 17 18:12:51 1999
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,13 @@
 +#include <InterViews/xparams.cf>
 +#undef CppCmd
 +#define CppCmd cpp
@@ -10,4 +10,7 @@
 +#define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
 +#undef ExtraCCLdLibs
 +#define ExtraCCLdLibs -lg++
++#undef SharedCCFlags
 +#define SharedCCFlags -fpic
++#undef ExtraCCIncludes
++#define ExtraCCIncludes -I/usr/include/g++
diff --git a/x11-toolkits/iv/files/patch-ak b/x11-toolkits/iv/files/patch-ak
index e2f4e1594edf..799c6ae3e90b 100644
--- a/x11-toolkits/iv/files/patch-ak
+++ b/x11-toolkits/iv/files/patch-ak
@@ -1,15 +1,15 @@
---- src/include/IV-X11/xwindow.h.orig	Fri Sep 25 07:16:22 1992
-+++ src/include/IV-X11/xwindow.h	Sun Jan 17 17:48:20 1999
-@@ -46,8 +46,13 @@
+--- src/include/IV-X11/xwindow.h.orig	Sat Mar 13 07:21:41 1993
++++ src/include/IV-X11/xwindow.h	Sun Sep  5 13:44:40 1999
+@@ -46,7 +46,13 @@
  class Style;
  class WindowCursorStack;
  class WindowTable;
+-
 +/*
 + * modified by jj@ldjpc.apana.org.au
 + *
 + * this seems to break the compile...
- class XDisplay;
--
++class XDisplay;
 + *
 + */
  struct WindowOverlayInfo {
diff --git a/x11-toolkits/iv/files/patch-ar b/x11-toolkits/iv/files/patch-ar
index a39dec102758..7002bae379fd 100644
--- a/x11-toolkits/iv/files/patch-ar
+++ b/x11-toolkits/iv/files/patch-ar
@@ -1,5 +1,5 @@
---- src/lib/IV-2_6/xpainter.c.orig	Mon Oct 19 15:32:42 1992
-+++ src/lib/IV-2_6/xpainter.c	Tue Dec 28 22:23:39 1999
+--- src/lib/IV-2_6/xpainter.c.orig	Tue Oct 20 05:32:42 1992
++++ src/lib/IV-2_6/xpainter.c	Sun Jan 23 18:46:22 2000
 @@ -56,6 +56,7 @@
  #include <OS/math.h>
  #include <OS/string.h>
@@ -8,12 +8,19 @@
  
  PainterRep::PainterRep() {
      display = Session::instance()->default_display();
-@@ -1125,7 +1126,8 @@
+@@ -1117,6 +1118,7 @@
+ }
+ 
+ void Painter::Polygon(Canvas* c, IntCoord x[], IntCoord y[], int n) {
++    register int i;
+     if (c == nil) {
+ 	return;
+     }
+@@ -1125,7 +1127,7 @@
  	return;
      }
      register XPoint* v = AllocPts(n+1);
 -    for (register int i = 0; i < n; i++) {
-+    register int i;
 +    for (i = 0; i < n; i++) {
  	Map(c, x[i], y[i], v[i].x, v[i].y);
      }
diff --git a/x11-toolkits/iv/files/patch-bb b/x11-toolkits/iv/files/patch-bb
index 3a42d837c943..5fc921f67254 100644
--- a/x11-toolkits/iv/files/patch-bb
+++ b/x11-toolkits/iv/files/patch-bb
@@ -8,7 +8,8 @@
 +.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")
 +VERSION	   = 3
 +.else
- VERSION	   = 3.1
+-VERSION	   = 3.1
++VERSION	   = 3.2
 +.endif
  
  KIT_CCFLAGS = KitFlags
diff --git a/x11-toolkits/iv/files/patch-bc b/x11-toolkits/iv/files/patch-bc
new file mode 100644
index 000000000000..64bf06f90a8b
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bc
@@ -0,0 +1,16 @@
+--- src/lib/Unidraw/Imakefile.orig	Sat Oct 31 08:32:58 1992
++++ src/lib/Unidraw/Imakefile	Sat Jan 16 19:49:31 1999
+@@ -5,7 +5,12 @@
+ #ifdef InObjectCodeDir
+ 
+ LIB = Unidraw
+-VERSION = 3.1
++#VERSION = 3.1
++.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")
++VERSION    = 3
++.else
++VERSION    = 3.2
++.endif
+ 
+ MakeLibrary($(LIB),$(VERSION))
+ 
diff --git a/x11-toolkits/iv/files/patch-bd b/x11-toolkits/iv/files/patch-bd
index 41715c4cac6e..c2c7d5ac422c 100644
--- a/x11-toolkits/iv/files/patch-bd
+++ b/x11-toolkits/iv/files/patch-bd
@@ -1,27 +1,16 @@
---- src/lib/Unidraw/catalog.c.orig	Fri Dec 11 22:27:55 1992
-+++ src/lib/Unidraw/catalog.c	Tue Dec 28 22:51:04 1999
-@@ -57,7 +57,9 @@
+--- src/lib/Unidraw/catalog.c.orig	Tue May 25 06:29:33 1993
++++ src/lib/Unidraw/catalog.c	Sun Jan 23 19:23:39 2000
+@@ -58,7 +58,8 @@
  #include <IV-2_6/_enter.h>
  
  #include <ctype.h>
-+#if __FreeBSD_cc_version < 400002
+-#ifndef __DECCXX
++/*#ifndef __DECCXX*/
++#if !defined(__DECCXX) || (__FreeBSD_cc_version < 400002)
  #include <osfcn.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -67,6 +69,10 @@
- #include <OS/types.h>
- #include <unistd.h>
  #endif
-+#ifdef __FreeBSD__
-+#include <unistd.h>
-+#endif
-+
- #include <sys/file.h>
- 
- #ifdef __DECCXX
-@@ -1502,7 +1508,8 @@
+ #include <stdio.h>
+@@ -1504,7 +1505,8 @@
              in >> graylevel;
  
          } else if (graylevel == nograylevel) {
@@ -31,7 +20,7 @@
                  if (buf[0] == '>' || sscanf(buf, "%x", &data[i]) != 1) {
                      break;
                  }
-@@ -1609,9 +1616,9 @@
+@@ -1611,9 +1613,9 @@
  
  	} else {
  	    istrstream in(definition, strlen(definition) + 1);
diff --git a/x11-toolkits/iv/files/patch-be b/x11-toolkits/iv/files/patch-be
new file mode 100644
index 000000000000..7bec291bfe9c
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-be
@@ -0,0 +1,12 @@
+--- src/lib/Unidraw/catcmds.c.orig	Thu May 27 20:08:11 1999
++++ src/lib/Unidraw/catcmds.c	Thu May 27 20:08:33 1999
+@@ -42,7 +42,9 @@
+ #include <InterViews/window.h>
+ #include <OS/string.h>
+ 
++#if __FreeBSD_cc_version < 400002
+ #include <osfcn.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stream.h>
diff --git a/x11-toolkits/iv/files/patch-bg b/x11-toolkits/iv/files/patch-bg
index 31d097b17853..f712411fe450 100644
--- a/x11-toolkits/iv/files/patch-bg
+++ b/x11-toolkits/iv/files/patch-bg
@@ -1,9 +1,9 @@
---- src/bin/ibuild/ibcode.c.orig	Mon Oct 19 12:58:01 1992
-+++ src/bin/ibuild/ibcode.c	Tue Dec 28 23:55:54 1999
-@@ -41,7 +41,10 @@
- #include <Unidraw/Graphic/pspaint.h>
+--- src/bin/ibuild/ibcode.c.orig	Fri Jun  4 05:55:09 1993
++++ src/bin/ibuild/ibcode.c	Sun Jan 23 20:12:54 2000
+@@ -42,7 +42,10 @@
  #include <InterViews/shape.h>
  #include <InterViews/transformer.h>
+ #include <OS/types.h>
 +#if __FreeBSD_cc_version < 400002
  #include <osfcn.h>
 +#endif
@@ -11,43 +11,43 @@
  #include <stdlib.h>
  #include <stream.h>
  #include <string.h>
-@@ -362,7 +365,7 @@
+@@ -363,7 +366,7 @@
  	ButtonStateVar* bsVar = intcomp->GetButtonStateVar();
  	const char* bsname = bsVar->GetName();
  	const char* proc = bsVar->GetFuncName();
 -        boolean export = bsVar->GetExport();
-+        boolean export_ = bsVar->GetExport();
++        boolean exportval = bsVar->GetExport();
          const char* subclass = bsVar->GetSubclassName();
  
          if (!bsVar->IsSubclass() && !_emitMain) {
-@@ -375,7 +378,7 @@
+@@ -376,7 +379,7 @@
  	if (!_bsinitslist->Search(bsname)) {
  	    _bsinitslist->Append(bsname);
  
 -            if (export && !_emitMain) {
-+            if (export_ && !_emitMain) {
++            if (exportval && !_emitMain) {
                  out << "    " << bsname;
              } else {
                  out << "    " << ButtonClass << "* " << bsname;
-@@ -384,7 +387,7 @@
+@@ -385,7 +388,7 @@
              out << bsVar->GetInitial() << ");\n";
  
              if (!_emitMain && proc != nil && *proc != '\0') {
 -                if (!export || bsVar->IsSubclass()) {
-+                if (!export_ || bsVar->IsSubclass()) {
++                if (!exportval || bsVar->IsSubclass()) {
                      out << "    " << bsname << "->SetCoreClass(this);\n";
                      out <<"    "<< bsname<<"->SetCoreFunc("<< "&" << coreclass;
                      out << "::" << proc << ");\n";
-@@ -1598,10 +1601,10 @@
+@@ -1599,10 +1602,10 @@
  void CodeView::BeginInstantiate (ostream& out) {
      InteractorComp* icomp = GetIntComp();
      const char* mname = icomp->GetMemberNameVar()->GetName();
 -    boolean export = icomp->GetMemberNameVar()->GetExport();
-+    boolean export_ = icomp->GetMemberNameVar()->GetExport();
++    boolean exportval = icomp->GetMemberNameVar()->GetExport();
      const char* classname = icomp->GetClassNameVar()->GetName();
  
 -    if (export && !_emitMain) {
-+    if (export_ && !_emitMain) {
++    if (exportval && !_emitMain) {
          out << "    " << mname << " = new ";
      } else {
          out << "    " << classname << "* ";
diff --git a/x11-toolkits/iv/files/patch-bi b/x11-toolkits/iv/files/patch-bi
index af387518100b..9cc100453117 100644
--- a/x11-toolkits/iv/files/patch-bi
+++ b/x11-toolkits/iv/files/patch-bi
@@ -1,6 +1,6 @@
---- src/bin/iclass/direct.c.orig	Fri Dec 11 22:40:42 1992
-+++ src/bin/iclass/direct.c	Tue Dec 28 23:16:01 1999
-@@ -30,11 +30,16 @@
+--- src/bin/iclass/direct.c.orig	Sat Dec 12 13:40:42 1992
++++ src/bin/iclass/direct.c	Sun Jan 23 20:25:38 2000
+@@ -30,11 +30,15 @@
  #include <OS/string.h>
  #include <OS/types.h>
  #include <stddef.h>
@@ -11,9 +11,8 @@
  #include <string.h>
  #include <stdlib.h>
  #include <sys/stat.h>
-+#ifdef __FreeBSD__
++#include <sys/types.h>
 +#include <unistd.h>
-+#endif
  
  #ifdef __DECCXX
  extern "C" {
diff --git a/x11-toolkits/iv/files/patch-bj b/x11-toolkits/iv/files/patch-bj
index 5872afd5866f..2d0f928a4630 100644
--- a/x11-toolkits/iv/files/patch-bj
+++ b/x11-toolkits/iv/files/patch-bj
@@ -1,14 +1,48 @@
---- src/lib/InterViews/style.c.orig	Tue Dec 28 22:14:59 1999
-+++ src/lib/InterViews/style.c	Tue Dec 28 22:15:54 1999
-@@ -419,9 +419,10 @@
+--- src/lib/Dispatch/dispatcher.c.orig	Wed Aug 25 07:59:45 1993
++++ src/lib/Dispatch/dispatcher.c	Sun Sep  5 14:05:04 1999
+@@ -631,16 +631,23 @@
  
-     long n = path->count();
-     if (e->avail_ <= n) {
-+	long i;
- 	long new_avail = n + 5;
- 	StyleAttributeList** new_list = new StyleAttributeList*[new_avail];
--	for (long i = 0; i < e->avail_; i++) {
-+	for (i = 0; i < e->avail_; i++) {
- 	    new_list[i] = e->entries_[i];
- 	}
- 	for (i = e->avail_; i < new_avail; i++) {
+     if (!_cqueue->isEmpty()) {
+ #ifdef SV_INTERRUPT                   /* BSD-style */
++#ifdef __FreeBSD__
++	sv.sv_handler = (sig_t)fxSIGVECHANDLER(&Dispatcher::sigCLD);
++#else
+ 	sv.sv_handler = fxSIGVECHANDLER(&Dispatcher::sigCLD);
++#endif
+ 	sv.sv_flags = SV_INTERRUPT;
+-	sigvec(SIGCLD, &sv, &osv);
++	/*sigvec(SIGCLD, &sv, &osv);*/
++	sigvec(SIGCHLD, &sv, &osv);
+ #else
+ #ifdef SA_NOCLDSTOP                   /* POSIX */
+ 	sa.sa_handler = fxSIGACTIONHANDLER(&Dispatcher::sigCLD);
+ 	sa.sa_flags = SA_INTERRUPT;
+-	sigaction(SIGCLD, &sa, &osa);
++	/*sigaction(SIGCLD, &sa, &osa);*/
++	sigaction(SIGCHLD, &sa, &osa);
+ #else                                 /* System V-style */
+-	osig = (void (*)())signal(SIGCLD, fxSIGHANDLER(&Dispatcher::sigCLD));
++	/*osig = (void (*)())signal(SIGCLD, fxSIGHANDLER(&Dispatcher::sigCLD));*/
++	osig = (void (*)())signal(SIGCHLD, fxSIGHANDLER(&Dispatcher::sigCLD));
+ #endif
+ #endif
+     }
+@@ -661,12 +668,15 @@
+     } while (nfound < 0 && !handleError());
+     if (!_cqueue->isEmpty()) {
+ #ifdef SV_INTERRUPT                   /* BSD-style */
+-	sigvec(SIGCLD, &osv, (struct sigvec*) 0);
++	/*sigvec(SIGCLD, &osv, (struct sigvec*) 0);*/
++	sigvec(SIGCHLD, &osv, (struct sigvec*) 0);
+ #else
+ #ifdef SA_NOCLDSTOP                   /* POSIX */
+-	sigaction(SIGCLD, &osa, (struct sigaction*) 0);
++	/*sigaction(SIGCLD, &osa, (struct sigaction*) 0);*/
++	sigaction(SIGCHLD, &osa, (struct sigaction*) 0);
+ #else                                 /* System V-style */
+-	(void) signal(SIGCLD, fxSIGHANDLER(osig));
++	/*(void) signal(SIGCLD, fxSIGHANDLER(osig));*/
++	(void) signal(SIGCHLD, fxSIGHANDLER(osig));
+ #endif
+ #endif
+     }
diff --git a/x11-toolkits/iv/files/patch-bk b/x11-toolkits/iv/files/patch-bk
index d920f4dc65a5..4336dd4a7950 100644
--- a/x11-toolkits/iv/files/patch-bk
+++ b/x11-toolkits/iv/files/patch-bk
@@ -1,20 +1,24 @@
---- src/bin/dclock/data.c.orig	Tue Dec 28 22:25:29 1999
-+++ src/bin/dclock/data.c	Tue Dec 28 22:25:57 1999
-@@ -109,6 +109,8 @@
- }
+--- src/config/InterViews/cxx.def.orig	Wed Jan 27 07:16:55 1993
++++ src/config/InterViews/cxx.def	Sun Sep  5 16:19:16 1999
+@@ -17,8 +17,8 @@
+  * When dynamic link works, we might want to change that.
+  */
+ #if HasSharedLibraries
+-/*#define HasSunOSSharedLibraries     YES */
+-#define HasSunOSSharedLibraries       NO
++/*#define HasDynamicSharedLibraries     YES */
++#define HasDynamicSharedLibraries       NO
+ #endif
  
- void InitData() {
-+    int i;
-+
-     FadeStep = FadeRate==0 ? 16 : 1;
-     SegCode[9][SegD] = (JohnsFlag)? true : false;
-     Slant = min( max( 0,SlantPC ), 100 )/100.0;
-@@ -149,7 +151,7 @@
+ #undef SharedCCFlags
+@@ -31,8 +31,8 @@
+ #define NonSharedCCLdFlags /**/
+ #endif
  
-     ColonData[0].count = Colon.count;
-     ColonData[1].count = Colon.count;
--    for ( int i=0; i< Colon.count; i++ ) {
-+    for ( i=0; i< Colon.count; i++ ) {
- 	ColonData[0].y[i] = Colon.y[i]+(0.5-2.25*HThick)/height+ALLy;
- 	ColonData[0].x[i] = Colon.x[i]+COLx+ColonData[0].y[i]*Slant/width;
- 	ColonData[1].y[i] = Colon.y[i]+(0.5+0.25*HThick)/height+ALLy;
+-#undef NormalSunOSSharedLibraryTarget
+-#define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs)    @@\
++#undef NormalDynamicSharedLibraryTarget
++#define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs)    @@\
+ AOUT = Concat(lib,libname.so)                                         @@\
+ SHARED_CCFLAGS = SharedCCFlags					      @@\
+                                                                       @@\
diff --git a/x11-toolkits/iv/files/patch-bl b/x11-toolkits/iv/files/patch-bl
index 9d94e3b54134..7b8c1a915910 100644
--- a/x11-toolkits/iv/files/patch-bl
+++ b/x11-toolkits/iv/files/patch-bl
@@ -1,40 +1,10 @@
---- src/bin/idraw/idarrow.c.orig	Tue Dec 28 22:27:42 1999
-+++ src/bin/idraw/idarrow.c	Tue Dec 28 22:28:29 1999
-@@ -304,9 +304,11 @@
- 	if (dashpatsize <= 0) {
- 	    out << "[] " << dashoffset << " ";
- 	} else {
-+	    int i;
-+
- 	    out << "[";
+--- src/config/InterViews/gcc.def.orig	Wed Sep  9 07:38:37 1992
++++ src/config/InterViews/gcc.def	Sun Sep  5 16:19:38 1999
+@@ -17,5 +17,5 @@
+ #define ExtraCCLdLibs -lg++
+ #endif
  
--	    for (int i = 0; i < dashpatsize - 1; i++) {
-+	    for (i = 0; i < dashpatsize - 1; i++) {
- 		out << dashpat[i] << " ";
- 	    }
- 	    out << dashpat[i] << "] " << dashoffset << " ";
-@@ -557,9 +559,11 @@
- 	if (dashpatsize <= 0) {
- 	    out << "[] " << dashoffset << " ";
- 	} else {
-+	    int i;
-+
- 	    out << "[";
- 
--	    for (int i = 0; i < dashpatsize - 1; i++) {
-+	    for (i = 0; i < dashpatsize - 1; i++) {
- 		out << dashpat[i] << " ";
- 	    }
- 	    out << dashpat[i] << "] " << dashoffset << " ";
-@@ -806,9 +810,10 @@
- 	if (dashpatsize <= 0) {
- 	    out << "[] " << dashoffset << " ";
- 	} else {
-+	    int i;
- 	    out << "[";
- 
--	    for (int i = 0; i < dashpatsize - 1; i++) {
-+	    for (i = 0; i < dashpatsize - 1; i++) {
- 		out << dashpat[i] << " ";
- 	    }
- 	    out << dashpat[i] << "] " << dashoffset << " ";
+-#undef HasSunOSSharedLibraries
+-#define HasSunOSSharedLibraries NO
++#undef HasDynamicSharedLibraries
++#define HasDynamicSharedLibraries NO
diff --git a/x11-toolkits/iv/files/patch-bm b/x11-toolkits/iv/files/patch-bm
index 5fd7ad691468..d4509433abeb 100644
--- a/x11-toolkits/iv/files/patch-bm
+++ b/x11-toolkits/iv/files/patch-bm
@@ -1,12 +1,14 @@
---- src/bin/mailbox/main.c.orig	Tue Dec 28 22:29:16 1999
-+++ src/bin/mailbox/main.c	Tue Dec 28 22:29:29 1999
-@@ -453,7 +453,8 @@
- 	    if (atp != nil) {
- 		char* dotp = strchr(atp, '.');
- 		if (dotp != nil) {
--		    for (int i = 0; i < strlen(mail_domain); ++i) {
-+		    int i;
-+		    for (i = 0; i < strlen(mail_domain); ++i) {
- 			char c = dotp[i];
- 			c = isupper(c) ? c - 'A' + 'a' : c;
- 			if (c != mail_domain[i]) {
+--- src/lib/InterViews/style.c.org	Tue Mar  9 06:51:05 1993
++++ src/lib/InterViews/style.c	Sun Jan 23 18:44:36 2000
+@@ -420,9 +420,10 @@
+ 
+     long n = path->count();
+     if (e->avail_ <= n) {
++	long i;
+ 	long new_avail = n + 5;
+ 	StyleAttributeList** new_list = new StyleAttributeList*[new_avail];
+-	for (long i = 0; i < e->avail_; i++) {
++	for (i = 0; i < e->avail_; i++) {
+ 	    new_list[i] = e->entries_[i];
+ 	}
+ 	for (i = e->avail_; i < new_avail; i++) {
diff --git a/x11-toolkits/iv/files/patch-bn b/x11-toolkits/iv/files/patch-bn
index 85ecc768315d..c85844bdc08c 100644
--- a/x11-toolkits/iv/files/patch-bn
+++ b/x11-toolkits/iv/files/patch-bn
@@ -1,11 +1,10 @@
---- src/lib/IV-2_6/control.c.orig	Tue Dec 28 22:48:52 1999
-+++ src/lib/IV-2_6/control.c	Tue Dec 28 22:49:19 1999
-@@ -154,10 +154,12 @@
+--- src/lib/IV-2_6/control.c.org	Wed Feb 12 05:48:58 1992
++++ src/lib/IV-2_6/control.c	Sun Jan 23 18:48:18 2000
+@@ -154,10 +154,11 @@
   */
  
  boolean Control::IsGrabbing(Interactor* i) {
 +    ControlState* c;
-+
      if (i == this) {
  	return true;
      }
diff --git a/x11-toolkits/iv/files/patch-bo b/x11-toolkits/iv/files/patch-bo
index f0ff58fb13bc..a684ee12c53a 100644
--- a/x11-toolkits/iv/files/patch-bo
+++ b/x11-toolkits/iv/files/patch-bo
@@ -1,15 +1,12 @@
---- src/bin/dclock/segment.c.orig	Tue Dec 28 22:51:59 1999
-+++ src/bin/dclock/segment.c	Tue Dec 28 22:52:17 1999
-@@ -41,10 +41,10 @@
+--- src/lib/IV-2_6/matcheditor.c.org	Thu Jun 25 03:30:20 1992
++++ src/lib/IV-2_6/matcheditor.c	Sun Jan 23 18:50:03 2000
+@@ -53,7 +53,8 @@
+ }
  
- Pattern* Segment::MakePattern (int seed) {
-     Pattern* pat;
--    int dat[16];
-+    int dat[16], i;
-     unsigned int Row[4];
- 
--    for (int i = 0; i <= 3; i++) {
-+    for (i = 0; i <= 3; i++) {
- 	Row[i] = seed & 0xF;
- 	Row[i] |= Row[i]<<4;
- 	Row[i] |= Row[i]<<8;
+ void MatchEditor::Match (const char* p, boolean m) {
+-    for (char* pp = pattern; *p != '\0'; ++p, ++pp) {
++    char* pp;
++    for (pp = pattern; *p != '\0'; ++p, ++pp) {
+         *pp = *p;
+         if (*p == '%') {
+             ++p;
diff --git a/x11-toolkits/iv/files/patch-bp b/x11-toolkits/iv/files/patch-bp
index 98accbeec7e4..8042e2e84ab4 100644
--- a/x11-toolkits/iv/files/patch-bp
+++ b/x11-toolkits/iv/files/patch-bp
@@ -1,79 +1,16 @@
---- src/bin/doc/Document.c.orig	Tue Dec 28 22:53:19 1999
-+++ src/bin/doc/Document.c	Tue Dec 28 22:55:06 1999
-@@ -449,8 +449,8 @@
-     if (strlen(name) == 0) {
-         return nil;
-     } else {
--        long count = _families->count();
--        for (long i = 0; i < count; ++i) {
-+        long count = _families->count(), i;
-+        for (i = 0; i < count; ++i) {
-             FontFamilyInfo& info = _families->item_ref(0);
-             if (strcmp(info._name, name) == 0) {
-                 break;
-@@ -589,8 +589,8 @@
- 
- void Document::remove_float (Item* item) {
-     touch(true);
--    long count = _viewer->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _viewer->count(), i;
-+    for (i = 0; i < count; ++i) {
-         DocumentViewerInfo& info = _viewer->item_ref(i);
-         info._viewer->float_removed(item);
+--- src/lib/IV-X11/xdrag.c.org	Thu Jun 10 01:10:59 1993
++++ src/lib/IV-X11/xdrag.c	Sun Jan 23 18:52:17 2000
+@@ -229,11 +229,12 @@
+     XWindow *children;
+     unsigned int kids;
+     Status status;
++    int i;
+     status = XQueryTree(display, root, &root, &parent, &children, &kids);
+     if (status == 0) {
+ 	return None;
      }
-@@ -2276,8 +2276,8 @@
- }
- 
- long Document::find_macro (const char* name) {
--    long count = _macro->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _macro->count(), i;
-+    for (i = 0; i < count; ++i) {
-         MacroInfo& info = _macro->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -2313,8 +2313,8 @@
- }
- 
- long Document::find_counter (const char* name) {
--    long count = _counter->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _counter->count(), i;
-+    for (i = 0; i < count; ++i) {
-         CounterInfo& info = _counter->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -2364,8 +2364,8 @@
- }
- 
- long Document::find_parameter (const char* name) {
--    long count = _parameter->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _parameter->count(), i;
-+    for (i = 0; i < count; ++i) {
-         DocumentParameterInfo& info = _parameter->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -2405,8 +2405,8 @@
- }
- 
- long Document::find_label (const char* name) {
--    long count = _label->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _label->count(), i;
-+    for (i = 0; i < count; ++i) {
-         LabelInfo& info = _label->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -2446,8 +2446,8 @@
- }
- 
- long Document::find_float (Item* item) {
--    long count = _float->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _float->count(), i;
-+    for (i = 0; i < count; ++i) {
-         FloatInfo& info = _float->item_ref(i);
-         if (info._item == item) {
-             break;
+-    for (int i = kids - 1; i >= 0 && children[i] != under ; --i);
++    for (i = kids - 1; i >= 0 && children[i] != under ; --i);
+     for (--i; i >= 0; --i) {
+ 	XWindowAttributes attributes;
+ 	XGetWindowAttributes(display, children[i], &attributes);
diff --git a/x11-toolkits/iv/files/patch-bq b/x11-toolkits/iv/files/patch-bq
index 6a1a0bd180a3..81a82ad4ac9e 100644
--- a/x11-toolkits/iv/files/patch-bq
+++ b/x11-toolkits/iv/files/patch-bq
@@ -1,12 +1,14 @@
---- src/bin/idraw/idcatalog.c.orig	Tue Dec 28 22:55:59 1999
-+++ src/bin/idraw/idcatalog.c	Tue Dec 28 22:56:30 1999
-@@ -658,7 +658,8 @@
- 		graylevel = CalcGrayLevel(data[0]);
- 	    }
- 	} else if (graylevel == -1) {
--	    for (int i = 0; in >> _buf && i < patternHeight; i++) {
-+	    int i;
-+	    for (i = 0; in >> _buf && i < patternHeight; i++) {
- 		if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
- 		    break;
- 		}
+--- src/lib/IV-X11/xfont.c.org	Thu Dec  9 14:17:55 1993
++++ src/lib/IV-X11/xfont.c	Sun Jan 23 18:53:44 2000
+@@ -538,8 +538,9 @@
+ static boolean contains(const char* string, const char* substring) {
+     int sublength = strlen(substring);
+     int length = strlen(string) - sublength;
+-    for (int i = 0; i <= length; ++i) {
+-        for (int j = 0; j < sublength; ++j) {
++    int i, j;
++    for (i = 0; i <= length; ++i) {
++        for (j = 0; j < sublength; ++j) {
+             if (string[i+j] != substring[j]) {
+                 break;
+             }
diff --git a/x11-toolkits/iv/files/patch-br b/x11-toolkits/iv/files/patch-br
index 7bc97f62926e..019f2ff3c2f2 100644
--- a/x11-toolkits/iv/files/patch-br
+++ b/x11-toolkits/iv/files/patch-br
@@ -1,12 +1,14 @@
---- src/lib/IV-2_6/matcheditor.c.orig	Tue Dec 28 23:03:32 1999
-+++ src/lib/IV-2_6/matcheditor.c	Tue Dec 28 23:03:47 1999
-@@ -53,7 +53,8 @@
- }
+--- src/lib/Unidraw/psview.c.org	Fri Sep  4 03:28:12 1992
++++ src/lib/Unidraw/psview.c	Sun Jan 23 19:26:35 2000
+@@ -752,9 +752,10 @@
+ 	if (dashpatsize <= 0) {
+ 	    out << "[] " << dashoffset << " ";
+ 	} else {
++	    int i;
+ 	    out << "[";
  
- void MatchEditor::Match (const char* p, boolean m) {
--    for (char* pp = pattern; *p != '\0'; ++p, ++pp) {
-+    char* pp;
-+    for (pp = pattern; *p != '\0'; ++p, ++pp) {
-         *pp = *p;
-         if (*p == '%') {
-             ++p;
+-	    for (int i = 0; i < dashpatsize - 1; i++) {
++	    for (i = 0; i < dashpatsize - 1; i++) {
+ 		out << dashpat[i] << " ";
+ 	    }
+ 	    out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/x11-toolkits/iv/files/patch-bs b/x11-toolkits/iv/files/patch-bs
index 6c2b4a019dd9..a3d79618fdac 100644
--- a/x11-toolkits/iv/files/patch-bs
+++ b/x11-toolkits/iv/files/patch-bs
@@ -1,14 +1,11 @@
---- src/lib/Unidraw/psview.c.orig	Tue Dec 28 23:04:51 1999
-+++ src/lib/Unidraw/psview.c	Tue Dec 28 23:05:07 1999
-@@ -752,9 +752,10 @@
- 	if (dashpatsize <= 0) {
- 	    out << "[] " << dashoffset << " ";
- 	} else {
-+	    int i;
- 	    out << "[";
+--- src/lib/Unidraw/stencilcomp.c.org	Wed Mar 25 10:18:16 1992
++++ src/lib/Unidraw/stencilcomp.c	Sun Jan 23 19:28:28 2000
+@@ -169,7 +169,7 @@
+     StencilComp* comp = (StencilComp*) GetSubject();
+     Bitmap* image, *mask;
+     comp->GetStencil()->GetOriginal(image, mask);
+-    char* tag = (image == mask) ? "SSten" : "FSten";
++    const char* tag = (image == mask) ? "SSten" : "FSten";
+     Coord w = image->Width();
+     Coord h = image->Height();
  
--	    for (int i = 0; i < dashpatsize - 1; i++) {
-+	    for (i = 0; i < dashpatsize - 1; i++) {
- 		out << dashpat[i] << " ";
- 	    }
- 	    out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/x11-toolkits/iv/files/patch-bt b/x11-toolkits/iv/files/patch-bt
index 9cb3141b7be1..f0d38ea8420d 100644
--- a/x11-toolkits/iv/files/patch-bt
+++ b/x11-toolkits/iv/files/patch-bt
@@ -1,90 +1,13 @@
---- src/bin/doc/DocViewer.c.orig	Tue Dec 28 23:06:17 1999
-+++ src/bin/doc/DocViewer.c	Tue Dec 28 23:08:16 1999
-@@ -600,8 +600,8 @@
- }
+--- src/lib/Unidraw/text.c.org	Wed Mar 25 10:18:22 1992
++++ src/lib/Unidraw/text.c	Sun Jan 23 19:29:41 2000
+@@ -561,8 +561,9 @@
  
- void DocumentViewer::pin (const char* name) {
--    long count = _pinned_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _pinned_info->count(), i;
-+    for (i = 0; i < count; ++i) {
-         ViewerPinnedInfo& m = _pinned_info->item_ref(i);
-         if (strcmp(m._name, name) == 0) {
-             break;
-@@ -633,8 +633,8 @@
- }
+ const char* PSText::Filter (const char* string, int len) {
+     TextBuffer stext(sbuf, 0, SBUFSIZE);
++    int dot;
  
- void DocumentViewer::unpin (const char* name) {
--    long count = _pinned_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _pinned_info->count(), i;
-+    for (i = 0; i < count; ++i) {
-         ViewerPinnedInfo& m = _pinned_info->item_ref(i);
-         if (strcmp(m._name, name) == 0) {
-             break;
-@@ -651,8 +651,8 @@
+-    for (int dot = 0; len--; string++) {
++    for (dot = 0; len--; string++) {
+ 	char c = *string;
  
- void DocumentViewer::menubar (const char* name) {
-     choose(nil, false);
--    long count = _menu_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _menu_info->count(), i;
-+    for (i = 0; i < count; ++i) {
-         ViewerMenuInfo& m = _menu_info->item_ref(i);
-         if (strcmp(m._name, name) == 0) {
-             break;
-@@ -674,8 +674,8 @@
- }
- 
- void DocumentViewer::keymap (const char* name) {
--    long count = _keymap_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _keymap_info->count(), i;
-+    for (i = 0; i < count; ++i) {
-         ViewerKeymapInfo& info = _keymap_info->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -698,8 +698,8 @@
- void DocumentViewer::highlight_colors (
-     const char* name, const Color*& overlay, const Color*& underlay
- ) {
--    long count = _color_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _color_info->count(), i;
-+    for (i = 0; i < count; ++i) {
-         ViewerColorInfo& info = _color_info->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -766,8 +766,8 @@
- }
- 
- void DocumentViewer::float_removed (Item* item) {
--    long count = _float_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _float_info->count(), i;
-+    for (i = 0; i < count; ++i) {
-         if (_float_info->item_ref(i)._item == item) {
-             break;
-         }
-@@ -782,8 +782,8 @@
- }
- 
- void DocumentViewer::float_changed (Item* item) {
--    long count = _float_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _float_info->count(), i;
-+    for (i = 0; i < count; ++i) {
-         if (_float_info->item_ref(i)._item == item) {
-             break;
-         }
-@@ -797,8 +797,8 @@
- 
- void DocumentViewer::float_adjusted (Item* item, float x, float y, long p) {
-     Session::instance()->default_display()->flush();
--    long count = _float_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long count = _float_info->count(), i;
-+    for (i = 0; i < count; ++i) {
-         if (_float_info->item_ref(i)._item == item) {
-             break;
-         }
+ 	if (!isascii(c) || iscntrl(c)) {
diff --git a/x11-toolkits/iv/files/patch-bu b/x11-toolkits/iv/files/patch-bu
index fe85507f2e20..38f8f2ec0fc6 100644
--- a/x11-toolkits/iv/files/patch-bu
+++ b/x11-toolkits/iv/files/patch-bu
@@ -1,16 +1,19 @@
---- src/lib/IV-X11/xdrag.c.orig	Tue Dec 28 23:10:52 1999
-+++ src/lib/IV-X11/xdrag.c	Tue Dec 28 23:11:10 1999
-@@ -230,11 +230,12 @@
-     XWindow *children;
-     unsigned int kids;
-     Status status;
+--- src/bin/dclock/data.c.org	Sat Jul 20 04:13:49 1991
++++ src/bin/dclock/data.c	Sun Jan 23 19:38:38 2000
+@@ -114,6 +114,7 @@
+     Slant = min( max( 0,SlantPC ), 100 )/100.0;
+     HThick = min( max( 5,ThickPC ), 25 )/100.0;
+     VThick = min( max( 5,ThickPC ), 25 )/100.0 * 3.0/2.0;
 +    int i;
-     status = XQueryTree(display, root, &root, &parent, &children, &kids);
-     if (status == 0) {
- 	return None;
-     }
--    for (int i = kids - 1; i >= 0 && children[i] != under ; --i);
-+    for (i = kids - 1; i >= 0 && children[i] != under ; --i);
-     for (--i; i >= 0; --i) {
- 	XWindowAttributes attributes;
- 	XGetWindowAttributes(display, children[i], &attributes);
+ 
+     Width = Coord( min( max( 100,Width ), 1024));
+     Height = Coord( min( max( 25,Height ), 865));
+@@ -149,7 +150,7 @@
+ 
+     ColonData[0].count = Colon.count;
+     ColonData[1].count = Colon.count;
+-    for ( int i=0; i< Colon.count; i++ ) {
++    for ( i=0; i< Colon.count; i++ ) {
+ 	ColonData[0].y[i] = Colon.y[i]+(0.5-2.25*HThick)/height+ALLy;
+ 	ColonData[0].x[i] = Colon.x[i]+COLx+ColonData[0].y[i]*Slant/width;
+ 	ColonData[1].y[i] = Colon.y[i]+(0.5+0.25*HThick)/height+ALLy;
diff --git a/x11-toolkits/iv/files/patch-bv b/x11-toolkits/iv/files/patch-bv
index 9acdcb492e16..20e6a8a2de08 100644
--- a/x11-toolkits/iv/files/patch-bv
+++ b/x11-toolkits/iv/files/patch-bv
@@ -1,11 +1,13 @@
---- src/lib/Unidraw/stencilcomp.c.orig	Tue Dec 28 23:12:07 1999
-+++ src/lib/Unidraw/stencilcomp.c	Tue Dec 28 23:12:27 1999
-@@ -169,7 +169,7 @@
-     StencilComp* comp = (StencilComp*) GetSubject();
-     Bitmap* image, *mask;
-     comp->GetStencil()->GetOriginal(image, mask);
--    char* tag = (image == mask) ? "SSten" : "FSten";
-+    char* tag = (image == mask) ? (char*)"SSten" : (char*)"FSten";
-     Coord w = image->Width();
-     Coord h = image->Height();
+--- src/bin/dclock/segment.c.org	Tue Mar  5 02:56:58 1991
++++ src/bin/dclock/segment.c	Sun Jan 23 19:39:52 2000
+@@ -43,8 +43,9 @@
+     Pattern* pat;
+     int dat[16];
+     unsigned int Row[4];
++    int i;
  
+-    for (int i = 0; i <= 3; i++) {
++    for (i = 0; i <= 3; i++) {
+ 	Row[i] = seed & 0xF;
+ 	Row[i] |= Row[i]<<4;
+ 	Row[i] |= Row[i]<<8;
diff --git a/x11-toolkits/iv/files/patch-bw b/x11-toolkits/iv/files/patch-bw
index 25667b8f537f..059f2e3c1092 100644
--- a/x11-toolkits/iv/files/patch-bw
+++ b/x11-toolkits/iv/files/patch-bw
@@ -1,46 +1,232 @@
---- src/bin/doc/DialogMgr.c.orig	Tue Dec 28 23:13:39 1999
-+++ src/bin/doc/DialogMgr.c	Tue Dec 28 23:14:26 1999
-@@ -107,8 +107,8 @@
- const char* DialogManager::choose (
-     Window* window, const char* prompt, const char* filter
+--- src/bin/doc/Document.c.org	Tue Mar 16 03:10:24 1993
++++ src/bin/doc/Document.c	Sun Jan 23 19:52:26 2000
+@@ -450,7 +450,8 @@
+         return nil;
+     } else {
+         long count = _families->count();
+-        for (long i = 0; i < count; ++i) {
++	long i;
++        for (i = 0; i < count; ++i) {
+             FontFamilyInfo& info = _families->item_ref(i);
+             if (strcmp(info._name, name) == 0) {
+                 break;
+@@ -581,7 +582,8 @@
+     info._page = -3;
+     touch(true);
+     long count = _viewer->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         DocumentViewerInfo& vinfo = _viewer->item_ref(i);
+         vinfo._viewer->float_inserted(item);
+     }
+@@ -590,7 +592,8 @@
+ void Document::remove_float (Item* item) {
+     touch(true);
+     long count = _viewer->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         DocumentViewerInfo& info = _viewer->item_ref(i);
+         info._viewer->float_removed(item);
+     }
+@@ -603,7 +606,8 @@
+     FloatInfo& info = _float->item_ref(find_float(item));
+     touch(true);
+     long count = _viewer->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         DocumentViewerInfo& viewer = _viewer->item_ref(i);
+         viewer._viewer->float_changed(item);
+     }
+@@ -616,7 +620,8 @@
+     info._page = page;
+     touch(true);
+     long count = _viewer->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         DocumentViewerInfo& info = _viewer->item_ref(i);
+         info._viewer->float_adjusted(item, x, y, page);
+     }
+@@ -656,7 +661,8 @@
+ 	if (!dot && *p == '.') {
+ 	    dot = true;
+ 	} else if (!isdigit(*p)) {
+-	    int i = p - v.string();
++	    int i;
++	    i = p - v.string();
+ 	    units.set_to_right(i);
+ 	    v.set_to_left(i);
+ 	    if (!v.convert(f)) {
+@@ -1390,10 +1396,11 @@
+ }
+ 
+ long Document::parse_text (const char* buffer) {
++    long i;
+     if (buffer == nil) {
+         return 0;
+     }
+-    for (long i = 0; text_map[i]._format != nil; ++i) {
++    for (i = 0; text_map[i]._format != nil; ++i) {
+         if (strcmp(buffer, text_map[i]._format) == 0) {
+             return text_map[i]._code;
+         }
+@@ -1523,7 +1530,8 @@
+             done = true;
+         } else {
+             int length = strlen(line);
+-            for (int i = 0; i < length; ++i) {
++	    int i;
++            for (i = 0; i < length; ++i) {
+                 index = text->insert(index, line[i], style, source, nil);
+             }
+             index = text->insert(index, '\n', style, source, nil);
+@@ -1538,6 +1546,7 @@
  ) {
--    long count = _chooser->count();
+     SourceInfo& info = _source->item_ref(source);
+     if (info._source._editable) {
++	long i;
+         if (info._style != style) {
+             char buffer[100];
+             unparse_style(buffer, style, info._style);
+@@ -1545,7 +1554,7 @@
+         }
+         out << "%\n\\begin{verbatim}\n";
+         column = 0;
+-        for (long i = index; i < index + count; ++i) {
++        for (i = index; i < index + count; ++i) {
+             out.put(char(text->item_code(i)));
+         }
+         out << "\\end{verbatim}%\n";
+@@ -1570,7 +1579,8 @@
+         file.getline(line, 1000);
+         if (file) {
+             int length = strlen(line);
+-            for (int i = 0; i < length; ++i) {
++	    int i;
++            for (i = 0; i < length; ++i) {
+                 index = text->insert(index, line[i], style, source, nil);
+             }
+             index = text->insert(index, '\n', style, source, nil);
+@@ -1937,7 +1947,8 @@
+ 
+ void Document::step (const char* counter, const char* context) {
+     long count = _counter->count();
 -    for (long i = 0; i < count; ++i) {
-+    long count = _chooser->count(), i;
++    long i;
 +    for (i = 0; i < count; ++i) {
-         ChooserInfo& info = _chooser->item_ref(i);
-         if (strcmp(info._prompt, prompt) == 0) {
+         CounterInfo& info = _counter->item_ref(i);
+         if (strcmp(info._name, counter) == 0) {
+             info._value += 1;
+@@ -1976,7 +1987,8 @@
+     info._viewer = viewer;
+     _viewer->append(info);
+     long count = _float->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         FloatInfo& info = _float->item_ref(i);
+         viewer->float_inserted(info._item);
+         viewer->float_adjusted(info._item, info._x, info._y, info._page);
+@@ -1986,7 +1998,8 @@
+ 
+ void Document::detach (DocumentViewer* viewer) {
+     long count = _viewer->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         DocumentViewerInfo& info = _viewer->item_ref(i);
+         if (info._viewer == viewer) {
+             _viewer->remove(i);
+@@ -1998,7 +2011,8 @@
+ void Document::notify () {
+     while (_body != nil && _relabel) {
+         long count = _counter->count();
+-        for (long i = 0; i < count; ++i) {
++	long i;
++        for (i = 0; i < count; ++i) {
+             CounterInfo& info = _counter->item_ref(i);
+             info._value = info._initial;
+         }
+@@ -2006,7 +2020,8 @@
+         _body->label("");
+     }
+     long count = _viewer->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         DocumentViewerInfo& info = _viewer->item_ref(i);
+         info._viewer->update();
+     }
+@@ -2062,7 +2077,8 @@
+     char screenfont[100];
+     strcpy(screenfont, style._style._font);
+     long len = strlen(screenfont);
+-    for (long i = 0; i < len; ++i) {
++    long i;
++    for (i = 0; i < len; ++i) {
+         if (isupper(screenfont[i])) {
+             screenfont[i] += 'a' - 'A';
+         }
+@@ -2277,7 +2293,8 @@
+ 
+ long Document::find_macro (const char* name) {
+     long count = _macro->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         MacroInfo& info = _macro->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
              break;
-@@ -127,8 +127,8 @@
- const char* DialogManager::ask (
-     Window* window, const char* prompt, const char* initial
- ) {
--    long count = _asker->count();
+@@ -2314,7 +2331,8 @@
+ 
+ long Document::find_counter (const char* name) {
+     long count = _counter->count();
 -    for (long i = 0; i < count; ++i) {
-+    long count = _asker->count(), i;
++    long i;
 +    for (i = 0; i < count; ++i) {
-         AskerInfo& info = _asker->item_ref(i);
-         if (strcmp(info._prompt, prompt) == 0) {
+         CounterInfo& info = _counter->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
              break;
-@@ -145,8 +145,8 @@
- }
+@@ -2365,7 +2383,8 @@
  
- int DialogManager::confirm (Window* window, const char* prompt) {
--    long count = _confirmer->count();
+ long Document::find_parameter (const char* name) {
+     long count = _parameter->count();
 -    for (long i = 0; i < count; ++i) {
-+    long count = _confirmer->count(), i;
++    long i;
 +    for (i = 0; i < count; ++i) {
-         ConfirmerInfo& info = _confirmer->item_ref(i);
-         if (strcmp(info._prompt, prompt) == 0) {
+         DocumentParameterInfo& info = _parameter->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
              break;
-@@ -163,8 +163,8 @@
- }
+@@ -2406,7 +2425,8 @@
+ 
+ long Document::find_label (const char* name) {
+     long count = _label->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         LabelInfo& info = _label->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
+             break;
+@@ -2447,7 +2467,8 @@
  
- void DialogManager::report (Window* window, const char* prompt) {
--    long count = _reporter->count();
+ long Document::find_float (Item* item) {
+     long count = _float->count();
 -    for (long i = 0; i < count; ++i) {
-+    long count = _reporter->count(), i;
++    long i;
 +    for (i = 0; i < count; ++i) {
-         ReporterInfo& info = _reporter->item_ref(i);
-         if (strcmp(info._prompt, prompt) == 0) {
+         FloatInfo& info = _float->item_ref(i);
+         if (info._item == item) {
              break;
+@@ -2578,7 +2599,8 @@
+                 return COMMAND;
+             }
+         } else if (isdigit(c)) {
+-            int i = c - '0';
++            int i;
++            i = c - '0';
+             if (isdigit(c = in.get())) {
+                 i = i * 8 + (c - '0');
+             } else {
diff --git a/x11-toolkits/iv/files/patch-bx b/x11-toolkits/iv/files/patch-bx
index d277ad0975e0..ffa75a713b12 100644
--- a/x11-toolkits/iv/files/patch-bx
+++ b/x11-toolkits/iv/files/patch-bx
@@ -1,12 +1,142 @@
---- src/lib/IV-X11/xfont.c.orig	Tue Dec 28 23:19:05 1999
-+++ src/lib/IV-X11/xfont.c	Tue Dec 28 23:19:38 1999
-@@ -527,7 +527,8 @@
-     int sublength = strlen(substring);
-     int length = strlen(string) - sublength;
-     for (int i = 0; i <= length; ++i) {
--        for (int j = 0; j < sublength; ++j) {
-+	int j;
-+        for (j = 0; j < sublength; ++j) {
-             if (string[i+j] != substring[j]) {
-                 break;
-             }
+--- src/bin/doc/DocViewer.c.org	Thu Nov 26 13:46:57 1992
++++ src/bin/doc/DocViewer.c	Sun Jan 23 19:55:09 2000
+@@ -434,7 +434,8 @@
+                 ps->resize(a.left(), a.bottom(), a.right(), a.top());
+                 long current_page = _current_page;
+                 long count = _page_info->count();
+-                for (long i = 0; i < count; ++i) {
++		long i;
++                for (i = 0; i < count; ++i) {
+                     ps->page(_page_info->item_ref(i)._label);
+                     page_to(i);
+                     _page_patch->print(ps, a);
+@@ -601,7 +602,8 @@
+ 
+ void DocumentViewer::pin (const char* name) {
+     long count = _pinned_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerPinnedInfo& m = _pinned_info->item_ref(i);
+         if (strcmp(m._name, name) == 0) {
+             break;
+@@ -634,7 +636,8 @@
+ 
+ void DocumentViewer::unpin (const char* name) {
+     long count = _pinned_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerPinnedInfo& m = _pinned_info->item_ref(i);
+         if (strcmp(m._name, name) == 0) {
+             break;
+@@ -652,7 +655,8 @@
+ void DocumentViewer::menubar (const char* name) {
+     choose(nil, false);
+     long count = _menu_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerMenuInfo& m = _menu_info->item_ref(i);
+         if (strcmp(m._name, name) == 0) {
+             break;
+@@ -675,7 +679,8 @@
+ 
+ void DocumentViewer::keymap (const char* name) {
+     long count = _keymap_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerKeymapInfo& info = _keymap_info->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
+             break;
+@@ -699,7 +704,8 @@
+     const char* name, const Color*& overlay, const Color*& underlay
+ ) {
+     long count = _color_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerColorInfo& info = _color_info->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
+             break;
+@@ -767,7 +773,8 @@
+ 
+ void DocumentViewer::float_removed (Item* item) {
+     long count = _float_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         if (_float_info->item_ref(i)._item == item) {
+             break;
+         }
+@@ -783,7 +790,8 @@
+ 
+ void DocumentViewer::float_changed (Item* item) {
+     long count = _float_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         if (_float_info->item_ref(i)._item == item) {
+             break;
+         }
+@@ -798,7 +806,8 @@
+ void DocumentViewer::float_adjusted (Item* item, float x, float y, long p) {
+     Session::instance()->default_display()->flush();
+     long count = _float_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         if (_float_info->item_ref(i)._item == item) {
+             break;
+         }
+@@ -909,6 +918,7 @@
+ 	Style* style = kit.style();
+         const Color* fg = kit.foreground();
+         char label[10];
++	long i;
+         while (_page_info->count() < page_count) {
+             ViewerPageInfo info;
+             _document->format_counter(
+@@ -954,7 +964,7 @@
+         LRComposition* comp = new LRComposition(
+             layout.vbox_first_aligned(), new SimpleCompositor(), nil, width
+         );
+-        for (long i = 0; i < page_count; ++i) {
++        for (i = 0; i < page_count; ++i) {
+             ViewerPageInfo& info = _page_info->item_ref(i);
+             char command [20];
+             sprintf(command, "page %d", i);
+@@ -980,10 +990,11 @@
+     page = Math::max(0L, page);
+     page = Math::min(page_count-1, page);
+     if (page != _current_page) {
++	long i;
+         _current_page = page;
+         _pages->flip_to(_current_page * 2);
+         _view->view_page(_current_page * 2);
+-        for (long i = 0; i < page_count; ++i) {
++        for (i = 0; i < page_count; ++i) {
+             ViewerPageInfo& info = _page_info->item_ref(i);
+             info._telltale->choose(i == _current_page);
+         }
+@@ -1024,7 +1035,8 @@
+ ) {
+     Coord top = t;
+     long count = _float_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerFloatInfo& info = _float_info->item_ref(i);
+         if (info._page == page/2 || info._page == -2 && page > 0) {
+ 	    Allotment ax, ay;
+@@ -1049,7 +1061,8 @@
+ ) {
+     Coord bottom = b;
+     long count = _float_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerFloatInfo& info = _float_info->item_ref(i);
+         if (info._page == page/2 || info._page == -2 && page > 0) {
+ 	    Allotment ax, ay;
diff --git a/x11-toolkits/iv/files/patch-by b/x11-toolkits/iv/files/patch-by
index cb1e2b2946ae..ffd077cb4f88 100644
--- a/x11-toolkits/iv/files/patch-by
+++ b/x11-toolkits/iv/files/patch-by
@@ -1,13 +1,42 @@
---- src/lib/Unidraw/text.c.orig	Tue Dec 28 23:20:23 1999
-+++ src/lib/Unidraw/text.c	Tue Dec 28 23:20:46 1999
-@@ -561,8 +561,9 @@
+--- src/bin/doc/DialogMgr.c.org	Sat Apr 11 14:28:48 1992
++++ src/bin/doc/DialogMgr.c	Sun Jan 23 19:56:53 2000
+@@ -108,7 +108,8 @@
+     Window* window, const char* prompt, const char* filter
+ ) {
+     long count = _chooser->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ChooserInfo& info = _chooser->item_ref(i);
+         if (strcmp(info._prompt, prompt) == 0) {
+             break;
+@@ -128,7 +129,8 @@
+     Window* window, const char* prompt, const char* initial
+ ) {
+     long count = _asker->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         AskerInfo& info = _asker->item_ref(i);
+         if (strcmp(info._prompt, prompt) == 0) {
+             break;
+@@ -146,7 +148,8 @@
  
- const char* PSText::Filter (const char* string, int len) {
-     TextBuffer stext(sbuf, 0, SBUFSIZE);
-+    int dot;
+ int DialogManager::confirm (Window* window, const char* prompt) {
+     long count = _confirmer->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ConfirmerInfo& info = _confirmer->item_ref(i);
+         if (strcmp(info._prompt, prompt) == 0) {
+             break;
+@@ -164,7 +167,8 @@
  
--    for (int dot = 0; len--; string++) {
-+    for (dot = 0; len--; string++) {
- 	char c = *string;
- 
- 	if (!isascii(c) || iscntrl(c)) {
+ void DialogManager::report (Window* window, const char* prompt) {
+     long count = _reporter->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ReporterInfo& info = _reporter->item_ref(i);
+         if (strcmp(info._prompt, prompt) == 0) {
+             break;
diff --git a/x11-toolkits/iv/files/patch-bz b/x11-toolkits/iv/files/patch-bz
index 1b978829b58b..d71a4f1979e0 100644
--- a/x11-toolkits/iv/files/patch-bz
+++ b/x11-toolkits/iv/files/patch-bz
@@ -1,12 +1,14 @@
---- src/bin/doc/Keymap.c.orig	Tue Dec 28 23:21:41 1999
-+++ src/bin/doc/Keymap.c	Tue Dec 28 23:22:00 1999
-@@ -105,12 +105,12 @@
+--- src/bin/doc/Keymap.c.org	Sat Apr 11 14:29:37 1992
++++ src/bin/doc/Keymap.c	Sun Jan 23 19:58:14 2000
+@@ -103,6 +103,7 @@
+         _viewer != nil
+         && e.type() == Event::key && e.mapkey(s, sizeof(s)) > 0
      ) {
++	long i;
          _viewer->ref();
          ItemView* view = _viewer->focus();
--        long count = _info->count();
-+        long count = _info->count(), i;
-         int key = s[0];
+         long count = _info->count();
+@@ -110,7 +111,7 @@
          if (key < 0) {
              key += 256;
          }
diff --git a/x11-toolkits/iv/files/patch-ca b/x11-toolkits/iv/files/patch-ca
index 47889ef38bf4..7d6769091a86 100644
--- a/x11-toolkits/iv/files/patch-ca
+++ b/x11-toolkits/iv/files/patch-ca
@@ -1,11 +1,20 @@
---- src/bin/idraw/ided.c.orig	Tue Dec 28 23:47:23 1999
-+++ src/bin/idraw/ided.c	Tue Dec 28 23:47:41 1999
-@@ -350,7 +350,7 @@
-     return commands;
- }
+--- src/bin/ibuild/ibvars.h.org	Thu Jul 16 07:36:21 1992
++++ src/bin/ibuild/ibvars.h	Sun Jan 23 20:01:12 2000
+@@ -232,7 +232,7 @@
  
--static const unit = 15;
-+static const int unit = 15;
+ inline boolean MemberSharedName::GetExport() { return _export; }
+ inline SubclassNameVar* MemberSharedName::GetSubclass () { return _subclass; }
+-inline void MemberSharedName::SetExport(boolean export) { _export = export;}
++inline void MemberSharedName::SetExport(boolean exportval) { _export = exportval;}
+ inline int& MemberSharedName::GetSerial () { return _mSerial; }
+ inline IDVar* MemberSharedName::GetIDVar () { return _idVar; }
  
- static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
- static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
+@@ -326,7 +326,7 @@
+ inline int ButtonSharedName::GetInitial() { return _initial; }
+ inline void ButtonSharedName::SetInitial(int initial) { _initial = initial;}
+ inline boolean ButtonSharedName::GetExport() { return _export; }
+-inline void ButtonSharedName::SetExport(boolean export) { _export = export;}
++inline void ButtonSharedName::SetExport(boolean exportval) { _export = exportval;}
+ inline const char* ButtonSharedName::GetFuncName() { return _func; }
+ inline int& ButtonSharedName::GetSerial() { return _bsSerial; }
+ inline SubclassNameVar* ButtonSharedName::GetSubclass () { return _subclass; }
diff --git a/x11-toolkits/iv/files/patch-cb b/x11-toolkits/iv/files/patch-cb
index 5ba9a22f6d61..56ed107fa143 100644
--- a/x11-toolkits/iv/files/patch-cb
+++ b/x11-toolkits/iv/files/patch-cb
@@ -1,20 +1,12 @@
---- src/bin/ibuild/ibvars.h.orig	Tue Dec 28 23:49:31 1999
-+++ src/bin/ibuild/ibvars.h	Tue Dec 28 23:50:16 1999
-@@ -232,7 +232,7 @@
- 
- inline boolean MemberSharedName::GetExport() { return _export; }
- inline SubclassNameVar* MemberSharedName::GetSubclass () { return _subclass; }
--inline void MemberSharedName::SetExport(boolean export) { _export = export;}
-+inline void MemberSharedName::SetExport(boolean export_) { _export = export_;}
- inline int& MemberSharedName::GetSerial () { return _mSerial; }
- inline IDVar* MemberSharedName::GetIDVar () { return _idVar; }
- 
-@@ -326,7 +326,7 @@
- inline int ButtonSharedName::GetInitial() { return _initial; }
- inline void ButtonSharedName::SetInitial(int initial) { _initial = initial;}
- inline boolean ButtonSharedName::GetExport() { return _export; }
--inline void ButtonSharedName::SetExport(boolean export) { _export = export;}
-+inline void ButtonSharedName::SetExport(boolean export_) { _export = export_;}
- inline const char* ButtonSharedName::GetFuncName() { return _func; }
- inline int& ButtonSharedName::GetSerial() { return _bsSerial; }
- inline SubclassNameVar* ButtonSharedName::GetSubclass () { return _subclass; }
+--- src/bin/ibuild/ibcatalog.c.org	Wed Sep  9 07:36:27 1992
++++ src/bin/ibuild/ibcatalog.c	Sun Jan 23 20:03:11 2000
+@@ -614,7 +614,8 @@
+ 		graylevel = CalcGrayLevel(data[0]);
+ 	    }
+ 	} else if (graylevel == -1) {
+-	    for (int i = 0; in >> _buf && i < patternHeight; i++) {
++	    int i;
++	    for (i = 0; in >> _buf && i < patternHeight; i++) {
+ 		if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
+ 		    break;
+ 		}
diff --git a/x11-toolkits/iv/files/patch-cc b/x11-toolkits/iv/files/patch-cc
index a17c050e23ec..ab0156ab2a70 100644
--- a/x11-toolkits/iv/files/patch-cc
+++ b/x11-toolkits/iv/files/patch-cc
@@ -1,12 +1,28 @@
---- src/bin/ibuild/ibcatalog.c.orig	Tue Dec 28 23:51:30 1999
-+++ src/bin/ibuild/ibcatalog.c	Tue Dec 28 23:51:44 1999
-@@ -614,7 +614,8 @@
- 		graylevel = CalcGrayLevel(data[0]);
- 	    }
- 	} else if (graylevel == -1) {
--	    for (int i = 0; in >> _buf && i < patternHeight; i++) {
-+	    int i;
-+	    for (i = 0; in >> _buf && i < patternHeight; i++) {
- 		if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
- 		    break;
- 		}
+--- src/bin/ibuild/ibdialog.c.org	Tue Feb  2 08:04:15 1993
++++ src/bin/ibuild/ibdialog.c	Sun Jan 23 20:14:43 2000
+@@ -35,6 +35,7 @@
+ #include <Unidraw/unidraw.h>
+ #include <Unidraw/viewer.h>
+ #include <Unidraw/catalog.h>
++#include <stdio.h>
+ #include <stream.h>
+ #include <string.h>
+ 
+@@ -382,7 +383,7 @@
+     strcat(ButtonClass, "_Button");
+     const char* proc = bsVar->GetFuncName();
+     
+-    boolean export = bsVar->GetExport();
++    boolean exportval = bsVar->GetExport();
+     CodeView* kidview = GetKidView();
+     MemberNameVar* kidname;
+     if (kidview != nil) {
+@@ -409,7 +410,7 @@
+ 
+     out << "Interactor*" << coreclass;
+     out << "::Interior() {\n";
+-    if (export) {
++    if (exportval) {
+         out << "    " << bsVar->GetName() << " = state;\n";
+     } else {
+         out << "    ButtonState* ";
diff --git a/x11-toolkits/iv/files/patch-cd b/x11-toolkits/iv/files/patch-cd
index 9dd57932f7ec..bda372b32dca 100644
--- a/x11-toolkits/iv/files/patch-cd
+++ b/x11-toolkits/iv/files/patch-cd
@@ -1,28 +1,11 @@
---- src/bin/ibuild/ibdialog.c.orig	Tue Dec 28 23:57:35 1999
-+++ src/bin/ibuild/ibdialog.c	Tue Dec 28 23:58:10 1999
-@@ -35,6 +35,7 @@
- #include <Unidraw/unidraw.h>
- #include <Unidraw/viewer.h>
- #include <Unidraw/catalog.h>
-+#include <stdio.h>
- #include <stream.h>
- #include <string.h>
+--- src/bin/ibuild/ibed.c.org	Wed Nov 11 03:16:15 1992
++++ src/bin/ibuild/ibed.c	Sun Jan 23 20:15:55 2000
+@@ -672,7 +672,7 @@
+     return tools;
+ }
  
-@@ -380,7 +381,7 @@
-     strcat(ButtonClass, "_Button");
-     const char* proc = bsVar->GetFuncName();
-     
--    boolean export = bsVar->GetExport();
-+    boolean export_ = bsVar->GetExport();
-     CodeView* kidview = GetKidView();
-     MemberNameVar* kidname;
-     if (kidview != nil) {
-@@ -407,7 +408,7 @@
+-static const unit = 15;
++static const int unit = 15;
  
-     out << "Interactor*" << coreclass;
-     out << "::Interior() {\n";
--    if (export) {
-+    if (export_) {
-         out << "    " << bsVar->GetName() << " = state;\n";
-     } else {
-         out << "    ButtonState* ";
+ static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
+ static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
diff --git a/x11-toolkits/iv/files/patch-ce b/x11-toolkits/iv/files/patch-ce
index f9971b4c46dd..2284d8b34774 100644
--- a/x11-toolkits/iv/files/patch-ce
+++ b/x11-toolkits/iv/files/patch-ce
@@ -1,11 +1,19 @@
---- src/bin/ibuild/ibed.c.orig	Tue Dec 28 23:59:18 1999
-+++ src/bin/ibuild/ibed.c	Tue Dec 28 23:59:30 1999
-@@ -672,7 +672,7 @@
-     return tools;
- }
+--- src/bin/ibuild/ibglue.c.org	Sat Apr 25 05:14:55 1992
++++ src/bin/ibuild/ibglue.c	Sun Jan 23 20:17:10 2000
+@@ -271,14 +271,14 @@
+             strcpy(VGlueClass, coreclass);
+             strcat(VGlueClass, "_VGlue");
+             
+-            boolean export = icomp->GetMemberNameVar()->GetExport();
++            boolean exportval = icomp->GetMemberNameVar()->GetExport();
+             const char* classname = icomp->GetClassNameVar()->GetName();
+             if (icomp->GetClassNameVar()->IsSubclass()) {
+                 BeginInstantiate(out);
+                 out << "(";
  
--static const unit = 15;
-+static const int unit = 15;
- 
- static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
- static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
+             } else {
+-                if (export && !_emitMain) {
++                if (exportval && !_emitMain) {
+                     out << "    " << mname << " = new ";
+                 } else {
+                     out << "    " << classname << "* ";
diff --git a/x11-toolkits/iv/files/patch-cf b/x11-toolkits/iv/files/patch-cf
index 9edef1b34178..73b4fc126e0b 100644
--- a/x11-toolkits/iv/files/patch-cf
+++ b/x11-toolkits/iv/files/patch-cf
@@ -1,19 +1,29 @@
---- src/bin/ibuild/ibglue.c.orig	Wed Dec 29 00:01:29 1999
-+++ src/bin/ibuild/ibglue.c	Wed Dec 29 00:02:33 1999
-@@ -271,14 +271,14 @@
-             strcpy(VGlueClass, coreclass);
-             strcat(VGlueClass, "_VGlue");
+--- src/bin/ibuild/ibmenu.c.org	Wed Sep  9 07:34:15 1992
++++ src/bin/ibuild/ibmenu.c	Sun Jan 23 20:18:28 2000
+@@ -403,7 +403,7 @@
              
+             const char* proc = menuItem->GetTrackNameVar()->GetName();
+             const char* text = menuItem->GetMenuItemGraphic()->GetText();
 -            boolean export = icomp->GetMemberNameVar()->GetExport();
-+            boolean export_ = icomp->GetMemberNameVar()->GetExport();
-             const char* classname = icomp->GetClassNameVar()->GetName();
++            boolean exportval = icomp->GetMemberNameVar()->GetExport();
+             Shape* shape = icomp->GetShapeVar()->GetShape();
+             
              if (icomp->GetClassNameVar()->IsSubclass()) {
-                 BeginInstantiate(out);
+@@ -411,7 +411,7 @@
                  out << "(";
- 
+                 
              } else {
 -                if (export && !_emitMain) {
-+                if (export_ && !_emitMain) {
-                     out << "    " << mname << " = new ";
++                if (exportval && !_emitMain) {
+                     out << "    " << mname << " = ";
+                     out << "new " << MenuClass;
                  } else {
-                     out << "    " << classname << "* ";
+@@ -431,7 +431,7 @@
+             EndInstantiate(out);
+             
+             if (!_emitMain && proc != nil && *proc != '\0') {
+-                if (!export || icomp->GetClassNameVar()->IsSubclass()) {
++                if (!exportval || icomp->GetClassNameVar()->IsSubclass()) {
+                     out << "    " << mname << "->SetCoreClass(this);\n";
+                     out <<"    "<< mname <<"->SetCoreFunc("<< "&" << coreclass;
+                     out << "::" << proc << ");\n";
diff --git a/x11-toolkits/iv/files/patch-cg b/x11-toolkits/iv/files/patch-cg
index c9ec771d343b..0be19c64d07d 100644
--- a/x11-toolkits/iv/files/patch-cg
+++ b/x11-toolkits/iv/files/patch-cg
@@ -1,29 +1,18 @@
---- src/bin/ibuild/ibmenu.c.orig	Wed Dec 29 00:03:53 1999
-+++ src/bin/ibuild/ibmenu.c	Wed Dec 29 00:04:11 1999
-@@ -403,7 +403,7 @@
-             
-             const char* proc = menuItem->GetTrackNameVar()->GetName();
-             const char* text = menuItem->GetMenuItemGraphic()->GetText();
--            boolean export = icomp->GetMemberNameVar()->GetExport();
-+            boolean export_ = icomp->GetMemberNameVar()->GetExport();
-             Shape* shape = icomp->GetShapeVar()->GetShape();
-             
-             if (icomp->GetClassNameVar()->IsSubclass()) {
-@@ -411,7 +411,7 @@
-                 out << "(";
-                 
+--- src/bin/ibuild/ibpanelctrl.c.org	Wed Nov 11 03:16:39 1992
++++ src/bin/ibuild/ibpanelctrl.c	Sun Jan 23 20:19:37 2000
+@@ -871,13 +871,13 @@
+     } else if (_emitBSInits) {
+         ButtonStateVar* bsVar = pcComp->GetButtonStateVar();
+ 	const char* name = bsVar->GetName();
+-        boolean export = bsVar->GetExport();
++        boolean exportval = bsVar->GetExport();
+         const char* subclass = bsVar->GetSubclassName();
+ 
+ 	if (!_bsinitslist->Search(name)) {
+ 	    _bsinitslist->Append(name);
+ 
+-            if (export && !_emitMain) {
++            if (exportval && !_emitMain) {
+                 out << "    " << name;
+ 
              } else {
--                if (export && !_emitMain) {
-+                if (export_ && !_emitMain) {
-                     out << "    " << mname << " = ";
-                     out << "new " << MenuClass;
-                 } else {
-@@ -431,7 +431,7 @@
-             EndInstantiate(out);
-             
-             if (!_emitMain && proc != nil && *proc != '\0') {
--                if (!export || icomp->GetClassNameVar()->IsSubclass()) {
-+                if (!export_ || icomp->GetClassNameVar()->IsSubclass()) {
-                     out << "    " << mname << "->SetCoreClass(this);\n";
-                     out <<"    "<< mname <<"->SetCoreFunc("<< "&" << coreclass;
-                     out << "::" << proc << ");\n";
diff --git a/x11-toolkits/iv/files/patch-ch b/x11-toolkits/iv/files/patch-ch
index 629db73d7ab1..87180c862664 100644
--- a/x11-toolkits/iv/files/patch-ch
+++ b/x11-toolkits/iv/files/patch-ch
@@ -1,18 +1,20 @@
---- src/bin/ibuild/ibpanelctrl.c.orig	Wed Dec 29 00:05:10 1999
-+++ src/bin/ibuild/ibpanelctrl.c	Wed Dec 29 00:05:30 1999
-@@ -871,13 +871,13 @@
-     } else if (_emitBSInits) {
-         ButtonStateVar* bsVar = pcComp->GetButtonStateVar();
- 	const char* name = bsVar->GetName();
--        boolean export = bsVar->GetExport();
-+        boolean export_ = bsVar->GetExport();
-         const char* subclass = bsVar->GetSubclassName();
+--- src/bin/ibuild/ibslider.c.org	Tue Jun  9 04:44:50 1992
++++ src/bin/ibuild/ibslider.c	Sun Jan 23 20:20:51 2000
+@@ -416,7 +416,7 @@
+                 strcpy(SliderClass, coreclass);
+                 strcat(SliderClass, "_Slider");
+                 
+-                boolean export = icomp->GetMemberNameVar()->GetExport();
++                boolean exportval = icomp->GetMemberNameVar()->GetExport();
+                 const char* classname = icomp->GetClassNameVar()->GetName();
  
- 	if (!_bsinitslist->Search(name)) {
- 	    _bsinitslist->Append(name);
- 
--            if (export && !_emitMain) {
-+            if (export_ && !_emitMain) {
-                 out << "    " << name;
- 
-             } else {
+ 		int w = icomp->GetCanvasVar()->Width();
+@@ -426,7 +426,7 @@
+                     BeginInstantiate(out);
+                     out << "(";
+                 } else {
+-                    if (export && !_emitMain) {
++                    if (exportval && !_emitMain) {
+                         out << "    " << mname << " = new " << SliderClass;
+                         out << "(";
+                     } else {
diff --git a/x11-toolkits/iv/files/patch-ci b/x11-toolkits/iv/files/patch-ci
index 9456720522ab..cb7fb399d4a1 100644
--- a/x11-toolkits/iv/files/patch-ci
+++ b/x11-toolkits/iv/files/patch-ci
@@ -1,20 +1,28 @@
---- src/bin/ibuild/ibslider.c.orig	Wed Dec 29 00:06:31 1999
-+++ src/bin/ibuild/ibslider.c	Wed Dec 29 00:06:43 1999
-@@ -416,7 +416,7 @@
-                 strcpy(SliderClass, coreclass);
-                 strcat(SliderClass, "_Slider");
-                 
--                boolean export = icomp->GetMemberNameVar()->GetExport();
-+                boolean export_ = icomp->GetMemberNameVar()->GetExport();
-                 const char* classname = icomp->GetClassNameVar()->GetName();
+--- src/bin/ibuild/ibvars.c.org	Wed Sep  9 07:33:42 1992
++++ src/bin/ibuild/ibvars.c	Sun Jan 23 20:22:31 2000
+@@ -371,9 +371,9 @@
+ /*****************************************************************************/
  
- 		int w = icomp->GetCanvasVar()->Width();
-@@ -426,7 +426,7 @@
-                     BeginInstantiate(out);
-                     out << "(";
-                 } else {
--                    if (export && !_emitMain) {
-+                    if (export_ && !_emitMain) {
-                         out << "    " << mname << " = new " << SliderClass;
-                         out << "(";
-                     } else {
+ MemberSharedName::MemberSharedName (
+-    const char* name, boolean export, boolean machgen
++    const char* name, boolean exportval, boolean machgen
+ ) : SharedName(name, machgen) {
+-    _export = export;
++    _export = exportval;
+     _subclass = new SubclassNameVar("", false, false);
+     _subclass->ref();
+     _idVar = nil;
+@@ -471,11 +471,11 @@
+ 
+ /*****************************************************************************/
+ MemberNameVar::MemberNameVar (
+-    const char* name, boolean export, boolean machgen
++    const char* name, boolean exportval, boolean machgen
+ ) {
+     _msharedname = nil;
+     if (name != nil) {
+-        _msharedname = new MemberSharedName(name, export, machgen);
++        _msharedname = new MemberSharedName(name, exportval, machgen);
+         _msharedname->ref();
+     }
+ }
diff --git a/x11-toolkits/iv/files/patch-cj b/x11-toolkits/iv/files/patch-cj
index 3ac8c1e2f9c2..ee04d72f1977 100644
--- a/x11-toolkits/iv/files/patch-cj
+++ b/x11-toolkits/iv/files/patch-cj
@@ -1,28 +1,12 @@
---- src/bin/ibuild/ibvars.c.orig	Wed Dec 29 00:07:51 1999
-+++ src/bin/ibuild/ibvars.c	Wed Dec 29 00:08:26 1999
-@@ -371,9 +371,9 @@
- /*****************************************************************************/
- 
- MemberSharedName::MemberSharedName (
--    const char* name, boolean export, boolean machgen
-+    const char* name, boolean export_, boolean machgen
- ) : SharedName(name, machgen) {
--    _export = export;
-+    _export = export_;
-     _subclass = new SubclassNameVar("", false, false);
-     _subclass->ref();
-     _idVar = nil;
-@@ -471,11 +471,11 @@
- 
- /*****************************************************************************/
- MemberNameVar::MemberNameVar (
--    const char* name, boolean export, boolean machgen
-+    const char* name, boolean export_, boolean machgen
- ) {
-     _msharedname = nil;
-     if (name != nil) {
--        _msharedname = new MemberSharedName(name, export, machgen);
-+        _msharedname = new MemberSharedName(name, export_, machgen);
-         _msharedname->ref();
-     }
- }
+--- src/bin/ibuild/ibvarviews.c.org	Sat Feb 27 02:52:55 1993
++++ src/bin/ibuild/ibvarviews.c	Sun Jan 23 20:23:50 2000
+@@ -1379,7 +1379,8 @@
+                 );
+                 conflictCmd.Execute();
+                 UList* cl = conflictCmd.GetConflict();
+-                for(UList* i = cl->First(); i != cl->End(); i = i->Next()) {
++		UList* i;
++                for(i = cl->First(); i != cl->End(); i = i->Next()) {
+                     StateVar* state = (StateVar*) (*i)();
+                     if (state->IsA(SUBCLASSNAME_VAR) && state != subvar) {
+                         SubclassNameVar* svar = (SubclassNameVar*) state;
diff --git a/x11-toolkits/iv/files/patch-ck b/x11-toolkits/iv/files/patch-ck
index 6ae4b9965ff1..dd2bc0a8e675 100644
--- a/x11-toolkits/iv/files/patch-ck
+++ b/x11-toolkits/iv/files/patch-ck
@@ -1,17 +1,72 @@
---- src/bin/ibuild/ibvarviews.c.orig	Wed Dec 29 00:09:20 1999
-+++ src/bin/ibuild/ibvarviews.c	Wed Dec 29 00:09:52 1999
-@@ -1374,12 +1374,13 @@
-     if (strcmp(orig, subclass) != 0) {
-         if (*subclass != '\0') {
-             if (strcmp(subclass, baseclass) != 0) {
-+		UList* i;
-                 GetConflictCmd conflictCmd(
-                     (GraphicComp*) _icomp->GetRoot(), subclass, true
-                 );
-                 conflictCmd.Execute();
-                 UList* cl = conflictCmd.GetConflict();
--                for(UList* i = cl->First(); i != cl->End(); i = i->Next()) {
-+                for(i = cl->First(); i != cl->End(); i = i->Next()) {
-                     StateVar* state = (StateVar*) (*i)();
-                     if (state->IsA(SUBCLASSNAME_VAR) && state != subvar) {
-                         SubclassNameVar* svar = (SubclassNameVar*) state;
+--- src/bin/idraw/idarrow.c.org	Tue Jul 14 02:46:07 1992
++++ src/bin/idraw/idarrow.c	Sun Jan 23 20:28:32 2000
+@@ -304,9 +304,10 @@
+ 	if (dashpatsize <= 0) {
+ 	    out << "[] " << dashoffset << " ";
+ 	} else {
++	    int i;
+ 	    out << "[";
+ 
+-	    for (int i = 0; i < dashpatsize - 1; i++) {
++	    for (i = 0; i < dashpatsize - 1; i++) {
+ 		out << dashpat[i] << " ";
+ 	    }
+ 	    out << dashpat[i] << "] " << dashoffset << " ";
+@@ -510,6 +511,7 @@
+ boolean PSArrowMultiLine::Definition (ostream& out) {
+     ArrowMultiLineComp* comp = (ArrowMultiLineComp*) GetSubject();
+     ArrowMultiLine* aml = comp->GetArrowMultiLine();
++    int i;
+ 
+     const Coord* x, *y;
+     int n = aml->GetOriginal(x, y);
+@@ -518,7 +520,7 @@
+     out << "Begin " << MARK << " " << Name() << "\n";
+     MinGS(out);
+     out << MARK << " " << n << "\n";
+-    for (int i = 0; i < n; i++) {
++    for (i = 0; i < n; i++) {
+         out << x[i] << " " << y[i] << "\n";
+     }
+     out << n << " " << Name() << "\n";
+@@ -557,9 +559,10 @@
+ 	if (dashpatsize <= 0) {
+ 	    out << "[] " << dashoffset << " ";
+ 	} else {
++	    int i;
+ 	    out << "[";
+ 
+-	    for (int i = 0; i < dashpatsize - 1; i++) {
++	    for (i = 0; i < dashpatsize - 1; i++) {
+ 		out << dashpat[i] << " ";
+ 	    }
+ 	    out << dashpat[i] << "] " << dashoffset << " ";
+@@ -759,6 +762,7 @@
+ boolean PSArrowSpline::Definition (ostream& out) {
+     ArrowSplineComp* comp = (ArrowSplineComp*) GetSubject();
+     ArrowOpenBSpline* aml = comp->GetArrowOpenBSpline();
++    int i;
+ 
+     const Coord* x, *y;
+     int n = aml->GetOriginal(x, y);
+@@ -767,7 +771,7 @@
+     out << "Begin " << MARK << " " << Name() << "\n";
+     MinGS(out);
+     out << MARK << " " << n << "\n";
+-    for (int i = 0; i < n; i++) {
++    for (i = 0; i < n; i++) {
+         out << x[i] << " " << y[i] << "\n";
+     }
+     out << n << " " << Name() << "\n";
+@@ -806,9 +810,10 @@
+ 	if (dashpatsize <= 0) {
+ 	    out << "[] " << dashoffset << " ";
+ 	} else {
++	    int i;
+ 	    out << "[";
+ 
+-	    for (int i = 0; i < dashpatsize - 1; i++) {
++	    for (i = 0; i < dashpatsize - 1; i++) {
+ 		out << dashpat[i] << " ";
+ 	    }
+ 	    out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/x11-toolkits/iv/files/patch-cl b/x11-toolkits/iv/files/patch-cl
index 1d1178555f11..fd6617b9ab62 100644
--- a/x11-toolkits/iv/files/patch-cl
+++ b/x11-toolkits/iv/files/patch-cl
@@ -1,14 +1,29 @@
---- src/lib/Unidraw/Imakefile.orig	Wed Dec 29 00:22:37 1999
-+++ src/lib/Unidraw/Imakefile	Wed Dec 29 00:25:23 1999
-@@ -5,7 +5,11 @@
- #ifdef InObjectCodeDir
+--- src/bin/idraw/idcatalog.c.org	Tue Sep 29 03:09:01 1992
++++ src/bin/idraw/idcatalog.c	Sun Jan 23 20:29:52 2000
+@@ -658,7 +658,8 @@
+ 		graylevel = CalcGrayLevel(data[0]);
+ 	    }
+ 	} else if (graylevel == -1) {
+-	    for (int i = 0; in >> _buf && i < patternHeight; i++) {
++	    int i;
++	    for (i = 0; in >> _buf && i < patternHeight; i++) {
+ 		if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
+ 		    break;
+ 		}
+@@ -730,6 +731,7 @@
+     static int sizepoints = 0;
+     static Coord* xcoords = nil;
+     static Coord* ycoords = nil;
++    int i;
  
- LIB = Unidraw
-+.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")
-+VERSION = 3
-+.else
- VERSION = 3.1
-+.endif
- 
- MakeLibrary($(LIB),$(VERSION))
+     Skip(in);
+     in >> n;
+@@ -742,7 +744,7 @@
+         ycoords = new Coord[sizepoints];
+     }
  
+-    for (int i = 0; i < n; i++) {
++    for (i = 0; i < n; i++) {
+         if (_psversion < PSV_NONREDUNDANT) {
+             Skip(in);
+         }
diff --git a/x11-toolkits/iv/files/patch-cm b/x11-toolkits/iv/files/patch-cm
new file mode 100644
index 000000000000..64ac316e0af7
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-cm
@@ -0,0 +1,11 @@
+--- src/bin/idraw/ided.c.org	Wed Jan 27 06:09:36 1993
++++ src/bin/idraw/ided.c	Sun Jan 23 20:30:57 2000
+@@ -349,7 +349,7 @@
+     return commands;
+ }
+ 
+-static const unit = 15;
++static const int unit = 15;
+ 
+ static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
+ static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
diff --git a/x11-toolkits/iv/files/patch-cn b/x11-toolkits/iv/files/patch-cn
new file mode 100644
index 000000000000..fc579eee5530
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-cn
@@ -0,0 +1,35 @@
+--- src/bin/mailbox/main.c.org	Sat Sep 12 01:19:22 1992
++++ src/bin/mailbox/main.c	Sun Jan 23 20:32:57 2000
+@@ -453,7 +453,8 @@
+ 	    if (atp != nil) {
+ 		char* dotp = strchr(atp, '.');
+ 		if (dotp != nil) {
+-		    for (int i = 0; i < strlen(mail_domain); ++i) {
++		    int i;
++		    for (i = 0; i < strlen(mail_domain); ++i) {
+ 			char c = dotp[i];
+ 			c = isupper(c) ? c - 'A' + 'a' : c;
+ 			if (c != mail_domain[i]) {
+@@ -497,8 +498,9 @@
+ 		break;
+ 	    }
+         } else if (*line == '\n' && *mail != '\0') {
++	    int i;
+ 	    delete items[MaxItemCount-1];
+-	    for (int i=MaxItemCount-2; i>=0; --i) {
++	    for (i=MaxItemCount-2; i>=0; --i) {
+ 		items[i+1] = items[i];
+ 	    }
+ 	    items[0] = new char[MaxItemSize];
+@@ -517,9 +519,10 @@
+ 
+ char* MailBox::addressToAlias(char* emailAddress, boolean lookupNames) {
+     lowercasifyString(emailAddress);
++    int i;
+   
+     /* look for a match in the list of aliases */
+-    for (int i = 0; addresses[i]; i++) {
++    for (i = 0; addresses[i]; i++) {
+ 	if (strcmp(emailAddress, addresses[i]) == 0) {
+ 	    emailAddress = strcpy(new char[strlen(aliases[i])+1], aliases[i]);
+ 	    return emailAddress;
diff --git a/x11-toolkits/iv/pkg-descr b/x11-toolkits/iv/pkg-descr
index d4d6ff9464aa..bbbecffca622 100644
--- a/x11-toolkits/iv/pkg-descr
+++ b/x11-toolkits/iv/pkg-descr
@@ -1,3 +1,3 @@
 Interviews is a toolkit with lots of nice utilities (like idraw).
 
-Seigo TANIMURA <tanimura@naklab.dnj.ynu.ac.jp>
+Seigo Tanimura <tanimura@FreeBSD.org>
diff --git a/x11-toolkits/iv/pkg-plist b/x11-toolkits/iv/pkg-plist
index 4f1e8b61cff3..6f569ff09268 100644
--- a/x11-toolkits/iv/pkg-plist
+++ b/x11-toolkits/iv/pkg-plist
@@ -1,4 +1,5 @@
 interviews/bin/FREEBSD/alert
+interviews/bin/FREEBSD/bsdinst
 interviews/bin/FREEBSD/cpu
 interviews/bin/FREEBSD/dclock
 interviews/bin/FREEBSD/doc
@@ -14,10 +15,12 @@ interviews/bin/FREEBSD/mailbox
 interviews/bin/FREEBSD/remind
 interviews/config/InterViews/TIFF.def
 interviews/config/InterViews/arch.def
+interviews/config/InterViews/cxx.def
 interviews/config/InterViews/gcc.def
 interviews/config/InterViews/iv-DGUX.cf
 interviews/config/InterViews/iv-Mips.cf
 interviews/config/InterViews/iv-aix.cf
+interviews/config/InterViews/iv-alpha.cf
 interviews/config/InterViews/iv-apollo.cf
 interviews/config/InterViews/iv-att.cf
 interviews/config/InterViews/iv-bsd.cf
@@ -27,6 +30,7 @@ interviews/config/InterViews/iv-freebsd.cf
 interviews/config/InterViews/iv-generic.cf
 interviews/config/InterViews/iv-hp.cf
 interviews/config/InterViews/iv-ibm.cf
+interviews/config/InterViews/iv-linux.cf
 interviews/config/InterViews/iv-luna.cf
 interviews/config/InterViews/iv-m4330.cf
 interviews/config/InterViews/iv-macII.cf
@@ -35,6 +39,7 @@ interviews/config/InterViews/iv-pegasus.cf
 interviews/config/InterViews/iv-sgi.cf
 interviews/config/InterViews/iv-sony.cf
 interviews/config/InterViews/iv-stellar.cf
+interviews/config/InterViews/iv-stratus.cf
 interviews/config/InterViews/iv-sun.cf
 interviews/config/InterViews/iv-ultrix.cf
 interviews/config/InterViews/iv-x386.cf
@@ -395,8 +400,10 @@ interviews/include/Unidraw/umap.h
 interviews/include/Unidraw/unidraw.h
 interviews/include/Unidraw/upage.h
 interviews/include/Unidraw/viewer.h
-interviews/lib/FREEBSD/libIV.so.3.1
-interviews/lib/FREEBSD/libUnidraw.so.3.1
+interviews/lib/FREEBSD/libIV.so
+interviews/lib/FREEBSD/libIV.so.3
+interviews/lib/FREEBSD/libUnidraw.so
+interviews/lib/FREEBSD/libUnidraw.so.3
 interviews/lib/all/app-defaults/Doc
 interviews/lib/all/app-defaults/Idemo
 interviews/lib/all/app-defaults/InterViews
@@ -515,10 +522,6 @@ interviews/lib/all/styles/smallpage.sty
 interviews/lib/all/styles/thesis.sty
 interviews/lib/all/styles/times.sty
 interviews/man/refman.PS
-lib/libIV.so
-lib/libIV.so.3.1
-lib/libUnidraw.so
-lib/libUnidraw.so.3.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm interviews/bin/FREEBSD