diff --git a/graphics/tiff34/Makefile b/graphics/tiff34/Makefile
index b7232893306..31233de5cb5 100644
--- a/graphics/tiff34/Makefile
+++ b/graphics/tiff34/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 1999/04/18 23:19:52 brad Exp $
+# $OpenBSD: Makefile,v 1.11 1999/06/09 19:43:22 brad Exp $
 # NOTE:
 # At one time this port was installed as libtiff34.a to get rid of a
 # rumored incompatibility between libtiff3.3 and 3.4.  This is no longer
@@ -8,20 +8,19 @@
 #	libtiff34.so.1.0 -> libtiff.so.3.4
 #	tiff34.h -> tiff.h
 #	tiffio34.h -> tiffio.h
-#
 
-DISTNAME=	tiff-v3.4
-PKGNAME=	tiff-3.4
+DISTNAME=	tiff-v3.4beta037
+PKGNAME=	tiff-3.4b37
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://ftp.sgi.com/graphics/tiff/ \
-		ftp://ftp.isri.unlv.edu/pub/mirror/tiff/
-EXTRACT_SUFX=	-tar.gz
+MASTER_SITES=	ftp://ftp.sgi.com/graphics/tiff/ \
+		ftp://ftp.wizards.dupont.com/pub/ImageMagick/delegates/ \
+		ftp://ftp.fifi.org/pub/ImageMagick/delegates/
 
 NEED_VERSION=	1.64
 
-MAINTAINER=	don@OpenBSD.ORG
+MAINTAINER=	ports@openbsd.org
 
-LIB_DEPENDS=    jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=    jpeg.62:${PORTSDIR}/graphics/jpeg
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ZIP --with-JPEG --with-DIR_BIN=${PREFIX}/bin \
@@ -31,23 +30,22 @@ 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
 
 DOCDIR=	${PREFIX}/share/doc/tiff34
 
 # Create symbolic links for backwards compatibility
-#
 post-install:
 	${LN} -sf libtiff.a ${PREFIX}/lib/libtiff34.a
