[pkgsrc/trunk]: pkgsrc/graphics/tiff Update to 3.7.2.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/756ba760e350
branches:  trunk
changeset: 491324:756ba760e350
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Mar 23 01:17:45 2005 +0000

description:
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.

diffstat:

 graphics/tiff/Makefile         |  40 ++-----------------
 graphics/tiff/PLIST            |  83 +++++++++++++++++++++--------------------
 graphics/tiff/distinfo         |  17 ++------
 graphics/tiff/options.mk       |  15 +++++++
 graphics/tiff/patches/patch-aa |   6 +-
 graphics/tiff/patches/patch-ab |  13 ------
 graphics/tiff/patches/patch-ac |  13 ------
 graphics/tiff/patches/patch-ad |  13 ------
 graphics/tiff/patches/patch-ae |  13 ------
 graphics/tiff/patches/patch-af |  12 ------
 graphics/tiff/patches/patch-ag |  17 --------
 graphics/tiff/patches/patch-ah |  13 ------
 12 files changed, 70 insertions(+), 185 deletions(-)

diffs (truncated from 350 to 300 lines):

diff -r ec324413da79 -r 756ba760e350 graphics/tiff/Makefile
--- a/graphics/tiff/Makefile    Wed Mar 23 00:58:26 2005 +0000
+++ b/graphics/tiff/Makefile    Wed Mar 23 01:17:45 2005 +0000
@@ -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 @@
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-rpath
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_GIF) && !empty(USE_GIF:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=  lzw
-.endif
+CONFIGURE_ARGS+=       --enable-cxx
+CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/tiff
 
-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 -r ec324413da79 -r 756ba760e350 graphics/tiff/PLIST
--- a/graphics/tiff/PLIST       Wed Mar 23 00:58:26 2005 +0000
+++ b/graphics/tiff/PLIST       Wed Mar 23 01:17:45 2005 +0000
@@ -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.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/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.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 -r ec324413da79 -r 756ba760e350 graphics/tiff/distinfo
--- a/graphics/tiff/distinfo    Wed Mar 23 00:58:26 2005 +0000
+++ b/graphics/tiff/distinfo    Wed Mar 23 01:17:45 2005 +0000
@@ -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 -r ec324413da79 -r 756ba760e350 graphics/tiff/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/tiff/options.mk  Wed Mar 23 01:17:45 2005 +0000
@@ -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 -r ec324413da79 -r 756ba760e350 graphics/tiff/patches/patch-aa
--- a/graphics/tiff/patches/patch-aa    Wed Mar 23 00:58:26 2005 +0000
+++ b/graphics/tiff/patches/patch-aa    Wed Mar 23 01:17:45 2005 +0000
@@ -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 -r ec324413da79 -r 756ba760e350 graphics/tiff/patches/patch-ab
--- a/graphics/tiff/patches/patch-ab    Wed Mar 23 00:58:26 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r ec324413da79 -r 756ba760e350 graphics/tiff/patches/patch-ac
--- a/graphics/tiff/patches/patch-ac    Wed Mar 23 00:58:26 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r ec324413da79 -r 756ba760e350 graphics/tiff/patches/patch-ad
--- a/graphics/tiff/patches/patch-ad    Wed Mar 23 00:58:26 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r ec324413da79 -r 756ba760e350 graphics/tiff/patches/patch-ae
--- a/graphics/tiff/patches/patch-ae    Wed Mar 23 00:58:26 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r ec324413da79 -r 756ba760e350 graphics/tiff/patches/patch-af
--- a/graphics/tiff/patches/patch-af    Wed Mar 23 00:58:26 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@