- Upgrade to 1.2.3.

- Use external libtiff.
- Unmark FORBIDDEN.
- Unmark BROKEN since it seems to work on FreeBSD 6.X+ and !i386 now
  (at least the platforms I could test).

Initial upgrade work by:	fenner

32 files changed, 456 insertions, 120 deletions

diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index 71d3116e26b..ed7d800363d 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ivtools
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,26 +15,19 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drawing editors derived from idraw
 
-FORBIDDEN=	http://vuxml.FreeBSD.org/pkg-ivtools.html
-
 BUILD_DEPENDS=	imake:${X_IMAKE_PORT}
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	autoconf:259
+CONFIGURE_ARGS=	--with-tiff=${PREFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 INSTALLS_SHLIB=	yes
+USE_GNAKE=	yes
+MAKE_ARGS=	ARCH=FREEBSD
 
 MANCOMPRESSED=	no
 MAN1=	idraw.1 iclass.1 drawtool.1 comterp.1 comdraw.1 flipbook.1 graphdraw.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
-.if ${ARCH} != "i386"
-BROKEN=		"fails to configure on ${ARCH}"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/ivtools/distinfo b/graphics/ivtools/distinfo
index 9279719d040..8f0c7be3256 100644
--- a/graphics/ivtools/distinfo
+++ b/graphics/ivtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (ivtools-1.2.1.tgz) = 42235814450be55f489843f203383c0c
-SHA256 (ivtools-1.2.1.tgz) = d699c7bba5a85b2bfb32895ad3a6df533ad94148843a98f6e4bfbd42a9279494
-SIZE (ivtools-1.2.1.tgz) = 2135750
+MD5 (ivtools-1.2.3.tgz) = aa35433e5e30f0215d6a563ff2edffbc
+SHA256 (ivtools-1.2.3.tgz) = 2e201fd499646012611f15f220b15a7306bd013c830a9d6230cf9d7e6fa29fb1
+SIZE (ivtools-1.2.3.tgz) = 2137349
diff --git a/graphics/ivtools/files/patch-config::rules.def b/graphics/ivtools/files/patch-config::rules.def
deleted file mode 100644
index 952ef680d79..00000000000
--- a/graphics/ivtools/files/patch-config::rules.def
+++ /dev/null
@@ -1,76 +0,0 @@
---- config/rules.def.orig	Thu Jul 15 17:05:32 2004
-+++ config/rules.def	Thu Jul 15 17:10:44 2004
-@@ -1055,71 +1055,15 @@
-  */
- 
- #ifndef InstallIncludes
--#if InstallRelative
--#define InstallIncludes(dir)						@@\
--install::								@@\
--	-@if [ -h $(TOP)/include ]; then exit 0; else \                 @@\
--        (cd $(TOP) && $(LN) src/include include); fi
--#else
--#define InstallIncludes(dir)						@@\
--install::								@@\
--	MakeDir($(INCDIR)/dir)						@@\
--	$(INSTALL) -c $(INSTINCFLAGS) *.h $(INCDIR)/dir			@@\
--									@@\
--uninstall::								@@\
--	(cd $(INCDIR)/dir;$(RM) *.h)
--#endif
-+#define InstallIncludes(dir) /**/
- #endif
- 
- #ifndef InstallInclude
--#if InstallRelative
--#define InstallInclude(dir, file)					@@\
--install::								@@\
--	-@if [ -h $(TOP)/include ]; then exit 0; else \                 @@\
--        (cd $(TOP) && $(LN) src/include include); fi
--#else
--#define InstallInclude(dir, file)					@@\
--install::								@@\
--	MakeDir($(INCDIR)/dir)						@@\
--	$(INSTALL) -c $(INSTINCFLAGS) file $(INCDIR)/dir		@@\
--									@@\
--uninstall::								@@\
--	$(RM) $(INCDIR)/dir/file
--#endif
-+#define InstallInclude(dir, file) /**/
- #endif
- 
- #ifndef InstallSymLink
--#if InstallRelative
- #define InstallSymLink(dir, file) /**/
--#else
--#if !defined(SVR4)
--#if defined(DARWIN)
--#define InstallSymLink(dir, file)					@@\
--install::								@@\
--	MakeDir(dir)							@@\
--	cp -f file dir							@@\
--									@@\
--uninstall::								@@\
--	$(RM) dir/file	
--#else
--#define InstallSymLink(dir, file)					@@\
--install::								@@\
--	MakeDir(dir)							@@\
--	cp -fd file dir							@@\
--									@@\
--uninstall::								@@\
--	$(RM) dir/file	
--#endif
--#else
--#define InstallSymLink(dir, file)					@@\
--install::								@@\
--	MakeDir(dir)							@@\
--	tar cf - file | (cd dir; tar xfp -)				@@\
--									@@\
--uninstall::								@@\
--	$(RM) dir/file	
--#endif
--#endif	
- #endif
- 
- /* 
diff --git a/graphics/ivtools/files/patch-config::Imakefile b/graphics/ivtools/files/patch-config_Imakefile
index a18353b963d..1f6b4418293 100644
--- a/graphics/ivtools/files/patch-config::Imakefile
+++ b/graphics/ivtools/files/patch-config_Imakefile
@@ -1,9 +1,13 @@
---- config/Imakefile.orig	Mon Jul 16 10:10:06 2001
-+++ config/Imakefile	Wed Mar 27 12:18:06 2002
-@@ -9,12 +9,3 @@
+
+$FreeBSD$
+
+--- config/Imakefile.orig
++++ config/Imakefile
+@@ -8,13 +8,3 @@
+ SUBDIRS = InterViews
  
  MakeInSubdirs($(SUBDIRS))
- 
+-
 -#if !InstallRelative
 -install::
 -	MakeDir($(CONFIGDIR))
diff --git a/graphics/ivtools/files/patch-config_params.def b/graphics/ivtools/files/patch-config_params.def
new file mode 100644
index 00000000000..895f196f361
--- /dev/null
+++ b/graphics/ivtools/files/patch-config_params.def
@@ -0,0 +1,32 @@
+
+$FreeBSD$
+
+--- config/params.def.orig
++++ config/params.def
+@@ -975,7 +975,7 @@
+ -lSpatialObjectDEX \
+ -lStat \
+ -lSurfaceTest \
+--lTIFF \
++-ltiff \
+ -lTargetDetection-CSU \
+ -lTopology \
+ -lTraits \
+@@ -1023,7 +1023,7 @@
+ -lIUE-IF-Region \
+ -lDexTestIUE \
+ -lIUE-Unit \
+--lTIFF
++-ltiff
+ #endif
+ #else
+ #define IueCCLdLibs /**/
+@@ -1056,7 +1056,7 @@
+ 
+ #ifndef TiffCCLdLibs
+ #ifdef TiffLibDir
+-#define TiffCCLdLibs -L$(TIFFLIBDIR) -lTIFF
++#define TiffCCLdLibs -L$(TIFFLIBDIR) -ltiff
+ #else
+ #define TiffCCLdLibs /**/
+ #endif
diff --git a/graphics/ivtools/files/patch-config_rules.def b/graphics/ivtools/files/patch-config_rules.def
new file mode 100644
index 00000000000..6df57e840b8
--- /dev/null
+++ b/graphics/ivtools/files/patch-config_rules.def
@@ -0,0 +1,24 @@
+
+$FreeBSD$
+
+--- config/rules.def.orig
++++ config/rules.def
+@@ -1054,6 +1054,9 @@
+  * Install header files on Linux.
+  */
+ 
++#define InstallIncludes(dir)						@@\
++install::
++
+ #ifndef InstallIncludes
+ #if InstallRelative
+ #define InstallIncludes(dir)						@@\
+@@ -1071,6 +1074,8 @@
+ #endif
+ #endif
+ 
++#define InstallInclude(dir, file)					@@\
++install::
+ #ifndef InstallInclude
+ #if InstallRelative
+ #define InstallInclude(dir, file)					@@\
diff --git a/graphics/ivtools/files/patch-src::ComTerp::comterp.c b/graphics/ivtools/files/patch-src::ComTerp::comterp.c
index d37d5c0cc66..caca0e4ce09 100644
--- a/graphics/ivtools/files/patch-src::ComTerp::comterp.c
+++ b/graphics/ivtools/files/patch-src::ComTerp::comterp.c
@@ -1,6 +1,9 @@
---- src/ComTerp/comterp.c~	Tue May 25 15:07:38 2004
-+++ src/ComTerp/comterp.c	Mon Nov 22 11:27:09 2004
-@@ -63,6 +63,7 @@
+
+$FreeBSD$
+
+--- src/ComTerp/comterp.c.orig
++++ src/ComTerp/comterp.c
+@@ -74,6 +74,7 @@
  #if __GNUC__>=3
  #include <fstream.h>
  #endif
@@ -8,3 +11,12 @@
  
  #define TITLE "ComTerp"
  #define STREAM_MECH
+@@ -896,7 +897,7 @@
+     fbuf.attach(fd);
+   } else
+     fbuf.attach(fileno(stdout));
+-#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3
++#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3 || defined(__FreeBSD__)
+   fileptr_filebuf fbuf(handler() && handler()->wrfptr() 
+ 	       ? handler()->wrfptr() : stdout, 
+ 	       ios_base::out);
diff --git a/graphics/ivtools/files/patch-src_ComTerp_comterpserv.c b/graphics/ivtools/files/patch-src_ComTerp_comterpserv.c
new file mode 100644
index 00000000000..197ac094542
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_ComTerp_comterpserv.c
@@ -0,0 +1,49 @@
+
+$FreeBSD$
+
+--- src/ComTerp/comterpserv.c.orig
++++ src/ComTerp/comterpserv.c
+@@ -152,7 +152,7 @@
+     fbuf.attach(fd);
+     istream in (&fbuf);
+     in.gets(&instr);
+-#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3
++#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3 || defined(__FreeBSD__)
+     char instr[BUFSIZ];
+     FILE* ifptr = fdopen(fd, "r");
+     fileptr_filebuf fbuf(ifptr, ios_base::in);
+@@ -160,6 +160,7 @@
+     in.get(instr, BUFSIZ, '\n');  // needs to be generalized with <vector.h>
+ #else
+     char instr[BUFSIZ];
++    fileptr_filebuf fbuf(ifptr, ios_base::in);
+     fileptr_filebuf fbuf(fd, ios_base::in, false, static_cast<size_t>(BUFSIZ));
+     istream in (&fbuf);
+     in.get(instr, BUFSIZ, '\n');  // needs to be generalized with <vector.h>
+@@ -202,7 +203,7 @@
+ #if __GNUC__<3
+     filebuf fbuf;
+     fbuf.attach(fd);
+-#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3
++#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3  || defined(__FreeBSD__)
+     FILE* ofptr = fdopen(fd, "w");
+     fileptr_filebuf fbuf(ofptr, ios_base::out);
+ #else
+@@ -320,7 +321,7 @@
+ 	        err_print( stderr, "comterp" );
+ #if __GNUC__<3
+ 	        filebuf obuf(handler() ? handler()->get_handle() : 1);
+-#elif __GNUC__==3 && __GNUC_MINOR__<1 || __GNUC__>3
++#elif __GNUC__==3 && __GNUC_MINOR__<1 || __GNUC__>3  || defined(__FreeBSD__)
+                 FILE* ofptr = fdopen(handler() ? handler()->get_handle() : 1, "w"); 
+ 	        fileptr_filebuf obuf(ofptr, ios_base::out);
+ #else
+@@ -345,7 +346,7 @@
+ 	  err_print( stderr, "comterp" );
+ #if __GNUC__<3
+ 	  filebuf obuf(handler() ? handler()->get_handle() : 1);
+-#elif __GNUC__==3 && __GNUC_MINOR__<1 || __GNUC__>3
++#elif __GNUC__==3 && __GNUC_MINOR__<1 || __GNUC__>3  || defined(__FreeBSD__)
+           FILE* ofptr = fdopen(handler() ? handler()->get_handle() : 1, "w"); 
+ 	  fileptr_filebuf obuf(ofptr, ios_base::out);
+ #else
diff --git a/graphics/ivtools/files/patch-src_Imakefile b/graphics/ivtools/files/patch-src_Imakefile
new file mode 100644
index 00000000000..9642ea59e2a
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/Imakefile.orig
++++ src/Imakefile
+@@ -75,7 +75,6 @@
+ 	DrawServ \
+ 	drawserv_ \
+ 	\
+-	include \
+ 	scripts \
+ 	utils \
+ 	tests \
diff --git a/graphics/ivtools/files/patch-src_Makefile b/graphics/ivtools/files/patch-src_Makefile
new file mode 100644
index 00000000000..e7fb5f0a066
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/Makefile.orig
++++ src/Makefile
+@@ -298,7 +298,7 @@
+ 
+ ACEDISPATCH =
+ 
+-SUBDIRS = 	IV-common 	Unidraw-common 		ComUtil 	Attribute 	TopoFace 	ComTerp 	comtest 	comterp_ 		IV 	InterViews 	IV-2_6 	IV-X11 	OS 	TIFF 	Dispatch 	dclock 	iclass 	idemo 		Time 	IVGlyph 	ivtext 	glyphs 		AttrGlyph 	ComGlyph 	glyphterp 		Unidraw 	UniIdraw 	idraw 		OverlayUnidraw 	$(ACEDISPATCH) 	drawtool 		$(IUEDIRS) 		ComUnidraw 	comdraw 		FrameUnidraw 	flipbook 		GraphUnidraw 	graphdraw 		DrawServ 	drawserv_ 		include 	scripts 	utils 	tests 		 	man 	html
++SUBDIRS = 	IV-common 	Unidraw-common 		ComUtil 	Attribute 	TopoFace 	ComTerp 	comtest 	comterp_ 		IV 	InterViews 	IV-2_6 	IV-X11 	OS 	TIFF 	Dispatch 	dclock 	iclass 	idemo 		Time 	IVGlyph 	ivtext 	glyphs 		AttrGlyph 	ComGlyph 	glyphterp 		Unidraw 	UniIdraw 	idraw 		OverlayUnidraw 	$(ACEDISPATCH) 	drawtool 		$(IUEDIRS) 		ComUnidraw 	comdraw 		FrameUnidraw 	flipbook 		GraphUnidraw 	graphdraw 		DrawServ 	drawserv_ 		scripts 	utils 	tests 		 	man 	html
+ 
+ Makefiles::
+ 	-@for i in $(SUBDIRS); \
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_box1_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_box1_Imakefile
new file mode 100644
index 00000000000..f74f33e6281
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_box1_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/box1/Imakefile.orig
++++ src/glyphs/examples3.1/box1/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_box2_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_box2_Imakefile
new file mode 100644
index 00000000000..50927aeef27
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_box2_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/box2/Imakefile.orig
++++ src/glyphs/examples3.1/box2/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_box3_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_box3_Imakefile
new file mode 100644
index 00000000000..08cf2e08482
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_box3_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/box3/Imakefile.orig
++++ src/glyphs/examples3.1/box3/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_box4_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_box4_Imakefile
new file mode 100644
index 00000000000..6dfdc530b36
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_box4_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/box4/Imakefile.orig
++++ src/glyphs/examples3.1/box4/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_box5_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_box5_Imakefile
new file mode 100644
index 00000000000..5c73954e472
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_box5_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/box5/Imakefile.orig
++++ src/glyphs/examples3.1/box5/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_button1_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_button1_Imakefile
new file mode 100644
index 00000000000..f5bbde1df7c
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_button1_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/button1/Imakefile.orig
++++ src/glyphs/examples3.1/button1/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_button2_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_button2_Imakefile
new file mode 100644
index 00000000000..f377bf36c8c
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_button2_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/button2/Imakefile.orig
++++ src/glyphs/examples3.1/button2/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_button3_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_button3_Imakefile
new file mode 100644
index 00000000000..bf938256119
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_button3_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/button3/Imakefile.orig
++++ src/glyphs/examples3.1/button3/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_bvalue_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_bvalue_Imakefile
new file mode 100644
index 00000000000..52fd279645a
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_bvalue_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/bvalue/Imakefile.orig
++++ src/glyphs/examples3.1/bvalue/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_circle_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_circle_Imakefile
new file mode 100644
index 00000000000..73bf30f6f27
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_circle_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/circle/Imakefile.orig
++++ src/glyphs/examples3.1/circle/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_drag_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_drag_Imakefile
new file mode 100644
index 00000000000..1f6754915a4
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_drag_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/drag/Imakefile.orig
++++ src/glyphs/examples3.1/drag/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_fonts_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_fonts_Imakefile
new file mode 100644
index 00000000000..31c61851f29
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_fonts_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/fonts/Imakefile.orig
++++ src/glyphs/examples3.1/fonts/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_himom_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_himom_Imakefile
new file mode 100644
index 00000000000..d6cf3a5b6ed
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_himom_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/himom/Imakefile.orig
++++ src/glyphs/examples3.1/himom/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_image_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_image_Imakefile
new file mode 100644
index 00000000000..dc0e27cc0a6
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_image_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/image/Imakefile.orig
++++ src/glyphs/examples3.1/image/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_ips_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_ips_Imakefile
new file mode 100644
index 00000000000..a8969685766
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_ips_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/ips/Imakefile.orig
++++ src/glyphs/examples3.1/ips/Imakefile
+@@ -6,6 +6,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(ips)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_menu_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_menu_Imakefile
new file mode 100644
index 00000000000..f731083819d
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_menu_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/menu/Imakefile.orig
++++ src/glyphs/examples3.1/menu/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_patch_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_patch_Imakefile
new file mode 100644
index 00000000000..174aa08c025
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_patch_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/patch/Imakefile.orig
++++ src/glyphs/examples3.1/patch/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_preview_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_preview_Imakefile
new file mode 100644
index 00000000000..1ff5f2edf34
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_preview_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/preview/Imakefile.orig
++++ src/glyphs/examples3.1/preview/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_print_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_print_Imakefile
new file mode 100644
index 00000000000..a5b30c07df1
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_print_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/print/Imakefile.orig
++++ src/glyphs/examples3.1/print/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_rubband_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_rubband_Imakefile
new file mode 100644
index 00000000000..cc1ee69eb34
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_rubband_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/rubband/Imakefile.orig
++++ src/glyphs/examples3.1/rubband/Imakefile
+@@ -4,6 +4,7 @@
+ 
+ OBJS = main.o
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ 
+ ComplexProgramTargetNoInstall(a.out)
diff --git a/graphics/ivtools/files/patch-src_glyphs_examples3.1_zoomer_Imakefile b/graphics/ivtools/files/patch-src_glyphs_examples3.1_zoomer_Imakefile
new file mode 100644
index 00000000000..88fc95ddf00
--- /dev/null
+++ b/graphics/ivtools/files/patch-src_glyphs_examples3.1_zoomer_Imakefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/glyphs/examples3.1/zoomer/Imakefile.orig
++++ src/glyphs/examples3.1/zoomer/Imakefile
+@@ -2,6 +2,7 @@
+ 
+ #ifdef InObjectCodeDir
+ 
++OTHER_CCLDLIBS = $(TIFF_CCLDLIBS)
+ Use_libInterViews()
+ ComplexProgramTargetNoInstall(test)
+ 
diff --git a/graphics/ivtools/pkg-plist b/graphics/ivtools/pkg-plist
index ce4273c6614..a6758ea37ac 100644
--- a/graphics/ivtools/pkg-plist
+++ b/graphics/ivtools/pkg-plist
@@ -6,7 +6,6 @@ bin/flipbook
 bin/graphdraw
 bin/iclass
 bin/idraw
