Updated tiff to 3.5.7

* many bug fixes
* added support for 16bit minisblack/miniswhite images in RGBA interface
* integrated experimental OJPEG support
* updated tiffcp utility
* substantial changes to tiff2ps

10 files changed, 79 insertions, 71 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 9700db84197..b68e86b204a 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.36 2002/01/05 22:30:12 tron Exp $
+# $NetBSD: Makefile,v 1.37 2002/03/05 10:33:35 martti Exp $
 
-DISTNAME=	tiff-v3.5.5
-PKGNAME=	tiff-3.5.5
+DISTNAME=	tiff-v3.5.7
+PKGNAME=	tiff-3.5.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libtiff.org/ \
-		ftp://ftp.onshore.com/pub/libtiff/
+		ftp://ftp.remotesensing.org/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/
-COMMENT=	library and tools for reading and writing TIFF data files
+COMMENT=	Library and tools for reading and writing TIFF data files
 
 USE_LIBTOOL=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--noninteractive --site=${FILESDIR}
+CONFIGURE_ARGS=	--noninteractive --site=${FILESDIR} --prefix=${PREFIX}
 CONFIGURE_ENV+=	CC="${CC}"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/graphics/tiff/PLIST b/graphics/tiff/PLIST
index 940359db3f1..e89077138cf 100644
--- a/graphics/tiff/PLIST
+++ b/graphics/tiff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:11 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/05 10:33:35 martti Exp $
 bin/fax2ps
 bin/fax2tiff
 bin/gif2tiff
@@ -16,10 +16,12 @@ bin/tiffdither
 bin/tiffdump
 bin/tiffinfo
 bin/tiffmedian
+bin/tiffset
 bin/tiffsplit
 include/tiff.h
 include/tiffconf.h
 include/tiffio.h
+include/tiffvers.h
 lib/libtiff.a
 lib/libtiff.la
 lib/libtiff.so
@@ -36,6 +38,7 @@ man/man1/sgi2tiff.1
 man/man1/thumbnail.1
 man/man1/tiff2bw.1
 man/man1/tiff2ps.1
+man/man1/tiff2rgba.1
 man/man1/tiffcmp.1
 man/man1/tiffcp.1
 man/man1/tiffdither.1
@@ -46,6 +49,7 @@ man/man1/tiffmedian.1
 man/man1/tiffsplit.1
 man/man1/tiffsv.1
 man/man3/TIFFCheckTile.3
+man/man3/TIFFClientOpen.3
 man/man3/TIFFClose.3
 man/man3/TIFFComputeStrip.3
 man/man3/TIFFComputeTile.3
@@ -91,6 +95,7 @@ man/man3/TIFFReadScanline.3
 man/man3/TIFFReadTile.3
 man/man3/TIFFRegisterCODEC.3
 man/man3/TIFFReverseBits.3
+man/man3/TIFFRewriteDirectory.3
 man/man3/TIFFScanlineSize.3
 man/man3/TIFFSetDirectory.3
 man/man3/TIFFSetErrorHandler.3
@@ -133,6 +138,11 @@ man/man3/TIFFstrip.3
 man/man3/TIFFswab.3
 man/man3/TIFFtile.3
 man/man3/libtiff.3
+share/doc/html/tiff/bugs.html
+share/doc/html/tiff/build.html
+share/doc/html/tiff/contrib.html
+share/doc/html/tiff/document.html
+share/doc/html/tiff/images.html
 share/doc/html/tiff/images/back.gif
 share/doc/html/tiff/images/bali.jpg
 share/doc/html/tiff/images/cat.gif
@@ -149,12 +159,6 @@ share/doc/html/tiff/images/ring.gif
 share/doc/html/tiff/images/smallliz.jpg
 share/doc/html/tiff/images/strike.gif
 share/doc/html/tiff/images/warning.gif
-@dirrm share/doc/html/tiff/images
-share/doc/html/tiff/bugs.html
-share/doc/html/tiff/build.html
-share/doc/html/tiff/contrib.html
-share/doc/html/tiff/document.html
-share/doc/html/tiff/images.html
 share/doc/html/tiff/index.html
 share/doc/html/tiff/internals.html
 share/doc/html/tiff/intro.html
@@ -177,4 +181,5 @@ share/doc/html/tiff/v3.4beta036.html
 share/doc/html/tiff/v3.5.1.html
 share/doc/html/tiff/v3.5.2.html
 share/doc/html/tiff/v3.5.3.html
+@dirrm share/doc/html/tiff/images
 @dirrm share/doc/html/tiff
diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk
index 5b5ac3844c1..c625126344a 100644
--- a/graphics/tiff/buildlink.mk
+++ b/graphics/tiff/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/03/05 10:33:35 martti Exp $
 #
 # This Makefile fragment is included by packages that use libtiff.
 #
@@ -25,6 +25,7 @@ BUILDLINK_PREFIX.tiff_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.tiff=	include/tiff.h
 BUILDLINK_FILES.tiff+=	include/tiffconf.h
 BUILDLINK_FILES.tiff+=	include/tiffio.h
+BUILDLINK_FILES.tiff+=	include/tiffvers.h
 BUILDLINK_FILES.tiff+=	lib/libtiff.*
 
 .include "../../devel/zlib/buildlink.mk"
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index ad71ebf1fcf..132e8f412a2 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.6 2001/08/23 00:07:18 abs Exp $
+$NetBSD: distinfo,v 1.7 2002/03/05 10:33:35 martti Exp $
 
-SHA1 (tiff-v3.5.5.tar.gz) = e86acf234ea5d1423ff98d6607d49b150d822075
-Size (tiff-v3.5.5.tar.gz) = 900890 bytes
-SHA1 (libtiff-lzw-compression-kit-1.1.tar.gz) = ef9874616cdadcd717e2abd5b6a4abbc4fb247ac
-Size (libtiff-lzw-compression-kit-1.1.tar.gz) = 18685 bytes
-SHA1 (patch-aa) = d76a78bc36bc0b7a5a42c5f5a9fa1cb1bc8fad3e
-SHA1 (patch-ab) = 563d1d48a932d29ca377feefb473b688d3b6394f
-SHA1 (patch-ac) = 8cd7083afa94916350f5ab9bddc4e12c97c3fcad
-SHA1 (patch-ad) = cf443f74316678f60c9d6172094965eba451c356
-SHA1 (patch-ae) = 5b56c6430ef5ad303c396f5ec9b94c82ac605dbc
-SHA1 (patch-af) = d4eda39d4f70ec55fb329666fefdaa00a7a290c5
+SHA1 (tiff-v3.5.7.tar.gz) = a4c3e27b6625ee9daec7c7c35ec3dedf59c14ca7
+Size (tiff-v3.5.7.tar.gz) = 951139 bytes
+SHA1 (patch-aa) = 620c81f83da6af5ea89398a78fef4c86befc0325
+SHA1 (patch-ab) = 60a01fd74f271e512a7262964f5c7540164ac301
+SHA1 (patch-ac) = 754a02bb0561f8944fa1c870ab8dd6c1d6bf0c49
+SHA1 (patch-ad) = 9c8c96d1f57902222541ba9b5f439c94d575d9eb
+SHA1 (patch-ae) = 146a27e003ec0d194f31b021b961699f3ffe9f94
+SHA1 (patch-af) = e168502fbdc7f94439aa71a5f67d85ce41d1a68e
diff --git a/graphics/tiff/patches/patch-aa b/graphics/tiff/patches/patch-aa
index 9008e74f72b..d65e8a41c17 100644
--- a/graphics/tiff/patches/patch-aa
+++ b/graphics/tiff/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2001/08/23 00:07:18 abs Exp $
+$NetBSD: patch-aa,v 1.11 2002/03/05 10:33:35 martti Exp $
 
