tiff library upgraded from 3.5.2 to 3.5.4. LZW compression part is now

optional and controlled by USE_GIF in mk.conf, decompression is unchanged.
Comment for USE_GIF in mk.conf has been updated. Some HTML documentation
gets installed now, too.

Changes:
A Y2K bugfix in ras2tiff, removal of LZW compression, new Pixar tags,
and Adobe ZIP support, as well as removal of some compiler warnings
and minor fixes.

11 files changed, 127 insertions, 28 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 09c144f5791..36d67b701d5 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.22 1999/10/08 21:14:32 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2000/01/06 01:25:22 wiz Exp $
 
-DISTNAME=	tiff-v3.5.2
-PKGNAME=	tiff-3.5.2
+DISTNAME=	tiff-v3.5.4
+PKGNAME=	tiff-3.5.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libtiff.org/ \
 		ftp://ftp.onshore.com/pub/libtiff/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+# need DISTFILES above for adding lzw-files to it, if USE_GIF is defined
+# in mk.conf
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.libtiff.org/
@@ -24,6 +27,15 @@ DEPENDS+=	zlib-*:../../devel/zlib
 ZLIBDIR=	/usr/lib
 .endif
 
+.if defined(USE_GIF)
+DISTFILES+=	libtiff-lzw-compression-kit.tar.gz
+
+pre-build:
+	cd ${WRKSRC} \
+		&& ${CP} ../libtiff-lzw-compression-kit/tif_dir.c libtiff \
+		&& ${CP} ../libtiff-lzw-compression-kit/tif_lzw.c libtiff
+.endif
+
 CPPFLAGS+=	-Dunix
 CONFIGURE_ENV+=	PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" \
 		ENVOPTS="${CFLAGS} ${CPPFLAGS}" ZLIBDIR="${ZLIBDIR}"
diff --git a/graphics/tiff/files/config.site b/graphics/tiff/files/config.site
index c42c03f79d7..8a7ae8ce303 100644
--- a/graphics/tiff/files/config.site
+++ b/graphics/tiff/files/config.site
@@ -1,9 +1,10 @@
-# $NetBSD: config.site,v 1.3 1999/10/08 21:14:33 jlam Exp $
+# $NetBSD: config.site,v 1.4 2000/01/06 01:25:24 wiz Exp $
 
 DIR_BIN=${PREFIX}/bin			# destination for applications
 DIR_LIB=${PREFIX}/lib			# destination for library
 DIR_INC=${PREFIX}/include		# destination for include files
 DIR_MAN=${PREFIX}/man			# destination for man pages
+DIR_HTML=${PREFIX}/share/doc/tiff	# destination for html documentation
 DIRS_LIBINC=${LOCALBASE}/include	# dirs to search for ancillary includes
 
 # JPEG support
@@ -23,5 +24,6 @@ DSO=no				# don't use libtiff's shared lib mechanism
 INSTALL=
 LIBGL=no			# don't build SGI -lgl apps
 LIBIMAGE=no			# don't build SGI -limage apps
+HTML=yes			# build HTML documentation
 
 MANSCHEME=bsd-source-cat-strip
diff --git a/graphics/tiff/files/md5 b/graphics/tiff/files/md5
index 6a23471ef5c..25f54e4e42d 100644
--- a/graphics/tiff/files/md5
+++ b/graphics/tiff/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.4 1999/10/08 21:14:34 jlam Exp $
+$NetBSD: md5,v 1.5 2000/01/06 01:25:24 wiz Exp $
 
-MD5 (tiff-v3.5.2.tar.gz) = 2c498457556723485d488eb12c12fe95
+MD5 (tiff-v3.5.4.tar.gz) = 3957aeace6b66720751f497157e16e53
+MD5 (libtiff-lzw-compression-kit.tar.gz) = 7372ce27aa47f048c83aa59239a685d1
diff --git a/graphics/tiff/files/patch-sum b/graphics/tiff/files/patch-sum
index 768bff414e0..f621128c8b9 100644
--- a/graphics/tiff/files/patch-sum
+++ b/graphics/tiff/files/patch-sum
@@ -1,6 +1,8 @@
-$NetBSD: patch-sum,v 1.2 1999/10/08 21:14:34 jlam Exp $
+$NetBSD: patch-sum,v 1.3 2000/01/06 01:25:24 wiz Exp $
 
