- Update to 3.6.0

PR:		57805
Submitted by:	tkato@prontomail.com

9 files changed, 102 insertions, 128 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 5a88450ee7b9..146aee604314 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -8,11 +8,10 @@
 #
 
 PORTNAME=	tiff
-PORTVERSION=	3.5.7
-PORTREVISION=	1
+PORTVERSION=	3.6.0
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
-		http://www.libtiff.org/
+		http://libtiff.maptools.org/dl/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -41,29 +40,32 @@ CONFIGURE_ARGS+=	--with-HTML --with-DIR_HTML=${DOCSDIR}
 .endif
 
 MAN1=	fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 ras2tiff.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 TIFFError.3t TIFFFlush.3t TIFFGetField.3t TIFFOpen.3t \
-	TIFFPrintDirectory.3t TIFFRGBAImage.3t TIFFReadDirectory.3t \
-	TIFFReadEncodedStrip.3t TIFFReadEncodedTile.3t TIFFReadRGBAImage.3t \
-	TIFFReadRGBAStrip.3t TIFFReadRGBATile.3t TIFFReadRawStrip.3t \
-	TIFFReadRawTile.3t TIFFReadScanline.3t TIFFReadTile.3t \
-	TIFFSetDirectory.3t TIFFSetField.3t TIFFWarning.3t \
+	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 \
+	TIFFReadRGBAImage.3t TIFFReadRGBAStrip.3t TIFFReadRGBATile.3t \
+	TIFFReadRawStrip.3t TIFFReadRawTile.3t TIFFReadScanline.3t \
+	TIFFReadTile.3t TIFFSetDirectory.3t TIFFSetField.3t TIFFWarning.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 
+	TIFFtile.3t libtiff.3t
 MLINKS=	TIFFError.3t          TIFFSetErrorHandler.3t \
 	TIFFFlush.3t          TIFFFlushData.3t \
+	TIFFGetField.3t       TIFFGetFieldDefaulted.3t \
 	TIFFGetField.3t       TIFFVGetField.3t \
+	TIFFGetField.3t       TIFFVGetFieldDefaulted.3t \
 	TIFFOpen.3t           TIFFFdOpen.3t \
 	TIFFOpen.3t           TIFFClientOpen.3t \
 	TIFFRGBAImage.3t      TIFFRGBAImageOK.3t \
 	TIFFRGBAImage.3t      TIFFRGBAImageBegin.3t \
 	TIFFRGBAImage.3t      TIFFRGBAImageGet.3t \
 	TIFFRGBAImage.3t      TIFFRGBAImageEnd.3t \
+	TIFFRGBAImage.3t      TIFFReadRGBAImageOriented.3t \
 	TIFFSetDirectory.3t   TIFFSetSubDirectory.3t \
 	TIFFSetField.3t       TIFFVSetField.3t \
 	TIFFWarning.3t        TIFFSetWarningHandler.3t \
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 59a2ec4de3aa..9f41df30b606 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1 +1 @@
-MD5 (tiff-v3.5.7.tar.gz) = 82243b5ae9b7c9e492aeebc501680990
+MD5 (tiff-v3.6.0.tar.gz) = ec0ca41f0e5c7cb4aa605fab9ddbaef9
diff --git a/graphics/tiff/files/patch-aa b/graphics/tiff/files/patch-aa
index 2c128a149c29..32a006c433c0 100644
--- a/graphics/tiff/files/patch-aa
+++ b/graphics/tiff/files/patch-aa
@@ -1,6 +1,6 @@
---- libtiff/Makefile.in.orig	Mon Sep 10 00:56:04 2001
-+++ libtiff/Makefile.in	Sat Dec 15 00:00:00 2001
-@@ -220,8 +220,8 @@
+--- libtiff/Makefile.in.orig	Wed Aug 20 19:42:17 2003
++++ libtiff/Makefile.in	Wed Oct  8 00:16:03 2003
+@@ -223,8 +223,8 @@
  	  @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@; \
  	fi
  	touch $@
