Add DragonFly support, fix build with modular and pkgsrc Xorg and

shared library linkage in general. On DragonFly and NetBSD build
with -Wl,-z,defs to find possible regressions.

28 files changed, 477 insertions, 15 deletions

diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index ed104f9a6ba..d19a4064f4a 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2006/07/26 11:53:39 markd Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/15 18:26:14 joerg Exp $
 
 DISTNAME=	ivtools-1.2.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ivtools/}
 EXTRACT_SUFX=	.tgz
@@ -16,20 +16,24 @@ DEPENDS+=	pstoedit>=3.0:../../graphics/pstoedit
 DEPENDS+=	wget>=1.0:../../net/wget
 
 USE_LANGUAGES=	c c++
+USE_TOOLS+=	imake
 
 WRKSRC=		${WRKDIR}/ivtools-1.2
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-tiff=${BUILDLINK_PREFIX.tiff}
 
-.include "../../mk/x11.buildlink3.mk"
-
 post-patch:
 	${RM} -f ${WRKSRC}/src/include/ivstd/strstream.h
+	${TOUCH} ${WRKSRC}/config/dragonfly-gcc.mk
 
 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/arch.def.orig
 
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ivtools/PLIST b/graphics/ivtools/PLIST
index 49efa6ba1f7..14f416b0596 100644
--- a/graphics/ivtools/PLIST
+++ b/graphics/ivtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/07/24 12:04:26 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/02/15 18:26:14 joerg Exp $
 bin/comdraw
 bin/comterp
 bin/comtest
@@ -618,6 +618,7 @@ lib/ivtools/config/config.mk
 lib/ivtools/config/config.null.mk
 lib/ivtools/config/darwin-gcc.mk
 lib/ivtools/config/default-gcc.mk
+lib/ivtools/config/dragonfly-gcc.mk
 lib/ivtools/config/freebsd-gcc.mk
 lib/ivtools/config/freebsd2.1-gcc.mk
 lib/ivtools/config/gcc.def
diff --git a/graphics/ivtools/distinfo b/graphics/ivtools/distinfo
index 571391dcfbd..f1d874bb59f 100644
--- a/graphics/ivtools/distinfo
+++ b/graphics/ivtools/distinfo
@@ -1,10 +1,33 @@
-$NetBSD: distinfo,v 1.12 2006/07/26 11:53:39 markd Exp $
+$NetBSD: distinfo,v 1.13 2007/02/15 18:26:14 joerg Exp $
 
 SHA1 (ivtools-1.2.4.tgz) = 9c9cbfeedd7692c001b458ce82958428082367a5
 RMD160 (ivtools-1.2.4.tgz) = 88cc853e7a31b56a1968021c86394084ba07a4f4
 Size (ivtools-1.2.4.tgz) = 2145688 bytes
 SHA1 (patch-aa) = 191619b7db43c47d7cc991bc33787434f0ef6948
-SHA1 (patch-ab) = 513a29c861c7e33771667088668eaf7ff8e12778
-SHA1 (patch-ac) = bcda1a0b71b669ad6a4900077564c226af262708
+SHA1 (patch-ab) = 3d3f9b7a821a666c4e0aade1f0236e6ee48f69b8
+SHA1 (patch-ac) = c775baafa06c485a43f4341f480c04763d786964
 SHA1 (patch-ad) = 6ea96c7805bb28305f42e980a86152317988be64
 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-al) = c905b8ccc563bc5abcf0886b7511b4b354e2126d
