32 files changed, 1386 insertions, 1655 deletions

diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
index a9a2d7c91c06..d8ca404bdd44 100644
--- a/x11-toolkits/iv/Makefile
+++ b/x11-toolkits/iv/Makefile
@@ -3,16 +3,18 @@
 # Date created:		23.sept.1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.17 1998/10/15 13:24:08 jseger Exp $
+# $Id: Makefile,v 1.18 1998/12/18 09:40:52 asami Exp $
 #
 
-DISTNAME=	iv-3.1
+DISTNAME=	3.1
+PKGNAME=	iv-3.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://interviews.stanford.edu/pub/
-DISTFILES=	3.1.tar.Z
+EXTRACT_SUFX=	.tar.Z
+
+MAINTAINER=	tanimura@naklab.dnj.ynu.ac.jp
 
 USE_XLIB=	yes
-BROKEN_ELF=	yes
 
 DIST_SUBDIR=	iv
 WRKSRC=		${WRKDIR}/iv
@@ -55,10 +57,22 @@ MANN=		Adjuster.n Banner.n BasicDialog.n Border.n Box2_6.n \
 		statevars.n stateviews.n struct.n transfns.n \
 		transforms.n uctrls.n viewcmds.n
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+IV_LIB_VER=     3
+.else
+IV_LIB_VER=     3.1
+.endif
+
 post-install:
 # need these in ${PREFIX}/lib so that ldconfig can find them
