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.89
retrieving revision 1.103
diff -u -p -r1.89 -r1.103
--- pkgsrc/devel/glib2/Makefile	2006/02/05 23:08:42	1.89
+++ pkgsrc/devel/glib2/Makefile	2006/07/23 14:15:02	1.103
@@ -1,24 +1,22 @@
-# $NetBSD: Makefile,v 1.89 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: Makefile,v 1.103 2006/07/23 14:15:02 wiz Exp $
 
-DISTNAME=		glib-2.8.6
+DISTNAME=		glib-2.12.1
 PKGNAME=		${DISTNAME:S/glib/glib2/}
-PKGREVISION=		1
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.8/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.8/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.8/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.12/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.12/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.12/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		jmmv@NetBSD.org
+MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.gtk.org/docs/glib_toc.html
 COMMENT=		Some useful routines for C programming (glib2)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILD_USES_MSGFMT=	yes
-
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake perl:run pkg-config
+USE_TOOLS+=		gmake msgfmt perl:run pkg-config
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 TEST_TARGET=		check
 
@@ -41,7 +39,7 @@ CONFIGURE_ARGS+=	--includedir=${PREFIX}/
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 
-CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=gnu
+CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE:Q}
@@ -56,6 +54,12 @@ CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
 CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mmipspro*)
+CFLAGS+=		-c99
+.endif
+
 .if ${OPSYS} == "FreeBSD"
 
 SUBST_CLASSES+=		thr
@@ -66,10 +70,14 @@ SUBST_SED.thr=		-e "s|@G_THREAD_LIBS_FOR
 .  else
 SUBST_SED.thr=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
 .  endif
-SUBST_MESSAGE.thr=	"Fixing libgthread."
+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 \
@@ -78,6 +86,10 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/glib
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.if !empty(LOWER_OPSYS:Mirix5*)
+CONFIGURE_ARGS+=	--disable-threads
+.else
 .include "../../mk/pthread.buildlink3.mk"
+.endif
 
 .include "../../mk/bsd.pkg.mk"