+SHA1 (patch-am) = 6fd5da0438b6ae590a3636a6cb8abfff39eb5a7b
+SHA1 (patch-an) = 77271166ace7fa09ab12f373a574285d4fa3c700
+SHA1 (patch-ao) = 9c102573e30668ac5e722a0b2154eff0acfd27cb
+SHA1 (patch-ap) = 48c66a135f2cc685baddd9f26ebd0088323c14ca
+SHA1 (patch-aq) = edb3d1729a4d3f1b2f2fc95b6f1ca1853d70b032
+SHA1 (patch-ar) = e15757657454a1d86be2d35eb723ae66137a3d6d
+SHA1 (patch-as) = 75260ee2e3b6138d0927a9699549791e5921147f
+SHA1 (patch-at) = 4721e365a4ef906b97e1ef420221fddc06b14bf9
+SHA1 (patch-au) = 584b290c3509f2c433462ceeaac9b74a28577c1b
+SHA1 (patch-av) = d08feade6cdcc103ffe9fcce77b6a9382a3a23cc
+SHA1 (patch-aw) = 74f0aa51dc30e5e516853b2d5313a66c063b18cb
+SHA1 (patch-ax) = dd1ce5494d1e4562108d3dd8b3dda914b4156f1e
+SHA1 (patch-ay) = 9b50981134c7051d81f233da5fb76e82500a5428
+SHA1 (patch-az) = f73e21946a93f645cc0d295824de4a216e2cc2b4
+SHA1 (patch-ba) = 886b050733da5e6b2c882874c056928669c62912
+SHA1 (patch-bb) = 8385ea997c189384f514dcec7700cb3a2ab30a9f
diff --git a/graphics/ivtools/patches/patch-ab b/graphics/ivtools/patches/patch-ab
index 0018c0889b8..6128ebd551f 100644
--- a/graphics/ivtools/patches/patch-ab
+++ b/graphics/ivtools/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2006/07/24 12:04:26 markd Exp $
+$NetBSD: patch-ab,v 1.4 2007/02/15 18:26:14 joerg Exp $
 
---- configure.orig	2005-10-07 07:00:22.000000000 +1300
+--- configure.orig	2005-10-10 18:35:27.000000000 +0000
 +++ configure
-@@ -3734,7 +3734,7 @@ if test "${ac_cv_lib_stdcpp_peek__7istre
+@@ -1346,6 +1346,7 @@ case "$host" in
+     *hpux*10*20) platform_part=hpux10.20 ;;
+     *hpux* ) platform_part=hpux ;;
+     *netbsd* ) platform_part=netbsd ;;
++    *dragonfly* ) platform_part=netbsd ;;
+     *linux* ) platform_part=linux ;;
+     m88k-*-sysv4 ) platform_part=m88k-sysv4 ;;
+     m88k-*-sysv3 ) platform_part=m88k-sysv3 ;;
+@@ -3741,7 +3742,7 @@ if test "${ac_cv_lib_stdcpp_peek__7istre
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,7 +19,7 @@ $NetBSD: patch-ab,v 1.3 2006/07/24 12:04:26 markd Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -3804,7 +3804,7 @@ if test "${ac_cv_lib_stdcpp__ZNSi4peekEv
+@@ -3811,7 +3812,7 @@ if test "${ac_cv_lib_stdcpp__ZNSi4peekEv
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
diff --git a/graphics/ivtools/patches/patch-ac b/graphics/ivtools/patches/patch-ac
index 514eaf38fba..7357ef18324 100644
--- a/graphics/ivtools/patches/patch-ac
+++ b/graphics/ivtools/patches/patch-ac
@@ -1,14 +1,23 @@
-$NetBSD: patch-ac,v 1.1 2003/11/18 21:09:18 markd Exp $
+$NetBSD: patch-ac,v 1.2 2007/02/15 18:26:14 joerg Exp $
 
---- config/site.def.NETBSD.orig	2003-10-23 07:13:39.000000000 +1300
+--- config/site.def.NETBSD.orig	2003-10-22 18:13:39.000000000 +0000
 +++ config/site.def.NETBSD
 @@ -16,6 +16,9 @@
  #undef TroffCmd
  #define TroffCmd groff
  
 +#undef CppCmd
-+#define CppCmd /usr/bin/cpp
++#define CppCmd cpp
 +
  /* 
   * build RPC classes -- requires iostreams & TCP sockets
   */