-	[ ! -f libtiff.so.3.4 ] || ${LN} -sf libtiff.so.3.4 ${PREFIX}/lib/libtiff34.so.1.0
+	@if [ ! -f libtiff.so.3.4 ]; then \
+	 ${LN} -sf libtiff.so.3.4 ${PREFIX}/lib/libtiff34.so.1.0; \
+	fi
 	${LN} -sf tiff.h ${PREFIX}/include/tiff34.h
 	${LN} -sf tiffio.h ${PREFIX}/include/tiffio34.h
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCDIR}/images
 	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/html/images/* ${DOCDIR}/images
-.endif
 	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/tiff34/files/md5 b/graphics/tiff34/files/md5
index ac77346b6de..aca533a923b 100644
--- a/graphics/tiff34/files/md5
+++ b/graphics/tiff34/files/md5
@@ -1,3 +1,3 @@
-MD5 (tiff-v3.4-tar.gz) = 2a7fbbccdb805e39489176f8eb9a703b
-RMD160 (tiff-v3.4-tar.gz) = 87e6ed88da2d6e11afce1a4530ddd6c00cab4178
-SHA1 (tiff-v3.4-tar.gz) = fbc5062bb701e2b8b52120f1bc01d3dcc3a28bc3
+MD5 (tiff-v3.4beta037.tar.gz) = d809f5b88130062c6a2d2f70d0558b7e
+RMD160 (tiff-v3.4beta037.tar.gz) = 3de659e21251543bc5de34bf7dbe3448d54eafbe
+SHA1 (tiff-v3.4beta037.tar.gz) = 36220ecec17fb01dd1ba7e0893cb71ade83f3e02
diff --git a/graphics/tiff34/patches/patch-aa b/graphics/tiff34/patches/patch-aa
index 13bada22a58..e7d4e72ccc2 100644
--- a/graphics/tiff34/patches/patch-aa
+++ b/graphics/tiff34/patches/patch-aa
@@ -1,5 +1,5 @@
---- libtiff/Makefile.in.orig	Tue Apr 30 00:16:21 1996
-+++ libtiff/Makefile.in	Wed Jun  2 00:09:04 1999
+--- libtiff/Makefile.in.orig	Wed Jun  9 14:47:11 1999
++++ libtiff/Makefile.in	Wed Jun  9 14:53:32 1999
 @@ -62,7 +62,7 @@
  #
  CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@
@@ -9,28 +9,27 @@
  CFLAGS	= @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY}
  #
  SRCS	= \
-@@ -199,7 +199,10 @@
- # OSF/1 3.2 shared lib rule
+@@ -210,6 +210,10 @@
  OSFdso: ${OBJS}
  	${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm
--
-+FREEBSDdso: ${OBJS}
+ 
++OPENBSDdso: ${OBJS}
 +	${LD} -Bshareable -Bforcearchive -x /usr/lib/c++rt0.o -o libtiff.@DSOSUF_VERSION@ \
 +		${OBJS} @LIBJPEG@ @LIBGZ@
 +	touch $@
  
  ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h
  ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h
-@@ -306,10 +309,10 @@
+@@ -318,10 +322,10 @@
  	done
  installDSO: @DSO@dso
  	if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then			\
 -	    ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@		\
-+	    ${INSTALL} -idb tiff.sw.tools.nostrip -m 555 -F @DIR_LIB@		\
++	    ${INSTALL} -idb tiff.sw.tools.nostrip -m 555 -F @DIR_LIB@	\
  		-O libtiff.@DSOSUF_VERSION@;				\
  	    ${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 444 -F @DIR_LIB@		\
+ 	    ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@		\
  		-O libtiff.@DSOSUF@;					\
diff --git a/graphics/tiff34/patches/patch-ab b/graphics/tiff34/patches/patch-ab
index 7f848cdb921..3f802e04909 100644
--- a/graphics/tiff34/patches/patch-ab
+++ b/graphics/tiff34/patches/patch-ab
@@ -1,23 +1,12 @@
-*** tools/fax2ps.c.orig	Sat Dec 20 04:54:39 1997
---- tools/fax2ps.c	Sat Dec 20 04:55:22 1997
-***************
-*** 378,385 ****
-  	char temp[1024], buf[16*1024];
-  
-  	strcpy(temp, "/tmp/fax2psXXXXXX");
-! 	(void) mktemp(temp);
-! 	fd = fopen(temp, "w");
-  	if (fd == NULL) {
-  	    fprintf(stderr, "Could not create temp file \"%s\"\n", temp);
-  	    exit(-2);
---- 378,386 ----
-  	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);
+--- tools/fax2ps.c.orig	Wed Jun  9 14:54:37 1999
++++ tools/fax2ps.c	Wed Jun  9 14:55:27 1999
+@@ -378,8 +378,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/tiff34/patches/patch-ac b/graphics/tiff34/patches/patch-ac
index bdbe5dc98a6..e599a68c007 100644
--- a/graphics/tiff34/patches/patch-ac
+++ b/graphics/tiff34/patches/patch-ac
@@ -1,26 +1,22 @@
---- configure.orig	Tue Apr 30 00:16:17 1996
-+++ configure	Wed Feb 11 01:04:47 1998
-@@ -1140,6 +1140,23 @@
- 	DSOOPTS='-shared'
- 	DSO=OSF
+--- configure.orig	Wed Jun  9 14:56:59 1999
++++ configure	Wed Jun  9 15:10:03 1999
+@@ -1149,6 +1149,19 @@
+ 	DSO=FREEBSD
+ 	TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
  	;;
-+    *-freebsd*)
-+	DSOSUF=so
-+	DSOSUF_VERSION=${DSOSUF}.1.0
-+	LIBCOPTS='-fpic -DPIC'
-+	DSOOPTS='-Bshareable'
-+	DSO=FREEBSD
-+	;;
 +    alpha-*-openbsd*)
 +	DSO=no
 +	;;
++    powerpc-*-openbsd*)
++	DSO=no
++	;;
 +    *-openbsd*)
 +	DSOSUF=so
 +	DSOSUF_VERSION=${DSOSUF}.3.4
-+	LIBCOPTS='-fpic -DPIC'
-+	DSOOPTS='-Bshareable'
-+	DSO=FREEBSD
++	LIBCOPTS='-fpic'
++	DSO=OPENBSD
++	TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
 +	;;
-     *)  DSO=no;;
-     esac
-     test -z "$DSOSUF_VERSION" && DSOSUF_VERSION=${DSOSUF}
+     *-linux*)
+ 	if [ -r /lib/libc.so.5 ]; then
+ 	    DSOSUF=so.${DIST_MAJOR}
diff --git a/graphics/tiff34/patches/patch-ad b/graphics/tiff34/patches/patch-ad
index a54aa22884f..d235b75f366 100644
--- a/graphics/tiff34/patches/patch-ad
+++ b/graphics/tiff34/patches/patch-ad
@@ -1,14 +1,12 @@
-*** config.guess.orig	Sat Nov 22 17:02:00 1997
---- config.guess	Sat Nov 22 17:03:06 1997
-***************
-*** 276,281 ****
---- 276,284 ----
-      *:NetBSD:*:*)
-  	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-  	exit 0 ;;
-+     *:OpenBSD:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ 	exit 0 ;;
-      *:GNU:*:*)
-  	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-  	exit 0 ;;
+--- config.guess.orig	Wed Jun  9 15:13:40 1999
++++ config.guess	Wed Jun  9 15:14:49 1999
+@@ -276,6 +276,9 @@
+     *:NetBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 	exit 0 ;;
++    *:OpenBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++	exit 0 ;;
+     *:GNU:*:*)
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit 0 ;;
diff --git a/graphics/tiff34/patches/patch-ae b/graphics/tiff34/patches/patch-ae
index f7b4359d3f3..6a5484fa016 100644
--- a/graphics/tiff34/patches/patch-ae
+++ b/graphics/tiff34/patches/patch-ae
@@ -1,6 +1,6 @@
---- tools/Makefile.in.orig	Mon Apr 29 15:16:37 1996
-+++ tools/Makefile.in	Tue Jun  9 16:10:42 1998
-@@ -43,14 +43,14 @@
+--- tools/Makefile.in.orig	Wed Jun  9 15:16:07 1999
++++ tools/Makefile.in	Wed Jun  9 15:18:06 1999
+@@ -43,17 +43,17 @@
  INSTALL	= @INSTALL@
  #
  COPTS	= @GCOPTS@
@@ -10,12 +10,15 @@
 -CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
 +CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -L../libtiff
  #
--LIBTIFF	= ${DEPTH}/libtiff/libtiff.@DSOSUF@
-+LIBTIFF	= ${DEPTH}/libtiff/libtiff.@DSOSUF_VERSION@
+-TIFFLIB	= ${DEPTH}/libtiff/libtiff.@DSOSUF@
++TIFFLIB	= ${DEPTH}/libtiff/libtiff.@DSOSUF_VERSION@
  LIBJPEG	= @LIBJPEG@
  LIBGZ	= @LIBGZ@
--LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@
-+LIBS	= @LIBPORT@ -ltiff ${LIBJPEG} ${LIBGZ} @MACHDEPLIBS@
+ LIBTIFF	= @TIFFLIBREF@
+ LIBPORT	= @LIBPORT@
+ MACHLIBS= @MACHDEPLIBS@
+-LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
++LIBS	= @LIBPORT@ -ltiff ${LIBJPEG} ${LIBGZ} ${LIBPORT} @MACHDEPLIBS@
  #
  OBJS=	\
  	fax2tiff.o \
diff --git a/graphics/tiff34/pkg/PLIST b/graphics/tiff34/pkg/PLIST
index 56875131fc4..92c712fe116 100644
--- a/graphics/tiff34/pkg/PLIST
+++ b/graphics/tiff34/pkg/PLIST
@@ -156,6 +156,9 @@ share/doc/tiff34/v3.4beta029.html
 share/doc/tiff34/v3.4beta031.html
 share/doc/tiff34/v3.4beta032.html
 share/doc/tiff34/v3.4beta033.html
+share/doc/tiff34/v3.4beta034.html
+share/doc/tiff34/v3.4beta035.html
+share/doc/tiff34/v3.4beta036.html
 share/doc/tiff34/images/back.gif
 share/doc/tiff34/images/bali.jpg
 share/doc/tiff34/images/cat.gif
diff --git a/graphics/tiff34/pkg/PLIST.noshared b/graphics/tiff34/pkg/PLIST.noshared
index 866fab00357..6dbf4ceddfb 100644
--- a/graphics/tiff34/pkg/PLIST.noshared
+++ b/graphics/tiff34/pkg/PLIST.noshared
@@ -150,6 +150,9 @@ share/doc/tiff34/v3.4beta029.html
 share/doc/tiff34/v3.4beta031.html
 share/doc/tiff34/v3.4beta032.html
 share/doc/tiff34/v3.4beta033.html
+share/doc/tiff34/v3.4beta034.html
+share/doc/tiff34/v3.4beta035.html
+share/doc/tiff34/v3.4beta036.html
 share/doc/tiff34/images/back.gif
 share/doc/tiff34/images/bali.jpg
 share/doc/tiff34/images/cat.gif