Update to 3.5.7.

PR:		32858
Submitted by:	Ports Fury

6 files changed, 97 insertions, 271 deletions

diff --git a/graphics/tiff/files/patch-aa b/graphics/tiff/files/patch-aa
index 7d57394..2c128a1 100644
--- a/graphics/tiff/files/patch-aa
+++ b/graphics/tiff/files/patch-aa
@@ -1,63 +1,59 @@
---- libtiff/Makefile.in.orig	Mon Nov 29 05:15:36 1999
-+++ libtiff/Makefile.in	Sat Apr  1 00:00:00 2000
-@@ -62,7 +62,7 @@
- #
- CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@
- COPTS	= @GCOPTS@
--OPTIMIZER=-O
-+#OPTIMIZER=-O
- CFLAGS	= @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY}
- #
- SRCS	= \
-@@ -197,8 +197,8 @@
- 	${AR} ${AROPTS} libtiff.@DSOSUF@ shr.o
- 	rm -f shr.o
+--- 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 @@
+ 	  @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@; \
+ 	fi
  	touch $@
--# NetBSD 1.1 or FreeBSD
--NETBSDdso FREEBSDdso: ${OBJS}
-+# NetBSD 1.1
-+NETBSDdso: ${OBJS}
+-# NetBSD 1.1 or FreeBSD (old style)
+-NETBSDdso FREEBSDdso oldOPENBSDdso: ${OBJS}
++# NetBSD 1.1 (old style)
++NETBSDdso oldOPENBSDdso: ${OBJS}
  	@rm -f libtiff_pic.a
  	@${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q`
  	${RANLIB} libtiff_pic.a
-@@ -215,7 +215,12 @@
+@@ -239,6 +239,14 @@
  # OSF/1 3.2 shared lib rule
  OSFdso: ${OBJS}
  	${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm
--
 +# FreeBSD shared lib rule
 +FREEBSDdso: ${OBJS}
-+	${CC} -shared -Wl,-soname,libtiff.@DSOSUF_VERSION@ -o libtiff.@DSOSUF_VERSION@ \
-+		${OBJS} @LIBJPEG@ @LIBGZ@
++	${CC} -shared -Wl,-soname,libtiff.@DSOSUF_VERSION@ \
++	    -o libtiff.@DSOSUF_VERSION@  ${OBJS} \
++		@LIBJPEG@ @LIBGZ@ @MACHDEPLIBS@
++	rm -f libtiff.@DSOSUF@
 +	@LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@
 +	touch $@
  
- ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h
- ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h
-@@ -319,22 +324,20 @@
- 	${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_INC@
- 	for i in ${INCS}; do						\
+ OPENBSDdso: ${OBJS}
+ 	${CC} -shared @LIBCOPTS@ -o libtiff.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ -lm
+@@ -358,18 +366,15 @@
+ 	${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_INC@
+ 	for i in ${INCS_PRIVATE}; do					\
  	    f=`basename $$i`;						\
--	    ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_INC@		\
+-	    ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_INC@	\
 -		-src $$i -O $$f;					\
-+	    ${BSD_INSTALL_DATA} $$i @DIR_INC@/$$f;			\
++	    ${BSD_INSTALL_DATA} $$i ${DESTDIR}@DIR_INC@/$$f;		\
  	done
+ 
  installDSO: @DSO@dso
  	if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then			\
--	    ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@		\
+-	    ${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@	\
 -		-O libtiff.@DSOSUF_VERSION@;				\
-+	    ${BSD_INSTALL_DATA} libtiff.@DSOSUF_VERSION@ @DIR_LIB@;	\
- 	    ${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@			\
--		-ln libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@;	\
-+		-lns libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@;	\
++	    ${BSD_INSTALL_DATA} libtiff.@DSOSUF_VERSION@		\
++		${DESTDIR}@DIR_LIB@;					\
+ 	    ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@	\
+ 		-lns libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@;	\
+-	    ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@	\
+-		-lns libtiff.@DSOSUF@ -O libtiff.so;			\
  	else								\
- 	    ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@		\
+ 	    ${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@	\
  		-O libtiff.@DSOSUF@;					\
- 	fi
+@@ -377,7 +382,7 @@
+ 
  install: all installHdrs
- 	${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@
--	${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a
-+	${BSD_INSTALL_DATA} libtiff.a @DIR_LIB@
+ 	${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_LIB@
+-	${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_LIB@ -O libtiff.a
++	${BSD_INSTALL_DATA} libtiff.a ${DESTDIR}@DIR_LIB@
  	if [ @DSO@dso != nodso ]; then					\
- 	    ${MAKE} installDSO;						\
+ 	    ${MAKE} -${MAKEFLAGS} installDSO;				\
  	else								\
diff --git a/graphics/tiff/files/patch-ab b/graphics/tiff/files/patch-ab
index 2c3860e..13efb32 100644
--- a/graphics/tiff/files/patch-ab
+++ b/graphics/tiff/files/patch-ab
@@ -1,18 +1,38 @@
---- configure.orig	Mon Mar 20 20:20:42 2000
-+++ configure	Mon Sep 18 21:04:27 2000
-@@ -1150,8 +1150,10 @@
+--- configure.orig	Fri Nov 16 02:21:05 2001
++++ configure	Sat Dec 15 00:00:00 2001
+@@ -170,10 +170,10 @@
+     esac
+ done
+ 
+-DIR_BIN=${EPREFIX}/bin		# destination for applications
+-DIR_LIB=${EPREFIX}/lib		# destination for library
+-DIR_INC=${PREFIX}/include		# destination for include files
+-DIR_HTML=${PREFIX}/doc/libtiff		# destination for HTML files
++#DIR_BIN=${EPREFIX}/bin		# destination for applications
++#DIR_LIB=${EPREFIX}/lib		# destination for library
++#DIR_INC=${PREFIX}/include		# destination for include files
++#DIR_HTML=${PREFIX}/doc/libtiff		# destination for HTML files
+ 
+ if [ -n "$ac_prev" ]; then
+     bitch "configure: missing argument to --`echo $ac_prev | sed 's/_/-/g'`"
+@@ -1172,11 +1172,12 @@
  	TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
  	;;
      *-freebsd*)
--	DSOSUF=so.${DIST_MAJOR}.0
+-	DSOSUF=so.${DIST_MAJOR}
+-	DSOSUF_VERSION=${DSOSUF}.${DIST_MINOR}.${DIST_POINT}
+-	LIBCOPTS='-fPIC'
 +	DSOSUF=so
- 	LIBCOPTS='-fpic -fPIC'
 +	DSOSUF_VERSION=${DSOSUF}.4
-+	DSOOPTS='-shared'
- 	DSO=FREEBSD
- 	TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
++	LIBCOPTS='-fPIC -DPIC'
+ 	DSOOPTS='-shared'
+-	DSO=GNULD
++	DSO=FREEBSD
++	TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
  	;;
-@@ -1256,7 +1258,7 @@
+     *-openbsd*)
+ 	DSOSUF=so.${DIST_MAJOR}.${DIST_MINOR}
+@@ -1300,7 +1301,7 @@
  # Check if ln -s creates a symbolic link.
  #
  if [ -z "${LN_S-}" ]; then
diff --git a/graphics/tiff/files/patch-ac b/graphics/tiff/files/patch-ac
index 6aeea8e..0ffdddd 100644
--- a/graphics/tiff/files/patch-ac
+++ b/graphics/tiff/files/patch-ac
@@ -1,35 +1,12 @@
---- tools/Makefile.in.orig	Tue Dec 21 08:46:11 1999
-+++ tools/Makefile.in	Sat Apr  1 00:00:00 2000
-@@ -43,17 +43,17 @@
- INSTALL	= @INSTALL@
- #
- COPTS	= @GCOPTS@
--OPTIMIZER=-O
-+#OPTIMIZER=-O
- IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
--CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
-+CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -L../libtiff
- #
--TIFFLIB	= ${DEPTH}/libtiff/libtiff.@DSOSUF@
-+TIFFLIB	= ${DEPTH}/libtiff/libtiff.@DSOSUF_VERSION@
- LIBJPEG	= @LIBJPEG@
- LIBGZ	= @LIBGZ@
- LIBTIFF	= @TIFFLIBREF@
- LIBPORT	= @LIBPORT@
- MACHLIBS= @MACHDEPLIBS@
--LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
-+LIBS	= ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} -ltiff
- #
- OBJS=	\
- 	fax2tiff.o \
-@@ -108,8 +108,8 @@
- 	    true; \
- 	fi
+--- 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 @@
  install: all
--	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -dir @DIR_BIN@
--	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
-+	${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
-+	${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
- 	@if [ "@LIBIMAGE@" = yes ]; then \
- 	    ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \
- 	else \
+ 	${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 		\
+ 		-dir ${DESTDIR}@DIR_BIN@
+-	${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 		\
+-		-F ${DESTDIR}@DIR_BIN@ -O ${TARGETS}
++	${BSD_INSTALL_PROGRAM} ${TARGETS} ${DESTDIR}@DIR_BIN@
+ 	@if [ "@LIBIMAGE@" = yes ]; then 				\
+ 	    ${INSTALL} -idb tiff.sw.tools -m 755 			\
+ 		-F ${DESTDIR}@DIR_BIN@ -O sgi2tiff; 			\
diff --git a/graphics/tiff/files/patch-ad b/graphics/tiff/files/patch-ad
index 56a78f9..69b7371 100644
--- a/graphics/tiff/files/patch-ad
+++ b/graphics/tiff/files/patch-ad
@@ -1,152 +1,26 @@
---- man/Makefile.in.orig	Tue Nov 30 01:42:44 1999
-+++ man/Makefile.in	Sat Apr  1 00:00:00 2000
-@@ -41,6 +41,7 @@
- SED	= sed
- MV	= mv
- RM	= rm -f
-+LN	= ln -sf
- INSTALL	= @INSTALL@
- 
- #
-@@ -82,7 +83,7 @@
- # pathname prefix in the .so commands when setting
- # up alternate files for multi-function manual pages.
- #
--#MANDIR	= man3/
-+MANDIR	=
- 
- MANTOOLS=\
- 	apps/fax2tiff.1 \
-@@ -274,59 +275,59 @@
- lib/TIFFswab.3t::	${SRCDIR}/TIFFswab.3t;			${MANCVT}
- lib/TIFFtile.3t::	${SRCDIR}/TIFFtile.3t;			${MANCVT}
- 
--lib/TIFFComputeTile.3t:;	${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFCheckTile.3t:;		${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFNumberOfTiles.3t:;	${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFComputeStrip.3t:;	${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@
--lib/TIFFNumberOfStrips.3t:;	${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@
--lib/TIFFCurrentDirectory.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFCurrentRow.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFCurrentStrip.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFCurrentTile.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFFdOpen.3t:;		${ECHO} ".so ${MANDIR}TIFFOpen.3t" > $@
--lib/TIFFFileName.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFFileno.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFFlushData.3t:;		${ECHO} ".so ${MANDIR}TIFFFlush.3t" > $@
--lib/TIFFGetMode.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFIsTiled.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFIsByteSwapped.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFIsUpSampled.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFIsMSB2LSB.3t:;		${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFLastDirectory.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
--lib/TIFFReverseBits.3t:;	${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
--lib/TIFFRGBAImageOK.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
--lib/TIFFRGBAImageBegin.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
--lib/TIFFRGBAImageGet.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
--lib/TIFFRGBAImageEnd.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
--lib/TIFFSetErrorHandler.3t:;	${ECHO} ".so ${MANDIR}TIFFError.3t" > $@
--lib/TIFFSetSubDirectory.3t:;	${ECHO} ".so ${MANDIR}TIFFSetDirectory.3t" > $@
--lib/TIFFSetWarningHandler.3t:;	${ECHO} ".so ${MANDIR}TIFFWarning.3t" > $@
--lib/TIFFSwabArrayOfLong.3t:;	${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
--lib/TIFFSwabArrayOfShort.3t:;	${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
--lib/TIFFSwabLong.3t:;		${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
--lib/TIFFSwabShort.3t:;		${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
--lib/TIFFScanlineSize.3t:;	${ECHO} ".so ${MANDIR}TIFFsize.3t" > $@
--lib/TIFFRasterScanlineSize.3t:;	${ECHO} ".so ${MANDIR}TIFFsize.3t" > $@
--lib/TIFFDefaultStripSize.3t:;	${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@
--lib/TIFFStripSize.3t:;		${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@
--lib/TIFFVStripSize.3t:;		${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@
--lib/TIFFTileSize.3t:;		${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFVTileSize.3t:;		${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFDefaultTileSize.3t:;	${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFTileRowSize.3t:;	${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
--lib/TIFFVGetField.3t:;		${ECHO} ".so ${MANDIR}TIFFGetField.3t" > $@
--lib/TIFFVSetField.3t:;		${ECHO} ".so ${MANDIR}TIFFSetField.3t" > $@
--lib/TIFFFindCODEC.3t:;		${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@
--lib/TIFFRegisterCODEC.3t:;	${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@
--lib/TIFFUnRegisterCODEC.3t:;	${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@
--lib/TIFFmalloc.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFrealloc.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFfree.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFmemset.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFmemcpy.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFmemcmp.3t:;		${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@
--lib/TIFFReadBufferSetup.3t:;	${ECHO} ".so ${MANDIR}TIFFbuffer.3t" > $@
--lib/TIFFWriteBufferSetup.3t:;	${ECHO} ".so ${MANDIR}TIFFbuffer.3t" > $@
-+lib/TIFFComputeTile.3t:;	${LN} ${MANDIR}TIFFtile.3t $@
-+lib/TIFFCheckTile.3t:;		${LN} ${MANDIR}TIFFtile.3t $@
-+lib/TIFFNumberOfTiles.3t:;	${LN} ${MANDIR}TIFFtile.3t $@
-+lib/TIFFComputeStrip.3t:;	${LN} ${MANDIR}TIFFstrip.3t $@
-+lib/TIFFNumberOfStrips.3t:;	${LN} ${MANDIR}TIFFstrip.3t $@
-+lib/TIFFCurrentDirectory.3t:;	${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFCurrentRow.3t:;		${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFCurrentStrip.3t:;	${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFCurrentTile.3t:;	${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFFdOpen.3t:;		${LN} ${MANDIR}TIFFOpen.3t $@
-+lib/TIFFFileName.3t:;		${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFFileno.3t:;		${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFFlushData.3t:;		${LN} ${MANDIR}TIFFFlush.3t $@
-+lib/TIFFGetMode.3t:;		${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFIsTiled.3t:;		${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFIsByteSwapped.3t:;	${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFIsUpSampled.3t:;	${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFIsMSB2LSB.3t:;		${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFLastDirectory.3t:;	${LN} ${MANDIR}TIFFquery.3t $@
-+lib/TIFFReverseBits.3t:;	${LN} ${MANDIR}TIFFswab.3t $@
-+lib/TIFFRGBAImageOK.3t:;	${LN} ${MANDIR}TIFFRGBAImage.3t $@
-+lib/TIFFRGBAImageBegin.3t:;	${LN} ${MANDIR}TIFFRGBAImage.3t $@
-+lib/TIFFRGBAImageGet.3t:;	${LN} ${MANDIR}TIFFRGBAImage.3t $@
-+lib/TIFFRGBAImageEnd.3t:;	${LN} ${MANDIR}TIFFRGBAImage.3t $@
-+lib/TIFFSetErrorHandler.3t:;	${LN} ${MANDIR}TIFFError.3t $@
-+lib/TIFFSetSubDirectory.3t:;	${LN} ${MANDIR}TIFFSetDirectory.3t $@
-+lib/TIFFSetWarningHandler.3t:;	${LN} ${MANDIR}TIFFWarning.3t $@
-+lib/TIFFSwabArrayOfLong.3t:;	${LN} ${MANDIR}TIFFswab.3t $@
-+lib/TIFFSwabArrayOfShort.3t:;	${LN} ${MANDIR}TIFFswab.3t $@
-+lib/TIFFSwabLong.3t:;		${LN} ${MANDIR}TIFFswab.3t $@
-+lib/TIFFSwabShort.3t:;		${LN} ${MANDIR}TIFFswab.3t $@
-+lib/TIFFScanlineSize.3t:;	${LN} ${MANDIR}TIFFsize.3t $@
-+lib/TIFFRasterScanlineSize.3t:;	${LN} ${MANDIR}TIFFsize.3t $@
-+lib/TIFFDefaultStripSize.3t:;	${LN} ${MANDIR}TIFFstrip.3t $@
-+lib/TIFFStripSize.3t:;		${LN} ${MANDIR}TIFFstrip.3t $@
-+lib/TIFFVStripSize.3t:;		${LN} ${MANDIR}TIFFstrip.3t $@
-+lib/TIFFTileSize.3t:;		${LN} ${MANDIR}TIFFtile.3t $@
-+lib/TIFFVTileSize.3t:;		${LN} ${MANDIR}TIFFtile.3t $@
-+lib/TIFFDefaultTileSize.3t:;	${LN} ${MANDIR}TIFFtile.3t $@
-+lib/TIFFTileRowSize.3t:;	${LN} ${MANDIR}TIFFtile.3t $@
-+lib/TIFFVGetField.3t:;		${LN} ${MANDIR}TIFFGetField.3t $@
-+lib/TIFFVSetField.3t:;		${LN} ${MANDIR}TIFFSetField.3t $@
-+lib/TIFFFindCODEC.3t:;		${LN} ${MANDIR}TIFFcodec.3t $@
-+lib/TIFFRegisterCODEC.3t:;	${LN} ${MANDIR}TIFFcodec.3t $@
-+lib/TIFFUnRegisterCODEC.3t:;	${LN} ${MANDIR}TIFFcodec.3t $@
-+lib/TIFFmalloc.3t:;		${LN} ${MANDIR}TIFFmemory.3t $@
-+lib/TIFFrealloc.3t:;		${LN} ${MANDIR}TIFFmemory.3t $@
-+lib/TIFFfree.3t:;		${LN} ${MANDIR}TIFFmemory.3t $@
-+lib/TIFFmemset.3t:;		${LN} ${MANDIR}TIFFmemory.3t $@
-+lib/TIFFmemcpy.3t:;		${LN} ${MANDIR}TIFFmemory.3t $@
-+lib/TIFFmemcmp.3t:;		${LN} ${MANDIR}TIFFmemory.3t $@
-+lib/TIFFReadBufferSetup.3t:;	${LN} ${MANDIR}TIFFbuffer.3t $@
-+lib/TIFFWriteBufferSetup.3t:;	${LN} ${MANDIR}TIFFbuffer.3t $@
- 
- apps/Makefile:
- 	test -d apps || mkdir apps
-@@ -336,8 +337,7 @@
+--- 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 @@
  	 ${ECHO} 'install:';						\
  	 for i in *.1; do						\
  	    f=${MANAPPNAME};						\
--	    ${ECHO} '	cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANAPPS}	\
+-	    ${ECHO} '	cd ..; ${INSTALL} -m 444 			\
+-		-F ${DESTDIR}${MAN}/${MANAPPS}				\
 -		-idb tiff.man.tools -src' apps/"$$i" '-O' "$$f";	\
-+	    ${ECHO} '	${BSD_INSTALL_MAN}' $$i ${MAN}/${MANAPPS}/$$f;	\
++	    ${ECHO} '	${BSD_INSTALL_MAN}'	 			\
++		$$i ${DESTDIR}${MAN}/${MANAPPS}/$$f;			\
  	 done								\
  	)>apps/Makefile
  lib/Makefile:
-@@ -348,8 +348,7 @@
+@@ -356,9 +355,8 @@
  	 ${ECHO} 'install:';						\
  	 for i in *.3t; do						\
  	    f=${MANLIBNAME};						\
--	    ${ECHO} '	cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANLIB}	\
+-	    ${ECHO} '	cd ..; ${INSTALL} -m 444 			\
+-		-F ${DESTDIR}${MAN}/${MANLIB}				\
 -		-idb tiff.man.dev -src' lib/"$$i" '-O' "$$f";		\
-+	    ${ECHO} '	${BSD_INSTALL_MAN}' $$i ${MAN}/${MANLIB}/$$f;	\
++	    ${ECHO} '	${BSD_INSTALL_MAN}'	 			\
++		$$i ${DESTDIR}${MAN}/${MANLIB}/$$f;			\
  	 done								\
  	)>lib/Makefile
  
diff --git a/graphics/tiff/files/patch-ae b/graphics/tiff/files/patch-ae
index c55ae32..58c73a0 100644
--- a/graphics/tiff/files/patch-ae
+++ b/graphics/tiff/files/patch-ae
@@ -1,15 +1,16 @@
---- html/Makefile.in.orig	Tue Mar 28 02:05:55 2000
-+++ html/Makefile.in	Sat Apr  1 00:00:00 2000
-@@ -76,8 +76,6 @@
+--- 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		\
-@@ -85,6 +83,8 @@
+@@ -86,6 +85,8 @@
  	images/cat.gif		\
  	images/cover.jpg	\
  	images/cramps.gif	\
@@ -18,13 +19,13 @@
  	images/jello.jpg	\
  	images/jim.gif		\
  	images/note.gif		\
-@@ -102,8 +102,7 @@
+@@ -103,8 +104,7 @@
  install: all
- 	${INSTALL} -m 755 -dir -idb tiff.man.html ${HTML} ${HTML}/images
+ 	${INSTALL} -m 755 -dir -idb tiff.man.html ${DESTDIR}${HTML} ${HTML}/images
  	for i in ${HTMLFILES} ${IMAGES}; do \
--	    ${INSTALL} -idb tiff.man.html -m 444 -F ${HTML} \
+-	    ${INSTALL} -idb tiff.man.html -m 444 -F ${DESTDIR}${HTML} \
 -		-src ${SRCDIR}/$$i -O $$i; \
-+	    ${BSD_INSTALL_DATA} ${SRCDIR}/$$i ${HTML}/$$i; \
++	    ${BSD_INSTALL_DATA} ${SRCDIR}/$$i ${DESTDIR}${HTML}/$$i; \
  	done
  
  clean:;
diff --git a/graphics/tiff/files/patch-tools::fax2ps.c b/graphics/tiff/files/patch-tools::fax2ps.c
deleted file mode 100644
index 64fa98e..0000000
--- a/graphics/tiff/files/patch-tools::fax2ps.c
+++ /dev/null
@@ -1,42 +0,0 @@
-
---- tools/fax2ps.c.orig	Tue Sep  2 19:54:34 1997
-+++ tools/fax2ps.c	Sat Feb 13 16:43:01 1999
-@@ -151,7 +151,7 @@
- {
-     uint32 w, h;
-     uint16 unit;
--    float xres, yres;
-+    float xres, yres, scale = 1.0;
-     tstrip_t s, ns;
- 
-     TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &h);
-@@ -174,21 +174,13 @@
- 
-     printf("%%%%Page: \"%d\" %d\n", pageNumber, pageNumber);
-     printf("/$pageTop save def gsave\n");
--    if (scaleToPage) {
--	float yscale = pageHeight / (h/yres);
--	float xscale = pageWidth / (w/xres);
--	printf("%d %d translate\n",
--               (int) (((basePageWidth - pageWidth) * points) * half),
--               (int)((yscale*(h/yres)*points) +
--               (basePageHeight - pageHeight) * points * half)  );
--	printf("%g %g scale\n", (72.*xscale)/xres, -(72.*yscale)/yres);
--    } else {
--	printf("%d %d translate\n",
--               (int) ((basePageWidth - pageWidth) * points * half),
--               (int)((72.*h/yres) +
--               (basePageHeight - pageHeight) * points * half) );
--	printf("%g %g scale\n", 72./xres, -72./yres);
--    }
-+    if (scaleToPage)
-+	scale = pageHeight / (h/yres) < pageWidth / (w/xres) ?
-+		pageHeight / (h/yres) : pageWidth / (w/xres);
-+    printf("%g %g translate\n",
-+           points * (pageWidth - scale*w/xres) * half,
-+           points * (scale*h/yres + (pageHeight - scale*h/yres) * half));
-+    printf("%g %g scale\n", points/xres*scale, -points/yres*scale);
-     printf("0 setgray\n");
-     TIFFSetField(tif, TIFFTAG_FAXFILLFUNC, printruns);
-     ns = TIFFNumberOfStrips(tif);
-