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.146
retrieving revision 1.154
diff -u -p -r1.146 -r1.154
--- pkgsrc/devel/glib2/Makefile	2008/10/06 15:20:26	1.146
+++ pkgsrc/devel/glib2/Makefile	2009/01/25 16:56:20	1.154
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.146 2008/10/06 15:20:26 tnn Exp $
+# $NetBSD: Makefile,v 1.154 2009/01/25 16:56:20 drochner 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.18.1
+DISTNAME=		glib-2.18.4
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.18/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.18/ \
@@ -43,11 +44,6 @@ CONFIGURE_ARGS+=	--includedir=${PREFIX}/
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 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}
 
@@ -63,7 +59,6 @@ CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCAL
 CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
 .if ${OPSYS} == "FreeBSD"
-
 SUBST_CLASSES+=		thr
 SUBST_STAGE.thr=	post-patch
 SUBST_FILES.thr=	gthread/Makefile.in
@@ -80,6 +75,11 @@ SUBST_MESSAGE.thr=	Fixing libgthread.
 CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
 .endif
 
+# Workaround for Bug#562310
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
+TOOLS_NOOP+=		gtkdoc-rebase
+.endif
+
 .if ${OPSYS} == "HPUX"
 CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
 .endif
@@ -91,9 +91,6 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/glib
 
 PLIST_VARS+=		fam
 
-# Overridden in options.mk.
-CONFIGURE_ARGS+=	--disable-fam
-
 .if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1"
 .include "options.mk"
 .endif
@@ -107,6 +104,8 @@ CONFIGURE_ARGS+=	--disable-threads
 .else
 .include "../../mk/pthread.buildlink3.mk"
 .endif
+# need pcre utf8 + unicode-properties
+BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
 .include "../../devel/pcre/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"