-bin/ivdl
 bin/ivgetjpg
 bin/ivtext
 bin/ivtiftopnm
@@ -16,39 +15,39 @@ bin/stdcmapppm
 lib/ivtools/InterViews
 lib/ivtools/comterp.err
 lib/libAttrGlyph.so
-lib/libAttrGlyph.so.1.2.1
+lib/libAttrGlyph.so.1.2.3
 lib/libAttribute.so
-lib/libAttribute.so.1.2.1
+lib/libAttribute.so.1.2.3
 lib/libComGlyph.so
-lib/libComGlyph.so.1.2.1
+lib/libComGlyph.so.1.2.3
 lib/libComTerp.so
-lib/libComTerp.so.1.2.1
+lib/libComTerp.so.1.2.3
 lib/libComUnidraw.so
-lib/libComUnidraw.so.1.2.1
+lib/libComUnidraw.so.1.2.3
 lib/libComUtil.so
-lib/libComUtil.so.1.2.1
+lib/libComUtil.so.1.2.3
 lib/libDrawServ.so
-lib/libDrawServ.so.1.2.1
+lib/libDrawServ.so.1.2.3
 lib/libFrameUnidraw.so
-lib/libFrameUnidraw.so.1.2.1
+lib/libFrameUnidraw.so.1.2.3
 lib/libGraphUnidraw.so