@@ -11,7 +11,7 @@
  	@rm -f libtiff_pic.a
  	@${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q`
  	${RANLIB} libtiff_pic.a
-@@ -239,6 +239,14 @@
+@@ -242,6 +242,14 @@
  # OSF/1 3.2 shared lib rule
  OSFdso: ${OBJS}
  	${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm
@@ -26,7 +26,7 @@
  
  OPENBSDdso: ${OBJS}
  	${CC} -shared @LIBCOPTS@ -o libtiff.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ -lm
-@@ -358,18 +366,15 @@
+@@ -374,18 +382,15 @@
  	${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_INC@
  	for i in ${INCS_PRIVATE}; do					\
  	    f=`basename $$i`;						\
@@ -37,8 +37,8 @@
  
  installDSO: @DSO@dso
  	if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then			\
--	    ${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@	\
--		-O libtiff.@DSOSUF_VERSION@;				\
+-	    ${INSTALL} -idb tiff.sw.tools.nostrip -m 555		\
+-		-F ${DESTDIR}@DIR_LIB@ -O libtiff.@DSOSUF_VERSION@;	\
 +	    ${BSD_INSTALL_DATA} libtiff.@DSOSUF_VERSION@		\
 +		${DESTDIR}@DIR_LIB@;					\
  	    ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@	\
@@ -46,9 +46,9 @@
 -	    ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@	\
 -		-lns libtiff.@DSOSUF@ -O libtiff.so;			\
  	else								\
- 	    ${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@	\
- 		-O libtiff.@DSOSUF@;					\
-@@ -377,7 +382,7 @@
+ 	    ${INSTALL} -idb tiff.sw.tools.nostrip -m 555		\
+ 		-F ${DESTDIR}@DIR_LIB@ -O libtiff.@DSOSUF@;		\
+@@ -393,7 +398,7 @@
  
  install: all installHdrs
  	${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_LIB@
diff --git a/graphics/tiff/files/patch-ac b/graphics/tiff/files/patch-ac
index 0ffdddd4334c..dc917ad17a1d 100644
--- a/graphics/tiff/files/patch-ac
+++ b/graphics/tiff/files/patch-ac
@@ -1,10 +1,10 @@
---- tools/Makefile.in.orig	Tue Jul 17 22:13:37 2001
-+++ tools/Makefile.in	Sat Dec 15 00:00:00 2001
-@@ -113,8 +113,7 @@
+--- tools/Makefile.in.orig	Mon Aug 12 00:01:46 2002
++++ tools/Makefile.in	Wed Oct  8 00:19:39 2003
+@@ -115,8 +115,7 @@
  install: all
- 	${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 		\
+ 	${INSTALL} -idb tiff.sw.tools -m 755 				\
  		-dir ${DESTDIR}@DIR_BIN@
--	${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 		\
+-	${INSTALL} -idb tiff.sw.tools -m 755 				\
 -		-F ${DESTDIR}@DIR_BIN@ -O ${TARGETS}
 +	${BSD_INSTALL_PROGRAM} ${TARGETS} ${DESTDIR}@DIR_BIN@
  	@if [ "@LIBIMAGE@" = yes ]; then 				\
diff --git a/graphics/tiff/files/patch-ad b/graphics/tiff/files/patch-ad
index 69b7371f53b8..a6008bf5a0db 100644
--- a/graphics/tiff/files/patch-ad
+++ b/graphics/tiff/files/patch-ad
@@ -1,26 +1,26 @@
---- man/Makefile.in.orig	Thu Sep 27 02:32:24 2001
-+++ man/Makefile.in	Sat Dec 15 00:00:00 2001
-@@ -343,9 +343,8 @@
+--- man/Makefile.in.orig	Sat Oct  4 20:43:16 2003
++++ man/Makefile.in	Wed Oct  8 00:22:56 2003
+@@ -354,9 +354,8 @@
  	 ${ECHO} 'install:';						\
  	 for i in *.1; do						\
  	    f=${MANAPPNAME};						\
 -	    ${ECHO} '	cd ..; ${INSTALL} -m 444 			\
--		-F ${DESTDIR}${MAN}/${MANAPPS}				\
+-		-F $${DESTDIR}${MAN}/${MANAPPS}				\
 -		-idb tiff.man.tools -src' apps/"$$i" '-O' "$$f";	\
 +	    ${ECHO} '	${BSD_INSTALL_MAN}'	 			\
-+		$$i ${DESTDIR}${MAN}/${MANAPPS}/$$f;			\
++		$$i $${DESTDIR}${MAN}/${MANAPPS}/$$f;			\
  	 done								\
  	)>apps/Makefile
  lib/Makefile:
-@@ -356,9 +355,8 @@
+@@ -367,9 +366,8 @@
  	 ${ECHO} 'install:';						\
  	 for i in *.3t; do						\
  	    f=${MANLIBNAME};						\
 -	    ${ECHO} '	cd ..; ${INSTALL} -m 444 			\
--		-F ${DESTDIR}${MAN}/${MANLIB}				\
+-		-F $${DESTDIR}${MAN}/${MANLIB}				\
 -		-idb tiff.man.dev -src' lib/"$$i" '-O' "$$f";		\
 +	    ${ECHO} '	${BSD_INSTALL_MAN}'	 			\
-+		$$i ${DESTDIR}${MAN}/${MANLIB}/$$f;			\
++		$$i $${DESTDIR}${MAN}/${MANLIB}/$$f;			\
  	 done								\
  	)>lib/Makefile
  
diff --git a/graphics/tiff/files/patch-ae b/graphics/tiff/files/patch-ae
index 58c73a00223f..82a948e005c1 100644
--- a/graphics/tiff/files/patch-ae
+++ b/graphics/tiff/files/patch-ae
@@ -1,27 +1,16 @@
---- html/Makefile.in.orig	Tue Jul 17 22:13:37 2001
-+++ html/Makefile.in	Sat Dec 15 00:00:00 2001
-@@ -77,8 +77,7 @@
- 	v3.5.1.html		\
- 	v3.5.2.html		\
- 	v3.5.3.html		\
--	v3.5.4.html		\
--	v3.5.5.html		\
-+	v3.5.7.html		\
- 	${NULL}
- IMAGES=\
- 	images/back.gif		\
-@@ -86,6 +85,8 @@
- 	images/cat.gif		\
- 	images/cover.jpg	\
- 	images/cramps.gif	\
-+	images/dave.gif		\
-+	images/info.gif		\
- 	images/jello.jpg	\
- 	images/jim.gif		\
- 	images/note.gif		\
-@@ -103,8 +104,7 @@
+--- html/Makefile.in.orig	Thu Oct  3 00:14:34 2002
++++ html/Makefile.in	Wed Oct  8 00:40:18 2003
+@@ -54,7 +54,6 @@
+ HTML		= @DIR_HTML@
+ 
+ HTMLFILES=\
+-	TIFFTechNote2.html	\
+ 	bugs.html		\
+ 	build.html		\
+ 	contrib.html		\
+@@ -112,8 +111,7 @@
  install: all
- 	${INSTALL} -m 755 -dir -idb tiff.man.html ${DESTDIR}${HTML} ${HTML}/images
+ 	${INSTALL} -m 755 -dir -idb tiff.man.html ${DESTDIR}${HTML} ${DESTDIR}${HTML}/images
  	for i in ${HTMLFILES} ${IMAGES}; do \
 -	    ${INSTALL} -idb tiff.man.html -m 444 -F ${DESTDIR}${HTML} \
 -		-src ${SRCDIR}/$$i -O $$i; \
diff --git a/graphics/tiff/files/patch-tools_tiffset_c b/graphics/tiff/files/patch-tools_tiffset_c
deleted file mode 100644
index 65d890d38eb3..000000000000
--- a/graphics/tiff/files/patch-tools_tiffset_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-tools_tiffset_c,v 1.1 2003/04/15 15:30:52 avsm Exp $
---- tools/tiffset.c.orig	Mon Apr 14 17:03:27 2003
-+++ tools/tiffset.c	Mon Apr 14 17:11:28 2003
-@@ -86,7 +86,7 @@ main(int argc, char* argv[])
- 
-             if( id < 1 )
-             {
--                fprintf( stderr, "Field name %s not recognised.\n" );
-+                fprintf( stderr, "Field name %s not recognised.\n", argv[arg_index+1] );
-                 exit( -3 );
-             }
- 
-@@ -112,7 +112,7 @@ main(int argc, char* argv[])
- 
-             if( id < 1 )
-             {
--                fprintf( stderr, "Field name %s not recognised.\n" );
-+                fprintf( stderr, "Field name %s not recognised.\n", argv[arg_index+1] );
-                 exit( -3 );
-             }
- 
diff --git a/graphics/tiff/pkg-descr b/graphics/tiff/pkg-descr
index 7e73e03b4480..bff5d6b7e272 100644
--- a/graphics/tiff/pkg-descr
+++ b/graphics/tiff/pkg-descr
@@ -14,4 +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.
 
-WWW: http://www.libtiff.org/
+WWW: http://www.remotesensing.org/libtiff/
diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist
index 277ab2cfbab1..29d24f79b28e 100644
--- a/graphics/tiff/pkg-plist
+++ b/graphics/tiff/pkg-plist
@@ -4,6 +4,7 @@ bin/gif2tiff
 bin/pal2rgb
 bin/ppm2tiff
 bin/ras2tiff
+bin/raw2tiff
 bin/rgb2ycbcr
 bin/thumbnail
 bin/tiff2bw
@@ -24,49 +25,52 @@ include/tiffvers.h
 lib/libtiff.a
 lib/libtiff.so
 lib/libtiff.so.4
-%%PORTDOCS%%share/doc/tiff/bugs.html
-%%PORTDOCS%%share/doc/tiff/build.html
-%%PORTDOCS%%share/doc/tiff/contrib.html
-%%PORTDOCS%%share/doc/tiff/document.html
-%%PORTDOCS%%share/doc/tiff/images/back.gif
-%%PORTDOCS%%share/doc/tiff/images/bali.jpg
-%%PORTDOCS%%share/doc/tiff/images/cat.gif
-%%PORTDOCS%%share/doc/tiff/images/cover.jpg
-%%PORTDOCS%%share/doc/tiff/images/cramps.gif
-%%PORTDOCS%%share/doc/tiff/images/dave.gif
-%%PORTDOCS%%share/doc/tiff/images/info.gif
-%%PORTDOCS%%share/doc/tiff/images/jello.jpg
-%%PORTDOCS%%share/doc/tiff/images/jim.gif
-%%PORTDOCS%%share/doc/tiff/images/note.gif
-%%PORTDOCS%%share/doc/tiff/images/oxford.gif
-%%PORTDOCS%%share/doc/tiff/images/quad.jpg
-%%PORTDOCS%%share/doc/tiff/images/ring.gif
-%%PORTDOCS%%share/doc/tiff/images/smallliz.jpg
-%%PORTDOCS%%share/doc/tiff/images/strike.gif
-%%PORTDOCS%%share/doc/tiff/images/warning.gif
-%%PORTDOCS%%share/doc/tiff/images.html
-%%PORTDOCS%%share/doc/tiff/index.html
-%%PORTDOCS%%share/doc/tiff/internals.html
-%%PORTDOCS%%share/doc/tiff/intro.html
-%%PORTDOCS%%share/doc/tiff/libtiff.html
-%%PORTDOCS%%share/doc/tiff/misc.html
-%%PORTDOCS%%share/doc/tiff/support.html
-%%PORTDOCS%%share/doc/tiff/tools.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta007.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta016.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta018.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta024.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta028.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta029.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta031.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta032.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta033.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta034.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta035.html
-%%PORTDOCS%%share/doc/tiff/v3.4beta036.html
-%%PORTDOCS%%share/doc/tiff/v3.5.1.html
-%%PORTDOCS%%share/doc/tiff/v3.5.2.html
-%%PORTDOCS%%share/doc/tiff/v3.5.3.html
-%%PORTDOCS%%share/doc/tiff/v3.5.7.html
-%%PORTDOCS%%@dirrm share/doc/tiff/images
-%%PORTDOCS%%@dirrm share/doc/tiff
+%%PORTDOCS%%%%DOCSDIR%%/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/build.html
+%%PORTDOCS%%%%DOCSDIR%%/contrib.html
+%%PORTDOCS%%%%DOCSDIR%%/document.html
+%%PORTDOCS%%%%DOCSDIR%%/images/back.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/bali.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/cat.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/cover.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/cramps.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/dave.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/info.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/jello.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/jim.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/note.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/oxford.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/quad.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/ring.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/smallliz.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/strike.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
+%%PORTDOCS%%%%DOCSDIR%%/images.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/internals.html
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/libtiff.html
+%%PORTDOCS%%%%DOCSDIR%%/misc.html
+%%PORTDOCS%%%%DOCSDIR%%/support.html
+%%PORTDOCS%%%%DOCSDIR%%/tools.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta007.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta016.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta018.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta024.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta028.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta029.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta031.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta032.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta033.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta034.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta035.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.4beta036.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.5.1.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.5.2.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.5.3.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.5.4.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.5.5.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.5.6-beta.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.5.7.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%