Update to tiff-3.6.1. This is many changes and fixes.

The main changes include:
new utility tiff2pdf for converting a TIFF image to a PDF document
new utility raw2tiff for converting raw rasters into TIFF files
new tiff2ps options
new fax2tiff options
bug fixes for LZW, JPEG and OJPEG compression.
more documentation
and upgrade to libtiff.so.3.6
other changes at http://www.libtiff.org/v3.6.0.html

Removed patch-ab because
html/Makefile.in: added missing images per bug 92
Removed patch-ag because
http://bugzilla.remotesensing.org/show_bug.cgi?id=315

Other changes:
HOMEPAGE changed due to libtiff.org has been hijacked
INSTALL.OpenWindows updated (thank you to dieter)

tiff is backward compatible with older version,
but buildlink2.mk version is increased because libtiff
was broken for amd64 support.

5 files changed, 54 insertions, 65 deletions

diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab
index cd47e1f361f..4a373f093b1 100644
--- a/graphics/tiff/patches/patch-ab
+++ b/graphics/tiff/patches/patch-ab
@@ -1,22 +1,13 @@
-$NetBSD: patch-ab,v 1.12 2002/03/05 10:33:36 martti Exp $
+$NetBSD: patch-ab,v 1.13 2004/01/03 18:33:24 reed Exp $
 
---- html/Makefile.in.orig	Tue Jul 17 15:13:37 2001
-+++ html/Makefile.in	Mon Mar  4 16:02:59 2002
-@@ -77,8 +77,6 @@
- 	v3.5.1.html		\
- 	v3.5.2.html		\
- 	v3.5.3.html		\
--	v3.5.4.html		\
--	v3.5.5.html		\
- 	${NULL}
- IMAGES=\
- 	images/back.gif		\
-@@ -86,6 +84,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		\
+--- libtiff/tiff.h.orig	Mon Oct  7 11:50:46 2002
++++ libtiff/tiff.h
+@@ -79,7 +79,7 @@ typedef	char int8;
+ typedef	unsigned char uint8;
+ typedef	short int16;
+ typedef	unsigned short uint16;	/* sizeof (uint16) must == 2 */
+-#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__)
++#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__) || defined(_LP64)
+ typedef	int int32;
+ typedef	unsigned int uint32;	/* sizeof (uint32) must == 4 */
+ #else
diff --git a/graphics/tiff/patches/patch-ae b/graphics/tiff/patches/patch-ae
index afa9b349432..e355b01f92a 100644
--- a/graphics/tiff/patches/patch-ae
+++ b/graphics/tiff/patches/patch-ae
@@ -1,26 +1,26 @@
-$NetBSD: patch-ae,v 1.6 2002/03/05 10:33:36 martti Exp $
+$NetBSD: patch-ae,v 1.7 2004/01/03 18:33:24 reed Exp $
 
---- man/Makefile.in.orig	Wed Sep 26 19:32:24 2001
-+++ man/Makefile.in	Mon Mar  4 16:07:34 2002
-@@ -343,9 +343,7 @@
+--- man/Makefile.in.orig	Fri Nov 21 19:28:59 2003
++++ man/Makefile.in
+@@ -354,9 +354,7 @@ apps/Makefile:
  	 ${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_DATA}' $$i ${MAN}/${MANAPPS}/$$f;	\
++	    ${ECHO} '	${BSD_INSTALL_DATA}' $$i ${MAN}/${MANAPPS}/$$f; \
  	 done								\
  	)>apps/Makefile
  lib/Makefile:
-@@ -356,9 +354,7 @@
+@@ -367,9 +365,7 @@ lib/Makefile:
  	 ${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_DATA}' $$i ${MAN}/${MANLIB}/$$f;	\
++	    ${ECHO} '	${BSD_INSTALL_DATA}' $$i ${MAN}/${MANLIB}/$$f;  \
  	 done								\
  	)>lib/Makefile
  
diff --git a/graphics/tiff/patches/patch-af b/graphics/tiff/patches/patch-af
index e58ef5ce731..687c55f9575 100644
--- a/graphics/tiff/patches/patch-af
+++ b/graphics/tiff/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2002/03/05 10:33:36 martti Exp $
+$NetBSD: patch-af,v 1.7 2004/01/03 18:33:24 reed Exp $
 