-MD5 (patch-aa) = fc0f75027ad9d0ddadae75d3ab6be3d5
-MD5 (patch-ab) = faf2e55a2d576dca4b79c6f8360a2ff0
-MD5 (patch-ac) = f595dbd1baacd38dea3c767d88c3737b
-MD5 (patch-ad) = d3f3eaac0ef76577085514770265b5fa
+MD5 (patch-aa) = 347f3d4e204a0ad2efbb38dbb9ea2394
+MD5 (patch-ab) = e3ec199475823b7fd769c53d8aebae25
+MD5 (patch-ac) = ac3749f83d20a794683240c0ff9e4273
+MD5 (patch-ad) = 514225e0cacc10cca883b4670a72949f
+MD5 (patch-ae) = 6eb6553aa1245bb8ce9dce1cfce6b329
+MD5 (patch-af) = 05bb28ae1f5d1d007fb63f51baf08de1
diff --git a/graphics/tiff/patches/patch-aa b/graphics/tiff/patches/patch-aa
index 5f771a86e98..55bb19459f9 100644
--- a/graphics/tiff/patches/patch-aa
+++ b/graphics/tiff/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 1999/10/08 21:14:34 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2000/01/06 01:25:25 wiz Exp $
 
---- ./man/Makefile.in.orig	Fri Oct  8 01:52:45 1999
-+++ ./man/Makefile.in	Fri Oct  8 02:02:14 1999
-@@ -334,8 +334,7 @@
+--- ./man/Makefile.in.orig	Mon Jan  3 17:34:03 2000
++++ ./man/Makefile.in	Mon Jan  3 17:34:04 2000
+@@ -336,8 +336,7 @@
  	 ${ECHO} 'install:';						\
  	 for i in *.1; do						\
  	    f=${MANAPPNAME};						\
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.7 1999/10/08 21:14:34 jlam Exp $
  	 done								\
  	)>apps/Makefile
  lib/Makefile:
-@@ -346,8 +345,7 @@
+@@ -348,8 +347,7 @@
  	 ${ECHO} 'install:';						\
  	 for i in *.3t; do						\
  	    f=${MANLIBNAME};						\
diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab
index 762e65b31c3..c8b979b22c1 100644
--- a/graphics/tiff/patches/patch-ab
+++ b/graphics/tiff/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.6 1999/10/08 21:14:34 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2000/01/06 01:25:25 wiz Exp $
 
---- ./libtiff/Makefile.in.orig	Wed Sep  8 05:39:00 1999
-+++ ./libtiff/Makefile.in	Thu Oct  7 22:08:32 1999
+--- ./libtiff/Makefile.in.orig	Sun Nov 28 21:15:36 1999
++++ ./libtiff/Makefile.in	Mon Jan  3 17:34:04 2000
 @@ -35,7 +35,8 @@
  #
  SHELL	= @SCRIPT_SH@
diff --git a/graphics/tiff/patches/patch-ac b/graphics/tiff/patches/patch-ac
index b82810be988..1667be1bf7e 100644
--- a/graphics/tiff/patches/patch-ac
+++ b/graphics/tiff/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.8 1999/10/08 21:14:34 jlam Exp $
+$NetBSD: patch-ac,v 1.9 2000/01/06 01:25:25 wiz Exp $
 
---- ./tools/Makefile.in.orig	Thu Aug 19 06:03:27 1999
-+++ ./tools/Makefile.in	Fri Oct  8 02:21:21 1999
+--- ./tools/Makefile.in.orig	Mon Jan  3 17:34:03 2000
++++ ./tools/Makefile.in	Mon Jan  3 17:34:05 2000
 @@ -47,10 +47,10 @@
  IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
  CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
@@ -18,8 +18,8 @@ $NetBSD: patch-ac,v 1.8 1999/10/08 21:14:34 jlam Exp $
 @@ -109,7 +109,7 @@
  	fi
  install: all
