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.205
retrieving revision 1.231.6.1
diff -u -p -r1.205 -r1.231.6.1
--- pkgsrc/devel/glib2/Makefile	2012/05/22 20:40:07	1.205
+++ pkgsrc/devel/glib2/Makefile	2017/05/06 15:29:10	1.231.6.1
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.205 2012/05/22 20:40:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.231.6.1 2017/05/06 15:29:10 bsiegert Exp $
 
 .include "Makefile.common"
-.include "options.mk"
 
-PKGREVISION=		1
-
-CATEGORIES=		devel
+CATEGORIES=		devel gnome
 
 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
@@ -29,11 +26,11 @@ FILES_SUBST+=		GLIB_SCHEMAS_DIR=${PREFIX
 # gtester is the glib unit testing and reporting framework
 # agc doesn't want glib2 to depend on python so we install it
 # in a broken and useless state.
-CHECK_INTERPRETER_SKIP+=	bin/gtester-report
-CHECK_INTERPRETER_SKIP+=	bin/gdbus-codegen
+CHECK_INTERPRETER_SKIP+=	bin/gdbus-codegen bin/gtester-report
+CHECK_WRKREF_SKIP+=		bin/gdbus-codegen bin/gtester-report
 
 # 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"
@@ -45,7 +42,16 @@ LIBS.SunOS+=		-lnsl -lsocket
 CPPFLAGS.SunOS+=	-DBSD_COMP
 
 .if ${OBJECT_FMT} == "ELF"
-.include "../../devel/libelf/buildlink3.mk"
+.  if ${OPSYS} == "SunOS"
+.    if empty(ABI:U:M64)
+# 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
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"