Update TiffIO to 1.2.0e.

Changes:
- Use libtiff>3.8.
- bit order is different from byte order. So don't messup endianness
  with LSBfirst in bitmaps.
- Added support for Lab up to 3x16bits and RGB/RGBA up to 4x32bits.

4 files changed, 35 insertions, 113 deletions

diff --git a/graphics/TiffIO/Makefile b/graphics/TiffIO/Makefile
index 4e6ce558d03..a6da2b232ec 100644
--- a/graphics/TiffIO/Makefile
+++ b/graphics/TiffIO/Makefile
@@ -1,35 +1,33 @@
-# $NetBSD: Makefile,v 1.7 2006/03/17 21:27:38 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/23 03:25:12 minskim Exp $
 #
 
-DISTNAME=		TiffIO-110c
-PKGNAME=		TiffIO-1.1.0.3
-PKGREVISION=		3
+DISTNAME=		TiffIO-120e
+PKGNAME=		TiffIO-1.2.0e
 CATEGORIES=		graphics
-MASTER_SITES=		http://artis.imag.fr/Software/TiffIO/
+MASTER_SITES=		http://artis.imag.fr/Software/TiffIO/SOURCES/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://artis.imag.fr/Software/TiffIO/
 COMMENT=		Tiff support for QT image loader
 
-USE_TOOLS+=     gmake
-USE_LANGUAGES=  c c++
+USE_TOOLS+=	gmake
+USE_LANGUAGES=	c c++
 
-do-configure:
-	(cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile TiffIO.pro; \
-		${SED} -e 's,-rpath.*$$,-rpath "${QTDIR}/lib",' < Makefile > Makefile.new; \
-		${MV} Makefile.new Makefile; \
-		)
-
-do-install:
-	(cd ${WRKSRC} && \
-	libtool --mode=install ${INSTALL_PROGRAM} libTiffIO.la ${PREFIX}/qt3/plugins/imageformats && \
-	libtool --finish ${PREFIX}/qt3/plugins/imageformats)
-
-BUILD_ENV+=		QTDIR="${QTDIR}"
+BUILD_ENV+=	QTDIR=${QTDIR:Q}
 
+.include "../../devel/zlib/buildlink3.mk"
+BUILDLINK_DEPENDS.tiff+=	tiff>=3.8.1
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
 
+do-configure:
+	cd ${WRKSRC} && ${SETENV} QTDIR=${QTDIR:Q} ${QTDIR}/bin/qmake \
+		CONFIG+=libtiff \
+		JPEG=${BUILDLINK_PREFIX.jpeg}/include \
+		TIFF_ROOT=${BUILDLINK_PREFIX.tiff} \
+		ZLIB=${BUILDLINK_PREFIX.zlib} TiffIO.pro
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/TiffIO/distinfo b/graphics/TiffIO/distinfo
index 9fe757e4b23..a6a60559d54 100644
--- a/graphics/TiffIO/distinfo
+++ b/graphics/TiffIO/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/02/23 17:59:49 joerg Exp $
+$NetBSD: distinfo,v 1.3 2006/03/23 03:25:12 minskim Exp $
 
