Update to version 3.4-beta37.

PR:		9641
Submitted by:	Mikhail Teterin <mi@aldan.algebra.com>

7 files changed, 75 insertions, 57 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 93cf2391ffbb..f6d6415af772 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -2,17 +2,17 @@
 # Version required:	3.4
 # Date created:		8 October 1996
 # Whom:			Richard Hwang <rhwang@bigpanda.com>
-#			Mikhail Teterin <mi@aldan.ziplink.net>
+#			Mikhail Teterin <mi@aldan.algebra.com>
 #			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.15 1999/03/01 15:42:35 itojun Exp $
+# $Id: Makefile,v 1.16 1999/03/29 06:41:43 asami Exp $
 #
 
-DISTNAME=	tiff-v3.4
-PKGNAME=	tiff-3.4a
+DISTNAME=	tiff-v3.4beta037
+PKGNAME=	tiff-3.4b37
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://ftp.sgi.com/graphics/tiff/
-EXTRACT_SUFX=	-tar.gz
+MASTER_SITES=	ftp://ftp.wizards.dupont.com/pub/ImageMagick/delegates/ \
+		ftp://ftp.fifi.org/pub/ImageMagick/delegates/
 
 MAINTAINER=	ports@freebsd.org
 
@@ -27,8 +27,14 @@ CONFIGURE_ARGS=	--with-ZIP --with-JPEG --with-DIR_BIN=${PREFIX}/bin \
 		--with-DIR_GZLIB=/usr/lib \
 		--with-DIR_JPEGLIB=${PREFIX}/lib \
 		--with-LIBGL=no --with-LIBIMAGE=no \
-		--with-INSTALL="/bin/sh ${WRKSRC}/port/install.sh" \
+		--with-INSTALL="${SH} ${WRKSRC}/port/install.sh" \
 		--noninteractive
+
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=--with-HTML=no
+PLIST=${PKGDIR}/PLIST.nodocs
+.endif
+
 MAN1=	fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 ras2tiff.1 \
 	rgb2ycbcr.1 sgi2tiff.1 thumbnail.1 tiff2bw.1 tiff2ps.1 tiffcmp.1 \
 	tiffcp.1 tiffdither.1 tiffdump.1 tiffgt.1 tiffinfo.1 tiffmedian.1 \
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 165482aec88c..5c3b41279dc8 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1 +1 @@
-MD5 (tiff-v3.4-tar.gz) = 2a7fbbccdb805e39489176f8eb9a703b
+MD5 (tiff-v3.4beta037.tar.gz) = d809f5b88130062c6a2d2f70d0558b7e
diff --git a/graphics/tiff/files/patch-ab b/graphics/tiff/files/patch-ab
index 1a910fd4626b..4cc2f15fde0f 100644
--- a/graphics/tiff/files/patch-ab
+++ b/graphics/tiff/files/patch-ab
@@ -1,22 +1,18 @@
---- configure.orig	Mon Apr 29 17:16:17 1996
-+++ configure	Fri Sep 18 16:38:02 1998
-@@ -1140,6 +1140,19 @@
- 	DSOOPTS='-shared'
- 	DSO=OSF
- 	;;
-+    *-freebsd*)
+--- configure.orig	Tue Sep  2 13:54:16 1997
++++ configure	Sat Jan 23 10:58:22 1999
+@@ -1146,5 +1146,13 @@
+     *-freebsd*)
+-	DSOSUF=so.${DIST_MAJOR}.0
 +	DSOSUF=so
-+	LIBCOPTS='-fpic -DPIC'
+ 	LIBCOPTS='-fpic -fPIC'
+-	DSO=FREEBSD
 +	if [ $PORTOBJFORMAT = elf ]; then
-+	    DSOSUF_VERSION=${DSOSUF}.4
-+	    DSOOPTS='-shared'
-+	    DSO=FREEBSD_ELF
++		DSOSUF_VERSION=${DSOSUF}.4
++		DSOOPTS='-shared'
++		DSO=FREEBSD_ELF
 +	else
-+	    DSOSUF_VERSION=${DSOSUF}.4.0
-+	    DSOOPTS='-Bshareable'
-+	    DSO=FREEBSD_AOUT
++		DSOSUF_VERSION=${DSOSUF}.4.0
++		DSOOPTS='-Bshareable'
++		DSO=FREEBSD_AOUT
 +	fi
