aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorkris <kris@FreeBSD.org>2003-08-07 13:10:43 +0800
committerkris <kris@FreeBSD.org>2003-08-07 13:10:43 +0800
commit6c2d2ee359e44cb7f090a1d706f12c42220a5874 (patch)
treebccdc9a63ecb4345bb558f0bdcef651bf0a50b29 /x11-toolkits
parent0b7fd01c0727d19e2cd548dbc31e18cce327d57a (diff)
downloadfreebsd-ports-gnome-6c2d2ee359e44cb7f090a1d706f12c42220a5874.tar.gz
freebsd-ports-gnome-6c2d2ee359e44cb7f090a1d706f12c42220a5874.tar.zst
freebsd-ports-gnome-6c2d2ee359e44cb7f090a1d706f12c42220a5874.zip
As announced on May 6, remove the broken iv port
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/Makefile1
-rw-r--r--x11-toolkits/iv/Makefile96
-rw-r--r--x11-toolkits/iv/distinfo1
-rw-r--r--x11-toolkits/iv/files/patch-aa46
-rw-r--r--x11-toolkits/iv/files/patch-ab12
-rw-r--r--x11-toolkits/iv/files/patch-ac34
-rw-r--r--x11-toolkits/iv/files/patch-ad10
-rw-r--r--x11-toolkits/iv/files/patch-ae11
-rw-r--r--x11-toolkits/iv/files/patch-af14
-rw-r--r--x11-toolkits/iv/files/patch-ag27
-rw-r--r--x11-toolkits/iv/files/patch-ah64
-rw-r--r--x11-toolkits/iv/files/patch-ai41
-rw-r--r--x11-toolkits/iv/files/patch-aj16
-rw-r--r--x11-toolkits/iv/files/patch-ak17
-rw-r--r--x11-toolkits/iv/files/patch-al570
-rw-r--r--x11-toolkits/iv/files/patch-am30
-rw-r--r--x11-toolkits/iv/files/patch-an64
-rw-r--r--x11-toolkits/iv/files/patch-ao10
-rw-r--r--x11-toolkits/iv/files/patch-ap10
-rw-r--r--x11-toolkits/iv/files/patch-aq12
-rw-r--r--x11-toolkits/iv/files/patch-ar27
-rw-r--r--x11-toolkits/iv/files/patch-as11
-rw-r--r--x11-toolkits/iv/files/patch-at16
-rw-r--r--x11-toolkits/iv/files/patch-au10
-rw-r--r--x11-toolkits/iv/files/patch-av11
-rw-r--r--x11-toolkits/iv/files/patch-aw12
-rw-r--r--x11-toolkits/iv/files/patch-ax60
-rw-r--r--x11-toolkits/iv/files/patch-ay12
-rw-r--r--x11-toolkits/iv/files/patch-az40
-rw-r--r--x11-toolkits/iv/files/patch-ba24
-rw-r--r--x11-toolkits/iv/files/patch-bb16
-rw-r--r--x11-toolkits/iv/files/patch-bc16
-rw-r--r--x11-toolkits/iv/files/patch-bd43
-rw-r--r--x11-toolkits/iv/files/patch-be12
-rw-r--r--x11-toolkits/iv/files/patch-bf11
-rw-r--r--x11-toolkits/iv/files/patch-bg53
-rw-r--r--x11-toolkits/iv/files/patch-bh12
-rw-r--r--x11-toolkits/iv/files/patch-bi18
-rw-r--r--x11-toolkits/iv/files/patch-bj48
-rw-r--r--x11-toolkits/iv/files/patch-bk24
-rw-r--r--x11-toolkits/iv/files/patch-bl10
-rw-r--r--x11-toolkits/iv/files/patch-bm14
-rw-r--r--x11-toolkits/iv/files/patch-bn15
-rw-r--r--x11-toolkits/iv/files/patch-bo12
-rw-r--r--x11-toolkits/iv/files/patch-bp16
-rw-r--r--x11-toolkits/iv/files/patch-bq14
-rw-r--r--x11-toolkits/iv/files/patch-br14
-rw-r--r--x11-toolkits/iv/files/patch-bs11
-rw-r--r--x11-toolkits/iv/files/patch-bt13
-rw-r--r--x11-toolkits/iv/files/patch-bu19
-rw-r--r--x11-toolkits/iv/files/patch-bv13
-rw-r--r--x11-toolkits/iv/files/patch-bw232
-rw-r--r--x11-toolkits/iv/files/patch-bx142
-rw-r--r--x11-toolkits/iv/files/patch-by42
-rw-r--r--x11-toolkits/iv/files/patch-bz19
-rw-r--r--x11-toolkits/iv/files/patch-ca20
-rw-r--r--x11-toolkits/iv/files/patch-cb12
-rw-r--r--x11-toolkits/iv/files/patch-cc28
-rw-r--r--x11-toolkits/iv/files/patch-cd11
-rw-r--r--x11-toolkits/iv/files/patch-ce19
-rw-r--r--x11-toolkits/iv/files/patch-cf29
-rw-r--r--x11-toolkits/iv/files/patch-cg18
-rw-r--r--x11-toolkits/iv/files/patch-ch20
-rw-r--r--x11-toolkits/iv/files/patch-ci28
-rw-r--r--x11-toolkits/iv/files/patch-cj12
-rw-r--r--x11-toolkits/iv/files/patch-ck72
-rw-r--r--x11-toolkits/iv/files/patch-cl29
-rw-r--r--x11-toolkits/iv/files/patch-cm11
-rw-r--r--x11-toolkits/iv/files/patch-cn35
-rw-r--r--x11-toolkits/iv/files/patch-co11
-rw-r--r--x11-toolkits/iv/pkg-descr3
-rw-r--r--x11-toolkits/iv/pkg-plist567
-rw-r--r--x11-toolkits/iv/scripts/configure11
73 files changed, 0 insertions, 3084 deletions
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index b21a9ca57efc..e75efbf6ebc7 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -84,7 +84,6 @@
SUBDIR += hs-gtk2hs
SUBDIR += icegradient
SUBDIR += itk
- SUBDIR += iv
SUBDIR += iwidgets
SUBDIR += jx
SUBDIR += lesstif
diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
deleted file mode 100644
index a456ff671bc7..000000000000
--- a/x11-toolkits/iv/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-# New ports collection makefile for: iv
-# Date created: 23.sept.1994
-# Whom: adam
-#
-# $FreeBSD$
-#
-
-PORTNAME= iv
-PORTVERSION= 3.2a
-CATEGORIES= x11-toolkits
-MASTER_SITES= ftp://ftp.sgi.com/graphics/interviews/
-DISTNAME= ${PORTVERSION}
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= tanimura@FreeBSD.org
-COMMENT= InterViews: A toolkit from Stanford University and Silicon Graphics
-
-BROKEN= "Does not compile"
-
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4
-
-USE_XLIB= yes
-INSTALLS_SHLIB= yes
-
-DIST_SUBDIR= iv
-WRKSRC= ${WRKDIR}/iv
-MAKEFILE= makefile
-
-MANPREFIX= ${PREFIX}/interviews
-MANN= Adjuster.n Banner.n BasicDialog.n Border.n \
- Box2_6.n BrushCmd.n Button2_6.n CGlue.n \
- CSolver.n Catalog.n Clipboard.n ColorCmd.n \
- Command.n CompletionEditor.n Component.n ComponentView.n \
- ConnectTool.n Connector.n Control.n ControlInfo.n \
- Creator.n Damage.n Data.n Deck2_6.n \
- Dialog.n Dispatcher.n Editor.n EditorInfo.n \
- EllipseComp.n ExternView.n FileBrowser.n FileChooser.n \
- FontCmd.n Frame.n GVUpdater.n Glue2_6.n \
- Graphic.n GraphicBlock.n GraphicComp.n GraphicCompTool.n \
- GraphicView.n Grid.n IOCallback.n IOHandler.n \
- ImportCmd.n Interactor.n Iterator.n KeyMap.n \
- LineComp.n LinkComp.n MacroCmd.n MagnifyTool.n \
- Manipulator.n MatchEditor.n Menu2_6.n Message.n \
- MoveTool.n NOPCmd.n PadComp.n Page.n \
- Painter.n Panner.n Path.n Pattern.n \
- PatternCmd.n Perspective.n Picture.n PinComp.n \
- PolygonComp.n PostScriptView.n RasterComp.n RasterRect.n \
- RectComp.n Regexp.n ReqErr.n ReshapeTool.n \
- Resource.n RotateTool.n RpcHdr.n RpcPeer.n \
- RpcReader.n RpcRegistry.n RpcService.n RpcWriter.n \
- Rubband.n ScaleTool.n Scene.n Scroller.n \
- SelectTool.n Selection.n Sensor.n Shape.n \
- SlotComp.n SplineComp.n StateVar.n StateVarView.n \
- StencilComp.n StrBrowser.n StrChooser.n StretchTool.n \
- StringEditor.n Subject.n TextBuffer.n TextComp.n \
- TextDisplay.n TextEditor.n Tool.n TransferFunct.n \
- Tray.n UArray.n UControl.n UHashTable.n \
- ULabel.n UList.n UMap.n UStencil.n \
- Unidraw.n UnidrawIntro.n Vertices.n VerticesComp.n \
- Viewer.n Viewport.n World.n alert.n \
- align.n catcmds.n classes.n datas.n \
- dclock.n doc.n edit.n ellipses.n \
- geomobjs.n globals.n ibuild.n iclass.n \
- idraw.n ifb.n ifc.n iostreamb.n \
- ivmkmf.n kybd.n lines.n logo.n \
- mailbox.n manips.n polygons.n pspaint.n \
- remind.n rpcbuf.n rpcstream.n splines.n \
- 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.2
-.endif
-
-.if ${OSVERSION} >= 400002
-post-patch:
- @(cd ${WRKSRC}/src/config/InterViews; ${MV} -f iv-freebsd.cf \
- iv-freebsd.cf~; ${SED} -e 's/\-lg\+\+//' iv-freebsd.cf~ > iv-freebsd.cf)
-.endif
-
-post-install:
-# need these in ${PREFIX}/lib so that ldconfig can find them
- ${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
- ${LN} -fs libIV.so.${IV_LIB_VER} ${PREFIX}/interviews/lib/FREEBSD/libIV.so
- ${LN} -fs libUnidraw.so.${IV_LIB_VER} ${PREFIX}/interviews/lib/FREEBSD/libUnidraw.so
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-toolkits/iv/distinfo b/x11-toolkits/iv/distinfo
deleted file mode 100644
index 4414a01ca4e3..000000000000
--- a/x11-toolkits/iv/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (iv/3.2a.tar.Z) = 8d51188de584f8fb7b7829a57575399b
diff --git a/x11-toolkits/iv/files/patch-aa b/x11-toolkits/iv/files/patch-aa
deleted file mode 100644
index 70f1a6b9fd09..000000000000
--- a/x11-toolkits/iv/files/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/bin/ibuild/ibcmds.c.orig Mon Jan 3 08:12:08 1994
-+++ src/bin/ibuild/ibcmds.c Sun Jan 23 20:09:14 2000
-@@ -86,13 +86,16 @@
- #undef FileChooser
- #define FileChooser _lib_iv(FileChooser)
-
-+#if __FreeBSD_cc_version < 400002
- #include <osfcn.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <stream.h>
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
-+#include <unistd.h>
-
- #if defined(sgi) || defined(sco)
- /* not all vforks are alike */
-@@ -175,7 +178,7 @@
-
- static boolean Abort (Editor* ed, pid_t pid, const char* warning) {
- boolean aborted;
-- AbortDialog dialog(int(pid), warning);
-+ AbortDialog dialog((int)pid, warning);
- ed->InsertDialog(&dialog);
- aborted = dialog.Abort();
- ed->RemoveDialog(&dialog);
-@@ -2407,12 +2410,13 @@
- EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
- EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
-
-- 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)) {
-+ int i;
-+ IBEditor* iEd = (IBEditor*) unidraw->GetEditor(ii);
- ToolPanel* itoolpanel = iEd->GetToolPanel();
-
-- for (int i = 0; i < installed->Count(); i++) {
-+ for (i = 0; i < installed->Count(); i++) {
- itoolpanel->Install(installed->GetName(i));
- }
- for (i = 0; i < removed->Count(); i++) {
diff --git a/x11-toolkits/iv/files/patch-ab b/x11-toolkits/iv/files/patch-ab
deleted file mode 100644
index 57cb57f70526..000000000000
--- a/x11-toolkits/iv/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/bin/iclass/dialogs.c.orig Tue Aug 24 06:52:20 1993
-+++ src/bin/iclass/dialogs.c Sun Sep 5 13:36:17 1999
-@@ -41,7 +41,9 @@
-
- #include <stdlib.h>
- #include <string.h>
-+#if __FreeBSD_cc_version < 400002
- #include <osfcn.h>
-+#endif
-
- #if !defined(AIXV3) && !defined(hpux) && !defined(sun) && !defined(sgi)
- /* sigh, not all systems have this prototype */
diff --git a/x11-toolkits/iv/files/patch-ac b/x11-toolkits/iv/files/patch-ac
deleted file mode 100644
index 6a663f5977f4..000000000000
--- a/x11-toolkits/iv/files/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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
deleted file mode 100644
index 5044cfa33fd6..000000000000
--- a/x11-toolkits/iv/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 00c2bfac8e1d..000000000000
--- a/x11-toolkits/iv/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 374497410345..000000000000
--- a/x11-toolkits/iv/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 60e37c5dc2f1..000000000000
--- a/x11-toolkits/iv/files/patch-ag
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/config/InterViews/arch.def.orig Tue Jun 29 08:40:43 1993
-+++ src/config/InterViews/arch.def Sun Jan 23 17:28:56 2000
-@@ -404,6 +404,24 @@
- #define MacroFile InterViews/iv-alpha.cf
- #endif /* __alpha */
-
-+/*
-+ * XXX imake(1) seems to invoke /usr/libexec/cpp directly in certain
-+ * cases, leaving some macros including __FreeBSD__ undefined.
-+ */
-+#if !defined(__FreeBSD__)
-+#define __FreeBSD__
-+#endif /* __FreeBSD__ */
-+
-+#ifdef __FreeBSD__
-+#undef freebsd
-+#undef FREEBSD
-+#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
deleted file mode 100644
index d02d55694f9a..000000000000
--- a/x11-toolkits/iv/files/patch-ah
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/config/InterViews/local.def.orig Wed Aug 25 06:08:07 1993
-+++ src/config/InterViews/local.def Sun Sep 5 16:21:12 1999
-@@ -7,7 +7,14 @@
- /*
- * If you are using gcc/g++, then uncomment the include below.
- */
--/* #include <InterViews/gcc.def> */
-+#include <InterViews/gcc.def>
-+
-+#if defined (FreeBSDArchitecture)
-+#undef HasDynamicSharedLibs
-+#define HasDynamicSharedLibs YES
-+#undef HasDynamicSharedLibraries
-+#define HasDynamicSharedLibraries 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
deleted file mode 100644
index a3ace6a294bb..000000000000
--- a/x11-toolkits/iv/files/patch-ai
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/config/InterViews/rules.def.orig Wed Aug 25 07:47:08 1993
-+++ src/config/InterViews/rules.def Sun Sep 5 16:21:37 1999
-@@ -399,6 +399,30 @@
- /*
- * Make a shared library.
- */
-+#if defined(FreeBSDArchitecture)
-+#define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\
-+AOUT = Concat(lib,libname.so.rev) @@\
-+SHARED_CCFLAGS = SharedCCFlags @@\
-+ @@\
-+AllTarget(Concat(lib,libname.so.rev)) @@\
-+ @@\
-+Concat(lib,libname.so.rev): depobjs @@\
-+ @echo "building $@" @@\
-+ $(RM) $@~ @@\
-+.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf") @@\
-+ $(CC) -shared -Wl,-soname,Concat(lib,libname.so.rev) -o $@~ ldobjs @@\
-+.else @@\
-+ $(LD) -o $@~ -Bshareable ldobjs @@\
-+.endif @@\
-+ $(RM) $@ @@\
-+ $(MV) $@~ $@ @@\
-+.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf") @@\
-+ $(LN) $@ Concat(lib,libname.so) @@\
-+.endif @@\
-+ @@\
-+clean:: @@\
-+ $(RM) Concat(lib,libname.so.rev)
-+#else
- #ifndef NormalDynamicSharedLibraryTarget
- #if defined(sun) && OSMajorVersion < 5
- #define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\
-@@ -432,6 +456,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
deleted file mode 100644
index 300994ea6eeb..000000000000
--- a/x11-toolkits/iv/files/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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,13 @@
-+#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++
-+#undef SharedCCFlags
-+#define SharedCCFlags -fpic
-+#undef ExtraCCIncludes
-+#define ExtraCCIncludes -I/usr/include/g++
diff --git a/x11-toolkits/iv/files/patch-ak b/x11-toolkits/iv/files/patch-ak
deleted file mode 100644
index 799c6ae3e90b..000000000000
--- a/x11-toolkits/iv/files/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/include/IV-X11/xwindow.h.orig Sat Mar 13 07:21:41 1993
-+++ src/include/IV-X11/xwindow.h Sun Sep 5 13:44:40 1999
-@@ -46,7 +46,13 @@
- class Style;
- class WindowCursorStack;
- class WindowTable;
--
-+/*
-+ * modified by jj@ldjpc.apana.org.au
-+ *
-+ * this seems to break the compile...
-+class XDisplay;
-+ *
-+ */
- struct WindowOverlayInfo {
- VisualID id_;
- long type_;
diff --git a/x11-toolkits/iv/files/patch-al b/x11-toolkits/iv/files/patch-al
deleted file mode 100644
index 4b98dea3f7d6..000000000000
--- a/x11-toolkits/iv/files/patch-al
+++ /dev/null
@@ -1,570 +0,0 @@
---- 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
deleted file mode 100644
index c7358371d725..000000000000
--- a/x11-toolkits/iv/files/patch-am
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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
deleted file mode 100644
index 656d1f64316c..000000000000
--- a/x11-toolkits/iv/files/patch-an
+++ /dev/null
@@ -1,64 +0,0 @@
---- 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
deleted file mode 100644
index 0bbca96ec1ea..000000000000
--- a/x11-toolkits/iv/files/patch-ao
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 39dcfb99dcfb..000000000000
--- a/x11-toolkits/iv/files/patch-ap
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 3511bb34d524..000000000000
--- a/x11-toolkits/iv/files/patch-aq
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 7002bae379fd..000000000000
--- a/x11-toolkits/iv/files/patch-ar
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/lib/IV-2_6/xpainter.c.orig Tue Oct 20 05:32:42 1992
-+++ src/lib/IV-2_6/xpainter.c Sun Jan 23 18:46:22 2000
-@@ -56,6 +56,7 @@
- #include <OS/math.h>
- #include <OS/string.h>
- #include <OS/table2.h>
-+#include <InterViews/_names.h>
-
- PainterRep::PainterRep() {
- display = Session::instance()->default_display();
-@@ -1117,6 +1118,7 @@
- }
-
- void Painter::Polygon(Canvas* c, IntCoord x[], IntCoord y[], int n) {
-+ register int i;
- if (c == nil) {
- return;
- }
-@@ -1125,7 +1127,7 @@
- return;
- }
- register XPoint* v = AllocPts(n+1);
-- for (register int i = 0; i < n; i++) {
-+ for (i = 0; i < n; i++) {
- Map(c, x[i], y[i], v[i].x, v[i].y);
- }
- if (x[i-1] != x[0] || y[i-1] != y[0]) {
diff --git a/x11-toolkits/iv/files/patch-as b/x11-toolkits/iv/files/patch-as
deleted file mode 100644
index 3ddc0cf3d0b3..000000000000
--- a/x11-toolkits/iv/files/patch-as
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 6057d2305fb4..000000000000
--- a/x11-toolkits/iv/files/patch-at
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
deleted file mode 100644
index 8f170e50f992..000000000000
--- a/x11-toolkits/iv/files/patch-au
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index b0ea90716725..000000000000
--- a/x11-toolkits/iv/files/patch-av
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 37ea8c3aa390..000000000000
--- a/x11-toolkits/iv/files/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 7b78b69d5163..000000000000
--- a/x11-toolkits/iv/files/patch-ax
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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
deleted file mode 100644
index 69aab2ff2693..000000000000
--- a/x11-toolkits/iv/files/patch-ay
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index d29181c5d6c2..000000000000
--- a/x11-toolkits/iv/files/patch-az
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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
deleted file mode 100644
index 1df5bedc0793..000000000000
--- a/x11-toolkits/iv/files/patch-ba
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
deleted file mode 100644
index 5fc921f67254..000000000000
--- a/x11-toolkits/iv/files/patch-bb
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
-+VERSION = 3.2
-+.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
deleted file mode 100644
index 64bf06f90a8b..000000000000
--- a/x11-toolkits/iv/files/patch-bc
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/lib/Unidraw/Imakefile.orig Sat Oct 31 08:32:58 1992
-+++ src/lib/Unidraw/Imakefile Sat Jan 16 19:49:31 1999
-@@ -5,7 +5,12 @@
- #ifdef InObjectCodeDir
-
- LIB = Unidraw
--VERSION = 3.1
-+#VERSION = 3.1
-+.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")
-+VERSION = 3
-+.else
-+VERSION = 3.2
-+.endif
-
- MakeLibrary($(LIB),$(VERSION))
-
diff --git a/x11-toolkits/iv/files/patch-bd b/x11-toolkits/iv/files/patch-bd
deleted file mode 100644
index daa474d17f6a..000000000000
--- a/x11-toolkits/iv/files/patch-bd
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/lib/Unidraw/catalog.c.orig Tue May 25 06:29:33 1993
-+++ src/lib/Unidraw/catalog.c Sun Jan 23 19:23:39 2000
-@@ -58,7 +58,8 @@
- #include <IV-2_6/_enter.h>
-
- #include <ctype.h>
--#ifndef __DECCXX
-+/*#ifndef __DECCXX*/
-+#if !defined(__DECCXX) && (__FreeBSD_cc_version < 400002)
- #include <osfcn.h>
- #endif
- #include <stdio.h>
-@@ -66,7 +67,7 @@
- #include <string.h>
- #include <stream.h>
- #include <strstream.h>
--#ifdef SYSV
-+#if defined(SYSV) || (__FreeBSD_cc_version >= 400002)
- #include <unistd.h>
- #endif
- #include <sys/file.h>
-@@ -1504,7 +1505,8 @@
- in >> graylevel;
-
- } else if (graylevel == nograylevel) {
-- for (int i = 0; in >> buf && i < patternHeight; i++) {
-+ int i;
-+ for (i = 0; in >> buf && i < patternHeight; i++) {
- if (buf[0] == '>' || sscanf(buf, "%x", &data[i]) != 1) {
- break;
- }
-@@ -1611,9 +1613,9 @@
-
- } else {
- istrstream in(definition, strlen(definition) + 1);
-- int data[patternHeight];
-+ int data[patternHeight], i;
-
-- for (int i = 0; in >> buf && i < patternHeight; i++) {
-+ for (i = 0; in >> buf && i < patternHeight; i++) {
- if (sscanf(buf, "%x", &data[i]) != 1) {
- break;
- }
diff --git a/x11-toolkits/iv/files/patch-be b/x11-toolkits/iv/files/patch-be
deleted file mode 100644
index 7bec291bfe9c..000000000000
--- a/x11-toolkits/iv/files/patch-be
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/lib/Unidraw/catcmds.c.orig Thu May 27 20:08:11 1999
-+++ src/lib/Unidraw/catcmds.c Thu May 27 20:08:33 1999
-@@ -42,7 +42,9 @@
- #include <InterViews/window.h>
- #include <OS/string.h>
-
-+#if __FreeBSD_cc_version < 400002
- #include <osfcn.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <stream.h>
diff --git a/x11-toolkits/iv/files/patch-bf b/x11-toolkits/iv/files/patch-bf
deleted file mode 100644
index 27821508cb62..000000000000
--- a/x11-toolkits/iv/files/patch-bf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/dclock/clocktime.c.orig Thu May 27 21:32:07 1999
-+++ src/bin/dclock/clocktime.c Thu May 27 21:33:07 1999
-@@ -55,7 +55,7 @@
- #if defined(hpux) || defined(AIXV3)
- local = * localtime((time_t*) &gmt.tv_sec);
- #else
--#ifdef __DECCXX
-+#if defined(__DECCXX) || defined(__FreeBSD__)
- local = * localtime((time_t*)&gmt.tv_sec);
- #else
- local = * localtime(&gmt.tv_sec);
diff --git a/x11-toolkits/iv/files/patch-bg b/x11-toolkits/iv/files/patch-bg
deleted file mode 100644
index f712411fe450..000000000000
--- a/x11-toolkits/iv/files/patch-bg
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/bin/ibuild/ibcode.c.orig Fri Jun 4 05:55:09 1993
-+++ src/bin/ibuild/ibcode.c Sun Jan 23 20:12:54 2000
-@@ -42,7 +42,10 @@
- #include <InterViews/shape.h>
- #include <InterViews/transformer.h>
- #include <OS/types.h>
-+#if __FreeBSD_cc_version < 400002
- #include <osfcn.h>
-+#endif
-+#include <stdio.h>
- #include <stdlib.h>
- #include <stream.h>
- #include <string.h>
-@@ -363,7 +366,7 @@
- ButtonStateVar* bsVar = intcomp->GetButtonStateVar();
- const char* bsname = bsVar->GetName();
- const char* proc = bsVar->GetFuncName();
-- boolean export = bsVar->GetExport();
-+ boolean exportval = bsVar->GetExport();
- const char* subclass = bsVar->GetSubclassName();
-
- if (!bsVar->IsSubclass() && !_emitMain) {
-@@ -376,7 +379,7 @@
- if (!_bsinitslist->Search(bsname)) {
- _bsinitslist->Append(bsname);
-
-- if (export && !_emitMain) {
-+ if (exportval && !_emitMain) {
- out << " " << bsname;
- } else {
- out << " " << ButtonClass << "* " << bsname;
-@@ -385,7 +388,7 @@
- out << bsVar->GetInitial() << ");\n";
-
- if (!_emitMain && proc != nil && *proc != '\0') {
-- if (!export || bsVar->IsSubclass()) {
-+ if (!exportval || bsVar->IsSubclass()) {
- out << " " << bsname << "->SetCoreClass(this);\n";
- out <<" "<< bsname<<"->SetCoreFunc("<< "&" << coreclass;
- out << "::" << proc << ");\n";
-@@ -1599,10 +1602,10 @@
- void CodeView::BeginInstantiate (ostream& out) {
- InteractorComp* icomp = GetIntComp();
- const char* mname = icomp->GetMemberNameVar()->GetName();
-- boolean export = icomp->GetMemberNameVar()->GetExport();
-+ boolean exportval = icomp->GetMemberNameVar()->GetExport();
- const char* classname = icomp->GetClassNameVar()->GetName();
-
-- if (export && !_emitMain) {
-+ if (exportval && !_emitMain) {
- out << " " << mname << " = new ";
- } else {
- out << " " << classname << "* ";
diff --git a/x11-toolkits/iv/files/patch-bh b/x11-toolkits/iv/files/patch-bh
deleted file mode 100644
index e6ea7c2f83c6..000000000000
--- a/x11-toolkits/iv/files/patch-bh
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/bin/ibuild/ibdialogs.c.orig Thu May 27 21:41:29 1999
-+++ src/bin/ibuild/ibdialogs.c Thu May 27 21:41:59 1999
-@@ -60,7 +60,9 @@
- #include <InterViews/tray.h>
- #include <OS/types.h>
-
-+#if __FreeBSD_cc_version < 400002
- #include <osfcn.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/x11-toolkits/iv/files/patch-bi b/x11-toolkits/iv/files/patch-bi
deleted file mode 100644
index 9cc100453117..000000000000
--- a/x11-toolkits/iv/files/patch-bi
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/bin/iclass/direct.c.orig Sat Dec 12 13:40:42 1992
-+++ src/bin/iclass/direct.c Sun Jan 23 20:25:38 2000
-@@ -30,11 +30,15 @@
- #include <OS/string.h>
- #include <OS/types.h>
- #include <stddef.h>
-+#if __FreeBSD_cc_version < 400002
- #include <osfcn.h>
-+#endif
- #include <pwd.h>
- #include <string.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-
- #ifdef __DECCXX
- extern "C" {
diff --git a/x11-toolkits/iv/files/patch-bj b/x11-toolkits/iv/files/patch-bj
deleted file mode 100644
index 2d0f928a4630..000000000000
--- a/x11-toolkits/iv/files/patch-bj
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/lib/Dispatch/dispatcher.c.orig Wed Aug 25 07:59:45 1993
-+++ src/lib/Dispatch/dispatcher.c Sun Sep 5 14:05:04 1999
-@@ -631,16 +631,23 @@
-
- if (!_cqueue->isEmpty()) {
- #ifdef SV_INTERRUPT /* BSD-style */
-+#ifdef __FreeBSD__
-+ sv.sv_handler = (sig_t)fxSIGVECHANDLER(&Dispatcher::sigCLD);
-+#else
- sv.sv_handler = fxSIGVECHANDLER(&Dispatcher::sigCLD);
-+#endif
- sv.sv_flags = SV_INTERRUPT;
-- sigvec(SIGCLD, &sv, &osv);
-+ /*sigvec(SIGCLD, &sv, &osv);*/
-+ sigvec(SIGCHLD, &sv, &osv);
- #else
- #ifdef SA_NOCLDSTOP /* POSIX */
- sa.sa_handler = fxSIGACTIONHANDLER(&Dispatcher::sigCLD);
- sa.sa_flags = SA_INTERRUPT;
-- sigaction(SIGCLD, &sa, &osa);
-+ /*sigaction(SIGCLD, &sa, &osa);*/
-+ sigaction(SIGCHLD, &sa, &osa);
- #else /* System V-style */
-- osig = (void (*)())signal(SIGCLD, fxSIGHANDLER(&Dispatcher::sigCLD));
-+ /*osig = (void (*)())signal(SIGCLD, fxSIGHANDLER(&Dispatcher::sigCLD));*/
-+ osig = (void (*)())signal(SIGCHLD, fxSIGHANDLER(&Dispatcher::sigCLD));
- #endif
- #endif
- }
-@@ -661,12 +668,15 @@
- } while (nfound < 0 && !handleError());
- if (!_cqueue->isEmpty()) {
- #ifdef SV_INTERRUPT /* BSD-style */
-- sigvec(SIGCLD, &osv, (struct sigvec*) 0);
-+ /*sigvec(SIGCLD, &osv, (struct sigvec*) 0);*/
-+ sigvec(SIGCHLD, &osv, (struct sigvec*) 0);
- #else
- #ifdef SA_NOCLDSTOP /* POSIX */
-- sigaction(SIGCLD, &osa, (struct sigaction*) 0);
-+ /*sigaction(SIGCLD, &osa, (struct sigaction*) 0);*/
-+ sigaction(SIGCHLD, &osa, (struct sigaction*) 0);
- #else /* System V-style */
-- (void) signal(SIGCLD, fxSIGHANDLER(osig));
-+ /*(void) signal(SIGCLD, fxSIGHANDLER(osig));*/
-+ (void) signal(SIGCHLD, fxSIGHANDLER(osig));
- #endif
- #endif
- }
diff --git a/x11-toolkits/iv/files/patch-bk b/x11-toolkits/iv/files/patch-bk
deleted file mode 100644
index 4336dd4a7950..000000000000
--- a/x11-toolkits/iv/files/patch-bk
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/config/InterViews/cxx.def.orig Wed Jan 27 07:16:55 1993
-+++ src/config/InterViews/cxx.def Sun Sep 5 16:19:16 1999
-@@ -17,8 +17,8 @@
- * When dynamic link works, we might want to change that.
- */
- #if HasSharedLibraries
--/*#define HasSunOSSharedLibraries YES */
--#define HasSunOSSharedLibraries NO
-+/*#define HasDynamicSharedLibraries YES */
-+#define HasDynamicSharedLibraries NO
- #endif
-
- #undef SharedCCFlags
-@@ -31,8 +31,8 @@
- #define NonSharedCCLdFlags /**/
- #endif
-
--#undef NormalSunOSSharedLibraryTarget
--#define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\
-+#undef NormalDynamicSharedLibraryTarget
-+#define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\
- AOUT = Concat(lib,libname.so) @@\
- SHARED_CCFLAGS = SharedCCFlags @@\
- @@\
diff --git a/x11-toolkits/iv/files/patch-bl b/x11-toolkits/iv/files/patch-bl
deleted file mode 100644
index 7b8c1a915910..000000000000
--- a/x11-toolkits/iv/files/patch-bl
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/config/InterViews/gcc.def.orig Wed Sep 9 07:38:37 1992
-+++ src/config/InterViews/gcc.def Sun Sep 5 16:19:38 1999
-@@ -17,5 +17,5 @@
- #define ExtraCCLdLibs -lg++
- #endif
-
--#undef HasSunOSSharedLibraries
--#define HasSunOSSharedLibraries NO
-+#undef HasDynamicSharedLibraries
-+#define HasDynamicSharedLibraries NO
diff --git a/x11-toolkits/iv/files/patch-bm b/x11-toolkits/iv/files/patch-bm
deleted file mode 100644
index d4509433abeb..000000000000
--- a/x11-toolkits/iv/files/patch-bm
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/InterViews/style.c.org Tue Mar 9 06:51:05 1993
-+++ src/lib/InterViews/style.c Sun Jan 23 18:44:36 2000
-@@ -420,9 +420,10 @@
-
- long n = path->count();
- if (e->avail_ <= n) {
-+ long i;
- long new_avail = n + 5;
- StyleAttributeList** new_list = new StyleAttributeList*[new_avail];
-- for (long i = 0; i < e->avail_; i++) {
-+ for (i = 0; i < e->avail_; i++) {
- new_list[i] = e->entries_[i];
- }
- for (i = e->avail_; i < new_avail; i++) {
diff --git a/x11-toolkits/iv/files/patch-bn b/x11-toolkits/iv/files/patch-bn
deleted file mode 100644
index c85844bdc08c..000000000000
--- a/x11-toolkits/iv/files/patch-bn
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/lib/IV-2_6/control.c.org Wed Feb 12 05:48:58 1992
-+++ src/lib/IV-2_6/control.c Sun Jan 23 18:48:18 2000
-@@ -154,10 +154,11 @@
- */
-
- boolean Control::IsGrabbing(Interactor* i) {
-+ ControlState* c;
- if (i == this) {
- return true;
- }
-- for (ControlState* c = state_; c != nil; c = c->Next()) {
-+ for (c = state_; c != nil; c = c->Next()) {
- if (c->IsView(i)) {
- return true;
- }
diff --git a/x11-toolkits/iv/files/patch-bo b/x11-toolkits/iv/files/patch-bo
deleted file mode 100644
index a684ee12c53a..000000000000
--- a/x11-toolkits/iv/files/patch-bo
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/lib/IV-2_6/matcheditor.c.org Thu Jun 25 03:30:20 1992
-+++ src/lib/IV-2_6/matcheditor.c Sun Jan 23 18:50:03 2000
-@@ -53,7 +53,8 @@
- }
-
- void MatchEditor::Match (const char* p, boolean m) {
-- for (char* pp = pattern; *p != '\0'; ++p, ++pp) {
-+ char* pp;
-+ for (pp = pattern; *p != '\0'; ++p, ++pp) {
- *pp = *p;
- if (*p == '%') {
- ++p;
diff --git a/x11-toolkits/iv/files/patch-bp b/x11-toolkits/iv/files/patch-bp
deleted file mode 100644
index 8042e2e84ab4..000000000000
--- a/x11-toolkits/iv/files/patch-bp
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/lib/IV-X11/xdrag.c.org Thu Jun 10 01:10:59 1993
-+++ src/lib/IV-X11/xdrag.c Sun Jan 23 18:52:17 2000
-@@ -229,11 +229,12 @@
- XWindow *children;
- unsigned int kids;
- Status status;
-+ int i;
- status = XQueryTree(display, root, &root, &parent, &children, &kids);
- if (status == 0) {
- return None;
- }
-- for (int i = kids - 1; i >= 0 && children[i] != under ; --i);
-+ for (i = kids - 1; i >= 0 && children[i] != under ; --i);
- for (--i; i >= 0; --i) {
- XWindowAttributes attributes;
- XGetWindowAttributes(display, children[i], &attributes);
diff --git a/x11-toolkits/iv/files/patch-bq b/x11-toolkits/iv/files/patch-bq
deleted file mode 100644
index 81a82ad4ac9e..000000000000
--- a/x11-toolkits/iv/files/patch-bq
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/IV-X11/xfont.c.org Thu Dec 9 14:17:55 1993
-+++ src/lib/IV-X11/xfont.c Sun Jan 23 18:53:44 2000
-@@ -538,8 +538,9 @@
- static boolean contains(const char* string, const char* substring) {
- int sublength = strlen(substring);
- int length = strlen(string) - sublength;
-- for (int i = 0; i <= length; ++i) {
-- for (int j = 0; j < sublength; ++j) {
-+ int i, j;
-+ for (i = 0; i <= length; ++i) {
-+ for (j = 0; j < sublength; ++j) {
- if (string[i+j] != substring[j]) {
- break;
- }
diff --git a/x11-toolkits/iv/files/patch-br b/x11-toolkits/iv/files/patch-br
deleted file mode 100644
index 019f2ff3c2f2..000000000000
--- a/x11-toolkits/iv/files/patch-br
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/Unidraw/psview.c.org Fri Sep 4 03:28:12 1992
-+++ src/lib/Unidraw/psview.c Sun Jan 23 19:26:35 2000
-@@ -752,9 +752,10 @@
- if (dashpatsize <= 0) {
- out << "[] " << dashoffset << " ";
- } else {
-+ int i;
- out << "[";
-
-- for (int i = 0; i < dashpatsize - 1; i++) {
-+ for (i = 0; i < dashpatsize - 1; i++) {
- out << dashpat[i] << " ";
- }
- out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/x11-toolkits/iv/files/patch-bs b/x11-toolkits/iv/files/patch-bs
deleted file mode 100644
index a3d79618fdac..000000000000
--- a/x11-toolkits/iv/files/patch-bs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/Unidraw/stencilcomp.c.org Wed Mar 25 10:18:16 1992
-+++ src/lib/Unidraw/stencilcomp.c Sun Jan 23 19:28:28 2000
-@@ -169,7 +169,7 @@
- StencilComp* comp = (StencilComp*) GetSubject();
- Bitmap* image, *mask;
- comp->GetStencil()->GetOriginal(image, mask);
-- char* tag = (image == mask) ? "SSten" : "FSten";
-+ const char* tag = (image == mask) ? "SSten" : "FSten";
- Coord w = image->Width();
- Coord h = image->Height();
-
diff --git a/x11-toolkits/iv/files/patch-bt b/x11-toolkits/iv/files/patch-bt
deleted file mode 100644
index f0d38ea8420d..000000000000
--- a/x11-toolkits/iv/files/patch-bt
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/lib/Unidraw/text.c.org Wed Mar 25 10:18:22 1992
-+++ src/lib/Unidraw/text.c Sun Jan 23 19:29:41 2000
-@@ -561,8 +561,9 @@
-
- const char* PSText::Filter (const char* string, int len) {
- TextBuffer stext(sbuf, 0, SBUFSIZE);
-+ int dot;
-
-- for (int dot = 0; len--; string++) {
-+ for (dot = 0; len--; string++) {
- char c = *string;
-
- if (!isascii(c) || iscntrl(c)) {
diff --git a/x11-toolkits/iv/files/patch-bu b/x11-toolkits/iv/files/patch-bu
deleted file mode 100644
index 38f8f2ec0fc6..000000000000
--- a/x11-toolkits/iv/files/patch-bu
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/bin/dclock/data.c.org Sat Jul 20 04:13:49 1991
-+++ src/bin/dclock/data.c Sun Jan 23 19:38:38 2000
-@@ -114,6 +114,7 @@
- Slant = min( max( 0,SlantPC ), 100 )/100.0;
- HThick = min( max( 5,ThickPC ), 25 )/100.0;
- VThick = min( max( 5,ThickPC ), 25 )/100.0 * 3.0/2.0;
-+ int i;
-
- Width = Coord( min( max( 100,Width ), 1024));
- Height = Coord( min( max( 25,Height ), 865));
-@@ -149,7 +150,7 @@
-
- ColonData[0].count = Colon.count;
- ColonData[1].count = Colon.count;
-- for ( int i=0; i< Colon.count; i++ ) {
-+ for ( i=0; i< Colon.count; i++ ) {
- ColonData[0].y[i] = Colon.y[i]+(0.5-2.25*HThick)/height+ALLy;
- ColonData[0].x[i] = Colon.x[i]+COLx+ColonData[0].y[i]*Slant/width;
- ColonData[1].y[i] = Colon.y[i]+(0.5+0.25*HThick)/height+ALLy;
diff --git a/x11-toolkits/iv/files/patch-bv b/x11-toolkits/iv/files/patch-bv
deleted file mode 100644
index 20e6a8a2de08..000000000000
--- a/x11-toolkits/iv/files/patch-bv
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/bin/dclock/segment.c.org Tue Mar 5 02:56:58 1991
-+++ src/bin/dclock/segment.c Sun Jan 23 19:39:52 2000
-@@ -43,8 +43,9 @@
- Pattern* pat;
- int dat[16];
- unsigned int Row[4];
-+ int i;
-
-- for (int i = 0; i <= 3; i++) {
-+ for (i = 0; i <= 3; i++) {
- Row[i] = seed & 0xF;
- Row[i] |= Row[i]<<4;
- Row[i] |= Row[i]<<8;
diff --git a/x11-toolkits/iv/files/patch-bw b/x11-toolkits/iv/files/patch-bw
deleted file mode 100644
index 059f2e3c1092..000000000000
--- a/x11-toolkits/iv/files/patch-bw
+++ /dev/null
@@ -1,232 +0,0 @@
---- src/bin/doc/Document.c.org Tue Mar 16 03:10:24 1993
-+++ src/bin/doc/Document.c Sun Jan 23 19:52:26 2000
-@@ -450,7 +450,8 @@
- return nil;
- } else {
- long count = _families->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- FontFamilyInfo& info = _families->item_ref(i);
- if (strcmp(info._name, name) == 0) {
- break;
-@@ -581,7 +582,8 @@
- info._page = -3;
- touch(true);
- long count = _viewer->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- DocumentViewerInfo& vinfo = _viewer->item_ref(i);
- vinfo._viewer->float_inserted(item);
- }
-@@ -590,7 +592,8 @@
- void Document::remove_float (Item* item) {
- touch(true);
- long count = _viewer->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- DocumentViewerInfo& info = _viewer->item_ref(i);
- info._viewer->float_removed(item);
- }
-@@ -603,7 +606,8 @@
- FloatInfo& info = _float->item_ref(find_float(item));
- touch(true);
- long count = _viewer->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- DocumentViewerInfo& viewer = _viewer->item_ref(i);
- viewer._viewer->float_changed(item);
- }
-@@ -616,7 +620,8 @@
- info._page = page;
- touch(true);
- long count = _viewer->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- DocumentViewerInfo& info = _viewer->item_ref(i);
- info._viewer->float_adjusted(item, x, y, page);
- }
-@@ -656,7 +661,8 @@
- if (!dot && *p == '.') {
- dot = true;
- } else if (!isdigit(*p)) {
-- int i = p - v.string();
-+ int i;
-+ i = p - v.string();
- units.set_to_right(i);
- v.set_to_left(i);
- if (!v.convert(f)) {
-@@ -1390,10 +1396,11 @@
- }
-
- long Document::parse_text (const char* buffer) {
-+ long i;
- if (buffer == nil) {
- return 0;
- }
-- for (long i = 0; text_map[i]._format != nil; ++i) {
-+ for (i = 0; text_map[i]._format != nil; ++i) {
- if (strcmp(buffer, text_map[i]._format) == 0) {
- return text_map[i]._code;
- }
-@@ -1523,7 +1530,8 @@
- done = true;
- } else {
- int length = strlen(line);
-- for (int i = 0; i < length; ++i) {
-+ int i;
-+ for (i = 0; i < length; ++i) {
- index = text->insert(index, line[i], style, source, nil);
- }
- index = text->insert(index, '\n', style, source, nil);
-@@ -1538,6 +1546,7 @@
- ) {
- SourceInfo& info = _source->item_ref(source);
- if (info._source._editable) {
-+ long i;
- if (info._style != style) {
- char buffer[100];
- unparse_style(buffer, style, info._style);
-@@ -1545,7 +1554,7 @@
- }
- out << "%\n\\begin{verbatim}\n";
- column = 0;
-- for (long i = index; i < index + count; ++i) {
-+ for (i = index; i < index + count; ++i) {
- out.put(char(text->item_code(i)));
- }
- out << "\\end{verbatim}%\n";
-@@ -1570,7 +1579,8 @@
- file.getline(line, 1000);
- if (file) {
- int length = strlen(line);
-- for (int i = 0; i < length; ++i) {
-+ int i;
-+ for (i = 0; i < length; ++i) {
- index = text->insert(index, line[i], style, source, nil);
- }
- index = text->insert(index, '\n', style, source, nil);
-@@ -1937,7 +1947,8 @@
-
- void Document::step (const char* counter, const char* context) {
- long count = _counter->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- CounterInfo& info = _counter->item_ref(i);
- if (strcmp(info._name, counter) == 0) {
- info._value += 1;
-@@ -1976,7 +1987,8 @@
- info._viewer = viewer;
- _viewer->append(info);
- long count = _float->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- FloatInfo& info = _float->item_ref(i);
- viewer->float_inserted(info._item);
- viewer->float_adjusted(info._item, info._x, info._y, info._page);
-@@ -1986,7 +1998,8 @@
-
- void Document::detach (DocumentViewer* viewer) {
- long count = _viewer->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- DocumentViewerInfo& info = _viewer->item_ref(i);
- if (info._viewer == viewer) {
- _viewer->remove(i);
-@@ -1998,7 +2011,8 @@
- void Document::notify () {
- while (_body != nil && _relabel) {
- long count = _counter->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- CounterInfo& info = _counter->item_ref(i);
- info._value = info._initial;
- }
-@@ -2006,7 +2020,8 @@
- _body->label("");
- }
- long count = _viewer->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- DocumentViewerInfo& info = _viewer->item_ref(i);
- info._viewer->update();
- }
-@@ -2062,7 +2077,8 @@
- char screenfont[100];
- strcpy(screenfont, style._style._font);
- long len = strlen(screenfont);
-- for (long i = 0; i < len; ++i) {
-+ long i;
-+ for (i = 0; i < len; ++i) {
- if (isupper(screenfont[i])) {
- screenfont[i] += 'a' - 'A';
- }
-@@ -2277,7 +2293,8 @@
-
- long Document::find_macro (const char* name) {
- long count = _macro->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- MacroInfo& info = _macro->item_ref(i);
- if (strcmp(info._name, name) == 0) {
- break;
-@@ -2314,7 +2331,8 @@
-
- long Document::find_counter (const char* name) {
- long count = _counter->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- CounterInfo& info = _counter->item_ref(i);
- if (strcmp(info._name, name) == 0) {
- break;
-@@ -2365,7 +2383,8 @@
-
- long Document::find_parameter (const char* name) {
- long count = _parameter->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- DocumentParameterInfo& info = _parameter->item_ref(i);
- if (strcmp(info._name, name) == 0) {
- break;
-@@ -2406,7 +2425,8 @@
-
- long Document::find_label (const char* name) {
- long count = _label->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- LabelInfo& info = _label->item_ref(i);
- if (strcmp(info._name, name) == 0) {
- break;
-@@ -2447,7 +2467,8 @@
-
- long Document::find_float (Item* item) {
- long count = _float->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- FloatInfo& info = _float->item_ref(i);
- if (info._item == item) {
- break;
-@@ -2578,7 +2599,8 @@
- return COMMAND;
- }
- } else if (isdigit(c)) {
-- int i = c - '0';
-+ int i;
-+ i = c - '0';
- if (isdigit(c = in.get())) {
- i = i * 8 + (c - '0');
- } else {
diff --git a/x11-toolkits/iv/files/patch-bx b/x11-toolkits/iv/files/patch-bx
deleted file mode 100644
index ffa75a713b12..000000000000
--- a/x11-toolkits/iv/files/patch-bx
+++ /dev/null
@@ -1,142 +0,0 @@
---- src/bin/doc/DocViewer.c.org Thu Nov 26 13:46:57 1992
-+++ src/bin/doc/DocViewer.c Sun Jan 23 19:55:09 2000
-@@ -434,7 +434,8 @@
- ps->resize(a.left(), a.bottom(), a.right(), a.top());
- long current_page = _current_page;
- long count = _page_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ps->page(_page_info->item_ref(i)._label);
- page_to(i);
- _page_patch->print(ps, a);
-@@ -601,7 +602,8 @@
-
- void DocumentViewer::pin (const char* name) {
- long count = _pinned_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ViewerPinnedInfo& m = _pinned_info->item_ref(i);
- if (strcmp(m._name, name) == 0) {
- break;
-@@ -634,7 +636,8 @@
-
- void DocumentViewer::unpin (const char* name) {
- long count = _pinned_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ViewerPinnedInfo& m = _pinned_info->item_ref(i);
- if (strcmp(m._name, name) == 0) {
- break;
-@@ -652,7 +655,8 @@
- void DocumentViewer::menubar (const char* name) {
- choose(nil, false);
- long count = _menu_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ViewerMenuInfo& m = _menu_info->item_ref(i);
- if (strcmp(m._name, name) == 0) {
- break;
-@@ -675,7 +679,8 @@
-
- void DocumentViewer::keymap (const char* name) {
- long count = _keymap_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ViewerKeymapInfo& info = _keymap_info->item_ref(i);
- if (strcmp(info._name, name) == 0) {
- break;
-@@ -699,7 +704,8 @@
- const char* name, const Color*& overlay, const Color*& underlay
- ) {
- long count = _color_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ViewerColorInfo& info = _color_info->item_ref(i);
- if (strcmp(info._name, name) == 0) {
- break;
-@@ -767,7 +773,8 @@
-
- void DocumentViewer::float_removed (Item* item) {
- long count = _float_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- if (_float_info->item_ref(i)._item == item) {
- break;
- }
-@@ -783,7 +790,8 @@
-
- void DocumentViewer::float_changed (Item* item) {
- long count = _float_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- if (_float_info->item_ref(i)._item == item) {
- break;
- }
-@@ -798,7 +806,8 @@
- void DocumentViewer::float_adjusted (Item* item, float x, float y, long p) {
- Session::instance()->default_display()->flush();
- long count = _float_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- if (_float_info->item_ref(i)._item == item) {
- break;
- }
-@@ -909,6 +918,7 @@
- Style* style = kit.style();
- const Color* fg = kit.foreground();
- char label[10];
-+ long i;
- while (_page_info->count() < page_count) {
- ViewerPageInfo info;
- _document->format_counter(
-@@ -954,7 +964,7 @@
- LRComposition* comp = new LRComposition(
- layout.vbox_first_aligned(), new SimpleCompositor(), nil, width
- );
-- for (long i = 0; i < page_count; ++i) {
-+ for (i = 0; i < page_count; ++i) {
- ViewerPageInfo& info = _page_info->item_ref(i);
- char command [20];
- sprintf(command, "page %d", i);
-@@ -980,10 +990,11 @@
- page = Math::max(0L, page);
- page = Math::min(page_count-1, page);
- if (page != _current_page) {
-+ long i;
- _current_page = page;
- _pages->flip_to(_current_page * 2);
- _view->view_page(_current_page * 2);
-- for (long i = 0; i < page_count; ++i) {
-+ for (i = 0; i < page_count; ++i) {
- ViewerPageInfo& info = _page_info->item_ref(i);
- info._telltale->choose(i == _current_page);
- }
-@@ -1024,7 +1035,8 @@
- ) {
- Coord top = t;
- long count = _float_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ViewerFloatInfo& info = _float_info->item_ref(i);
- if (info._page == page/2 || info._page == -2 && page > 0) {
- Allotment ax, ay;
-@@ -1049,7 +1061,8 @@
- ) {
- Coord bottom = b;
- long count = _float_info->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ViewerFloatInfo& info = _float_info->item_ref(i);
- if (info._page == page/2 || info._page == -2 && page > 0) {
- Allotment ax, ay;
diff --git a/x11-toolkits/iv/files/patch-by b/x11-toolkits/iv/files/patch-by
deleted file mode 100644
index ffd077cb4f88..000000000000
--- a/x11-toolkits/iv/files/patch-by
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/bin/doc/DialogMgr.c.org Sat Apr 11 14:28:48 1992
-+++ src/bin/doc/DialogMgr.c Sun Jan 23 19:56:53 2000
-@@ -108,7 +108,8 @@
- Window* window, const char* prompt, const char* filter
- ) {
- long count = _chooser->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ChooserInfo& info = _chooser->item_ref(i);
- if (strcmp(info._prompt, prompt) == 0) {
- break;
-@@ -128,7 +129,8 @@
- Window* window, const char* prompt, const char* initial
- ) {
- long count = _asker->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- AskerInfo& info = _asker->item_ref(i);
- if (strcmp(info._prompt, prompt) == 0) {
- break;
-@@ -146,7 +148,8 @@
-
- int DialogManager::confirm (Window* window, const char* prompt) {
- long count = _confirmer->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ConfirmerInfo& info = _confirmer->item_ref(i);
- if (strcmp(info._prompt, prompt) == 0) {
- break;
-@@ -164,7 +167,8 @@
-
- void DialogManager::report (Window* window, const char* prompt) {
- long count = _reporter->count();
-- for (long i = 0; i < count; ++i) {
-+ long i;
-+ for (i = 0; i < count; ++i) {
- ReporterInfo& info = _reporter->item_ref(i);
- if (strcmp(info._prompt, prompt) == 0) {
- break;
diff --git a/x11-toolkits/iv/files/patch-bz b/x11-toolkits/iv/files/patch-bz
deleted file mode 100644
index d71a4f1979e0..000000000000
--- a/x11-toolkits/iv/files/patch-bz
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/bin/doc/Keymap.c.org Sat Apr 11 14:29:37 1992
-+++ src/bin/doc/Keymap.c Sun Jan 23 19:58:14 2000
-@@ -103,6 +103,7 @@
- _viewer != nil
- && e.type() == Event::key && e.mapkey(s, sizeof(s)) > 0
- ) {
-+ long i;
- _viewer->ref();
- ItemView* view = _viewer->focus();
- long count = _info->count();
-@@ -110,7 +111,7 @@
- if (key < 0) {
- key += 256;
- }
-- for (long i = 0; i < count; ++i) {
-+ for (i = 0; i < count; ++i) {
- DocKeymapInfo& info = _info->item_ref(i);
- if (info._key == key) {
- boolean pending_repair;
diff --git a/x11-toolkits/iv/files/patch-ca b/x11-toolkits/iv/files/patch-ca
deleted file mode 100644
index 7d6769091a86..000000000000
--- a/x11-toolkits/iv/files/patch-ca
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/bin/ibuild/ibvars.h.org Thu Jul 16 07:36:21 1992
-+++ src/bin/ibuild/ibvars.h Sun Jan 23 20:01:12 2000
-@@ -232,7 +232,7 @@
-
- inline boolean MemberSharedName::GetExport() { return _export; }
- inline SubclassNameVar* MemberSharedName::GetSubclass () { return _subclass; }
--inline void MemberSharedName::SetExport(boolean export) { _export = export;}
-+inline void MemberSharedName::SetExport(boolean exportval) { _export = exportval;}
- inline int& MemberSharedName::GetSerial () { return _mSerial; }
- inline IDVar* MemberSharedName::GetIDVar () { return _idVar; }
-
-@@ -326,7 +326,7 @@
- inline int ButtonSharedName::GetInitial() { return _initial; }
- inline void ButtonSharedName::SetInitial(int initial) { _initial = initial;}
- inline boolean ButtonSharedName::GetExport() { return _export; }
--inline void ButtonSharedName::SetExport(boolean export) { _export = export;}
-+inline void ButtonSharedName::SetExport(boolean exportval) { _export = exportval;}
- inline const char* ButtonSharedName::GetFuncName() { return _func; }
- inline int& ButtonSharedName::GetSerial() { return _bsSerial; }
- inline SubclassNameVar* ButtonSharedName::GetSubclass () { return _subclass; }
diff --git a/x11-toolkits/iv/files/patch-cb b/x11-toolkits/iv/files/patch-cb
deleted file mode 100644
index 56ed107fa143..000000000000
--- a/x11-toolkits/iv/files/patch-cb
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/bin/ibuild/ibcatalog.c.org Wed Sep 9 07:36:27 1992
-+++ src/bin/ibuild/ibcatalog.c Sun Jan 23 20:03:11 2000
-@@ -614,7 +614,8 @@
- graylevel = CalcGrayLevel(data[0]);
- }
- } else if (graylevel == -1) {
-- for (int i = 0; in >> _buf && i < patternHeight; i++) {
-+ int i;
-+ for (i = 0; in >> _buf && i < patternHeight; i++) {
- if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
- break;
- }
diff --git a/x11-toolkits/iv/files/patch-cc b/x11-toolkits/iv/files/patch-cc
deleted file mode 100644
index ab0156ab2a70..000000000000
--- a/x11-toolkits/iv/files/patch-cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/bin/ibuild/ibdialog.c.org Tue Feb 2 08:04:15 1993
-+++ src/bin/ibuild/ibdialog.c Sun Jan 23 20:14:43 2000
-@@ -35,6 +35,7 @@
- #include <Unidraw/unidraw.h>
- #include <Unidraw/viewer.h>
- #include <Unidraw/catalog.h>
-+#include <stdio.h>
- #include <stream.h>
- #include <string.h>
-
-@@ -382,7 +383,7 @@
- strcat(ButtonClass, "_Button");
- const char* proc = bsVar->GetFuncName();
-
-- boolean export = bsVar->GetExport();
-+ boolean exportval = bsVar->GetExport();
- CodeView* kidview = GetKidView();
- MemberNameVar* kidname;
- if (kidview != nil) {
-@@ -409,7 +410,7 @@
-
- out << "Interactor*" << coreclass;
- out << "::Interior() {\n";
-- if (export) {
-+ if (exportval) {
- out << " " << bsVar->GetName() << " = state;\n";
- } else {
- out << " ButtonState* ";
diff --git a/x11-toolkits/iv/files/patch-cd b/x11-toolkits/iv/files/patch-cd
deleted file mode 100644
index bda372b32dca..000000000000
--- a/x11-toolkits/iv/files/patch-cd
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/ibuild/ibed.c.org Wed Nov 11 03:16:15 1992
-+++ src/bin/ibuild/ibed.c Sun Jan 23 20:15:55 2000
-@@ -672,7 +672,7 @@
- return tools;
- }
-
--static const unit = 15;
-+static const int unit = 15;
-
- static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
- static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
diff --git a/x11-toolkits/iv/files/patch-ce b/x11-toolkits/iv/files/patch-ce
deleted file mode 100644
index 2284d8b34774..000000000000
--- a/x11-toolkits/iv/files/patch-ce
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/bin/ibuild/ibglue.c.org Sat Apr 25 05:14:55 1992
-+++ src/bin/ibuild/ibglue.c Sun Jan 23 20:17:10 2000
-@@ -271,14 +271,14 @@
- strcpy(VGlueClass, coreclass);
- strcat(VGlueClass, "_VGlue");
-
-- boolean export = icomp->GetMemberNameVar()->GetExport();
-+ boolean exportval = icomp->GetMemberNameVar()->GetExport();
- const char* classname = icomp->GetClassNameVar()->GetName();
- if (icomp->GetClassNameVar()->IsSubclass()) {
- BeginInstantiate(out);
- out << "(";
-
- } else {
-- if (export && !_emitMain) {
-+ if (exportval && !_emitMain) {
- out << " " << mname << " = new ";
- } else {
- out << " " << classname << "* ";
diff --git a/x11-toolkits/iv/files/patch-cf b/x11-toolkits/iv/files/patch-cf
deleted file mode 100644
index 73b4fc126e0b..000000000000
--- a/x11-toolkits/iv/files/patch-cf
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/bin/ibuild/ibmenu.c.org Wed Sep 9 07:34:15 1992
-+++ src/bin/ibuild/ibmenu.c Sun Jan 23 20:18:28 2000
-@@ -403,7 +403,7 @@
-
- const char* proc = menuItem->GetTrackNameVar()->GetName();
- const char* text = menuItem->GetMenuItemGraphic()->GetText();
-- boolean export = icomp->GetMemberNameVar()->GetExport();
-+ boolean exportval = icomp->GetMemberNameVar()->GetExport();
- Shape* shape = icomp->GetShapeVar()->GetShape();
-
- if (icomp->GetClassNameVar()->IsSubclass()) {
-@@ -411,7 +411,7 @@
- out << "(";
-
- } else {
-- if (export && !_emitMain) {
-+ if (exportval && !_emitMain) {
- out << " " << mname << " = ";
- out << "new " << MenuClass;
- } else {
-@@ -431,7 +431,7 @@
- EndInstantiate(out);
-
- if (!_emitMain && proc != nil && *proc != '\0') {
-- if (!export || icomp->GetClassNameVar()->IsSubclass()) {
-+ if (!exportval || icomp->GetClassNameVar()->IsSubclass()) {
- out << " " << mname << "->SetCoreClass(this);\n";
- out <<" "<< mname <<"->SetCoreFunc("<< "&" << coreclass;
- out << "::" << proc << ");\n";
diff --git a/x11-toolkits/iv/files/patch-cg b/x11-toolkits/iv/files/patch-cg
deleted file mode 100644
index 0be19c64d07d..000000000000
--- a/x11-toolkits/iv/files/patch-cg
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/bin/ibuild/ibpanelctrl.c.org Wed Nov 11 03:16:39 1992
-+++ src/bin/ibuild/ibpanelctrl.c Sun Jan 23 20:19:37 2000
-@@ -871,13 +871,13 @@
- } else if (_emitBSInits) {
- ButtonStateVar* bsVar = pcComp->GetButtonStateVar();
- const char* name = bsVar->GetName();
-- boolean export = bsVar->GetExport();
-+ boolean exportval = bsVar->GetExport();
- const char* subclass = bsVar->GetSubclassName();
-
- if (!_bsinitslist->Search(name)) {
- _bsinitslist->Append(name);
-
-- if (export && !_emitMain) {
-+ if (exportval && !_emitMain) {
- out << " " << name;
-
- } else {
diff --git a/x11-toolkits/iv/files/patch-ch b/x11-toolkits/iv/files/patch-ch
deleted file mode 100644
index 87180c862664..000000000000
--- a/x11-toolkits/iv/files/patch-ch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/bin/ibuild/ibslider.c.org Tue Jun 9 04:44:50 1992
-+++ src/bin/ibuild/ibslider.c Sun Jan 23 20:20:51 2000
-@@ -416,7 +416,7 @@
- strcpy(SliderClass, coreclass);
- strcat(SliderClass, "_Slider");
-
-- boolean export = icomp->GetMemberNameVar()->GetExport();
-+ boolean exportval = icomp->GetMemberNameVar()->GetExport();
- const char* classname = icomp->GetClassNameVar()->GetName();
-
- int w = icomp->GetCanvasVar()->Width();
-@@ -426,7 +426,7 @@
- BeginInstantiate(out);
- out << "(";
- } else {
-- if (export && !_emitMain) {
-+ if (exportval && !_emitMain) {
- out << " " << mname << " = new " << SliderClass;
- out << "(";
- } else {
diff --git a/x11-toolkits/iv/files/patch-ci b/x11-toolkits/iv/files/patch-ci
deleted file mode 100644
index cb7fb399d4a1..000000000000
--- a/x11-toolkits/iv/files/patch-ci
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/bin/ibuild/ibvars.c.org Wed Sep 9 07:33:42 1992
-+++ src/bin/ibuild/ibvars.c Sun Jan 23 20:22:31 2000
-@@ -371,9 +371,9 @@
- /*****************************************************************************/
-
- MemberSharedName::MemberSharedName (
-- const char* name, boolean export, boolean machgen
-+ const char* name, boolean exportval, boolean machgen
- ) : SharedName(name, machgen) {
-- _export = export;
-+ _export = exportval;
- _subclass = new SubclassNameVar("", false, false);
- _subclass->ref();
- _idVar = nil;
-@@ -471,11 +471,11 @@
-
- /*****************************************************************************/
- MemberNameVar::MemberNameVar (
-- const char* name, boolean export, boolean machgen
-+ const char* name, boolean exportval, boolean machgen
- ) {
- _msharedname = nil;
- if (name != nil) {
-- _msharedname = new MemberSharedName(name, export, machgen);
-+ _msharedname = new MemberSharedName(name, exportval, machgen);
- _msharedname->ref();
- }
- }
diff --git a/x11-toolkits/iv/files/patch-cj b/x11-toolkits/iv/files/patch-cj
deleted file mode 100644
index ee04d72f1977..000000000000
--- a/x11-toolkits/iv/files/patch-cj
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/bin/ibuild/ibvarviews.c.org Sat Feb 27 02:52:55 1993
-+++ src/bin/ibuild/ibvarviews.c Sun Jan 23 20:23:50 2000
-@@ -1379,7 +1379,8 @@
- );
- conflictCmd.Execute();
- UList* cl = conflictCmd.GetConflict();
-- for(UList* i = cl->First(); i != cl->End(); i = i->Next()) {
-+ UList* i;
-+ for(i = cl->First(); i != cl->End(); i = i->Next()) {
- StateVar* state = (StateVar*) (*i)();
- if (state->IsA(SUBCLASSNAME_VAR) && state != subvar) {
- SubclassNameVar* svar = (SubclassNameVar*) state;
diff --git a/x11-toolkits/iv/files/patch-ck b/x11-toolkits/iv/files/patch-ck
deleted file mode 100644
index dd2bc0a8e675..000000000000
--- a/x11-toolkits/iv/files/patch-ck
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/bin/idraw/idarrow.c.org Tue Jul 14 02:46:07 1992
-+++ src/bin/idraw/idarrow.c Sun Jan 23 20:28:32 2000
-@@ -304,9 +304,10 @@
- if (dashpatsize <= 0) {
- out << "[] " << dashoffset << " ";
- } else {
-+ int i;
- out << "[";
-
-- for (int i = 0; i < dashpatsize - 1; i++) {
-+ for (i = 0; i < dashpatsize - 1; i++) {
- out << dashpat[i] << " ";
- }
- out << dashpat[i] << "] " << dashoffset << " ";
-@@ -510,6 +511,7 @@
- boolean PSArrowMultiLine::Definition (ostream& out) {
- ArrowMultiLineComp* comp = (ArrowMultiLineComp*) GetSubject();
- ArrowMultiLine* aml = comp->GetArrowMultiLine();
-+ int i;
-
- const Coord* x, *y;
- int n = aml->GetOriginal(x, y);
-@@ -518,7 +520,7 @@
- out << "Begin " << MARK << " " << Name() << "\n";
- MinGS(out);
- out << MARK << " " << n << "\n";
-- for (int i = 0; i < n; i++) {
-+ for (i = 0; i < n; i++) {
- out << x[i] << " " << y[i] << "\n";
- }
- out << n << " " << Name() << "\n";
-@@ -557,9 +559,10 @@
- if (dashpatsize <= 0) {
- out << "[] " << dashoffset << " ";
- } else {
-+ int i;
- out << "[";
-
-- for (int i = 0; i < dashpatsize - 1; i++) {
-+ for (i = 0; i < dashpatsize - 1; i++) {
- out << dashpat[i] << " ";
- }
- out << dashpat[i] << "] " << dashoffset << " ";
-@@ -759,6 +762,7 @@
- boolean PSArrowSpline::Definition (ostream& out) {
- ArrowSplineComp* comp = (ArrowSplineComp*) GetSubject();
- ArrowOpenBSpline* aml = comp->GetArrowOpenBSpline();
-+ int i;
-
- const Coord* x, *y;
- int n = aml->GetOriginal(x, y);
-@@ -767,7 +771,7 @@
- out << "Begin " << MARK << " " << Name() << "\n";
- MinGS(out);
- out << MARK << " " << n << "\n";
-- for (int i = 0; i < n; i++) {
-+ for (i = 0; i < n; i++) {
- out << x[i] << " " << y[i] << "\n";
- }
- out << n << " " << Name() << "\n";
-@@ -806,9 +810,10 @@
- if (dashpatsize <= 0) {
- out << "[] " << dashoffset << " ";
- } else {
-+ int i;
- out << "[";
-
-- for (int i = 0; i < dashpatsize - 1; i++) {
-+ for (i = 0; i < dashpatsize - 1; i++) {
- out << dashpat[i] << " ";
- }
- out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/x11-toolkits/iv/files/patch-cl b/x11-toolkits/iv/files/patch-cl
deleted file mode 100644
index fd6617b9ab62..000000000000
--- a/x11-toolkits/iv/files/patch-cl
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/bin/idraw/idcatalog.c.org Tue Sep 29 03:09:01 1992
-+++ src/bin/idraw/idcatalog.c Sun Jan 23 20:29:52 2000
-@@ -658,7 +658,8 @@
- graylevel = CalcGrayLevel(data[0]);
- }
- } else if (graylevel == -1) {
-- for (int i = 0; in >> _buf && i < patternHeight; i++) {
-+ int i;
-+ for (i = 0; in >> _buf && i < patternHeight; i++) {
- if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
- break;
- }
-@@ -730,6 +731,7 @@
- static int sizepoints = 0;
- static Coord* xcoords = nil;
- static Coord* ycoords = nil;
-+ int i;
-
- Skip(in);
- in >> n;
-@@ -742,7 +744,7 @@
- ycoords = new Coord[sizepoints];
- }
-
-- for (int i = 0; i < n; i++) {
-+ for (i = 0; i < n; i++) {
- if (_psversion < PSV_NONREDUNDANT) {
- Skip(in);
- }
diff --git a/x11-toolkits/iv/files/patch-cm b/x11-toolkits/iv/files/patch-cm
deleted file mode 100644
index 64ac316e0af7..000000000000
--- a/x11-toolkits/iv/files/patch-cm
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/idraw/ided.c.org Wed Jan 27 06:09:36 1993
-+++ src/bin/idraw/ided.c Sun Jan 23 20:30:57 2000
-@@ -349,7 +349,7 @@
- return commands;
- }
-
--static const unit = 15;
-+static const int unit = 15;
-
- static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
- static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
diff --git a/x11-toolkits/iv/files/patch-cn b/x11-toolkits/iv/files/patch-cn
deleted file mode 100644
index fc579eee5530..000000000000
--- a/x11-toolkits/iv/files/patch-cn
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/bin/mailbox/main.c.org Sat Sep 12 01:19:22 1992
-+++ src/bin/mailbox/main.c Sun Jan 23 20:32:57 2000
-@@ -453,7 +453,8 @@
- if (atp != nil) {
- char* dotp = strchr(atp, '.');
- if (dotp != nil) {
-- for (int i = 0; i < strlen(mail_domain); ++i) {
-+ int i;
-+ for (i = 0; i < strlen(mail_domain); ++i) {
- char c = dotp[i];
- c = isupper(c) ? c - 'A' + 'a' : c;
- if (c != mail_domain[i]) {
-@@ -497,8 +498,9 @@
- break;
- }
- } else if (*line == '\n' && *mail != '\0') {
-+ int i;
- delete items[MaxItemCount-1];
-- for (int i=MaxItemCount-2; i>=0; --i) {
-+ for (i=MaxItemCount-2; i>=0; --i) {
- items[i+1] = items[i];
- }
- items[0] = new char[MaxItemSize];
-@@ -517,9 +519,10 @@
-
- char* MailBox::addressToAlias(char* emailAddress, boolean lookupNames) {
- lowercasifyString(emailAddress);
-+ int i;
-
- /* look for a match in the list of aliases */
-- for (int i = 0; addresses[i]; i++) {
-+ for (i = 0; addresses[i]; i++) {
- if (strcmp(emailAddress, addresses[i]) == 0) {
- emailAddress = strcpy(new char[strlen(aliases[i])+1], aliases[i]);
- return emailAddress;
diff --git a/x11-toolkits/iv/files/patch-co b/x11-toolkits/iv/files/patch-co
deleted file mode 100644
index 113433158ab4..000000000000
--- a/x11-toolkits/iv/files/patch-co
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/scripts/mkdirhier.sh.orig Wed Aug 16 03:15:19 2000
-+++ src/bin/scripts/mkdirhier.sh Wed Aug 16 03:15:56 2000
-@@ -52,7 +52,7 @@
- done
-
- mkdir $paths || status=$?
-- chmod g+w $paths
-+ chmod g-w $paths
-
- break
- }
diff --git a/x11-toolkits/iv/pkg-descr b/x11-toolkits/iv/pkg-descr
deleted file mode 100644
index bbbecffca622..000000000000
--- a/x11-toolkits/iv/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Interviews is a toolkit with lots of nice utilities (like idraw).
-
-Seigo Tanimura <tanimura@FreeBSD.org>
diff --git a/x11-toolkits/iv/pkg-plist b/x11-toolkits/iv/pkg-plist
deleted file mode 100644
index faabd6132c93..000000000000
--- a/x11-toolkits/iv/pkg-plist
+++ /dev/null
@@ -1,567 +0,0 @@
-interviews/bin/FREEBSD/alert
-interviews/bin/FREEBSD/bsdinst
-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/cxx.def
-interviews/config/InterViews/gcc.def
-interviews/config/InterViews/iv-DGUX.cf
-interviews/config/InterViews/iv-Mips.cf
-interviews/config/InterViews/iv-aix.cf
-interviews/config/InterViews/iv-alpha.cf
-interviews/config/InterViews/iv-apollo.cf
-interviews/config/InterViews/iv-att.cf
-interviews/config/InterViews/iv-bsd.cf
-interviews/config/InterViews/iv-convex.cf
-interviews/config/InterViews/iv-cray.cf
-interviews/config/InterViews/iv-freebsd.cf
-interviews/config/InterViews/iv-generic.cf
-interviews/config/InterViews/iv-hp.cf
-interviews/config/InterViews/iv-ibm.cf
-interviews/config/InterViews/iv-linux.cf
-interviews/config/InterViews/iv-luna.cf
-interviews/config/InterViews/iv-m4330.cf
-interviews/config/InterViews/iv-macII.cf
-interviews/config/InterViews/iv-moto.cf
-interviews/config/InterViews/iv-pegasus.cf
-interviews/config/InterViews/iv-sgi.cf
-interviews/config/InterViews/iv-sony.cf
-interviews/config/InterViews/iv-stellar.cf
-interviews/config/InterViews/iv-stratus.cf
-interviews/config/InterViews/iv-sun.cf
-interviews/config/InterViews/iv-ultrix.cf
-interviews/config/InterViews/iv-x386.cf
-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
-interviews/include/Dispatch/dispatcher.h
-interviews/include/Dispatch/dp.h
-interviews/include/Dispatch/enter-scope.h
-interviews/include/Dispatch/iocallback.h
-interviews/include/Dispatch/iohandler.h
-interviews/include/Dispatch/iostreamb.h
-interviews/include/Dispatch/leave-scope.h
-interviews/include/Dispatch/rpcbuf.h
-interviews/include/Dispatch/rpchdr.h
-interviews/include/Dispatch/rpcpeer.h
-interviews/include/Dispatch/rpcreader.h
-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/InterViews/adjuster.h
-interviews/include/IV-2_6/InterViews/alignment.h
-interviews/include/IV-2_6/InterViews/banner.h
-interviews/include/IV-2_6/InterViews/border.h
-interviews/include/IV-2_6/InterViews/box.h
-interviews/include/IV-2_6/InterViews/button.h
-interviews/include/IV-2_6/InterViews/compeditor.h
-interviews/include/IV-2_6/InterViews/control.h
-interviews/include/IV-2_6/InterViews/deck.h
-interviews/include/IV-2_6/InterViews/defs.h
-interviews/include/IV-2_6/InterViews/dialog.h
-interviews/include/IV-2_6/InterViews/filebrowser.h
-interviews/include/IV-2_6/InterViews/filechooser.h
-interviews/include/IV-2_6/InterViews/frame.h
-interviews/include/IV-2_6/InterViews/glue.h
-interviews/include/IV-2_6/InterViews/ihandler.h
-interviews/include/IV-2_6/InterViews/interactor.h
-interviews/include/IV-2_6/InterViews/iwindow.h
-interviews/include/IV-2_6/InterViews/matcheditor.h
-interviews/include/IV-2_6/InterViews/menu.h
-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/panner.h
-interviews/include/IV-2_6/InterViews/perspective.h
-interviews/include/IV-2_6/InterViews/rubband.h
-interviews/include/IV-2_6/InterViews/rubcurve.h
-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
-interviews/include/IV-2_6/InterViews/shape.h
-interviews/include/IV-2_6/InterViews/strbrowser.h
-interviews/include/IV-2_6/InterViews/strchooser.h
-interviews/include/IV-2_6/InterViews/streditor.h
-interviews/include/IV-2_6/InterViews/subject.h
-interviews/include/IV-2_6/InterViews/textbuffer.h
-interviews/include/IV-2_6/InterViews/textdisplay.h
-interviews/include/IV-2_6/InterViews/texteditor.h
-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
-interviews/include/IV-X11/Xundefs.h
-interviews/include/IV-X11/Xutil.h
-interviews/include/IV-X11/xbitmap.h
-interviews/include/IV-X11/xbrush.h
-interviews/include/IV-X11/xcanvas.h
-interviews/include/IV-X11/xcolor.h
-interviews/include/IV-X11/xcursor.h
-interviews/include/IV-X11/xdisplay.h
-interviews/include/IV-X11/xdrag.h
-interviews/include/IV-X11/xevent.h
-interviews/include/IV-X11/xfont.h
-interviews/include/IV-X11/xpainter.h
-interviews/include/IV-X11/xpattern.h
-interviews/include/IV-X11/xraster.h
-interviews/include/IV-X11/xselection.h
-interviews/include/IV-X11/xwindow.h
-interviews/include/IV-look/bevel.h
-interviews/include/IV-look/browser.h
-interviews/include/IV-look/button.h
-interviews/include/IV-look/choice.h
-interviews/include/IV-look/dialogs.h
-interviews/include/IV-look/fbrowser.h
-interviews/include/IV-look/fchooser.h
-interviews/include/IV-look/field.h
-interviews/include/IV-look/kit.h
-interviews/include/IV-look/menu.h
-interviews/include/IV-look/mf_dialogs.h
-interviews/include/IV-look/mf_kit.h
-interviews/include/IV-look/mono_kit.h
-interviews/include/IV-look/ol_dialogs.h
-interviews/include/IV-look/ol_kit.h
-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
-interviews/include/InterViews/_names.h
-interviews/include/InterViews/_undefs.h
-interviews/include/InterViews/action.h
-interviews/include/InterViews/adjust.h
-interviews/include/InterViews/aggr.h
-interviews/include/InterViews/align.h
-interviews/include/InterViews/alloctbl.h
-interviews/include/InterViews/arraycomp.h
-interviews/include/InterViews/background.h
-interviews/include/InterViews/bitmap.h
-interviews/include/InterViews/boolean.h
-interviews/include/InterViews/border.h
-interviews/include/InterViews/box.h
-interviews/include/InterViews/brush.h
-interviews/include/InterViews/canvas.h
-interviews/include/InterViews/character.h
-interviews/include/InterViews/color.h
-interviews/include/InterViews/composition.h
-interviews/include/InterViews/compositor.h
-interviews/include/InterViews/coord.h
-interviews/include/InterViews/cursor.h
-interviews/include/InterViews/debug.h
-interviews/include/InterViews/deck.h
-interviews/include/InterViews/dialog.h
-interviews/include/InterViews/display.h
-interviews/include/InterViews/drag.h
-interviews/include/InterViews/enter-scope.h
-interviews/include/InterViews/event.h
-interviews/include/InterViews/font.h
-interviews/include/InterViews/geometry.h
-interviews/include/InterViews/glcontext.h
-interviews/include/InterViews/glue.h
-interviews/include/InterViews/glyph.h
-interviews/include/InterViews/group.h
-interviews/include/InterViews/handler.h
-interviews/include/InterViews/hit.h
-interviews/include/InterViews/image.h
-interviews/include/InterViews/input.h
-interviews/include/InterViews/iv.h
-interviews/include/InterViews/label.h
-interviews/include/InterViews/layout.h
-interviews/include/InterViews/leave-scope.h
-interviews/include/InterViews/lrmarker.h
-interviews/include/InterViews/monoglyph.h
-interviews/include/InterViews/observe.h
-interviews/include/InterViews/page.h
-interviews/include/InterViews/patch.h
-interviews/include/InterViews/pattern.h
-interviews/include/InterViews/place.h
-interviews/include/InterViews/polyglyph.h
-interviews/include/InterViews/printer.h
-interviews/include/InterViews/psfont.h
-interviews/include/InterViews/raster.h
-interviews/include/InterViews/regexp.h
-interviews/include/InterViews/reqerr.h
-interviews/include/InterViews/resource.h
-interviews/include/InterViews/rule.h
-interviews/include/InterViews/scrbox.h
-interviews/include/InterViews/selection.h
-interviews/include/InterViews/session.h
-interviews/include/InterViews/shadow.h
-interviews/include/InterViews/simplecomp.h
-interviews/include/InterViews/stencil.h
-interviews/include/InterViews/style.h
-interviews/include/InterViews/superpose.h
-interviews/include/InterViews/target.h
-interviews/include/InterViews/telltale.h
-interviews/include/InterViews/texcomp.h
-interviews/include/InterViews/tformsetter.h
-interviews/include/InterViews/tiff.h
-interviews/include/InterViews/tile.h
-interviews/include/InterViews/transformer.h
-interviews/include/InterViews/window.h
-interviews/include/InterViews/xymarker.h
-interviews/include/OS/_defines.h
-interviews/include/OS/_undefs.h
-interviews/include/OS/directory.h
-interviews/include/OS/enter-scope.h
-interviews/include/OS/file.h
-interviews/include/OS/host.h
-interviews/include/OS/leave-scope.h
-interviews/include/OS/list.h
-interviews/include/OS/math.h
-interviews/include/OS/memory.h
-interviews/include/OS/os.h
-interviews/include/OS/string.h
-interviews/include/OS/table.h
-interviews/include/OS/table2.h
-interviews/include/OS/types.h
-interviews/include/OS/ustring.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
-interviews/include/Unidraw/Components/connector.h
-interviews/include/Unidraw/Components/csolver.h
-interviews/include/Unidraw/Components/ellipse.h
-interviews/include/Unidraw/Components/externview.h
-interviews/include/Unidraw/Components/grcomp.h
-interviews/include/Unidraw/Components/grview.h
-interviews/include/Unidraw/Components/gvupdater.h
-interviews/include/Unidraw/Components/line.h
-interviews/include/Unidraw/Components/link.h
-interviews/include/Unidraw/Components/pad.h
-interviews/include/Unidraw/Components/pin.h
-interviews/include/Unidraw/Components/polygon.h
-interviews/include/Unidraw/Components/psformat.h
-interviews/include/Unidraw/Components/psview.h
-interviews/include/Unidraw/Components/rastercomp.h
-interviews/include/Unidraw/Components/rect.h
-interviews/include/Unidraw/Components/slot.h
-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/Graphic/damage.h
-interviews/include/Unidraw/Graphic/ellipses.h
-interviews/include/Unidraw/Graphic/geomobjs.h
-interviews/include/Unidraw/Graphic/graphic.h
-interviews/include/Unidraw/Graphic/grblock.h
-interviews/include/Unidraw/Graphic/lines.h
-interviews/include/Unidraw/Graphic/picture.h
-interviews/include/Unidraw/Graphic/polygons.h
-interviews/include/Unidraw/Graphic/pspaint.h
-interviews/include/Unidraw/Graphic/rasterrect.h
-interviews/include/Unidraw/Graphic/splines.h
-interviews/include/Unidraw/Graphic/ulabel.h
-interviews/include/Unidraw/Graphic/ustencil.h
-interviews/include/Unidraw/Graphic/util.h
-interviews/include/Unidraw/Graphic/verts.h
-interviews/include/Unidraw/Tools/connect.h
-interviews/include/Unidraw/Tools/grcomptool.h
-interviews/include/Unidraw/Tools/magnify.h
-interviews/include/Unidraw/Tools/move.h
-interviews/include/Unidraw/Tools/reshape.h
-interviews/include/Unidraw/Tools/rotate.h
-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
-interviews/lib/FREEBSD/libIV.so.3
-interviews/lib/FREEBSD/libUnidraw.so
-interviews/lib/FREEBSD/libUnidraw.so.3
-interviews/lib/all/app-defaults/Doc
-interviews/lib/all/app-defaults/Idemo
-interviews/lib/all/app-defaults/InterViews
-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
-interviews/lib/all/drawings/ducks
-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/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
-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
-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
-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
-interviews/lib/all/ibuild-samples/Sted/SaveDialog.h
-interviews/lib/all/ibuild-samples/Sted/SearchDialog.c
-interviews/lib/all/ibuild-samples/Sted/SearchDialog.h
-interviews/lib/all/ibuild-samples/Sted/Sted.c
-interviews/lib/all/ibuild-samples/Sted/Sted.h
-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
-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
-interviews/lib/all/images/jello.tif
-interviews/lib/all/images/linton.tif
-interviews/lib/all/logos/iv
-interviews/lib/all/logos/iv.OK
-interviews/lib/all/logos/iv.TV
-interviews/lib/all/logos/iv.X
-interviews/lib/all/logos/iv.bite
-interviews/lib/all/logos/iv.bits
-interviews/lib/all/logos/iv.bomb
-interviews/lib/all/logos/iv.boom
-interviews/lib/all/logos/iv.boot
-interviews/lib/all/logos/iv.bug
-interviews/lib/all/logos/iv.build
-interviews/lib/all/logos/iv.burn
-interviews/lib/all/logos/iv.chip
-interviews/lib/all/logos/iv.collapse
-interviews/lib/all/logos/iv.desk
-interviews/lib/all/logos/iv.die
-interviews/lib/all/logos/iv.die.gray
-interviews/lib/all/logos/iv.egg
-interviews/lib/all/logos/iv.fade
-interviews/lib/all/logos/iv.flag
-interviews/lib/all/logos/iv.flip
-interviews/lib/all/logos/iv.hang
-interviews/lib/all/logos/iv.holes
-interviews/lib/all/logos/iv.house
-interviews/lib/all/logos/iv.ivy
-interviews/lib/all/logos/iv.no
-interviews/lib/all/logos/iv.patch
-interviews/lib/all/logos/iv.pbomb
-interviews/lib/all/logos/iv.pbug
-interviews/lib/all/logos/iv.peel
-interviews/lib/all/logos/iv.persp
-interviews/lib/all/logos/iv.scan
-interviews/lib/all/logos/iv.scroll
-interviews/lib/all/logos/iv.shade
-interviews/lib/all/logos/iv.shuffle
-interviews/lib/all/logos/iv.spider
-interviews/lib/all/logos/iv.tank
-interviews/lib/all/logos/iv.tomb
-interviews/lib/all/logos/iv.trash
-interviews/lib/all/logos/iv.tree
-interviews/lib/all/logos/iv.warp
-interviews/lib/all/logos/iv.window
-interviews/lib/all/logos/iv.world
-interviews/lib/all/styles/10pt.sty
-interviews/lib/all/styles/12pt.sty
-interviews/lib/all/styles/14pt.sty
-interviews/lib/all/styles/18pt.sty
-interviews/lib/all/styles/24pt.sty
-interviews/lib/all/styles/8pt.sty
-interviews/lib/all/styles/article.sty
-interviews/lib/all/styles/book.sty
-interviews/lib/all/styles/helvetica.sty
-interviews/lib/all/styles/largepage.sty
-interviews/lib/all/styles/letter.sty
-interviews/lib/all/styles/mediumpage.sty
-interviews/lib/all/styles/report.sty
-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/man/refman.PS
-lib/libIV.so
-lib/libIV.so.3
-lib/libUnidraw.so
-lib/libUnidraw.so.3
-@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
diff --git a/x11-toolkits/iv/scripts/configure b/x11-toolkits/iv/scripts/configure
deleted file mode 100644
index 4bd27d00f252..000000000000
--- a/x11-toolkits/iv/scripts/configure
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-
-find ${WRKSRC} -name Makefile -print | xargs rm
-
-xpath=/usr/X11R6
-if [ -n $xpath ]; then
- xpath=`echo $xpath | sed 's;/bin/imake$;;'`
- sed "s;/usr/X386;$xpath;" ${WRKSRC}/makefile >${WRKSRC}/makefile.foo
- mv ${WRKSRC}/makefile.foo ${WRKSRC}/makefile
-fi