-SHA1 (TiffIO-110c.tgz) = 061b291c7b123b8936ba1d52989fd44c422dbd94
-RMD160 (TiffIO-110c.tgz) = d8f6c17f6669887bfea0cc8cf1dca1855298b41a
-Size (TiffIO-110c.tgz) = 826601 bytes
-SHA1 (patch-aa) = 09ebe7b537112f3782eb42c8bc88453ec65fae3e
+SHA1 (TiffIO-120e.tgz) = ff27532efc97db5f5ab964b202ff320133ba4108
+RMD160 (TiffIO-120e.tgz) = 11f1a6ff85d713c62545e8bffcf6590a37228a2f
+Size (TiffIO-120e.tgz) = 1144429 bytes
+SHA1 (patch-ab) = a79c4f0a4ac734c387a67c7571b06f06ca7774b3
diff --git a/graphics/TiffIO/patches/patch-aa b/graphics/TiffIO/patches/patch-aa
deleted file mode 100644
index affe90a215c..00000000000
--- a/graphics/TiffIO/patches/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/02/23 17:59:50 joerg Exp $
-
---- TiffIO.pri.orig	2006-02-23 02:30:46.000000000 +0100
-+++ TiffIO.pri
-@@ -23,11 +23,7 @@
- CONFIG -= debug_and_release debug_and_release_target
- CONFIG += qt
- 
--isEmpty(TIFF): TIFF=$$(TIFF)
--isEmpty(TIFF): TIFF=libtiff-3.7.2
--message( +++++ Using TIFF $${TIFF} )
--!exists( $$TIFF/tiffio.h ) : error( Unable to find libtiff )
--INCLUDEPATH = $$TIFF $$INCLUDEPATH
-+INCLUDEPATH = $${PREFIX}/include $$INCLUDEPATH
- INCLUDEPATH -= /usr/include
- 
- #Note: All *_SUPPORT flags are set inside tif_config.h
-@@ -40,70 +36,10 @@ win32: !jpeg: CONFIG += no-jpeg
- #       (that generates link error on Qt4/nmake compiles).
- DEFINES += TIF_PLATFORM_CONSOLE=1
- 
--HEADERS += \
--    $$TIFF/tiffio.h
--
- SOURCES += \
-     TiffIO.cpp
- 
--##############################################################################
--# Auto detect, for linux, if a tiff plateform was required
--
--linux: !exists( $$TIFF/tif_aux.c ) : CONFIG += libtiff
--!libtiff {
--	message( +++++ Using internal $$TIFF sources )
--
--	HEADERS += \
--    	$$TIFF/tiff.h          \
--    	$$TIFF/tiffiop.h       \
--    	$$TIFF/tiffvers.h      \
--    	$$TIFF/tif_config.h
--
--	SOURCES += \
--    	$$TIFF/tif_aux.c       \
--    	$$TIFF/tif_close.c     \
--    	$$TIFF/tif_codec.c     \
--    	$$TIFF/tif_color.c     \
--    	$$TIFF/tif_compress.c  \
--    	$$TIFF/tif_dir.c       \
--    	$$TIFF/tif_dirinfo.c   \
--    	$$TIFF/tif_dirread.c   \
--    	$$TIFF/tif_dirwrite.c  \
--    	$$TIFF/tif_dumpmode.c  \
--    	$$TIFF/tif_error.c     \
--    	$$TIFF/tif_extension.c \
--    	$$TIFF/tif_fax3.c      \
--    	$$TIFF/tif_fax3sm.c    \
--    	$$TIFF/tif_flush.c     \
--    	$$TIFF/tif_getimage.c  \
--    	$$TIFF/tif_luv.c       \
--    	$$TIFF/tif_next.c      \
--    	$$TIFF/tif_open.c      \
--    	$$TIFF/tif_packbits.c  \
--    	$$TIFF/tif_predict.c   \
--    	$$TIFF/tif_print.c     \
--    	$$TIFF/tif_read.c      \
--    	$$TIFF/tif_strip.c     \
--    	$$TIFF/tif_swab.c      \
--    	$$TIFF/tif_thunder.c   \
--    	$$TIFF/tif_tile.c      \
--    	$$TIFF/tif_version.c   \
--    	$$TIFF/tif_warning.c   \
--    	$$TIFF/tif_write.c
--
--	!no-zlib: SOURCES += $$TIFF/tif_zip.c $$TIFF/tif_pixarlog.c
-- 	 no-zlib: DEFINES += NO_ZLIB=1
--	!no-lzw:  SOURCES += $$TIFF/tif_lzw.c
-- 	 no-lzw:  DEFINES += NO_LZW=1
--	!no-jpeg: SOURCES += $$TIFF/tif_jpeg.c
-- 	 no-jpeg: DEFINES += NO_JPEG=1
--
--	win32: SOURCES += $$TIFF/tif_win32.c
--	unix : SOURCES += $$TIFF/tif_unix.c
--} else {
--	message( Using system Tiff )
--	LIBS *= -ltiff
--}
-+LIBS *= -ltiff
- 
- ##############################################################################
- # Auto-detect Qt3 or Qt4 support mode...
diff --git a/graphics/TiffIO/patches/patch-ab b/graphics/TiffIO/patches/patch-ab
new file mode 100644
index 00000000000..5157dfa259d
--- /dev/null
+++ b/graphics/TiffIO/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/03/23 03:25:12 minskim Exp $
+
+--- TiffIO.pro.orig	2006-01-12 01:57:40.000000000 +0000
++++ TiffIO.pro
+@@ -15,7 +15,7 @@ TARGET  = TiffIO
+ # NOTE: Install features have been removed from Qt 4.0 (and 4.1) doc,
+ #       *but* they are still working...
+ #
+-linux {
++unix {
+     target.path = $$(RPM_BUILD_ROOT)$$(QTDIR)/plugins/imageformats/
+     INSTALLS += target
+ }