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.221
retrieving revision 1.232
diff -u -p -r1.221 -r1.232
--- pkgsrc/devel/glib2/Makefile	2014/09/05 20:51:44	1.221
+++ pkgsrc/devel/glib2/Makefile	2017/05/04 12:19:12	1.232
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.221 2014/09/05 20:51:44 wiz Exp $
+# $NetBSD: Makefile,v 1.232 2017/05/04 12:19:12 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -26,8 +26,8 @@ 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.31
@@ -43,7 +43,7 @@ CPPFLAGS.SunOS+=	-DBSD_COMP
 
 .if ${OBJECT_FMT} == "ELF"
 .  if ${OPSYS} == "SunOS"
-.    if ${ABI} == 32
+.    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.