From 13b00d2284153730a5fd4f8a33dd1ba19f132d90 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 29 May 2008 08:03:58 +0000
Subject: Take ownership of lib/gio/modules directory. Bump PKGREVISION.

---
 devel/glib2/Makefile      | 4 ++--
 devel/glib2/PLIST         | 4 +++-
 devel/glib2/buildlink3.mk | 6 +++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'devel')

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index a38cadde1da..aaeb69c30cd 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.140 2008/05/29 07:28:07 wiz Exp $
+# $NetBSD: Makefile,v 1.141 2008/05/29 08:03:58 wiz Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
 DISTNAME=		glib-2.16.3
 PKGNAME=		${DISTNAME:S/glib/glib2/}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.16/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.16/ \
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 3e8799c5d6d..a80f26c0b41 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2008/04/13 13:15:59 tnn Exp $
+@comment $NetBSD: PLIST,v 1.42 2008/05/29 08:03:58 wiz Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -488,7 +488,9 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrm share/glib-2.0
 @dirrm lib/glib-2.0/include
 @dirrm lib/glib-2.0
+@exec ${MKDIR} %D/lib/gio/modules 2>/dev/null || ${TRUE}
 @dirrm lib/gio/modules
+@dirrm lib/gio
 @dirrm include/glib/glib-2.0/gobject
 @dirrm include/glib/glib-2.0/glib
 @dirrm include/glib/glib-2.0/gio
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index 243ca399140..c97deb68fac 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/05/21 15:54:34 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2008/05/29 08:03:58 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB2_BUILDLINK3_MK:=	${GLIB2_BUILDLINK3_MK}+
@@ -15,6 +15,10 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glib2
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0
 BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.14.3
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
+
+PRINT_PLIST_AWK+=	/^@dirrm lib\/gio$$/ { next; }
+PRINT_PLIST_AWK+=	/^@dirrm lib\/gio\/modules$$/ \
+				{ print "@comment in glib2: " $$0; next; }
 .endif	# GLIB2_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
-- 
cgit v1.2.3