pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/tiff Include stddef.h instead of defining NUL...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d4e3f9a42cd
branches:  trunk
changeset: 508507:1d4e3f9a42cd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Feb 20 17:56:36 2006 +0000

description:
Include stddef.h instead of defining NULL manually. This fixes
the inclusion of tiffio.h from C++ as seen in digikam.
Bump revision.

diffstat:

 graphics/tiff/Makefile         |   3 ++-
 graphics/tiff/distinfo         |   3 ++-
 graphics/tiff/patches/patch-ab |  26 ++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diffs (55 lines):

diff -r 847669ba1040 -r 1d4e3f9a42cd graphics/tiff/Makefile
--- a/graphics/tiff/Makefile    Mon Feb 20 17:23:44 2006 +0000
+++ b/graphics/tiff/Makefile    Mon Feb 20 17:56:36 2006 +0000
@@ -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 -r 847669ba1040 -r 1d4e3f9a42cd graphics/tiff/distinfo
--- a/graphics/tiff/distinfo    Mon Feb 20 17:23:44 2006 +0000
+++ b/graphics/tiff/distinfo    Mon Feb 20 17:56:36 2006 +0000
@@ -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 -r 847669ba1040 -r 1d4e3f9a42cd graphics/tiff/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/tiff/patches/patch-ab    Mon Feb 20 17:56:36 2006 +0000
@@ -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



Home | Main Index | Thread Index | Old Index