Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/devel/glib2/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/devel/glib2/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.99
retrieving revision 1.107
diff -u -p -r1.99 -r1.107
--- pkgsrc/devel/glib2/Makefile	2006/05/29 17:06:49	1.99
+++ pkgsrc/devel/glib2/Makefile	2006/10/06 18:05:21	1.107
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.99 2006/05/29 17:06:49 drochner Exp $
+# $NetBSD: Makefile,v 1.107 2006/10/06 18:05:21 wiz Exp $
 
-DISTNAME=		glib-2.10.3
+DISTNAME=		glib-2.12.4
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.10/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.10/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.12/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.12/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.12/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		wiz@NetBSD.org
@@ -16,6 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgvie
 
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt perl:run pkg-config
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 TEST_TARGET=		check
 
@@ -65,14 +66,18 @@ SUBST_CLASSES+=		thr
 SUBST_STAGE.thr=	post-patch
 SUBST_FILES.thr=	gthread/Makefile.in
 .  if ${OS_VERSION:R} >= 5
-SUBST_SED.thr=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
+SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
 .  else
-SUBST_SED.thr=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
+SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
 .  endif
 SUBST_MESSAGE.thr=	Fixing libgthread.
 
 .endif
 
+.if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*)
+CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
+.endif
+
 # Handle directories shared with devel/glib.
 PRINT_PLIST_AWK+=	/^@dirrm include\/glib$$/ \
 				{ print "@unexec $${RMDIR} %D/" $$2 \