From 6f307f276851337d160d44047fc231e4557161c2 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Thu, 12 Jan 2006 19:49:15 +0000
Subject: Fix glib.h's NULL definition for C++: it MUST be 0 there, not (void
 *)0. Bump revision.

---
 devel/glib/Makefile         |  4 ++--
 devel/glib/distinfo         |  4 ++--
 devel/glib/patches/patch-aj | 19 ++++++++++++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'devel/glib')

diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 86acabce4bf..3ffc6c0ad5a 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2005/04/11 21:45:23 tv Exp $
+# $NetBSD: Makefile,v 1.78 2006/01/12 19:49:15 joerg Exp $
 
 DISTNAME=		glib-1.2.10
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/devel/glib/distinfo b/devel/glib/distinfo
index 19bf70dd3a1..35e4571b909 100644
--- a/devel/glib/distinfo
+++ b/devel/glib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2005/06/06 18:57:30 jmmv Exp $
+$NetBSD: distinfo,v 1.17 2006/01/12 19:49:15 joerg Exp $
 
 SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa
 RMD160 (glib-1.2.10.tar.gz) = f19efe8c87ebeea979a4d36902d8a8209640cd95
@@ -12,4 +12,4 @@ SHA1 (patch-af) = 8fa1db64eb7a44e83e9e2ad483b12cf9fe50341e
 SHA1 (patch-ag) = efdff0d20a1c3280c9916405a8d89190c68b9604
 SHA1 (patch-ah) = 1e6dec25db0c72601868bb0f7c465202ecead81b
 SHA1 (patch-ai) = 6f6e5727bcb52655865b689c923601843d8d453d
-SHA1 (patch-aj) = ee05519f3b36e5b2a711ca01599ba1f0662faa20
+SHA1 (patch-aj) = 25cdacb4742589533f37113dcbb50ba7c6dd45bc
diff --git a/devel/glib/patches/patch-aj b/devel/glib/patches/patch-aj
index a072c5b2cf5..3bea6312973 100644
--- a/devel/glib/patches/patch-aj
+++ b/devel/glib/patches/patch-aj
@@ -1,8 +1,21 @@
-$NetBSD: patch-aj,v 1.1 2004/06/01 08:03:10 shannonjr Exp $
+$NetBSD: patch-aj,v 1.2 2006/01/12 19:49:15 joerg Exp $
 
---- glib.h.orig	2001-02-26 20:44:38.000000000 -0700
+--- glib.h.orig	2001-02-27 03:44:38.000000000 +0000
 +++ glib.h
-@@ -271,14 +271,18 @@ extern "C" {
+@@ -119,8 +119,12 @@ extern "C" {
+  *  defined then the current definition is correct.
+  */
+ #ifndef	NULL
++#ifdef		__cplusplus
++#define	NULL	(0L)
++#else
+ #define	NULL	((void*) 0)
+ #endif
++#endif
+ 
+ #ifndef	FALSE
+ #define	FALSE	(0)
+@@ -271,14 +275,18 @@ extern "C" {
  
  /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
   * macros, so we can refer to them as strings unconditionally.
-- 
cgit v1.2.3