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.104
retrieving revision 1.115
diff -u -p -r1.104 -r1.115
--- pkgsrc/devel/glib2/Makefile	2006/08/17 22:35:10	1.104
+++ pkgsrc/devel/glib2/Makefile	2007/05/08 19:29:07	1.115
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.104 2006/08/17 22:35:10 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2007/05/08 19:29:07 wiz Exp $
 
-DISTNAME=		glib-2.12.2
+DISTNAME=		glib-2.12.12
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.12/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.12/ \
+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
 
@@ -13,10 +13,11 @@ HOMEPAGE=		http://www.gtk.org/docs/glib_
 COMMENT=		Some useful routines for C programming (glib2)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt perl:run pkg-config
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++ c99
 USE_LIBTOOL=		yes
 TEST_TARGET=		check
 
@@ -34,9 +35,7 @@ PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 
 CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
@@ -54,21 +53,15 @@ 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
 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.