-+	;;
-     *)  DSO=no;;
-     esac
-     test -z "$DSOSUF_VERSION" && DSOSUF_VERSION=${DSOSUF}
+ 	TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
diff --git a/graphics/tiff/files/patch-ac b/graphics/tiff/files/patch-ac
index 0c9fb4a77e3f..8b7f6309a316 100644
--- a/graphics/tiff/files/patch-ac
+++ b/graphics/tiff/files/patch-ac
@@ -1,21 +1,14 @@
---- ./tools/Makefile.in.orig	Tue Apr 30 07:16:37 1996
-+++ ./tools/Makefile.in	Sun May 25 22:37:20 1997
-@@ -43,14 +43,14 @@
- INSTALL	= @INSTALL@
- #
- COPTS	= @GCOPTS@
+--- tools/Makefile.in.orig	Tue Sep  2 13:54:34 1997
++++ tools/Makefile.in	Sat Jan 23 10:44:45 1999
+@@ -46 +46 @@
 -OPTIMIZER=-O
 +#OPTIMIZER=-O
- IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
+@@ -48 +48 @@
 -CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
 +CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -L../libtiff
- #
--LIBTIFF	= ${DEPTH}/libtiff/libtiff.@DSOSUF@
-+LIBTIFF	= ${DEPTH}/libtiff/libtiff.@DSOSUF_VERSION@
- LIBJPEG	= @LIBJPEG@
- LIBGZ	= @LIBGZ@
--LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@
-+LIBS	= ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@ -ltiff
- #
- OBJS=	\
- 	fax2tiff.o \
+@@ -50 +50 @@
+-TIFFLIB	= ${DEPTH}/libtiff/libtiff.@DSOSUF@
++TIFFLIB	= ${DEPTH}/libtiff/libtiff.@DSOSUF_VERSION@
+@@ -56 +56 @@
+-LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
++LIBS	= ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} -ltiff
diff --git a/graphics/tiff/pkg-descr b/graphics/tiff/pkg-descr
index 2d153164efb5..5e743ab3db8a 100644
--- a/graphics/tiff/pkg-descr
+++ b/graphics/tiff/pkg-descr
@@ -1,11 +1,11 @@
-This software provides support for the Tag Image File Format (TIFF), a
-widely used format for storing image data.
+This software provides support for the Tag Image File Format (TIFF),
+a widely used format for storing image data.
 
 Included in this software distribution is a library, libtiff, for
-reading and writing TIFF, a small collection of tools for doing simple
-manipulations of TIFF images on UNIX systems, and documentation on the
-library and tools. A small assortment of TIFF-related software for
-UNIX that has been contributed by others is also included.
+reading and writing TIFF, a small collection of tools for doing
+simple manipulations of TIFF images on UNIX systems, and documentation
+on the library and tools. A small assortment of TIFF-related software
+for UNIX that has been contributed by others is also included.
 
 The library is capable of dealing with images that are written to
 follow the 5.0 or 6.0 TIFF spec.  There is also considerable support
@@ -13,12 +13,8 @@ for some of the more esoteric portions of the 6.0 TIFF spec.
 
 SGI has also added html-documentation in addition to man-pages.
 
-  TIFF web site: http://www-mipl.jpl.nasa.gov/~ndr/tiff
-Master FTP site: ftp://ftp.sgi.com/graphics/tiff
+	  TIFF web site: http://www-mipl.jpl.nasa.gov/~ndr/tiff
+	Master FTP site: ftp://ftp.sgi.com/graphics/tiff
 
-
-NOTE: Since it is suspected that there's incompatibility between
-libtiff 3.4 and previous releases, we install this kit as follows.
-	/usr/local/include/tiff34/tiff.h
-	/usr/local/include/tiff34/tiffio.h
-	/usr/local/lib/libtiff34.a
+Unless NOPORTDOCS is defined, the html documentations is also
+installed locally in /usr/local/share/doc/tiff.
diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist
index b41474f03699..265c7bdd5ab7 100644
--- a/graphics/tiff/pkg-plist
+++ b/graphics/tiff/pkg-plist
@@ -43,6 +43,9 @@ share/doc/tiff/v3.4beta029.html
 share/doc/tiff/v3.4beta031.html
 share/doc/tiff/v3.4beta032.html
 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/images/back.gif
 share/doc/tiff/images/bali.jpg
 share/doc/tiff/images/cat.gif
diff --git a/graphics/tiff/pkg-plist.nodocs b/graphics/tiff/pkg-plist.nodocs
new file mode 100644
index 000000000000..57d4c25b7cbf
--- /dev/null
+++ b/graphics/tiff/pkg-plist.nodocs
@@ -0,0 +1,24 @@
+lib/libtiff.a
+lib/libtiff.so.4
+lib/libtiff.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+bin/fax2tiff
+bin/fax2ps
+bin/gif2tiff
+bin/pal2rgb
+bin/ppm2tiff
+bin/rgb2ycbcr
+bin/thumbnail
+bin/ras2tiff
+bin/tiff2bw
+bin/tiff2ps
+bin/tiffcmp
+bin/tiffcp
+bin/tiffdither
+bin/tiffdump
+bin/tiffinfo
+bin/tiffmedian
+bin/tiffsplit
+include/tiff.h
+include/tiffio.h