Update to ivtools 1.2.8

leaf node.  Adds DESTDIR support.  Drop maintainership.

Nov. 21st, 2009  ivtools-1.2.8

- significant work on keeping up with gcc and libstdc++.  A wrapper
  for stdio.h was inadvertently getting pulled in by /usr/include
  files, causing a lot of trouble.  Now builds with gcc-4.4 on Ubuntu
  9.10.

August 25th, 2009  ivtools-1.2.7

- series of memory leak checking commands
- added reference counting to OverlayView's (ComponentView's) referred from
  AttributeValue's (#define RESOURCE_COMPVIEW)
- fixed attrname func.
- fixed stddev func.
- added BooleanType to NumFunc promotion method.
- fixed graphdraw copy/paste of graph fragments
- new SocketObj for use comterp
- fix behavior of symbol manipulating funcs, by using internal bquote.
- port to Ubuntu Heron
- applied (most of) patch to build on Fedora 10 contributed by John Heidemann
- balance of changes to support ipl-1.0.4

July 9th, 2008  ivtools-1.2.6

- Debian contributed patch for iostreams backward compatibility
- bug fix for dispatcher.c contributed by Damon Permezel
- add mute command to comterp
- balance of changes to support ipl-1.0.2

March 4th, 2008  ivtools-1.2.5

- overall evolution to support use by ipl-1.0.1 (see
  http://sf.net/projects/ipl for further details)

15 files changed, 434 insertions, 38 deletions

diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index 7de6b308364..48ac4004e07 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:02 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/04/05 22:52:23 markd Exp $
 
-DISTNAME=	ivtools-1.2.4
-PKGREVISION=	5
+DISTNAME=	ivtools-1.2.8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ivtools/}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	markd@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ivtools.org/ivtools/
 COMMENT=	Drawing editors for PostScript, TeX, and web graphics
 
@@ -15,6 +14,8 @@ CONFLICTS+=	dclock-[0-9]*
 DEPENDS+=	pstoedit>=3.0:../../graphics/pstoedit
 DEPENDS+=	wget>=1.0:../../net/wget
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	imake bash:run
 
@@ -31,7 +32,8 @@ post-patch:
 pre-install:
 	${RM} -f ${WRKSRC}/config/local.def.orig
 	${RM} -f ${WRKSRC}/config/params.def.orig
-	${RM} -f ${WRKSRC}/config/site.def.NETBSD.orig
+	${RM} -f ${WRKSRC}/config/rules.def.orig
+	${RM} -f ${WRKSRC}/config/site.def.*.orig
 	${RM} -f ${WRKSRC}/config/arch.def.orig
 
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/ivtools/PLIST b/graphics/ivtools/PLIST
index 52fff3eb4c8..294e1e3cd58 100644
--- a/graphics/ivtools/PLIST
+++ b/graphics/ivtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 20:05:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/04/05 22:52:23 markd Exp $
 bin/comdraw
 bin/comterp
 bin/comtest
@@ -41,6 +41,7 @@ include/ComTerp/assignfunc.h
 include/ComTerp/bitfunc.h
 include/ComTerp/boolfunc.h
 include/ComTerp/bquotefunc.h
+include/ComTerp/charfunc.h
 include/ComTerp/comfunc.h
 include/ComTerp/comhandler.h
 include/ComTerp/commodule.h
@@ -107,10 +108,12 @@ include/Dispatch/rpcwriter.h
 include/DrawServ/ackback-handler.h
 include/DrawServ/drawcatalog.h
 include/DrawServ/drawclasses.h
+include/DrawServ/drawcmds.h
 include/DrawServ/drawcomps.h
 include/DrawServ/drawcreator.h
 include/DrawServ/draweditor.h
 include/DrawServ/drawfunc.h
+include/DrawServ/drawimport.h
 include/DrawServ/drawkit.h
 include/DrawServ/drawlink.h
 include/DrawServ/drawlinkcomp.h
@@ -131,6 +134,7 @@ include/FrameUnidraw/framecreator.h
 include/FrameUnidraw/frameeditor.h
 include/FrameUnidraw/framefile.h
 include/FrameUnidraw/framefunc.h
+include/FrameUnidraw/frameimport.h
 include/FrameUnidraw/framekit.h
 include/FrameUnidraw/frameps.h
 include/FrameUnidraw/framescripts.h
@@ -374,7 +378,7 @@ include/OverlayUnidraw/clippoly.h
 include/OverlayUnidraw/grayraster.h
 include/OverlayUnidraw/grloctool.h
 include/OverlayUnidraw/indexmixins.h
-include/OverlayUnidraw/leakchecker.h
+include/OverlayUnidraw/leafwalker.h
 include/OverlayUnidraw/ovabout.h
 include/OverlayUnidraw/ovadjuster.h
 include/OverlayUnidraw/ovarrow.h