- 	${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
--	${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
+ 	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -dir @DIR_BIN@
+-	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
 +	${LIBTOOL} ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
  	@if [ "@LIBIMAGE@" = yes ]; then \
  	    ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \
diff --git a/graphics/tiff/patches/patch-ad b/graphics/tiff/patches/patch-ad
index 9f78cdf7a37..561754cb99a 100644
--- a/graphics/tiff/patches/patch-ad
+++ b/graphics/tiff/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 1999/10/08 21:14:35 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2000/01/06 01:25:25 wiz Exp $
 
---- ./configure.orig	Wed Sep  8 05:38:56 1999
-+++ ./configure	Fri Oct  8 01:37:09 1999
+--- ./configure.orig	Wed Sep  8 14:32:18 1999
++++ ./configure	Mon Jan  3 17:34:05 2000
 @@ -1661,6 +1661,7 @@
  	    -[LR]/*)	echo "$i" ;;
  	    -L*)	echo "$i" | sed 's;^-L;-L../;' ;;
diff --git a/graphics/tiff/patches/patch-ae b/graphics/tiff/patches/patch-ae
new file mode 100644
index 00000000000..af3dc5eb2f3
--- /dev/null
+++ b/graphics/tiff/patches/patch-ae
@@ -0,0 +1,23 @@
+$NetBSD: patch-ae,v 1.3 2000/01/06 01:25:25 wiz Exp $
+
+--- html/Makefile.in.orig	Tue Jul 27 23:50:27 1999
++++ html/Makefile.in	Thu Jan  6 01:32:51 2000
+@@ -73,6 +73,9 @@
+ 	v3.4beta034.html	\
+ 	v3.4beta035.html	\
+ 	v3.4beta036.html	\
++	v3.5.1.html		\
++	v3.5.2.html		\
++	v3.5.3.html		\
+ 	${NULL}
+ IMAGES=\
+ 	images/back.gif		\
+@@ -80,6 +83,8 @@
+ 	images/cat.gif		\
+ 	images/cover.jpg	\
+ 	images/cramps.gif	\
++	images/dave.gif		\
++	images/info.gif		\
+ 	images/jello.jpg	\
+ 	images/jim.gif		\
+ 	images/note.gif		\
diff --git a/graphics/tiff/patches/patch-af b/graphics/tiff/patches/patch-af
new file mode 100644
index 00000000000..c964a68aabd
--- /dev/null
+++ b/graphics/tiff/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.3 2000/01/06 01:25:26 wiz Exp $
+
+--- html/index.html.orig	Tue Dec 21 22:09:04 1999
++++ html/index.html	Thu Jan  6 02:20:45 2000
+@@ -76,7 +76,6 @@
+ <LI><A HREF="bugs.html">Bugs and the TIFF mailing list</A>
+ <LI><A HREF="images.html">Test images</A>
+ <LI><A HREF="misc.html">Acknowledgements and copyright issues</A>
+-<LI><A HREF="man/index.html">Man Pages</A> 
+ </UL>
+ 
+ <P>
diff --git a/graphics/tiff/pkg/PLIST b/graphics/tiff/pkg/PLIST
index 1e4d4830928..501e0567236 100644
--- a/graphics/tiff/pkg/PLIST
+++ b/graphics/tiff/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1999/10/08 21:14:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/01/06 01:25:26 wiz Exp $
 bin/fax2ps
 bin/fax2tiff
 bin/gif2tiff
@@ -18,6 +18,7 @@ bin/tiffinfo
 bin/tiffmedian
 bin/tiffsplit
 include/tiff.h
+include/tiffconf.h
 include/tiffio.h
 lib/libtiff.a
 lib/libtiff.so.3.5
@@ -113,6 +114,7 @@ man/man3/TIFFWriteEncodedTile.3
 man/man3/TIFFWriteRawStrip.3
 man/man3/TIFFWriteRawTile.3
 man/man3/TIFFWriteScanline.3
+man/man3/TIFFWriteTile.3
 man/man3/TIFFbuffer.3
 man/man3/TIFFcodec.3
 man/man3/TIFFfree.3
@@ -128,3 +130,48 @@ man/man3/TIFFstrip.3
 man/man3/TIFFswab.3
 man/man3/TIFFtile.3
 man/man3/libtiff.3
+share/doc/tiff/images/back.gif
+share/doc/tiff/images/bali.jpg
+share/doc/tiff/images/cat.gif
+share/doc/tiff/images/cover.jpg
+share/doc/tiff/images/cramps.gif
+share/doc/tiff/images/dave.gif
+share/doc/tiff/images/info.gif
+share/doc/tiff/images/jello.jpg
+share/doc/tiff/images/jim.gif
+share/doc/tiff/images/note.gif
+share/doc/tiff/images/oxford.gif
+share/doc/tiff/images/quad.jpg
+share/doc/tiff/images/ring.gif
+share/doc/tiff/images/smallliz.jpg
+share/doc/tiff/images/strike.gif
+share/doc/tiff/images/warning.gif
+@dirrm share/doc/tiff/images
+share/doc/tiff/bugs.html
+share/doc/tiff/build.html
+share/doc/tiff/contrib.html
+share/doc/tiff/document.html
+share/doc/tiff/images.html
+share/doc/tiff/index.html
+share/doc/tiff/internals.html
+share/doc/tiff/intro.html
+share/doc/tiff/libtiff.html
+share/doc/tiff/misc.html
+share/doc/tiff/support.html
+share/doc/tiff/tools.html
+share/doc/tiff/v3.4beta007.html
+share/doc/tiff/v3.4beta016.html
+share/doc/tiff/v3.4beta018.html
+share/doc/tiff/v3.4beta024.html
+share/doc/tiff/v3.4beta028.html
+share/doc/tiff/v3.4beta029.html
+share/doc/tiff/v3.4beta031.html
+share/doc/tiff/v3.4beta032.html
+share/doc/tiff/v3.4beta033.html
+share/doc/tiff/v3.4beta034.html
+share/doc/tiff/v3.4beta035.html
+share/doc/tiff/v3.4beta036.html
+share/doc/tiff/v3.5.1.html
+share/doc/tiff/v3.5.2.html
+share/doc/tiff/v3.5.3.html
+@dirrm share/doc/tiff