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.147
diff -u -p -r1.89 -r1.147
--- pkgsrc/devel/glib2/Makefile	2006/02/05 23:08:42	1.89
+++ pkgsrc/devel/glib2/Makefile	2008/10/24 15:59:52	1.147
@@ -1,24 +1,25 @@
-# $NetBSD: Makefile,v 1.89 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: Makefile,v 1.147 2008/10/24 15:59:52 wiz Exp $
 
-DISTNAME=		glib-2.8.6
+# When updating glib2, please apply patch-ak to configure.in
+# Then run a matching version of autoconf to regen patch-aa.
+DISTNAME=		glib-2.18.2
 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/glib/2.18/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.18/ \
+			${MASTER_SITE_GNOME:=sources/glib/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		jmmv@NetBSD.org
-HOMEPAGE=		http://www.gtk.org/docs/glib_toc.html
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://developer.gnome.org/doc/API/2.0/glib/glib.html
 COMMENT=		Some useful routines for C programming (glib2)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-BUILD_USES_MSGFMT=	yes
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake perl:run pkg-config
+USE_TOOLS+=		gmake msgfmt perl:run pkg-config
+USE_LANGUAGES=		c c++ c99
 USE_LIBTOOL=		yes
 TEST_TARGET=		check
 
@@ -33,25 +34,30 @@ PKGCONFIG_OVERRIDE+=	gobject-2.0-uninsta
 PKGCONFIG_OVERRIDE+=	gobject-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gthread-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-unix-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
+CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
+CONFIGURE_ARGS+=	--with-pcre=system
+# need pcre utf8 + unicode-properties
+BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE:Q}
 
 CONFIGURE_ENV+=		PERL_PATH=${PERL5:Q}
 
-.include "options.mk"
-
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "NetBSD"
+# configure detects wrongly
+CONFIGURE_ENV+=		ac_cv_func_statfs=no
+.endif
+
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
 CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
@@ -62,12 +68,20 @@ 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."
+SUBST_MESSAGE.thr=	Fixing libgthread.
+
+.endif
 
+.if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*)
+CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
+.endif
+
+.if ${OPSYS} == "HPUX"
+CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
 .endif
 
 # Handle directories shared with devel/glib.
@@ -75,9 +89,24 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/glib
 				{ print "@unexec $${RMDIR} %D/" $$2 \
 				  " 2>/dev/null || $${TRUE}"; next; }
 
+PLIST_VARS+=		fam
+
+# Overridden in options.mk.
+CONFIGURE_ARGS+=	--disable-fam
+
+.if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1"
+.include "options.mk"
+.endif
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
+CONFIGURE_ARGS+=	--disable-threads
+.else
 .include "../../mk/pthread.buildlink3.mk"
+.endif
+.include "../../devel/pcre/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"