5 files changed, 35 insertions, 67 deletions

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 );
-             }
-