@@ -437,7 +441,7 @@ include/TIFF/format.h
 include/TIFF/tiff.h
 include/TIFF/tiffio.h
 include/Time/Date.h
-include/Time/Time.h
+include/Time/Time_.h
 include/Time/obstime.h
 include/Time/timeglyph.h
 include/TopoFace/fgeomobjs.h
@@ -565,6 +569,7 @@ include/Unidraw/viewer.h
 include/ivstd/fstream.h
 include/ivstd/iosfwd
 include/ivstd/iostream.h
+include/ivstd/leakchecker.h
 include/ivstd/malloc.h
 include/ivstd/math.h
 include/ivstd/nan.h
diff --git a/graphics/ivtools/distinfo b/graphics/ivtools/distinfo
index 2de978cbe96..8f275f36cfb 100644
--- a/graphics/ivtools/distinfo
+++ b/graphics/ivtools/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.17 2010/01/08 18:46:48 joerg Exp $
+$NetBSD: distinfo,v 1.18 2010/04/05 22:52:23 markd Exp $
 
-SHA1 (ivtools-1.2.4.tgz) = 9c9cbfeedd7692c001b458ce82958428082367a5
-RMD160 (ivtools-1.2.4.tgz) = 88cc853e7a31b56a1968021c86394084ba07a4f4
-Size (ivtools-1.2.4.tgz) = 2145688 bytes
+SHA1 (ivtools-1.2.8.tgz) = b494c726cf8784e0a5ca3a4092e5831d2d5b2bba
+RMD160 (ivtools-1.2.8.tgz) = 7f63f2b491202ba81c6d24234760d17d7f95ebc6
+Size (ivtools-1.2.8.tgz) = 2168627 bytes
 SHA1 (patch-aa) = 191619b7db43c47d7cc991bc33787434f0ef6948
 SHA1 (patch-ab) = 3d3f9b7a821a666c4e0aade1f0236e6ee48f69b8
-SHA1 (patch-ac) = b5111b9f2c04b5906b27463032822665ebd028f3
-SHA1 (patch-ad) = 6ea96c7805bb28305f42e980a86152317988be64
+SHA1 (patch-ac) = 2b9b8065194dc0badcafdabe22079101416515aa
+SHA1 (patch-ad) = f5e19829367fb8d0406077934d2ccc222497b9aa
 SHA1 (patch-ae) = 64d0b99a868baf4be3ffd55f387ee1cd4f07747e
 SHA1 (patch-af) = de74e5bcb19c61938269a08c88e5962bbf675f76
 SHA1 (patch-ag) = d79843a5c27f024d4cb8f804c3875de29b0ec1cc
 SHA1 (patch-ah) = 4542d8bc5118d85b9722eb2f400dcc74930ff43c
 SHA1 (patch-ai) = 58bdfa9afb392298365c7d5cb203818cc64f437b
-SHA1 (patch-aj) = a69ae5ef3a8e1bacf103376f63d4935e3e6b1537
-SHA1 (patch-ak) = ac0fb27790caf62eae5afd2fa661a7d2d64589b7
+SHA1 (patch-aj) = 46c5fa3e02e5efe252e4a38c501a4f099523759c
+SHA1 (patch-ak) = fa6204c100c4d9ef361e0877dd141d5e84d4cb3a
 SHA1 (patch-al) = e3f9bb775035019bd148a5d2e90e0e6e5e23d9cc
 SHA1 (patch-am) = fdfd7321e9840540b7dc47274c8c6abb9f790a18
 SHA1 (patch-an) = 3b825ee567274415f81676b7d3e33fac69548f78
@@ -33,3 +33,11 @@ SHA1 (patch-ba) = bcc98482672d9c1642dd108fbecec16627d43345
 SHA1 (patch-bb) = 8221a722579cc8921cd71e9ff8aedbf73a938e0b
 SHA1 (patch-bc) = be65c4c37689880cb66de15efd27ab2fa77d76d0
 SHA1 (patch-bd) = c4cd942bbabf48df7919b83de6a6cef85eb9d2b3
+SHA1 (patch-be) = 71397158e66fb694ad3482ab2c231daa26fa3631
+SHA1 (patch-bf) = 60e8f16226e526e75da80652aaeb11b7f51c30a9
+SHA1 (patch-bg) = 36113051de323a5483337b4821ffa1a8163f59bf
+SHA1 (patch-bh) = dcd30d0096d8a13bdd2e5db2eb5eace3b010ba56
+SHA1 (patch-bi) = 477ce54baeb05a4c383c26af696ce18c07085e60
+SHA1 (patch-bj) = d262c3a217b8f7838a08d6a0952417aeb3e525dd
+SHA1 (patch-bk) = 96edb15971da782c78fc2dd177bce5869cb68201
+SHA1 (patch-bl) = 807a2b860184e990fbf5afcebf4a161c4c614741
diff --git a/graphics/ivtools/patches/patch-ac b/graphics/ivtools/patches/patch-ac
index 7c29144a973..9eaba72e56d 100644
--- a/graphics/ivtools/patches/patch-ac
+++ b/graphics/ivtools/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2007/06/21 11:55:32 markd Exp $
+$NetBSD: patch-ac,v 1.4 2010/04/05 22:52:23 markd Exp $
 
 --- config/site.def.NETBSD.orig	2003-10-22 18:13:39.000000000 +0000
 +++ config/site.def.NETBSD
