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.

12 files changed, 70 insertions, 185 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 2bf05d23ab1..ea91b63aff2 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2005/01/17 08:04:25 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/03/23 01:17:45 wiz Exp $
 
-DISTNAME=	tiff-3.7.1
-PKGREVISION=	3
+DISTNAME=	tiff-3.7.2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://libtiff.maptools.org/dl/
@@ -20,40 +19,11 @@ USE_LIBTOOL=	yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-rpath
+CONFIGURE_ARGS+=	--enable-cxx
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/tiff
 
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_GIF) && !empty(USE_GIF:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	lzw
-.endif
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.tiff
-PKG_SUPPORTED_OPTIONS=	lzw
-.include "../../mk/bsd.options.mk"
-
-###
-### LZW compression support
-###
-.if !empty(PKG_OPTIONS:Mlzw)
-CONFIGURE_ARGS+=	--enable-lzw
-.else
-CONFIGURE_ARGS+=	--disable-lzw
-.endif
+.include "options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-
-# We explicitly build libtiff without C++ support by patching the
-# configure script (patch-af).  We also add a new target into
-# libtiff/Makefile to create a libtiffcxx.la containing the C++
-# functions (patch-ag).
-#
-post-build:
-	cd ${WRKSRC}/libtiff && ${MAKE} libtiffcxx.la
-
-post-install:
-	cd ${WRKSRC}/libtiff && ${INSTALL_DATA} tiffio.hxx ${PREFIX}/include
-	cd ${WRKSRC}/libtiff && ${LIBTOOL} --mode=install		\
-		${INSTALL_LIB} libtiffcxx.la ${PREFIX}/lib
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tiff/PLIST b/graphics/tiff/PLIST
index 1ffb049891d..b28b76e3533 100644
--- a/graphics/tiff/PLIST
+++ b/graphics/tiff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/01/11 05:29:55 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/03/23 01:17:45 wiz Exp $
 bin/bmp2tiff
 bin/fax2ps
 bin/fax2tiff
@@ -27,7 +27,7 @@ include/tiffio.h
 include/tiffio.hxx
 include/tiffvers.h
 lib/libtiff.la
-lib/libtiffcxx.la
+lib/libtiffxx.la
 man/man1/bmp2tiff.1
 man/man1/fax2ps.1
 man/man1/fax2tiff.1
@@ -124,48 +124,48 @@ share/doc/tiff/html/index.html
 share/doc/tiff/html/internals.html
 share/doc/tiff/html/intro.html
 share/doc/tiff/html/libtiff.html
-share/doc/tiff/html/man/TIFFClose.3t.html
-share/doc/tiff/html/man/TIFFDataWidth.3t.html
-share/doc/tiff/html/man/TIFFError.3t.html
-share/doc/tiff/html/man/TIFFFlush.3t.html
-share/doc/tiff/html/man/TIFFGetField.3t.html
-share/doc/tiff/html/man/TIFFOpen.3t.html
-share/doc/tiff/html/man/TIFFPrintDirectory.3t.html
-share/doc/tiff/html/man/TIFFRGBAImage.3t.html
-share/doc/tiff/html/man/TIFFReadDirectory.3t.html
-share/doc/tiff/html/man/TIFFReadEncodedStrip.3t.html
-share/doc/tiff/html/man/TIFFReadEncodedTile.3t.html
-share/doc/tiff/html/man/TIFFReadRGBAImage.3t.html
-share/doc/tiff/html/man/TIFFReadRGBAStrip.3t.html
-share/doc/tiff/html/man/TIFFReadRGBATile.3t.html
-share/doc/tiff/html/man/TIFFReadRawStrip.3t.html
-share/doc/tiff/html/man/TIFFReadRawTile.3t.html
-share/doc/tiff/html/man/TIFFReadScanline.3t.html
-share/doc/tiff/html/man/TIFFReadTile.3t.html
-share/doc/tiff/html/man/TIFFSetDirectory.3t.html
-share/doc/tiff/html/man/TIFFSetField.3t.html
-share/doc/tiff/html/man/TIFFWarning.3t.html
-share/doc/tiff/html/man/TIFFWriteDirectory.3t.html
-share/doc/tiff/html/man/TIFFWriteEncodedStrip.3t.html
-share/doc/tiff/html/man/TIFFWriteEncodedTile.3t.html
-share/doc/tiff/html/man/TIFFWriteRawStrip.3t.html
-share/doc/tiff/html/man/TIFFWriteRawTile.3t.html
-share/doc/tiff/html/man/TIFFWriteScanline.3t.html
-share/doc/tiff/html/man/TIFFWriteTile.3t.html
-share/doc/tiff/html/man/TIFFbuffer.3t.html
-share/doc/tiff/html/man/TIFFcodec.3t.html
-share/doc/tiff/html/man/TIFFcolor.3t.html
-share/doc/tiff/html/man/TIFFmemory.3t.html
-share/doc/tiff/html/man/TIFFquery.3t.html
-share/doc/tiff/html/man/TIFFsize.3t.html
-share/doc/tiff/html/man/TIFFstrip.3t.html
-share/doc/tiff/html/man/TIFFswab.3t.html
-share/doc/tiff/html/man/TIFFtile.3t.html
+share/doc/tiff/html/man/TIFFClose.3tiff.html
+share/doc/tiff/html/man/TIFFDataWidth.3tiff.html
+share/doc/tiff/html/man/TIFFError.3tiff.html
+share/doc/tiff/html/man/TIFFFlush.3tiff.html
+share/doc/tiff/html/man/TIFFGetField.3tiff.html
+share/doc/tiff/html/man/TIFFOpen.3tiff.html
+share/doc/tiff/html/man/TIFFPrintDirectory.3tiff.html
+share/doc/tiff/html/man/TIFFRGBAImage.3tiff.html
+share/doc/tiff/html/man/TIFFReadDirectory.3tiff.html
+share/doc/tiff/html/man/TIFFReadEncodedStrip.3tiff.html
+share/doc/tiff/html/man/TIFFReadEncodedTile.3tiff.html
+share/doc/tiff/html/man/TIFFReadRGBAImage.3tiff.html
+share/doc/tiff/html/man/TIFFReadRGBAStrip.3tiff.html
+share/doc/tiff/html/man/TIFFReadRGBATile.3tiff.html
+share/doc/tiff/html/man/TIFFReadRawStrip.3tiff.html
+share/doc/tiff/html/man/TIFFReadRawTile.3tiff.html
+share/doc/tiff/html/man/TIFFReadScanline.3tiff.html
+share/doc/tiff/html/man/TIFFReadTile.3tiff.html
+share/doc/tiff/html/man/TIFFSetDirectory.3tiff.html
+share/doc/tiff/html/man/TIFFSetField.3tiff.html
+share/doc/tiff/html/man/TIFFWarning.3tiff.html
+share/doc/tiff/html/man/TIFFWriteDirectory.3tiff.html
+share/doc/tiff/html/man/TIFFWriteEncodedStrip.3tiff.html
+share/doc/tiff/html/man/TIFFWriteEncodedTile.3tiff.html
+share/doc/tiff/html/man/TIFFWriteRawStrip.3tiff.html
+share/doc/tiff/html/man/TIFFWriteRawTile.3tiff.html
+share/doc/tiff/html/man/TIFFWriteScanline.3tiff.html
+share/doc/tiff/html/man/TIFFWriteTile.3tiff.html
+share/doc/tiff/html/man/TIFFbuffer.3tiff.html
+share/doc/tiff/html/man/TIFFcodec.3tiff.html
+share/doc/tiff/html/man/TIFFcolor.3tiff.html
+share/doc/tiff/html/man/TIFFmemory.3tiff.html
+share/doc/tiff/html/man/TIFFquery.3tiff.html
+share/doc/tiff/html/man/TIFFsize.3tiff.html
+share/doc/tiff/html/man/TIFFstrip.3tiff.html
+share/doc/tiff/html/man/TIFFswab.3tiff.html
+share/doc/tiff/html/man/TIFFtile.3tiff.html
 share/doc/tiff/html/man/fax2ps.1.html
 share/doc/tiff/html/man/fax2tiff.1.html
 share/doc/tiff/html/man/gif2tiff.1.html
 share/doc/tiff/html/man/index.html
-share/doc/tiff/html/man/libtiff.3t.html
+share/doc/tiff/html/man/libtiff.3tiff.html
 share/doc/tiff/html/man/pal2rgb.1.html
 share/doc/tiff/html/man/ppm2tiff.1.html
 share/doc/tiff/html/man/ras2tiff.1.html
@@ -215,7 +215,8 @@ share/doc/tiff/html/v3.7.0.html
 share/doc/tiff/html/v3.7.0alpha.html
 share/doc/tiff/html/v3.7.0beta.html
 share/doc/tiff/html/v3.7.0beta2.html
-share/doc/tiff/html/v${PKGVERSION}.html
+share/doc/tiff/html/v3.7.1.html
+share/doc/tiff/html/v3.7.2.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 1b70b2aa05a..f76ff37b0fd 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.25 2005/02/24 08:45:13 agc Exp $
+$NetBSD: distinfo,v 1.26 2005/03/23 01:17:45 wiz Exp $
 
-SHA1 (tiff-3.7.1.tar.gz) = 001b03350182869c7f5d46e6b27862b85cb06fc3
-RMD160 (tiff-3.7.1.tar.gz) = 96ac6ade88a799afbd31c851abce527cb69ac937
-Size (tiff-3.7.1.tar.gz) = 1253810 bytes
-SHA1 (patch-aa) = 995c418791f2c8ce3f634dac117949048955b625
-SHA1 (patch-ab) = 1e6a2dd379e388f11c5a7b1959240fd66d29b88a
-SHA1 (patch-ac) = 40e817380c5183cf2e1e5461c05600073dec7348
-SHA1 (patch-ad) = 301e0ce2c121e9082e0ff9c5681c2ea1e0e6dcff
-SHA1 (patch-ae) = bb2e2d3a5be49204356c3c504d3a4bd5ba1fd9b2
-SHA1 (patch-af) = 29adfbcaa317df36a41af791e93159ad795c5e0b
-SHA1 (patch-ag) = 8ec28fcea0690275935b4c20f57a8d6d8b114b86
-SHA1 (patch-ah) = 355c36e637f7e230cb555afb50090b9c9d1bad9c
+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
diff --git a/graphics/tiff/options.mk b/graphics/tiff/options.mk
new file mode 100644
index 00000000000..f56f430744a
--- /dev/null
+++ b/graphics/tiff/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2005/03/23 01:17:45 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.tiff
+PKG_SUPPORTED_OPTIONS=	lzw
+PKG_DEFAULT_OPTIONS=	lzw
+.include "../../mk/bsd.options.mk"
+
+###
+### LZW compression support
+###
+.if !empty(PKG_OPTIONS:Mlzw)
+CONFIGURE_ARGS+=	--enable-lzw
+.else
+CONFIGURE_ARGS+=	--disable-lzw
+.endif
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 */