7 files changed, 11 insertions, 50 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 399f6adb6f08..dac5f2a1152f 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -8,7 +8,8 @@
 #
 
 PORTNAME=	tiff
-PORTVERSION=	3.9.4
+PORTVERSION=	4.0.0
+DISTVERSION=	4.0.0beta6
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://dl1.maptools.org/dl/libtiff/
@@ -19,6 +20,9 @@ COMMENT=	Tools and library routines for working with TIFF images
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		jbig.1:${PORTSDIR}/graphics/jbigkit
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ARGS+=	--with-jpeg-include-dir=${LOCALBASE}/include \
@@ -36,8 +40,8 @@ PLIST_SUB+=	WITH_X11="@comment "
 MAN1=	bmp2tiff.1 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 \
-	tiffset.1 tiffsplit.1 tiffsv.1 tiffcrop.1
+	tiffcrop.1 tiffdither.1 tiffdump.1 tiffgt.1 tiffinfo.1 tiffmedian.1 \
+	tiffset.1 tiffsplit.1 tiffsv.1
 MAN3=	TIFFClose.3tiff TIFFDataWidth.3tiff TIFFError.3tiff TIFFFlush.3tiff \
 	TIFFGetField.3tiff TIFFOpen.3tiff TIFFPrintDirectory.3tiff \
 	TIFFRGBAImage.3tiff TIFFReadDirectory.3tiff \
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index d6dc23b4e2f6..2a63fda6d1b1 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,3 +1,3 @@
-MD5 (tiff-3.9.4.tar.gz) = 2006c1bdd12644dbf02956955175afd6
-SHA256 (tiff-3.9.4.tar.gz) = 67b76d075fb74f7cb32e7e4b217701674755fe6cee0f463b259a753fce691da6
-SIZE (tiff-3.9.4.tar.gz) = 1436968
+MD5 (tiff-4.0.0beta6.tar.gz) = 6a1e51841a5a5062cc381e34a48122a0
+SHA256 (tiff-4.0.0beta6.tar.gz) = de016175742bcdd0cd6f326dd2e7bbc7154437d7bb09976ad4789016065061e6
+SIZE (tiff-4.0.0beta6.tar.gz) = 1968829
diff --git a/graphics/tiff/files/patch-TIFFClose.3tiff b/graphics/tiff/files/patch-TIFFClose.3tiff
deleted file mode 100644
index e9a36fae58da..000000000000
--- a/graphics/tiff/files/patch-TIFFClose.3tiff
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/TIFFClose.3tiff.orig	2008-08-17 13:03:49.058994404 -0400
-+++ man/TIFFClose.3tiff	2008-08-17 13:03:52.522727821 -0400
-@@ -40,7 +40,7 @@
- current directory (if modified); and all resources are reclaimed.
- .SH DIAGNOSTICS
- All error messages are directed to the
--.bR TIFFError (3TIFF)
-+.BR TIFFError (3TIFF)
- routine.
- Likewise, warning messages are directed to the
- .BR TIFFWarning (3TIFF)
diff --git a/graphics/tiff/files/patch-raw2tiff.1 b/graphics/tiff/files/patch-raw2tiff.1
deleted file mode 100644
index b02ff0d69c1e..000000000000
--- a/graphics/tiff/files/patch-raw2tiff.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/raw2tiff.1.orig	2008-08-17 13:03:49.042994359 -0400
-+++ man/raw2tiff.1	2008-08-17 13:03:52.519034963 -0400
-@@ -184,7 +184,7 @@
- in some cases. But for most ordinary images guessing method will work fine.
- .SH "SEE ALSO"
- .BR pal2rgb (1),
--.bR tiffinfo (1),
-+.BR tiffinfo (1),
- .BR tiffcp (1),
- .BR tiffmedian (1),
- .BR libtiff (3)
diff --git a/graphics/tiff/files/patch-tiffcmp.1 b/graphics/tiff/files/patch-tiffcmp.1
deleted file mode 100644
index df179f116621..000000000000
--- a/graphics/tiff/files/patch-tiffcmp.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/tiffcmp.1.orig	2008-08-17 13:03:49.062994301 -0400
-+++ man/tiffcmp.1	2008-08-17 13:03:52.522727821 -0400
-@@ -77,7 +77,7 @@
- in some exotic cases. 
- .SH "SEE ALSO"
- .BR pal2rgb (1),
--.bR tiffinfo (1),
-+.BR tiffinfo (1),
- .BR tiffcp (1),
- .BR tiffmedian (1),
- .BR libtiff (3TIFF)
diff --git a/graphics/tiff/files/patch-tiffsplit.1 b/graphics/tiff/files/patch-tiffsplit.1
deleted file mode 100644
index 5bb19b84fdb1..000000000000
--- a/graphics/tiff/files/patch-tiffsplit.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/tiffsplit.1.orig	2008-08-17 13:03:49.070994233 -0400
-+++ man/tiffsplit.1	2008-08-17 13:03:52.522727821 -0400
-@@ -50,7 +50,7 @@
- (e.g. 
- .IR xaaa.tif ,
- .IR xaab.tif ,
--\...
-+.IR ... ,
- .IR xzzz.tif ).
- If a prefix is not specified on the command line,
- the default prefix of
diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist
index d87b15cd8b08..91364e62c57e 100644
--- a/graphics/tiff/pkg-plist
+++ b/graphics/tiff/pkg-plist
@@ -164,6 +164,7 @@ lib/libtiffxx.so.4
 %%PORTDOCS%%%%DOCSDIR%%/v3.9.0beta.html
 %%PORTDOCS%%%%DOCSDIR%%/v3.9.1.html
 %%PORTDOCS%%%%DOCSDIR%%/v3.9.2.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0.0.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/man
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%