-lib/libGraphUnidraw.so.1.2.1
+lib/libGraphUnidraw.so.1.2.3
 lib/libIV-common.so
-lib/libIV-common.so.1.2.1
+lib/libIV-common.so.1.2.3
 lib/libIV.so
-lib/libIV.so.1.2.1
+lib/libIV.so.1.2.3
 lib/libIVGlyph.so
-lib/libIVGlyph.so.1.2.1
+lib/libIVGlyph.so.1.2.3
 lib/libOverlayUnidraw.so
-lib/libOverlayUnidraw.so.1.2.1
+lib/libOverlayUnidraw.so.1.2.3
 lib/libTime.so
-lib/libTime.so.1.2.1
+lib/libTime.so.1.2.3
 lib/libTopoFace.so
-lib/libTopoFace.so.1.2.1
+lib/libTopoFace.so.1.2.3
 lib/libUniIdraw.so
-lib/libUniIdraw.so.1.2.1
+lib/libUniIdraw.so.1.2.3
 lib/libUnidraw-common.so
-lib/libUnidraw-common.so.1.2.1
+lib/libUnidraw-common.so.1.2.3
 lib/libUnidraw.so
-lib/libUnidraw.so.1.2.1
+lib/libUnidraw.so.1.2.3
 @dirrm lib/ivtools