Upgrade tiff to 3.7.1.

Remove OpenWindows workaround in pkgsrc for this.

Too many changes to include here.
See http://www.remotesensing.org/libtiff/v3.7.1.html
and http://www.remotesensing.org/libtiff/v3.7.0.html
and previous change files for changes information.

tiff-3.7.1 now includes the lzw compression code again.
It also uses autoconf and libtool now.

A new tool is bmp2tiff.

Docs are placed under share/doc/tiff/html instead of share/doc/html/tiff.

Many manpage symlinks are now missing. (This was reported to tiff list.)

1 files changed, 10 insertions, 51 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index bfea8bc79f0..bf57bccd90b 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,17 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2004/12/22 03:57:15 reed Exp $
+# $NetBSD: Makefile,v 1.61 2004/12/28 23:10:10 reed Exp $
 
-DISTNAME=	tiff-v3.6.1
-PKGNAME=	${DISTNAME:S/-v/-/}
-PKGREVISION=	6
+DISTNAME=	tiff-3.7.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/old/ \
-		ftp://ftp.fu-berlin.de/unix/graphics/tiff/old/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-# need DISTFILES above for adding lzw-files to it if USE_GIF is defined
-# in mk.conf
-DISTFILES+=	TIFFTechNote2.html
-# It is in CVS for Release-v3-6-1, but accidently excluded from distribution.
-SITES_TIFFTechNote2.html=	${MASTER_SITE_LOCAL:=tiff/}
+MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
+		http://libtiff.maptools.org/dl/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.remotesensing.org/libtiff/
@@ -19,56 +11,23 @@ COMMENT=	Library and tools for reading and writing TIFF data files
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-# use DIST_SUBDIR because TIFFTechNote2.html could be changed later
-DIST_SUBDIR=	${PKGNAME_NOREV}
-
 BUILD_DEFS+=	USE_GIF
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=	yes
 USE_LIBTOOL=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--noninteractive --site=${FILESDIR} --prefix=${PREFIX}
-MAKE_ENV+=	PKGDIRMODE=${PKGDIRMODE}
-
-.include "../../mk/bsd.prefs.mk"
+GNU_CONFIGURE=	yes
 
-.if !empty(X11BASE:M*openwin)
-USE_PKGINSTALL=		yes
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL.OpenWindows
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL.OpenWindows
-.endif
+CONFIGURE_ARGS+=	--enable-rpath
 
-post-extract:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/TIFFTechNote2.html ${WRKSRC}/html/
+.include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_GIF)
-LZW_VERSION=	1.5
-DISTFILES+=	libtiff-lzw-compression-kit-${LZW_VERSION}.tar.gz
-EXTRACT_ONLY+=	libtiff-lzw-compression-kit-${LZW_VERSION}.tar.gz
-LZWWRKDIR=	${WRKDIR}/libtiff-lzw-compression-kit-${LZW_VERSION}
-pre-patch:
-	${CP} ${LZWWRKDIR}/tif_lzw.c ${WRKSRC}/libtiff
+.if !defined(USE_GIF) || !empty(USE_GIF:M[Nn][Oo])
+# disable support for LZW algorithm
+CONFIGURE_ARGS+=	--disable-lzw
 .endif
 
-CPPFLAGS+=	-Dunix
-CONFIGURE_ENV+=	PREFIX="${PREFIX}"
-CONFIGURE_ENV+=	ENVOPTS="${CFLAGS} ${CPPFLAGS}"
-
-INSTALLATION_DIRS=	share/doc/html
-
-# reference correct relative man page when using .so;
-# libtoolize build of TIFF tools
-post-patch:
-	${MV} ${WRKSRC}/man/Makefile.in ${WRKSRC}/man/Makefile.in.in
-	${SED}	-e "s,\$${MANDIR}\(.*\)\.\([0-9]\).,${PREFIX}/man/man\2/\1.\2,g" \
-		-e "s,\$${MANDIR}\(.*\)\.\([0-9]\),${PREFIX}/man/man\2/\1.\2,g" \
-		${WRKSRC}/man/Makefile.in.in  > ${WRKSRC}/man/Makefile.in
-	${MV} ${WRKSRC}/tools/Makefile.in ${WRKSRC}/tools/Makefile.in.in
-	${SED}	-e "s,\(\$${CC} -o\),\$${LIBTOOL} \1,g" \
-		${WRKSRC}/tools/Makefile.in.in  > ${WRKSRC}/tools/Makefile.in
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"