Update to 4.0.7

The following tools are removed from this release: bmp2tiff, gif2tiff,
ras2tiff, rgb2ycbcr and thumbnail.

12 files changed, 20 insertions, 426 deletions

diff --git a/UPDATING b/UPDATING
index 82e7db57a93f..88cff35a69b3 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,7 +5,14 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
-20161116
+20161121:
+  AFFECTS: Users of graphics/tiff
+  AUTHOR: antoine@FreeBSD.org
+
+  The tiff port was updated to 4.0.7.
+  The following tools are removed from this release: bmp2tiff, gif2tiff, ras2tiff, rgb2ycbcr and thumbnail.
+
+20161116:
   AFFECTS: Users of sysutils/bareos-*
   AUTHOR: rand@iteris.com
 
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 045df636bd17..a89100bcc30e 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	tiff
-PORTVERSION=	4.0.6
-PORTREVISION=	2
+PORTVERSION=	4.0.7
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
-		http://download.osgeo.org/libtiff/
+MASTER_SITES=	http://download.osgeo.org/libtiff/
 
 MAINTAINER=	portmgr@FreeBSD.org
 COMMENT=	Tools and library routines for working with TIFF images
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 7fb248cfc435..f6f7ae62f407 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tiff-4.0.6.tar.gz) = 4d57a50907b510e3049a4bba0d7888930fdfc16ce49f1bf693e5b6247370d68c
-SIZE (tiff-4.0.6.tar.gz) = 2192991
+TIMESTAMP = 1479629608
+SHA256 (tiff-4.0.7.tar.gz) = 9f43a2cfb9589e5cecaa66e16bf87f814c945f22df7ba600d63aac4632c4f019
+SIZE (tiff-4.0.7.tar.gz) = 2076392
diff --git a/graphics/tiff/files/patch-CVE-2015-8665_8683 b/graphics/tiff/files/patch-CVE-2015-8665_8683
deleted file mode 100644
index e6b7de809f96..000000000000
--- a/graphics/tiff/files/patch-CVE-2015-8665_8683
+++ /dev/null
@@ -1,118 +0,0 @@
-revision 1.94
-date: 2015-12-26 17:32:03 +0000;  author: erouault;  state: Exp;  lines: +23 -14;  commitid: ohB9uRxvIWq9YtOy;
-* libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage
-interface in case of unsupported values of SamplesPerPixel/ExtraSamples
-for LogLUV / CIELab. Add explicit call to TIFFRGBAImageOK() in
-TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by limingxing and
-CVE-2015-8683 reported by zzf of Alibaba.
-
-Index: libtiff/tif_getimage.c
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_getimage.c,v
-retrieving revision 1.93
-retrieving revision 1.94
-diff -u -r1.93 -r1.94
---- libtiff/tif_getimage.c	22 Nov 2015 15:31:03 -0000	1.93
-+++ libtiff/tif_getimage.c	26 Dec 2015 17:32:03 -0000	1.94
-@@ -1,4 +1,4 @@
--/* $Id: tif_getimage.c,v 1.93 2015-11-22 15:31:03 erouault Exp $ */
-+/* $Id: tif_getimage.c,v 1.94 2015-12-26 17:32:03 erouault Exp $ */
- 
- /*
-  * Copyright (c) 1991-1997 Sam Leffler
-@@ -182,20 +182,22 @@
- 				    "Planarconfiguration", td->td_planarconfig);
- 				return (0);
- 			}
--			if( td->td_samplesperpixel != 3 )
-+			if( td->td_samplesperpixel != 3 || colorchannels != 3 )
-             {
-                 sprintf(emsg,
--                        "Sorry, can not handle image with %s=%d",
--                        "Samples/pixel", td->td_samplesperpixel);
-+                        "Sorry, can not handle image with %s=%d, %s=%d",
-+                        "Samples/pixel", td->td_samplesperpixel,
-+                        "colorchannels", colorchannels);
-                 return 0;
-             }
- 			break;
- 		case PHOTOMETRIC_CIELAB:
--            if( td->td_samplesperpixel != 3 || td->td_bitspersample != 8 )
-+            if( td->td_samplesperpixel != 3 || colorchannels != 3 || td->td_bitspersample != 8 )
-             {
-                 sprintf(emsg,
--                        "Sorry, can not handle image with %s=%d and %s=%d",
-+                        "Sorry, can not handle image with %s=%d, %s=%d and %s=%d",
-                         "Samples/pixel", td->td_samplesperpixel,
-+                        "colorchannels", colorchannels,
-                         "Bits/sample", td->td_bitspersample);
-                 return 0;
-             }
-@@ -255,6 +257,9 @@
- 	int colorchannels;
- 	uint16 *red_orig, *green_orig, *blue_orig;
- 	int n_color;
-+	
-+	if( !TIFFRGBAImageOK(tif, emsg) )
-+		return 0;
- 
- 	/* Initialize to normal values */
- 	img->row_offset = 0;
-@@ -2509,29 +2514,33 @@
- 		case PHOTOMETRIC_RGB:
- 			switch (img->bitspersample) {
- 				case 8:
--					if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
-+					if (img->alpha == EXTRASAMPLE_ASSOCALPHA &&
-+						img->samplesperpixel >= 4)
- 						img->put.contig = putRGBAAcontig8bittile;
--					else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
-+					else if (img->alpha == EXTRASAMPLE_UNASSALPHA &&
-+							 img->samplesperpixel >= 4)
- 					{
- 						if (BuildMapUaToAa(img))
- 							img->put.contig = putRGBUAcontig8bittile;
- 					}
--					else
-+					else if( img->samplesperpixel >= 3 )
- 						img->put.contig = putRGBcontig8bittile;
- 					break;
- 				case 16:
--					if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
-+					if (img->alpha == EXTRASAMPLE_ASSOCALPHA &&
-+						img->samplesperpixel >=4 )
- 					{
- 						if (BuildMapBitdepth16To8(img))
- 							img->put.contig = putRGBAAcontig16bittile;
- 					}
--					else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
-+					else if (img->alpha == EXTRASAMPLE_UNASSALPHA &&
-+							 img->samplesperpixel >=4 )
- 					{
- 						if (BuildMapBitdepth16To8(img) &&
- 						    BuildMapUaToAa(img))
- 							img->put.contig = putRGBUAcontig16bittile;
- 					}
--					else
-+					else if( img->samplesperpixel >=3 )
- 					{
- 						if (BuildMapBitdepth16To8(img))
- 							img->put.contig = putRGBcontig16bittile;
-@@ -2540,7 +2549,7 @@
- 			}
- 			break;
- 		case PHOTOMETRIC_SEPARATED:
--			if (buildMap(img)) {
-+			if (img->samplesperpixel >=4 && buildMap(img)) {
- 				if (img->bitspersample == 8) {
- 					if (!img->Map)
- 						img->put.contig = putRGBcontig8bitCMYKtile;
-@@ -2636,7 +2645,7 @@
- 			}
- 			break;
- 		case PHOTOMETRIC_CIELAB:
--			if (buildMap(img)) {
-+			if (img->samplesperpixel == 3 && buildMap(img)) {
- 				if (img->bitspersample == 8)
- 					img->put.contig = initCIELabConversion(img);
- 				break;
diff --git a/graphics/tiff/files/patch-Makefile.in b/graphics/tiff/files/patch-Makefile.in
index 8da105dfde58..3f2f7de6e5fa 100644
--- a/graphics/tiff/files/patch-Makefile.in
+++ b/graphics/tiff/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2015-09-12 19:48:44 UTC
+--- Makefile.in.orig	2016-11-19 17:40:20 UTC
 +++ Makefile.in
-@@ -494,19 +494,6 @@ distclean-libtool:
+@@ -495,19 +495,6 @@ distclean-libtool:
  	-rm -f libtool config.lt
  install-dist_docDATA: $(dist_doc_DATA)
  	@$(NORMAL_INSTALL)
diff --git a/graphics/tiff/files/patch-libtiff_tif__luv.c b/graphics/tiff/files/patch-libtiff_tif__luv.c
deleted file mode 100644
index 47327c815f2d..000000000000
--- a/graphics/tiff/files/patch-libtiff_tif__luv.c
+++ /dev/null
@@ -1,176 +0,0 @@
-revision 1.41
-date: 2015-12-27 16:25:11 +0000;  author: erouault;  state: Exp;  lines: +45 -12;  commitid: gXczlJDfVlBdzBOy;
-* libtiff/tif_luv.c: fix potential out-of-bound writes in decode
-functions in non debug builds by replacing assert()s by regular if
-checks (bugzilla #2522).
-Fix potential out-of-bound reads in case of short input data.
-
-Index: libtiff/tif_luv.c
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_luv.c,v
-retrieving revision 1.40
-retrieving revision 1.41
-diff -u -r1.40 -r1.41
---- libtiff/tif_luv.c	21 Jun 2015 01:09:09 -0000	1.40
-+++ libtiff/tif_luv.c	27 Dec 2015 16:25:11 -0000	1.41
-@@ -1,4 +1,4 @@
--/* $Id: tif_luv.c,v 1.40 2015-06-21 01:09:09 bfriesen Exp $ */
-+/* $Id: tif_luv.c,v 1.41 2015-12-27 16:25:11 erouault Exp $ */
- 
- /*
-  * Copyright (c) 1997 Greg Ward Larson
-@@ -202,7 +202,11 @@
- 	if (sp->user_datafmt == SGILOGDATAFMT_16BIT)
- 		tp = (int16*) op;
- 	else {
--		assert(sp->tbuflen >= npixels);
-+		if(sp->tbuflen < npixels) {
-+			TIFFErrorExt(tif->tif_clientdata, module,
-+						 "Translation buffer too short");
-+			return (0);
-+		}
- 		tp = (int16*) sp->tbuf;
- 	}
- 	_TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0]));
-@@ -211,9 +215,11 @@
- 	cc = tif->tif_rawcc;
- 	/* get each byte string */
- 	for (shft = 2*8; (shft -= 8) >= 0; ) {
--		for (i = 0; i < npixels && cc > 0; )
-+		for (i = 0; i < npixels && cc > 0; ) {
- 			if (*bp >= 128) {		/* run */
--				rc = *bp++ + (2-128);   /* TODO: potential input buffer overrun when decoding corrupt or truncated data */
-+				if( cc < 2 )
-+					break;
-+				rc = *bp++ + (2-128);
- 				b = (int16)(*bp++ << shft);
- 				cc -= 2;
- 				while (rc-- && i < npixels)
-@@ -223,6 +229,7 @@
- 				while (--cc && rc-- && i < npixels)
- 					tp[i++] |= (int16)*bp++ << shft;
- 			}
-+		}
- 		if (i != npixels) {
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- 			TIFFErrorExt(tif->tif_clientdata, module,
-@@ -268,13 +275,17 @@
- 	if (sp->user_datafmt == SGILOGDATAFMT_RAW)
- 		tp = (uint32 *)op;
- 	else {
--		assert(sp->tbuflen >= npixels);
-+		if(sp->tbuflen < npixels) {
-+			TIFFErrorExt(tif->tif_clientdata, module,
-+						 "Translation buffer too short");
-+			return (0);
-+		}
- 		tp = (uint32 *) sp->tbuf;
- 	}
- 	/* copy to array of uint32 */
- 	bp = (unsigned char*) tif->tif_rawcp;
- 	cc = tif->tif_rawcc;
--	for (i = 0; i < npixels && cc > 0; i++) {
-+	for (i = 0; i < npixels && cc >= 3; i++) {
- 		tp[i] = bp[0] << 16 | bp[1] << 8 | bp[2];
- 		bp += 3;
- 		cc -= 3;
-@@ -325,7 +336,11 @@
- 	if (sp->user_datafmt == SGILOGDATAFMT_RAW)
- 		tp = (uint32*) op;
- 	else {
--		assert(sp->tbuflen >= npixels);
-+		if(sp->tbuflen < npixels) {
-+			TIFFErrorExt(tif->tif_clientdata, module,
-+						 "Translation buffer too short");
-+			return (0);
-+		}
- 		tp = (uint32*) sp->tbuf;
- 	}
- 	_TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0]));
-@@ -334,11 +349,13 @@
- 	cc = tif->tif_rawcc;
- 	/* get each byte string */
- 	for (shft = 4*8; (shft -= 8) >= 0; ) {
--		for (i = 0; i < npixels && cc > 0; )
-+		for (i = 0; i < npixels && cc > 0; ) {
- 			if (*bp >= 128) {		/* run */
-+				if( cc < 2 )
-+					break;
- 				rc = *bp++ + (2-128);
- 				b = (uint32)*bp++ << shft;
--				cc -= 2;                /* TODO: potential input buffer overrun when decoding corrupt or truncated data */
-+				cc -= 2;
- 				while (rc-- && i < npixels)
- 					tp[i++] |= b;
- 			} else {			/* non-run */
-@@ -346,6 +363,7 @@
- 				while (--cc && rc-- && i < npixels)
- 					tp[i++] |= (uint32)*bp++ << shft;
- 			}
-+		}
- 		if (i != npixels) {
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- 			TIFFErrorExt(tif->tif_clientdata, module,
-@@ -413,6 +431,7 @@
- static int
- LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
- {
-+	static const char module[] = "LogL16Encode";
- 	LogLuvState* sp = EncoderState(tif);
- 	int shft;
- 	tmsize_t i;
-@@ -433,7 +452,11 @@
- 		tp = (int16*) bp;
- 	else {
- 		tp = (int16*) sp->tbuf;
--		assert(sp->tbuflen >= npixels);
-+		if(sp->tbuflen < npixels) {
-+			TIFFErrorExt(tif->tif_clientdata, module,
-+						 "Translation buffer too short");
-+			return (0);
-+		}
- 		(*sp->tfunc)(sp, bp, npixels);
- 	}
- 	/* compress each byte string */
-@@ -506,6 +529,7 @@
- static int
- LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
- {
-+	static const char module[] = "LogLuvEncode24";
- 	LogLuvState* sp = EncoderState(tif);
- 	tmsize_t i;
- 	tmsize_t npixels;
-@@ -521,7 +545,11 @@
- 		tp = (uint32*) bp;
- 	else {
- 		tp = (uint32*) sp->tbuf;
--		assert(sp->tbuflen >= npixels);
-+		if(sp->tbuflen < npixels) {
-+			TIFFErrorExt(tif->tif_clientdata, module,
-+						 "Translation buffer too short");
-+			return (0);
-+		}
- 		(*sp->tfunc)(sp, bp, npixels);
- 	}
- 	/* write out encoded pixels */
-@@ -553,6 +581,7 @@
- static int
- LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
- {
-+	static const char module[] = "LogLuvEncode32";
- 	LogLuvState* sp = EncoderState(tif);
- 	int shft;
- 	tmsize_t i;
-@@ -574,7 +603,11 @@
- 		tp = (uint32*) bp;
- 	else {
- 		tp = (uint32*) sp->tbuf;
--		assert(sp->tbuflen >= npixels);
-+		if(sp->tbuflen < npixels) {
-+			TIFFErrorExt(tif->tif_clientdata, module,
-+						 "Translation buffer too short");
-+			return (0);
-+		}
- 		(*sp->tfunc)(sp, bp, npixels);
- 	}
- 	/* compress each byte string */
diff --git a/graphics/tiff/files/patch-libtiff_tif__next.c b/graphics/tiff/files/patch-libtiff_tif__next.c
deleted file mode 100644
index de0f4287b79b..000000000000
--- a/graphics/tiff/files/patch-libtiff_tif__next.c
+++ /dev/null
@@ -1,54 +0,0 @@
-revision 1.17
-date: 2015-12-27 16:55:20 +0000;  author: erouault;  state: Exp;  lines: +9 -3;  commitid: 4yLOaM0uFVPyJBOy;
-* libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode()
-triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
-(bugzilla #2508)
-
-Index: libtiff/tif_next.c
-===================================================================
-RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_next.c,v
-retrieving revision 1.16
-retrieving revision 1.17
-diff -u -r1.16 -r1.17
---- libtiff/tif_next.c	29 Dec 2014 12:09:11 -0000	1.16
-+++ libtiff/tif_next.c	27 Dec 2015 16:55:20 -0000	1.17
-@@ -1,4 +1,4 @@
--/* $Id: tif_next.c,v 1.16 2014-12-29 12:09:11 erouault Exp $ */
-+/* $Id: tif_next.c,v 1.17 2015-12-27 16:55:20 erouault Exp $ */
- 
- /*
-  * Copyright (c) 1988-1997 Sam Leffler
-@@ -37,7 +37,7 @@
- 	case 0:	op[0]  = (unsigned char) ((v) << 6); break;	\
- 	case 1:	op[0] |= (v) << 4; break;	\
- 	case 2:	op[0] |= (v) << 2; break;	\
--	case 3:	*op++ |= (v);	   break;	\
-+	case 3:	*op++ |= (v);	   op_offset++; break;	\
- 	}					\
- }
- 
-@@ -106,6 +106,7 @@
- 			uint32 imagewidth = tif->tif_dir.td_imagewidth;
-             if( isTiled(tif) )
-                 imagewidth = tif->tif_dir.td_tilewidth;
-+            tmsize_t op_offset = 0;
- 
- 			/*
- 			 * The scanline is composed of a sequence of constant
-@@ -122,10 +123,15 @@
- 				 * bounds, potentially resulting in a security
- 				 * issue.
- 				 */
--				while (n-- > 0 && npixels < imagewidth)
-+				while (n-- > 0 && npixels < imagewidth && op_offset < scanline)
- 					SETPIXEL(op, grey);
- 				if (npixels >= imagewidth)
- 					break;
-+                if (op_offset >= scanline ) {
-+                    TIFFErrorExt(tif->tif_clientdata, module, "Invalid data for scanline %ld",
-+                        (long) tif->tif_row);
-+                    return (0);
-+                }
- 				if (cc == 0)
- 					goto bad;
- 				n = *bp++, cc--;
diff --git a/graphics/tiff/files/patch-libtiff_tif__pixarlog.c b/graphics/tiff/files/patch-libtiff_tif__pixarlog.c
deleted file mode 100644
index 4976524bba73..000000000000
--- a/graphics/tiff/files/patch-libtiff_tif__pixarlog.c
+++ /dev/null
@@ -1,34 +0,0 @@
-CVE-2016-5875(, dup?)
-https://marc.info/?l=oss-security&m=146720235906569&w=2
-
---- libtiff/tif_pixarlog.c.orig	Sat Aug 29 00:16:22 2015
-+++ libtiff/tif_pixarlog.c	Fri Jul  1 13:04:52 2016
-@@ -457,6 +457,7 @@ horizontalAccumulate8abgr(uint16 *wp, int n, int strid
- typedef	struct {
- 	TIFFPredictorState	predict;
- 	z_stream		stream;
-+	tmsize_t		tbuf_size; /* only set/used on reading for now */
- 	uint16			*tbuf; 
- 	uint16			stride;
- 	int			state;
-@@ -692,6 +693,7 @@ PixarLogSetupDecode(TIFF* tif)
- 	sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size);
- 	if (sp->tbuf == NULL)
- 		return (0);
-+	sp->tbuf_size = tbuf_size;
- 	if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
- 		sp->user_datafmt = PixarLogGuessDataFmt(td);
- 	if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {
-@@ -779,6 +781,12 @@ PixarLogDecode(TIFF* tif, uint8* op, tmsize_t occ, uin
- 	if (sp->stream.avail_out != nsamples * sizeof(uint16))
- 	{
- 		TIFFErrorExt(tif->tif_clientdata, module, "ZLib cannot deal with buffers this size");
-+		return (0);
-+	}
-+	/* Check that we will not fill more than what was allocated */
-+	if (sp->stream.avail_out > sp->tbuf_size)
-+	{
-+		TIFFErrorExt(tif->tif_clientdata, module, "sp->stream.avail_out > sp->tbuf_size");
- 		return (0);
- 	}
- 	do {
diff --git a/graphics/tiff/files/patch-tiffcrop.1 b/graphics/tiff/files/patch-tiffcrop.1
index 12ff4a1f5e70..0ed172a8ab8b 100644
--- a/graphics/tiff/files/patch-tiffcrop.1
+++ b/graphics/tiff/files/patch-tiffcrop.1
@@ -1,4 +1,4 @@
---- man/tiffcrop.1.orig	2010-12-14 01:45:44 UTC
+--- man/tiffcrop.1.orig	2016-09-25 20:05:52 UTC
 +++ man/tiffcrop.1
 @@ -496,7 +496,6 @@ the portrait or landscape option. The pa
  the image. It breaks each original image into a series of smaller images
diff --git a/graphics/tiff/files/patch-tools_gif2tiff.c b/graphics/tiff/files/patch-tools_gif2tiff.c
deleted file mode 100644
index cba2d90e21c2..000000000000
--- a/graphics/tiff/files/patch-tools_gif2tiff.c
+++ /dev/null
@@ -1,14 +0,0 @@
-CVE-2016-3186, patch from:
-https://bugzilla.redhat.com/show_bug.cgi?id=1319666
-
---- tools/gif2tiff.c.orig	Fri Jul  1 13:11:43 2016
-+++ tools/gif2tiff.c	Fri Jul  1 13:12:07 2016
-@@ -349,7 +349,7 @@ readextension(void)
-     int status = 1;
- 
-     (void) getc(infile);
--    while ((count = getc(infile)) && count <= 255)
-+    while ((count = getc(infile)) && count >= 0 && count <= 255)
-         if (fread(buf, 1, count, infile) != (size_t) count) {
-             fprintf(stderr, "short read from file %s (%s)\n",
-                     filename, strerror(errno));
diff --git a/graphics/tiff/pkg-descr b/graphics/tiff/pkg-descr
index 309ceb08dbe2..c6cba9bdb9b5 100644
--- a/graphics/tiff/pkg-descr
+++ b/graphics/tiff/pkg-descr
@@ -14,6 +14,4 @@ for some of the more esoteric portions of the 6.0 TIFF spec.
 Unless NOPORTDOCS is defined, the html documentations is also
 installed locally in /usr/local/share/doc/tiff.
 
-LICENSE: Permission to use, copy, modify, distribute, and sell for any purpose
-
-WWW: http://www.remotesensing.org/libtiff/
+WWW: http://www.simplesystems.org/libtiff/
diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist
index bb710a528a47..66e4d8b2dabf 100644
--- a/graphics/tiff/pkg-plist
+++ b/graphics/tiff/pkg-plist
@@ -1,13 +1,8 @@
-bin/bmp2tiff
 bin/fax2ps
 bin/fax2tiff
-bin/gif2tiff
 bin/pal2rgb
 bin/ppm2tiff
-bin/ras2tiff
 bin/raw2tiff
-bin/rgb2ycbcr
-bin/thumbnail
 bin/tiff2bw
 bin/tiff2pdf
 bin/tiff2ps
@@ -30,22 +25,18 @@ lib/libtiff.a
 lib/libtiff.so
 lib/libtiff.so.4
 lib/libtiff.so.5
-lib/libtiff.so.5.2.4
+lib/libtiff.so.5.2.5
 lib/libtiffxx.a
 lib/libtiffxx.so
 lib/libtiffxx.so.5
-lib/libtiffxx.so.5.2.4
+lib/libtiffxx.so.5.2.5
 libdata/pkgconfig/libtiff-4.pc
-man/man1/bmp2tiff.1.gz
 man/man1/fax2ps.1.gz
 man/man1/fax2tiff.1.gz
-man/man1/gif2tiff.1.gz
 man/man1/pal2rgb.1.gz
 man/man1/ppm2tiff.1.gz
-man/man1/ras2tiff.1.gz
 man/man1/raw2tiff.1.gz
 man/man1/rgb2ycbcr.1.gz
-man/man1/sgi2tiff.1.gz
 man/man1/thumbnail.1.gz
 man/man1/tiff2bw.1.gz
 man/man1/tiff2pdf.1.gz
@@ -60,7 +51,6 @@ man/man1/tiffinfo.1.gz
 man/man1/tiffmedian.1.gz
 man/man1/tiffset.1.gz
 man/man1/tiffsplit.1.gz
-man/man1/tiffsv.1.gz
 man/man3/TIFFCheckTile.3tiff.gz
 man/man3/TIFFClientOpen.3tiff.gz
 man/man3/TIFFClose.3tiff.gz
@@ -232,18 +222,14 @@ man/man3/libtiff.3tiff.gz
 %%PORTDOCS%%%%DOCSDIR%%/man/TIFFstrip.3tiff.html
 %%PORTDOCS%%%%DOCSDIR%%/man/TIFFswab.3tiff.html
 %%PORTDOCS%%%%DOCSDIR%%/man/TIFFtile.3tiff.html
-%%PORTDOCS%%%%DOCSDIR%%/man/bmp2tiff.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/fax2ps.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/fax2tiff.1.html
-%%PORTDOCS%%%%DOCSDIR%%/man/gif2tiff.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/index.html
 %%PORTDOCS%%%%DOCSDIR%%/man/libtiff.3tiff.html
 %%PORTDOCS%%%%DOCSDIR%%/man/pal2rgb.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/ppm2tiff.1.html
-%%PORTDOCS%%%%DOCSDIR%%/man/ras2tiff.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/raw2tiff.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/rgb2ycbcr.1.html
-%%PORTDOCS%%%%DOCSDIR%%/man/sgi2tiff.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/thumbnail.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/tiff2bw.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/tiff2pdf.1.html
@@ -259,7 +245,6 @@ man/man3/libtiff.3tiff.gz
 %%PORTDOCS%%%%DOCSDIR%%/man/tiffmedian.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/tiffset.1.html
 %%PORTDOCS%%%%DOCSDIR%%/man/tiffsplit.1.html
-%%PORTDOCS%%%%DOCSDIR%%/man/tiffsv.1.html
 %%PORTDOCS%%%%DOCSDIR%%/misc.html
 %%PORTDOCS%%%%DOCSDIR%%/support.html
 %%PORTDOCS%%%%DOCSDIR%%/tools.html
@@ -306,3 +291,4 @@ man/man3/libtiff.3tiff.gz
 %%PORTDOCS%%%%DOCSDIR%%/v4.0.4beta.html
 %%PORTDOCS%%%%DOCSDIR%%/v4.0.5.html
 %%PORTDOCS%%%%DOCSDIR%%/v4.0.6.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0.7.html