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.210
retrieving revision 1.220
diff -u -p -r1.210 -r1.220
--- pkgsrc/devel/glib2/Makefile	2012/09/15 10:04:09	1.210
+++ pkgsrc/devel/glib2/Makefile	2014/06/05 23:41:26	1.220
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.210 2012/09/15 10:04:09 obache Exp $
+# $NetBSD: Makefile,v 1.220 2014/06/05 23:41:26 enami Exp $
 
 .include "Makefile.common"
-.include "options.mk"
 
-PKGREVISION=		1
-CATEGORIES=		devel
+CATEGORIES=		devel gnome
+PKGREVISION=		2
 
 COMMENT=		Some useful routines for C programming (glib2)
 
-USE_TOOLS+=		msgfmt perl:run
+USE_TOOLS+=		msgfmt perl:run readlink
 
 PKGCONFIG_OVERRIDE+=	glib-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gmodule-2.0.pc.in
@@ -32,7 +31,7 @@ CHECK_INTERPRETER_SKIP+=	bin/gtester-rep
 CHECK_INTERPRETER_SKIP+=	bin/gdbus-codegen
 
 # need pcre utf8 + unicode-properties
-BUILDLINK_API_DEPENDS.pcre+=	pcre>=8.11
+BUILDLINK_API_DEPENDS.pcre+=	pcre>=8.31
 # to avoid pkg-config dependency, explicitly specify pcre location
 CONFIGURE_ARGS+=	PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
 CONFIGURE_ARGS+=	PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
@@ -44,16 +43,16 @@ LIBS.SunOS+=		-lnsl -lsocket
 CPPFLAGS.SunOS+=	-DBSD_COMP
 
 .if ${OBJECT_FMT} == "ELF"
-. if ${OPSYS} == "SunOS"
-.  if ${ABI} == 32
+.  if ${OPSYS} == "SunOS"
+.    if ${ABI} == 32
 # Solaris libelf in 32-bit mode does not support largefile.  We patch files
 # individually to force _FILE_OFFSET_BITS=32 but need to turn back on -lelf
 # after configure disabled it.
 CONFIGURE_ENV+=		LIBELF_LIBS='-lelf'
+.    endif
+.  else
+.  include "../../devel/libelf/buildlink3.mk"
 .  endif
-. else
-.include "../../devel/libelf/buildlink3.mk"
-. endif
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"