Update tiff to version 3.5.2.

Changes in TIFF v3.5.1
* Support was added for IPTC Newsphoto metadata (TIFFTAGE_IPTCNEWSPHOTO)
* Support was added for photoshop caption handling (TIFFTAG_PHOTOSHOP)

Changes in TIFF v3.5.2
* Added TIFFReassignTagToIgnore() API on behalf of
  Bruce Cameron <cameron@petris.com>.  Man page still pending.

* Fixed problem with cvtcmap() in tif_getimage.c modifying the
  colormaps owned by the TIFF handle itself when trying to fixup wrong
  (eight bit) colormaps.  Corrected by maintaining a private copy of
  the colormap.

* Added TIFFReadRGBATile()/TIFFReadRGBAStrip() support in
  tif_getimage.c.

* Applied "a" mode fix to tif_win32.c/TIFFOpen() as suggested
  by Christopher Lawton <clawton@mathworks.com>

* Set O_BINARY for tif_unix.c open() ... used on cygwin for instance.

* Applied Francois Dagand's patch to handle fax decompression bug.
  (sizes >= 65536 were failing)

10 files changed, 124 insertions, 452 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 41b0b5b2d80..09c144f5791 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,22 +1,45 @@
-# $NetBSD: Makefile,v 1.21 1999/10/07 17:41:54 tron Exp $
+# $NetBSD: Makefile,v 1.22 1999/10/08 21:14:32 jlam Exp $
 
