Update to 3.7.3:

Many bugfixes and several new features. The runtime endianness check
has been replaced with the compile time one. Support has been added
for the new predictor type (floating point predictor) defined at the
TIFF Technical Note 3, for custom tags passed by value, and for all
DNG tags.

6 files changed, 15 insertions, 140 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index cca856c694f..984f77953f0 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2005/07/14 00:29:16 grant Exp $
+# $NetBSD: Makefile,v 1.72 2005/07/14 13:43:28 wiz Exp $
 
-DISTNAME=	tiff-3.7.2
-PKGREVISION=	1
+DISTNAME=	tiff-3.7.3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://libtiff.maptools.org/dl/
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index f7a6108a65f..4f92aa2cfaf 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.29 2005/05/12 12:53:21 salo Exp $
+$NetBSD: distinfo,v 1.30 2005/07/14 13:43:28 wiz Exp $
 
-SHA1 (tiff-3.7.2.tar.gz) = 0eb69e88bf6c430160ad2897cd0ae637d507ed66
-RMD160 (tiff-3.7.2.tar.gz) = fb156e17f55b1d565adbc5247f01d836d5f25824
-Size (tiff-3.7.2.tar.gz) = 1260598 bytes
-SHA1 (patch-aa) = 06ecb34e5eeae5650020b456dddd40c8b9fe9647
-SHA1 (patch-ab) = 0363e36d8c7575b4a55fee587aa4d92ee6c6db0b
-SHA1 (patch-ac) = 80c0abc2e8111a9b7608514cce239c8195e44cee
-SHA1 (patch-ad) = 2e448a0491c4137820ec81cf566cf1962fab6045
+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 (patch-aa) = edac79a6f3b61e9fc787fe14f750d88023a29bfa
+SHA1 (patch-ac) = 9c5c00da3b248ac7af63286f3a31f7fe1dfbf8f3
diff --git a/graphics/tiff/patches/patch-aa b/graphics/tiff/patches/patch-aa
index bdd64e7562c..1b8aa556da9 100644
--- a/graphics/tiff/patches/patch-aa
+++ b/graphics/tiff/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2005/03/23 01:17:45 wiz Exp $
+$NetBSD: patch-aa,v 1.17 2005/07/14 13:43:28 wiz Exp $
 
---- man/Makefile.in.orig	2005-03-11 16:49:52.000000000 +0100
+--- man/Makefile.in.orig	2005-07-05 16:38:13.000000000 +0000
 +++ man/Makefile.in
-@@ -376,11 +376,7 @@ install-man3: $(man3_MANS) $(man_MANS)
+@@ -380,11 +380,7 @@ install-man3: $(man3_MANS) $(man_MANS)
  	for i in $$list; do \
  	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
  	  else file=$$i; fi; \
diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab
deleted file mode 100644
index ff876457163..00000000000
--- a/graphics/tiff/patches/patch-ab
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.16 2005/03/24 17:46:29 recht Exp $
-
---- libtiff/Makefile.in.orig	Wed Mar  9 10:49:43 2005
-+++ libtiff/Makefile.in	Thu Mar 24 01:25:26 2005
-@@ -103,7 +103,8 @@
- 	tif_warning.lo tif_write.lo tif_zip.lo
- am_libtiff_la_OBJECTS = $(am__objects_1)
- libtiff_la_OBJECTS = $(am_libtiff_la_OBJECTS)
--libtiffxx_la_LIBADD =
-+am__DEPENDENCIES_1 = $(top_builddir)/libtiff/libtiff.la
-+libtiffxx_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__objects_2 = tif_stream.lo
- am_libtiffxx_la_OBJECTS = $(am__objects_2)
- libtiffxx_la_OBJECTS = $(am_libtiffxx_la_OBJECTS)
-@@ -111,8 +112,8 @@
- PROGRAMS = $(noinst_PROGRAMS)
- am_mkg3states_OBJECTS = mkg3states.$(OBJEXT)
- mkg3states_OBJECTS = $(am_mkg3states_OBJECTS)
--am__DEPENDENCIES_1 =
--mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am__DEPENDENCIES_2 = $(top_builddir)/port/libport.la
-+mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_2)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I.
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -271,7 +272,8 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--LIBPORT = -L$(top_builddir)/port -lport
-+LIBPORT = $(top_builddir)/port/libport.la
-+LIBTIFF = $(top_builddir)/libtiff/libtiff.la
- EXTRA_DIST = Makefile.vc tif_config.h.vc tiffconf.h.vc libtiff.def \
- 	     $(EXTRA_SRCS)
- 
-@@ -338,15 +340,14 @@
- noinst_HEADERS = $(EXTRA_HDRS)
- lib_LTLIBRARIES = libtiff.la $(am__append_2)
- libtiff_la_SOURCES = $(SRCS)
--libtiff_la_LDFLAGS = \
--	-no-undefined \
--	-version-number $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION)
--
-+libtiff_la_LDFLAGS = -no-undefined -version-number \
-+	$(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION) \
-+	$(am__append_3)
- libtiffxx_la_SOURCES = $(SRCSXX)
--libtiffxx_la_LDFLAGS = \
--	-no-undefined \
--	-version-number $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION)
--
-+libtiffxx_la_LDFLAGS = -no-undefined -version-number \
-+	$(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION) \
-+	$(am__append_4)
-+libtiffxx_la_LIBADD = $(LIBTIFF)
- mkg3states_SOURCES = mkg3states.c tif_fax3.h
- mkg3states_LDADD = $(LIBPORT)
- all: tif_config.h tiffconf.h
diff --git a/graphics/tiff/patches/patch-ac b/graphics/tiff/patches/patch-ac
index d75628b466e..e7612c16443 100644
--- a/graphics/tiff/patches/patch-ac
+++ b/graphics/tiff/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.16 2005/05/07 00:47:30 toshii Exp $
+$NetBSD: patch-ac,v 1.17 2005/07/14 13:43:28 wiz Exp $
 