---- tools/Makefile.in.orig	Tue Jul 17 15:13:37 2001
-+++ tools/Makefile.in	Mon Mar  4 16:09:50 2002
-@@ -48,10 +48,10 @@
+--- tools/Makefile.in.orig	Fri Nov 21 19:35:56 2003
++++ tools/Makefile.in
+@@ -48,10 +48,10 @@ OPTIMIZER=@OPTIMIZER@
  IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
  CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
  #
@@ -15,15 +15,14 @@ $NetBSD: patch-af,v 1.6 2002/03/05 10:33:36 martti Exp $
  LIBPORT	= @LIBPORT@
  MACHLIBS= @MACHDEPLIBS@
  LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
-@@ -111,10 +111,8 @@
- 	    true; \
+@@ -114,9 +114,8 @@ all:	${TARGETS}
  	fi
  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}
-+	${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
++		-dir @DIR_BIN@
 +	${LIBTOOL} ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
  	@if [ "@LIBIMAGE@" = yes ]; then 				\
  	    ${INSTALL} -idb tiff.sw.tools -m 755 			\
diff --git a/graphics/tiff/patches/patch-ag b/graphics/tiff/patches/patch-ag
index 016022736a7..77a28c3b1dd 100644
--- a/graphics/tiff/patches/patch-ag
+++ b/graphics/tiff/patches/patch-ag
@@ -1,27 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2002/12/25 14:25:27 wiz Exp $
+$NetBSD: patch-ag,v 1.4 2004/01/03 18:33:24 reed Exp $
 
---- tools/fax2tiff.c.orig	Fri Jan 28 22:18:16 2000
-+++ tools/fax2tiff.c
-@@ -63,6 +63,13 @@ DummyReadProc(thandle_t fd, tdata_t buf,
- }
- 
- static tsize_t
-+DummySeekProc(thandle_t fd, toff_t offset, int whence)
-+{
-+	(void) fd; (void) offset; (void) whence;
-+	return (0);
-+}
-+
-+static tsize_t
- DummyWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
- {
- 	(void) fd; (void) buf; (void) size;
-@@ -89,7 +96,7 @@ main(int argc, char* argv[])
- 	/* smuggle a descriptor out of the library */
- 	faxTIFF = TIFFClientOpen("(FakeInput)", "w", (thandle_t) -1,
- 				 DummyReadProc, DummyWriteProc,
--				 NULL, NULL, NULL, NULL, NULL);
-+				 DummySeekProc, NULL, NULL, NULL, NULL);
- 	if (faxTIFF == NULL)
- 		return (EXIT_FAILURE);
- 	faxTIFF->tif_mode = O_RDONLY;
+--- libtiff/tif_fax3.c.orig	Mon Sep 29 23:13:07 2003
++++ libtiff/tif_fax3.c
+@@ -311,7 +311,7 @@ Fax3Decode2D(TIFF* tif, tidata_t buf, ts
+  * this is <8 bytes.  We optimize the code here to reflect the
+  * machine characteristics.
+  */
+-#if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__) || defined(__arch64__)
++#if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__) || defined(__arch64__) || defined(_LP64)
+ #define FILL(n, cp)							    \
+     switch (n) {							    \
+     case 15:(cp)[14] = 0xff; case 14:(cp)[13] = 0xff; case 13: (cp)[12] = 0xff;\
diff --git a/graphics/tiff/patches/patch-ah b/graphics/tiff/patches/patch-ah
new file mode 100644
index 00000000000..d7a649273ef
--- /dev/null
+++ b/graphics/tiff/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2004/01/03 18:33:25 reed Exp $
+
+--- html/Makefile.in.orig	Wed Oct  2 08:14:34 2002
++++ html/Makefile.in
+@@ -86,6 +86,8 @@ HTMLFILES=\
+ 	v3.5.5.html		\
+ 	v3.5.6-beta.html	\
+ 	v3.5.7.html		\
++	v3.6.0.html		\
++	v3.6.1.html		\
+ 	${NULL}
+ IMAGES=\
+ 	images/back.gif		\