From 3040cbd70618f5277968a32d98046900e28bd05e Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sat, 27 Dec 2003 05:29:45 +0000
Subject: [PATCH] - Update to 3.6.1

---
 graphics/tiff/Makefile                      | 15 ++++++------
 graphics/tiff/distinfo                      |  2 +-
 graphics/tiff/files/patch-libtiff-tif_dir.c | 27 ---------------------
 graphics/tiff/pkg-plist                     |  1 +
 4 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 graphics/tiff/files/patch-libtiff-tif_dir.c

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 3a976b39a657..909baae6ac4d 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	tiff
-PORTVERSION=	3.6.0
-PORTREVISION=	1
+PORTVERSION=	3.6.1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://libtiff.maptools.org/dl/
@@ -40,10 +39,10 @@ CONFIGURE_ARGS=	--with-ZIP --with-JPEG \
 CONFIGURE_ARGS+=	--with-HTML --with-DIR_HTML=${DOCSDIR}
 .endif
 
-MAN1=	fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 ras2tiff.1 \
-	raw2tiff.1 rgb2ycbcr.1 sgi2tiff.1 thumbnail.1 tiff2bw.1 tiff2ps.1 \
-	tiff2rgba.1 tiffcmp.1 tiffcp.1 tiffdither.1 tiffdump.1 tiffgt.1 \
-	tiffinfo.1 tiffmedian.1 tiffsplit.1 tiffsv.1
+MAN1=	tiff2pdf.1 fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 \
+	ras2tiff.1 raw2tiff.1 rgb2ycbcr.1 sgi2tiff.1 thumbnail.1 tiff2bw.1 \
+	tiff2ps.1 tiff2rgba.1 tiffcmp.1 tiffcp.1 tiffdither.1 tiffdump.1 \
+	tiffgt.1 tiffinfo.1 tiffmedian.1 tiffsplit.1 tiffsv.1
 MAN3=	TIFFClose.3t TIFFDataWidth.3t TIFFError.3t TIFFFlush.3t \
 	TIFFGetField.3t TIFFOpen.3t TIFFPrintDirectory.3t TIFFRGBAImage.3t \
 	TIFFReadDirectory.3t TIFFReadEncodedStrip.3t TIFFReadEncodedTile.3t \
@@ -53,8 +52,8 @@ MAN3=	TIFFClose.3t TIFFDataWidth.3t TIFFError.3t TIFFFlush.3t \
 	TIFFWriteDirectory.3t TIFFWriteEncodedStrip.3t \
 	TIFFWriteEncodedTile.3t TIFFWriteRawStrip.3t TIFFWriteRawTile.3t \
 	TIFFWriteScanline.3t TIFFWriteTile.3t TIFFbuffer.3t TIFFcodec.3t \
-	TIFFmemory.3t TIFFquery.3t TIFFsize.3t TIFFstrip.3t TIFFswab.3t \
-	TIFFtile.3t libtiff.3t
+	TIFFcolor.3t TIFFmemory.3t TIFFquery.3t TIFFsize.3t TIFFstrip.3t \
+	TIFFswab.3t TIFFtile.3t libtiff.3t
 MLINKS=	TIFFError.3t          TIFFSetErrorHandler.3t \
 	TIFFFlush.3t          TIFFFlushData.3t \
 	TIFFGetField.3t       TIFFGetFieldDefaulted.3t \
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 9f41df30b606..c4900770eaa1 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1 +1 @@
-MD5 (tiff-v3.6.0.tar.gz) = ec0ca41f0e5c7cb4aa605fab9ddbaef9
+MD5 (tiff-v3.6.1.tar.gz) = b3f0ee7617593c2703755672fb1bfed3
diff --git a/graphics/tiff/files/patch-libtiff-tif_dir.c b/graphics/tiff/files/patch-libtiff-tif_dir.c
deleted file mode 100644
index 914100d8e2c8..000000000000
--- a/graphics/tiff/files/patch-libtiff-tif_dir.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- libtiff/tif_dir.c.orig	Tue Sep 30 08:13:07 2003
-+++ libtiff/tif_dir.c	Mon Dec  1 15:36:11 2003
-@@ -607,18 +607,18 @@
- 	va_end(ap);
- 	return (status);
- badvalue:
--	TIFFError(module, "%.1000s: Bad value %d for \"%s\"", v,
--		  tif->tif_name, _TIFFFieldWithTag(tif, tag)->field_name);
-+	TIFFError(module, "%.1000s: Bad value %d for \"%s\"",
-+		  tif->tif_name, v, _TIFFFieldWithTag(tif, tag)->field_name);
- 	va_end(ap);
- 	return (0);
- badvalue32:
--	TIFFError(module, "%.1000s: Bad value %ld for \"%s\"", v32,
--		   tif->tif_name, _TIFFFieldWithTag(tif, tag)->field_name);
-+	TIFFError(module, "%.1000s: Bad value %ld for \"%s\"",
-+		   tif->tif_name, v32, _TIFFFieldWithTag(tif, tag)->field_name);
- 	va_end(ap);
- 	return (0);
- badvaluedbl:
--	TIFFError(module, "%.1000s: Bad value %f for \"%s\"", d,
--		  tif->tif_name, _TIFFFieldWithTag(tif, tag)->field_name);
-+	TIFFError(module, "%.1000s: Bad value %f for \"%s\"",
-+		  tif->tif_name, d, _TIFFFieldWithTag(tif, tag)->field_name);
- 	va_end(ap);
- 	return (0);
- }
diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist
index 29d24f79b28e..56209584787b 100644
--- a/graphics/tiff/pkg-plist
+++ b/graphics/tiff/pkg-plist
@@ -8,6 +8,7 @@ bin/raw2tiff
 bin/rgb2ycbcr
 bin/thumbnail
 bin/tiff2bw
+bin/tiff2pdf
 bin/tiff2ps
 bin/tiff2rgba
 bin/tiffcmp