---- libtiff/tiff.h.orig	2005-05-07 09:26:00.000000000 +0900
+--- 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__)
-+#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__) || defined(_LP64)
+-#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-ad b/graphics/tiff/patches/patch-ad
deleted file mode 100644
index 163fdc010eb..00000000000
--- a/graphics/tiff/patches/patch-ad
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-ad,v 1.14 2005/05/12 12:53:21 salo Exp $
-
---- libtiff/tif_dirread.c.orig	2005-03-05 10:06:00.000000000 +0100
-+++ libtiff/tif_dirread.c	2005-05-12 14:38:22.000000000 +0200
-@@ -1310,12 +1310,16 @@
- 		uint16 buf[10];
- 		uint16* v = buf;
- 
--		if (samples > NITEMS(buf))
--			v = (uint16*) CheckMalloc(tif, samples, sizeof(uint16),
-+        if (dir->tdir_count > NITEMS(buf))
-+            v = (uint16*) CheckMalloc(tif, dir->tdir_count, sizeof(uint16),
- 						  "to fetch per-sample values");
- 		if (v && TIFFFetchShortArray(tif, dir, v)) {
- 			uint16 i;
--			for (i = 1; i < samples; i++)
-+            int check_count = dir->tdir_count;
-+            if( samples < check_count )
-+                check_count = samples;
-+
-+            for (i = 1; i < check_count; i++)
- 				if (v[i] != v[0]) {
- 					TIFFError(tif->tif_name,
- 		"Cannot handle different per-sample values for field \"%s\"",
-@@ -1347,12 +1351,16 @@
- 		uint32 buf[10];
- 		uint32* v = buf;
- 
--		if (samples > NITEMS(buf))
--			v = (uint32*) CheckMalloc(tif, samples, sizeof(uint32),
-+        if (dir->tdir_count > NITEMS(buf))
-+            v = (uint32*) CheckMalloc(tif, dir->tdir_count, sizeof(uint32),
- 						  "to fetch per-sample values");
- 		if (v && TIFFFetchLongArray(tif, dir, v)) {
- 			uint16 i;
--			for (i = 1; i < samples; i++)
-+            int check_count = dir->tdir_count;
-+
-+            if( samples < check_count )
-+                check_count = samples;
-+            for (i = 1; i < check_count; i++)
- 				if (v[i] != v[0]) {
- 					TIFFError(tif->tif_name,
- 		"Cannot handle different per-sample values for field \"%s\"",
-@@ -1384,12 +1392,16 @@
- 		double buf[10];
- 		double* v = buf;
- 
--		if (samples > NITEMS(buf))
--			v = (double*) CheckMalloc(tif, samples, sizeof (double),
-+        if (dir->tdir_count > NITEMS(buf))
-+            v = (double*) CheckMalloc(tif, dir->tdir_count, sizeof (double),
- 						  "to fetch per-sample values");
- 		if (v && TIFFFetchAnyArray(tif, dir, v)) {
- 			uint16 i;
--			for (i = 1; i < samples; i++)
-+            int check_count = dir->tdir_count;
-+            if( samples < check_count )
-+                check_count = samples;
-+
-+            for (i = 1; i < check_count; i++)
- 				if (v[i] != v[0]) {
- 					TIFFError(tif->tif_name,
- 		"Cannot handle different per-sample values for field \"%s\"",