@@ -21,3 +21,25 @@ $NetBSD: patch-ac,v 1.3 2007/06/21 11:55:32 markd Exp $
  
  /*
   * Install a shared library on NetBSD.
+@@ -46,15 +46,15 @@
+ #ifndef InstallDynamicSharedLibrary
+ #define InstallDynamicSharedLibrary(libname,rev,dest)			@@\
+ install:: Concat(lib,libname.so.rev)					@@\
+-	MakeDir(dest)                                                   @@\
+-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest   @@\
+-	-@$(RM) dest/Concat(lib,libname.so)		                @@\
+-	-@(cd dest;$(LN) Concat(lib,libname.so.rev) \			@@\
++	MakeDir($(DESTDIR)dest)                                                   @@\
++	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest   @@\
++	-@$(RM) $(DESTDIR)dest/Concat(lib,libname.so)		                @@\
++	-@(cd $(DESTDIR)dest;$(LN) Concat(lib,libname.so.rev) \			@@\
+ 	Concat(lib,libname.so))					        @@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dest/Concat(lib,libname.so.rev)				@@\
+-	$(RM) dest/Concat(lib,libname.so)	
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.so.rev)				@@\
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.so)	
+ #endif
+ 
+ #ifndef ImakeFlags
diff --git a/graphics/ivtools/patches/patch-ad b/graphics/ivtools/patches/patch-ad
index 46c7ac58e64..1df0ef8961a 100644
--- a/graphics/ivtools/patches/patch-ad
+++ b/graphics/ivtools/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.6 2006/07/24 12:04:26 markd Exp $
+$NetBSD: patch-ad,v 1.7 2010/04/05 22:52:23 markd Exp $
 
---- src/Dispatch/dispatcher.c.orig	2005-01-27 07:39:22.000000000 +1300
+--- src/Dispatch/dispatcher.c.orig	2009-09-15 16:36:12.000000000 +0000
 +++ src/Dispatch/dispatcher.c
 @@ -659,7 +659,7 @@ int Dispatcher::waitFor(
  #endif
  #else
  #ifdef SA_NOCLDSTOP                   /* POSIX */
--#if defined(hpux) || defined(linux) || defined(sun) && defined(__svr4__)
-+#if defined(hpux) || defined(linux) || defined(sun) && defined(__svr4__) || defined(__NetBSD__)
+-#if defined(__CYGWIN__) || defined(hpux) || defined(linux) || defined(sun) && defined(__svr4__)
++#if defined(__CYGWIN__) || defined(hpux) || defined(linux) || defined(sun) && defined(__svr4__) || defined(__NetBSD__)
  	sa.sa_handler = (void (*)(int))(&Dispatcher::sigCLD);
  #else
  	sa.sa_handler = fxSIGACTIONHANDLER(&Dispatcher::sigCLD);
diff --git a/graphics/ivtools/patches/patch-aj b/graphics/ivtools/patches/patch-aj
index 22dbdad97c4..4293330291b 100644
--- a/graphics/ivtools/patches/patch-aj
+++ b/graphics/ivtools/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.3 2007/02/15 18:26:15 joerg Exp $
+$NetBSD: patch-aj,v 1.4 2010/04/05 22:52:23 markd Exp $
 
