Update to 3.7.4:

   MAJOR CHANGES:
     * Fixed important bug in custom tags handling code..

   ------------------------------------------------

   CHANGES IN THE SOFTWARE CONFIGURATION:
     * Applied patch from Patrick Welche (all scripts moved in the 'config'
       and 'm4' directories).
     * SConstruct, libtiff/SConstruct: Added the first very preliminary
       support for SCons software building tool (http://www.scons.org/). This
       is experimental infrastructure and it will exist along with the
       autotools stuff.
     * port/lfind.c: Added lfind() replacement module.

   ------------------------------------------------

   CHANGES IN LIBTIFF:
     * tif_dir.c: When prefreeing tv->value in TIFFSetFieldV also set it to
       NULL to avoid double free when re-setting custom string fields as per:
       http://bugzilla.remotesensing.org/show_bug.cgi?id=922
     * tif_dir.c: Fixed up support for swapping "double complex" values (128
       bits as 2 64 bits doubles). GDAL gcore tests now pass on bigendian
       (macosx) system.
     * libtiff/{tif_dirread.c, tif_dirinfo.c}: Do not upcast BYTEs to SHORTs
       in the TIFFFetchByteArray(). Remove TIFFFetchExtraSamples() function,
       use TIFFFetchNormalTag() instead as per bug
       http://bugzilla.remotesensing.org/show_bug.cgi?id=831 Remove
       TIFFFetchExtraSamples() function, use TIFFFetchNormalTag() instead.
     * tif_print.c: Fixed printing of the BYTE and SBYTE arrays.
     * tif_write.c: Do not check the PlanarConfiguration field in the
       TIFFWriteCheck() function in case of single band images (as per TIFF
       spec).
     * libtiff/{tif_dir.c, tif_dir.h, tif_dirinfo.c, tif_print.c}: Make
       FieldOfViewCotangent, MatrixWorldToScreen, MatrixWorldToCamera,
       ImageFullWidth, ImageFullLength and PrimaryChromaticities tags custom.

   ------------------------------------------------

   CHANGES IN THE TOOLS:
     * tiffcp.c: Fixed WhitePoint tag copying.

   ------------------------------------------------

   CHANGES IN THE CONTRIB AREA:
     * tiffdump.c: Added support for TIFF_IFD datatype.
     * addtiffo/{tif_overview.c, tif_ovrcache.c, tif_ovrcache.h}: Make
       overviews working for contiguous images.

10 files changed, 13 insertions, 209 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 984f77953f0..e371676b257 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2005/07/14 13:43:28 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2005/10/15 17:11:51 wiz Exp $
 
-DISTNAME=	tiff-3.7.3
+DISTNAME=	tiff-3.7.4
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://libtiff.maptools.org/dl/
diff --git a/graphics/tiff/PLIST b/graphics/tiff/PLIST
index b28b76e3533..08228fc4547 100644
--- a/graphics/tiff/PLIST
+++ b/graphics/tiff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/03/23 01:17:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/10/15 17:11:51 wiz Exp $
 bin/bmp2tiff
 bin/fax2ps
 bin/fax2tiff
@@ -217,6 +217,8 @@ share/doc/tiff/html/v3.7.0beta.html
 share/doc/tiff/html/v3.7.0beta2.html
 share/doc/tiff/html/v3.7.1.html
 share/doc/tiff/html/v3.7.2.html
+share/doc/tiff/html/v3.7.3.html
+share/doc/tiff/html/v3.7.4.html
 @dirrm share/doc/tiff/html/man
 @dirrm share/doc/tiff/html/images
 @dirrm share/doc/tiff/html
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 4522e56fe52..8f206a98f0b 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.31 2005/07/14 14:59:10 wiz Exp $
+$NetBSD: distinfo,v 1.32 2005/10/15 17:11:51 wiz Exp $
 
-SHA1 (tiff-3.7.3.tar.gz) = 8e55ade017a21a1f701d7eaa75d700cd159e5d7a
-RMD160 (tiff-3.7.3.tar.gz) = 9d50199ddf1fed8ce1b7ac4986a317f39bb15ed9
-Size (tiff-3.7.3.tar.gz) = 1272719 bytes
+SHA1 (tiff-3.7.4.tar.gz) = 0ff822b63069ab7044dad0d2098440b83b3df572
+RMD160 (tiff-3.7.4.tar.gz) = 9445eeb6a49991d5b16980acf75a7088c3f673fe
+Size (tiff-3.7.4.tar.gz) = 1282627 bytes
 SHA1 (patch-aa) = edac79a6f3b61e9fc787fe14f750d88023a29bfa
-SHA1 (patch-ac) = 9c5c00da3b248ac7af63286f3a31f7fe1dfbf8f3
-SHA1 (patch-at) = b1d0228a46fefb3b7ad58cd135f1f6c14aad7217
-SHA1 (patch-au) = c1a23ce2a183b6bec0b12024f349ea79456866ae
-SHA1 (patch-av) = a78d5425baea217e10ef133872529d116ec4a1cc
-SHA1 (patch-aw) = 0832b42776f8c0caa09c50f4c2af77df4e27b0ee
-SHA1 (patch-ax) = 8cf3a2db9fbe7edca14dcf51c9c6fedce71bc137
-SHA1 (patch-ay) = be085fd0fd131d1fc1a9d04d300b735de66da086
+SHA1 (patch-at) = 10b93d13d94a3273bdc4a8ff1530ebdcd2cad6a6
diff --git a/graphics/tiff/patches/patch-ac b/graphics/tiff/patches/patch-ac
deleted file mode 100644
index e7612c16443..00000000000
--- a/graphics/tiff/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.17 2005/07/14 13:43:28 wiz Exp $
-
---- libtiff/tiff.h.orig	2005-07-05 16:38:13.000000000 +0000
-+++ libtiff/tiff.h
-@@ -81,7 +81,7 @@ typedef	signed char int8;	/* NB: non-ANS
- typedef	unsigned char uint8;
- typedef	short int16;
- typedef	unsigned short uint16;	/* sizeof (uint16) must == 2 */
--#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__) || defined(__sparcv9)
-+#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__) || defined(__sparcv9) || defined(_LP64)
- typedef	int int32;
- typedef	unsigned int uint32;	/* sizeof (uint32) must == 4 */
- #else
diff --git a/graphics/tiff/patches/patch-at b/graphics/tiff/patches/patch-at
index 1a8496ed0ac..7236023cbf8 100644
--- a/graphics/tiff/patches/patch-at
+++ b/graphics/tiff/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.3 2005/07/14 14:59:10 wiz Exp $
+$NetBSD: patch-at,v 1.4 2005/10/15 17:11:51 wiz Exp $
 
---- configure.orig	2005-07-05 18:37:50.000000000 +0200
+--- configure.orig	2005-09-12 15:52:41.000000000 +0200
 +++ configure
-@@ -22736,6 +22736,117 @@ done
+@@ -22526,6 +22526,117 @@ done
  
  
  
diff --git a/graphics/tiff/patches/patch-au b/graphics/tiff/patches/patch-au
deleted file mode 100644
index 16859441e22..00000000000
--- a/graphics/tiff/patches/patch-au
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-au,v 1.3 2005/07/14 14:59:10 wiz Exp $
-
---- libtiff/tif_config.h.in.orig	2005-04-15 19:13:34.000000000 +0200
-+++ libtiff/tif_config.h.in
-@@ -52,6 +52,9 @@
- /* Define to 1 if you have the `isascii' function. */
- #undef HAVE_ISASCII
- 
-+/* Define to 1 if you have the `lfind' function. */
-+#undef HAVE_LFIND
-+
- /* Define to 1 if you have the `c' library (-lc). */
- #undef HAVE_LIBC
- 
diff --git a/graphics/tiff/patches/patch-av b/graphics/tiff/patches/patch-av
deleted file mode 100644
index d1edc5c529d..00000000000
--- a/graphics/tiff/patches/patch-av
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-av,v 1.3 2005/07/14 14:59:10 wiz Exp $
-
---- libtiff/tiffiop.h.orig	2005-07-05 18:38:13.000000000 +0200
-+++ libtiff/tiffiop.h
-@@ -32,26 +32,29 @@
- 
- #include "tif_config.h"
- 
--#if HAVE_FCNTL_H
-+#ifdef HAVE_FCNTL_H
- # include <fcntl.h>
- #endif
- 
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
- 
--#if HAVE_STRING_H
-+#ifdef HAVE_STRING_H
- # include <string.h>
- #endif
- 
--#if HAVE_ASSERT_H
-+#ifdef HAVE_ASSERT_H
- # include <assert.h>
- #else
- # define assert(x) 
- #endif
- 
--#if HAVE_SEARCH_H
-+#ifdef HAVE_SEARCH_H
- # include <search.h>
-+#else
-+extern void *lfind(const void *, const void *, size_t *, size_t,
-+		   int (*)(const void *, const void *));
- #endif
- 
- #include "tiffio.h"
diff --git a/graphics/tiff/patches/patch-aw b/graphics/tiff/patches/patch-aw
deleted file mode 100644
index 84c6c0b4c1e..00000000000
--- a/graphics/tiff/patches/patch-aw
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-aw,v 1.3 2005/07/14 14:59:10 wiz Exp $
-
---- port/lfind.c.orig	2005-07-14 16:42:34.000000000 +0200
-+++ port/lfind.c
-@@ -0,0 +1,54 @@
-+
-+/*
-+ * Copyright (c) 1989, 1993
-+ *	The Regents of the University of California.  All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Roger L. Snyder.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#include <sys/types.h>
-+
-+#ifndef NULL
-+# define NULL 0
-+#endif
-+
-+typedef int (*cmp_fn_t) __P((const void *, const void *));
-+
-+void *
-+lfind(const void *key, const void *base, size_t *nmemb, size_t size,
-+      cmp_fn_t compar)
-+{
-+	char *element, *end;
-+
-+	end = (char *)base + *nmemb * size;
-+	for (element = (char *)base; element < end; element += size)
-+		if (!compar(element, key))		/* key found */
-+			return element;
-+
-+	return NULL;
-+}
diff --git a/graphics/tiff/patches/patch-ax b/graphics/tiff/patches/patch-ax
deleted file mode 100644
index 661a350e6d2..00000000000
--- a/graphics/tiff/patches/patch-ax
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ax,v 1.3 2005/07/14 14:59:10 wiz Exp $
-
---- port/Makefile.in.orig	2005-07-14 16:45:12.000000000 +0200
-+++ port/Makefile.in
-@@ -66,7 +66,7 @@ host_triplet = @host@
- target_triplet = @target@
- subdir = port
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in getopt.c \
--	strcasecmp.c strtoul.c
-+	lfind.c strcasecmp.c strtoul.c
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/libtool.m4 \
- 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-@@ -284,6 +284,7 @@ distclean-compile:
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lfind.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoul.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
diff --git a/graphics/tiff/patches/patch-ay b/graphics/tiff/patches/patch-ay
deleted file mode 100644
index 9bda457aa71..00000000000
--- a/graphics/tiff/patches/patch-ay
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2005/07/14 14:59:10 wiz Exp $
-
---- libtiff/Makefile.in.orig	2005-07-05 18:38:08.000000000 +0200
-+++ libtiff/Makefile.in
-@@ -93,7 +93,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- 	"$(DESTDIR)$(libtiffincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libtiff_la_LIBADD =
-+am__DEPENDENCIES_1 = $(top_builddir)/port/libport.la
-+libtiff_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__objects_1 = tif_aux.lo tif_close.lo tif_codec.lo tif_color.lo \
- 	tif_compress.lo tif_dir.lo tif_dirinfo.lo tif_dirread.lo \
- 	tif_dirwrite.lo tif_dumpmode.lo tif_error.lo tif_extension.lo \
-@@ -105,7 +106,7 @@ am__objects_1 = tif_aux.lo tif_close.lo 
- 	tif_warning.lo tif_write.lo tif_zip.lo
- am_libtiff_la_OBJECTS = $(am__objects_1)
- libtiff_la_OBJECTS = $(am_libtiff_la_OBJECTS)
--am__DEPENDENCIES_1 = $(top_builddir)/libtiff/libtiff.la
-+am__DEPENDENCIES_2 = $(top_builddir)/libtiff/libtiff.la
- am__objects_2 = tif_stream.lo
- am_libtiffxx_la_OBJECTS = $(am__objects_2)
- libtiffxx_la_OBJECTS = $(am_libtiffxx_la_OBJECTS)
-@@ -113,8 +114,7 @@ libtiffxx_la_OBJECTS = $(am_libtiffxx_la
- PROGRAMS = $(noinst_PROGRAMS)
- am_mkg3states_OBJECTS = mkg3states.$(OBJEXT)
- mkg3states_OBJECTS = $(am_mkg3states_OBJECTS)
--am__DEPENDENCIES_2 = $(top_builddir)/port/libport.la
--mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_2)
-+mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I.
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -347,10 +347,11 @@ lib_LTLIBRARIES = libtiff.la $(am__appen
- libtiff_la_SOURCES = $(SRCS)
- libtiff_la_LDFLAGS = -no-undefined -version-number \
- 	$(LIBTIFF_VERSION_INFO) $(am__append_3)
-+libtiff_la_LIBADD = $(LIBPORT)
- libtiffxx_la_SOURCES = $(SRCSXX)
- libtiffxx_la_LDFLAGS = -no-undefined -version-number \
- 	$(LIBTIFF_VERSION_INFO) $(am__append_4)
--libtiffxx_la_LIBADD = $(LIBTIFF)
-+libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT)
- libtiffxx_la_DEPENDENCIES = libtiff.la
- mkg3states_SOURCES = mkg3states.c tif_fax3.h
- mkg3states_LDADD = $(LIBPORT)