-	ln -fs ../interviews/lib/FREEBSD/libIV.so.3.1 ${PREFIX}/lib
-	ln -fs ../interviews/lib/FREEBSD/libUnidraw.so.3.1 ${PREFIX}/lib
-	${LDCONFIG} -m ${PREFIX}/lib
+	${LN} -fs ../interviews/lib/FREEBSD/libIV.so.${IV_LIB_VER} ${PREFIX}/lib
+	${LN} -fs ../interviews/lib/FREEBSD/libUnidraw.so.${IV_LIB_VER} ${PREFIX}/lib
+.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
+.endif
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/iv/files/patch-aa b/x11-toolkits/iv/files/patch-aa
index ae834f128cf4..853c75c5b62a 100644
--- a/x11-toolkits/iv/files/patch-aa
+++ b/x11-toolkits/iv/files/patch-aa
@@ -1,289 +1,15 @@
-*** src/bin/iclass/dialogs.c	Wed Sep 23 09:45:09 1992
---- /usr/oports/x11/iv/src/bin/iclass/dialogs.c	Tue Apr 26 17:01:39 1994
-***************
-*** 45,51 ****
-  #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5)
-  /* sigh, not all systems have this prototype */
-  extern "C" {
-!     char* getcwd(char*, int);
-  }
-  #endif
-  
---- 45,51 ----
-  #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5)
-  /* sigh, not all systems have this prototype */
-  extern "C" {
-!     char* getcwd(char*, unsigned int);
-  }
-  #endif
-  
-*** src/bin/scripts/Imakefile	Thu Sep 12 15:01:39 1991
---- /usr/oports/x11/iv/src/bin/scripts/Imakefile	Tue Apr 26 17:01:52 1994
-***************
-*** 11,16 ****
---- 11,17 ----
-  
-  AllTarget($(PROGRAMS))
-  
-+ CPP = /usr/bin/cpp
-  CppScriptTarget(cpu,cpu.cpp,-DCPU='"'"$(ARCH)"'"',always)
-  CppScriptTarget(ibmkmf,ibmkmf.cpp,-DCONFIGDIRSPEC='$(CONFIGDIRSPEC)',always)
-  CppScriptTarget(ivmkmf,ivmkmf.cpp,-DCONFIGDIRSPEC='$(CONFIGDIRSPEC)',always)
-*** src/bin/scripts/remind.cpp	Wed Jun  3 21:37:00 1992
---- /usr/oports/x11/iv/src/bin/scripts/remind.cpp	Tue Apr 26 17:01:53 1994
-***************
-*** 34,40 ****
-  ' > $tmp
-  
-  cat $MacrosFile $RemindersFile \
-!     | /lib/cpp \
-      | egrep -f $tmp \
-      | awk '
-  	/[0-9][0-9]?:[0-9][0-9]?/ {
---- 34,40 ----
-  ' > $tmp
-  
-  cat $MacrosFile $RemindersFile \
-!     | /usr/bin/cpp \
-      | egrep -f $tmp \
-      | awk '
-  	/[0-9][0-9]?:[0-9][0-9]?/ {
-*** src/config/InterViews/TIFF.def	Fri Dec 11 15:33:54 1992
---- /usr/oports/x11/iv/src/config/InterViews/TIFF.def	Tue Apr 26 17:01:54 1994
-***************
-*** 90,95 ****
---- 90,100 ----
-   *
-   */
-  #ifndef TIFFStdCDefines
-+ #if defined(FreeBSDArchitecture)
-+ #define TIFFStdCDefines \
-+     -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT -DMMAP_SUPPORT \
-+     -DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
-+ #endif
-  #if defined(SGIArchitecture)
-  #define TIFFStdCDefines \
-      -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
-*** src/config/InterViews/arch.def	Fri Dec 11 15:34:52 1992
---- /usr/oports/x11/iv/src/config/InterViews/arch.def	Tue Apr 26 17:01:55 1994
-***************
-*** 385,390 ****
---- 385,400 ----
-  #define MacroFile InterViews/iv-convex.cf
-  #endif /* __convex__ */
-  
-+ #ifdef __FreeBSD__
-+ #undef freebsd
-+ #undef FREEBSD
-+ #define FreeBSDArchitecture
-+ #define ArchitectureName FREEBSD
-+ #define architectureName freebsd
-+ #define MacroIncludeFile <InterViews/iv-freebsd.cf>
-+ #define MacroFile InterViews/iv-freebsd.cf
-+ #endif
-+ 
-  #ifndef ArchitectureName
-  XCOMM WARNING: Imakefile not configured; guessing at definitions!!!
-  XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
-*** src/config/InterViews/local.def	Tue Nov 24 12:08:51 1992
---- /usr/oports/x11/iv/src/config/InterViews/local.def	Thu Jun 16 18:34:11 1994
-***************
-*** 8,14 ****
-  /*
-   * If you are using gcc/g++, then uncomment the include below.
-   */
-! /* #include <InterViews/gcc.def> */
-  
-  /*
-   * Default customization of kits.
---- 8,19 ----
-  /*
-   * If you are using gcc/g++, then uncomment the include below.
-   */
-! #include <InterViews/gcc.def>
-! 
-! #if defined(FreeBSDArchitecture)
-! #undef HasSunOSSharedLibs
-! #define HasSunOSSharedLibs YES
-! #endif
-  
-  /*
-   * Default customization of kits.
-***************
-*** 33,38 ****
---- 38,48 ----
-  #define BuildRPCClasses YES
-  #endif
-  
-+ #if defined (FreeBSDArchitecture)
-+ #undef BuildRPCClasses
-+ #define BuildRPCClasses NO
-+ #endif
-+ 
-  /*
-   * Delete this definition if your /tmp space is less than five megabytes.
-   */
-***************
-*** 49,55 ****
-   * installed data files.
-   */
-  #undef InstalledRoot
-! #define InstalledRoot /interviews
-  
-  /*
-   * If the X11 config files are not in /usr/lib/X11/config, the X11
---- 59,65 ----
-   * installed data files.
-   */
-  #undef InstalledRoot
-! #define InstalledRoot /usr/local/interviews
-  
-  /*
-   * If the X11 config files are not in /usr/lib/X11/config, the X11
-***************
-*** 60,70 ****
-   * If you have to set XConfigDir, don't forget to override XCONFIGDIR
-   * on the command line when saying "make World" for the first time.
-   */
-! /*
-  #undef XConfigDir
-! #define XConfigDir /usr/X11R5/lib/X11/config
-  #undef XIncDir
-! #define XIncDir /usr/X11R5/include
-  #undef XLibDir
-! #define XLibDir /usr/X11R5/lib
-! */
---- 70,80 ----
-   * If you have to set XConfigDir, don't forget to override XCONFIGDIR
-   * on the command line when saying "make World" for the first time.
-   */
-! 
-  #undef XConfigDir
-! #define XConfigDir /usr/X11R6/lib/X11/config
-  #undef XIncDir
-! #define XIncDir /usr/X11R6/include
-  #undef XLibDir
-! #define XLibDir /usr/X11R6/lib
-! 
-*** src/config/InterViews/rules.def	Thu Sep 24 15:06:33 1992
---- /usr/oports/x11/iv/src/config/InterViews/rules.def	Thu Jun 16 18:34:12 1994
-***************
-*** 399,404 ****
---- 399,421 ----
-  /*
-   * 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) $@~							@@\
-+ 	$(LD) -o $@~ -Bshareable ldobjs					@@\
-+ 	$(RM) $@							@@\
-+ 	$(MV) $@~ $@							@@\
-+ 									@@\
-+ clean::									@@\
-+ 	$(RM) Concat(lib,libname.so.rev)
-+ #else
-  #ifndef NormalSunOSSharedLibraryTarget
-  #if OSMajorVersion < 5
-  #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs)	@@\
-***************
-*** 434,439 ****
---- 451,457 ----
-  									@@\
-  clean::									@@\
-  	$(RM) Concat(lib,libname.so.rev)
-+ #endif
-  #endif
-  #endif
-  
-*** src/lib/IV-X11/xwindow.c	Mon Nov 23 12:26:43 1992
---- /usr/oports/x11/iv/src/lib/IV-X11/xwindow.c	Tue Apr 26 17:03:44 1994
-***************
-*** 64,70 ****
-  
-  /* no standard place for this */
-  extern "C" {
-!     extern int ioctl(int, int, ...);
-  }
-  
-  implementPtrList(WindowVisualList,WindowVisual)
---- 64,70 ----
-  
-  /* no standard place for this */
-  extern "C" {
-!     extern int ioctl(int, long unsigned int, ...);
-  }
-  
-  implementPtrList(WindowVisualList,WindowVisual)
-*** src/lib/OS/string.c	Mon Jul 13 10:54:03 1992
---- /usr/oports/x11/iv/src/lib/OS/string.c	Thu Jun 16 18:37:30 1994
-***************
-*** 31,41 ****
---- 31,43 ----
-   */
-  
-  extern "C" {
-+ #ifndef __FreeBSD__
-  #ifndef tolower
-      extern int tolower(int);
-  #endif
-  #ifndef toupper
-      extern int toupper(int);
-+ #endif
-  #endif
-      extern long int strtol(const char*, char**, int);
-      extern double strtod(const char*, char**);
-*** src/lib/TIFF/mkg3states.c	Fri Mar  6 11:11:03 1992
---- /usr/oports/x11/iv/src/lib/TIFF/mkg3states.c	Tue Apr 26 17:03:59 1994
-***************
-*** 68,73 ****
---- 68,74 ----
-   * END (from the original source)
-   */
-  #include <stdio.h>
-+ #define va_dcl /**/
-  #include "prototypes.h"
-  
-  #ifndef TRUE
-*** src/lib/TIFF/prototypes.h	Tue Feb 18 18:20:12 1992
---- /usr/oports/x11/iv/src/lib/TIFF/prototypes.h	Tue Apr 26 17:03:59 1994
-***************
-*** 25,30 ****
---- 25,31 ----
-   */
-  
-  #if USE_PROTOTYPES
-+ va_dcl
-  #define	DECLARE1(f,t1,a1)		f(t1 a1)
-  #define	DECLARE2(f,t1,a1,t2,a2)		f(t1 a1, t2 a2)
-  #define	DECLARE3(f,t1,a1,t2,a2,t3,a3)	f(t1 a1, t2 a2, t3 a3)
-*** src/bin/ibuild/ibcmds.c.old	Fri Dec 11 20:33:25 1992
---- src/bin/ibuild/ibcmds.c	Wed Nov 13 06:38:33 1996
-***************
-*** 2407,2415 ****
-  	EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
-          EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
-  
-! 	Iterator i;
-! 	for (unidraw->First(i); !unidraw->Done(i); unidraw->Next(i)) {
-! 	    IBEditor* iEd = (IBEditor*) unidraw->GetEditor(i);
-  	    ToolPanel* itoolpanel = iEd->GetToolPanel();
-  
-              for (int i = 0; i < installed->Count(); i++) {
---- 2407,2415 ----
-  	EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
-          EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
-  
-! 	Iterator ii;
-! 	for (unidraw->First(ii); !unidraw->Done(ii); unidraw->Next(ii)) {
-! 	    IBEditor* iEd = (IBEditor*) unidraw->GetEditor(ii);
-  	    ToolPanel* itoolpanel = iEd->GetToolPanel();
-  
-              for (int i = 0; i < installed->Count(); i++) {
+--- src/bin/ibuild/ibcmds.c.orig	Sat Dec 12 13:33:25 1992
++++ src/bin/ibuild/ibcmds.c	Sun Jan 17 17:48:19 1999
+@@ -2407,9 +2407,9 @@
+ 	EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
+         EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
+ 
+-	Iterator i;
+-	for (unidraw->First(i); !unidraw->Done(i); unidraw->Next(i)) {
+-	    IBEditor* iEd = (IBEditor*) unidraw->GetEditor(i);
++	Iterator ii;
++	for (unidraw->First(ii); !unidraw->Done(ii); unidraw->Next(ii)) {
++	    IBEditor* iEd = (IBEditor*) unidraw->GetEditor(ii);
+ 	    ToolPanel* itoolpanel = iEd->GetToolPanel();
+ 
+             for (int i = 0; i < installed->Count(); i++) {
diff --git a/x11-toolkits/iv/files/patch-ab b/x11-toolkits/iv/files/patch-ab
index 64d9ce8ea2a8..08f3f2d6e246 100644
--- a/x11-toolkits/iv/files/patch-ab
+++ b/x11-toolkits/iv/files/patch-ab
@@ -1,26 +1,11 @@
-*** makefile.old	Sat Sep 24 06:49:19 1994
---- makefile	Sat Sep 24 05:47:49 1994
-***************
-*** 0 ****
---- 1,21 ----
-+ CPU=FREEBSD
-+ 
-+ all: src/Makefile
-+ 	@$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)'
-+ 
-+ # simple but brutal. Will not install to multiple destinations simultaneously.
-+ install: Makefile
-+ 	@rm -rf installed ${DESTDIR}/usr/local/interviews
-+ 	@mkdir -p ${DESTDIR}/usr/local/interviews
-+ 	@ln -s ${DESTDIR}/usr/local/interviews installed
-+ 	@$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)' $@
-+ 
-+ src/Makefile: Makefile
-+ 	@$(MAKE) Makefiles
-+ 
-+ Makefile:
-+ 	imake -T "InterViews/template" -I./src/config \
-+ 		-I/usr/X386/lib/X11/config -DTOPDIR=. -DCURDIR=.
-+ 
-+ .DEFAULT: src/Makefile
-+ 	@$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)' $@
+--- src/bin/iclass/dialogs.c.orig	Thu Sep 24 01:45:09 1992
++++ src/bin/iclass/dialogs.c	Sun Jan 17 17:48:18 1999
+@@ -45,7 +45,7 @@
+ #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5)
+ /* 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-ac b/x11-toolkits/iv/files/patch-ac
index e3e6ef75aca2..6a663f5977f4 100644
--- a/x11-toolkits/iv/files/patch-ac
+++ b/x11-toolkits/iv/files/patch-ac
@@ -1,15 +1,34 @@
-*** src/config/InterViews/iv-freebsd.cf	Mon Oct 31 17:31:42 1994
---- src/config/InterViews/iv-freebsd.cf	Mon Oct 31 17:36:04 1994
-***************
-*** 0 ****
---- 1,10 ----
-+ #include <InterViews/xparams.cf>
-+ #undef CppCmd
-+ #define CppCmd cpp
-+ #undef CCDriver
-+ #define CCDriver c++
-+ #undef DependCCFlags
-+ #define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
-+ #undef ExtraCCLdLibs
-+ #define ExtraCCLdLibs -lg++
-+ #define SharedCCFlags -fpic
+--- src/bin/idraw/idcmds.c.orig	Sat May 23 03:07:32 1992
++++ src/bin/idraw/idcmds.c	Sun Jan 17 17:48:19 1999
+@@ -26,7 +26,6 @@
+ 
+ #include "ided.h"
+ #include "idclasses.h"
+-#include "idcmds.h"
+ #include "idcomp.h"
+ #include "iddialogs.h"
+ #include "idvars.h"
+@@ -46,11 +45,9 @@
+ #include <Unidraw/Commands/edit.h>
+ #include <Unidraw/Commands/transforms.h>
+ 
+-#undef FileChooser
+-#define FileChooser _lib_iv(FileChooser)
+-
+ #include <stream.h>
+ 
++#include "idcmds.h"
+ /*****************************************************************************/
+ 
+ ClassId OpenCmd::GetClassId () { return OPEN_CMD; }
+@@ -59,8 +56,8 @@
+     return OPEN_CMD == id || ViewCompCmd::IsA(id);
+ }
+ 
+-OpenCmd::OpenCmd (ControlInfo* c, FileChooser* fc) : ViewCompCmd(c, fc) { }
+-OpenCmd::OpenCmd (Editor* ed, FileChooser* fc) : ViewCompCmd(ed, fc) { }
++OpenCmd::OpenCmd (ControlInfo* c, FileChooser* fc) : ViewCompCmd(c, fc) { };
++OpenCmd::OpenCmd (Editor* ed, FileChooser* fc) : ViewCompCmd(ed, fc) { };
+ 
+ Command* OpenCmd::Copy () {
+     Command* copy = new OpenCmd(CopyControlInfo());
diff --git a/x11-toolkits/iv/files/patch-ad b/x11-toolkits/iv/files/patch-ad
index a619dc79d735..5044cfa33fd6 100644
--- a/x11-toolkits/iv/files/patch-ad
+++ b/x11-toolkits/iv/files/patch-ad
@@ -1,1176 +1,10 @@
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/makefile ./makefile
-*** work-orig/iv/makefile	Wed May 31 08:52:13 1995
---- ./makefile	Sun May 28 12:45:18 1995
-***************
-*** 15,21 ****
-  
-  Makefile:
-  	imake -T "InterViews/template" -I./src/config \
-! 		-I/usr/X386/lib/X11/config -DTOPDIR=. -DCURDIR=.
-  
-  .DEFAULT: src/Makefile
-  	@$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)' $@
---- 15,21 ----
-  
-  Makefile:
-  	imake -T "InterViews/template" -I./src/config \
-! 		-I/usr/X11R6/lib/X11/config -DTOPDIR=. -DCURDIR=.
-  
-  .DEFAULT: src/Makefile
-  	@$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)' $@
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/bin/idraw/idcmds.c ./src/bin/idraw/idcmds.c
-*** work-orig/iv/src/bin/idraw/idcmds.c	Sat May 23 03:37:32 1992
---- ./src/bin/idraw/idcmds.c	Mon May 29 20:18:43 1995
-***************
-*** 26,32 ****
-  
-  #include "ided.h"
-  #include "idclasses.h"
-- #include "idcmds.h"
-  #include "idcomp.h"
-  #include "iddialogs.h"
-  #include "idvars.h"
---- 26,31 ----
-***************
-*** 46,56 ****
-  #include <Unidraw/Commands/edit.h>
-  #include <Unidraw/Commands/transforms.h>
-  
-- #undef FileChooser
-- #define FileChooser _lib_iv(FileChooser)
-- 
-  #include <stream.h>
-  
-  /*****************************************************************************/
-  
-  ClassId OpenCmd::GetClassId () { return OPEN_CMD; }
---- 45,53 ----
-  #include <Unidraw/Commands/edit.h>
-  #include <Unidraw/Commands/transforms.h>
-  
-  #include <stream.h>
-  
-+ #include "idcmds.h"
-  /*****************************************************************************/
-  
-  ClassId OpenCmd::GetClassId () { return OPEN_CMD; }
-***************
-*** 59,66 ****
-      return OPEN_CMD == id || ViewCompCmd::IsA(id);
-  }
-  
-! OpenCmd::OpenCmd (ControlInfo* c, FileChooser* fc) : ViewCompCmd(c, fc) { }
-! OpenCmd::OpenCmd (Editor* ed, FileChooser* fc) : ViewCompCmd(ed, fc) { }
-  
-  Command* OpenCmd::Copy () {
-      Command* copy = new OpenCmd(CopyControlInfo());
---- 56,63 ----
-      return OPEN_CMD == id || ViewCompCmd::IsA(id);
-  }
-  
-! OpenCmd::OpenCmd (ControlInfo* c, FileChooser* fc) : ViewCompCmd(c, fc) { };
-! OpenCmd::OpenCmd (Editor* ed, FileChooser* fc) : ViewCompCmd(ed, fc) { };
-  
-  Command* OpenCmd::Copy () {
-      Command* copy = new OpenCmd(CopyControlInfo());
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/config/InterViews/iv-freebsd.cf ./src/config/InterViews/iv-freebsd.cf
-*** work-orig/iv/src/config/InterViews/iv-freebsd.cf	Wed May 31 08:52:13 1995
---- ./src/config/InterViews/iv-freebsd.cf	Mon May 29 21:55:00 1995
-***************
-*** 2,8 ****
-  #undef CppCmd
-  #define CppCmd cpp
-  #undef CCDriver
-! #define CCDriver c++
-  #undef DependCCFlags
-  #define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
-  #undef ExtraCCLdLibs
---- 2,8 ----
-  #undef CppCmd
-  #define CppCmd cpp
-  #undef CCDriver
-! #define CCDriver /usr/bin/c++
-  #undef DependCCFlags
-  #define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
-  #undef ExtraCCLdLibs
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/config/InterViews/local.def ./src/config/InterViews/local.def
-*** work-orig/iv/src/config/InterViews/local.def	Wed May 31 08:52:10 1995
---- ./src/config/InterViews/local.def	Mon May 29 23:56:31 1995
-***************
-*** 10,18 ****
-   */
-  #include <InterViews/gcc.def>
-  
-! #if defined(FreeBSDArchitecture)
-  #undef HasSunOSSharedLibs
-  #define HasSunOSSharedLibs YES
-  #endif
-  
-  /*
---- 10,20 ----
-   */
-  #include <InterViews/gcc.def>
-  
-! #if defined (FreeBSDArchitecture)
-  #undef HasSunOSSharedLibs
-  #define HasSunOSSharedLibs YES
-+ #undef HasSunOSSharedLibraries
-+ #define HasSunOSSharedLibraries YES
-  #endif
-  
-  /*
-***************
-*** 47,53 ****
-   * Delete this definition if your /tmp space is less than five megabytes.
-   */
-  #undef HasLargeTmp
-- #define HasLargeTmp YES
-  
-  /*
-   * If you do not want to create a symbolic link called "/interviews"
---- 49,54 ----
-***************
-*** 77,80 ****
---- 78,84 ----
-  #define XIncDir /usr/X11R6/include
-  #undef XLibDir
-  #define XLibDir /usr/X11R6/lib
-+ 
-+ #undef SharedCCFlags
-+ #define SharedCCFlags -fpic
-  
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/IV-X11/xwindow.h ./src/include/IV-X11/xwindow.h
-*** work-orig/iv/src/include/IV-X11/xwindow.h	Fri Sep 25 07:46:22 1992
---- ./src/include/IV-X11/xwindow.h	Sun May 28 12:49:16 1995
-***************
-*** 46,53 ****
-  class Style;
-  class WindowCursorStack;
-  class WindowTable;
-  class XDisplay;
-! 
-  struct WindowOverlayInfo {
-      VisualID id_;
-      long type_;
---- 46,58 ----
-  class Style;
-  class WindowCursorStack;
-  class WindowTable;
-+ /*
-+  * modified by jj@ldjpc.apana.org.au
-+  *
-+  * this seems to break the compile...
-  class XDisplay;
-!  *
-!  */
-  struct WindowOverlayInfo {
-      VisualID id_;
-      long type_;
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/InterViews/_defines.h ./src/include/InterViews/_defines.h
-*** work-orig/iv/src/include/InterViews/_defines.h	Wed May 13 06:29:09 1992
---- ./src/include/InterViews/_defines.h	Mon May 29 18:24:27 1995
-***************
-*** 1,14 ****
-! #define Alignment _lib_iv(Alignment)
-! #define ColorIntensity _lib_iv(ColorIntensity)
-! #define ColorOp _lib_iv(ColorOp)
-! #define Coord _lib_iv(Coord)
-! #define EventType _lib_iv(EventType)
-! #define EventButton _lib_iv(EventButton)
-! #define GlyphBreakType _lib_iv(GlyphBreakType)
-! #define GlyphIndex _lib_iv(GlyphIndex)
-! #define IntCoord _lib_iv(IntCoord)
-! #define PixelCoord _lib_iv(PixelCoord)
-! #define Selection _lib_iv(Selection)
-  #define Action _lib_iv(Action)
-  #define ActiveHandler _lib_iv(ActiveHandler)
-  #define Adjustable _lib_iv(Adjustable)
---- 1,4 ----
-! #define AcknowledgeDialog _lib_iv(AcknowledgeDialog)
-  #define Action _lib_iv(Action)
-  #define ActiveHandler _lib_iv(ActiveHandler)
-  #define Adjustable _lib_iv(Adjustable)
-***************
-*** 16,21 ****
---- 6,14 ----
-  #define Aggregate _lib_iv(Aggregate)
-  #define AggregateInfo_List _lib_iv(AggregateInfo_List)
-  #define Align _lib_iv(Align)
-+ #define AlignCmd _lib_iv(AlignCmd)
-+ #define AlignToGridCmd _lib_iv(AlignToGridCmd)
-+ #define Alignment _lib_iv(Alignment)
-  #define Allocation _lib_iv(Allocation)
-  #define AllocationInfo _lib_iv(AllocationInfo)
-  #define AllocationTable _lib_iv(AllocationTable)
-***************
-*** 24,31 ****
---- 17,26 ----
-  #define ApplicationWindow _lib_iv(ApplicationWindow)
-  #define ArrayCompositor _lib_iv(ArrayCompositor)
-  #define ArrowSubclassName _lib_iv(ArrowSubclassName)
-+ #define BackCmd _lib_iv(BackCmd)
-  #define Background _lib_iv(Background)
-  #define Banner _lib_iv(Banner)
-+ #define BasicDialog _lib_iv(BasicDialog)
-  #define Bevel _lib_iv(Bevel)
-  #define BevelFrame _lib_iv(BevelFrame)
-  #define Bitmap _lib_iv(Bitmap)
-***************
-*** 36,89 ****
---- 31,158 ----
-  #define BoxCanonical _lib_iv(BoxCanonical)
-  #define BoxElement _lib_iv(BoxElement)
-  #define BoxImpl _lib_iv(BoxImpl)
-+ #define BoxObj _lib_iv(BoxObj)
-  #define Break _lib_iv(Break)
-  #define Break_List _lib_iv(Break_List)
-  #define Browser _lib_iv(Browser)
-  #define BrowserList _lib_iv(BrowserList)
-  #define Brush _lib_iv(Brush)
-+ #define BrushCmd _lib_iv(BrushCmd)
-  #define BrushImpl _lib_iv(BrushImpl)
-  #define BrushRep _lib_iv(BrushRep)
-+ #define BrushVar _lib_iv(BrushVar)
-+ #define BrushVarView _lib_iv(BrushVarView)
-  #define Button _lib_iv(Button)
-  #define ButtonList _lib_iv(ButtonList)
-  #define ButtonState _lib_iv(ButtonState)
-+ #define CCnxn _lib_iv(CCnxn)
-+ #define CCnxn_HashTable _lib_iv(CCnxn_HashTable)
-+ #define CGlue _lib_iv(CGlue)
-+ #define CNet _lib_iv(CNet)
-+ #define CSolver _lib_iv(CSolver)
-+ #define CSolverInfo _lib_iv(CSolverInfo)
-+ #define CSolverState _lib_iv(CSolverState)
-  #define Canvas _lib_iv(Canvas)
-  #define CanvasDamage _lib_iv(CanvasDamage)
-  #define CanvasRep _lib_iv(CanvasRep)
-  #define Card _lib_iv(Card)
-+ #define Catalog _lib_iv(Catalog)
-+ #define CatalogChooser _lib_iv(CatalogChooser)
-+ #define CenterCmd _lib_iv(CenterCmd)
-  #define CenterLayout _lib_iv(CenterLayout)
-  #define Character _lib_iv(Character)
-  #define CheckBox _lib_iv(CheckBox)
-  #define ChoiceItem _lib_iv(ChoiceItem)
-+ #define ClassId _lib_iv(ClassId)
-+ #define Clipboard _lib_iv(Clipboard)
-  #define ClippingStack _lib_iv(ClippingStack)
-+ #define CloseEditorCmd _lib_iv(CloseEditorCmd)
-+ #define ClosedBSpline _lib_iv(ClosedBSpline)
-+ #define ClosedSplineComp _lib_iv(ClosedSplineComp)
-+ #define ClosedSplineView _lib_iv(ClosedSplineView)
-  #define Color _lib_iv(Color)
-+ #define ColorCmd _lib_iv(ColorCmd)
-+ #define ColorData _lib_iv(ColorData)
-  #define ColorImpl _lib_iv(ColorImpl)
-+ #define ColorIntensity _lib_iv(ColorIntensity)
-+ #define ColorOp _lib_iv(ColorOp)
-  #define ColorRep _lib_iv(ColorRep)
-  #define ColorTable _lib_iv(ColorTable)
-+ #define ColorVar _lib_iv(ColorVar)
-+ #define Command _lib_iv(Command)
-+ #define CommandControl _lib_iv(CommandControl)
-+ #define CommandInteractor _lib_iv(CommandInteractor)
-+ #define CompNameVar _lib_iv(CompNameVar)
-+ #define CompNameVarView _lib_iv(CompNameVarView)
-  #define CompletionEditor _lib_iv(CompletionEditor)
-+ #define Component _lib_iv(Component)
-+ #define ComponentView _lib_iv(ComponentView)
-  #define Composition _lib_iv(Composition)
-  #define CompositionComponent_List _lib_iv(CompositionComponent_List)
-  #define Compositor _lib_iv(Compositor)
-+ #define ConfirmDialog _lib_iv(ConfirmDialog)
-+ #define ConnInfo _lib_iv(ConnInfo)
-+ #define ConnectCmd _lib_iv(ConnectCmd)
-+ #define ConnectManip _lib_iv(ConnectManip)
-+ #define ConnectTool _lib_iv(ConnectTool)
-+ #define Connector _lib_iv(Connector)
-+ #define ConnectorView _lib_iv(ConnectorView)
-  #define Control _lib_iv(Control)
-+ #define ControlInfo _lib_iv(ControlInfo)
-  #define ControlState _lib_iv(ControlState)
-+ #define Coord _lib_iv(Coord)
-+ #define CoordinateSpace _lib_iv(CoordinateSpace)
-+ #define CopyCmd _lib_iv(CopyCmd)
-+ #define Creator _lib_iv(Creator)
-  #define Cursor _lib_iv(Cursor)
-  #define CursorRep _lib_iv(CursorRep)
-  #define CursorRepBitmap _lib_iv(CursorRepBitmap)
-  #define CursorRepData _lib_iv(CursorRepData)
-  #define CursorRepFont _lib_iv(CursorRepFont)
-  #define CursorRepXFont _lib_iv(CursorRepXFont)
-+ #define CutCmd _lib_iv(CutCmd)
-+ #define Damage _lib_iv(Damage)
-  #define DamageList _lib_iv(DamageList)
-+ #define Data _lib_iv(Data)
-+ #define DataCache _lib_iv(DataCache)
-  #define DebugGlyph _lib_iv(DebugGlyph)
-  #define Deck _lib_iv(Deck)
-+ #define DeleteCmd _lib_iv(DeleteCmd)
-  #define Dialog _lib_iv(Dialog)
-  #define DialogKit _lib_iv(DialogKit)
-+ #define DialogKitImpl _lib_iv(DialogKitImpl)
-  #define Display _lib_iv(Display)
-  #define DisplayRep _lib_iv(DisplayRep)
-  #define DownMover _lib_iv(DownMover)
-+ #define Drag _lib_iv(Drag)
-+ #define DragManip _lib_iv(DragManip)
-+ #define DragRep _lib_iv(DragRep)
-+ #define DragZone _lib_iv(DragZone)
-+ #define DragZoneRep _lib_iv(DragZoneRep)
-+ #define DragZoneSink _lib_iv(DragZoneSink)
-+ #define DragZoneSinkHandler _lib_iv(DragZoneSinkHandler)
-+ #define DupCmd _lib_iv(DupCmd)
-+ #define Editor _lib_iv(Editor)
-+ #define EditorImpl _lib_iv(EditorImpl)
-+ #define EditorInfo _lib_iv(EditorInfo)
-+ #define Ellipse _lib_iv(Ellipse)
-+ #define EllipseComp _lib_iv(EllipseComp)
-+ #define EllipseView _lib_iv(EllipseView)
-  #define Enlarger _lib_iv(Enlarger)
-  #define Event _lib_iv(Event)
-+ #define EventButton _lib_iv(EventButton)
-  #define EventRep _lib_iv(EventRep)
-+ #define EventType _lib_iv(EventType)
-  #define Extension _lib_iv(Extension)
-+ #define Extent _lib_iv(Extent)
-+ #define ExternView _lib_iv(ExternView)
-  #define FBDirectory _lib_iv(FBDirectory)
-+ #define F_Circle _lib_iv(F_Circle)
-+ #define F_ClosedBSpline _lib_iv(F_ClosedBSpline)
-+ #define F_Ellipse _lib_iv(F_Ellipse)
-+ #define F_OpenBSpline _lib_iv(F_OpenBSpline)
-+ #define F_Polygon _lib_iv(F_Polygon)
-+ #define F_Rect _lib_iv(F_Rect)
-  #define FieldEditor _lib_iv(FieldEditor)
-  #define FieldEditorAction _lib_iv(FieldEditorAction)
-  #define FieldEditorImpl _lib_iv(FieldEditorImpl)
-***************
-*** 92,113 ****
---- 161,210 ----
-  #define FileChooser _lib_iv(FileChooser)
-  #define FileChooserAction _lib_iv(FileChooserAction)
-  #define FileChooserImpl _lib_iv(FileChooserImpl)
-+ #define FileNameVarView _lib_iv(FileNameVarView)
-+ #define FillPolygonObj _lib_iv(FillPolygonObj)
-  #define FixedLayout _lib_iv(FixedLayout)
-+ #define FixedPin _lib_iv(FixedPin)
-  #define Font _lib_iv(Font)
-  #define FontBoundingBox _lib_iv(FontBoundingBox)
-+ #define FontCmd _lib_iv(FontCmd)
-  #define FontFamily _lib_iv(FontFamily)
-  #define FontFamilyImpl _lib_iv(FontFamilyImpl)
-  #define FontFamilyRep _lib_iv(FontFamilyRep)
-  #define FontImpl _lib_iv(FontImpl)
-  #define FontRep _lib_iv(FontRep)
-+ #define FontVar _lib_iv(FontVar)
-+ #define FontVarView _lib_iv(FontVarView)
-  #define Frame _lib_iv(Frame)
-+ #define FrontCmd _lib_iv(FrontCmd)
-+ #define FullGraphic _lib_iv(FullGraphic)
-  #define GLContext _lib_iv(GLContext)
-  #define GLContextImpl _lib_iv(GLContextImpl)
-  #define GLWindow _lib_iv(GLWindow)
-+ #define GSData _lib_iv(GSData)
-+ #define GVU_HashTable _lib_iv(GVU_HashTable)
-+ #define GVUpdater _lib_iv(GVUpdater)
-  #define Glue _lib_iv(Glue)
-  #define Glyph _lib_iv(Glyph)
-+ #define GlyphBreakType _lib_iv(GlyphBreakType)
-+ #define GlyphIndex _lib_iv(GlyphIndex)
-  #define GrabList _lib_iv(GrabList)
-+ #define Graphic _lib_iv(Graphic)
-+ #define GraphicBlock _lib_iv(GraphicBlock)
-+ #define GraphicComp _lib_iv(GraphicComp)
-+ #define GraphicCompTool _lib_iv(GraphicCompTool)
-+ #define GraphicComps _lib_iv(GraphicComps)
-+ #define GraphicView _lib_iv(GraphicView)
-+ #define GraphicViews _lib_iv(GraphicViews)
-+ #define GravityCmd _lib_iv(GravityCmd)
-+ #define GravityVar _lib_iv(GravityVar)
-+ #define GravityVarView _lib_iv(GravityVarView)
-+ #define Grid _lib_iv(Grid)
-+ #define GridCmd _lib_iv(GridCmd)
-+ #define GridDialog _lib_iv(GridDialog)
-+ #define GridSpacingCmd _lib_iv(GridSpacingCmd)
-  #define Group _lib_iv(Group)
-+ #define GroupCmd _lib_iv(GroupCmd)
-  #define GrowingBSpline _lib_iv(GrowingBSpline)
-  #define GrowingClosedBSpline _lib_iv(GrowingClosedBSpline)
-  #define GrowingMultiLine _lib_iv(GrowingMultiLine)
-***************
-*** 116,134 ****
---- 213,240 ----
-  #define HBorder _lib_iv(HBorder)
-  #define HBox _lib_iv(HBox)
-  #define HGlue _lib_iv(HGlue)
-+ #define HPanelControl _lib_iv(HPanelControl)
-  #define HRule _lib_iv(HRule)
-  #define HScrollBar _lib_iv(HScrollBar)
-  #define HScroller _lib_iv(HScroller)
-+ #define HSlotComp _lib_iv(HSlotComp)
-+ #define HSlotView _lib_iv(HSlotView)
-  #define Handler _lib_iv(Handler)
-+ #define HistoryMap _lib_iv(HistoryMap)
-  #define Hit _lib_iv(Hit)
-  #define HitImpl _lib_iv(HitImpl)
-  #define IconWindow _lib_iv(IconWindow)
-  #define Image _lib_iv(Image)
-+ #define ImportCmd _lib_iv(ImportCmd)
-+ #define InorderView _lib_iv(InorderView)
-  #define InputHandler _lib_iv(InputHandler)
-  #define InputHandlerImpl _lib_iv(InputHandlerImpl)
-+ #define IntCoord _lib_iv(IntCoord)
-  #define Interactor _lib_iv(Interactor)
-  #define InteractorHandler _lib_iv(InteractorHandler)
-  #define InteractorWindow _lib_iv(InteractorWindow)
-+ #define Iterator _lib_iv(Iterator)
-+ #define KeyMap _lib_iv(KeyMap)
-  #define KnownFonts _lib_iv(KnownFonts)
-  #define LRComposition _lib_iv(LRComposition)
-  #define LRMarker _lib_iv(LRMarker)
-***************
-*** 136,198 ****
---- 242,404 ----
-  #define Layout _lib_iv(Layout)
-  #define LayoutKit _lib_iv(LayoutKit)
-  #define LeftMover _lib_iv(LeftMover)
-+ #define Line _lib_iv(Line)
-+ #define LineComp _lib_iv(LineComp)
-+ #define LineObj _lib_iv(LineObj)
-+ #define LineView _lib_iv(LineView)
-+ #define LinkComp _lib_iv(LinkComp)
-+ #define LinkView _lib_iv(LinkView)
-  #define MFDialogKit _lib_iv(MFDialogKit)
-  #define MFKit _lib_iv(MFKit)
-  #define MFKitImpl _lib_iv(MFKitImpl)
-  #define Macro _lib_iv(Macro)
-+ #define MacroActionList _lib_iv(MacroActionList)
-+ #define MacroCmd _lib_iv(MacroCmd)
-+ #define MagnifVar _lib_iv(MagnifVar)
-+ #define MagnifVarView _lib_iv(MagnifVarView)
-+ #define MagnifyTool _lib_iv(MagnifyTool)
-+ #define ManagedWindow _lib_iv(ManagedWindow)
-  #define ManagedWindow _lib_iv(ManagedWindow)
-  #define ManagedWindowHintInfo _lib_iv(ManagedWindowHintInfo)
-  #define ManagedWindowRep _lib_iv(ManagedWindowRep)
-+ #define ManipGroup _lib_iv(ManipGroup)
-+ #define Manipulator _lib_iv(Manipulator)
-  #define MarginFrame _lib_iv(MarginFrame)
-  #define MarginLayout _lib_iv(MarginLayout)
-  #define MatchEditor _lib_iv(MatchEditor)
-+ #define MatchEditor _lib_iv(MatchEditor)
-  #define Menu _lib_iv(Menu)
-  #define MenuBar _lib_iv(MenuBar)
-  #define MenuImpl _lib_iv(MenuImpl)
-  #define MenuItem _lib_iv(MenuItem)
-  #define Message _lib_iv(Message)
-+ #define MobilityCmd _lib_iv(MobilityCmd)
-+ #define MobilityData _lib_iv(MobilityData)
-+ #define ModifStatusVar _lib_iv(ModifStatusVar)
-+ #define ModifStatusVarView _lib_iv(ModifStatusVarView)
-  #define MonoGlyph _lib_iv(MonoGlyph)
-+ #define MonoKit _lib_iv(MonoKit)
-+ #define MonoKitImpl _lib_iv(MonoKitImpl)
-  #define MonoScene _lib_iv(MonoScene)
-+ #define MoveCmd _lib_iv(MoveCmd)
-+ #define MoveData _lib_iv(MoveData)
-+ #define MoveTool _lib_iv(MoveTool)
-  #define Mover _lib_iv(Mover)
-+ #define MultiLine _lib_iv(MultiLine)
-+ #define MultiLineComp _lib_iv(MultiLineComp)
-+ #define MultiLineObj _lib_iv(MultiLineObj)
-+ #define MultiLineView _lib_iv(MultiLineView)
-+ #define NOPCmd _lib_iv(NOPCmd)
-+ #define NameMap _lib_iv(NameMap)
-+ #define NameVar _lib_iv(NameVar)
-+ #define NameVarView _lib_iv(NameVarView)
-  #define NaturalLayout _lib_iv(NaturalLayout)
-+ #define NewCompCmd _lib_iv(NewCompCmd)
-+ #define NormSizeCmd _lib_iv(NormSizeCmd)
-+ #define OLDialogKit _lib_iv(OLDialogKit)
-+ #define OLKit _lib_iv(OLKit)
-+ #define OLKitImpl _lib_iv(OLKitImpl)
-+ #define ObjectMap _lib_iv(ObjectMap)
-+ #define ObjectMapElem _lib_iv(ObjectMapElem)
-  #define Observable _lib_iv(Observable)
-  #define Observer _lib_iv(Observer)
-  #define ObserverList _lib_iv(ObserverList)
-+ #define OpenBSpline _lib_iv(OpenBSpline)
-  #define OptionDesc _lib_iv(OptionDesc)
-+ #define Orientation _lib_iv(Orientation)
-+ #define OrientationCmd _lib_iv(OrientationCmd)
-+ #define PSBrush _lib_iv(PSBrush)
-+ #define PSClosedSpline _lib_iv(PSClosedSpline)
-+ #define PSColor _lib_iv(PSColor)
-+ #define PSEllipse _lib_iv(PSEllipse)
-  #define PSFont _lib_iv(PSFont)
-  #define PSFontImpl _lib_iv(PSFontImpl)
-+ #define PSLine _lib_iv(PSLine)
-+ #define PSLink _lib_iv(PSLink)
-+ #define PSMultiLine _lib_iv(PSMultiLine)
-+ #define PSPad _lib_iv(PSPad)
-+ #define PSPattern _lib_iv(PSPattern)
-+ #define PSPin _lib_iv(PSPin)
-+ #define PSPolygon _lib_iv(PSPolygon)
-+ #define PSRaster _lib_iv(PSRaster)
-+ #define PSRect _lib_iv(PSRect)
-+ #define PSSlot _lib_iv(PSSlot)
-+ #define PSSpline _lib_iv(PSSpline)
-+ #define PSStencil _lib_iv(PSStencil)
-+ #define PSText _lib_iv(PSText)
-+ #define PSVertices _lib_iv(PSVertices)
-+ #define PadComp _lib_iv(PadComp)
-+ #define PadGraphic _lib_iv(PadGraphic)
-+ #define PadView _lib_iv(PadView)
-  #define Page _lib_iv(Page)
-  #define PageInfo_List _lib_iv(PageInfo_List)
-  #define Painter _lib_iv(Painter)
-  #define PainterRep _lib_iv(PainterRep)
-+ #define PanelControl _lib_iv(PanelControl)
-+ #define PanelInteractor _lib_iv(PanelInteractor)
-  #define Panner _lib_iv(Panner)
-+ #define PasteCmd _lib_iv(PasteCmd)
-  #define Patch _lib_iv(Patch)
-+ #define Path _lib_iv(Path)
-  #define PathRenderInfo _lib_iv(PathRenderInfo)
-  #define Pattern _lib_iv(Pattern)
-+ #define PatternCmd _lib_iv(PatternCmd)
-  #define PatternRep _lib_iv(PatternRep)
-+ #define PatternVar _lib_iv(PatternVar)
-+ #define PatternVarView _lib_iv(PatternVarView)
-  #define Perspective _lib_iv(Perspective)
-+ #define Picture _lib_iv(Picture)
-+ #define PinComp _lib_iv(PinComp)
-+ #define PinGraphic _lib_iv(PinGraphic)
-+ #define PinView _lib_iv(PinView)
-+ #define PixelCoord _lib_iv(PixelCoord)
-  #define Placement _lib_iv(Placement)
-+ #define Point _lib_iv(Point)
-+ #define PointObj _lib_iv(PointObj)
-  #define PolyGlyph _lib_iv(PolyGlyph)
-  #define PolyGlyphImpl _lib_iv(PolyGlyphImpl)
-+ #define Polygon _lib_iv(Polygon)
-+ #define PolygonComp _lib_iv(PolygonComp)
-+ #define PolygonView _lib_iv(PolygonView)
-  #define PopupMenu _lib_iv(PopupMenu)
-  #define PopupWindow _lib_iv(PopupWindow)
-+ #define PostScriptView _lib_iv(PostScriptView)
-+ #define PostScriptViews _lib_iv(PostScriptViews)
-+ #define PostorderView _lib_iv(PostorderView)
-+ #define PreorderView _lib_iv(PreorderView)
-+ #define PrintBS _lib_iv(PrintBS)
-+ #define PrintCmd _lib_iv(PrintCmd)
-+ #define PrintDialog _lib_iv(PrintDialog)
-  #define Printer _lib_iv(Printer)
-  #define PrinterRep _lib_iv(PrinterRep)
-  #define PropertyData _lib_iv(PropertyData)
-  #define PulldownMenu _lib_iv(PulldownMenu)
-  #define PullrightMenu _lib_iv(PullrightMenu)
-  #define PushButton _lib_iv(PushButton)
-+ #define QuitCmd _lib_iv(QuitCmd)
-  #define RGBTable _lib_iv(RGBTable)
-  #define RadioButton _lib_iv(RadioButton)
-  #define Raster _lib_iv(Raster)
-+ #define RasterComp _lib_iv(RasterComp)
-+ #define RasterRect _lib_iv(RasterRect)
-  #define RasterRep _lib_iv(RasterRep)
-+ #define RasterView _lib_iv(RasterView)
-+ #define RectComp _lib_iv(RectComp)
-+ #define RectView _lib_iv(RectView)
-+ #define RedToFitCmd _lib_iv(RedToFitCmd)
-+ #define RedoCmd _lib_iv(RedoCmd)
-  #define Reducer _lib_iv(Reducer)
-  #define Regexp _lib_iv(Regexp)
-+ #define ReplaceCmd _lib_iv(ReplaceCmd)
-  #define ReqErr _lib_iv(ReqErr)
-  #define Requirement _lib_iv(Requirement)
-  #define Requisition _lib_iv(Requisition)
-+ #define ReshapeTool _lib_iv(ReshapeTool)
-  #define Resource _lib_iv(Resource)
-+ #define RevertCmd _lib_iv(RevertCmd)
-  #define RightMover _lib_iv(RightMover)
-+ #define RotateCmd _lib_iv(RotateCmd)
-+ #define RotateTool _lib_iv(RotateTool)
-  #define RotatingLine _lib_iv(RotatingLine)
-  #define RotatingLineList _lib_iv(RotatingLineList)
-  #define RotatingRect _lib_iv(RotatingRect)
-***************
-*** 211,218 ****
---- 417,444 ----
-  #define RubberVertex _lib_iv(RubberVertex)
-  #define Rubberband _lib_iv(Rubberband)
-  #define Rule _lib_iv(Rule)
-+ #define SFH_ClosedBSpline _lib_iv(SFH_ClosedBSpline)
-+ #define SFH_OpenBSpline _lib_iv(SFH_OpenBSpline)
-+ #define SF_Circle _lib_iv(SF_Circle)
-+ #define SF_ClosedBSpline _lib_iv(SF_ClosedBSpline)
-+ #define SF_Ellipse _lib_iv(SF_Ellipse)
-+ #define SF_MultiLine _lib_iv(SF_MultiLine)
-+ #define SF_OpenBSpline _lib_iv(SF_OpenBSpline)
-+ #define SF_Polygon _lib_iv(SF_Polygon)
-+ #define SF_Rect _lib_iv(SF_Rect)
-  #define SMFKit _lib_iv(SMFKit)
-  #define SMFKitImpl _lib_iv(SMFKitImpl)
-+ #define S_Circle _lib_iv(S_Circle)
-+ #define S_ClosedBSpline _lib_iv(S_ClosedBSpline)
-+ #define S_Ellipse _lib_iv(S_Ellipse)
-+ #define S_MultiLine _lib_iv(S_MultiLine)
-+ #define S_OpenBSpline _lib_iv(S_OpenBSpline)
-+ #define S_Polygon _lib_iv(S_Polygon)
-+ #define S_Rect _lib_iv(S_Rect)
-+ #define SaveCompAsCmd _lib_iv(SaveCompAsCmd)
-+ #define SaveCompCmd _lib_iv(SaveCompCmd)
-+ #define ScaleCmd _lib_iv(ScaleCmd)
-+ #define ScaleTool _lib_iv(ScaleTool)
-  #define ScalingLine _lib_iv(ScalingLine)
-  #define ScalingLineList _lib_iv(ScalingLineList)
-  #define ScalingRect _lib_iv(ScalingRect)
-***************
-*** 220,225 ****
---- 446,453 ----
-  #define ScrollBar _lib_iv(ScrollBar)
-  #define ScrollBox _lib_iv(ScrollBox)
-  #define Scroller _lib_iv(Scroller)
-+ #define SelectTool _lib_iv(SelectTool)
-+ #define Selection _lib_iv(Selection)
-  #define SelectionHandler _lib_iv(SelectionHandler)
-  #define SelectionList _lib_iv(SelectionList)
-  #define SelectionManager _lib_iv(SelectionManager)
-***************
-*** 232,247 ****
---- 460,488 ----
-  #define Shape _lib_iv(Shape)
-  #define ShowFrame _lib_iv(ShowFrame)
-  #define SimpleCompositor _lib_iv(SimpleCompositor)
-+ #define SlctAllCmd _lib_iv(SlctAllCmd)
-  #define Slider _lib_iv(Slider)
-  #define SliderImpl _lib_iv(SliderImpl)
-  #define SlidingEllipse _lib_iv(SlidingEllipse)
-  #define SlidingLine _lib_iv(SlidingLine)
-  #define SlidingLineList _lib_iv(SlidingLineList)
-+ #define SlidingPin _lib_iv(SlidingPin)
-  #define SlidingPointList _lib_iv(SlidingPointList)
-  #define SlidingRect _lib_iv(SlidingRect)
-+ #define SlotComp _lib_iv(SlotComp)
-+ #define SlotGraphic _lib_iv(SlotGraphic)
-+ #define SlotView _lib_iv(SlotView)
-+ #define SplineComp _lib_iv(SplineComp)
-+ #define SplineView _lib_iv(SplineView)
-+ #define State _lib_iv(State)
-+ #define StateVar _lib_iv(StateVar)
-+ #define StateVarView _lib_iv(StateVarView)
-  #define Stencil _lib_iv(Stencil)
-+ #define StencilComp _lib_iv(StencilComp)
-+ #define StencilView _lib_iv(StencilView)
-  #define Stepper _lib_iv(Stepper)
-  #define StepperSubclassName _lib_iv(StepperSubclassName)
-+ #define StretchTool _lib_iv(StretchTool)
-  #define StretchingRect _lib_iv(StretchingRect)
-  #define StringBrowser _lib_iv(StringBrowser)
-  #define StringChooser _lib_iv(StringChooser)
-***************
-*** 254,259 ****
---- 495,502 ----
-  #define TBComposition _lib_iv(TBComposition)
-  #define TBScrollBox _lib_iv(TBScrollBox)
-  #define TBScrollBoxImpl _lib_iv(TBScrollBoxImpl)
-+ #define TF_2Port _lib_iv(TF_2Port)
-+ #define TF_Direct _lib_iv(TF_Direct)
-  #define TGlue _lib_iv(TGlue)
-  #define TIFFRaster _lib_iv(TIFFRaster)
-  #define TSolver _lib_iv(TSolver)
-***************
-*** 263,278 ****
---- 506,529 ----
-  #define TelltaleGroup _lib_iv(TelltaleGroup)
-  #define TelltaleState _lib_iv(TelltaleState)
-  #define TextBuffer _lib_iv(TextBuffer)
-+ #define TextBuffer _lib_iv(TextBuffer)
-  #define TextButton _lib_iv(TextButton)
-+ #define TextComp _lib_iv(TextComp)
-  #define TextDisplay _lib_iv(TextDisplay)
-  #define TextEditor _lib_iv(TextEditor)
-+ #define TextGraphic _lib_iv(TextGraphic)
-+ #define TextInteractor _lib_iv(TextInteractor)
-+ #define TextManip _lib_iv(TextManip)
-  #define TextRenderInfo _lib_iv(TextRenderInfo)
-+ #define TextView _lib_iv(TextView)
-  #define Tile _lib_iv(Tile)
-  #define TileFirstAligned _lib_iv(TileFirstAligned)
-  #define TileReversed _lib_iv(TileReversed)
-  #define TileReversedFirstAligned _lib_iv(TileReversedFirstAligned)
-  #define TitleFrame _lib_iv(TitleFrame)
-+ #define Tool _lib_iv(Tool)
-  #define TopLevelWindow _lib_iv(TopLevelWindow)
-+ #define TransferFunct _lib_iv(TransferFunct)
-  #define TransformFitter _lib_iv(TransformFitter)
-  #define TransformSetter _lib_iv(TransformSetter)
-  #define Transformer _lib_iv(Transformer)
-***************
-*** 280,304 ****
---- 531,585 ----
-  #define TransientWindow _lib_iv(TransientWindow)
-  #define Tray _lib_iv(Tray)
-  #define TrayElement _lib_iv(TrayElement)
-+ #define UArray _lib_iv(UArray)
-+ #define UChooser _lib_iv(UChooser)
-+ #define UControl _lib_iv(UControl)
-+ #define UControlInteractor _lib_iv(UControlInteractor)
-+ #define UHashElem _lib_iv(UHashElem)
-+ #define UHashTable _lib_iv(UHashTable)
-+ #define ULabel _lib_iv(ULabel)
-+ #define UList _lib_iv(UList)
-+ #define UMap _lib_iv(UMap)
-+ #define UMapElem _lib_iv(UMapElem)
-+ #define UPage _lib_iv(UPage)
-+ #define UStencil _lib_iv(UStencil)
-+ #define UndoCmd _lib_iv(UndoCmd)
-+ #define UngroupCmd _lib_iv(UngroupCmd)
-+ #define Unidraw _lib_iv(Unidraw)
-  #define UpMover _lib_iv(UpMover)
-  #define VBorder _lib_iv(VBorder)
-  #define VBox _lib_iv(VBox)
-  #define VGlue _lib_iv(VGlue)
-+ #define VPanelControl _lib_iv(VPanelControl)
-  #define VRule _lib_iv(VRule)
-  #define VScrollBar _lib_iv(VScrollBar)
-  #define VScroller _lib_iv(VScroller)
-+ #define VSlotComp _lib_iv(VSlotComp)
-+ #define VSlotView _lib_iv(VSlotView)
-  #define VariableLayout _lib_iv(VariableLayout)
-+ #define VertexManip _lib_iv(VertexManip)
-+ #define Vertices _lib_iv(Vertices)
-+ #define VerticesComp _lib_iv(VerticesComp)
-+ #define VerticesView _lib_iv(VerticesView)
-+ #define ViewCompCmd _lib_iv(ViewCompCmd)
-  #define ViewList _lib_iv(ViewList)
-+ #define Viewer _lib_iv(Viewer)
-+ #define ViewerView _lib_iv(ViewerView)
-  #define Viewport _lib_iv(Viewport)
-+ #define VoidData _lib_iv(VoidData)
-  #define WidgetKit _lib_iv(WidgetKit)
-  #define WidgetKitImpl _lib_iv(WidgetKitImpl)
-  #define Window _lib_iv(Window)
-+ #define WindowCursorStack _lib_iv(WindowCursorStack)
-  #define WindowRep _lib_iv(WindowRep)
-  #define WindowTable _lib_iv(WindowTable)
-  #define WindowVisual _lib_iv(WindowVisual)
-  #define World _lib_iv(World)
-+ #define XDisplay _lib_iv(XDisplay)
-+ #define XDrag _lib_iv(XDrag)
-  #define XSlider _lib_iv(XSlider)
-  #define XYMarker _lib_iv(XYMarker)
-  #define XYSlider _lib_iv(XYSlider)
-  #define YSlider _lib_iv(YSlider)
-  #define Zoomer _lib_iv(Zoomer)
-+ #define Zooming _lib_iv(Zooming)
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/InterViews/_names.h ./src/include/InterViews/_names.h
-*** work-orig/iv/src/include/InterViews/_names.h	Fri Mar 20 07:46:49 1992
---- ./src/include/InterViews/_names.h	Mon May 29 19:23:56 1995
-***************
-*** 36,41 ****
---- 36,48 ----
-  #undef Coord
-  #undef Deck
-  #undef Dialog
-+ #undef RasterRect
-+ #undef Point
-+ #undef Line
-+ #undef Ellipse
-+ #undef MultiLine
-+ #undef Polygon
-+ #undef ClosedBSpline
-  #undef FileBrowser
-  #undef FileChooser
-  #undef Glue
-***************
-*** 68,73 ****
---- 75,87 ----
-  #define Coord _lib_iv(Coord)
-  #define Deck _lib_iv(Deck)
-  #define Dialog _lib_iv(Dialog)
-+ #define RasterRect _lib_iv(RasterRect)
-+ #define Point _lib_iv(Point)
-+ #define Line _lib_iv(Line)
-+ #define Ellipse _lib_iv(Ellipse)
-+ #define MultiLine _lib_iv(MultiLine)
-+ #define Polygon _lib_iv(Polygon)
-+ #define ClosedBSpline _lib_iv(ClosedBSpline)
-  #define FileBrowser _lib_iv(FileBrowser)
-  #define FileChooser _lib_iv(FileChooser)
-  #define Glue _lib_iv(Glue)
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/InterViews/_undefs.h ./src/include/InterViews/_undefs.h
-*** work-orig/iv/src/include/InterViews/_undefs.h	Wed May 13 06:29:09 1992
---- ./src/include/InterViews/_undefs.h	Mon May 29 18:15:36 1995
-***************
-*** 65,70 ****
---- 65,71 ----
-  #undef Compositor
-  #undef Control
-  #undef ControlState
-+ #undef CoordinateSpace
-  #undef Cursor
-  #undef CursorRep
-  #undef CursorRepBitmap
-***************
-*** 76,84 ****
---- 77,92 ----
-  #undef Deck
-  #undef Dialog
-  #undef DialogKit
-+ #undef DialogKitImpl
-  #undef Display
-  #undef DisplayRep
-  #undef DownMover
-+ #undef Drag
-+ #undef DragRep
-+ #undef DragZone
-+ #undef DragZoneRep
-+ #undef DragZoneSink
-+ #undef DragZoneSinkHandler
-  #undef Enlarger
-  #undef Event
-  #undef EventRep
-***************
-*** 140,145 ****
---- 148,154 ----
-  #undef MFKit
-  #undef MFKitImpl
-  #undef Macro
-+ #undef MacroActionList
-  #undef ManagedWindow
-  #undef ManagedWindowHintInfo
-  #undef ManagedWindowRep
-***************
-*** 152,160 ****
---- 161,174 ----
-  #undef MenuItem
-  #undef Message
-  #undef MonoGlyph
-+ #undef MonoKit
-+ #undef MonoKitImpl
-  #undef MonoScene
-  #undef Mover
-  #undef NaturalLayout
-+ #undef OLDialogKit
-+ #undef OLKit
-+ #undef OLKitImpl
-  #undef Observable
-  #undef Observer
-  #undef ObserverList
-***************
-*** 293,302 ****
---- 307,319 ----
-  #undef WidgetKit
-  #undef WidgetKitImpl
-  #undef Window
-+ #undef WindowCursorStack
-  #undef WindowRep
-  #undef WindowTable
-  #undef WindowVisual
-  #undef World
-+ #undef XDisplay
-+ #undef XDrag
-  #undef XSlider
-  #undef XYMarker
-  #undef XYSlider
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/Unidraw/_defines.h ./src/include/Unidraw/_defines.h
-*** work-orig/iv/src/include/Unidraw/_defines.h	Sat Oct 31 09:52:35 1992
---- ./src/include/Unidraw/_defines.h	Mon May 29 18:34:17 1995
-***************
-*** 156,162 ****
-  #define PadComp _lib_iv(PadComp)
-  #define PadGraphic _lib_iv(PadGraphic)
-  #define PadView _lib_iv(PadView)
-- #define Page _lib_iv(Page)
-  #define PanelControl _lib_iv(PanelControl)
-  #define PanelInteractor _lib_iv(PanelInteractor)
-  #define PasteCmd _lib_iv(PasteCmd)
---- 156,161 ----
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/Unidraw/_undefs.h ./src/include/Unidraw/_undefs.h
-*** work-orig/iv/src/include/Unidraw/_undefs.h	Sat Oct 31 09:52:35 1992
---- ./src/include/Unidraw/_undefs.h	Mon May 29 18:34:17 1995
-***************
-*** 156,162 ****
-  #undef PadComp
-  #undef PadGraphic
-  #undef PadView
-- #undef Page
-  #undef PanelControl
-  #undef PanelInteractor
-  #undef PasteCmd
---- 156,161 ----
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/IV-2_6/painter.c ./src/lib/IV-2_6/painter.c
-*** work-orig/iv/src/lib/IV-2_6/painter.c	Wed Feb 12 07:19:44 1992
---- ./src/lib/IV-2_6/painter.c	Mon May 29 15:01:27 1995
-***************
-*** 39,44 ****
---- 39,47 ----
-  #include <stdlib.h>
-  #include <string.h>
-  
-+ #include <InterViews/_names.h>
-+ #include <InterViews/_enter.h>
-+ 
-  /*
-   * For reasons of caching, it is important that the attributes
-   * are set to nil (or 0) before being set to their default values.
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/IV-2_6/xpainter.c ./src/lib/IV-2_6/xpainter.c
-*** work-orig/iv/src/lib/IV-2_6/xpainter.c	Tue Oct 20 06:02:42 1992
---- ./src/lib/IV-2_6/xpainter.c	Mon May 29 19:19:13 1995
-***************
-*** 56,61 ****
---- 56,62 ----
-  #include <OS/math.h>
-  #include <OS/string.h>
-  #include <OS/table2.h>
-+ #include <InterViews/_names.h>
-  
-  PainterRep::PainterRep() {
-      display = Session::instance()->default_display();
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/prototypes.h ./src/lib/TIFF/prototypes.h
-*** work-orig/iv/src/lib/TIFF/prototypes.h	Wed May 31 08:52:12 1995
---- ./src/lib/TIFF/prototypes.h	Sun May 28 14:21:04 1995
-***************
-*** 25,31 ****
-   */
-  
-  #if USE_PROTOTYPES
-- va_dcl
-  #define	DECLARE1(f,t1,a1)		f(t1 a1)
-  #define	DECLARE2(f,t1,a1,t2,a2)		f(t1 a1, t2 a2)
-  #define	DECLARE3(f,t1,a1,t2,a2,t3,a3)	f(t1 a1, t2 a2, t3 a3)
---- 25,30 ----
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/tif_aux.c ./src/lib/TIFF/tif_aux.c
-*** work-orig/iv/src/lib/TIFF/tif_aux.c	Sat Mar 28 08:23:06 1992
---- ./src/lib/TIFF/tif_aux.c	Sun May 28 14:15:50 1995
-***************
-*** 42,47 ****
---- 42,49 ----
-   *	explcit values so that defaults exist only one
-   *	place in the library -- in TIFFDefaultDirectory.
-   */
-+  ;
-+  /* for some reason it needs a ; before this line */
-  TIFFVGetFieldDefaulted(tif, tag, ap)
-  	TIFF *tif;
-  	int tag;
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/tif_dir.c ./src/lib/TIFF/tif_dir.c
-*** work-orig/iv/src/lib/TIFF/tif_dir.c	Sat Mar  7 06:29:51 1992
---- ./src/lib/TIFF/tif_dir.c	Sun May 28 13:00:03 1995
-***************
-*** 950,956 ****
-  		}
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabShort(&dircount);
-! 		lseek(tif->tif_fd, dircount*sizeof (TIFFDirEntry), L_INCR);
-  		if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
-  			TIFFError(module, "%s: Error fetching directory link",
-  			    tif->tif_name);
---- 950,957 ----
-  		}
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabShort(&dircount);
-! 		/*added (off_t) .. jj@ldjpc.apana.org.au*/
-! 		lseek(tif->tif_fd, (off_t)(dircount*sizeof (TIFFDirEntry)), L_INCR);
-  		if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
-  			TIFFError(module, "%s: Error fetching directory link",
-  			    tif->tif_name);
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/tif_dirwrite.c ./src/lib/TIFF/tif_dirwrite.c
-*** work-orig/iv/src/lib/TIFF/tif_dirwrite.c	Wed Mar 18 05:39:29 1992
---- ./src/lib/TIFF/tif_dirwrite.c	Sun May 28 12:57:11 1995
-***************
-*** 177,183 ****
-  	dataoff = tif->tif_diroff + sizeof (short) + dirsize + sizeof (long);
-  	if (dataoff & 1)
-  		dataoff++;
-! 	(void) lseek(tif->tif_fd, dataoff, L_SET);
-  	tif->tif_curdir++;
-  	dir = (TIFFDirEntry *)data;
-  	/*
---- 177,184 ----
-  	dataoff = tif->tif_diroff + sizeof (short) + dirsize + sizeof (long);
-  	if (dataoff & 1)
-  		dataoff++;
-! 	/* added (off_t) below.....jj@ldjpc.apana.org.au*/
-! 	(void) lseek(tif->tif_fd, (off_t)(dataoff), L_SET);
-  	tif->tif_curdir++;
-  	dir = (TIFFDirEntry *)data;
-  	/*
-***************
-*** 314,320 ****
-  	/*
-  	 * Write directory.
-  	 */
-! 	(void) lseek(tif->tif_fd, tif->tif_diroff, L_SET);
-  	dircount = nfields;
-  	if (!WriteOK(tif->tif_fd, &dircount, sizeof (short))) {
-  		TIFFError(tif->tif_name, "Error writing directory count");
---- 315,322 ----
-  	/*
-  	 * Write directory.
-  	 */
-! 	/*added (off_t) below.....jj@ldjpc.apana.org.au*/
-! 	(void) lseek(tif->tif_fd, (off_t)(tif->tif_diroff), L_SET);
-  	dircount = nfields;
-  	if (!WriteOK(tif->tif_fd, &dircount, sizeof (short))) {
-  		TIFFError(tif->tif_name, "Error writing directory count");
-***************
-*** 762,774 ****
-  	u_short dircount;
-  	long nextdir;
-  
-! 	tif->tif_diroff = (lseek(tif->tif_fd, 0L, L_XTND)+1) &~ 1L;
-  	if (tif->tif_header.tiff_diroff == 0) {
-  		/*
-  		 * First directory, overwrite header.
-  		 */
-  		tif->tif_header.tiff_diroff = tif->tif_diroff;
-! 		(void) lseek(tif->tif_fd, 0L, L_SET);
-  		if (!WriteOK(tif->tif_fd, &tif->tif_header,
-  		    sizeof (tif->tif_header))) {
-  			TIFFError(tif->tif_name, "Error writing TIFF header");
---- 764,778 ----
-  	u_short dircount;
-  	long nextdir;
-  
-! 	/* changed 0L to (off_t)0 below...jj@ldjpc.apana.org.au*/
-! 	tif->tif_diroff = (lseek(tif->tif_fd, (off_t)0, L_XTND)+1) &~ 1L;
-  	if (tif->tif_header.tiff_diroff == 0) {
-  		/*
-  		 * First directory, overwrite header.
-  		 */
-  		tif->tif_header.tiff_diroff = tif->tif_diroff;
-! 		/* changed 0L to (off_t)0 .. jj@ldjpc.apana.org.au*/
-! 		(void) lseek(tif->tif_fd, (off_t)0, L_SET);
-  		if (!WriteOK(tif->tif_fd, &tif->tif_header,
-  		    sizeof (tif->tif_header))) {
-  			TIFFError(tif->tif_name, "Error writing TIFF header");
-***************
-*** 788,794 ****
-  		}
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabShort(&dircount);
-! 		lseek(tif->tif_fd, dircount * sizeof (TIFFDirEntry), L_INCR);
-  		if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
-  			TIFFError(module, "Error fetching directory link");
-  			return (0);
---- 792,799 ----
-  		}
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabShort(&dircount);
-! 		/*added (off_t) below....jj@ldjpc.apana.org.au*/
-! 		lseek(tif->tif_fd, (off_t)(dircount * sizeof (TIFFDirEntry)), L_INCR);
-  		if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
-  			TIFFError(module, "Error fetching directory link");
-  			return (0);
-***************
-*** 796,802 ****
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabLong((u_long *)&nextdir);
-  	} while (nextdir != 0);
-! 	(void) lseek(tif->tif_fd, -sizeof (nextdir), L_INCR);
-  	if (!WriteOK(tif->tif_fd, &tif->tif_diroff, sizeof (tif->tif_diroff))) {
-  		TIFFError(module, "Error writing directory link");
-  		return (0);
---- 801,808 ----
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabLong((u_long *)&nextdir);
-  	} while (nextdir != 0);
-! 	/*added (off_t) below ... jj@ldjpc.apana.org.au*/
-! 	(void) lseek(tif->tif_fd, (off_t)(-sizeof (nextdir)), L_INCR);
-  	if (!WriteOK(tif->tif_fd, &tif->tif_diroff, sizeof (tif->tif_diroff))) {
-  		TIFFError(module, "Error writing directory link");
-  		return (0);
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/tif_write.c ./src/lib/TIFF/tif_write.c
-*** work-orig/iv/src/lib/TIFF/tif_write.c	Tue Feb 11 13:36:47 1992
---- ./src/lib/TIFF/tif_write.c	Sun May 28 12:57:57 1995
-***************
-*** 550,556 ****
-  			}
-  		} else
-  			td->td_stripoffset[strip] =
-! 			    lseek(tif->tif_fd, 0L, L_XTND);
-  		tif->tif_curoff = td->td_stripoffset[strip];
-  	}
-  	if (!WriteOK(tif->tif_fd, data, cc)) {
---- 550,557 ----
-  			}
-  		} else
-  			td->td_stripoffset[strip] =
-! 			    /*changed 0L to (off_t)0 .. jj@ldjpc.apana.org.au*/
-! 			    lseek(tif->tif_fd, (off_t)0, L_XTND);
-  		tif->tif_curoff = td->td_stripoffset[strip];
-  	}
-  	if (!WriteOK(tif->tif_fd, data, cc)) {
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/tiffcompat.h ./src/lib/TIFF/tiffcompat.h
-*** work-orig/iv/src/lib/TIFF/tiffcompat.h	Tue Mar 31 12:01:04 1992
---- ./src/lib/TIFF/tiffcompat.h	Sun May 28 14:13:59 1995
-***************
-*** 154,160 ****
-  #define	lseek	mpw_lseek
-  extern long mpw_lseek(int, long, int);
-  #else
-! extern	long lseek();
-  #endif
-  
-  /*
---- 154,161 ----
-  #define	lseek	mpw_lseek
-  extern long mpw_lseek(int, long, int);
-  #else
-! /*changed to the correct one...jj@ldjpc.apana.org.au*/
-! extern	off_t lseek();
-  #endif
-  
-  /*
-***************
-*** 163,170 ****
-  #ifndef ReadOK
-  #define	ReadOK(fd, buf, size)	(read(fd, (char *)buf, size) == size)
-  #endif
-  #ifndef SeekOK
-! #define	SeekOK(fd, off)	(lseek(fd, (long)off, L_SET) == (long)off)
-  #endif
-  #ifndef WriteOK
-  #define	WriteOK(fd, buf, size)	(write(fd, (char *)buf, size) == size)
---- 164,172 ----
-  #ifndef ReadOK
-  #define	ReadOK(fd, buf, size)	(read(fd, (char *)buf, size) == size)
-  #endif
-+ /*changed (long) to (off_t) to compile....jj@ldjpc.apana.org.au*/
-  #ifndef SeekOK
-! #define	SeekOK(fd, off)	(lseek(fd, (off_t)off, L_SET) == (off_t)off)
-  #endif
-  #ifndef WriteOK
-  #define	WriteOK(fd, buf, size)	(write(fd, (char *)buf, size) == size)
-***************
-*** 202,211 ****
-   */
-  #if defined(__STDC__) && !defined(USE_VARARGS)
-  #define	USE_VARARGS	0
-  #endif
-  
-  #if defined(USE_VARARGS)
-! #if USE_VARARGS
-  #include <varargs.h>
-  #define	VA_START(ap, parmN)	va_start(ap)
-  #else
---- 204,218 ----
-   */
-  #if defined(__STDC__) && !defined(USE_VARARGS)
-  #define	USE_VARARGS	0
-+ #else 
-+ #if defined(__FreeBSD__)
-+ #undef USE_VARARGS
-+ #define USE_VARARGS     0
-+ #endif
-  #endif
-  
-  #if defined(USE_VARARGS)
-! #if USE_VARARGS && !defined(__FreeBSD__)
-  #include <varargs.h>
-  #define	VA_START(ap, parmN)	va_start(ap)
-  #else
+--- src/bin/scripts/Imakefile.orig	Fri Sep 13 07:01:39 1991
++++ src/bin/scripts/Imakefile	Sun Jan 17 17:48:18 1999
+@@ -11,6 +11,7 @@
+ 
+ AllTarget($(PROGRAMS))
+ 
++CPP = /usr/bin/cpp
+ CppScriptTarget(cpu,cpu.cpp,-DCPU='"'"$(ARCH)"'"',always)
+ CppScriptTarget(ibmkmf,ibmkmf.cpp,-DCONFIGDIRSPEC='$(CONFIGDIRSPEC)',always)
+ CppScriptTarget(ivmkmf,ivmkmf.cpp,-DCONFIGDIRSPEC='$(CONFIGDIRSPEC)',always)
diff --git a/x11-toolkits/iv/files/patch-ae b/x11-toolkits/iv/files/patch-ae
new file mode 100644
index 000000000000..00c2bfac8e1d
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ae
@@ -0,0 +1,11 @@
+--- src/bin/scripts/remind.cpp.orig	Thu Jun  4 13:37:00 1992
++++ src/bin/scripts/remind.cpp	Sun Jan 17 17:48:18 1999
+@@ -34,7 +34,7 @@
+ ' > $tmp
+ 
+ cat $MacrosFile $RemindersFile \
+-    | /lib/cpp \
++    | /usr/bin/cpp \
+     | egrep -f $tmp \
+     | awk '
+ 	/[0-9][0-9]?:[0-9][0-9]?/ {
diff --git a/x11-toolkits/iv/files/patch-af b/x11-toolkits/iv/files/patch-af
new file mode 100644
index 000000000000..374497410345
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-af
@@ -0,0 +1,14 @@
+--- src/config/InterViews/TIFF.def.orig	Sat Dec 12 08:33:54 1992
++++ src/config/InterViews/TIFF.def	Sun Jan 17 17:48:18 1999
+@@ -90,6 +90,11 @@
+  *
+  */
+ #ifndef TIFFStdCDefines
++#if defined(FreeBSDArchitecture)
++#define TIFFStdCDefines \
++    -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT -DMMAP_SUPPORT \
++    -DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
++#endif
+ #if defined(SGIArchitecture)
+ #define TIFFStdCDefines \
+     -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
diff --git a/x11-toolkits/iv/files/patch-ag b/x11-toolkits/iv/files/patch-ag
new file mode 100644
index 000000000000..559e8b51397b
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ag
@@ -0,0 +1,19 @@
+--- 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__ */
+ 
++#ifdef __FreeBSD__
++#undef freebsd
++#undef FREEBSD
++#define FreeBSDArchitecture
++#define ArchitectureName FREEBSD
++#define architectureName freebsd
++#define MacroIncludeFile <InterViews/iv-freebsd.cf>
++#define MacroFile InterViews/iv-freebsd.cf
++#endif
++
+ #ifndef ArchitectureName
+ XCOMM WARNING: Imakefile not configured; guessing at definitions!!!
+ XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
diff --git a/x11-toolkits/iv/files/patch-ah b/x11-toolkits/iv/files/patch-ah
new file mode 100644
index 000000000000..527323b07af5
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ah
@@ -0,0 +1,64 @@
+--- 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 @@
+ /*
+  * If you are using gcc/g++, then uncomment the include below.
+  */
+-/* #include <InterViews/gcc.def> */
++#include <InterViews/gcc.def>
++
++#if defined (FreeBSDArchitecture)
++#undef HasSunOSSharedLibs
++#define HasSunOSSharedLibs YES
++#undef HasSunOSSharedLibraries
++#define HasSunOSSharedLibraries YES
++#endif
+ 
+ /*
+  * Default customization of kits.
+@@ -33,11 +40,15 @@
+ #define BuildRPCClasses YES
+ #endif
+ 
++#if defined (FreeBSDArchitecture)
++#undef BuildRPCClasses
++#define BuildRPCClasses NO
++#endif
++
+ /*
+  * Delete this definition if your /tmp space is less than five megabytes.
+  */
+ #undef HasLargeTmp
+-#define HasLargeTmp YES
+ 
+ /*
+  * If you do not want to create a symbolic link called "/interviews"
+@@ -49,7 +60,7 @@
+  * installed data files.
+  */
+ #undef InstalledRoot
+-#define InstalledRoot /interviews
++#define InstalledRoot /usr/local/interviews
+ 
+ /*
+  * If the X11 config files are not in /usr/lib/X11/config, the X11
+@@ -60,11 +71,14 @@
+  * If you have to set XConfigDir, don't forget to override XCONFIGDIR
+  * on the command line when saying "make World" for the first time.
+  */
+-/*
++
+ #undef XConfigDir
+-#define XConfigDir /usr/X11R5/lib/X11/config
++#define XConfigDir /usr/X11R6/lib/X11/config
+ #undef XIncDir
+-#define XIncDir /usr/X11R5/include
++#define XIncDir /usr/X11R6/include
+ #undef XLibDir
+-#define XLibDir /usr/X11R5/lib
+-*/
++#define XLibDir /usr/X11R6/lib
++
++#undef SharedCCFlags
++#define SharedCCFlags -fpic
++
diff --git a/x11-toolkits/iv/files/patch-ai b/x11-toolkits/iv/files/patch-ai
new file mode 100644
index 000000000000..745e1dfeeefe
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ai
@@ -0,0 +1,41 @@
+--- 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
+@@ -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::                                                                        @@\
++	$(RM) Concat(lib,libname.so.rev)
++#else
+ #ifndef NormalSunOSSharedLibraryTarget
+ #if OSMajorVersion < 5
+ #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs)	@@\
+@@ -434,6 +458,7 @@
+ 									@@\
+ clean::									@@\
+ 	$(RM) Concat(lib,libname.so.rev)
++#endif
+ #endif
+ #endif
+ 
diff --git a/x11-toolkits/iv/files/patch-aj b/x11-toolkits/iv/files/patch-aj
new file mode 100644
index 000000000000..41563d3fcf9f
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-aj
@@ -0,0 +1,13 @@
+--- 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 @@
++#include <InterViews/xparams.cf>
++#undef CppCmd
++#define CppCmd cpp
++#undef CCDriver
++#define CCDriver /usr/bin/c++
++#undef DependCCFlags
++#define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
++#undef ExtraCCLdLibs
++#define ExtraCCLdLibs -lg++
++#define SharedCCFlags -fpic
diff --git a/x11-toolkits/iv/files/patch-ak b/x11-toolkits/iv/files/patch-ak
new file mode 100644
index 000000000000..e2f4e1594edf
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ak
@@ -0,0 +1,17 @@
+--- 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 @@
+ class Style;
+ class WindowCursorStack;
+ class WindowTable;
++/*
++ * modified by jj@ldjpc.apana.org.au
++ *
++ * this seems to break the compile...
+ class XDisplay;
+-
++ *
++ */
+ struct WindowOverlayInfo {
+     VisualID id_;
+     long type_;
diff --git a/x11-toolkits/iv/files/patch-al b/x11-toolkits/iv/files/patch-al
new file mode 100644
index 000000000000..4b98dea3f7d6
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-al
@@ -0,0 +1,570 @@
+--- src/include/InterViews/_defines.h.orig	Wed May 13 05:59:09 1992
++++ src/include/InterViews/_defines.h	Sun Jan 17 17:48:20 1999
+@@ -1,14 +1,4 @@
+-#define Alignment _lib_iv(Alignment)
+-#define ColorIntensity _lib_iv(ColorIntensity)
+-#define ColorOp _lib_iv(ColorOp)
+-#define Coord _lib_iv(Coord)
+-#define EventType _lib_iv(EventType)
+-#define EventButton _lib_iv(EventButton)
+-#define GlyphBreakType _lib_iv(GlyphBreakType)
+-#define GlyphIndex _lib_iv(GlyphIndex)
+-#define IntCoord _lib_iv(IntCoord)
+-#define PixelCoord _lib_iv(PixelCoord)
+-#define Selection _lib_iv(Selection)
++#define AcknowledgeDialog _lib_iv(AcknowledgeDialog)
+ #define Action _lib_iv(Action)
+ #define ActiveHandler _lib_iv(ActiveHandler)
+ #define Adjustable _lib_iv(Adjustable)
+@@ -16,6 +6,9 @@
+ #define Aggregate _lib_iv(Aggregate)
+ #define AggregateInfo_List _lib_iv(AggregateInfo_List)
+ #define Align _lib_iv(Align)
++#define AlignCmd _lib_iv(AlignCmd)
++#define AlignToGridCmd _lib_iv(AlignToGridCmd)
++#define Alignment _lib_iv(Alignment)
+ #define Allocation _lib_iv(Allocation)
+ #define AllocationInfo _lib_iv(AllocationInfo)
+ #define AllocationTable _lib_iv(AllocationTable)
+@@ -24,8 +17,10 @@
+ #define ApplicationWindow _lib_iv(ApplicationWindow)
+ #define ArrayCompositor _lib_iv(ArrayCompositor)
+ #define ArrowSubclassName _lib_iv(ArrowSubclassName)
++#define BackCmd _lib_iv(BackCmd)
+ #define Background _lib_iv(Background)
+ #define Banner _lib_iv(Banner)
++#define BasicDialog _lib_iv(BasicDialog)
+ #define Bevel _lib_iv(Bevel)
+ #define BevelFrame _lib_iv(BevelFrame)
+ #define Bitmap _lib_iv(Bitmap)
+@@ -36,54 +31,128 @@
+ #define BoxCanonical _lib_iv(BoxCanonical)
+ #define BoxElement _lib_iv(BoxElement)
+ #define BoxImpl _lib_iv(BoxImpl)
++#define BoxObj _lib_iv(BoxObj)
+ #define Break _lib_iv(Break)
+ #define Break_List _lib_iv(Break_List)
+ #define Browser _lib_iv(Browser)
+ #define BrowserList _lib_iv(BrowserList)
+ #define Brush _lib_iv(Brush)
++#define BrushCmd _lib_iv(BrushCmd)
+ #define BrushImpl _lib_iv(BrushImpl)
+ #define BrushRep _lib_iv(BrushRep)
++#define BrushVar _lib_iv(BrushVar)
++#define BrushVarView _lib_iv(BrushVarView)
+ #define Button _lib_iv(Button)
+ #define ButtonList _lib_iv(ButtonList)
+ #define ButtonState _lib_iv(ButtonState)
++#define CCnxn _lib_iv(CCnxn)
++#define CCnxn_HashTable _lib_iv(CCnxn_HashTable)
++#define CGlue _lib_iv(CGlue)
++#define CNet _lib_iv(CNet)
++#define CSolver _lib_iv(CSolver)
++#define CSolverInfo _lib_iv(CSolverInfo)
++#define CSolverState _lib_iv(CSolverState)
+ #define Canvas _lib_iv(Canvas)
+ #define CanvasDamage _lib_iv(CanvasDamage)
+ #define CanvasRep _lib_iv(CanvasRep)
+ #define Card _lib_iv(Card)
++#define Catalog _lib_iv(Catalog)
++#define CatalogChooser _lib_iv(CatalogChooser)
++#define CenterCmd _lib_iv(CenterCmd)
+ #define CenterLayout _lib_iv(CenterLayout)
+ #define Character _lib_iv(Character)
+ #define CheckBox _lib_iv(CheckBox)
+ #define ChoiceItem _lib_iv(ChoiceItem)
++#define ClassId _lib_iv(ClassId)
++#define Clipboard _lib_iv(Clipboard)
+ #define ClippingStack _lib_iv(ClippingStack)
++#define CloseEditorCmd _lib_iv(CloseEditorCmd)
++#define ClosedBSpline _lib_iv(ClosedBSpline)
++#define ClosedSplineComp _lib_iv(ClosedSplineComp)
++#define ClosedSplineView _lib_iv(ClosedSplineView)
+ #define Color _lib_iv(Color)
++#define ColorCmd _lib_iv(ColorCmd)
++#define ColorData _lib_iv(ColorData)
+ #define ColorImpl _lib_iv(ColorImpl)
++#define ColorIntensity _lib_iv(ColorIntensity)
++#define ColorOp _lib_iv(ColorOp)
+ #define ColorRep _lib_iv(ColorRep)
+ #define ColorTable _lib_iv(ColorTable)
++#define ColorVar _lib_iv(ColorVar)
++#define Command _lib_iv(Command)
++#define CommandControl _lib_iv(CommandControl)
++#define CommandInteractor _lib_iv(CommandInteractor)
++#define CompNameVar _lib_iv(CompNameVar)
++#define CompNameVarView _lib_iv(CompNameVarView)
+ #define CompletionEditor _lib_iv(CompletionEditor)
++#define Component _lib_iv(Component)
++#define ComponentView _lib_iv(ComponentView)
+ #define Composition _lib_iv(Composition)
+ #define CompositionComponent_List _lib_iv(CompositionComponent_List)
+ #define Compositor _lib_iv(Compositor)
++#define ConfirmDialog _lib_iv(ConfirmDialog)
++#define ConnInfo _lib_iv(ConnInfo)
++#define ConnectCmd _lib_iv(ConnectCmd)
++#define ConnectManip _lib_iv(ConnectManip)
++#define ConnectTool _lib_iv(ConnectTool)
++#define Connector _lib_iv(Connector)
++#define ConnectorView _lib_iv(ConnectorView)
+ #define Control _lib_iv(Control)
++#define ControlInfo _lib_iv(ControlInfo)
+ #define ControlState _lib_iv(ControlState)
++#define Coord _lib_iv(Coord)
++#define CoordinateSpace _lib_iv(CoordinateSpace)
++#define CopyCmd _lib_iv(CopyCmd)
++#define Creator _lib_iv(Creator)
+ #define Cursor _lib_iv(Cursor)
+ #define CursorRep _lib_iv(CursorRep)
+ #define CursorRepBitmap _lib_iv(CursorRepBitmap)
+ #define CursorRepData _lib_iv(CursorRepData)
+ #define CursorRepFont _lib_iv(CursorRepFont)
+ #define CursorRepXFont _lib_iv(CursorRepXFont)
++#define CutCmd _lib_iv(CutCmd)
++#define Damage _lib_iv(Damage)
+ #define DamageList _lib_iv(DamageList)
++#define Data _lib_iv(Data)
++#define DataCache _lib_iv(DataCache)
+ #define DebugGlyph _lib_iv(DebugGlyph)
+ #define Deck _lib_iv(Deck)
++#define DeleteCmd _lib_iv(DeleteCmd)
+ #define Dialog _lib_iv(Dialog)
+ #define DialogKit _lib_iv(DialogKit)
++#define DialogKitImpl _lib_iv(DialogKitImpl)
+ #define Display _lib_iv(Display)
+ #define DisplayRep _lib_iv(DisplayRep)
+ #define DownMover _lib_iv(DownMover)
++#define Drag _lib_iv(Drag)
++#define DragManip _lib_iv(DragManip)
++#define DragRep _lib_iv(DragRep)
++#define DragZone _lib_iv(DragZone)
++#define DragZoneRep _lib_iv(DragZoneRep)
++#define DragZoneSink _lib_iv(DragZoneSink)
++#define DragZoneSinkHandler _lib_iv(DragZoneSinkHandler)
++#define DupCmd _lib_iv(DupCmd)
++#define Editor _lib_iv(Editor)
++#define EditorImpl _lib_iv(EditorImpl)
++#define EditorInfo _lib_iv(EditorInfo)
++#define Ellipse _lib_iv(Ellipse)
++#define EllipseComp _lib_iv(EllipseComp)
++#define EllipseView _lib_iv(EllipseView)
+ #define Enlarger _lib_iv(Enlarger)
+ #define Event _lib_iv(Event)
++#define EventButton _lib_iv(EventButton)
+ #define EventRep _lib_iv(EventRep)
++#define EventType _lib_iv(EventType)
+ #define Extension _lib_iv(Extension)
++#define Extent _lib_iv(Extent)
++#define ExternView _lib_iv(ExternView)
+ #define FBDirectory _lib_iv(FBDirectory)
++#define F_Circle _lib_iv(F_Circle)
++#define F_ClosedBSpline _lib_iv(F_ClosedBSpline)
++#define F_Ellipse _lib_iv(F_Ellipse)
++#define F_OpenBSpline _lib_iv(F_OpenBSpline)
++#define F_Polygon _lib_iv(F_Polygon)
++#define F_Rect _lib_iv(F_Rect)
+ #define FieldEditor _lib_iv(FieldEditor)
+ #define FieldEditorAction _lib_iv(FieldEditorAction)
+ #define FieldEditorImpl _lib_iv(FieldEditorImpl)
+@@ -92,22 +161,50 @@
+ #define FileChooser _lib_iv(FileChooser)
+ #define FileChooserAction _lib_iv(FileChooserAction)
+ #define FileChooserImpl _lib_iv(FileChooserImpl)
++#define FileNameVarView _lib_iv(FileNameVarView)
++#define FillPolygonObj _lib_iv(FillPolygonObj)
+ #define FixedLayout _lib_iv(FixedLayout)
++#define FixedPin _lib_iv(FixedPin)
+ #define Font _lib_iv(Font)
+ #define FontBoundingBox _lib_iv(FontBoundingBox)
++#define FontCmd _lib_iv(FontCmd)
+ #define FontFamily _lib_iv(FontFamily)
+ #define FontFamilyImpl _lib_iv(FontFamilyImpl)
+ #define FontFamilyRep _lib_iv(FontFamilyRep)
+ #define FontImpl _lib_iv(FontImpl)
+ #define FontRep _lib_iv(FontRep)
++#define FontVar _lib_iv(FontVar)
++#define FontVarView _lib_iv(FontVarView)
+ #define Frame _lib_iv(Frame)
++#define FrontCmd _lib_iv(FrontCmd)
++#define FullGraphic _lib_iv(FullGraphic)
+ #define GLContext _lib_iv(GLContext)
+ #define GLContextImpl _lib_iv(GLContextImpl)
+ #define GLWindow _lib_iv(GLWindow)
++#define GSData _lib_iv(GSData)
++#define GVU_HashTable _lib_iv(GVU_HashTable)
++#define GVUpdater _lib_iv(GVUpdater)
+ #define Glue _lib_iv(Glue)
+ #define Glyph _lib_iv(Glyph)
++#define GlyphBreakType _lib_iv(GlyphBreakType)
++#define GlyphIndex _lib_iv(GlyphIndex)
+ #define GrabList _lib_iv(GrabList)
++#define Graphic _lib_iv(Graphic)
++#define GraphicBlock _lib_iv(GraphicBlock)
++#define GraphicComp _lib_iv(GraphicComp)
++#define GraphicCompTool _lib_iv(GraphicCompTool)
++#define GraphicComps _lib_iv(GraphicComps)
++#define GraphicView _lib_iv(GraphicView)
++#define GraphicViews _lib_iv(GraphicViews)
++#define GravityCmd _lib_iv(GravityCmd)
++#define GravityVar _lib_iv(GravityVar)
++#define GravityVarView _lib_iv(GravityVarView)
++#define Grid _lib_iv(Grid)
++#define GridCmd _lib_iv(GridCmd)
++#define GridDialog _lib_iv(GridDialog)
++#define GridSpacingCmd _lib_iv(GridSpacingCmd)
+ #define Group _lib_iv(Group)
++#define GroupCmd _lib_iv(GroupCmd)
+ #define GrowingBSpline _lib_iv(GrowingBSpline)
+ #define GrowingClosedBSpline _lib_iv(GrowingClosedBSpline)
+ #define GrowingMultiLine _lib_iv(GrowingMultiLine)
+@@ -116,19 +213,28 @@
+ #define HBorder _lib_iv(HBorder)
+ #define HBox _lib_iv(HBox)
+ #define HGlue _lib_iv(HGlue)
++#define HPanelControl _lib_iv(HPanelControl)
+ #define HRule _lib_iv(HRule)
+ #define HScrollBar _lib_iv(HScrollBar)
+ #define HScroller _lib_iv(HScroller)
++#define HSlotComp _lib_iv(HSlotComp)
++#define HSlotView _lib_iv(HSlotView)
+ #define Handler _lib_iv(Handler)
++#define HistoryMap _lib_iv(HistoryMap)
+ #define Hit _lib_iv(Hit)
+ #define HitImpl _lib_iv(HitImpl)
+ #define IconWindow _lib_iv(IconWindow)
+ #define Image _lib_iv(Image)
++#define ImportCmd _lib_iv(ImportCmd)
++#define InorderView _lib_iv(InorderView)
+ #define InputHandler _lib_iv(InputHandler)
+ #define InputHandlerImpl _lib_iv(InputHandlerImpl)
++#define IntCoord _lib_iv(IntCoord)
+ #define Interactor _lib_iv(Interactor)
+ #define InteractorHandler _lib_iv(InteractorHandler)
+ #define InteractorWindow _lib_iv(InteractorWindow)
++#define Iterator _lib_iv(Iterator)
++#define KeyMap _lib_iv(KeyMap)
+ #define KnownFonts _lib_iv(KnownFonts)
+ #define LRComposition _lib_iv(LRComposition)
+ #define LRMarker _lib_iv(LRMarker)
+@@ -136,63 +242,163 @@
+ #define Layout _lib_iv(Layout)
+ #define LayoutKit _lib_iv(LayoutKit)
+ #define LeftMover _lib_iv(LeftMover)
++#define Line _lib_iv(Line)
++#define LineComp _lib_iv(LineComp)
++#define LineObj _lib_iv(LineObj)
++#define LineView _lib_iv(LineView)
++#define LinkComp _lib_iv(LinkComp)
++#define LinkView _lib_iv(LinkView)
+ #define MFDialogKit _lib_iv(MFDialogKit)
+ #define MFKit _lib_iv(MFKit)
+ #define MFKitImpl _lib_iv(MFKitImpl)
+ #define Macro _lib_iv(Macro)
++#define MacroActionList _lib_iv(MacroActionList)
++#define MacroCmd _lib_iv(MacroCmd)
++#define MagnifVar _lib_iv(MagnifVar)
++#define MagnifVarView _lib_iv(MagnifVarView)
++#define MagnifyTool _lib_iv(MagnifyTool)
++#define ManagedWindow _lib_iv(ManagedWindow)
+ #define ManagedWindow _lib_iv(ManagedWindow)
+ #define ManagedWindowHintInfo _lib_iv(ManagedWindowHintInfo)
+ #define ManagedWindowRep _lib_iv(ManagedWindowRep)
++#define ManipGroup _lib_iv(ManipGroup)
++#define Manipulator _lib_iv(Manipulator)
+ #define MarginFrame _lib_iv(MarginFrame)
+ #define MarginLayout _lib_iv(MarginLayout)
+ #define MatchEditor _lib_iv(MatchEditor)
++#define MatchEditor _lib_iv(MatchEditor)
+ #define Menu _lib_iv(Menu)
+ #define MenuBar _lib_iv(MenuBar)
+ #define MenuImpl _lib_iv(MenuImpl)
+ #define MenuItem _lib_iv(MenuItem)
+ #define Message _lib_iv(Message)
++#define MobilityCmd _lib_iv(MobilityCmd)
++#define MobilityData _lib_iv(MobilityData)
++#define ModifStatusVar _lib_iv(ModifStatusVar)
++#define ModifStatusVarView _lib_iv(ModifStatusVarView)
+ #define MonoGlyph _lib_iv(MonoGlyph)
++#define MonoKit _lib_iv(MonoKit)
++#define MonoKitImpl _lib_iv(MonoKitImpl)
+ #define MonoScene _lib_iv(MonoScene)
++#define MoveCmd _lib_iv(MoveCmd)
++#define MoveData _lib_iv(MoveData)
++#define MoveTool _lib_iv(MoveTool)
+ #define Mover _lib_iv(Mover)
++#define MultiLine _lib_iv(MultiLine)
++#define MultiLineComp _lib_iv(MultiLineComp)
++#define MultiLineObj _lib_iv(MultiLineObj)
++#define MultiLineView _lib_iv(MultiLineView)
++#define NOPCmd _lib_iv(NOPCmd)
++#define NameMap _lib_iv(NameMap)
++#define NameVar _lib_iv(NameVar)
++#define NameVarView _lib_iv(NameVarView)
+ #define NaturalLayout _lib_iv(NaturalLayout)
++#define NewCompCmd _lib_iv(NewCompCmd)
++#define NormSizeCmd _lib_iv(NormSizeCmd)
++#define OLDialogKit _lib_iv(OLDialogKit)
++#define OLKit _lib_iv(OLKit)
++#define OLKitImpl _lib_iv(OLKitImpl)
++#define ObjectMap _lib_iv(ObjectMap)
++#define ObjectMapElem _lib_iv(ObjectMapElem)
+ #define Observable _lib_iv(Observable)
+ #define Observer _lib_iv(Observer)
+ #define ObserverList _lib_iv(ObserverList)
++#define OpenBSpline _lib_iv(OpenBSpline)
+ #define OptionDesc _lib_iv(OptionDesc)
++#define Orientation _lib_iv(Orientation)
++#define OrientationCmd _lib_iv(OrientationCmd)
++#define PSBrush _lib_iv(PSBrush)
++#define PSClosedSpline _lib_iv(PSClosedSpline)
++#define PSColor _lib_iv(PSColor)
++#define PSEllipse _lib_iv(PSEllipse)
+ #define PSFont _lib_iv(PSFont)
+ #define PSFontImpl _lib_iv(PSFontImpl)
++#define PSLine _lib_iv(PSLine)
++#define PSLink _lib_iv(PSLink)
++#define PSMultiLine _lib_iv(PSMultiLine)
++#define PSPad _lib_iv(PSPad)
++#define PSPattern _lib_iv(PSPattern)
++#define PSPin _lib_iv(PSPin)
++#define PSPolygon _lib_iv(PSPolygon)
++#define PSRaster _lib_iv(PSRaster)
++#define PSRect _lib_iv(PSRect)
++#define PSSlot _lib_iv(PSSlot)
++#define PSSpline _lib_iv(PSSpline)
++#define PSStencil _lib_iv(PSStencil)
++#define PSText _lib_iv(PSText)
++#define PSVertices _lib_iv(PSVertices)
++#define PadComp _lib_iv(PadComp)
++#define PadGraphic _lib_iv(PadGraphic)
++#define PadView _lib_iv(PadView)
+ #define Page _lib_iv(Page)
+ #define PageInfo_List _lib_iv(PageInfo_List)
+ #define Painter _lib_iv(Painter)
+ #define PainterRep _lib_iv(PainterRep)
++#define PanelControl _lib_iv(PanelControl)
++#define PanelInteractor _lib_iv(PanelInteractor)
+ #define Panner _lib_iv(Panner)
++#define PasteCmd _lib_iv(PasteCmd)
+ #define Patch _lib_iv(Patch)
++#define Path _lib_iv(Path)
+ #define PathRenderInfo _lib_iv(PathRenderInfo)
+ #define Pattern _lib_iv(Pattern)
++#define PatternCmd _lib_iv(PatternCmd)
+ #define PatternRep _lib_iv(PatternRep)
++#define PatternVar _lib_iv(PatternVar)
++#define PatternVarView _lib_iv(PatternVarView)
+ #define Perspective _lib_iv(Perspective)
++#define Picture _lib_iv(Picture)
++#define PinComp _lib_iv(PinComp)
++#define PinGraphic _lib_iv(PinGraphic)
++#define PinView _lib_iv(PinView)
++#define PixelCoord _lib_iv(PixelCoord)
+ #define Placement _lib_iv(Placement)
++#define Point _lib_iv(Point)
++#define PointObj _lib_iv(PointObj)
+ #define PolyGlyph _lib_iv(PolyGlyph)
+ #define PolyGlyphImpl _lib_iv(PolyGlyphImpl)
++#define Polygon _lib_iv(Polygon)
++#define PolygonComp _lib_iv(PolygonComp)
++#define PolygonView _lib_iv(PolygonView)
+ #define PopupMenu _lib_iv(PopupMenu)
+ #define PopupWindow _lib_iv(PopupWindow)
++#define PostScriptView _lib_iv(PostScriptView)
++#define PostScriptViews _lib_iv(PostScriptViews)
++#define PostorderView _lib_iv(PostorderView)
++#define PreorderView _lib_iv(PreorderView)
++#define PrintBS _lib_iv(PrintBS)
++#define PrintCmd _lib_iv(PrintCmd)
++#define PrintDialog _lib_iv(PrintDialog)
+ #define Printer _lib_iv(Printer)
+ #define PrinterRep _lib_iv(PrinterRep)
+ #define PropertyData _lib_iv(PropertyData)
+ #define PulldownMenu _lib_iv(PulldownMenu)
+ #define PullrightMenu _lib_iv(PullrightMenu)
+ #define PushButton _lib_iv(PushButton)
++#define QuitCmd _lib_iv(QuitCmd)
+ #define RGBTable _lib_iv(RGBTable)
+ #define RadioButton _lib_iv(RadioButton)
+ #define Raster _lib_iv(Raster)
++#define RasterComp _lib_iv(RasterComp)
++#define RasterRect _lib_iv(RasterRect)
+ #define RasterRep _lib_iv(RasterRep)
++#define RasterView _lib_iv(RasterView)
++#define RectComp _lib_iv(RectComp)
++#define RectView _lib_iv(RectView)
++#define RedToFitCmd _lib_iv(RedToFitCmd)
++#define RedoCmd _lib_iv(RedoCmd)
+ #define Reducer _lib_iv(Reducer)
+ #define Regexp _lib_iv(Regexp)
++#define ReplaceCmd _lib_iv(ReplaceCmd)
+ #define ReqErr _lib_iv(ReqErr)
+ #define Requirement _lib_iv(Requirement)
+ #define Requisition _lib_iv(Requisition)
++#define ReshapeTool _lib_iv(ReshapeTool)
+ #define Resource _lib_iv(Resource)
++#define RevertCmd _lib_iv(RevertCmd)
+ #define RightMover _lib_iv(RightMover)
++#define RotateCmd _lib_iv(RotateCmd)
++#define RotateTool _lib_iv(RotateTool)
+ #define RotatingLine _lib_iv(RotatingLine)
+ #define RotatingLineList _lib_iv(RotatingLineList)
+ #define RotatingRect _lib_iv(RotatingRect)
+@@ -211,8 +417,28 @@
+ #define RubberVertex _lib_iv(RubberVertex)
+ #define Rubberband _lib_iv(Rubberband)
+ #define Rule _lib_iv(Rule)
++#define SFH_ClosedBSpline _lib_iv(SFH_ClosedBSpline)
++#define SFH_OpenBSpline _lib_iv(SFH_OpenBSpline)
++#define SF_Circle _lib_iv(SF_Circle)
++#define SF_ClosedBSpline _lib_iv(SF_ClosedBSpline)
++#define SF_Ellipse _lib_iv(SF_Ellipse)
++#define SF_MultiLine _lib_iv(SF_MultiLine)
++#define SF_OpenBSpline _lib_iv(SF_OpenBSpline)
++#define SF_Polygon _lib_iv(SF_Polygon)
++#define SF_Rect _lib_iv(SF_Rect)
+ #define SMFKit _lib_iv(SMFKit)
+ #define SMFKitImpl _lib_iv(SMFKitImpl)
++#define S_Circle _lib_iv(S_Circle)
++#define S_ClosedBSpline _lib_iv(S_ClosedBSpline)
++#define S_Ellipse _lib_iv(S_Ellipse)
++#define S_MultiLine _lib_iv(S_MultiLine)
++#define S_OpenBSpline _lib_iv(S_OpenBSpline)
++#define S_Polygon _lib_iv(S_Polygon)
++#define S_Rect _lib_iv(S_Rect)
++#define SaveCompAsCmd _lib_iv(SaveCompAsCmd)
++#define SaveCompCmd _lib_iv(SaveCompCmd)
++#define ScaleCmd _lib_iv(ScaleCmd)
++#define ScaleTool _lib_iv(ScaleTool)
+ #define ScalingLine _lib_iv(ScalingLine)
+ #define ScalingLineList _lib_iv(ScalingLineList)
+ #define ScalingRect _lib_iv(ScalingRect)
+@@ -220,6 +446,8 @@
+ #define ScrollBar _lib_iv(ScrollBar)
+ #define ScrollBox _lib_iv(ScrollBox)
+ #define Scroller _lib_iv(Scroller)
++#define SelectTool _lib_iv(SelectTool)
++#define Selection _lib_iv(Selection)
+ #define SelectionHandler _lib_iv(SelectionHandler)
+ #define SelectionList _lib_iv(SelectionList)
+ #define SelectionManager _lib_iv(SelectionManager)
+@@ -232,16 +460,29 @@
+ #define Shape _lib_iv(Shape)
+ #define ShowFrame _lib_iv(ShowFrame)
+ #define SimpleCompositor _lib_iv(SimpleCompositor)
++#define SlctAllCmd _lib_iv(SlctAllCmd)
+ #define Slider _lib_iv(Slider)
+ #define SliderImpl _lib_iv(SliderImpl)
+ #define SlidingEllipse _lib_iv(SlidingEllipse)
+ #define SlidingLine _lib_iv(SlidingLine)
+ #define SlidingLineList _lib_iv(SlidingLineList)
++#define SlidingPin _lib_iv(SlidingPin)
+ #define SlidingPointList _lib_iv(SlidingPointList)
+ #define SlidingRect _lib_iv(SlidingRect)
++#define SlotComp _lib_iv(SlotComp)
++#define SlotGraphic _lib_iv(SlotGraphic)
++#define SlotView _lib_iv(SlotView)
++#define SplineComp _lib_iv(SplineComp)
++#define SplineView _lib_iv(SplineView)
++#define State _lib_iv(State)
++#define StateVar _lib_iv(StateVar)
++#define StateVarView _lib_iv(StateVarView)
+ #define Stencil _lib_iv(Stencil)
++#define StencilComp _lib_iv(StencilComp)
++#define StencilView _lib_iv(StencilView)
+ #define Stepper _lib_iv(Stepper)
+ #define StepperSubclassName _lib_iv(StepperSubclassName)
++#define StretchTool _lib_iv(StretchTool)
+ #define StretchingRect _lib_iv(StretchingRect)
+ #define StringBrowser _lib_iv(StringBrowser)
+ #define StringChooser _lib_iv(StringChooser)
+@@ -254,6 +495,8 @@
+ #define TBComposition _lib_iv(TBComposition)
+ #define TBScrollBox _lib_iv(TBScrollBox)
+ #define TBScrollBoxImpl _lib_iv(TBScrollBoxImpl)
++#define TF_2Port _lib_iv(TF_2Port)
++#define TF_Direct _lib_iv(TF_Direct)
+ #define TGlue _lib_iv(TGlue)
+ #define TIFFRaster _lib_iv(TIFFRaster)
+ #define TSolver _lib_iv(TSolver)
+@@ -263,16 +506,24 @@
+ #define TelltaleGroup _lib_iv(TelltaleGroup)
+ #define TelltaleState _lib_iv(TelltaleState)
+ #define TextBuffer _lib_iv(TextBuffer)
++#define TextBuffer _lib_iv(TextBuffer)
+ #define TextButton _lib_iv(TextButton)
++#define TextComp _lib_iv(TextComp)
+ #define TextDisplay _lib_iv(TextDisplay)
+ #define TextEditor _lib_iv(TextEditor)
++#define TextGraphic _lib_iv(TextGraphic)
++#define TextInteractor _lib_iv(TextInteractor)
++#define TextManip _lib_iv(TextManip)
+ #define TextRenderInfo _lib_iv(TextRenderInfo)
++#define TextView _lib_iv(TextView)
+ #define Tile _lib_iv(Tile)
+ #define TileFirstAligned _lib_iv(TileFirstAligned)
+ #define TileReversed _lib_iv(TileReversed)
+ #define TileReversedFirstAligned _lib_iv(TileReversedFirstAligned)
+ #define TitleFrame _lib_iv(TitleFrame)
++#define Tool _lib_iv(Tool)
+ #define TopLevelWindow _lib_iv(TopLevelWindow)
++#define TransferFunct _lib_iv(TransferFunct)
+ #define TransformFitter _lib_iv(TransformFitter)
+ #define TransformSetter _lib_iv(TransformSetter)
+ #define Transformer _lib_iv(Transformer)
+@@ -280,25 +531,55 @@
+ #define TransientWindow _lib_iv(TransientWindow)
+ #define Tray _lib_iv(Tray)
+ #define TrayElement _lib_iv(TrayElement)
++#define UArray _lib_iv(UArray)
++#define UChooser _lib_iv(UChooser)
++#define UControl _lib_iv(UControl)
++#define UControlInteractor _lib_iv(UControlInteractor)
++#define UHashElem _lib_iv(UHashElem)
++#define UHashTable _lib_iv(UHashTable)
++#define ULabel _lib_iv(ULabel)
++#define UList _lib_iv(UList)
++#define UMap _lib_iv(UMap)
++#define UMapElem _lib_iv(UMapElem)
++#define UPage _lib_iv(UPage)
++#define UStencil _lib_iv(UStencil)
++#define UndoCmd _lib_iv(UndoCmd)
++#define UngroupCmd _lib_iv(UngroupCmd)
++#define Unidraw _lib_iv(Unidraw)
+ #define UpMover _lib_iv(UpMover)
+ #define VBorder _lib_iv(VBorder)
+ #define VBox _lib_iv(VBox)
+ #define VGlue _lib_iv(VGlue)
++#define VPanelControl _lib_iv(VPanelControl)
+ #define VRule _lib_iv(VRule)
+ #define VScrollBar _lib_iv(VScrollBar)
+ #define VScroller _lib_iv(VScroller)
++#define VSlotComp _lib_iv(VSlotComp)
++#define VSlotView _lib_iv(VSlotView)
+ #define VariableLayout _lib_iv(VariableLayout)
++#define VertexManip _lib_iv(VertexManip)
++#define Vertices _lib_iv(Vertices)
++#define VerticesComp _lib_iv(VerticesComp)
++#define VerticesView _lib_iv(VerticesView)
++#define ViewCompCmd _lib_iv(ViewCompCmd)
+ #define ViewList _lib_iv(ViewList)
++#define Viewer _lib_iv(Viewer)
++#define ViewerView _lib_iv(ViewerView)
+ #define Viewport _lib_iv(Viewport)
++#define VoidData _lib_iv(VoidData)
+ #define WidgetKit _lib_iv(WidgetKit)
+ #define WidgetKitImpl _lib_iv(WidgetKitImpl)
+ #define Window _lib_iv(Window)
++#define WindowCursorStack _lib_iv(WindowCursorStack)
+ #define WindowRep _lib_iv(WindowRep)
+ #define WindowTable _lib_iv(WindowTable)
+ #define WindowVisual _lib_iv(WindowVisual)
+ #define World _lib_iv(World)
++#define XDisplay _lib_iv(XDisplay)
++#define XDrag _lib_iv(XDrag)
+ #define XSlider _lib_iv(XSlider)
+ #define XYMarker _lib_iv(XYMarker)
+ #define XYSlider _lib_iv(XYSlider)
+ #define YSlider _lib_iv(YSlider)
+ #define Zoomer _lib_iv(Zoomer)
++#define Zooming _lib_iv(Zooming)
diff --git a/x11-toolkits/iv/files/patch-am b/x11-toolkits/iv/files/patch-am
new file mode 100644
index 000000000000..c7358371d725
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-am
@@ -0,0 +1,30 @@
+--- src/include/InterViews/_names.h.orig	Fri Mar 20 06:16:49 1992
++++ src/include/InterViews/_names.h	Sun Jan 17 17:48:20 1999
+@@ -36,6 +36,13 @@
+ #undef Coord
+ #undef Deck
+ #undef Dialog
++#undef RasterRect
++#undef Point
++#undef Line
++#undef Ellipse
++#undef MultiLine
++#undef Polygon
++#undef ClosedBSpline
+ #undef FileBrowser
+ #undef FileChooser
+ #undef Glue
+@@ -68,6 +75,13 @@
+ #define Coord _lib_iv(Coord)
+ #define Deck _lib_iv(Deck)
+ #define Dialog _lib_iv(Dialog)
++#define RasterRect _lib_iv(RasterRect)
++#define Point _lib_iv(Point)
++#define Line _lib_iv(Line)
++#define Ellipse _lib_iv(Ellipse)
++#define MultiLine _lib_iv(MultiLine)
++#define Polygon _lib_iv(Polygon)
++#define ClosedBSpline _lib_iv(ClosedBSpline)
+ #define FileBrowser _lib_iv(FileBrowser)
+ #define FileChooser _lib_iv(FileChooser)
+ #define Glue _lib_iv(Glue)
diff --git a/x11-toolkits/iv/files/patch-an b/x11-toolkits/iv/files/patch-an
new file mode 100644
index 000000000000..656d1f64316c
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-an
@@ -0,0 +1,64 @@
+--- src/include/InterViews/_undefs.h.orig	Wed May 13 05:59:09 1992
++++ src/include/InterViews/_undefs.h	Sun Jan 17 17:48:20 1999
+@@ -65,6 +65,7 @@
+ #undef Compositor
+ #undef Control
+ #undef ControlState
++#undef CoordinateSpace
+ #undef Cursor
+ #undef CursorRep
+ #undef CursorRepBitmap
+@@ -76,9 +77,16 @@
+ #undef Deck
+ #undef Dialog
+ #undef DialogKit
++#undef DialogKitImpl
+ #undef Display
+ #undef DisplayRep
+ #undef DownMover
++#undef Drag
++#undef DragRep
++#undef DragZone
++#undef DragZoneRep
++#undef DragZoneSink
++#undef DragZoneSinkHandler
+ #undef Enlarger
+ #undef Event
+ #undef EventRep
+@@ -140,6 +148,7 @@
+ #undef MFKit
+ #undef MFKitImpl
+ #undef Macro
++#undef MacroActionList
+ #undef ManagedWindow
+ #undef ManagedWindowHintInfo
+ #undef ManagedWindowRep
+@@ -152,9 +161,14 @@
+ #undef MenuItem
+ #undef Message
+ #undef MonoGlyph
++#undef MonoKit
++#undef MonoKitImpl
+ #undef MonoScene
+ #undef Mover
+ #undef NaturalLayout
++#undef OLDialogKit
++#undef OLKit
++#undef OLKitImpl
+ #undef Observable
+ #undef Observer
+ #undef ObserverList
+@@ -293,10 +307,13 @@
+ #undef WidgetKit
+ #undef WidgetKitImpl
+ #undef Window
++#undef WindowCursorStack
+ #undef WindowRep
+ #undef WindowTable
+ #undef WindowVisual
+ #undef World
++#undef XDisplay
++#undef XDrag
+ #undef XSlider
+ #undef XYMarker
+ #undef XYSlider
diff --git a/x11-toolkits/iv/files/patch-ao b/x11-toolkits/iv/files/patch-ao
new file mode 100644
index 000000000000..0bbca96ec1ea
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ao
@@ -0,0 +1,10 @@
+--- src/include/Unidraw/_defines.h.orig	Sat Oct 31 08:22:35 1992
++++ src/include/Unidraw/_defines.h	Sun Jan 17 17:48:20 1999
+@@ -156,7 +156,6 @@
+ #define PadComp _lib_iv(PadComp)
+ #define PadGraphic _lib_iv(PadGraphic)
+ #define PadView _lib_iv(PadView)
+-#define Page _lib_iv(Page)
+ #define PanelControl _lib_iv(PanelControl)
+ #define PanelInteractor _lib_iv(PanelInteractor)
+ #define PasteCmd _lib_iv(PasteCmd)
diff --git a/x11-toolkits/iv/files/patch-ap b/x11-toolkits/iv/files/patch-ap
new file mode 100644
index 000000000000..39dcfb99dcfb
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ap
@@ -0,0 +1,10 @@
+--- src/include/Unidraw/_undefs.h.orig	Sat Oct 31 08:22:35 1992
++++ src/include/Unidraw/_undefs.h	Sun Jan 17 17:48:20 1999
+@@ -156,7 +156,6 @@
+ #undef PadComp
+ #undef PadGraphic
+ #undef PadView
+-#undef Page
+ #undef PanelControl
+ #undef PanelInteractor
+ #undef PasteCmd
diff --git a/x11-toolkits/iv/files/patch-aq b/x11-toolkits/iv/files/patch-aq
new file mode 100644
index 000000000000..3511bb34d524
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-aq
@@ -0,0 +1,12 @@
+--- src/lib/IV-2_6/painter.c.orig	Wed Feb 12 05:49:44 1992
++++ src/lib/IV-2_6/painter.c	Sun Jan 17 17:48:20 1999
+@@ -39,6 +39,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <InterViews/_names.h>
++#include <InterViews/_enter.h>
++
+ /*
+  * For reasons of caching, it is important that the attributes
+  * are set to nil (or 0) before being set to their default values.
diff --git a/x11-toolkits/iv/files/patch-ar b/x11-toolkits/iv/files/patch-ar
new file mode 100644
index 000000000000..7ca84d896bcf
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ar
@@ -0,0 +1,10 @@
+--- src/lib/IV-2_6/xpainter.c.orig	Tue Oct 20 05:32:42 1992
++++ src/lib/IV-2_6/xpainter.c	Sun Jan 17 17:48:20 1999
+@@ -56,6 +56,7 @@
+ #include <OS/math.h>
+ #include <OS/string.h>
+ #include <OS/table2.h>
++#include <InterViews/_names.h>
+ 
+ PainterRep::PainterRep() {
+     display = Session::instance()->default_display();
diff --git a/x11-toolkits/iv/files/patch-as b/x11-toolkits/iv/files/patch-as
new file mode 100644
index 000000000000..3ddc0cf3d0b3
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-as
@@ -0,0 +1,11 @@
+--- src/lib/IV-X11/xwindow.c.orig	Tue Nov 24 05:26:43 1992
++++ src/lib/IV-X11/xwindow.c	Sun Jan 17 17:48:18 1999
+@@ -64,7 +64,7 @@
+ 
+ /* no standard place for this */
+ extern "C" {
+-    extern int ioctl(int, int, ...);
++    extern int ioctl(int, long unsigned int, ...);
+ }
+ 
+ implementPtrList(WindowVisualList,WindowVisual)
diff --git a/x11-toolkits/iv/files/patch-at b/x11-toolkits/iv/files/patch-at
new file mode 100644
index 000000000000..6057d2305fb4
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-at
@@ -0,0 +1,16 @@
+--- src/lib/OS/string.c.orig	Tue Jul 14 02:54:03 1992
++++ src/lib/OS/string.c	Sun Jan 17 17:48:19 1999
+@@ -31,11 +31,13 @@
+  */
+ 
+ extern "C" {
++#ifndef __FreeBSD__
+ #ifndef tolower
+     extern int tolower(int);
+ #endif
+ #ifndef toupper
+     extern int toupper(int);
++#endif
+ #endif
+     extern long int strtol(const char*, char**, int);
+     extern double strtod(const char*, char**);
diff --git a/x11-toolkits/iv/files/patch-au b/x11-toolkits/iv/files/patch-au
new file mode 100644
index 000000000000..8f170e50f992
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-au
@@ -0,0 +1,10 @@
+--- src/lib/TIFF/mkg3states.c.orig	Sat Mar  7 04:11:03 1992
++++ src/lib/TIFF/mkg3states.c	Sun Jan 17 17:48:19 1999
+@@ -68,6 +68,7 @@
+  * END (from the original source)
+  */
+ #include <stdio.h>
++#define va_dcl /**/
+ #include "prototypes.h"
+ 
+ #ifndef TRUE
diff --git a/x11-toolkits/iv/files/patch-av b/x11-toolkits/iv/files/patch-av
new file mode 100644
index 000000000000..b0ea90716725
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-av
@@ -0,0 +1,11 @@
+--- src/lib/TIFF/tif_aux.c.orig	Sat Mar 28 07:53:06 1992
++++ src/lib/TIFF/tif_aux.c	Sun Jan 17 17:48:20 1999
+@@ -42,6 +42,8 @@
+  *	explcit values so that defaults exist only one
+  *	place in the library -- in TIFFDefaultDirectory.
+  */
++ ;
++ /* for some reason it needs a ; before this line */
+ TIFFVGetFieldDefaulted(tif, tag, ap)
+ 	TIFF *tif;
+ 	int tag;
diff --git a/x11-toolkits/iv/files/patch-aw b/x11-toolkits/iv/files/patch-aw
new file mode 100644
index 000000000000..37ea8c3aa390
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-aw
@@ -0,0 +1,12 @@
+--- src/lib/TIFF/tif_dir.c.orig	Sat Mar  7 04:59:51 1992
++++ src/lib/TIFF/tif_dir.c	Sun Jan 17 17:48:20 1999
+@@ -950,7 +950,8 @@
+ 		}
+ 		if (tif->tif_flags & TIFF_SWAB)
+ 			TIFFSwabShort(&dircount);
+-		lseek(tif->tif_fd, dircount*sizeof (TIFFDirEntry), L_INCR);
++		/*added (off_t) .. jj@ldjpc.apana.org.au*/
++		lseek(tif->tif_fd, (off_t)(dircount*sizeof (TIFFDirEntry)), L_INCR);
+ 		if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
+ 			TIFFError(module, "%s: Error fetching directory link",
+ 			    tif->tif_name);
diff --git a/x11-toolkits/iv/files/patch-ax b/x11-toolkits/iv/files/patch-ax
new file mode 100644
index 000000000000..7b78b69d5163
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ax
@@ -0,0 +1,60 @@
+--- src/lib/TIFF/tif_dirwrite.c.orig	Wed Mar 18 04:09:29 1992
++++ src/lib/TIFF/tif_dirwrite.c	Sun Jan 17 17:48:20 1999
+@@ -177,7 +177,8 @@
+ 	dataoff = tif->tif_diroff + sizeof (short) + dirsize + sizeof (long);
+ 	if (dataoff & 1)
+ 		dataoff++;
+-	(void) lseek(tif->tif_fd, dataoff, L_SET);
++	/* added (off_t) below.....jj@ldjpc.apana.org.au*/
++	(void) lseek(tif->tif_fd, (off_t)(dataoff), L_SET);
+ 	tif->tif_curdir++;
+ 	dir = (TIFFDirEntry *)data;
+ 	/*
+@@ -314,7 +315,8 @@
+ 	/*
+ 	 * Write directory.
+ 	 */
+-	(void) lseek(tif->tif_fd, tif->tif_diroff, L_SET);
++	/*added (off_t) below.....jj@ldjpc.apana.org.au*/
++	(void) lseek(tif->tif_fd, (off_t)(tif->tif_diroff), L_SET);
+ 	dircount = nfields;
+ 	if (!WriteOK(tif->tif_fd, &dircount, sizeof (short))) {
+ 		TIFFError(tif->tif_name, "Error writing directory count");
+@@ -762,13 +764,15 @@
+ 	u_short dircount;
+ 	long nextdir;
+ 
+-	tif->tif_diroff = (lseek(tif->tif_fd, 0L, L_XTND)+1) &~ 1L;
++	/* changed 0L to (off_t)0 below...jj@ldjpc.apana.org.au*/
++	tif->tif_diroff = (lseek(tif->tif_fd, (off_t)0, L_XTND)+1) &~ 1L;
+ 	if (tif->tif_header.tiff_diroff == 0) {
+ 		/*
+ 		 * First directory, overwrite header.
+ 		 */
+ 		tif->tif_header.tiff_diroff = tif->tif_diroff;
+-		(void) lseek(tif->tif_fd, 0L, L_SET);
++		/* changed 0L to (off_t)0 .. jj@ldjpc.apana.org.au*/
++		(void) lseek(tif->tif_fd, (off_t)0, L_SET);
+ 		if (!WriteOK(tif->tif_fd, &tif->tif_header,
+ 		    sizeof (tif->tif_header))) {
+ 			TIFFError(tif->tif_name, "Error writing TIFF header");
+@@ -788,7 +792,8 @@
+ 		}
+ 		if (tif->tif_flags & TIFF_SWAB)
+ 			TIFFSwabShort(&dircount);
+-		lseek(tif->tif_fd, dircount * sizeof (TIFFDirEntry), L_INCR);
++		/*added (off_t) below....jj@ldjpc.apana.org.au*/
++		lseek(tif->tif_fd, (off_t)(dircount * sizeof (TIFFDirEntry)), L_INCR);
+ 		if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
+ 			TIFFError(module, "Error fetching directory link");
+ 			return (0);
+@@ -796,7 +801,8 @@
+ 		if (tif->tif_flags & TIFF_SWAB)
+ 			TIFFSwabLong((u_long *)&nextdir);
+ 	} while (nextdir != 0);
+-	(void) lseek(tif->tif_fd, -sizeof (nextdir), L_INCR);
++	/*added (off_t) below ... jj@ldjpc.apana.org.au*/
++	(void) lseek(tif->tif_fd, (off_t)(-sizeof (nextdir)), L_INCR);
+ 	if (!WriteOK(tif->tif_fd, &tif->tif_diroff, sizeof (tif->tif_diroff))) {
+ 		TIFFError(module, "Error writing directory link");
+ 		return (0);
diff --git a/x11-toolkits/iv/files/patch-ay b/x11-toolkits/iv/files/patch-ay
new file mode 100644
index 000000000000..69aab2ff2693
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ay
@@ -0,0 +1,12 @@
+--- src/lib/TIFF/tif_write.c.orig	Tue Feb 11 12:06:47 1992
++++ src/lib/TIFF/tif_write.c	Sun Jan 17 17:48:20 1999
+@@ -550,7 +550,8 @@
+ 			}
+ 		} else
+ 			td->td_stripoffset[strip] =
+-			    lseek(tif->tif_fd, 0L, L_XTND);
++			    /*changed 0L to (off_t)0 .. jj@ldjpc.apana.org.au*/
++			    lseek(tif->tif_fd, (off_t)0, L_XTND);
+ 		tif->tif_curoff = td->td_stripoffset[strip];
+ 	}
+ 	if (!WriteOK(tif->tif_fd, data, cc)) {
diff --git a/x11-toolkits/iv/files/patch-az b/x11-toolkits/iv/files/patch-az
new file mode 100644
index 000000000000..d29181c5d6c2
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-az
@@ -0,0 +1,40 @@
+--- src/lib/TIFF/tiffcompat.h.orig	Tue Mar 31 11:31:04 1992
++++ src/lib/TIFF/tiffcompat.h	Sun Jan 17 17:48:20 1999
+@@ -154,7 +154,8 @@
+ #define	lseek	mpw_lseek
+ extern long mpw_lseek(int, long, int);
+ #else
+-extern	long lseek();
++/*changed to the correct one...jj@ldjpc.apana.org.au*/
++extern	off_t lseek();
+ #endif
+ 
+ /*
+@@ -163,8 +164,9 @@
+ #ifndef ReadOK
+ #define	ReadOK(fd, buf, size)	(read(fd, (char *)buf, size) == size)
+ #endif
++/*changed (long) to (off_t) to compile....jj@ldjpc.apana.org.au*/
+ #ifndef SeekOK
+-#define	SeekOK(fd, off)	(lseek(fd, (long)off, L_SET) == (long)off)
++#define	SeekOK(fd, off)	(lseek(fd, (off_t)off, L_SET) == (off_t)off)
+ #endif
+ #ifndef WriteOK
+ #define	WriteOK(fd, buf, size)	(write(fd, (char *)buf, size) == size)
+@@ -202,10 +204,15 @@
+  */
+ #if defined(__STDC__) && !defined(USE_VARARGS)
+ #define	USE_VARARGS	0
++#else 
++#if defined(__FreeBSD__)
++#undef USE_VARARGS
++#define USE_VARARGS     0
++#endif
+ #endif
+ 
+ #if defined(USE_VARARGS)
+-#if USE_VARARGS
++#if USE_VARARGS && !defined(__FreeBSD__)
+ #include <varargs.h>
+ #define	VA_START(ap, parmN)	va_start(ap)
+ #else
diff --git a/x11-toolkits/iv/files/patch-ba b/x11-toolkits/iv/files/patch-ba
new file mode 100644
index 000000000000..1df5bedc0793
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ba
@@ -0,0 +1,24 @@
+--- makefile.orig	Sun Jan 17 20:56:19 1999
++++ makefile	Sun Jan 17 20:48:39 1999
+@@ -0,0 +1,21 @@
++CPU=FREEBSD
++
++all: src/Makefile
++	@$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)'
++
++# simple but brutal. Will not install to multiple destinations simultaneously.
++install: Makefile
++	@rm -rf installed ${DESTDIR}/usr/local/interviews
++	@mkdir -p ${DESTDIR}/usr/local/interviews
++	@ln -s ${DESTDIR}/usr/local/interviews installed
++	@$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)' $@
++
++src/Makefile: Makefile
++	@$(MAKE) Makefiles
++
++Makefile:
++	imake -T "InterViews/template" -I./src/config \
++		-I/usr/X11R6/lib/X11/config -DTOPDIR=. -DCURDIR=.
++
++.DEFAULT: src/Makefile
++	@$(MAKE) $(.MAKEFLAGS) -f Makefile 'CPU=$(CPU)' $@
diff --git a/x11-toolkits/iv/files/patch-bb b/x11-toolkits/iv/files/patch-bb
new file mode 100644
index 000000000000..3a42d837c943
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bb
@@ -0,0 +1,15 @@
+--- src/lib/IV/Imakefile.orig	Sat Sep 19 01:36:17 1992
++++ src/lib/IV/Imakefile	Sat Jan 16 19:47:51 1999
+@@ -32,7 +32,12 @@
+ 	$(OS)$(SLASH)*.$(CCSUFFIX)
+ 	/* TIFF not included because it can't use the same flags */
+ LIB	   = IV
++#VERSION	   = 3.1
++.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")
++VERSION	   = 3
++.else
+ VERSION	   = 3.1
++.endif
+ 
+ KIT_CCFLAGS = KitFlags
+ LIBPATHS   = -DIV_LIBALL='"$(ABSLIBALLDIR)"' -DX_LIBDIR='"$(XLIBDIR)"'
diff --git a/x11-toolkits/iv/files/patch-bc b/x11-toolkits/iv/files/patch-bc
new file mode 100644
index 000000000000..14a0ee80faaa
--- /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.1
++.endif
+ 
+ MakeLibrary($(LIB),$(VERSION))
+ 
diff --git a/x11-toolkits/iv/pkg-descr b/x11-toolkits/iv/pkg-descr
index 0d765f872bf4..d4d6ff9464aa 100644
--- a/x11-toolkits/iv/pkg-descr
+++ b/x11-toolkits/iv/pkg-descr
@@ -1 +1,3 @@
 Interviews is a toolkit with lots of nice utilities (like idraw).
+
+Seigo TANIMURA <tanimura@naklab.dnj.ynu.ac.jp>
diff --git a/x11-toolkits/iv/pkg-plist b/x11-toolkits/iv/pkg-plist
index a295d11ef8f5..4f1e8b61cff3 100644
--- a/x11-toolkits/iv/pkg-plist
+++ b/x11-toolkits/iv/pkg-plist
@@ -1,14 +1,20 @@
-@exec ln -fs ../interviews/lib/FREEBSD/libIV.so.3.1 %D/lib
-@exec ln -fs ../interviews/lib/FREEBSD/libUnidraw.so.3.1 %D/lib
-@unexec rm %D/lib/libIV.so.3.1
-@unexec rm %D/lib/libUnidraw.so.3.1
-interviews/config/InterViews/template
+interviews/bin/FREEBSD/alert
+interviews/bin/FREEBSD/cpu
+interviews/bin/FREEBSD/dclock
+interviews/bin/FREEBSD/doc
+interviews/bin/FREEBSD/ibmkmf
+interviews/bin/FREEBSD/ibuild
+interviews/bin/FREEBSD/iclass
+interviews/bin/FREEBSD/idemo
+interviews/bin/FREEBSD/idraw
+interviews/bin/FREEBSD/ifc
+interviews/bin/FREEBSD/ivmkmf
+interviews/bin/FREEBSD/logo
+interviews/bin/FREEBSD/mailbox
+interviews/bin/FREEBSD/remind
 interviews/config/InterViews/TIFF.def
 interviews/config/InterViews/arch.def
 interviews/config/InterViews/gcc.def
-interviews/config/InterViews/local.def
-interviews/config/InterViews/params.def
-interviews/config/InterViews/rules.def
 interviews/config/InterViews/iv-DGUX.cf
 interviews/config/InterViews/iv-Mips.cf
 interviews/config/InterViews/iv-aix.cf
@@ -32,6 +38,10 @@ interviews/config/InterViews/iv-stellar.cf
 interviews/config/InterViews/iv-sun.cf
 interviews/config/InterViews/iv-ultrix.cf
 interviews/config/InterViews/iv-x386.cf
+interviews/config/InterViews/local.def
+interviews/config/InterViews/params.def
+interviews/config/InterViews/rules.def
+interviews/config/InterViews/template
 interviews/config/InterViews/xparams.cf
 interviews/include/Dispatch/_defines.h
 interviews/include/Dispatch/_undefs.h
@@ -50,9 +60,6 @@ interviews/include/Dispatch/rpcregistry.h
 interviews/include/Dispatch/rpcservice.h
 interviews/include/Dispatch/rpcstream.h
 interviews/include/Dispatch/rpcwriter.h
-interviews/include/IV-2_6/_enter.h
-interviews/include/IV-2_6/_leave.h
-interviews/include/IV-2_6/_names.h
 interviews/include/IV-2_6/InterViews/adjuster.h
 interviews/include/IV-2_6/InterViews/alignment.h
 interviews/include/IV-2_6/InterViews/banner.h
@@ -77,7 +84,6 @@ interviews/include/IV-2_6/InterViews/message.h
 interviews/include/IV-2_6/InterViews/minmax.h
 interviews/include/IV-2_6/InterViews/paint.h
 interviews/include/IV-2_6/InterViews/painter.h
-interviews/include/IV-2_6/InterViews/scene.h
 interviews/include/IV-2_6/InterViews/panner.h
 interviews/include/IV-2_6/InterViews/perspective.h
 interviews/include/IV-2_6/InterViews/rubband.h
@@ -86,6 +92,7 @@ interviews/include/IV-2_6/InterViews/rubgroup.h
 interviews/include/IV-2_6/InterViews/rubline.h
 interviews/include/IV-2_6/InterViews/rubrect.h
 interviews/include/IV-2_6/InterViews/rubverts.h
+interviews/include/IV-2_6/InterViews/scene.h
 interviews/include/IV-2_6/InterViews/scrollbar.h
 interviews/include/IV-2_6/InterViews/scroller.h
 interviews/include/IV-2_6/InterViews/sensor.h
@@ -101,6 +108,9 @@ interviews/include/IV-2_6/InterViews/textstyle.h
 interviews/include/IV-2_6/InterViews/tray.h
 interviews/include/IV-2_6/InterViews/viewport.h
 interviews/include/IV-2_6/InterViews/world.h
+interviews/include/IV-2_6/_enter.h
+interviews/include/IV-2_6/_leave.h
+interviews/include/IV-2_6/_names.h
 interviews/include/IV-X11/Xdefs.h
 interviews/include/IV-X11/Xext.h
 interviews/include/IV-X11/Xlib.h
@@ -139,6 +149,57 @@ interviews/include/IV-look/slider.h
 interviews/include/IV-look/smf_kit.h
 interviews/include/IV-look/stepper.h
 interviews/include/IV-look/telltale.h
+interviews/include/InterViews/Bitmaps/big_checkmark.bm
+interviews/include/InterViews/Bitmaps/checkmark.bm
+interviews/include/InterViews/Bitmaps/chkbox.bm
+interviews/include/InterViews/Bitmaps/chkboxBoth.bm
+interviews/include/InterViews/Bitmaps/chkboxChosen.bm
+interviews/include/InterViews/Bitmaps/chkboxHit.bm
+interviews/include/InterViews/Bitmaps/dfast.bm
+interviews/include/InterViews/Bitmaps/dfastMask.bm
+interviews/include/InterViews/Bitmaps/dmover.bm
+interviews/include/InterViews/Bitmaps/dmoverHit.bm
+interviews/include/InterViews/Bitmaps/dmoverMask.bm
+interviews/include/InterViews/Bitmaps/enlarge.bm
+interviews/include/InterViews/Bitmaps/enlargeHit.bm
+interviews/include/InterViews/Bitmaps/enlargeMask.bm
+interviews/include/InterViews/Bitmaps/hand.bm
+interviews/include/InterViews/Bitmaps/handMask.bm
+interviews/include/InterViews/Bitmaps/ldfast.bm
+interviews/include/InterViews/Bitmaps/ldfastMask.bm
+interviews/include/InterViews/Bitmaps/lfast.bm
+interviews/include/InterViews/Bitmaps/lfastMask.bm
+interviews/include/InterViews/Bitmaps/lmover.bm
+interviews/include/InterViews/Bitmaps/lmoverHit.bm
+interviews/include/InterViews/Bitmaps/lmoverMask.bm
+interviews/include/InterViews/Bitmaps/lufast.bm
+interviews/include/InterViews/Bitmaps/lufastMask.bm
+interviews/include/InterViews/Bitmaps/page.bm
+interviews/include/InterViews/Bitmaps/pageBoth.bm
+interviews/include/InterViews/Bitmaps/pageChosen.bm
+interviews/include/InterViews/Bitmaps/pageHit.bm
+interviews/include/InterViews/Bitmaps/radio.bm
+interviews/include/InterViews/Bitmaps/radioBoth.bm
+interviews/include/InterViews/Bitmaps/radioChosen.bm
+interviews/include/InterViews/Bitmaps/radioHit.bm
+interviews/include/InterViews/Bitmaps/radioMask.bm
+interviews/include/InterViews/Bitmaps/rdfast.bm
+interviews/include/InterViews/Bitmaps/rdfastMask.bm
+interviews/include/InterViews/Bitmaps/reducer.bm
+interviews/include/InterViews/Bitmaps/reducerHit.bm
+interviews/include/InterViews/Bitmaps/reducerMask.bm
+interviews/include/InterViews/Bitmaps/rfast.bm
+interviews/include/InterViews/Bitmaps/rfastMask.bm
+interviews/include/InterViews/Bitmaps/rmover.bm
+interviews/include/InterViews/Bitmaps/rmoverHit.bm
+interviews/include/InterViews/Bitmaps/rmoverMask.bm
+interviews/include/InterViews/Bitmaps/rufast.bm
+interviews/include/InterViews/Bitmaps/rufastMask.bm
+interviews/include/InterViews/Bitmaps/ufast.bm
+interviews/include/InterViews/Bitmaps/ufastMask.bm
+interviews/include/InterViews/Bitmaps/umover.bm
+interviews/include/InterViews/Bitmaps/umoverHit.bm
+interviews/include/InterViews/Bitmaps/umoverMask.bm
 interviews/include/InterViews/_defines.h
 interviews/include/InterViews/_enter.h
 interviews/include/InterViews/_leave.h
@@ -216,57 +277,6 @@ interviews/include/InterViews/tile.h
 interviews/include/InterViews/transformer.h
 interviews/include/InterViews/window.h
 interviews/include/InterViews/xymarker.h
-interviews/include/InterViews/Bitmaps/big_checkmark.bm
-interviews/include/InterViews/Bitmaps/checkmark.bm
-interviews/include/InterViews/Bitmaps/chkbox.bm
-interviews/include/InterViews/Bitmaps/chkboxBoth.bm
-interviews/include/InterViews/Bitmaps/chkboxChosen.bm
-interviews/include/InterViews/Bitmaps/chkboxHit.bm
-interviews/include/InterViews/Bitmaps/dfast.bm
-interviews/include/InterViews/Bitmaps/dfastMask.bm
-interviews/include/InterViews/Bitmaps/dmover.bm
-interviews/include/InterViews/Bitmaps/dmoverHit.bm
-interviews/include/InterViews/Bitmaps/dmoverMask.bm
-interviews/include/InterViews/Bitmaps/enlarge.bm
-interviews/include/InterViews/Bitmaps/enlargeHit.bm
-interviews/include/InterViews/Bitmaps/enlargeMask.bm
-interviews/include/InterViews/Bitmaps/hand.bm
-interviews/include/InterViews/Bitmaps/handMask.bm
-interviews/include/InterViews/Bitmaps/ldfast.bm
-interviews/include/InterViews/Bitmaps/ldfastMask.bm
-interviews/include/InterViews/Bitmaps/lfast.bm
-interviews/include/InterViews/Bitmaps/lfastMask.bm
-interviews/include/InterViews/Bitmaps/lmover.bm
-interviews/include/InterViews/Bitmaps/lufast.bm
-interviews/include/InterViews/Bitmaps/lmoverHit.bm
-interviews/include/InterViews/Bitmaps/lmoverMask.bm
-interviews/include/InterViews/Bitmaps/lufastMask.bm
-interviews/include/InterViews/Bitmaps/page.bm
-interviews/include/InterViews/Bitmaps/pageBoth.bm
-interviews/include/InterViews/Bitmaps/pageChosen.bm
-interviews/include/InterViews/Bitmaps/pageHit.bm
-interviews/include/InterViews/Bitmaps/radio.bm
-interviews/include/InterViews/Bitmaps/radioBoth.bm
-interviews/include/InterViews/Bitmaps/radioChosen.bm
-interviews/include/InterViews/Bitmaps/radioHit.bm
-interviews/include/InterViews/Bitmaps/radioMask.bm
-interviews/include/InterViews/Bitmaps/rdfast.bm
-interviews/include/InterViews/Bitmaps/rdfastMask.bm
-interviews/include/InterViews/Bitmaps/reducer.bm
-interviews/include/InterViews/Bitmaps/reducerHit.bm
-interviews/include/InterViews/Bitmaps/reducerMask.bm
-interviews/include/InterViews/Bitmaps/rfast.bm
-interviews/include/InterViews/Bitmaps/rfastMask.bm
-interviews/include/InterViews/Bitmaps/rmover.bm
-interviews/include/InterViews/Bitmaps/rmoverHit.bm
-interviews/include/InterViews/Bitmaps/rmoverMask.bm
-interviews/include/InterViews/Bitmaps/rufast.bm
-interviews/include/InterViews/Bitmaps/rufastMask.bm
-interviews/include/InterViews/Bitmaps/ufast.bm
-interviews/include/InterViews/Bitmaps/ufastMask.bm
-interviews/include/InterViews/Bitmaps/umover.bm
-interviews/include/InterViews/Bitmaps/umoverHit.bm
-interviews/include/InterViews/Bitmaps/umoverMask.bm
 interviews/include/OS/_defines.h
 interviews/include/OS/_undefs.h
 interviews/include/OS/directory.h
@@ -283,43 +293,22 @@ interviews/include/OS/table.h
 interviews/include/OS/table2.h
 interviews/include/OS/types.h
 interviews/include/OS/ustring.h
-interviews/include/Unidraw/_defines.h
-interviews/include/Unidraw/_undefs.h
-interviews/include/Unidraw/catalog.h
-interviews/include/Unidraw/classes.h
-interviews/include/Unidraw/clipboard.h
-interviews/include/Unidraw/creator.h
-interviews/include/Unidraw/ctrlinfo.h
-interviews/include/Unidraw/dialogs.h
-interviews/include/Unidraw/editor.h
-interviews/include/Unidraw/editorinfo.h
-interviews/include/Unidraw/enter-scope.h
-interviews/include/Unidraw/globals.h
-interviews/include/Unidraw/grid.h
-interviews/include/Unidraw/iterator.h
-interviews/include/Unidraw/keymap.h
-interviews/include/Unidraw/kybd.h
-interviews/include/Unidraw/leave-scope.h
-interviews/include/Unidraw/manip.h
-interviews/include/Unidraw/manips.h
-interviews/include/Unidraw/path.h
-interviews/include/Unidraw/selection.h
-interviews/include/Unidraw/statevar.h
-interviews/include/Unidraw/statevars.h
-interviews/include/Unidraw/stateview.h
-interviews/include/Unidraw/stateviews.h
-interviews/include/Unidraw/transfn.h
-interviews/include/Unidraw/transfns.h
-interviews/include/Unidraw/uarray.h
-interviews/include/Unidraw/uctrl.h
-interviews/include/Unidraw/uctrls.h
-interviews/include/Unidraw/uformat.h
-interviews/include/Unidraw/uhash.h
-interviews/include/Unidraw/ulist.h
-interviews/include/Unidraw/umap.h
-interviews/include/Unidraw/unidraw.h
-interviews/include/Unidraw/upage.h
-interviews/include/Unidraw/viewer.h
+interviews/include/Unidraw/Commands/align.h
+interviews/include/Unidraw/Commands/brushcmd.h
+interviews/include/Unidraw/Commands/catcmds.h
+interviews/include/Unidraw/Commands/colorcmd.h
+interviews/include/Unidraw/Commands/command.h
+interviews/include/Unidraw/Commands/data.h
+interviews/include/Unidraw/Commands/datas.h
+interviews/include/Unidraw/Commands/edit.h
+interviews/include/Unidraw/Commands/font.h
+interviews/include/Unidraw/Commands/import.h
+interviews/include/Unidraw/Commands/macro.h
+interviews/include/Unidraw/Commands/nop.h
+interviews/include/Unidraw/Commands/patcmd.h
+interviews/include/Unidraw/Commands/struct.h
+interviews/include/Unidraw/Commands/transforms.h
+interviews/include/Unidraw/Commands/viewcmds.h
 interviews/include/Unidraw/Components/cglue.h
 interviews/include/Unidraw/Components/component.h
 interviews/include/Unidraw/Components/compview.h
@@ -344,22 +333,6 @@ interviews/include/Unidraw/Components/spline.h
 interviews/include/Unidraw/Components/stencilcomp.h
 interviews/include/Unidraw/Components/text.h
 interviews/include/Unidraw/Components/vertices.h
-interviews/include/Unidraw/Commands/align.h
-interviews/include/Unidraw/Commands/brushcmd.h
-interviews/include/Unidraw/Commands/catcmds.h
-interviews/include/Unidraw/Commands/colorcmd.h
-interviews/include/Unidraw/Commands/command.h
-interviews/include/Unidraw/Commands/data.h
-interviews/include/Unidraw/Commands/datas.h
-interviews/include/Unidraw/Commands/edit.h
-interviews/include/Unidraw/Commands/font.h
-interviews/include/Unidraw/Commands/import.h
-interviews/include/Unidraw/Commands/macro.h
-interviews/include/Unidraw/Commands/nop.h
-interviews/include/Unidraw/Commands/patcmd.h
-interviews/include/Unidraw/Commands/struct.h
-interviews/include/Unidraw/Commands/transforms.h
-interviews/include/Unidraw/Commands/viewcmds.h
 interviews/include/Unidraw/Graphic/damage.h
 interviews/include/Unidraw/Graphic/ellipses.h
 interviews/include/Unidraw/Graphic/geomobjs.h
@@ -385,17 +358,54 @@ interviews/include/Unidraw/Tools/scale.h
 interviews/include/Unidraw/Tools/select.h
 interviews/include/Unidraw/Tools/stretch.h
 interviews/include/Unidraw/Tools/tool.h
+interviews/include/Unidraw/_defines.h
+interviews/include/Unidraw/_undefs.h
+interviews/include/Unidraw/catalog.h
+interviews/include/Unidraw/classes.h
+interviews/include/Unidraw/clipboard.h
+interviews/include/Unidraw/creator.h
+interviews/include/Unidraw/ctrlinfo.h
+interviews/include/Unidraw/dialogs.h
+interviews/include/Unidraw/editor.h
+interviews/include/Unidraw/editorinfo.h
+interviews/include/Unidraw/enter-scope.h
+interviews/include/Unidraw/globals.h
+interviews/include/Unidraw/grid.h
+interviews/include/Unidraw/iterator.h
+interviews/include/Unidraw/keymap.h
+interviews/include/Unidraw/kybd.h
+interviews/include/Unidraw/leave-scope.h
+interviews/include/Unidraw/manip.h
+interviews/include/Unidraw/manips.h
+interviews/include/Unidraw/path.h
+interviews/include/Unidraw/selection.h
+interviews/include/Unidraw/statevar.h
+interviews/include/Unidraw/statevars.h
+interviews/include/Unidraw/stateview.h
+interviews/include/Unidraw/stateviews.h
+interviews/include/Unidraw/transfn.h
+interviews/include/Unidraw/transfns.h
+interviews/include/Unidraw/uarray.h
+interviews/include/Unidraw/uctrl.h
+interviews/include/Unidraw/uctrls.h
+interviews/include/Unidraw/uformat.h
+interviews/include/Unidraw/uhash.h
+interviews/include/Unidraw/ulist.h
+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/all/app-defaults/Doc
-interviews/lib/all/app-defaults/InterViews
 interviews/lib/all/app-defaults/Idemo
-interviews/lib/all/doc-samples/intro.doc
-interviews/lib/all/doc-samples/slides.doc
-interviews/lib/all/doc-samples/uist.doc
+interviews/lib/all/app-defaults/InterViews
 interviews/lib/all/doc-samples/car.ips
 interviews/lib/all/doc-samples/flag.oz.ips
+interviews/lib/all/doc-samples/intro.doc
 interviews/lib/all/doc-samples/objects.ips
+interviews/lib/all/doc-samples/slides.doc
+interviews/lib/all/doc-samples/uist.doc
 interviews/lib/all/drawings/car
 interviews/lib/all/drawings/car.bw
 interviews/lib/all/drawings/cis
@@ -404,27 +414,27 @@ interviews/lib/all/drawings/flags
 interviews/lib/all/drawings/pepsi
 interviews/lib/all/drawings/qbf
 interviews/lib/all/drawings/workstation
-interviews/lib/all/ibuild-samples/README
 interviews/lib/all/ibuild-samples/Clock/Clock.c
 interviews/lib/all/ibuild-samples/Clock/Clock.h
 interviews/lib/all/ibuild-samples/Clock/Dial.c
 interviews/lib/all/ibuild-samples/Clock/Dial.h
-interviews/lib/all/ibuild-samples/Clock/clock-main.c
 interviews/lib/all/ibuild-samples/Clock/clock
+interviews/lib/all/ibuild-samples/Clock/clock-main.c
 interviews/lib/all/ibuild-samples/Grapher/Grapher.c
 interviews/lib/all/ibuild-samples/Grapher/Grapher.h
 interviews/lib/all/ibuild-samples/Grapher/Plotter.c
 interviews/lib/all/ibuild-samples/Grapher/Plotter.h
-interviews/lib/all/ibuild-samples/Grapher/grapher-main.c
 interviews/lib/all/ibuild-samples/Grapher/grapher
+interviews/lib/all/ibuild-samples/Grapher/grapher-main.c
 interviews/lib/all/ibuild-samples/Meter/Meter.c
 interviews/lib/all/ibuild-samples/Meter/Meter.h
 interviews/lib/all/ibuild-samples/Meter/meter
 interviews/lib/all/ibuild-samples/Pie/Pie.c
 interviews/lib/all/ibuild-samples/Pie/Pie.h
-interviews/lib/all/ibuild-samples/Pie/pie-main.c
 interviews/lib/all/ibuild-samples/Pie/pie
+interviews/lib/all/ibuild-samples/Pie/pie-main.c
 interviews/lib/all/ibuild-samples/Punidraw/punidraw
+interviews/lib/all/ibuild-samples/README
 interviews/lib/all/ibuild-samples/Sted/OpenDialog.c
 interviews/lib/all/ibuild-samples/Sted/OpenDialog.h
 interviews/lib/all/ibuild-samples/Sted/SaveDialog.c
@@ -437,8 +447,8 @@ interviews/lib/all/ibuild-samples/Sted/sted
 interviews/lib/all/ibuild-samples/Sted/sted-main.c
 interviews/lib/all/ibuild-samples/VMouse/VMouse.c
 interviews/lib/all/ibuild-samples/VMouse/VMouse.h
-interviews/lib/all/ibuild-samples/VMouse/vmouse-main.c
 interviews/lib/all/ibuild-samples/VMouse/vmouse
+interviews/lib/all/ibuild-samples/VMouse/vmouse-main.c
 interviews/lib/all/ibuild-samples/VWork/VWork.c
 interviews/lib/all/ibuild-samples/VWork/VWork.h
 interviews/lib/all/ibuild-samples/VWork/vwork
@@ -504,20 +514,49 @@ interviews/lib/all/styles/slides.sty
 interviews/lib/all/styles/smallpage.sty
 interviews/lib/all/styles/thesis.sty
 interviews/lib/all/styles/times.sty
-interviews/bin/FREEBSD/alert
-interviews/bin/FREEBSD/dclock
-interviews/bin/FREEBSD/doc
-interviews/bin/FREEBSD/ibuild
-interviews/bin/FREEBSD/iclass
-interviews/bin/FREEBSD/idemo
-interviews/bin/FREEBSD/idraw
-interviews/bin/FREEBSD/ifc
-interviews/bin/FREEBSD/logo
-interviews/bin/FREEBSD/mailbox
-interviews/bin/FREEBSD/cpu
-interviews/bin/FREEBSD/ibmkmf
-interviews/bin/FREEBSD/ivmkmf
-interviews/bin/FREEBSD/remind
 interviews/man/refman.PS
-@exec ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+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
+@dirrm interviews/bin
+@dirrm interviews/config/InterViews
+@dirrm interviews/config
+@dirrm interviews/include/Dispatch
+@dirrm interviews/include/IV-2_6/InterViews
+@dirrm interviews/include/IV-2_6
+@dirrm interviews/include/IV-X11
+@dirrm interviews/include/IV-look
+@dirrm interviews/include/InterViews/Bitmaps
+@dirrm interviews/include/InterViews
+@dirrm interviews/include/OS
+@dirrm interviews/include/Unidraw/Commands
+@dirrm interviews/include/Unidraw/Components
+@dirrm interviews/include/Unidraw/Graphic
+@dirrm interviews/include/Unidraw/Tools
+@dirrm interviews/include/Unidraw
+@dirrm interviews/include
+@dirrm interviews/lib/FREEBSD
+@dirrm interviews/lib/all/app-defaults
+@dirrm interviews/lib/all/doc-samples
+@dirrm interviews/lib/all/drawings
+@dirrm interviews/lib/all/ibuild-samples/Clock
+@dirrm interviews/lib/all/ibuild-samples/Grapher
+@dirrm interviews/lib/all/ibuild-samples/Meter
+@dirrm interviews/lib/all/ibuild-samples/Pie
+@dirrm interviews/lib/all/ibuild-samples/Punidraw
+@dirrm interviews/lib/all/ibuild-samples/Sted
+@dirrm interviews/lib/all/ibuild-samples/VMouse
+@dirrm interviews/lib/all/ibuild-samples/VWork
+@dirrm interviews/lib/all/ibuild-samples
+@dirrm interviews/lib/all/images
+@dirrm interviews/lib/all/logos
+@dirrm interviews/lib/all/styles
+@dirrm interviews/lib/all
+@dirrm interviews/lib
+@dirrm interviews/man/mann
+@dirrm interviews/man
+@dirrm interviews