---- src/ComTerp/comterpserv.c.orig	2006-07-20 20:48:00.000000000 +0000
+--- src/ComTerp/comterpserv.c.orig	2009-08-27 16:32:39.000000000 +0000
 +++ src/ComTerp/comterpserv.c
 @@ -161,7 +161,7 @@ char* ComTerpServ::fd_fgets(char* s, int
      fileptr_filebuf fbuf(ifptr, ios_base::in);
      istream in (&fbuf);
      in.get(instr, BUFSIZ, '\n');  // needs to be generalized with <vector.h>
--#elif __GNUC__>3
-+#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+-#elif __GNUC__>3 || defined(__CYGWIN__)
++#elif __GNUC__>3 || defined(__CYGWIN__) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
      char instr[BUFSIZ];
      FILE* ifptr = fd==0 ? stdin : server->handler()->rdfptr();
      fileptr_filebuf fbuf(ifptr, ios_base::in);
@@ -15,26 +15,26 @@ $NetBSD: patch-aj,v 1.3 2007/02/15 18:26:15 joerg Exp $
  #elif (__GNUC__==3 && __GNUC_MINOR__<1)
      FILE* ofptr = fd==0 ? stdout : fdopen(fd, "w");
      fileptr_filebuf fbuf(ofptr, ios_base::out);
--#elif __GNUC__>3
-+#elif __GNUC__>3 || (__GNUC__==3 && __GNUC_MINOR__ >= 4)
+-#elif __GNUC__>3 || defined(__CYGWIN__)
++#elif __GNUC__>3 || defined(__CYGWIN__) || (__GNUC__==3 && __GNUC_MINOR__ >= 4)
      FILE* ofptr = fd==0 ? stdout : server->handler()->wrfptr();
      fileptr_filebuf fbuf(ofptr, ios_base::out);
  #else
-@@ -335,7 +335,7 @@ int ComTerpServ::runfile(const char* fil
+@@ -334,7 +334,7 @@ int ComTerpServ::runfile(const char* fil
  #elif __GNUC__==3 && __GNUC_MINOR__<1
                  FILE* ofptr = handler() ? fdopen(handler()->get_handle(), "w") : stdout; 
  	        fileptr_filebuf obuf(ofptr, ios_base::out);
--#elif __GNUC__>3
-+#elif __GNUC__>3 || (__GNUC__==3 && __GNUC_MINOR__ >= 4)
+-#elif __GNUC__>3 || defined(__CYGWIN__)
++#elif __GNUC__>3 || defined(__CYGWIN__) || (__GNUC__==3 && __GNUC_MINOR__ >= 4)
                  FILE* ofptr = handler() ? handler()->wrfptr() : stdout; 
  	        fileptr_filebuf obuf(ofptr, ios_base::out);
  #else
-@@ -363,7 +363,7 @@ int ComTerpServ::runfile(const char* fil
+@@ -362,7 +362,7 @@ int ComTerpServ::runfile(const char* fil
  #elif __GNUC__==3 && __GNUC_MINOR__<1
            FILE* ofptr = handler() ? fdopen(handler()->get_handle(), "w") : stdout; 
  	  fileptr_filebuf obuf(ofptr, ios_base::out);
--#elif __GNUC__>3
-+#elif __GNUC__>3 || (__GNUC__==3 && __GNUC_MINOR__ >= 4)
+-#elif __GNUC__>3 || defined(__CYGWIN__)
++#elif __GNUC__>3 || defined(__CYGWIN__) || (__GNUC__==3 && __GNUC_MINOR__ >= 4)
            FILE* ofptr = handler() ? handler()->wrfptr() : stdout; 
  	  fileptr_filebuf obuf(ofptr, ios_base::out);
  #else
diff --git a/graphics/ivtools/patches/patch-ak b/graphics/ivtools/patches/patch-ak
index fca87f18c76..166386bfa5c 100644
--- a/graphics/ivtools/patches/patch-ak
+++ b/graphics/ivtools/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.3 2007/02/15 18:26:15 joerg Exp $
+$NetBSD: patch-ak,v 1.4 2010/04/05 22:52:23 markd Exp $
 
---- src/ComTerp/comterp.c.orig	2007-02-15 16:01:11.000000000 +0000
+--- src/ComTerp/comterp.c.orig	2009-09-08 03:18:15.000000000 +0000
 +++ src/ComTerp/comterp.c
-@@ -899,7 +899,7 @@ int ComTerp::run(boolean one_expr, boole
+@@ -999,7 +999,7 @@ int ComTerp::run(boolean one_expr, boole
      fbuf.attach(fd);
    } else
      fbuf.attach(fileno(stdout));
--#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3
-+#elif (__GNUC__==3 && (__GNUC_MINOR__<1 || __GNUC_MINOR__ >= 4)) || __GNUC__>3
+-#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3 || defined(__CYGWIN__)
++#elif (__GNUC__==3 && (__GNUC_MINOR__<1 || __GNUC_MINOR__ >= 4)) || __GNUC__>3 || defined(__CYGWIN__)
    fileptr_filebuf fbuf(handler() && handler()->wrfptr() 
  	       ? handler()->wrfptr() : stdout, 
  	       ios_base::out);
diff --git a/graphics/ivtools/patches/patch-be b/graphics/ivtools/patches/patch-be
new file mode 100644
index 00000000000..37e05c13d0c
--- /dev/null
+++ b/graphics/ivtools/patches/patch-be
@@ -0,0 +1,191 @@
+$NetBSD: patch-be,v 1.1 2010/04/05 22:52:23 markd Exp $
+
+--- config/rules.def.orig	2005-10-11 21:21:17.000000000 +0000
++++ config/rules.def
+@@ -929,22 +929,22 @@ step::									@@\
+ #ifndef InstallDynamicSharedLibrary
+ #define InstallDynamicSharedLibrary(libname,rev,dest)			@@\
+ install:: Concat(lib,libname.so.rev)					@@\
+-	MakeDir(dest)							@@\
+-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest   @@\
++	MakeDir($(DESTDIR)dest)							@@\
++	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest   @@\
+ 									@@\
+ uninstall:: 								@@\
+-	$(RM) dest/Concat(lib,libname.so.rev)			
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.so.rev)			
+ #endif
+ 
+ #ifndef InstallNonSharedLibrary
+ #define InstallNonSharedLibrary(libname,dest)				@@\
+ install:: Concat(lib,libname.a)						@@\
+-	MakeDir(dest)							@@\
+-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) dest	@@\
+-	RanLibrary($(RANLIBINSTFLAGS) Concat(dest/lib,libname.a))       @@\
++	MakeDir($(DESTDIR)dest)							@@\
++	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) $(DESTDIR)dest	@@\
++	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.a))       @@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dest/Concat(lib,libname.a)
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.a)
+ #endif
+ 
+ #ifndef InstallLibrary
+@@ -964,20 +964,20 @@ InstallNonSharedLibrary(libname,dest)
+ #if RemoveAfterInstall
+ #define InstallProgramWithFlags(program,destdir,destname,flags)		@@\
+ install:: program							@@\
+-	MakeDir(destdir)						@@\
+-	$(INSTALL) -c $(INSTPGMFLAGS) flags program destdir/destname	@@\
++	MakeDir($(DESTDIR)destdir)						@@\
++	$(INSTALL) -c $(INSTPGMFLAGS) flags program $(DESTDIR)destdir/destname	@@\
+ 	$(RM) program							@@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) destdir/destname
++	$(RM) $(DESTDIR)destdir/destname
+ #else
+ #define InstallProgramWithFlags(program,destdir,destname,flags)		@@\
+ install:: program							@@\
+-	MakeDir(destdir)						@@\
+-	$(INSTALL) -c $(INSTPGMFLAGS) flags program destdir/destname    @@\
++	MakeDir($(DESTDIR)destdir)						@@\
++	$(INSTALL) -c $(INSTPGMFLAGS) flags program $(DESTDIR)destdir/destname    @@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) destdir/destname
++	$(RM) $(DESTDIR)destdir/destname
+ #endif
+ #endif
+ 
+@@ -992,11 +992,11 @@ InstallProgramWithFlags(program,destdir,
+ #ifndef InstallScript
+ #define InstallScript(script,dest)					@@\
+ install:: script							@@\
+-	MakeDir(dest)							@@\
+-	$(INSTALL) -c $(INSTBINFLAGS) script dest			@@\
++	MakeDir($(DESTDIR)dest)							@@\
++	$(INSTALL) -c $(INSTBINFLAGS) script $(DESTDIR)dest			@@\
+ 									@@\
+ uninstall::								@@\
+-	dest/script
++	$(DESTDIR)dest/script
+ #endif
+ 
+ /*
+@@ -1005,11 +1005,11 @@ uninstall::								@@\
+ #ifndef InstallScriptAs
+ #define InstallScriptAs(script,dest,destname)				@@\
+ install:: script							@@\
+-	MakeDir(dest)							@@\
+-	$(INSTALL) -c $(INSTBINFLAGS) script dest/destname		@@\
++	MakeDir($(DESTDIR)dest)							@@\
++	$(INSTALL) -c $(INSTBINFLAGS) script $(DESTDIR)dest/destname		@@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dest/destname		
++	$(RM) $(DESTDIR)dest/destname		
+ #endif
+ 
+ /*
+@@ -1018,14 +1018,14 @@ uninstall::								@@\
+ #ifndef InstallMultipleFlags
+ #define InstallMultipleFlags(list,dest,flags)				@@\
+ install:: list								@@\
+-	MakeDir(dest)							@@\
++	MakeDir($(DESTDIR)dest)							@@\
+ 	@for i in list; do \						@@\
+-		(set -x; $(INSTALL) -c flags $$i dest); \		@@\
++		(set -x; $(INSTALL) -c flags $$i $(DESTDIR)dest); \		@@\
+ 	done								@@\
+ 									@@\
+ uninstall::								@@\
+ 	@for i in list; do \						@@\
+-		($(RM) dest/$$i); \					@@\
++		($(RM) $(DESTDIR)dest/$$i); \					@@\
+ 	done
+ #endif
+ 
+@@ -1042,12 +1042,12 @@ InstallMultipleFlags(list,dest,$(INSTALL
+ install::  								@@\
+ 	@if [ -f libdir/libbase ]; then \				@@\
+ 	if [ ! -f dest/libbase ]; then \				@@\
+-		 $(LN) libdir/libbase dest/; \				@@\
+-		 echo $(LN) libdir/libbase dest/ \			@@\
++		 $(LN) libdir/libbase $(DESTDIR)dest/; \				@@\
++		 echo $(LN) libdir/libbase $(DESTDIR)dest/ \			@@\
+ 	;fi ;fi								@@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dest/libbase
++	$(RM) $(DESTDIR)dest/libbase
+ #endif
+ 
+ /*
+@@ -1063,11 +1063,11 @@ install::								@@\
+ #else
+ #define InstallIncludes(dir)						@@\
+ install::								@@\
+-	MakeDir($(INCDIR)/dir)						@@\
+-	$(INSTALL) -c $(INSTINCFLAGS) *.h $(INCDIR)/dir			@@\
++	MakeDir($(DESTDIR)$(INCDIR)/dir)						@@\
++	$(INSTALL) -c $(INSTINCFLAGS) *.h $(DESTDIR)$(INCDIR)/dir			@@\
+ 									@@\
+ uninstall::								@@\
+-	(cd $(INCDIR)/dir;$(RM) *.h)
++	(cd $(DESTDIR)$(INCDIR)/dir;$(RM) *.h)
+ #endif
+ #endif
+ 
+@@ -1080,11 +1080,11 @@ install::								@@\
+ #else
+ #define InstallInclude(dir, file)					@@\
+ install::								@@\
+-	MakeDir($(INCDIR)/dir)						@@\
+-	$(INSTALL) -c $(INSTINCFLAGS) file $(INCDIR)/dir		@@\
++	MakeDir($(DESTDIR)$(INCDIR)/dir)						@@\
++	$(INSTALL) -c $(INSTINCFLAGS) file $(DESTDIR)$(INCDIR)/dir		@@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) $(INCDIR)/dir/file
++	$(RM) $(DESTDIR)$(INCDIR)/dir/file
+ #endif
+ #endif
+ 
+@@ -1095,19 +1095,19 @@ uninstall::								@@\
+ #if !defined(SVR4) && !defined(DarwinArchitecture)
+ #define InstallSymLink(dir, file)					@@\
+ install::								@@\
+-	MakeDir(dir)							@@\
+-	cp -fd file dir							@@\
++	MakeDir($(DESTDIR)dir)							@@\
++	cp -fd file $(DESTDIR)dir							@@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dir/file	
++	$(RM) $(DESTDIR)dir/file	
+ #else
+ #define InstallSymLink(dir, file)					@@\
+ install::								@@\
+-	MakeDir(dir)							@@\
+-	tar cf - file | (cd dir; tar xfp -)				@@\
++	MakeDir($(DESTDIR)dir)							@@\
++	tar cf - file | (cd $(DESTDIR)dir; tar xfp -)				@@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dir/file	
++	$(RM) $(DESTDIR)dir/file	
+ #endif
+ #endif	
+ #endif
+@@ -1119,7 +1119,7 @@ uninstall::								@@\
+ #ifndef InstallXDefaultAs                                        
+ #define InstallXDefaultAs(source,dest,destname)                          @@\
+ install:: source                                                         @@\
+-	MakeDir(dest)                                                    @@\
+-	$(INSTALL) -c $(INSTINCFLAGS) source dest/destname
++	MakeDir($(DESTDIR)dest)                                                    @@\
++	$(INSTALL) -c $(INSTINCFLAGS) source $(DESTDIR)dest/destname
+ #endif
+ 
diff --git a/graphics/ivtools/patches/patch-bf b/graphics/ivtools/patches/patch-bf
new file mode 100644
index 00000000000..46c3f9431a0
--- /dev/null
+++ b/graphics/ivtools/patches/patch-bf
@@ -0,0 +1,18 @@
+$NetBSD: patch-bf,v 1.1 2010/04/05 22:52:23 markd Exp $
+
+--- config/Imakefile.orig	2003-10-22 18:13:38.000000000 +0000
++++ config/Imakefile
+@@ -11,10 +11,10 @@ MakeInSubdirs($(SUBDIRS))
+ 
+ #if !InstallRelative
+ install::
+-	MakeDir($(CONFIGDIR))
+-	$(INSTALL) -c $(INSTINCFLAGS) *.def* template *.mk $(CONFIGDIR)
++	MakeDir($(DESTDIR)$(CONFIGDIR))
++	$(INSTALL) -c $(INSTINCFLAGS) *.def* template *.mk $(DESTDIR)$(CONFIGDIR)
+ 
+ uninstall::
+-	(cd $(CONFIGDIR);$(RM) *.def* template *.mk)
++	(cd $(DESTDIR)$(CONFIGDIR);$(RM) *.def* template *.mk)
+ #endif
+ 
diff --git a/graphics/ivtools/patches/patch-bg b/graphics/ivtools/patches/patch-bg
new file mode 100644
index 00000000000..c14ae80b53a
--- /dev/null
+++ b/graphics/ivtools/patches/patch-bg
@@ -0,0 +1,19 @@
+$NetBSD: patch-bg,v 1.1 2010/04/05 22:52:23 markd Exp $
+
+--- config/InterViews/Imakefile.orig	2003-10-22 18:13:37.000000000 +0000
++++ config/InterViews/Imakefile
+@@ -8,11 +8,11 @@ IvmkcmTargets($(PACKAGE))
+ 
+ #if !InstallRelative
+ install::
+-	MakeDir($(CONFIGDIR)/InterViews)
+-	$(INSTALL) -c $(INSTINCFLAGS) *.cf $(CONFIGDIR)/InterViews
++	MakeDir($(DESTDIR)$(CONFIGDIR)/InterViews)
++	$(INSTALL) -c $(INSTINCFLAGS) *.cf $(DESTDIR)$(CONFIGDIR)/InterViews
+ 
+ uninstall::
+-	(cd $(CONFIGDIR)/InterViews; $(RM) *.cf)
++	(cd $(DESTDIR)$(CONFIGDIR)/InterViews; $(RM) *.cf)
+ #endif
+ 
+ 
diff --git a/graphics/ivtools/patches/patch-bh b/graphics/ivtools/patches/patch-bh
new file mode 100644
index 00000000000..5d618d0c8d7
--- /dev/null
+++ b/graphics/ivtools/patches/patch-bh
@@ -0,0 +1,26 @@
+$NetBSD: patch-bh,v 1.1 2010/04/05 22:52:23 markd Exp $
+
+--- config/site.def.DARWIN.orig	2005-10-07 16:51:19.000000000 +0000
++++ config/site.def.DARWIN
+@@ -83,15 +83,15 @@ clean::									@@\
+ #ifndef InstallDynamicSharedLibrary
+ #define InstallDynamicSharedLibrary(libname,rev,dest)			@@\
+ install:: Concat(lib,libname.rev.dylib)					@@\
+-	MakeDir(dest)                                                   @@\
+-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.rev.dylib) dest   @@\
+-	-@$(RM) dest/Concat(lib,libname.dylib)		                @@\
+-	-@(cd dest;$(LN) Concat(lib,libname.rev.dylib) \			@@\
++	MakeDir($(DESTDIR)dest)                                                   @@\
++	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.rev.dylib) $(DESTDIR)dest   @@\
++	-@$(RM) $(DESTDIR)dest/Concat(lib,libname.dylib)		                @@\
++	-@(cd $(DESTDIR)dest;$(LN) Concat(lib,libname.rev.dylib) \			@@\
+ 	Concat(lib,libname.dylib))					        @@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dest/Concat(lib,libname.rev.dylib)				@@\
+-	$(RM) dest/Concat(lib,libname.dylib)	
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.rev.dylib)				@@\
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.dylib)	
+ #endif
+ 
+ /* file output by configure script */
diff --git a/graphics/ivtools/patches/patch-bi b/graphics/ivtools/patches/patch-bi
new file mode 100644
index 00000000000..82a9b726ca6
--- /dev/null
+++ b/graphics/ivtools/patches/patch-bi
@@ -0,0 +1,26 @@
+$NetBSD: patch-bi,v 1.1 2010/04/05 22:52:23 markd Exp $
+
+--- config/site.def.FREEBSD.orig	2003-10-22 18:13:39.000000000 +0000
++++ config/site.def.FREEBSD
+@@ -43,15 +43,15 @@
+ #ifndef InstallDynamicSharedLibrary
+ #define InstallDynamicSharedLibrary(libname,rev,dest)			@@\
+ install:: Concat(lib,libname.so.rev)					@@\
+-	MakeDir(dest)                                                   @@\
+-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest   @@\
+-	-@$(RM) dest/Concat(lib,libname.so)		                @@\
+-	-@(cd dest;$(LN) Concat(lib,libname.so.rev) \			@@\
++	MakeDir($(DESTDIR)dest)                                                   @@\
++	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest   @@\
++	-@$(RM) $(DESTDIR)dest/Concat(lib,libname.so)		                @@\
++	-@(cd $(DESTDIR)dest;$(LN) Concat(lib,libname.so.rev) \			@@\
+ 	Concat(lib,libname.so))					        @@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dest/Concat(lib,libname.so.rev)				@@\
+-	$(RM) dest/Concat(lib,libname.so)	
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.so.rev)				@@\
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.so)	
+ #endif
+ 
+ /* file output by configure script */
diff --git a/graphics/ivtools/patches/patch-bj b/graphics/ivtools/patches/patch-bj
new file mode 100644
index 00000000000..6ccd8a83840
--- /dev/null
+++ b/graphics/ivtools/patches/patch-bj
@@ -0,0 +1,27 @@
+$NetBSD: patch-bj,v 1.1 2010/04/05 22:52:23 markd Exp $
+
+--- config/site.def.HP800.orig	2003-10-22 18:13:39.000000000 +0000
++++ config/site.def.HP800
+@@ -50,15 +50,15 @@
+ #ifndef InstallDynamicSharedLibrary
+ #define InstallDynamicSharedLibrary(libname,rev,dest)			@@\
+ install:: Concat(lib,libname.sl.rev)					@@\
+-	MakeDir(dest)							@@\
+-	if [ -f dest/Concat(lib,libname.sl.rev) ]; then \		@@\
+-	$(RM) dest/Concat(lib,libname.sl.rev); else exit 0; fi		@@\
+-	$(INSTALL) -c -m555 Concat(lib,libname.sl.rev) dest   		@@\
+-	$(LN) dest/Concat(lib,libname.sl.rev) dest/Concat(lib,libname.sl)@@\
++	MakeDir($(DESTDIR)dest)							@@\
++	if [ -f $(DESTDIR)dest/Concat(lib,libname.sl.rev) ]; then \		@@\
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.sl.rev); else exit 0; fi		@@\
++	$(INSTALL) -c -m555 Concat(lib,libname.sl.rev) $(DESTDIR)dest   		@@\
++	$(LN) $(DESTDIR)dest/Concat(lib,libname.sl.rev) $(DESTDIR)dest/Concat(lib,libname.sl)@@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dest/Concat(lib,libname.sl.rev)				@@\
+-	$(RM) dest/Concat(lib,libname.sl)
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.sl.rev)				@@\
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.sl)
+ #endif
+ 
+ #undef BuildProgram
diff --git a/graphics/ivtools/patches/patch-bk b/graphics/ivtools/patches/patch-bk
new file mode 100644
index 00000000000..2e2c0e5fd48
--- /dev/null
+++ b/graphics/ivtools/patches/patch-bk
@@ -0,0 +1,26 @@
+$NetBSD: patch-bk,v 1.1 2010/04/05 22:52:23 markd Exp $
+
+--- config/site.def.LINUX.orig	2003-10-22 18:13:39.000000000 +0000
++++ config/site.def.LINUX
+@@ -43,15 +43,15 @@
+ #ifndef InstallDynamicSharedLibrary
+ #define InstallDynamicSharedLibrary(libname,rev,dest)			@@\
+ install:: Concat(lib,libname.so.rev)					@@\
+-	MakeDir(dest)                                                   @@\
+-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest   @@\
+-	-@$(RM) dest/Concat(lib,libname.so)		                @@\
+-	-@(cd dest;$(LN) Concat(lib,libname.so.rev) \			@@\
++	MakeDir($(DESTDIR)dest)                                                   @@\
++	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest   @@\
++	-@$(RM) $(DESTDIR)dest/Concat(lib,libname.so)		                @@\
++	-@(cd $(DESTDIR)dest;$(LN) Concat(lib,libname.so.rev) \			@@\
+ 	Concat(lib,libname.so))					        @@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dest/Concat(lib,libname.so.rev)				@@\
+-	$(RM) dest/Concat(lib,libname.so)	
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.so.rev)				@@\
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.so)	
+ #endif
+ 
+ /* file output by configure script */
diff --git a/graphics/ivtools/patches/patch-bl b/graphics/ivtools/patches/patch-bl
new file mode 100644
index 00000000000..6dfe2277570
--- /dev/null
+++ b/graphics/ivtools/patches/patch-bl
@@ -0,0 +1,26 @@
+$NetBSD: patch-bl,v 1.1 2010/04/05 22:52:23 markd Exp $
+
+--- config/site.def.SUN4.orig	2003-10-22 18:13:39.000000000 +0000
++++ config/site.def.SUN4
+@@ -82,15 +82,15 @@
+ #ifndef InstallDynamicSharedLibrary
+ #define InstallDynamicSharedLibrary(libname,rev,dest)                   @@\
+ install:: Concat(lib,libname.so.rev)                                    @@\
+-	MakeDir(dest)                                                   @@\
+-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest   @@\
+-	-@if [ -f dest/Concat(lib,libname.so) ]; then exit 0; else \    @@\
+-	cd dest; \                                                   	@@\
++	MakeDir($(DESTDIR)dest)                                                   @@\
++	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest   @@\
++	-@if [ -f $(DESTDIR)dest/Concat(lib,libname.so) ]; then exit 0; else \    @@\
++	cd $(DESTDIR)dest; \                                                   	@@\
+ 	$(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so); fi	@@\
+ 									@@\
+ uninstall::								@@\
+-	$(RM) dest/Concat(lib,libname.so.rev)				@@\
+-	$(RM) dest/Concat(lib,libname.so)
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.so.rev)				@@\
++	$(RM) $(DESTDIR)dest/Concat(lib,libname.so)
+ #endif
+ 
+ /*