summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/tiff/INSTALL.OpenWindows6
-rw-r--r--graphics/tiff/Makefile33
-rw-r--r--graphics/tiff/PLIST20
-rw-r--r--graphics/tiff/buildlink2.mk4
-rw-r--r--graphics/tiff/distinfo21
-rw-r--r--graphics/tiff/patches/patch-ab33
-rw-r--r--graphics/tiff/patches/patch-ae18
-rw-r--r--graphics/tiff/patches/patch-af17
-rw-r--r--graphics/tiff/patches/patch-ag38
-rw-r--r--graphics/tiff/patches/patch-ah13
10 files changed, 112 insertions, 91 deletions
diff --git a/graphics/tiff/INSTALL.OpenWindows b/graphics/tiff/INSTALL.OpenWindows
index 667155ee94b..8efe20d9988 100644
--- a/graphics/tiff/INSTALL.OpenWindows
+++ b/graphics/tiff/INSTALL.OpenWindows
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL.OpenWindows,v 1.3 2003/08/30 23:01:31 jlam Exp $
+# $NetBSD: INSTALL.OpenWindows,v 1.4 2004/01/03 18:33:24 reed Exp $
-LIBTIFF="libtiff.so libtiff.so.3"
+LIBTIFF="libtiff.so.3 libtiff.so"
case ${STAGE} in
-PRE-INSTALL)
+POST-INSTALL)
for lib in ${LIBTIFF}; do
src="${PKG_PREFIX}/lib/${lib}"
dest="${X11BASE}/lib/${lib}"
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 5c7c07dae13..979d010b587 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,18 +1,28 @@
-# $NetBSD: Makefile,v 1.48 2003/10/03 15:38:46 salo Exp $
+# $NetBSD: Makefile,v 1.49 2004/01/03 18:33:24 reed Exp $
-DISTNAME= tiff-v3.5.7
-PKGNAME= tiff-3.5.7
-PKGREVISION= 1
+DISTNAME= tiff-v3.6.1
+PKGNAME= tiff-3.6.1
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/
+MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \
+ http://libtiff.maptools.org/dl/
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/}
MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.libtiff.org/
+HOMEPAGE= http://www.remotesensing.org/libtiff/
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
+
USE_BUILDLINK2= yes
USE_LIBTOOL= yes
HAS_CONFIGURE= yes
@@ -26,12 +36,15 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL.OpenWindows
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL.OpenWindows
.endif
+post-extract:
+ ${CP} ${DISTDIR}/${DIST_SUBDIR}/TIFFTechNote2.html ${WRKSRC}/html/
+
.if defined(USE_GIF)
-LZW_VERSION= 1.3
+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}
-
-post-patch:
+pre-patch:
${CP} ${LZWWRKDIR}/tif_lzw.c ${WRKSRC}/libtiff
.endif
@@ -39,7 +52,7 @@ CPPFLAGS+= -Dunix
CONFIGURE_ENV+= PREFIX="${PREFIX}"
CONFIGURE_ENV+= ENVOPTS="${CFLAGS} ${CPPFLAGS}"
-pre-patch:
+post-patch:
# reference correct relative man page when using .so
#
${MV} ${WRKSRC}/man/Makefile.in ${WRKSRC}/man/Makefile.in.in
diff --git a/graphics/tiff/PLIST b/graphics/tiff/PLIST
index e89077138cf..579474ee644 100644
--- a/graphics/tiff/PLIST
+++ b/graphics/tiff/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/05 10:33:35 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/01/03 18:33:24 reed Exp $
bin/fax2ps
bin/fax2tiff
bin/gif2tiff
bin/pal2rgb
bin/ppm2tiff
bin/ras2tiff
+bin/raw2tiff
bin/rgb2ycbcr
bin/thumbnail
bin/tiff2bw
+bin/tiff2pdf
bin/tiff2ps
bin/tiff2rgba
bin/tiffcmp
@@ -26,17 +28,19 @@ lib/libtiff.a
lib/libtiff.la
lib/libtiff.so
lib/libtiff.so.3
-lib/libtiff.so.3.5
+lib/libtiff.so.3.6
man/man1/fax2ps.1
man/man1/fax2tiff.1
man/man1/gif2tiff.1
man/man1/pal2rgb.1
man/man1/ppm2tiff.1
man/man1/ras2tiff.1
+man/man1/raw2tiff.1
man/man1/rgb2ycbcr.1
man/man1/sgi2tiff.1
man/man1/thumbnail.1
man/man1/tiff2bw.1
+man/man1/tiff2pdf.1
man/man1/tiff2ps.1
man/man1/tiff2rgba.1
man/man1/tiffcmp.1
@@ -57,6 +61,7 @@ man/man3/TIFFCurrentDirectory.3
man/man3/TIFFCurrentRow.3
man/man3/TIFFCurrentStrip.3
man/man3/TIFFCurrentTile.3
+man/man3/TIFFDataWidth.3
man/man3/TIFFDefaultStripSize.3
man/man3/TIFFDefaultTileSize.3
man/man3/TIFFError.3
@@ -67,6 +72,7 @@ man/man3/TIFFFindCODEC.3
man/man3/TIFFFlush.3
man/man3/TIFFFlushData.3
man/man3/TIFFGetField.3
+man/man3/TIFFGetFieldDefaulted.3
man/man3/TIFFGetMode.3
man/man3/TIFFIsByteSwapped.3
man/man3/TIFFIsMSB2LSB.3
@@ -87,6 +93,7 @@ man/man3/TIFFReadDirectory.3
man/man3/TIFFReadEncodedStrip.3
man/man3/TIFFReadEncodedTile.3
man/man3/TIFFReadRGBAImage.3
+man/man3/TIFFReadRGBAImageOriented.3
man/man3/TIFFReadRGBAStrip.3
man/man3/TIFFReadRGBATile.3
man/man3/TIFFReadRawStrip.3
@@ -111,6 +118,7 @@ man/man3/TIFFTileRowSize.3
man/man3/TIFFTileSize.3
man/man3/TIFFUnRegisterCODEC.3
man/man3/TIFFVGetField.3
+man/man3/TIFFVGetFieldDefaulted.3
man/man3/TIFFVSetField.3
man/man3/TIFFVStripSize.3
man/man3/TIFFVTileSize.3
@@ -125,6 +133,7 @@ man/man3/TIFFWriteScanline.3
man/man3/TIFFWriteTile.3
man/man3/TIFFbuffer.3
man/man3/TIFFcodec.3
+man/man3/TIFFcolor.3
man/man3/TIFFfree.3
man/man3/TIFFmalloc.3
man/man3/TIFFmemcmp.3
@@ -138,6 +147,7 @@ man/man3/TIFFstrip.3
man/man3/TIFFswab.3
man/man3/TIFFtile.3
man/man3/libtiff.3
+share/doc/html/tiff/TIFFTechNote2.html
share/doc/html/tiff/bugs.html
share/doc/html/tiff/build.html
share/doc/html/tiff/contrib.html
@@ -181,5 +191,11 @@ share/doc/html/tiff/v3.4beta036.html
share/doc/html/tiff/v3.5.1.html
share/doc/html/tiff/v3.5.2.html
share/doc/html/tiff/v3.5.3.html
+share/doc/html/tiff/v3.5.4.html
+share/doc/html/tiff/v3.5.5.html
+share/doc/html/tiff/v3.5.6-beta.html
+share/doc/html/tiff/v3.5.7.html
+share/doc/html/tiff/v3.6.0.html
+share/doc/html/tiff/v${PKGVERSION}.html
@dirrm share/doc/html/tiff/images
@dirrm share/doc/html/tiff
diff --git a/graphics/tiff/buildlink2.mk b/graphics/tiff/buildlink2.mk
index 4c025ad4f72..cda8c1c7a5a 100644
--- a/graphics/tiff/buildlink2.mk
+++ b/graphics/tiff/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:23 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/01/03 18:33:24 reed Exp $
.if !defined(TIFF_BUILDLINK2_MK)
TIFF_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= tiff
-BUILDLINK_DEPENDS.tiff?= tiff>=3.5.4
+BUILDLINK_DEPENDS.tiff?= tiff>=3.6.1
BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff
EVAL_PREFIX+= BUILDLINK_PREFIX.tiff=tiff
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index cc9e501b830..dc85718938f 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.10 2003/05/23 09:26:58 wiz Exp $
+$NetBSD: distinfo,v 1.11 2004/01/03 18:33:24 reed Exp $
-SHA1 (tiff-v3.5.7.tar.gz) = a4c3e27b6625ee9daec7c7c35ec3dedf59c14ca7
-Size (tiff-v3.5.7.tar.gz) = 951139 bytes
-SHA1 (libtiff-lzw-compression-kit-1.3.tar.gz) = 88809c8950e168a4d374b9f39d01a07282070717
-Size (libtiff-lzw-compression-kit-1.3.tar.gz) = 8847 bytes
+SHA1 (tiff-3.6.1/tiff-v3.6.1.tar.gz) = f7817145d8756152cc341804df6477f37ef93c38
+Size (tiff-3.6.1/tiff-v3.6.1.tar.gz) = 1072165 bytes
+SHA1 (tiff-3.6.1/TIFFTechNote2.html) = bf202e0ded764f0f6b9cda673245dea4ebfaf73f
+Size (tiff-3.6.1/TIFFTechNote2.html) = 35698 bytes
+SHA1 (tiff-3.6.1/libtiff-lzw-compression-kit-1.5.tar.gz) = 97d103ca8595cf6759fc6c52f4199be4b02b95b0
+Size (tiff-3.6.1/libtiff-lzw-compression-kit-1.5.tar.gz) = 9646 bytes
SHA1 (patch-aa) = 228fa627d820bce8f1767387e5b4dbdd8148fd52
-SHA1 (patch-ab) = 60a01fd74f271e512a7262964f5c7540164ac301
+SHA1 (patch-ab) = 186b597cb44768570d844d55a4f4358a89974633
SHA1 (patch-ac) = 754a02bb0561f8944fa1c870ab8dd6c1d6bf0c49
SHA1 (patch-ad) = 9c8c96d1f57902222541ba9b5f439c94d575d9eb
-SHA1 (patch-ae) = 146a27e003ec0d194f31b021b961699f3ffe9f94
-SHA1 (patch-af) = e168502fbdc7f94439aa71a5f67d85ce41d1a68e
-SHA1 (patch-ag) = 32ff74fe27c0fd00948c50db97a2ee71f34560ef
+SHA1 (patch-ae) = d82547ecce837e667ce8f821e0cf8c8a25af2187
+SHA1 (patch-af) = 51cbd54bff7999af84d6f4d49972f5ee519dd2e0
+SHA1 (patch-ag) = fb51f031121e6d290de59b08595bdbf7bc29f602
+SHA1 (patch-ah) = b824c4aaf1f97787afe1937ec471823164d03685
diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab
index cd47e1f361f..4a373f093b1 100644
--- a/graphics/tiff/patches/patch-ab
+++ b/graphics/tiff/patches/patch-ab
@@ -1,22 +1,13 @@
-$NetBSD: patch-ab,v 1.12 2002/03/05 10:33:36 martti Exp $
+$NetBSD: patch-ab,v 1.13 2004/01/03 18:33:24 reed Exp $
---- html/Makefile.in.orig Tue Jul 17 15:13:37 2001
-+++ html/Makefile.in Mon Mar 4 16:02:59 2002
-@@ -77,8 +77,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 \
-@@ -86,6 +84,8 @@
- images/cat.gif \
- images/cover.jpg \
- images/cramps.gif \
-+ images/dave.gif \
-+ images/info.gif \
- images/jello.jpg \
- images/jim.gif \
- images/note.gif \
+--- libtiff/tiff.h.orig Mon Oct 7 11:50:46 2002
++++ libtiff/tiff.h
+@@ -79,7 +79,7 @@ typedef char int8;
+ typedef unsigned char uint8;
+ typedef short int16;
+ typedef unsigned short uint16; /* sizeof (uint16) must == 2 */
+-#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__)
++#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__) || defined(_LP64)
+ typedef int int32;
+ typedef unsigned int uint32; /* sizeof (uint32) must == 4 */
+ #else
diff --git a/graphics/tiff/patches/patch-ae b/graphics/tiff/patches/patch-ae
index afa9b349432..e355b01f92a 100644
--- a/graphics/tiff/patches/patch-ae
+++ b/graphics/tiff/patches/patch-ae
@@ -1,26 +1,26 @@
-$NetBSD: patch-ae,v 1.6 2002/03/05 10:33:36 martti Exp $
+$NetBSD: patch-ae,v 1.7 2004/01/03 18:33:24 reed Exp $
---- man/Makefile.in.orig Wed Sep 26 19:32:24 2001
-+++ man/Makefile.in Mon Mar 4 16:07:34 2002
-@@ -343,9 +343,7 @@
+--- man/Makefile.in.orig Fri Nov 21 19:28:59 2003
++++ man/Makefile.in
+@@ -354,9 +354,7 @@ apps/Makefile:
${ECHO} 'install:'; \
for i in *.1; do \
f=${MANAPPNAME}; \
- ${ECHO} ' cd ..; ${INSTALL} -m 444 \
-- -F ${DESTDIR}${MAN}/${MANAPPS} \
+- -F $${DESTDIR}${MAN}/${MANAPPS} \
- -idb tiff.man.tools -src' apps/"$$i" '-O' "$$f"; \
-+ ${ECHO} ' ${BSD_INSTALL_DATA}' $$i ${MAN}/${MANAPPS}/$$f; \
++ ${ECHO} ' ${BSD_INSTALL_DATA}' $$i ${MAN}/${MANAPPS}/$$f; \
done \
)>apps/Makefile
lib/Makefile:
-@@ -356,9 +354,7 @@
+@@ -367,9 +365,7 @@ lib/Makefile:
${ECHO} 'install:'; \
for i in *.3t; do \
f=${MANLIBNAME}; \
- ${ECHO} ' cd ..; ${INSTALL} -m 444 \
-- -F ${DESTDIR}${MAN}/${MANLIB} \
+- -F $${DESTDIR}${MAN}/${MANLIB} \
- -idb tiff.man.dev -src' lib/"$$i" '-O' "$$f"; \
-+ ${ECHO} ' ${BSD_INSTALL_DATA}' $$i ${MAN}/${MANLIB}/$$f; \
++ ${ECHO} ' ${BSD_INSTALL_DATA}' $$i ${MAN}/${MANLIB}/$$f; \
done \
)>lib/Makefile
diff --git a/graphics/tiff/patches/patch-af b/graphics/tiff/patches/patch-af
index e58ef5ce731..687c55f9575 100644
--- a/graphics/tiff/patches/patch-af
+++ b/graphics/tiff/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2002/03/05 10:33:36 martti Exp $
+$NetBSD: patch-af,v 1.7 2004/01/03 18:33:24 reed Exp $
---- tools/Makefile.in.orig Tue Jul 17 15:13:37 2001
-+++ tools/Makefile.in Mon Mar 4 16:09:50 2002
-@@ -48,10 +48,10 @@
+--- tools/Makefile.in.orig Fri Nov 21 19:35:56 2003
++++ tools/Makefile.in
+@@ -48,10 +48,10 @@ OPTIMIZER=@OPTIMIZER@
IPATH = -I. -I${SRCDIR} -I${LIBDIR}
CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
#
@@ -15,15 +15,14 @@ $NetBSD: patch-af,v 1.6 2002/03/05 10:33:36 martti Exp $
LIBPORT = @LIBPORT@
MACHLIBS= @MACHDEPLIBS@
LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
-@@ -111,10 +111,8 @@
- true; \
+@@ -114,9 +114,8 @@ all: ${TARGETS}
fi
install: all
-- ${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 \
+ ${INSTALL} -idb tiff.sw.tools -m 755 \
- -dir ${DESTDIR}@DIR_BIN@
-- ${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 \
+- ${INSTALL} -idb tiff.sw.tools -m 755 \
- -F ${DESTDIR}@DIR_BIN@ -O ${TARGETS}
-+ ${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
++ -dir @DIR_BIN@
+ ${LIBTOOL} ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
@if [ "@LIBIMAGE@" = yes ]; then \
${INSTALL} -idb tiff.sw.tools -m 755 \
diff --git a/graphics/tiff/patches/patch-ag b/graphics/tiff/patches/patch-ag
index 016022736a7..77a28c3b1dd 100644
--- a/graphics/tiff/patches/patch-ag
+++ b/graphics/tiff/patches/patch-ag
@@ -1,27 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2002/12/25 14:25:27 wiz Exp $
+$NetBSD: patch-ag,v 1.4 2004/01/03 18:33:24 reed Exp $
---- tools/fax2tiff.c.orig Fri Jan 28 22:18:16 2000
-+++ tools/fax2tiff.c
-@@ -63,6 +63,13 @@ DummyReadProc(thandle_t fd, tdata_t buf,
- }
-
- static tsize_t
-+DummySeekProc(thandle_t fd, toff_t offset, int whence)
-+{
-+ (void) fd; (void) offset; (void) whence;
-+ return (0);
-+}
-+
-+static tsize_t
- DummyWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
- {
- (void) fd; (void) buf; (void) size;
-@@ -89,7 +96,7 @@ main(int argc, char* argv[])
- /* smuggle a descriptor out of the library */
- faxTIFF = TIFFClientOpen("(FakeInput)", "w", (thandle_t) -1,
- DummyReadProc, DummyWriteProc,
-- NULL, NULL, NULL, NULL, NULL);
-+ DummySeekProc, NULL, NULL, NULL, NULL);
- if (faxTIFF == NULL)
- return (EXIT_FAILURE);
- faxTIFF->tif_mode = O_RDONLY;
+--- libtiff/tif_fax3.c.orig Mon Sep 29 23:13:07 2003
++++ libtiff/tif_fax3.c
+@@ -311,7 +311,7 @@ Fax3Decode2D(TIFF* tif, tidata_t buf, ts
+ * this is <8 bytes. We optimize the code here to reflect the
+ * machine characteristics.
+ */
+-#if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__) || defined(__arch64__)
++#if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__) || defined(__arch64__) || defined(_LP64)
+ #define FILL(n, cp) \
+ switch (n) { \
+ case 15:(cp)[14] = 0xff; case 14:(cp)[13] = 0xff; case 13: (cp)[12] = 0xff;\
diff --git a/graphics/tiff/patches/patch-ah b/graphics/tiff/patches/patch-ah
new file mode 100644
index 00000000000..d7a649273ef
--- /dev/null
+++ b/graphics/tiff/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2004/01/03 18:33:25 reed Exp $
+
+--- html/Makefile.in.orig Wed Oct 2 08:14:34 2002
++++ html/Makefile.in
+@@ -86,6 +86,8 @@ HTMLFILES=\
+ v3.5.5.html \
+ v3.5.6-beta.html \
+ v3.5.7.html \
++ v3.6.0.html \
++ v3.6.1.html \
+ ${NULL}
+ IMAGES=\
+ images/back.gif \
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-12 08:14:44 +0000