Update to 3.7.2.

Package changes:
Put options in options.mk, and retire support for USE_GIF; turn on
the lzw option by default (since USE_GIF was on by default).
C++ library's name changed, to be in sync with tiff distribution's name
for it (libtiffcxx -> libtiffxx).

Changes in 3.7.2:
	Maintainance [sic] release. Many bugfixes in the build
	environment and compatibility improvements.

8 files changed, 3 insertions, 97 deletions

diff --git a/graphics/tiff/patches/patch-aa b/graphics/tiff/patches/patch-aa
index b02bc2363a4..bdd64e7562c 100644
--- a/graphics/tiff/patches/patch-aa
+++ b/graphics/tiff/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2004/12/28 23:10:09 reed Exp $
+$NetBSD: patch-aa,v 1.16 2005/03/23 01:17:45 wiz Exp $
 
---- man/Makefile.in.orig	Mon Dec 20 11:41:54 2004
+--- man/Makefile.in.orig	2005-03-11 16:49:52.000000000 +0100
 +++ man/Makefile.in
-@@ -373,11 +373,7 @@ install-man3: $(man3_MANS) $(man_MANS)
+@@ -376,11 +376,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 eae035c5722..00000000000
--- a/graphics/tiff/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.14 2004/12/28 23:10:10 reed Exp $
-
---- html/Makefile.in.orig	2004-12-20 11:41:54.000000000 -0800
-+++ html/Makefile.in
-@@ -224,7 +224,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/html
-+docdir = $(prefix)/share/doc/$(PACKAGE)/html
- docfiles = \
- 	addingtags.html \
- 	bugs.html \
diff --git a/graphics/tiff/patches/patch-ac b/graphics/tiff/patches/patch-ac
deleted file mode 100644
index 17fa5e29ad6..00000000000
--- a/graphics/tiff/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.14 2004/12/28 23:10:10 reed Exp $
-
---- html/man/Makefile.in.orig	Mon Dec 20 11:29:26 2004
-+++ html/man/Makefile.in
-@@ -213,7 +213,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/html/man
-+docdir = $(prefix)/share/doc/$(PACKAGE)/html/man
- docfiles = \
- 	fax2ps.1.html \
- 	fax2ps.1.html \
diff --git a/graphics/tiff/patches/patch-ad b/graphics/tiff/patches/patch-ad
deleted file mode 100644
index 5e7e3928351..00000000000
--- a/graphics/tiff/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.12 2004/12/28 23:10:10 reed Exp $
-
---- Makefile.in.orig	Mon Dec 20 11:41:46 2004
-+++ Makefile.in
-@@ -236,7 +236,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(prefix)/share/doc/$(PACKAGE)
- AUTOMAKE_OPTIONS = dist-zip foreign
- docfiles = \
- 	COPYRIGHT \
diff --git a/graphics/tiff/patches/patch-ae b/graphics/tiff/patches/patch-ae
deleted file mode 100644
index 084c0825715..00000000000
--- a/graphics/tiff/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2004/12/28 23:10:10 reed Exp $
-
---- html/images/Makefile.in.orig	Mon Dec 20 11:29:26 2004
-+++ html/images/Makefile.in
-@@ -213,7 +213,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/html/images
-+docdir = $(prefix)/share/doc/$(PACKAGE)/html/images
- docfiles = \
- 	back.gif \
- 	bali.jpg \
diff --git a/graphics/tiff/patches/patch-af b/graphics/tiff/patches/patch-af
deleted file mode 100644
index 64ad1e7ded4..00000000000
--- a/graphics/tiff/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.10 2005/01/11 05:29:55 jlam Exp $
-
---- configure.orig	2004-12-20 14:41:54.000000000 -0500
-+++ configure
-@@ -23722,6 +23722,7 @@ if test "${enable_c+++set}" = set; then
- else
-   HAVE_CXX=yes
- fi;
-+HAVE_CXX=no
- 
- if test "$HAVE_CXX" = "yes" ; then
- 
diff --git a/graphics/tiff/patches/patch-ag b/graphics/tiff/patches/patch-ag
deleted file mode 100644
index cc06ccb81d6..00000000000
--- a/graphics/tiff/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.12 2005/01/17 08:04:26 jlam Exp $
-
---- libtiff/Makefile.in.orig	2004-12-20 14:41:54.000000000 -0500
-+++ libtiff/Makefile.in
-@@ -407,7 +407,11 @@ clean-libLTLIBRARIES:
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libtiff.la: $(libtiff_la_OBJECTS) $(libtiff_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libtiff_la_LDFLAGS) $(libtiff_la_OBJECTS) $(libtiff_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libtiff_la_LDFLAGS) $(libtiff_la_OBJECTS) $(libtiff_la_LIBADD) $(LIBS)
-+
-+libtiffcxx_la_OBJECTS = tif_stream.lo
-+libtiffcxx.la: $(libtiffcxx_la_OBJECTS) $(libtiff_la_DEPENDENCIES) 
-+	$(CXXLINK) -rpath $(libdir) $(libtiff_la_LDFLAGS) $(libtiffcxx_la_OBJECTS) libtiff.la $(libtiff_la_LIBADD) $(LIBS)
- 
- clean-noinstPROGRAMS:
- 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
diff --git a/graphics/tiff/patches/patch-ah b/graphics/tiff/patches/patch-ah
deleted file mode 100644
index 489e8f42885..00000000000
--- a/graphics/tiff/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2005/01/17 08:37:31 jlam Exp $
-
---- libtiff/tif_getimage.c.orig	2004-12-20 14:29:27.000000000 -0500
-+++ libtiff/tif_getimage.c
-@@ -247,7 +247,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, T
-     TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &img->samplesperpixel);
-     TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
- 	&extrasamples, &sampleinfo);
--    if (extrasamples > 1)
-+    if (extrasamples >= 1)
-     {
- 	switch (sampleinfo[0]) {
- 	case EXTRASAMPLE_UNSPECIFIED:	/* Workaround for some images without */