---- configure.orig	Mon Mar 20 18:20:42 2000
-+++ configure
-@@ -486,7 +486,7 @@
+--- configure.orig	Thu Nov 15 18:21:05 2001
++++ configure	Mon Mar  4 16:02:34 2002
+@@ -487,7 +487,7 @@
  
  checkCompiler()
  {
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2001/08/23 00:07:18 abs Exp $
      if isGNU $compiler; then
  	ISGCC=yes
      else
-@@ -512,7 +512,7 @@
+@@ -513,7 +513,7 @@
      $RM dummy dummy.o
      capture $compiler -o dummy ${C_ANSI} dummy.c && {
  	CC=$compiler;
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.10 2001/08/23 00:07:18 abs Exp $
  	test -z "${ENVOPTS-}"   && ENVOPTS="${C_ANSI-}"
  	return 0
      }
-@@ -1661,6 +1661,7 @@
+@@ -1705,6 +1705,7 @@
  	    -[LR]/*)	echo "$i" ;;
  	    -L*)	echo "$i" | sed 's;^-L;-L../;' ;;
  	    -R*)	echo "$i" | sed 's;^-R;-R../;' ;;
diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab
index 7ecf6943e11..cd47e1f361f 100644
--- a/graphics/tiff/patches/patch-ab
+++ b/graphics/tiff/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2001/08/23 00:07:18 abs Exp $
+$NetBSD: patch-ab,v 1.12 2002/03/05 10:33:36 martti Exp $
 
---- html/Makefile.in.orig	Mon Mar 27 17:05:55 2000
-+++ html/Makefile.in
-@@ -76,8 +76,6 @@
+--- html/Makefile.in.orig	Tue Jul 17 15:13:37 2001
++++ html/Makefile.in	Mon Mar  4 16:02:59 2002
+@@ -77,8 +77,6 @@
  	v3.5.1.html		\
  	v3.5.2.html		\
  	v3.5.3.html		\
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.11 2001/08/23 00:07:18 abs Exp $
  	${NULL}
  IMAGES=\
  	images/back.gif		\
-@@ -85,6 +83,8 @@
+@@ -86,6 +84,8 @@
  	images/cat.gif		\
  	images/cover.jpg	\
  	images/cramps.gif	\
diff --git a/graphics/tiff/patches/patch-ac b/graphics/tiff/patches/patch-ac
index 108e24e7b7a..4f82f08ef2d 100644
--- a/graphics/tiff/patches/patch-ac
+++ b/graphics/tiff/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.12 2001/08/23 00:07:18 abs Exp $
+$NetBSD: patch-ac,v 1.13 2002/03/05 10:33:36 martti Exp $
 
---- html/index.html.orig	Mon Mar 27 17:05:55 2000
-+++ html/index.html
-@@ -78,7 +78,6 @@
- <LI><A HREF="bugs.html">Bugs and the TIFF mailing list</A>
+--- html/index.html.orig	Fri Nov 23 16:56:18 2001
++++ html/index.html	Mon Mar  4 16:03:43 2002
+@@ -77,7 +77,6 @@
+ <LI><A HREF="bugs.html">Bugs, Bugzilla, 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> 
diff --git a/graphics/tiff/patches/patch-ad b/graphics/tiff/patches/patch-ad
index b2acac53936..e33a1631cec 100644
--- a/graphics/tiff/patches/patch-ad
+++ b/graphics/tiff/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.8 2001/08/23 00:07:18 abs Exp $
+$NetBSD: patch-ad,v 1.9 2002/03/05 10:33:36 martti Exp $
 
---- libtiff/Makefile.in.orig	Sun Nov 28 20:15:36 1999
-+++ libtiff/Makefile.in
-@@ -35,12 +35,18 @@
- #
+--- libtiff/Makefile.in.orig	Sun Sep  9 17:56:04 2001
++++ libtiff/Makefile.in	Mon Mar  4 16:05:30 2002
+@@ -36,12 +36,18 @@
  SHELL	= @SCRIPT_SH@
+ SCRIPT_SH = @SCRIPT_SH@
  NULL	=
 -CC	= @CCOMPILER@
 +CCOMPILER = @CCOMPILER@
@@ -22,7 +22,7 @@ $NetBSD: patch-ad,v 1.8 2001/08/23 00:07:18 abs Exp $
  #
  # If JPEG support is to be included and the Independent JPEG
  # Software distribution is not installed then DIR_JPEG must
-@@ -135,7 +141,7 @@
+@@ -138,7 +144,7 @@
  	tif_write.o \
  	tif_zip.o \
  	${NULL}
@@ -31,7 +31,7 @@ $NetBSD: patch-ad,v 1.8 2001/08/23 00:07:18 abs Exp $
  
  all:	${TARGETS}
  	if [ @DSO@dso != nodso ]; then \
-@@ -144,9 +150,10 @@
+@@ -147,9 +153,10 @@
  	    true; \
  	fi
  
@@ -45,7 +45,7 @@ $NetBSD: patch-ad,v 1.8 2001/08/23 00:07:18 abs Exp $
  
  #
  # NB: The configure script verifies that the configured
-@@ -249,8 +256,13 @@
+@@ -277,8 +284,13 @@
  	${CC} -c ${CFLAGS} ${SRCDIR}/tif_dir.c
  tif_dirinfo.o: ${SRCDIR}/tif_dirinfo.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirinfo.c
@@ -59,12 +59,12 @@ $NetBSD: patch-ad,v 1.8 2001/08/23 00:07:18 abs Exp $
  tif_dirwrite.o: ${SRCDIR}/tif_dirwrite.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirwrite.c
  tif_dumpmode.o: ${SRCDIR}/tif_dumpmode.c
-@@ -334,7 +346,7 @@
- 	fi
+@@ -377,7 +389,7 @@
+ 
  install: all installHdrs
- 	${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@
--	${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a
+ 	${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_LIB@
+-	${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_LIB@ -O libtiff.a
 +	${LIBTOOL} ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@
  	if [ @DSO@dso != nodso ]; then					\
- 	    ${MAKE} installDSO;						\
+ 	    ${MAKE} -${MAKEFLAGS} installDSO;				\
  	else								\
diff --git a/graphics/tiff/patches/patch-ae b/graphics/tiff/patches/patch-ae
index f6dc8d76f0b..afa9b349432 100644
--- a/graphics/tiff/patches/patch-ae
+++ b/graphics/tiff/patches/patch-ae
@@ -1,22 +1,24 @@
-$NetBSD: patch-ae,v 1.5 2001/08/23 00:07:18 abs Exp $
+$NetBSD: patch-ae,v 1.6 2002/03/05 10:33:36 martti Exp $
 
---- man/Makefile.in.orig	Tue Aug 21 08:44:42 2001
-+++ man/Makefile.in
-@@ -336,8 +336,7 @@
+--- man/Makefile.in.orig	Wed Sep 26 19:32:24 2001
++++ man/Makefile.in	Mon Mar  4 16:07:34 2002
+@@ -343,9 +343,7 @@
  	 ${ECHO} 'install:';						\
  	 for i in *.1; do						\
  	    f=${MANAPPNAME};						\
--	    ${ECHO} '	cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANAPPS}	\
+-	    ${ECHO} '	cd ..; ${INSTALL} -m 444 			\
+-		-F ${DESTDIR}${MAN}/${MANAPPS}				\
 -		-idb tiff.man.tools -src' apps/"$$i" '-O' "$$f";	\
 +	    ${ECHO} '	${BSD_INSTALL_DATA}' $$i ${MAN}/${MANAPPS}/$$f;	\
  	 done								\
  	)>apps/Makefile
  lib/Makefile:
-@@ -348,8 +347,7 @@
+@@ -356,9 +354,7 @@
  	 ${ECHO} 'install:';						\
  	 for i in *.3t; do						\
  	    f=${MANLIBNAME};						\
--	    ${ECHO} '	cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANLIB}	\
+-	    ${ECHO} '	cd ..; ${INSTALL} -m 444 			\
+-		-F ${DESTDIR}${MAN}/${MANLIB}				\
 -		-idb tiff.man.dev -src' lib/"$$i" '-O' "$$f";		\
 +	    ${ECHO} '	${BSD_INSTALL_DATA}' $$i ${MAN}/${MANLIB}/$$f;	\
  	 done								\
diff --git a/graphics/tiff/patches/patch-af b/graphics/tiff/patches/patch-af
index a604a90bb46..e58ef5ce731 100644
--- a/graphics/tiff/patches/patch-af
+++ b/graphics/tiff/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2001/08/23 00:07:19 abs Exp $
+$NetBSD: patch-af,v 1.6 2002/03/05 10:33:36 martti Exp $
 
---- tools/Makefile.in.orig	Tue Aug 21 08:44:43 2001
-+++ tools/Makefile.in
-@@ -47,10 +47,10 @@
+--- tools/Makefile.in.orig	Tue Jul 17 15:13:37 2001
++++ tools/Makefile.in	Mon Mar  4 16:09:50 2002
+@@ -48,10 +48,10 @@
  IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
  CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
  #
@@ -15,14 +15,16 @@ $NetBSD: patch-af,v 1.5 2001/08/23 00:07:19 abs Exp $
  LIBPORT	= @LIBPORT@
  MACHLIBS= @MACHDEPLIBS@
  LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
-@@ -108,8 +108,8 @@
+@@ -111,10 +111,8 @@
  	    true; \
  	fi
  install: all
--	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -dir @DIR_BIN@
--	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
+-	${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 		\
+-		-dir ${DESTDIR}@DIR_BIN@
+-	${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 		\
+-		-F ${DESTDIR}@DIR_BIN@ -O ${TARGETS}
 +	${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
 +	${LIBTOOL} ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
- 	@if [ "@LIBIMAGE@" = yes ]; then \
- 	    ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \
- 	else \
+ 	@if [ "@LIBIMAGE@" = yes ]; then 				\
+ 	    ${INSTALL} -idb tiff.sw.tools -m 755 			\
+ 		-F ${DESTDIR}@DIR_BIN@ -O sgi2tiff; 			\