-DISTNAME=	tiff-v3.4beta037
-PKGNAME=	tiff-3.4
+DISTNAME=	tiff-v3.5.2
+PKGNAME=	tiff-3.5.2
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://ftp.sgi.com/graphics/tiff/ \
-		ftp://ftp.gwdg.de/pub/grafik/sgi/tiff/ \
-		ftp://ftp.fu-berlin.de/unix/graphics/tiff/
-EXTRACT_SUFX=	-tar.gz
+MASTER_SITES=	http://www.libtiff.org/ \
+		ftp://ftp.onshore.com/pub/libtiff/
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://home.earthlink.net/~ritter/tiff/
+HOMEPAGE=	http://www.libtiff.org/
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 
-HAS_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	--noninteractive --site ${FILESDIR}
-CONFIGURE_ENV+=		PREFIX=${PREFIX} GCOPTS="${CFLAGS} -Dunix"
-MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}" LN="${LN}"
+USE_LIBTOOL=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--noninteractive --site=${FILESDIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+ZLIBDIR=	${LOCALBASE}/lib
+DEPENDS+=	zlib-*:../../devel/zlib
+.else
+ZLIBDIR=	/usr/lib
+.endif
+
+CPPFLAGS+=	-Dunix
+CONFIGURE_ENV+=	PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" \
+		ENVOPTS="${CFLAGS} ${CPPFLAGS}" ZLIBDIR="${ZLIBDIR}"
+
+pre-patch:
+	# reference correct relative man page when using .so
+	#
+	${MV} ${WRKSRC}/man/Makefile.in ${WRKSRC}/man/Makefile.in.in
+	${SED}	-e "s,\$${MANDIR}\(.*\)\.\([0-9]\).,\1.\2,g" \
+		-e "s,\$${MANDIR}\(.*\)\.\([0-9]\),\1.\2,g" \
+		${WRKSRC}/man/Makefile.in.in  > ${WRKSRC}/man/Makefile.in
+
+	# libtoolize build of TIFF tools
+	#
+	${MV} ${WRKSRC}/tools/Makefile.in ${WRKSRC}/tools/Makefile.in.in
+	${SED}	-e "s,\(\$${CC} -o\),\$${LIBTOOL} \1,g" \
+		${WRKSRC}/tools/Makefile.in.in  > ${WRKSRC}/tools/Makefile.in
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tiff/files/config.site b/graphics/tiff/files/config.site
index e5839e81a13..c42c03f79d7 100644
--- a/graphics/tiff/files/config.site
+++ b/graphics/tiff/files/config.site
@@ -1,12 +1,27 @@
-DIR_BIN=$PREFIX/bin
-DIR_LIB=$PREFIX/lib
-DIRS_LIBINC=$PREFIX/include
-DIR_GZLIB=/usr/lib
-DIR_INC=$PREFIX/include
-DIR_JPEGLIB=$PREFIX/lib
-DIR_MAN=$PREFIX/man
-DSO=no
-INSTALL=
+# $NetBSD: config.site,v 1.3 1999/10/08 21:14:33 jlam 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
+DIRS_LIBINC=${LOCALBASE}/include	# dirs to search for ancillary includes
+
+# JPEG support
+#
 JPEG=yes
-MANSCHEME=bsd-source-strip
+DIR_JPEGLIB=${LOCALBASE}/lib
+LIBJPEG="-Wl,-R${DIR_JPEGLIB} -L${DIR_JPEGLIB} -ljpeg"
+
+# ZLIB compression support
+#
 ZIP=yes
+DIR_GZLIB=${ZLIBDIR}
+LIBGZ="-Wl,-R${DIR_GZLIB} -L${DIR_GZLIB} -lz"
+
+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
+
+MANSCHEME=bsd-source-cat-strip
diff --git a/graphics/tiff/files/md5 b/graphics/tiff/files/md5
index 8763447677e..6a23471ef5c 100644
--- a/graphics/tiff/files/md5
+++ b/graphics/tiff/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:21:37 agc Exp $
+$NetBSD: md5,v 1.4 1999/10/08 21:14:34 jlam Exp $
 
-MD5 (tiff-v3.4beta037-tar.gz) = d809f5b88130062c6a2d2f70d0558b7e
+MD5 (tiff-v3.5.2.tar.gz) = 2c498457556723485d488eb12c12fe95
diff --git a/graphics/tiff/files/patch-sum b/graphics/tiff/files/patch-sum
index bdc08235edd..768bff414e0 100644
--- a/graphics/tiff/files/patch-sum
+++ b/graphics/tiff/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:12 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/08 21:14:34 jlam Exp $
 
-MD5 (patch-aa) = 445e63aa11b25b0205935846f4f5e3e4
-MD5 (patch-ab) = 4b1b88b3f1d62794545ce16c25036912
-MD5 (patch-ac) = dd865f6b602c696d07f5627f747adc17
+MD5 (patch-aa) = fc0f75027ad9d0ddadae75d3ab6be3d5
+MD5 (patch-ab) = faf2e55a2d576dca4b79c6f8360a2ff0
+MD5 (patch-ac) = f595dbd1baacd38dea3c767d88c3737b
+MD5 (patch-ad) = d3f3eaac0ef76577085514770265b5fa
diff --git a/graphics/tiff/patches/patch-aa b/graphics/tiff/patches/patch-aa
index 26ad2cbb245..5f771a86e98 100644
--- a/graphics/tiff/patches/patch-aa
+++ b/graphics/tiff/patches/patch-aa
@@ -1,290 +1,24 @@
-$NetBSD: patch-aa,v 1.6 1999/03/31 10:00:07 agc Exp $
+$NetBSD: patch-aa,v 1.7 1999/10/08 21:14:34 jlam Exp $
 
---- man/Makefile.in.orig	Tue Sep  2 19:54:41 1997
-+++ man/Makefile.in	Sun Jul  5 04:33:47 1998
-@@ -82,7 +82,7 @@
- # pathname prefix in the .so commands when setting
- # up alternate files for multi-function manual pages.
- #
--#MANDIR	= man3/
-+MANDIR	= man3/
- 
- MANTOOLS=\
- 	apps/fax2tiff.1 \
-@@ -144,60 +144,60 @@
- 	lib/TIFFtile.3t \
- 	${NULL}
- MANDEVLINKS=\
--	lib/TIFFmalloc.3t \
--	lib/TIFFrealloc.3t \
--	lib/TIFFfree.3t \
--	lib/TIFFmemset.3t \
--	lib/TIFFmemcpy.3t \
--	lib/TIFFmemcmp.3t \
--	lib/TIFFComputeTile.3t \
--	lib/TIFFCheckTile.3t \
--	lib/TIFFNumberOfTiles.3t \
--	lib/TIFFComputeStrip.3t \
--	lib/TIFFNumberOfStrips.3t \
--	lib/TIFFCurrentDirectory.3t \
--	lib/TIFFCurrentRow.3t \
--	lib/TIFFCurrentStrip.3t \
--	lib/TIFFCurrentTile.3t \
--	lib/TIFFFdOpen.3t \
--	lib/TIFFFileName.3t \
--	lib/TIFFFileno.3t \
--	lib/TIFFFindCODEC.3t \
--	lib/TIFFFlushData.3t \
--	lib/TIFFGetMode.3t \
--	lib/TIFFIsTiled.3t \
--	lib/TIFFIsByteSwapped.3t \
--	lib/TIFFIsUpSampled.3t \
--	lib/TIFFIsMSB2LSB.3t \
--	lib/TIFFLastDirectory.3t \
--	lib/TIFFRegisterCODEC.3t \
--	lib/TIFFReverseBits.3t \
--	lib/TIFFRGBAImageOK.3t \
--	lib/TIFFRGBAImageBegin.3t \
--	lib/TIFFRGBAImageGet.3t \
--	lib/TIFFRGBAImageEnd.3t \
--	lib/TIFFSetErrorHandler.3t \
--	lib/TIFFSetSubDirectory.3t \
--	lib/TIFFSetWarningHandler.3t \
--	lib/TIFFSwabArrayOfLong.3t \
--	lib/TIFFSwabArrayOfShort.3t \
--	lib/TIFFSwabLong.3t \
--	lib/TIFFSwabShort.3t \
--	lib/TIFFScanlineSize.3t \
--	lib/TIFFDefaultStripSize.3t \
--	lib/TIFFVStripSize.3t \
--	lib/TIFFStripSize.3t \
--	lib/TIFFDefaultTileSize.3t \
--	lib/TIFFVTileSize.3t \
--	lib/TIFFTileSize.3t \
--	lib/TIFFTileRowSize.3t \
--	lib/TIFFUnRegisterCODEC.3t \
--	lib/TIFFVGetField.3t \
--	lib/TIFFVSetField.3t \
--	lib/TIFFReadBufferSetup.3t \
--	lib/TIFFWriteBufferSetup.3t \
-+	lib/TIFFmalloc.3l \
-+	lib/TIFFrealloc.3l \
-+	lib/TIFFfree.3l \
-+	lib/TIFFmemset.3l \
-+	lib/TIFFmemcpy.3l \
-+	lib/TIFFmemcmp.3l \
-+	lib/TIFFComputeTile.3l \
-+	lib/TIFFCheckTile.3l \
-+	lib/TIFFNumberOfTiles.3l \
-+	lib/TIFFComputeStrip.3l \
-+	lib/TIFFNumberOfStrips.3l \
-+	lib/TIFFCurrentDirectory.3l \
-+	lib/TIFFCurrentRow.3l \
-+	lib/TIFFCurrentStrip.3l \
-+	lib/TIFFCurrentTile.3l \
-+	lib/TIFFFdOpen.3l \
-+	lib/TIFFFileName.3l \
-+	lib/TIFFFileno.3l \
-+	lib/TIFFFindCODEC.3l \
-+	lib/TIFFFlushData.3l \
-+	lib/TIFFGetMode.3l \
-+	lib/TIFFIsTiled.3l \
-+	lib/TIFFIsByteSwapped.3l \
-+	lib/TIFFIsUpSampled.3l \
-+	lib/TIFFIsMSB2LSB.3l \
-+	lib/TIFFLastDirectory.3l \
-+	lib/TIFFRegisterCODEC.3l \
-+	lib/TIFFReverseBits.3l \
-+	lib/TIFFRGBAImageOK.3l \
-+	lib/TIFFRGBAImageBegin.3l \
-+	lib/TIFFRGBAImageGet.3l \
-+	lib/TIFFRGBAImageEnd.3l \
-+	lib/TIFFSetErrorHandler.3l \
-+	lib/TIFFSetSubDirectory.3l \
-+	lib/TIFFSetWarningHandler.3l \
-+	lib/TIFFSwabArrayOfLong.3l \
-+	lib/TIFFSwabArrayOfShort.3l \
-+	lib/TIFFSwabLong.3l \
-+	lib/TIFFSwabShort.3l \
-+	lib/TIFFScanlineSize.3l \
-+	lib/TIFFDefaultStripSize.3l \
-+	lib/TIFFVStripSize.3l \
-+	lib/TIFFStripSize.3l \
-+	lib/TIFFDefaultTileSize.3l \
-+	lib/TIFFVTileSize.3l \
-+	lib/TIFFTileSize.3l \
-+	lib/TIFFTileRowSize.3l \
-+	lib/TIFFUnRegisterCODEC.3l \
-+	lib/TIFFVGetField.3l \
-+	lib/TIFFVSetField.3l \
-+	lib/TIFFReadBufferSetup.3l \
-+	lib/TIFFWriteBufferSetup.3l \
- 	${NULL}
--TARGETS=apps/Makefile lib/Makefile
-+TARGETS=apps/dummy lib/dummy
- 
- #
- # System-specific manual page formatting commands should
-@@ -268,91 +268,86 @@
- lib/TIFFswab.3t::	${SRCDIR}/TIFFswab.3t;			${MANCVT}
- lib/TIFFtile.3t::	${SRCDIR}/TIFFtile.3t;			${MANCVT}
- 
--lib/TIFFComputeTile.3t:;	${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFCheckTile.3t:;		${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFNumberOfTiles.3t:;	${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFComputeStrip.3t:;	${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@
--lib/TIFFNumberOfStrips.3t:;	${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@
--lib/TIFFCurrentDirectory.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFCurrentRow.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFCurrentStrip.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFCurrentTile.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFFdOpen.3t:;		${ECHO} ".so ${MANDIR}TIFFOpen.3t" > $@
--lib/TIFFFileName.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFFileno.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFFlushData.3t:;		${ECHO} ".so ${MANDIR}TIFFFlush.3t" > $@
--lib/TIFFGetMode.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFIsTiled.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFIsByteSwapped.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFIsUpSampled.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFIsMSB2LSB.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFLastDirectory.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFReverseBits.3t:;	${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
--lib/TIFFRGBAImageOK.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
--lib/TIFFRGBAImageBegin.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
--lib/TIFFRGBAImageGet.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
--lib/TIFFRGBAImageEnd.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
--lib/TIFFSetErrorHandler.3t:;	${ECHO} ".so ${MANDIR}TIFFError.3t" > $@
--lib/TIFFSetSubDirectory.3t:;	${ECHO} ".so ${MANDIR}TIFFSetDirectory.3t" > $@
--lib/TIFFSetWarningHandler.3t:;	${ECHO} ".so ${MANDIR}TIFFWarning.3t" > $@
--lib/TIFFSwabArrayOfLong.3t:;	${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
--lib/TIFFSwabArrayOfShort.3t:;	${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
--lib/TIFFSwabLong.3t:;		${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
--lib/TIFFSwabShort.3t:;		${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
--lib/TIFFScanlineSize.3t:;	${ECHO} ".so ${MANDIR}TIFFsize.3t" > $@
--lib/TIFFRasterScanlineSize.3t:;	${ECHO} ".so ${MANDIR}TIFFsize.3t" > $@
--lib/TIFFDefaultStripSize.3t:;	${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@
--lib/TIFFStripSize.3t:;		${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@
--lib/TIFFVStripSize.3t:;		${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@
--lib/TIFFTileSize.3t:;		${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFVTileSize.3t:;		${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFDefaultTileSize.3t:;	${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFTileRowSize.3t:;	${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFVGetField.3t:;		${ECHO} ".so ${MANDIR}TIFFGetField.3t" > $@
--lib/TIFFVSetField.3t:;		${ECHO} ".so ${MANDIR}TIFFSetField.3t" > $@
--lib/TIFFFindCODEC.3t:;		${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@
--lib/TIFFRegisterCODEC.3t:;	${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@
--lib/TIFFUnRegisterCODEC.3t:;	${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@
--lib/TIFFmalloc.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFrealloc.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFfree.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFmemset.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFmemcpy.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFmemcmp.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFReadBufferSetup.3t:;	${ECHO} ".so ${MANDIR}TIFFbuffer.3t" > $@
--lib/TIFFWriteBufferSetup.3t:;	${ECHO} ".so ${MANDIR}TIFFbuffer.3t" > $@
-+lib/TIFFComputeTile.3l:;	${ECHO} "TIFFtile.3" > $@
-+lib/TIFFCheckTile.3l:;		${ECHO} "TIFFtile.3" > $@
-+lib/TIFFNumberOfTiles.3l:;	${ECHO} "TIFFtile.3" > $@
-+lib/TIFFComputeStrip.3l:;	${ECHO} "TIFFstrip.3" > $@
-+lib/TIFFNumberOfStrips.3l:;	${ECHO} "TIFFstrip.3" > $@
-+lib/TIFFCurrentDirectory.3l:;	${ECHO} "TIFFquery.3" > $@
-+lib/TIFFCurrentRow.3l:;		${ECHO} "TIFFquery.3" > $@
-+lib/TIFFCurrentStrip.3l:;	${ECHO} "TIFFquery.3" > $@
-+lib/TIFFCurrentTile.3l:;	${ECHO} "TIFFquery.3" > $@
-+lib/TIFFFdOpen.3l:;		${ECHO} "TIFFOpen.3" > $@
-+lib/TIFFFileName.3l:;		${ECHO} "TIFFquery.3" > $@
-+lib/TIFFFileno.3l:;		${ECHO} "TIFFquery.3" > $@
-+lib/TIFFFlushData.3l:;		${ECHO} "TIFFFlush.3" > $@
-+lib/TIFFGetMode.3l:;		${ECHO} "TIFFquery.3" > $@
-+lib/TIFFIsTiled.3l:;		${ECHO} "TIFFquery.3" > $@
-+lib/TIFFIsByteSwapped.3l:;	${ECHO} "TIFFquery.3" > $@
-+lib/TIFFIsUpSampled.3l:;	${ECHO} "TIFFquery.3" > $@
-+lib/TIFFIsMSB2LSB.3l:;		${ECHO} "TIFFquery.3" > $@
-+lib/TIFFLastDirectory.3l:;	${ECHO} "TIFFquery.3" > $@
-+lib/TIFFReverseBits.3l:;	${ECHO} "TIFFswab.3" > $@
-+lib/TIFFRGBAImageOK.3l:;	${ECHO} "TIFFRGBAImage.3" > $@
-+lib/TIFFRGBAImageBegin.3l:;	${ECHO} "TIFFRGBAImage.3" > $@
-+lib/TIFFRGBAImageGet.3l:;	${ECHO} "TIFFRGBAImage.3" > $@
-+lib/TIFFRGBAImageEnd.3l:;	${ECHO} "TIFFRGBAImage.3" > $@
-+lib/TIFFSetErrorHandler.3l:;	${ECHO} "TIFFError.3" > $@
-+lib/TIFFSetSubDirectory.3l:;	${ECHO} "TIFFSetDirectory.3" > $@
-+lib/TIFFSetWarningHandler.3l:;	${ECHO} "TIFFWarning.3" > $@
-+lib/TIFFSwabArrayOfLong.3l:;	${ECHO} "TIFFswab.3" > $@
-+lib/TIFFSwabArrayOfShort.3l:;	${ECHO} "TIFFswab.3" > $@
-+lib/TIFFSwabLong.3l:;		${ECHO} "TIFFswab.3" > $@
-+lib/TIFFSwabShort.3l:;		${ECHO} "TIFFswab.3" > $@
-+lib/TIFFScanlineSize.3l:;	${ECHO} "TIFFsize.3" > $@
-+lib/TIFFRasterScanlineSize.3l:;	${ECHO} "TIFFsize.3" > $@
-+lib/TIFFDefaultStripSize.3l:;	${ECHO} "TIFFstrip.3" > $@
-+lib/TIFFStripSize.3l:;		${ECHO} "TIFFstrip.3" > $@
-+lib/TIFFVStripSize.3l:;		${ECHO} "TIFFstrip.3" > $@
-+lib/TIFFTileSize.3l:;		${ECHO} "TIFFtile.3" > $@
-+lib/TIFFVTileSize.3l:;		${ECHO} "TIFFtile.3" > $@
-+lib/TIFFDefaultTileSize.3l:;	${ECHO} "TIFFtile.3" > $@
-+lib/TIFFTileRowSize.3l:;	${ECHO} "TIFFtile.3" > $@
-+lib/TIFFVGetField.3l:;		${ECHO} "TIFFGetField.3" > $@
-+lib/TIFFVSetField.3l:;		${ECHO} "TIFFSetField.3" > $@
-+lib/TIFFFindCODEC.3l:;		${ECHO} "TIFFcodec.3" > $@
-+lib/TIFFRegisterCODEC.3l:;	${ECHO} "TIFFcodec.3" > $@
-+lib/TIFFUnRegisterCODEC.3l:;	${ECHO} "TIFFcodec.3" > $@
-+lib/TIFFmalloc.3l:;		${ECHO} "TIFFmemory.3" > $@
-+lib/TIFFrealloc.3l:;		${ECHO} "TIFFmemory.3" > $@
-+lib/TIFFfree.3l:;		${ECHO} "TIFFmemory.3" > $@
-+lib/TIFFmemset.3l:;		${ECHO} "TIFFmemory.3" > $@
-+lib/TIFFmemcpy.3l:;		${ECHO} "TIFFmemory.3" > $@
-+lib/TIFFmemcmp.3l:;		${ECHO} "TIFFmemory.3" > $@
-+lib/TIFFReadBufferSetup.3l:;	${ECHO} "TIFFbuffer.3" > $@
-+lib/TIFFWriteBufferSetup.3l:;	${ECHO} "TIFFbuffer.3" > $@
- 
--apps/Makefile:
-+apps/dummy:
- 	test -d apps || mkdir apps
- 	${MAKE} ${MANTOOLS}
--	${RM} apps/Makefile
--	(cd apps;							\
--	 ${ECHO} 'install:';						\
--	 for i in *.1; do						\
--	    f=${MANAPPNAME};						\
+--- ./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 @@
+ 	 ${ECHO} 'install:';						\
+ 	 for i in *.1; do						\
+ 	    f=${MANAPPNAME};						\
 -	    ${ECHO} '	cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANAPPS}	\
 -		-idb tiff.man.tools -src' apps/"$$i" '-O' "$$f";	\
--	 done								\
--	)>apps/Makefile
--lib/Makefile:
-+	${ECHO} done >apps/dummy
-+
-+lib/dummy:
- 	test -d lib || mkdir lib
- 	${MAKE} ${MANDEV} ${MANDEVLINKS}
--	${RM} lib/Makefile
--	(cd lib;							\
--	 ${ECHO} 'install:';						\
--	 for i in *.3t; do						\
--	    f=${MANLIBNAME};						\
++	    ${ECHO} '	${BSD_INSTALL_DATA}' $$i ${MAN}/${MANAPPS}/$$f;	\
+ 	 done								\
+ 	)>apps/Makefile
+ lib/Makefile:
+@@ -346,8 +345,7 @@
+ 	 ${ECHO} 'install:';						\
+ 	 for i in *.3t; do						\
+ 	    f=${MANLIBNAME};						\
 -	    ${ECHO} '	cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANLIB}	\
 -		-idb tiff.man.dev -src' lib/"$$i" '-O' "$$f";		\
--	 done								\
--	)>lib/Makefile
-+	${ECHO} done >lib/dummy
- 
- install: all
- 	${INSTALL} -m 755 -dir -idb tiff.man.tools ${MAN}
- 	${INSTALL} -m 755 -dir -idb tiff.man.tools ${MAN}/${MANAPPS}
--	cd apps; ${MAKE} install
--	${INSTALL} -m 755 -dir -idb tiff.man.dev ${MAN}/${MANLIB}
--	cd lib; ${MAKE} install
-+	(cd apps; \
-+	 for FILE in *.1; do \
-+	   ${INSTALL_MAN} $$FILE ${PREFIX}/man/man1; \
-+	 done)
-+	(cd lib; \
-+	 for FILE in *.3t; do \
-+	   ${INSTALL_MAN} $$FILE ${PREFIX}/man/man3/`basename $$FILE .3t`.3; \
-+	 done; \
-+	 for FILE in *.3l; do \
-+	   linkname=${PREFIX}/man/man3/`basename $$FILE .3l`.3; \
-+	   rm -f $$linkname; \
-+	   ${LN} -s `cat $$FILE` $$linkname; \
-+	 done)
++	    ${ECHO} '	${BSD_INSTALL_DATA}' $$i ${MAN}/${MANLIB}/$$f;	\
+ 	 done								\
+ 	)>lib/Makefile
  
- clean:
- 	rm -rf apps lib
diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab
index 2929d561f60..762e65b31c3 100644
--- a/graphics/tiff/patches/patch-ab
+++ b/graphics/tiff/patches/patch-ab
@@ -1,17 +1,18 @@
-$NetBSD: patch-ab,v 1.5 1998/10/02 14:57:52 tv Exp $
+$NetBSD: patch-ab,v 1.6 1999/10/08 21:14:34 jlam Exp $
 
---- libtiff/Makefile.in.orig	Mon Jul 20 11:13:09 1998
-+++ libtiff/Makefile.in	Mon Jul 20 11:40:13 1998
-@@ -35,7 +35,7 @@
+--- ./libtiff/Makefile.in.orig	Wed Sep  8 05:39:00 1999
++++ ./libtiff/Makefile.in	Thu Oct  7 22:08:32 1999
+@@ -35,7 +35,8 @@
  #
  SHELL	= @SCRIPT_SH@
  NULL	=
 -CC	= @CCOMPILER@
-+CC	= ${LIBTOOL} @CCOMPILER@
++CCOMPILER = @CCOMPILER@
++CC	= ${LIBTOOL} ${CCOMPILER}
  AR	= @AR@
  AROPTS	= @AROPTS@
  RANLIB	= @RANLIB@
-@@ -135,7 +135,7 @@
+@@ -135,7 +136,7 @@
  	tif_write.o \
  	tif_zip.o \
  	${NULL}
@@ -20,7 +21,7 @@ $NetBSD: patch-ab,v 1.5 1998/10/02 14:57:52 tv Exp $
  
  all:	${TARGETS}
  	if [ @DSO@dso != nodso ]; then \
-@@ -144,9 +144,9 @@
+@@ -144,9 +145,9 @@
  	    true; \
  	fi
  
@@ -28,17 +29,17 @@ $NetBSD: patch-ab,v 1.5 1998/10/02 14:57:52 tv Exp $
 -	${AR} ${AROPTS} libtiff.a $?
 -	${RANLIB} libtiff.a
 +libtiff.la: ${OBJS}
-+	${CC} -o libtiff.la ${OBJS:.o=.lo} -rpath ${PREFIX}/lib \
-+		-version-info 3:4
++	${CC} -o $@ ${OBJS:.o=.lo} -rpath @DIR_LIB@ \
++		-version-info @DIST_MAJOR@:@DIST_MINOR@
  
  #
  # NB: The configure script verifies that the configured
-@@ -328,7 +328,7 @@
+@@ -334,7 +335,7 @@
  	fi
  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
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@
++	${LIBTOOL} ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@
  	if [ @DSO@dso != nodso ]; then					\
  	    ${MAKE} installDSO;						\
  	else								\
diff --git a/graphics/tiff/patches/patch-ac b/graphics/tiff/patches/patch-ac
index 576c9eeef8a..b82810be988 100644
--- a/graphics/tiff/patches/patch-ac
+++ b/graphics/tiff/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.7 1999/05/20 22:23:29 tron Exp $
+$NetBSD: patch-ac,v 1.8 1999/10/08 21:14:34 jlam Exp $
 
---- tools/Makefile.in.orig	Mon Jul 20 11:17:11 1998
-+++ tools/Makefile.in	Mon Jul 20 11:43:58 1998
+--- ./tools/Makefile.in.orig	Thu Aug 19 06:03:27 1999
++++ ./tools/Makefile.in	Fri Oct  8 02:21:21 1999
 @@ -47,10 +47,10 @@
  IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
  CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
@@ -11,11 +11,11 @@ $NetBSD: patch-ac,v 1.7 1999/05/20 22:23:29 tron Exp $
  LIBJPEG	= @LIBJPEG@
  LIBGZ	= @LIBGZ@
 -LIBTIFF	= @TIFFLIBREF@
-+LIBTIFF	= ../libtiff/libtiff.la
++LIBTIFF	= ${TIFFLIB}
  LIBPORT	= @LIBPORT@
  MACHLIBS= @MACHDEPLIBS@
  LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
-@@ -107,7 +107,7 @@
+@@ -109,7 +109,7 @@
  	fi
  install: all
  	${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
@@ -24,120 +24,3 @@ $NetBSD: patch-ac,v 1.7 1999/05/20 22:23:29 tron Exp $
  	@if [ "@LIBIMAGE@" = yes ]; then \
  	    ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \
  	else \
-@@ -127,37 +127,37 @@
- #
- 
- tiffinfo: tiffinfo.o ${TIFFLIB}
--	${CC} -o tiffinfo ${CFLAGS} tiffinfo.o ${LIBS}
-+	${LIBTOOL} ${CC} -o tiffinfo ${CFLAGS} tiffinfo.o ${LIBS} ${LDFLAGS}
- tiffinfo.o: ${SRCDIR}/tiffinfo.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffinfo.c
- 
- tiffcmp:tiffcmp.o ${TIFFLIB}
--	${CC} -o tiffcmp ${CFLAGS} tiffcmp.o ${LIBS}
-+	${LIBTOOL} ${CC} -o tiffcmp ${CFLAGS} tiffcmp.o ${LIBS} ${LDFLAGS}
- tiffcmp.o: ${SRCDIR}/tiffcmp.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffcmp.c
- 
- tiffcp:	tiffcp.o ${TIFFLIB}
--	${CC} -o tiffcp ${CFLAGS} tiffcp.o ${LIBS}
-+	${LIBTOOL} ${CC} -o tiffcp ${CFLAGS} tiffcp.o ${LIBS} ${LDFLAGS}
- tiffcp.o: ${SRCDIR}/tiffcp.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffcp.c
- 
- tiffdump: tiffdump.o
--	${CC} -o tiffdump ${CFLAGS} tiffdump.o ${LIBS}
-+	${LIBTOOL} ${CC} -o tiffdump ${CFLAGS} tiffdump.o ${LIBS} ${LDFLAGS}
- tiffdump.o: ${SRCDIR}/tiffdump.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffdump.c
- 
- tiffmedian: tiffmedian.o ${TIFFLIB}
--	${CC} -o tiffmedian ${CFLAGS} tiffmedian.o ${LIBS}
-+	${LIBTOOL} ${CC} -o tiffmedian ${CFLAGS} tiffmedian.o ${LIBS} ${LDFLAGS}
- tiffmedian.o: ${SRCDIR}/tiffmedian.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffmedian.c
- 
- tiffsplit: tiffsplit.o ${TIFFLIB}
--	${CC} -o tiffsplit ${CFLAGS} tiffsplit.o ${LIBS}
-+	${LIBTOOL} ${CC} -o tiffsplit ${CFLAGS} tiffsplit.o ${LIBS} ${LDFLAGS}
- tiffsplit.o: ${SRCDIR}/tiffsplit.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffsplit.c
- 
- tiff2ps: tiff2ps.o ${TIFFLIB}
--	${CC} -o tiff2ps ${CFLAGS} tiff2ps.o ${LIBS}
-+	${LIBTOOL} ${CC} -o tiff2ps ${CFLAGS} tiff2ps.o ${LIBS} ${LDFLAGS}
- tiff2ps.o: ${SRCDIR}/tiff2ps.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/tiff2ps.c
- 
-@@ -168,61 +168,61 @@
- 
- # convert RGB image to B&W
- tiff2bw: tiff2bw.o ${TIFFLIB}
--	${CC} -o tiff2bw ${CFLAGS} tiff2bw.o ${LIBS}
-+	${LIBTOOL} ${CC} -o tiff2bw ${CFLAGS} tiff2bw.o ${LIBS} ${LDFLAGS}
- tiff2bw.o: ${SRCDIR}/tiff2bw.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/tiff2bw.c
- 
- # convert B&W image to bilevel w/ FS dithering
- tiffdither: tiffdither.o ${TIFFLIB}
--	${CC} -o tiffdither ${CFLAGS} tiffdither.o ${LIBS}
-+	${LIBTOOL} ${CC} -o tiffdither ${CFLAGS} tiffdither.o ${LIBS} ${LDFLAGS}
- tiffdither.o: ${SRCDIR}/tiffdither.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffdither.c
- 
- # simple Sun rasterfile converter
- ras2tiff: ras2tiff.o ${TIFFLIB}
--	${CC} -o ras2tiff ${CFLAGS} ras2tiff.o ${LIBS}
-+	${LIBTOOL} ${CC} -o ras2tiff ${CFLAGS} ras2tiff.o ${LIBS} ${LDFLAGS}
- ras2tiff.o: ${SRCDIR}/ras2tiff.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/ras2tiff.c
- 
- # simple GIF converter
- gif2tiff: gif2tiff.o ${TIFFLIB}
--	${CC} -o gif2tiff ${CFLAGS} gif2tiff.o ${LIBS}
-+	${LIBTOOL} ${CC} -o gif2tiff ${CFLAGS} gif2tiff.o ${LIBS} ${LDFLAGS}
- gif2tiff.o: ${SRCDIR}/gif2tiff.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/gif2tiff.c
- 
- # very limited PBM converter
- ppm2tiff: ppm2tiff.o ${TIFFLIB}
--	${CC} -o ppm2tiff ${CFLAGS} ppm2tiff.o ${LIBS}
-+	${LIBTOOL} ${CC} -o ppm2tiff ${CFLAGS} ppm2tiff.o ${LIBS} ${LDFLAGS}
- ppm2tiff.o: ${SRCDIR}/ppm2tiff.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/ppm2tiff.c
- 
- # Group 3/4 FAX file converter
- fax2tiff: fax2tiff.o ${TIFFLIB}
--	${CC} -o fax2tiff ${CFLAGS} fax2tiff.o ${LIBS}
-+	${LIBTOOL} ${CC} -o fax2tiff ${CFLAGS} fax2tiff.o ${LIBS} ${LDFLAGS}
- fax2tiff.o: ${SRCDIR}/fax2tiff.c
- 	${CC} -c -I${LIBDIR} -I${DEPTH}/libtiff ${CFLAGS} ${SRCDIR}/fax2tiff.c
- 
- # Group 3/4 FAX to encoded PS converter
- fax2ps: fax2ps.o ${TIFFLIB}
--	${CC} -o fax2ps ${CFLAGS} fax2ps.o ${LIBS}
-+	${LIBTOOL} ${CC} -o fax2ps ${CFLAGS} fax2ps.o ${LIBS} ${LDFLAGS}
- fax2ps.o: ${SRCDIR}/fax2ps.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/fax2ps.c
- 
- # convert Palette image to RGB
- pal2rgb: pal2rgb.o ${TIFFLIB}
--	${CC} -o pal2rgb ${CFLAGS} pal2rgb.o ${LIBS}
-+	${LIBTOOL} ${CC} -o pal2rgb ${CFLAGS} pal2rgb.o ${LIBS} ${LDFLAGS}
- pal2rgb.o: ${SRCDIR}/pal2rgb.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/pal2rgb.c
- 
- # convert RGB image to YCbCr
- rgb2ycbcr: rgb2ycbcr.o ${TIFFLIB}
--	${CC} -o rgb2ycbcr ${CFLAGS} rgb2ycbcr.o ${LIBS}
-+	${LIBTOOL} ${CC} -o rgb2ycbcr ${CFLAGS} rgb2ycbcr.o ${LIBS} ${LDFLAGS}
- rgb2ycbcr.o: ${SRCDIR}/rgb2ycbcr.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/rgb2ycbcr.c
- 
- # generate thumbnail images from fax (example of SubIFD usage)
- thumbnail: thumbnail.o ${TIFFLIB}
--	${CC} -o thumbnail ${CFLAGS} thumbnail.o ${LIBS}
-+	${LIBTOOL} ${CC} -o thumbnail ${CFLAGS} thumbnail.o ${LIBS} ${LDFLAGS}
- thumbnail.o: ${SRCDIR}/thumbnail.c
- 	${CC} -c ${CFLAGS} ${SRCDIR}/thumbnail.c
- 
diff --git a/graphics/tiff/patches/patch-ad b/graphics/tiff/patches/patch-ad
new file mode 100644
index 00000000000..9f78cdf7a37
--- /dev/null
+++ b/graphics/tiff/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.3 1999/10/08 21:14:35 jlam Exp $
+
+--- ./configure.orig	Wed Sep  8 05:38:56 1999
++++ ./configure	Fri Oct  8 01:37:09 1999
+@@ -1661,6 +1661,7 @@
+ 	    -[LR]/*)	echo "$i" ;;
+ 	    -L*)	echo "$i" | sed 's;^-L;-L../;' ;;
+ 	    -R*)	echo "$i" | sed 's;^-R;-R../;' ;;
++	    -W*)	echo "$i" ;;
+ 	    *)		echo "../$i" ;;
+ 	    esac
+ 	done) | tr '\012' ' '
diff --git a/graphics/tiff/pkg/COMMENT b/graphics/tiff/pkg/COMMENT
index 41abc1de59d..079e12416d7 100644
--- a/graphics/tiff/pkg/COMMENT
+++ b/graphics/tiff/pkg/COMMENT
@@ -1 +1 @@
-A library for reading and writing TIFF data files.
+library and tools for reading and writing TIFF data files
diff --git a/graphics/tiff/pkg/PLIST b/graphics/tiff/pkg/PLIST
index 1bd644fd1ca..1e4d4830928 100644
--- a/graphics/tiff/pkg/PLIST
+++ b/graphics/tiff/pkg/PLIST
@@ -1,14 +1,15 @@
-@comment $NetBSD: PLIST,v 1.7 1998/07/15 11:24:51 agc Exp $
-bin/fax2tiff
+@comment $NetBSD: PLIST,v 1.8 1999/10/08 21:14:35 jlam Exp $
 bin/fax2ps
+bin/fax2tiff
 bin/gif2tiff
 bin/pal2rgb
 bin/ppm2tiff
+bin/ras2tiff
 bin/rgb2ycbcr
 bin/thumbnail
-bin/ras2tiff
 bin/tiff2bw
 bin/tiff2ps
+bin/tiff2rgba
 bin/tiffcmp
 bin/tiffcp
 bin/tiffdither
@@ -16,10 +17,10 @@ bin/tiffdump
 bin/tiffinfo
 bin/tiffmedian
 bin/tiffsplit
-lib/libtiff.a
-lib/libtiff.so.3.4
 include/tiff.h
 include/tiffio.h
+lib/libtiff.a
+lib/libtiff.so.3.5
 man/man1/fax2ps.1
 man/man1/fax2tiff.1
 man/man1/gif2tiff.1
@@ -78,6 +79,8 @@ man/man3/TIFFReadDirectory.3
 man/man3/TIFFReadEncodedStrip.3
 man/man3/TIFFReadEncodedTile.3
 man/man3/TIFFReadRGBAImage.3
+man/man3/TIFFReadRGBAStrip.3
+man/man3/TIFFReadRGBATile.3
 man/man3/TIFFReadRawStrip.3
 man/man3/TIFFReadRawTile.3
 man/man3/TIFFReadScanline.3