update to 3.5.5

PR:		17717
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

9 files changed, 110 insertions, 46 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 4cf09e707fe2..3f63c271fb6c 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	tiff
-# Version required:	3.5.4
+# Version required:	3.5.5
 # Date created:		8 October 1996
 # Whom:			Richard Hwang <rhwang@bigpanda.com>
 #			Mikhail Teterin <mi@aldan.algebra.com>
@@ -8,8 +8,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	tiff-v3.5.4
-PKGNAME=	tiff-3.5.4
+DISTNAME=	tiff-v3.5.5
+PKGNAME=	tiff-3.5.5
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.onshore.com/pub/libtiff/ \
 		http://www.libtiff.org/
@@ -105,9 +105,9 @@ MLINKS=	TIFFError.3t        TIFFSetErrorHandler.3t \
 	TIFFtile.3t         TIFFNumberOfTiles.3t \
 	TIFFtile.3t         TIFFTileRowSize.3t \
 	TIFFtile.3t         TIFFTileSize.3t \
-	TIFFtile.3t         TIFFVTileSize.3t \
+	TIFFtile.3t         TIFFVTileSize.3t
 
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 231591b0cba1..92cedc5b58a3 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1 +1 @@
-MD5 (tiff-v3.5.4.tar.gz) = 3957aeace6b66720751f497157e16e53
+MD5 (tiff-v3.5.5.tar.gz) = 407d65a98c7621ad6e2c64cd3d1e7a40
diff --git a/graphics/tiff/files/patch-aa b/graphics/tiff/files/patch-aa
index e7a85ad71cdd..7d573949e476 100644
--- a/graphics/tiff/files/patch-aa
+++ b/graphics/tiff/files/patch-aa
@@ -1,5 +1,5 @@
---- libtiff/Makefile.in.orig	Wed Sep  8 18:39:00 1999
-+++ libtiff/Makefile.in	Wed Nov 24 07:31:09 1999
+--- 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@
@@ -20,19 +20,13 @@
  	@rm -f libtiff_pic.a
  	@${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q`
  	${RANLIB} libtiff_pic.a
-@@ -215,7 +215,18 @@
+@@ -215,7 +215,12 @@
  # OSF/1 3.2 shared lib rule
  OSFdso: ${OBJS}
  	${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm
 -
-+# FreeBSD a.out shared lib rule
-+FREEBSD_AOUTdso: ${OBJS}
-+	${LD} -Bshareable -x ${LIBDIR}/c++rt0.o -o libtiff.@DSOSUF_VERSION@ \
-+		${OBJS} @LIBJPEG@ @LIBGZ@
-+	@LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@
-+	touch $@
-+# FreeBSD ELF shared lib rule
-+FREEBSD_ELFdso: ${OBJS}
++# FreeBSD shared lib rule
++FREEBSDdso: ${OBJS}
 +	${CC} -shared -Wl,-soname,libtiff.@DSOSUF_VERSION@ -o libtiff.@DSOSUF_VERSION@ \
 +		${OBJS} @LIBJPEG@ @LIBGZ@
 +	@LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@
@@ -40,12 +34,30 @@
  
  ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h
  ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h
-@@ -327,7 +338,7 @@
- 	    ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@		\
- 		-O libtiff.@DSOSUF_VERSION@;				\
+@@ -319,22 +324,20 @@
+ 	${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_INC@
+ 	for i in ${INCS}; do						\
+ 	    f=`basename $$i`;						\
+-	    ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_INC@		\
+-		-src $$i -O $$f;					\
++	    ${BSD_INSTALL_DATA} $$i @DIR_INC@/$$f;			\
+ 	done
+ installDSO: @DSO@dso
+ 	if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then			\
+-	    ${INSTALL} -idb tiff.sw.tools -m 555 -F @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@;	\
  	else								\
  	    ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@		\
  		-O libtiff.@DSOSUF@;					\
+ 	fi
+ 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@
+ 	if [ @DSO@dso != nodso ]; then					\
+ 	    ${MAKE} installDSO;						\
+ 	else								\
diff --git a/graphics/tiff/files/patch-ab b/graphics/tiff/files/patch-ab
index 4cc2f15fde0f..1a5de1cf6605 100644
--- a/graphics/tiff/files/patch-ab
+++ b/graphics/tiff/files/patch-ab
@@ -1,18 +1,14 @@
---- configure.orig	Tue Sep  2 13:54:16 1997
-+++ configure	Sat Jan 23 10:58:22 1999
-@@ -1146,5 +1146,13 @@
+--- configure.orig	Tue Mar 21 03:20:42 2000
++++ configure	Sat Apr  1 00:00:00 2000
+@@ -1150,8 +1150,10 @@
+ 	TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
+ 	;;
      *-freebsd*)
 -	DSOSUF=so.${DIST_MAJOR}.0
 +	DSOSUF=so
  	LIBCOPTS='-fpic -fPIC'
--	DSO=FREEBSD
-+	if [ $PORTOBJFORMAT = elf ]; then
-+		DSOSUF_VERSION=${DSOSUF}.4
-+		DSOOPTS='-shared'
-+		DSO=FREEBSD_ELF
-+	else
-+		DSOSUF_VERSION=${DSOSUF}.4.0
-+		DSOOPTS='-Bshareable'
-+		DSO=FREEBSD_AOUT
-+	fi
++	DSOSUF_VERSION=${DSOSUF}.4
++	DSOOPTS='-shared'
+ 	DSO=FREEBSD
  	TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
+ 	;;
diff --git a/graphics/tiff/files/patch-ac b/graphics/tiff/files/patch-ac
index c4770573bf9a..6aeea8e13955 100644
--- a/graphics/tiff/files/patch-ac
+++ b/graphics/tiff/files/patch-ac
@@ -1,5 +1,5 @@
---- tools/Makefile.in.orig	Mon Dec 20 18:46:11 1999
-+++ tools/Makefile.in	Sun Jan 23 15:39:20 2000
+--- 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@
  #
@@ -22,12 +22,14 @@
  #
  OBJS=	\
  	fax2tiff.o \
-@@ -108,7 +108,7 @@
+@@ -108,8 +108,8 @@
  	    true; \
  	fi
  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@
- 	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
++	${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
  	@if [ "@LIBIMAGE@" = yes ]; then \
  	    ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \
+ 	else \
diff --git a/graphics/tiff/files/patch-ad b/graphics/tiff/files/patch-ad
index c213d10425dd..56a78f9ea58a 100644
--- a/graphics/tiff/files/patch-ad
+++ b/graphics/tiff/files/patch-ad
@@ -1,10 +1,10 @@
---- man/Makefile.in.orig	Wed Sep  3 02:54:41 1997
-+++ man/Makefile.in	Sat Jun 12 20:59:00 1999
+--- 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 -fs
++LN	= ln -sf
  INSTALL	= @INSTALL@
  
  #
@@ -17,7 +17,7 @@
  
  MANTOOLS=\
  	apps/fax2tiff.1 \
-@@ -268,59 +269,59 @@
+@@ -274,59 +275,59 @@
  lib/TIFFswab.3t::	${SRCDIR}/TIFFswab.3t;			${MANCVT}
  lib/TIFFtile.3t::	${SRCDIR}/TIFFtile.3t;			${MANCVT}
  
@@ -130,3 +130,23 @@
  
  apps/Makefile:
  	test -d apps || mkdir apps
+@@ -336,8 +337,7 @@
+ 	 ${ECHO} 'install:';						\
+ 	 for i in *.1; do						\
+ 	    f=${MANAPPNAME};						\
+-	    ${ECHO} '	cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANAPPS}	\
+-		-idb tiff.man.tools -src' apps/"$$i" '-O' "$$f";	\
++	    ${ECHO} '	${BSD_INSTALL_MAN}' $$i ${MAN}/${MANAPPS}/$$f;	\
+ 	 done								\
+ 	)>apps/Makefile
+ lib/Makefile:
+@@ -348,8 +348,7 @@
+ 	 ${ECHO} 'install:';						\
+ 	 for i in *.3t; do						\
+ 	    f=${MANLIBNAME};						\
+-	    ${ECHO} '	cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANLIB}	\
+-		-idb tiff.man.dev -src' lib/"$$i" '-O' "$$f";		\
++	    ${ECHO} '	${BSD_INSTALL_MAN}' $$i ${MAN}/${MANLIB}/$$f;	\
+ 	 done								\
+ 	)>lib/Makefile
+ 
diff --git a/graphics/tiff/files/patch-ae b/graphics/tiff/files/patch-ae
index cba57e93964c..c55ae3236f50 100644
--- a/graphics/tiff/files/patch-ae
+++ b/graphics/tiff/files/patch-ae
@@ -1,6 +1,15 @@
---- html/Makefile.in.orig	Wed Jul 28 06:50:27 1999
-+++ html/Makefile.in	Wed Nov 24 06:20:07 1999
-@@ -80,6 +80,8 @@
+--- 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 @@
+ 	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		\
+@@ -85,6 +83,8 @@
  	images/cat.gif		\
  	images/cover.jpg	\
  	images/cramps.gif	\
@@ -9,3 +18,13 @@
  	images/jello.jpg	\
  	images/jim.gif		\
  	images/note.gif		\
+@@ -102,8 +102,7 @@
+ install: all
+ 	${INSTALL} -m 755 -dir -idb tiff.man.html ${HTML} ${HTML}/images
+ 	for i in ${HTMLFILES} ${IMAGES}; do \
+-	    ${INSTALL} -idb tiff.man.html -m 444 -F ${HTML} \
+-		-src ${SRCDIR}/$$i -O $$i; \
++	    ${BSD_INSTALL_DATA} ${SRCDIR}/$$i ${HTML}/$$i; \
+ 	done
+ 
+ clean:;
diff --git a/graphics/tiff/files/patch-af b/graphics/tiff/files/patch-af
new file mode 100644
index 000000000000..456bc825d9ec
--- /dev/null
+++ b/graphics/tiff/files/patch-af
@@ -0,0 +1,12 @@
+--- tools/fax2ps.c.orig	Wed Mar 29 13:22:33 2000
++++ tools/fax2ps.c	Sat Apr  1 00:00:00 2000
+@@ -382,8 +382,7 @@
+ 	char temp[1024], buf[16*1024];
+ 
+ 	strcpy(temp, "/tmp/fax2psXXXXXX");
+-	(void) mktemp(temp);
+-	fd = fopen(temp, "w");
++	fd = fdopen(mkstemp(temp), "w+");
+ 	if (fd == NULL) {
+ 	    fprintf(stderr, "Could not create temp file \"%s\"\n", temp);
+ 	    exit(-2);
diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist
index a9837e0cc66f..20c6c6ec6652 100644
--- a/graphics/tiff/pkg-plist
+++ b/graphics/tiff/pkg-plist
@@ -22,8 +22,8 @@ include/tiffio.h
 lib/libtiff.a
 lib/libtiff.so
 lib/libtiff.so.4
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
 share/doc/tiff/bugs.html
 share/doc/tiff/build.html
 share/doc/tiff/contrib.html
@@ -64,5 +64,8 @@ share/doc/tiff/v3.4beta033.html
 share/doc/tiff/v3.4beta034.html
 share/doc/tiff/v3.4beta035.html
 share/doc/tiff/v3.4beta036.html
+share/doc/tiff/v3.5.1.html
+share/doc/tiff/v3.5.2.html
+share/doc/tiff/v3.5.3.html
 @dirrm share/doc/tiff/images
 @dirrm share/doc/tiff