+@@ -35,7 +38,7 @@
+ #define ExtraCCLdLibs -lstdc++ -lm
+ 
+ /* command to create shared libraries */
+-#define SharedLibraryCmd(ldobjs,extra_flags) gcc -shared extra_flags -o $@ ldobjs
++#define SharedLibraryCmd(ldobjs,extra_flags) ${CXX} -Wl,-z,defs ${CCLDFLAGS} -shared extra_flags -o $@ ldobjs
+ 
+ /*
+  * Install a shared library on NetBSD.
diff --git a/graphics/ivtools/patches/patch-af b/graphics/ivtools/patches/patch-af
new file mode 100644
index 00000000000..c00ffb78fff
--- /dev/null
+++ b/graphics/ivtools/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.3 2007/02/15 18:26:14 joerg Exp $
+
+--- config/arch.def.orig	2007-02-15 15:28:24.000000000 +0000
++++ config/arch.def
+@@ -463,6 +463,17 @@
+ #define MacroFile InterViews/iv-netbsd.cf
+ #endif /* __NetBSD__ */
+ 
++#if defined(__DragonFly__)
++#undef DRAGONFLY
++#undef dragonfly
++#define DragonFlyArchitecture
++#define ArchitectureName DragonFly
++#define architectureName dragonfly
++#define SiteDefCpu <site.def.NETBSD>
++#define MacroIncludeFile <InterViews/iv-netbsd.cf>
++#define MacroFile InterViews/iv-netbsd.cf
++#endif /* __NetBSD__ */
++
+ #if defined(__FreeBSD__)
+ #undef FREEBSD
+ #undef freebsd
diff --git a/graphics/ivtools/patches/patch-ag b/graphics/ivtools/patches/patch-ag
new file mode 100644
index 00000000000..48249bb8733
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2007/02/15 18:26:15 joerg Exp $
+
+--- config/InterViews/TIFF.def.orig	2007-02-15 15:29:59.000000000 +0000
++++ config/InterViews/TIFF.def
+@@ -142,7 +142,7 @@ TIFF_OPTIMIZE_CFLAGS = TIFFOptimizeCFlag
+    -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
+     -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
+ #endif
+-#if defined(NetBSDArchitecture)
++#if defined(NetBSDArchitecture) || defined(DragonflyArchitecture)
+ #define TIFFStdCDefines \
+     -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
+     -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
diff --git a/graphics/ivtools/patches/patch-ah b/graphics/ivtools/patches/patch-ah
new file mode 100644
index 00000000000..6c44d798065
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.3 2007/02/15 18:26:15 joerg Exp $
+
+--- src/include/ivstd/nan.h.orig	2007-02-15 15:31:06.000000000 +0000
++++ src/include/ivstd/nan.h
+@@ -3,7 +3,7 @@
+ 
+ #if defined(__GLIBC__) && (__GLIBC__==2 && __GLIBC_MINOR__>0 || __GLIBC__>2)
+ #include <bits/nan.h>
+-#elif !defined(__CYGWIN__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
++#elif !defined(__CYGWIN__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
+ #include_next <nan.h>
+ #else
+ #include <math.h>
+@@ -12,7 +12,7 @@
+ #include <ieeefp.h>
+ #endif
+ 
+-#if defined(__sun__) && defined(__svr4__) || defined(__CYGWIN__) || defined(__linux__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(__sun__) && defined(__svr4__) || defined(__CYGWIN__) || defined(__linux__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+ #define isnanorinf(dval) (!finite(dval))
+ #elif defined(__alpha)
+ #define isnanorinf(dval) (IsNANorINF(dval))
diff --git a/graphics/ivtools/patches/patch-ai b/graphics/ivtools/patches/patch-ai
new file mode 100644
index 00000000000..11bf2521d5f
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.3 2007/02/15 18:26:15 joerg Exp $
+
+--- src/IV-X11/xwindow.c.orig	2007-02-15 15:44:36.000000000 +0000
++++ src/IV-X11/xwindow.c
+@@ -62,7 +62,7 @@
+ #include <stropts.h>
+ #include <sys/conf.h>
+ #endif
+-#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
+ #if !defined(__linux__) && !defined(__CYGWIN__)
+ /* no standard place for this */
+ extern "C" {
diff --git a/graphics/ivtools/patches/patch-aj b/graphics/ivtools/patches/patch-aj
new file mode 100644
index 00000000000..22dbdad97c4
--- /dev/null
+++ b/graphics/ivtools/patches/patch-aj
@@ -0,0 +1,40 @@
+$NetBSD: patch-aj,v 1.3 2007/02/15 18:26:15 joerg Exp $
+
+--- src/ComTerp/comterpserv.c.orig	2006-07-20 20:48:00.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)
+     char instr[BUFSIZ];
+     FILE* ifptr = fd==0 ? stdin : server->handler()->rdfptr();
+     fileptr_filebuf fbuf(ifptr, ios_base::in);
+@@ -214,7 +214,7 @@ int ComTerpServ::fd_fputs(const char* s,
+ #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)
+     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
+ #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)
+                 FILE* ofptr = handler() ? handler()->wrfptr() : stdout; 
+ 	        fileptr_filebuf obuf(ofptr, ios_base::out);
+ #else
+@@ -363,7 +363,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)
+           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
new file mode 100644
index 00000000000..fca87f18c76
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.3 2007/02/15 18:26:15 joerg Exp $
+
+--- src/ComTerp/comterp.c.orig	2007-02-15 16:01:11.000000000 +0000
++++ src/ComTerp/comterp.c
+@@ -899,7 +899,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
+   fileptr_filebuf fbuf(handler() && handler()->wrfptr() 
+ 	       ? handler()->wrfptr() : stdout, 
+ 	       ios_base::out);
diff --git a/graphics/ivtools/patches/patch-al b/graphics/ivtools/patches/patch-al
new file mode 100644
index 00000000000..beab17f66e6
--- /dev/null
+++ b/graphics/ivtools/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.3 2007/02/15 18:26:16 joerg Exp $
+
+--- src/IV/Imakefile.orig	2005-10-06 18:33:31.000000000 +0000
++++ src/IV/Imakefile
+@@ -41,6 +41,7 @@ SRCS	   = \
+ LIB	   = IV
+ 
+ KIT_CCFLAGS = KitFlags
++OTHER_CCLDFLAGS += ${TIFF_CCLDLIBS} -lX11 -lXext
+ LIBPATHS   = -DABSLIBALLDIR='"$(ABSLIBALLDIR)"' -DRELLIBALLDIR='"$(RELLIBALLDIR)"' \
+ 	     -DX_LIBDIR='"$(XLIBDIR)"'
+ DEPEND_CCFLAGS = DependCCFlags $(KIT_CCFLAGS) $(GL_CCFLAGS)
diff --git a/graphics/ivtools/patches/patch-am b/graphics/ivtools/patches/patch-am
new file mode 100644
index 00000000000..9509fbad4e1
--- /dev/null
+++ b/graphics/ivtools/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.3 2007/02/15 18:26:16 joerg Exp $
+
+--- src/Unidraw/Imakefile.orig	2007-02-15 16:29:47.000000000 +0000
++++ src/Unidraw/Imakefile
+@@ -7,6 +7,7 @@ PACKAGE = Unidraw
+ #ifdef InObjectCodeDir
+ 
+ LIB = Unidraw
++OTHER_CCLDFLAGS= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV -lX11
+ 
+ MakeLibrary($(LIB),$(VERSION))
+ 
diff --git a/graphics/ivtools/patches/patch-an b/graphics/ivtools/patches/patch-an
new file mode 100644
index 00000000000..ca40eebe45c
--- /dev/null
+++ b/graphics/ivtools/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.3 2007/02/15 18:26:16 joerg Exp $
+
+--- src/Unidraw-common/Imakefile.orig	2007-02-15 16:34:42.000000000 +0000
++++ src/Unidraw-common/Imakefile
+@@ -8,6 +8,7 @@ NO_IVMKCM = 1
+ #ifdef InObjectCodeDir
+ 
+ LIB = Unidraw-common
++OTHER_CCLDFLAGS= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
+ 
+ MakeLibrary($(LIB),$(VERSION))
+ 
diff --git a/graphics/ivtools/patches/patch-ao b/graphics/ivtools/patches/patch-ao
new file mode 100644
index 00000000000..18d83e7905c
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.3 2007/02/15 18:26:16 joerg Exp $
+
+--- src/Attribute/Imakefile.orig	2007-02-15 16:36:04.000000000 +0000
++++ src/Attribute/Imakefile
+@@ -7,6 +7,10 @@ PACKAGE = Attribute
+ #ifdef InObjectCodeDir
+ 
+ LIB = Attribute
++OTHER_CCLDFLAGS= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUtil/${ARCHORCPU} -L../../ComUtil/${ARCHORCPU} -lComUtil
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Unidraw/${ARCHORCPU} -L../../Unidraw/${ARCHORCPU} -lUnidraw
++
+ 
+ MakeLibrary($(LIB),$(VERSION))
+ 
diff --git a/graphics/ivtools/patches/patch-ap b/graphics/ivtools/patches/patch-ap
new file mode 100644
index 00000000000..e54f8c0350f
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ap
@@ -0,0 +1,14 @@
+$NetBSD: patch-ap,v 1.3 2007/02/15 18:26:16 joerg Exp $
+
+--- src/TopoFace/Imakefile.orig	2007-02-15 16:42:36.000000000 +0000
++++ src/TopoFace/Imakefile
+@@ -7,6 +7,9 @@ PACKAGE = TopoFace
+ #ifdef InObjectCodeDir
+ 
+ LIB = TopoFace
++OTHER_CCLDFLAGS= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Unidraw/${ARCHORCPU} -L../../Unidraw/${ARCHORCPU} -lUnidraw
++
+ 
+ 
+ MakeLibrary($(LIB),$(VERSION))
diff --git a/graphics/ivtools/patches/patch-aq b/graphics/ivtools/patches/patch-aq
new file mode 100644
index 00000000000..52c4f31b2a5
--- /dev/null
+++ b/graphics/ivtools/patches/patch-aq
@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.3 2007/02/15 18:26:16 joerg Exp $
+
+--- src/ComTerp/Imakefile.orig	2007-02-15 16:45:01.000000000 +0000
++++ src/ComTerp/Imakefile
+@@ -11,6 +11,10 @@ CCSUFFIX = c
+ 
+ OTHER_CCDEFINES = $(ACE_CCDEFINES)
+ OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
++OTHER_CCLDFLAGS= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUtil/${ARCHORCPU} -L../../ComUtil/${ARCHORCPU} -lComUtil
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Unidraw/${ARCHORCPU} -L../../Unidraw/${ARCHORCPU} -lUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Attribute/${ARCHORCPU} -L../../Attribute/${ARCHORCPU} -lAttribute
+ 
+ MakeLibrary($(LIB),$(VERSION))
+ 
diff --git a/graphics/ivtools/patches/patch-ar b/graphics/ivtools/patches/patch-ar
new file mode 100644
index 00000000000..148dab20a2f
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ar
@@ -0,0 +1,39 @@
+$NetBSD: patch-ar,v 1.3 2007/02/15 18:26:16 joerg Exp $
+
+--- src/Imakefile.orig	2004-01-30 18:36:03.000000000 +0000
++++ src/Imakefile
+@@ -23,6 +23,8 @@ ACEDISPATCH =
+ #endif
+ 
+ SUBDIRS = \
++	IV \
++	Unidraw \
+ 	IV-common \
+ 	Unidraw-common \
+ 	\
+@@ -33,7 +35,6 @@ SUBDIRS = \
+ 	comtest \
+ 	comterp_ \
+ 	\
+-	IV \
+ 	InterViews \
+ 	IV-2_6 \
+ 	IV-X11 \
+@@ -44,8 +45,8 @@ SUBDIRS = \
+ 	iclass \
+ 	idemo \
+ 	\
+-	Time \
+ 	IVGlyph \
++	Time \
+ 	ivtext \
+ 	glyphs \
+ 	\
+@@ -53,7 +54,6 @@ SUBDIRS = \
+ 	ComGlyph \
+ 	glyphterp \
+ 	\
+-	Unidraw \
+ 	UniIdraw \
+ 	idraw \
+ 	\
diff --git a/graphics/ivtools/patches/patch-as b/graphics/ivtools/patches/patch-as
new file mode 100644
index 00000000000..bc5844e465f
--- /dev/null
+++ b/graphics/ivtools/patches/patch-as
@@ -0,0 +1,12 @@
+$NetBSD: patch-as,v 1.3 2007/02/15 18:26:16 joerg Exp $
+
+--- src/IVGlyph/Imakefile.orig	2007-02-15 16:51:15.000000000 +0000
++++ src/IVGlyph/Imakefile
+@@ -7,6 +7,7 @@ PACKAGE = IVGlyph
+ #ifdef InObjectCodeDir
+ 
+ LIB = IVGlyph
++OTHER_CCLDFLAGS= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV -lX11
+ 
+ Use_libInterViews()
+ 
diff --git a/graphics/ivtools/patches/patch-at b/graphics/ivtools/patches/patch-at
new file mode 100644
index 00000000000..1c5990edf16
--- /dev/null
+++ b/graphics/ivtools/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.3 2007/02/15 18:26:17 joerg Exp $
+
+--- src/Time/Imakefile.orig	2007-02-15 16:49:02.000000000 +0000
++++ src/Time/Imakefile
+@@ -7,6 +7,8 @@ PACKAGE = Time
+ #ifdef InObjectCodeDir
+ 
+ LIB = Time
++OTHER_CCLDFLAGS= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IVGlyph/${ARCHORCPU} -L../../IVGlyph/${ARCHORCPU} -lIVGlyph
+ 
+ Use_libInterViews()
+ 
diff --git a/graphics/ivtools/patches/patch-au b/graphics/ivtools/patches/patch-au
new file mode 100644
index 00000000000..ff7490afa43
--- /dev/null
+++ b/graphics/ivtools/patches/patch-au
@@ -0,0 +1,15 @@
+$NetBSD: patch-au,v 1.1 2007/02/15 18:26:17 joerg Exp $
+
+--- src/AttrGlyph/Imakefile.orig	2007-02-15 16:55:28.000000000 +0000
++++ src/AttrGlyph/Imakefile
+@@ -7,6 +7,10 @@ PACKAGE = AttrGlyph
+ #ifdef InObjectCodeDir
+ 
+ LIB = AttrGlyph
++OTHER_CCLDFLAGS= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Unidraw/${ARCHORCPU} -L../../Unidraw/${ARCHORCPU} -lUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IVGlyph/${ARCHORCPU} -L../../IVGlyph/${ARCHORCPU} -lIVGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Attribute/${ARCHORCPU} -L../../Attribute/${ARCHORCPU} -lAttribute
+ 
+ Use_libInterViews()
+ 
diff --git a/graphics/ivtools/patches/patch-av b/graphics/ivtools/patches/patch-av
new file mode 100644
index 00000000000..f48c2035f87
--- /dev/null
+++ b/graphics/ivtools/patches/patch-av
@@ -0,0 +1,16 @@
+$NetBSD: patch-av,v 1.1 2007/02/15 18:26:17 joerg Exp $
+
+--- src/ComGlyph/Imakefile.orig	2007-02-15 16:57:44.000000000 +0000
++++ src/ComGlyph/Imakefile
+@@ -7,6 +7,11 @@ PACKAGE = ComGlyph
+ #ifdef InObjectCodeDir
+ 
+ LIB = ComGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IVGlyph/${ARCHORCPU} -L../../IVGlyph/${ARCHORCPU} -lIVGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Attribute/${ARCHORCPU} -L../../Attribute/${ARCHORCPU} -lAttribute
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComTerp/${ARCHORCPU} -L../../ComTerp/${ARCHORCPU} -lComTerp
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUtil/${ARCHORCPU} -L../../ComUtil/${ARCHORCPU} -lComUtil
+ 
+ Use_libInterViews()
+ 
diff --git a/graphics/ivtools/patches/patch-aw b/graphics/ivtools/patches/patch-aw
new file mode 100644
index 00000000000..0b47e72bd4c
--- /dev/null
+++ b/graphics/ivtools/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1 2007/02/15 18:26:17 joerg Exp $
+
+--- src/UniIdraw/Imakefile.orig	2007-02-15 16:59:50.000000000 +0000
++++ src/UniIdraw/Imakefile
+@@ -7,6 +7,8 @@ PACKAGE = UniIdraw
+ #ifdef InObjectCodeDir
+ 
+ LIB = UniIdraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Unidraw/${ARCHORCPU} -L../../Unidraw/${ARCHORCPU} -lUnidraw
+ 
+ Use_libUnidraw()
+ Use_2_6()
diff --git a/graphics/ivtools/patches/patch-ax b/graphics/ivtools/patches/patch-ax
new file mode 100644
index 00000000000..ed778b63066
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ax
@@ -0,0 +1,21 @@
+$NetBSD: patch-ax,v 1.1 2007/02/15 18:26:17 joerg Exp $
+
+--- src/OverlayUnidraw/Imakefile.orig	2007-02-15 17:04:20.000000000 +0000
++++ src/OverlayUnidraw/Imakefile
+@@ -9,6 +9,16 @@ PACKAGE = OverlayUnidraw
+ LIB = OverlayUnidraw
+ OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
+ OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV -lX11
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Unidraw/${ARCHORCPU} -L../../Unidraw/${ARCHORCPU} -lUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUtil/${ARCHORCPU} -L../../ComUtil/${ARCHORCPU} -lComUtil
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Attribute/${ARCHORCPU} -L../../Attribute/${ARCHORCPU} -lAttribute
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComTerp/${ARCHORCPU} -L../../ComTerp/${ARCHORCPU} -lComTerp
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComGlyph/${ARCHORCPU} -L../../ComGlyph/${ARCHORCPU} -lComGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../TopoFace/${ARCHORCPU} -L../../TopoFace/${ARCHORCPU} -lTopoFace
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IVGlyph/${ARCHORCPU} -L../../IVGlyph/${ARCHORCPU} -lIVGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../UniIdraw/${ARCHORCPU} -L../../UniIdraw/${ARCHORCPU} -lUniIdraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../AttrGlyph/${ARCHORCPU} -L../../AttrGlyph/${ARCHORCPU} -lAttrGlyph
+ 
+ Use_libUnidraw()
+ Use_2_6()
diff --git a/graphics/ivtools/patches/patch-ay b/graphics/ivtools/patches/patch-ay
new file mode 100644
index 00000000000..249108ad80d
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ay
@@ -0,0 +1,20 @@
+$NetBSD: patch-ay,v 1.1 2007/02/15 18:26:17 joerg Exp $
+
+--- src/ComUnidraw/Imakefile.orig	2007-02-15 17:10:45.000000000 +0000
++++ src/ComUnidraw/Imakefile
+@@ -9,6 +9,15 @@ PACKAGE = ComUnidraw
+ LIB = ComUnidraw
+ OTHER_CCDEFINES = $(ACE_CCDEFINES)
+ OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV -lX11
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../OverlayUnidraw/${ARCHORCPU} -L../../OverlayUnidraw/${ARCHORCPU} -lOverlayUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComTerp/${ARCHORCPU} -L../../ComTerp/${ARCHORCPU} -lComTerp
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Attribute/${ARCHORCPU} -L../../Attribute/${ARCHORCPU} -lAttribute
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Unidraw/${ARCHORCPU} -L../../Unidraw/${ARCHORCPU} -lUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUtil/${ARCHORCPU} -L../../ComUtil/${ARCHORCPU} -lComUtil
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IVGlyph/${ARCHORCPU} -L../../IVGlyph/${ARCHORCPU} -lIVGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComGlyph/${ARCHORCPU} -L../../ComGlyph/${ARCHORCPU} -lComGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../UniIdraw/${ARCHORCPU} -L../../UniIdraw/${ARCHORCPU} -lUniIdraw
+ 
+ Use_libUnidraw()
+ Use_2_6()
diff --git a/graphics/ivtools/patches/patch-az b/graphics/ivtools/patches/patch-az
new file mode 100644
index 00000000000..a16bed20d16
--- /dev/null
+++ b/graphics/ivtools/patches/patch-az
@@ -0,0 +1,21 @@
+$NetBSD: patch-az,v 1.1 2007/02/15 18:26:17 joerg Exp $
+
+--- src/FrameUnidraw/Imakefile.orig	2007-02-15 17:15:09.000000000 +0000
++++ src/FrameUnidraw/Imakefile
+@@ -7,6 +7,16 @@ PACKAGE = FrameUnidraw
+ #ifdef InObjectCodeDir
+ 
+ LIB = FrameUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Unidraw/${ARCHORCPU} -L../../Unidraw/${ARCHORCPU} -lUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../OverlayUnidraw/${ARCHORCPU} -L../../OverlayUnidraw/${ARCHORCPU} -lOverlayUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IVGlyph/${ARCHORCPU} -L../../IVGlyph/${ARCHORCPU} -lIVGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUtil/${ARCHORCPU} -L../../ComUtil/${ARCHORCPU} -lComUtil
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Attribute/${ARCHORCPU} -L../../Attribute/${ARCHORCPU} -lAttribute
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../UniIdraw/${ARCHORCPU} -L../../UniIdraw/${ARCHORCPU} -lUniIdraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComGlyph/${ARCHORCPU} -L../../ComGlyph/${ARCHORCPU} -lComGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComTerp/${ARCHORCPU} -L../../ComTerp/${ARCHORCPU} -lComTerp
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUnidraw/${ARCHORCPU} -L../../ComUnidraw/${ARCHORCPU} -lComUnidraw
+ 
+ Use_libUnidraw()
+ Use_2_6()
diff --git a/graphics/ivtools/patches/patch-ba b/graphics/ivtools/patches/patch-ba
new file mode 100644
index 00000000000..1c2a1cb57f4
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ba
@@ -0,0 +1,21 @@
+$NetBSD: patch-ba,v 1.1 2007/02/15 18:26:17 joerg Exp $
+
+--- src/GraphUnidraw/Imakefile.orig	2007-02-15 17:21:06.000000000 +0000
++++ src/GraphUnidraw/Imakefile
+@@ -7,6 +7,16 @@ PACKAGE = GraphUnidraw
+ #ifdef InObjectCodeDir
+ 
+ LIB = GraphUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../TopoFace/${ARCHORCPU} -L../../TopoFace/${ARCHORCPU} -lTopoFace
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Attribute/${ARCHORCPU} -L../../Attribute/${ARCHORCPU} -lAttribute
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../OverlayUnidraw/${ARCHORCPU} -L../../OverlayUnidraw/${ARCHORCPU} -lOverlayUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUtil/${ARCHORCPU} -L../../ComUtil/${ARCHORCPU} -lComUtil
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Unidraw/${ARCHORCPU} -L../../Unidraw/${ARCHORCPU} -lUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../UniIdraw/${ARCHORCPU} -L../../UniIdraw/${ARCHORCPU} -lUniIdraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IVGlyph/${ARCHORCPU} -L../../IVGlyph/${ARCHORCPU} -lIVGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComTerp/${ARCHORCPU} -L../../ComTerp/${ARCHORCPU} -lComTerp
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUnidraw/${ARCHORCPU} -L../../ComUnidraw/${ARCHORCPU} -lComUnidraw
+ 
+ Use_libUnidraw()
+ Use_2_6()
diff --git a/graphics/ivtools/patches/patch-bb b/graphics/ivtools/patches/patch-bb
new file mode 100644
index 00000000000..46ec0df43f9
--- /dev/null
+++ b/graphics/ivtools/patches/patch-bb
@@ -0,0 +1,23 @@
+$NetBSD: patch-bb,v 1.1 2007/02/15 18:26:18 joerg Exp $
+
+--- src/DrawServ/Imakefile.orig	2007-02-15 17:27:54.000000000 +0000
++++ src/DrawServ/Imakefile
+@@ -7,6 +7,18 @@ PACKAGE = DrawServ
+ #ifdef InObjectCodeDir
+ 
+ LIB = DrawServ
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IV/${ARCHORCPU} -L../../IV/${ARCHORCPU} -lIV
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../FrameUnidraw/${ARCHORCPU} -L../../FrameUnidraw/${ARCHORCPU} -lFrameUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../OverlayUnidraw/${ARCHORCPU} -L../../OverlayUnidraw/${ARCHORCPU} -lOverlayUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../GraphUnidraw/${ARCHORCPU} -L../../GraphUnidraw/${ARCHORCPU} -lGraphUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Unidraw/${ARCHORCPU} -L../../Unidraw/${ARCHORCPU} -lUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../UniIdraw/${ARCHORCPU} -L../../UniIdraw/${ARCHORCPU} -lUniIdraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../IVGlyph/${ARCHORCPU} -L../../IVGlyph/${ARCHORCPU} -lIVGlyph
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComTerp/${ARCHORCPU} -L../../ComTerp/${ARCHORCPU} -lComTerp
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUnidraw/${ARCHORCPU} -L../../ComUnidraw/${ARCHORCPU} -lComUnidraw
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../ComUtil/${ARCHORCPU} -L../../ComUtil/${ARCHORCPU} -lComUtil
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../Attribute/${ARCHORCPU} -L../../Attribute/${ARCHORCPU} -lAttribute
++OTHER_CCLDFLAGS+= -Wl,-rpath-link,../../TopoFace/${ARCHORCPU} -L../../TopoFace/${ARCHORCPU} -lTopoFace
+ 
+ OTHER_CCDEFINES = $(ACE_CCDEFINES)
+ OTHER_CCINCLUDES = $(ACE_CCINCLUDES)