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.243
diff -u -p -r1.210 -r1.243
--- pkgsrc/devel/glib2/Makefile	2012/09/15 10:04:09	1.210
+++ pkgsrc/devel/glib2/Makefile	2018/10/08 10:12:05	1.243
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.210 2012/09/15 10:04:09 obache Exp $
+# $NetBSD: Makefile,v 1.243 2018/10/08 10:12:05 prlw1 Exp $
 
+PKGREVISION= 2
 .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,10 +28,10 @@ FILES_SUBST+=		GLIB_SCHEMAS_DIR=${PREFIX
 # 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_WRKREF_SKIP+=		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"
@@ -44,18 +43,30 @@ LIBS.SunOS+=		-lnsl -lsocket
 CPPFLAGS.SunOS+=	-DBSD_COMP
 
 .if ${OBJECT_FMT} == "ELF"
-. if ${OPSYS} == "SunOS"
-.  if ${ABI} == 32
+.  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
-. else
-.include "../../devel/libelf/buildlink3.mk"
-. endif
 .endif
 
+# XXX: Kludge to avoid uncoditionally pick up some gtkdoc-* tools if gtk-doc
+# XXX: package is installed and then fails in the installation phase.
+CONFIGURE_ENV+=	ac_cv_prog_GTKDOC_CHECK= \
+		ac_cv_path_GTKDOC_CHECK_PATH= \
+		ac_cv_path_GTKDOC_REBASE= \
+		ac_cv_path_GTKDOC_MKPDF=
+
+# to run gdbus-codegen to generate gdbus-daemon-generated.{h,c}
+TOOL_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+PYTHON_FOR_BUILD_ONLY?=	yes
+.include "../../lang/python/pyversion.mk"
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"