summaryrefslogtreecommitdiff
path: root/graphics/tiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-02-20 17:56:36 +0000
committerjoerg <joerg@pkgsrc.org>2006-02-20 17:56:36 +0000
commit7f2cd475d3b3934cb73f296dd80c1c10b6048cd1 (patch)
treed61fa3971a13d2bcfd58388f184814eac5cf19b2 /graphics/tiff
parent03f43858f48dc8c1223436da709ed4f6761eb0d9 (diff)
downloadpkgsrc-7f2cd475d3b3934cb73f296dd80c1c10b6048cd1.tar.gz
Include stddef.h instead of defining NULL manually. This fixes
the inclusion of tiffio.h from C++ as seen in digikam. Bump revision.
Diffstat (limited to 'graphics/tiff')
-rw-r--r--graphics/tiff/Makefile3
-rw-r--r--graphics/tiff/distinfo3
-rw-r--r--graphics/tiff/patches/patch-ab26
3 files changed, 30 insertions, 2 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index ef9064548d0..387353dc811 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2005/12/31 00:07:36 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2006/02/20 17:56:36 joerg Exp $
DISTNAME= tiff-3.8.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \
http://libtiff.maptools.org/dl/
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 20c0cc00bfd..9cd539f4371 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.33 2005/12/31 00:07:36 wiz Exp $
+$NetBSD: distinfo,v 1.34 2006/02/20 17:56:36 joerg Exp $
SHA1 (tiff-3.8.0.tar.gz) = ad05bb258d20b64cd1a42a2c0b1c9b24ff1a2316
RMD160 (tiff-3.8.0.tar.gz) = e38cc14f775b63bf420fe2d37cdad856ee67d522
Size (tiff-3.8.0.tar.gz) = 1330533 bytes
SHA1 (patch-aa) = edac79a6f3b61e9fc787fe14f750d88023a29bfa
+SHA1 (patch-ab) = b517cb8bc2212d3e6c5a70db1bdf45b85b78fc72
SHA1 (patch-at) = 10b93d13d94a3273bdc4a8ff1530ebdcd2cad6a6
diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab
new file mode 100644
index 00000000000..3b9d080ad5b
--- /dev/null
+++ b/graphics/tiff/patches/patch-ab
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.18 2006/02/20 17:56:36 joerg Exp $
+
+--- libtiff/tiffio.h.orig 2006-02-20 17:43:42.000000000 +0000
++++ libtiff/tiffio.h
+@@ -30,6 +30,10 @@
+ /*
+ * TIFF I/O Library Definitions.
+ */
++
++/* NULL */
++#include <stddef.h>
++
+ #include "tiff.h"
+ #include "tiffvers.h"
+
+@@ -97,10 +101,6 @@ typedef HFILE thandle_t; /* client data
+ typedef void* thandle_t; /* client data handle */
+ #endif /* USE_WIN32_FILEIO */
+
+-#ifndef NULL
+-# define NULL (void *)0
+-#endif
+-
+ /*
+ * Flags to pass to TIFFPrintDirectory to control
+ * printing of data structures that are potentially