pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   prlw1
Date:           Mon Jun  3 09:53:51 UTC 2019

Modified Files:
        pkgsrc/devel/gdbus-codegen: Makefile PLIST
        pkgsrc/devel/glib2: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/devel/glib2-tools: Makefile
        pkgsrc/devel/glib2/patches: patch-gio_gresource-tool.c
            patch-glib_gmain.c patch-gobject_glib-mkenums.in
        pkgsrc/sysutils: Makefile
Added Files:
        pkgsrc/devel/gdbus-codegen: distinfo
        pkgsrc/devel/gdbus-codegen/patches: patch-meson.build
        pkgsrc/devel/glib2: options.mk
        pkgsrc/devel/glib2/patches: patch-gio_gdbus-2.0_codegen_meson.build
            patch-gio_meson.build patch-glib_meson.build
            patch-gobject_meson.build patch-meson.build
Removed Files:
        pkgsrc/devel/gdbus-codegen: hacks.mk
        pkgsrc/devel/glib2: hacks.mk
        pkgsrc/devel/glib2/patches: patch-Makefile.in patch-aa patch-af
            patch-ah patch-aha patch-ak patch-al patch-am patch-an patch-cb
            patch-cd patch-cl patch-cm
            patch-gio_gdbus-2.0_codegen_gdbus-codegen.in
            patch-glib_gthread-posix.c patch-glib_gtimezone.c
            patch-gobject_Makefile.am patch-gobject_Makefile.in
            patch-gobject_glib-genmarshal.in
        pkgsrc/sysutils/gio-fam: DESCR Makefile PLIST hacks.mk

Log Message:
Update glib2 to 2.60.2

GLib's move to meson from autotools means we are effectively starting
from scratch with non-linux build fixes. Support for python 2 has
also been dropped (given that meson requires python 3). I replaced
sysutils/gio-fam with a build option.

The full lengthy list of changes is available from:

  https://gitlab.gnome.org/GNOME/glib/tags/2.60.2

Some highlights:
* Improve network status detection with NetworkManager (!781)
* Add async GIO API: g_file_query_default_handler_async(), g_app_info_launch_uris_async() (#1249, #1347)
* Add overlay support to g_resources_get_info(). (#1445)
* Add writev() and writev_all() APIs to GOutputStream and GPollableOutputStream,
  and provide implementations of them for many subclasses. (#1431)
* Hide bind mounts from GIO mount listings. (#1271)
* Automatically realign data passed to `g_variant_new_from_bytes()` or
  `g_variant_new_from_data()` if it is not correctly aligned. This prevents
  misaligned accesses on architectures which don’t support them. Callers should
  still aim to correctly align data to get higher performance. (#1342)
* Support `ld -b binary` (on platforms which support it; i.e. Linux) to provide
  large pre-compiled `GResource` resources with a fast compilation time. (#1489+* Drop Python 2 support and require Python 3.4+. See discussion on
  https://mail.gnome.org/archives/desktop-devel-list/2018-July/msg00004.html.
  (!196)
* Various fixes to eliminate thread races, found by thread sanitizer (tsan).


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/gdbus-codegen/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gdbus-codegen/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gdbus-codegen/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/gdbus-codegen/hacks.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gdbus-codegen/patches/patch-meson.build
cvs rdiff -u -r1.245 -r1.246 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/glib2/Makefile.common
cvs rdiff -u -r1.101 -r1.102 pkgsrc/devel/glib2/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/glib2/buildlink3.mk
cvs rdiff -u -r1.237 -r1.238 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.10 -r0 pkgsrc/devel/glib2/hacks.mk
cvs rdiff -u -r0 -r1.21 pkgsrc/devel/glib2/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/glib2-tools/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/glib2/patches/patch-Makefile.in \
    pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_gdbus-codegen.in \
    pkgsrc/devel/glib2/patches/patch-gobject_Makefile.am \
    pkgsrc/devel/glib2/patches/patch-gobject_Makefile.in \
    pkgsrc/devel/glib2/patches/patch-gobject_glib-genmarshal.in
cvs rdiff -u -r1.62 -r0 pkgsrc/devel/glib2/patches/patch-aa
cvs rdiff -u -r1.17 -r0 pkgsrc/devel/glib2/patches/patch-af
cvs rdiff -u -r1.13 -r0 pkgsrc/devel/glib2/patches/patch-ah
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/glib2/patches/patch-aha \
    pkgsrc/devel/glib2/patches/patch-glib_gthread-posix.c
cvs rdiff -u -r1.21 -r0 pkgsrc/devel/glib2/patches/patch-ak
cvs rdiff -u -r1.9 -r0 pkgsrc/devel/glib2/patches/patch-al \
    pkgsrc/devel/glib2/patches/patch-am pkgsrc/devel/glib2/patches/patch-cd
cvs rdiff -u -r1.19 -r0 pkgsrc/devel/glib2/patches/patch-an
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/glib2/patches/patch-cb \
    pkgsrc/devel/glib2/patches/patch-cm \
    pkgsrc/devel/glib2/patches/patch-glib_gtimezone.c
cvs rdiff -u -r1.15 -r0 pkgsrc/devel/glib2/patches/patch-cl
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build \
    pkgsrc/devel/glib2/patches/patch-gio_meson.build \
    pkgsrc/devel/glib2/patches/patch-glib_meson.build \
    pkgsrc/devel/glib2/patches/patch-gobject_meson.build \
    pkgsrc/devel/glib2/patches/patch-meson.build
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/glib2/patches/patch-gio_gresource-tool.c \
    pkgsrc/devel/glib2/patches/patch-glib_gmain.c
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in
cvs rdiff -u -r1.814 -r1.815 pkgsrc/sysutils/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/sysutils/gio-fam/DESCR \
    pkgsrc/sysutils/gio-fam/PLIST
cvs rdiff -u -r1.17 -r0 pkgsrc/sysutils/gio-fam/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/gio-fam/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gdbus-codegen/Makefile
diff -u pkgsrc/devel/gdbus-codegen/Makefile:1.19 pkgsrc/devel/gdbus-codegen/Makefile:1.20
--- pkgsrc/devel/gdbus-codegen/Makefile:1.19    Thu Apr 25 07:32:45 2019
+++ pkgsrc/devel/gdbus-codegen/Makefile Mon Jun  3 09:53:50 2019
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.19 2019/04/25 07:32:45 maya Exp $
+# $NetBSD: Makefile,v 1.20 2019/06/03 09:53:50 prlw1 Exp $
 
-PKGREVISION= 2
 .include "../../devel/glib2/Makefile.common"
 
 PKGNAME:=      ${PKGNAME:S/glib2/gdbus-codegen/}
@@ -8,18 +7,21 @@ CATEGORIES=   devel gnome
 
 COMMENT=       Generate code and/or documentation for one or more D-Bus interfaces
 
-NOT_FOR_PLATFORM=      HPUX-*-* OSF1-*-*
+WRKSRC=                ${WRKDIR}/${DISTNAME}/gio/gdbus-2.0/codegen
 
-USE_TOOLS+=            pkg-config msgfmt perl:run
+SUBST_CLASSES+=                autovars
+SUBST_STAGE.autovars=  pre-configure
+SUBST_MESSAGE.autovars=        autoconf meson.build
+SUBST_FILES.autovars=  meson.build config.py.in gdbus-codegen.in
+SUBST_VARS.autovars=   PKGVERSION PYTHONBIN
+SUBST_SED.autovars=    -e 's,@VERSION@,${PKGVERSION:Q},'
+SUBST_SED.autovars+=   -e 's,@PYTHON@,${PYTHONBIN:Q},'
+SUBST_SED.autovars+=   -e 's,@DATADIR@,${PREFIX}/share,'
 
-BUILD_DIRS=            gio/gdbus-2.0/codegen
-INSTALL_DIRS=          ${BUILD_DIRS}
+REPLACE_PYTHON+=       gdbus-codegen.in
 
-REPLACE_PYTHON+=       gio/gdbus-2.0/codegen/gdbus-codegen.in
+DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-DEPENDS+=              ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-
-.include "../../devel/glib2/modules.mk"
+.include "../../devel/py-meson/build.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gdbus-codegen/PLIST
diff -u pkgsrc/devel/gdbus-codegen/PLIST:1.2 pkgsrc/devel/gdbus-codegen/PLIST:1.3
--- pkgsrc/devel/gdbus-codegen/PLIST:1.2        Fri Apr 19 22:21:41 2013
+++ pkgsrc/devel/gdbus-codegen/PLIST    Mon Jun  3 09:53:50 2019
@@ -1,26 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2013/04/19 22:21:41 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/06/03 09:53:50 prlw1 Exp $
 bin/gdbus-codegen
 share/glib-2.0/codegen/__init__.py
-share/glib-2.0/codegen/__init__.pyc
-share/glib-2.0/codegen/__init__.pyo
 share/glib-2.0/codegen/codegen.py
-share/glib-2.0/codegen/codegen.pyc
-share/glib-2.0/codegen/codegen.pyo
 share/glib-2.0/codegen/codegen_docbook.py
-share/glib-2.0/codegen/codegen_docbook.pyc
-share/glib-2.0/codegen/codegen_docbook.pyo
 share/glib-2.0/codegen/codegen_main.py
-share/glib-2.0/codegen/codegen_main.pyc
-share/glib-2.0/codegen/codegen_main.pyo
 share/glib-2.0/codegen/config.py
-share/glib-2.0/codegen/config.pyc
-share/glib-2.0/codegen/config.pyo
 share/glib-2.0/codegen/dbustypes.py
-share/glib-2.0/codegen/dbustypes.pyc
-share/glib-2.0/codegen/dbustypes.pyo
 share/glib-2.0/codegen/parser.py
-share/glib-2.0/codegen/parser.pyc
-share/glib-2.0/codegen/parser.pyo
 share/glib-2.0/codegen/utils.py
-share/glib-2.0/codegen/utils.pyc
-share/glib-2.0/codegen/utils.pyo

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.245 pkgsrc/devel/glib2/Makefile:1.246
--- pkgsrc/devel/glib2/Makefile:1.245   Thu Apr 25 07:32:45 2019
+++ pkgsrc/devel/glib2/Makefile Mon Jun  3 09:53:50 2019
@@ -1,75 +1,54 @@
-# $NetBSD: Makefile,v 1.245 2019/04/25 07:32:45 maya Exp $
+# $NetBSD: Makefile,v 1.246 2019/06/03 09:53:50 prlw1 Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 
-CATEGORIES=            devel gnome
+CATEGORIES=    devel gnome
+COMMENT=       Some useful routines for C programming (glib2)
 
-COMMENT=               Some useful routines for C programming (glib2)
+DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo
+PATCHDIR=      ${.CURDIR}/../../devel/glib2/patches
 
-USE_TOOLS+=            msgfmt perl:run readlink
+.include "options.mk"
 
-PKGCONFIG_OVERRIDE+=   glib-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gmodule-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gmodule-export-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gmodule-no-export-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gobject-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gthread-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gio-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gio-unix-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gio-windows-2.0.pc.in
-
-FILES_SUBST+=          GIO_MODULES_DIR=${PREFIX}/lib/gio/modules
-FILES_SUBST+=          GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules
-FILES_SUBST+=          GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas
-FILES_SUBST+=          GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas
-
-# 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_WRKREF_SKIP+=            bin/gtester-report
-
-# need pcre utf8 + unicode-properties
-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"
-
-# needs gz_header structure
-BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.2.1
-
-LIBS.SunOS+=           -lnsl -lsocket
-CPPFLAGS.SunOS+=       -DBSD_COMP
-
-.if ${OBJECT_FMT} == "ELF"
-.  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
-
-# 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=
+MESON_ARGS+=   -Dinstalled_tests=false
+# Avoid linux dependency on libmount-dev
+MESON_ARGS+=   -Dlibmount=false
+
+REPLACE_PYTHON+=       gio/gio-querymodules-wrapper.py
+REPLACE_PYTHON+=       gio/tests/gengiotypefuncs.py
+REPLACE_PYTHON+=       gio/tests/static-link.py
+REPLACE_PYTHON+=       glib/update-gtranslit.py
+REPLACE_PYTHON+=       gobject/tests/mkenums.py
+REPLACE_PYTHON+=       tests/gen-casefold-txt.py
+REPLACE_PYTHON+=       tests/gen-casemap-txt.py
+
+BUILD_DEFS+=           VARBASE
+SUBST_CLASSES+=                dbusdb
+SUBST_MESSAGE.dbusdb=  Adjust dbus machine uuid path to dbus package
+SUBST_STAGE.dbusdb=    pre-configure
+SUBST_FILES.dbusdb=    gio/gdbusconnection.c
+SUBST_FILES.dbusdb+=   gio/gdbusprivate.c
+SUBST_FILES.dbusdb+=   po/glib20.pot
+SUBST_FILES.dbusdb+=   po/*.po
+SUBST_SED.dbusdb=      -e 's,/var/lib/dbus,${VARBASE}/db/dbus,g'
+
+SUBST_CLASSES+=                xdg
+SUBST_MESSAGE.xdg=     Adjust XDG_DATA_DIRS so schemas and pixbuf loaders are found
+SUBST_STAGE.xdg=       pre-configure
+SUBST_FILES.xdg=       glib/gcharset.c glib/gutils.c gio/xdgmime/xdgmime.c
+SUBST_SED.xdg=         -e 's,/usr/local/share/:/usr/share/,${PREFIX}/share,'
+SUBST_SED.xdg+=                -e 's,/etc/xdg,${PKG_SYSCONFDIR}/xdg,'
+SUBST_SED.xdg+=                -e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,'
 
 # 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"
+TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+PYTHON_FOR_BUILD_ONLY= yes
+.include "../../lang/python/application.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/py-meson/build.mk"
 .include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/glib2/Makefile.common
diff -u pkgsrc/devel/glib2/Makefile.common:1.66 pkgsrc/devel/glib2/Makefile.common:1.67
--- pkgsrc/devel/glib2/Makefile.common:1.66     Sun Aug 19 18:32:27 2018
+++ pkgsrc/devel/glib2/Makefile.common  Mon Jun  3 09:53:50 2019
@@ -1,93 +1,19 @@
-# $NetBSD: Makefile.common,v 1.66 2018/08/19 18:32:27 wiz Exp $
+# $NetBSD: Makefile.common,v 1.67 2019/06/03 09:53:50 prlw1 Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2-tools/Makefile
-# used by sysutils/gio-fam/Makefile
 
-# When updating this package, please apply patch-ak to configure.in and
-# then run a matching version of autoconf to regen patch-aa.
-DISTNAME=      glib-2.56.2
+DISTNAME=      glib-2.60.2
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
-CATEGORIES=    # empty; redefined in Makefile
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    prlw1%cam.ac.uk@localhost
 HOMEPAGE=      https://developer.gnome.org/glib/
-COMMENT=       # empty; redefined in Makefile
 LICENSE=       gnu-lgpl-v2.1
 
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake pkg-config
-USE_LANGUAGES=         c c++ c99
-USE_LIBTOOL=           yes
-TEST_TARGET=           check
+USE_LANGUAGES= c c++ c99
+USE_TOOLS+=    pkg-config
 
-DISTINFO_FILE=         ${.CURDIR}/../../devel/glib2/distinfo
-PATCHDIR=              ${.CURDIR}/../../devel/glib2/patches
-
-GNU_CONFIGURE=         yes
-CONFIGURE_ENV+=                PKGLOCALEDIR=${PKGLOCALEDIR}
-CONFIGURE_ARGS+=       --disable-fam   # See sysutils/gio-fam.
-CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/glib
-CONFIGURE_ARGS+=       ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
-CONFIGURE_ARGS+=       --with-pcre=system
-CONFIGURE_ARGS+=       --disable-dtrace
-CONFIGURE_ARGS+=       --disable-man  # Requires xsltproc and Docbook.
-# Avoid unnecessary autotools invocation.
-CONFIGURE_ARGS+=       --disable-maintainer-mode
-# Avoid linux dependency on libmount-dev
-CONFIGURE_ARGS.Linux+= --disable-libmount
-
-# When ICONV_TYPE=gnu ensure we explicitly use the GNU version, to avoid
-# conflicts between iconv.h from converters/libiconv and builtin libiconv
-# which may be non-GNU.
-CONFIGURE_ARGS.gnu-iconv=      --with-libiconv=gnu
-
-CONFIGURE_ENV+=                PERL_PATH=${PERL5:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-CPPFLAGS+=             -DPREFIX="\"${PREFIX}\""
-CPPFLAGS+=             -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
-CPPFLAGS+=             -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-
-.if ${OPSYS} == "FreeBSD"
-SUBST_CLASSES+=                thr
-SUBST_STAGE.thr=       pre-configure
-SUBST_FILES.thr=       gthread/Makefile.in
-.  if ${OS_VERSION:R} >= 5
-SUBST_SED.thr+=                -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
-.  else
-SUBST_SED.thr+=                -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
-.  endif
-SUBST_MESSAGE.thr=     Fixing libgthread.
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*)
-CONFIGURE_ENV+=                gt_cv_c_wchar_t=no
-.endif
-
-BUILDLINK_TRANSFORM.Darwin+=   rm:-Werror=missing-prototypes
-BUILDLINK_TRANSFORM.SunOS+=    rm:-Werror=format=2
-
-CONFIGURE_ENV.HPUX+=           ac_cv_func_mmap_fixed_mapped=yes
-
-.include "../../mk/dlopen.buildlink3.mk"
-
-.if !empty(MACHINE_PLATFORM:MIRIX-5*)
-CONFIGURE_ARGS+=       --disable-threads
-.else
-.include "../../mk/pthread.buildlink3.mk"
-.endif
-
-BUILD_DEFS+=           VARBASE
-SUBST_CLASSES+=                dbusdb
-SUBST_MESSAGE.dbusdb=  Adjust dbus machine uuid path to dbus package
-SUBST_STAGE.dbusdb=    pre-configure
-SUBST_FILES.dbusdb=    gio/gdbusconnection.c
-SUBST_FILES.dbusdb+=   gio/gdbusprivate.c
-SUBST_FILES.dbusdb+=   po/glib20.pot
-SUBST_FILES.dbusdb+=   po/*.po
-SUBST_SED.dbusdb=      -e 's,/var/lib/dbus,${VARBASE}/db/dbus,g'
+PYTHON_VERSIONS_INCOMPATIBLE=  27

Index: pkgsrc/devel/glib2/PLIST
diff -u pkgsrc/devel/glib2/PLIST:1.101 pkgsrc/devel/glib2/PLIST:1.102
--- pkgsrc/devel/glib2/PLIST:1.101      Sun Aug 19 18:32:27 2018
+++ pkgsrc/devel/glib2/PLIST    Mon Jun  3 09:53:50 2019
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.101 2018/08/19 18:32:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.102 2019/06/03 09:53:50 prlw1 Exp $
 bin/gapplication
 bin/gdbus
 bin/gio
+bin/gio-launch-desktop
 bin/gio-querymodules
 bin/glib-compile-resources
 bin/glib-compile-schemas
@@ -9,276 +10,289 @@ bin/glib-gettextize
 bin/gobject-query
 bin/gresource
 bin/gsettings
-bin/gtester
-bin/gtester-report
-include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
-include/glib/gio-unix-2.0/gio/gfiledescriptorbased.h
-include/glib/gio-unix-2.0/gio/gunixconnection.h
-include/glib/gio-unix-2.0/gio/gunixcredentialsmessage.h
-include/glib/gio-unix-2.0/gio/gunixfdlist.h
-include/glib/gio-unix-2.0/gio/gunixfdmessage.h
-include/glib/gio-unix-2.0/gio/gunixinputstream.h
-include/glib/gio-unix-2.0/gio/gunixmounts.h
-include/glib/gio-unix-2.0/gio/gunixoutputstream.h
-include/glib/gio-unix-2.0/gio/gunixsocketaddress.h
-include/glib/glib-2.0/gio/gaction.h
-include/glib/glib-2.0/gio/gactiongroup.h
-include/glib/glib-2.0/gio/gactiongroupexporter.h
-include/glib/glib-2.0/gio/gactionmap.h
-include/glib/glib-2.0/gio/gappinfo.h
-include/glib/glib-2.0/gio/gapplication.h
-include/glib/glib-2.0/gio/gapplicationcommandline.h
-include/glib/glib-2.0/gio/gasyncinitable.h
-include/glib/glib-2.0/gio/gasyncresult.h
-include/glib/glib-2.0/gio/gbufferedinputstream.h
-include/glib/glib-2.0/gio/gbufferedoutputstream.h
-include/glib/glib-2.0/gio/gbytesicon.h
-include/glib/glib-2.0/gio/gcancellable.h
-include/glib/glib-2.0/gio/gcharsetconverter.h
-include/glib/glib-2.0/gio/gcontenttype.h
-include/glib/glib-2.0/gio/gconverter.h
-include/glib/glib-2.0/gio/gconverterinputstream.h
-include/glib/glib-2.0/gio/gconverteroutputstream.h
-include/glib/glib-2.0/gio/gcredentials.h
-include/glib/glib-2.0/gio/gdatagrambased.h
-include/glib/glib-2.0/gio/gdatainputstream.h
-include/glib/glib-2.0/gio/gdataoutputstream.h
-include/glib/glib-2.0/gio/gdbusactiongroup.h
-include/glib/glib-2.0/gio/gdbusaddress.h
-include/glib/glib-2.0/gio/gdbusauthobserver.h
-include/glib/glib-2.0/gio/gdbusconnection.h
-include/glib/glib-2.0/gio/gdbuserror.h
-include/glib/glib-2.0/gio/gdbusinterface.h
-include/glib/glib-2.0/gio/gdbusinterfaceskeleton.h
-include/glib/glib-2.0/gio/gdbusintrospection.h
-include/glib/glib-2.0/gio/gdbusmenumodel.h
-include/glib/glib-2.0/gio/gdbusmessage.h
-include/glib/glib-2.0/gio/gdbusmethodinvocation.h
-include/glib/glib-2.0/gio/gdbusnameowning.h
-include/glib/glib-2.0/gio/gdbusnamewatching.h
-include/glib/glib-2.0/gio/gdbusobject.h
-include/glib/glib-2.0/gio/gdbusobjectmanager.h
-include/glib/glib-2.0/gio/gdbusobjectmanagerclient.h
-include/glib/glib-2.0/gio/gdbusobjectmanagerserver.h
-include/glib/glib-2.0/gio/gdbusobjectproxy.h
-include/glib/glib-2.0/gio/gdbusobjectskeleton.h
-include/glib/glib-2.0/gio/gdbusproxy.h
-include/glib/glib-2.0/gio/gdbusserver.h
-include/glib/glib-2.0/gio/gdbusutils.h
-include/glib/glib-2.0/gio/gdrive.h
-include/glib/glib-2.0/gio/gdtlsclientconnection.h
-include/glib/glib-2.0/gio/gdtlsconnection.h
-include/glib/glib-2.0/gio/gdtlsserverconnection.h
-include/glib/glib-2.0/gio/gemblem.h
-include/glib/glib-2.0/gio/gemblemedicon.h
-include/glib/glib-2.0/gio/gfile.h
-include/glib/glib-2.0/gio/gfileattribute.h
-include/glib/glib-2.0/gio/gfileenumerator.h
-include/glib/glib-2.0/gio/gfileicon.h
-include/glib/glib-2.0/gio/gfileinfo.h
-include/glib/glib-2.0/gio/gfileinputstream.h
-include/glib/glib-2.0/gio/gfileiostream.h
-include/glib/glib-2.0/gio/gfilemonitor.h
-include/glib/glib-2.0/gio/gfilenamecompleter.h
-include/glib/glib-2.0/gio/gfileoutputstream.h
-include/glib/glib-2.0/gio/gfilterinputstream.h
-include/glib/glib-2.0/gio/gfilteroutputstream.h
-include/glib/glib-2.0/gio/gicon.h
-include/glib/glib-2.0/gio/ginetaddress.h
-include/glib/glib-2.0/gio/ginetaddressmask.h
-include/glib/glib-2.0/gio/ginetsocketaddress.h
-include/glib/glib-2.0/gio/ginitable.h
-include/glib/glib-2.0/gio/ginputstream.h
-include/glib/glib-2.0/gio/gio-autocleanups.h
-include/glib/glib-2.0/gio/gio.h
-include/glib/glib-2.0/gio/gioenums.h
-include/glib/glib-2.0/gio/gioenumtypes.h
-include/glib/glib-2.0/gio/gioerror.h
-include/glib/glib-2.0/gio/giomodule.h
-include/glib/glib-2.0/gio/gioscheduler.h
-include/glib/glib-2.0/gio/giostream.h
-include/glib/glib-2.0/gio/giotypes.h
-include/glib/glib-2.0/gio/glistmodel.h
-include/glib/glib-2.0/gio/gliststore.h
-include/glib/glib-2.0/gio/gloadableicon.h
-include/glib/glib-2.0/gio/gmemoryinputstream.h
-include/glib/glib-2.0/gio/gmemoryoutputstream.h
-include/glib/glib-2.0/gio/gmenu.h
-include/glib/glib-2.0/gio/gmenuexporter.h
-include/glib/glib-2.0/gio/gmenumodel.h
-include/glib/glib-2.0/gio/gmount.h
-include/glib/glib-2.0/gio/gmountoperation.h
-include/glib/glib-2.0/gio/gnativevolumemonitor.h
-include/glib/glib-2.0/gio/gnetworkaddress.h
-include/glib/glib-2.0/gio/gnetworking.h
-include/glib/glib-2.0/gio/gnetworkmonitor.h
-include/glib/glib-2.0/gio/gnetworkservice.h
-include/glib/glib-2.0/gio/gnotification.h
-include/glib/glib-2.0/gio/goutputstream.h
-include/glib/glib-2.0/gio/gpermission.h
-include/glib/glib-2.0/gio/gpollableinputstream.h
-include/glib/glib-2.0/gio/gpollableoutputstream.h
-include/glib/glib-2.0/gio/gpollableutils.h
-include/glib/glib-2.0/gio/gpropertyaction.h
-include/glib/glib-2.0/gio/gproxy.h
-include/glib/glib-2.0/gio/gproxyaddress.h
-include/glib/glib-2.0/gio/gproxyaddressenumerator.h
-include/glib/glib-2.0/gio/gproxyresolver.h
-include/glib/glib-2.0/gio/gremoteactiongroup.h
-include/glib/glib-2.0/gio/gresolver.h
-include/glib/glib-2.0/gio/gresource.h
-include/glib/glib-2.0/gio/gseekable.h
-include/glib/glib-2.0/gio/gsettings.h
-include/glib/glib-2.0/gio/gsettingsbackend.h
-include/glib/glib-2.0/gio/gsettingsschema.h
-include/glib/glib-2.0/gio/gsimpleaction.h
-include/glib/glib-2.0/gio/gsimpleactiongroup.h
-include/glib/glib-2.0/gio/gsimpleasyncresult.h
-include/glib/glib-2.0/gio/gsimpleiostream.h
-include/glib/glib-2.0/gio/gsimplepermission.h
-include/glib/glib-2.0/gio/gsimpleproxyresolver.h
-include/glib/glib-2.0/gio/gsocket.h
-include/glib/glib-2.0/gio/gsocketaddress.h
-include/glib/glib-2.0/gio/gsocketaddressenumerator.h
-include/glib/glib-2.0/gio/gsocketclient.h
-include/glib/glib-2.0/gio/gsocketconnectable.h
-include/glib/glib-2.0/gio/gsocketconnection.h
-include/glib/glib-2.0/gio/gsocketcontrolmessage.h
-include/glib/glib-2.0/gio/gsocketlistener.h
-include/glib/glib-2.0/gio/gsocketservice.h
-include/glib/glib-2.0/gio/gsrvtarget.h
-include/glib/glib-2.0/gio/gsubprocess.h
-include/glib/glib-2.0/gio/gsubprocesslauncher.h
-include/glib/glib-2.0/gio/gtask.h
-include/glib/glib-2.0/gio/gtcpconnection.h
-include/glib/glib-2.0/gio/gtcpwrapperconnection.h
-include/glib/glib-2.0/gio/gtestdbus.h
-include/glib/glib-2.0/gio/gthemedicon.h
-include/glib/glib-2.0/gio/gthreadedsocketservice.h
-include/glib/glib-2.0/gio/gtlsbackend.h
-include/glib/glib-2.0/gio/gtlscertificate.h
-include/glib/glib-2.0/gio/gtlsclientconnection.h
-include/glib/glib-2.0/gio/gtlsconnection.h
-include/glib/glib-2.0/gio/gtlsdatabase.h
-include/glib/glib-2.0/gio/gtlsfiledatabase.h
-include/glib/glib-2.0/gio/gtlsinteraction.h
-include/glib/glib-2.0/gio/gtlspassword.h
-include/glib/glib-2.0/gio/gtlsserverconnection.h
-include/glib/glib-2.0/gio/gvfs.h
-include/glib/glib-2.0/gio/gvolume.h
-include/glib/glib-2.0/gio/gvolumemonitor.h
-include/glib/glib-2.0/gio/gzlibcompressor.h
-include/glib/glib-2.0/gio/gzlibdecompressor.h
-include/glib/glib-2.0/glib-object.h
-include/glib/glib-2.0/glib-unix.h
-include/glib/glib-2.0/glib.h
-include/glib/glib-2.0/glib/deprecated/gallocator.h
-include/glib/glib-2.0/glib/deprecated/gcache.h
-include/glib/glib-2.0/glib/deprecated/gcompletion.h
-include/glib/glib-2.0/glib/deprecated/gmain.h
-include/glib/glib-2.0/glib/deprecated/grel.h
-include/glib/glib-2.0/glib/deprecated/gthread.h
-include/glib/glib-2.0/glib/galloca.h
-include/glib/glib-2.0/glib/garray.h
-include/glib/glib-2.0/glib/gasyncqueue.h
-include/glib/glib-2.0/glib/gatomic.h
-include/glib/glib-2.0/glib/gbacktrace.h
-include/glib/glib-2.0/glib/gbase64.h
-include/glib/glib-2.0/glib/gbitlock.h
-include/glib/glib-2.0/glib/gbookmarkfile.h
-include/glib/glib-2.0/glib/gbytes.h
-include/glib/glib-2.0/glib/gcharset.h
-include/glib/glib-2.0/glib/gchecksum.h
-include/glib/glib-2.0/glib/gconvert.h
-include/glib/glib-2.0/glib/gdataset.h
-include/glib/glib-2.0/glib/gdate.h
-include/glib/glib-2.0/glib/gdatetime.h
-include/glib/glib-2.0/glib/gdir.h
-include/glib/glib-2.0/glib/genviron.h
-include/glib/glib-2.0/glib/gerror.h
-include/glib/glib-2.0/glib/gfileutils.h
-include/glib/glib-2.0/glib/ggettext.h
-include/glib/glib-2.0/glib/ghash.h
-include/glib/glib-2.0/glib/ghmac.h
-include/glib/glib-2.0/glib/ghook.h
-include/glib/glib-2.0/glib/ghostutils.h
-include/glib/glib-2.0/glib/gi18n-lib.h
-include/glib/glib-2.0/glib/gi18n.h
-include/glib/glib-2.0/glib/giochannel.h
-include/glib/glib-2.0/glib/gkeyfile.h
-include/glib/glib-2.0/glib/glib-autocleanups.h
-include/glib/glib-2.0/glib/glist.h
-include/glib/glib-2.0/glib/gmacros.h
-include/glib/glib-2.0/glib/gmain.h
-include/glib/glib-2.0/glib/gmappedfile.h
-include/glib/glib-2.0/glib/gmarkup.h
-include/glib/glib-2.0/glib/gmem.h
-include/glib/glib-2.0/glib/gmessages.h
-include/glib/glib-2.0/glib/gnode.h
-include/glib/glib-2.0/glib/goption.h
-include/glib/glib-2.0/glib/gpattern.h
-include/glib/glib-2.0/glib/gpoll.h
-include/glib/glib-2.0/glib/gprimes.h
-include/glib/glib-2.0/glib/gprintf.h
-include/glib/glib-2.0/glib/gqsort.h
-include/glib/glib-2.0/glib/gquark.h
-include/glib/glib-2.0/glib/gqueue.h
-include/glib/glib-2.0/glib/grand.h
-include/glib/glib-2.0/glib/gregex.h
-include/glib/glib-2.0/glib/gscanner.h
-include/glib/glib-2.0/glib/gsequence.h
-include/glib/glib-2.0/glib/gshell.h
-include/glib/glib-2.0/glib/gslice.h
-include/glib/glib-2.0/glib/gslist.h
-include/glib/glib-2.0/glib/gspawn.h
-include/glib/glib-2.0/glib/gstdio.h
-include/glib/glib-2.0/glib/gstrfuncs.h
-include/glib/glib-2.0/glib/gstring.h
-include/glib/glib-2.0/glib/gstringchunk.h
-include/glib/glib-2.0/glib/gtestutils.h
-include/glib/glib-2.0/glib/gthread.h
-include/glib/glib-2.0/glib/gthreadpool.h
-include/glib/glib-2.0/glib/gtimer.h
-include/glib/glib-2.0/glib/gtimezone.h
-include/glib/glib-2.0/glib/gtrashstack.h
-include/glib/glib-2.0/glib/gtree.h
-include/glib/glib-2.0/glib/gtypes.h
-include/glib/glib-2.0/glib/gunicode.h
-include/glib/glib-2.0/glib/gurifuncs.h
-include/glib/glib-2.0/glib/gutils.h
-include/glib/glib-2.0/glib/guuid.h
-include/glib/glib-2.0/glib/gvariant.h
-include/glib/glib-2.0/glib/gvarianttype.h
-include/glib/glib-2.0/glib/gversion.h
-include/glib/glib-2.0/glib/gversionmacros.h
-include/glib/glib-2.0/glib/gwin32.h
-include/glib/glib-2.0/gmodule.h
-include/glib/glib-2.0/gobject/gbinding.h
-include/glib/glib-2.0/gobject/gboxed.h
-include/glib/glib-2.0/gobject/gclosure.h
-include/glib/glib-2.0/gobject/genums.h
-include/glib/glib-2.0/gobject/glib-types.h
-include/glib/glib-2.0/gobject/gmarshal.h
-include/glib/glib-2.0/gobject/gobject-autocleanups.h
-include/glib/glib-2.0/gobject/gobject.h
-include/glib/glib-2.0/gobject/gobjectnotifyqueue.c
-include/glib/glib-2.0/gobject/gparam.h
-include/glib/glib-2.0/gobject/gparamspecs.h
-include/glib/glib-2.0/gobject/gsignal.h
-include/glib/glib-2.0/gobject/gsourceclosure.h
-include/glib/glib-2.0/gobject/gtype.h
-include/glib/glib-2.0/gobject/gtypemodule.h
-include/glib/glib-2.0/gobject/gtypeplugin.h
-include/glib/glib-2.0/gobject/gvalue.h
-include/glib/glib-2.0/gobject/gvaluearray.h
-include/glib/glib-2.0/gobject/gvaluecollector.h
-include/glib/glib-2.0/gobject/gvaluetypes.h
+include/gio-unix-2.0/gio/gdesktopappinfo.h
+include/gio-unix-2.0/gio/gfiledescriptorbased.h
+include/gio-unix-2.0/gio/gunixconnection.h
+include/gio-unix-2.0/gio/gunixcredentialsmessage.h
+include/gio-unix-2.0/gio/gunixfdlist.h
+include/gio-unix-2.0/gio/gunixfdmessage.h
+include/gio-unix-2.0/gio/gunixinputstream.h
+include/gio-unix-2.0/gio/gunixmounts.h
+include/gio-unix-2.0/gio/gunixoutputstream.h
+include/gio-unix-2.0/gio/gunixsocketaddress.h
+include/glib-2.0/gio/gaction.h
+include/glib-2.0/gio/gactiongroup.h
+include/glib-2.0/gio/gactiongroupexporter.h
+include/glib-2.0/gio/gactionmap.h
+include/glib-2.0/gio/gappinfo.h
+include/glib-2.0/gio/gapplication.h
+include/glib-2.0/gio/gapplicationcommandline.h
+include/glib-2.0/gio/gasyncinitable.h
+include/glib-2.0/gio/gasyncresult.h
+include/glib-2.0/gio/gbufferedinputstream.h
+include/glib-2.0/gio/gbufferedoutputstream.h
+include/glib-2.0/gio/gbytesicon.h
+include/glib-2.0/gio/gcancellable.h
+include/glib-2.0/gio/gcharsetconverter.h
+include/glib-2.0/gio/gcontenttype.h
+include/glib-2.0/gio/gconverter.h
+include/glib-2.0/gio/gconverterinputstream.h
+include/glib-2.0/gio/gconverteroutputstream.h
+include/glib-2.0/gio/gcredentials.h
+include/glib-2.0/gio/gdatagrambased.h
+include/glib-2.0/gio/gdatainputstream.h
+include/glib-2.0/gio/gdataoutputstream.h
+include/glib-2.0/gio/gdbusactiongroup.h
+include/glib-2.0/gio/gdbusaddress.h
+include/glib-2.0/gio/gdbusauthobserver.h
+include/glib-2.0/gio/gdbusconnection.h
+include/glib-2.0/gio/gdbuserror.h
+include/glib-2.0/gio/gdbusinterface.h
+include/glib-2.0/gio/gdbusinterfaceskeleton.h
+include/glib-2.0/gio/gdbusintrospection.h
+include/glib-2.0/gio/gdbusmenumodel.h
+include/glib-2.0/gio/gdbusmessage.h
+include/glib-2.0/gio/gdbusmethodinvocation.h
+include/glib-2.0/gio/gdbusnameowning.h
+include/glib-2.0/gio/gdbusnamewatching.h
+include/glib-2.0/gio/gdbusobject.h
+include/glib-2.0/gio/gdbusobjectmanager.h
+include/glib-2.0/gio/gdbusobjectmanagerclient.h
+include/glib-2.0/gio/gdbusobjectmanagerserver.h
+include/glib-2.0/gio/gdbusobjectproxy.h
+include/glib-2.0/gio/gdbusobjectskeleton.h
+include/glib-2.0/gio/gdbusproxy.h
+include/glib-2.0/gio/gdbusserver.h
+include/glib-2.0/gio/gdbusutils.h
+include/glib-2.0/gio/gdrive.h
+include/glib-2.0/gio/gdtlsclientconnection.h
+include/glib-2.0/gio/gdtlsconnection.h
+include/glib-2.0/gio/gdtlsserverconnection.h
+include/glib-2.0/gio/gemblem.h
+include/glib-2.0/gio/gemblemedicon.h
+include/glib-2.0/gio/gfile.h
+include/glib-2.0/gio/gfileattribute.h
+include/glib-2.0/gio/gfileenumerator.h
+include/glib-2.0/gio/gfileicon.h
+include/glib-2.0/gio/gfileinfo.h
+include/glib-2.0/gio/gfileinputstream.h
+include/glib-2.0/gio/gfileiostream.h
+include/glib-2.0/gio/gfilemonitor.h
+include/glib-2.0/gio/gfilenamecompleter.h
+include/glib-2.0/gio/gfileoutputstream.h
+include/glib-2.0/gio/gfilterinputstream.h
+include/glib-2.0/gio/gfilteroutputstream.h
+include/glib-2.0/gio/gicon.h
+include/glib-2.0/gio/ginetaddress.h
+include/glib-2.0/gio/ginetaddressmask.h
+include/glib-2.0/gio/ginetsocketaddress.h
+include/glib-2.0/gio/ginitable.h
+include/glib-2.0/gio/ginputstream.h
+include/glib-2.0/gio/gio-autocleanups.h
+include/glib-2.0/gio/gio.h
+include/glib-2.0/gio/gioenums.h
+include/glib-2.0/gio/gioenumtypes.h
+include/glib-2.0/gio/gioerror.h
+include/glib-2.0/gio/giomodule.h
+include/glib-2.0/gio/gioscheduler.h
+include/glib-2.0/gio/giostream.h
+include/glib-2.0/gio/giotypes.h
+include/glib-2.0/gio/glistmodel.h
+include/glib-2.0/gio/gliststore.h
+include/glib-2.0/gio/gloadableicon.h
+include/glib-2.0/gio/gmemoryinputstream.h
+include/glib-2.0/gio/gmemoryoutputstream.h
+include/glib-2.0/gio/gmenu.h
+include/glib-2.0/gio/gmenuexporter.h
+include/glib-2.0/gio/gmenumodel.h
+include/glib-2.0/gio/gmount.h
+include/glib-2.0/gio/gmountoperation.h
+include/glib-2.0/gio/gnativevolumemonitor.h
+include/glib-2.0/gio/gnetworkaddress.h
+include/glib-2.0/gio/gnetworking.h
+include/glib-2.0/gio/gnetworkmonitor.h
+include/glib-2.0/gio/gnetworkservice.h
+include/glib-2.0/gio/gnotification.h
+include/glib-2.0/gio/goutputstream.h
+include/glib-2.0/gio/gpermission.h
+include/glib-2.0/gio/gpollableinputstream.h
+include/glib-2.0/gio/gpollableoutputstream.h
+include/glib-2.0/gio/gpollableutils.h
+include/glib-2.0/gio/gpropertyaction.h
+include/glib-2.0/gio/gproxy.h
+include/glib-2.0/gio/gproxyaddress.h
+include/glib-2.0/gio/gproxyaddressenumerator.h
+include/glib-2.0/gio/gproxyresolver.h
+include/glib-2.0/gio/gremoteactiongroup.h
+include/glib-2.0/gio/gresolver.h
+include/glib-2.0/gio/gresource.h
+include/glib-2.0/gio/gseekable.h
+include/glib-2.0/gio/gsettings.h
+include/glib-2.0/gio/gsettingsbackend.h
+include/glib-2.0/gio/gsettingsschema.h
+include/glib-2.0/gio/gsimpleaction.h
+include/glib-2.0/gio/gsimpleactiongroup.h
+include/glib-2.0/gio/gsimpleasyncresult.h
+include/glib-2.0/gio/gsimpleiostream.h
+include/glib-2.0/gio/gsimplepermission.h
+include/glib-2.0/gio/gsimpleproxyresolver.h
+include/glib-2.0/gio/gsocket.h
+include/glib-2.0/gio/gsocketaddress.h
+include/glib-2.0/gio/gsocketaddressenumerator.h
+include/glib-2.0/gio/gsocketclient.h
+include/glib-2.0/gio/gsocketconnectable.h
+include/glib-2.0/gio/gsocketconnection.h
+include/glib-2.0/gio/gsocketcontrolmessage.h
+include/glib-2.0/gio/gsocketlistener.h
+include/glib-2.0/gio/gsocketservice.h
+include/glib-2.0/gio/gsrvtarget.h
+include/glib-2.0/gio/gsubprocess.h
+include/glib-2.0/gio/gsubprocesslauncher.h
+include/glib-2.0/gio/gtask.h
+include/glib-2.0/gio/gtcpconnection.h
+include/glib-2.0/gio/gtcpwrapperconnection.h
+include/glib-2.0/gio/gtestdbus.h
+include/glib-2.0/gio/gthemedicon.h
+include/glib-2.0/gio/gthreadedsocketservice.h
+include/glib-2.0/gio/gtlsbackend.h
+include/glib-2.0/gio/gtlscertificate.h
+include/glib-2.0/gio/gtlsclientconnection.h
+include/glib-2.0/gio/gtlsconnection.h
+include/glib-2.0/gio/gtlsdatabase.h
+include/glib-2.0/gio/gtlsfiledatabase.h
+include/glib-2.0/gio/gtlsinteraction.h
+include/glib-2.0/gio/gtlspassword.h
+include/glib-2.0/gio/gtlsserverconnection.h
+include/glib-2.0/gio/gvfs.h
+include/glib-2.0/gio/gvolume.h
+include/glib-2.0/gio/gvolumemonitor.h
+include/glib-2.0/gio/gzlibcompressor.h
+include/glib-2.0/gio/gzlibdecompressor.h
+include/glib-2.0/glib-object.h
+include/glib-2.0/glib-unix.h
+include/glib-2.0/glib.h
+include/glib-2.0/glib/deprecated/gallocator.h
+include/glib-2.0/glib/deprecated/gcache.h
+include/glib-2.0/glib/deprecated/gcompletion.h
+include/glib-2.0/glib/deprecated/gmain.h
+include/glib-2.0/glib/deprecated/grel.h
+include/glib-2.0/glib/deprecated/gthread.h
+include/glib-2.0/glib/galloca.h
+include/glib-2.0/glib/garray.h
+include/glib-2.0/glib/gasyncqueue.h
+include/glib-2.0/glib/gatomic.h
+include/glib-2.0/glib/gbacktrace.h
+include/glib-2.0/glib/gbase64.h
+include/glib-2.0/glib/gbitlock.h
+include/glib-2.0/glib/gbookmarkfile.h
+include/glib-2.0/glib/gbytes.h
+include/glib-2.0/glib/gcharset.h
+include/glib-2.0/glib/gchecksum.h
+include/glib-2.0/glib/gconvert.h
+include/glib-2.0/glib/gdataset.h
+include/glib-2.0/glib/gdate.h
+include/glib-2.0/glib/gdatetime.h
+include/glib-2.0/glib/gdir.h
+include/glib-2.0/glib/genviron.h
+include/glib-2.0/glib/gerror.h
+include/glib-2.0/glib/gfileutils.h
+include/glib-2.0/glib/ggettext.h
+include/glib-2.0/glib/ghash.h
+include/glib-2.0/glib/ghmac.h
+include/glib-2.0/glib/ghook.h
+include/glib-2.0/glib/ghostutils.h
+include/glib-2.0/glib/gi18n-lib.h
+include/glib-2.0/glib/gi18n.h
+include/glib-2.0/glib/giochannel.h
+include/glib-2.0/glib/gkeyfile.h
+include/glib-2.0/glib/glib-autocleanups.h
+include/glib-2.0/glib/glist.h
+include/glib-2.0/glib/gmacros.h
+include/glib-2.0/glib/gmain.h
+include/glib-2.0/glib/gmappedfile.h
+include/glib-2.0/glib/gmarkup.h
+include/glib-2.0/glib/gmem.h
+include/glib-2.0/glib/gmessages.h
+include/glib-2.0/glib/gnode.h
+include/glib-2.0/glib/goption.h
+include/glib-2.0/glib/gpattern.h
+include/glib-2.0/glib/gpoll.h
+include/glib-2.0/glib/gprimes.h
+include/glib-2.0/glib/gprintf.h
+include/glib-2.0/glib/gqsort.h
+include/glib-2.0/glib/gquark.h
+include/glib-2.0/glib/gqueue.h
+include/glib-2.0/glib/grand.h
+include/glib-2.0/glib/grcbox.h
+include/glib-2.0/glib/grefcount.h
+include/glib-2.0/glib/grefstring.h
+include/glib-2.0/glib/gregex.h
+include/glib-2.0/glib/gscanner.h
+include/glib-2.0/glib/gsequence.h
+include/glib-2.0/glib/gshell.h
+include/glib-2.0/glib/gslice.h
+include/glib-2.0/glib/gslist.h
+include/glib-2.0/glib/gspawn.h
+include/glib-2.0/glib/gstdio.h
+include/glib-2.0/glib/gstrfuncs.h
+include/glib-2.0/glib/gstring.h
+include/glib-2.0/glib/gstringchunk.h
+include/glib-2.0/glib/gtestutils.h
+include/glib-2.0/glib/gthread.h
+include/glib-2.0/glib/gthreadpool.h
+include/glib-2.0/glib/gtimer.h
+include/glib-2.0/glib/gtimezone.h
+include/glib-2.0/glib/gtrashstack.h
+include/glib-2.0/glib/gtree.h
+include/glib-2.0/glib/gtypes.h
+include/glib-2.0/glib/gunicode.h
+include/glib-2.0/glib/gurifuncs.h
+include/glib-2.0/glib/gutils.h
+include/glib-2.0/glib/guuid.h
+include/glib-2.0/glib/gvariant.h
+include/glib-2.0/glib/gvarianttype.h
+include/glib-2.0/glib/gversion.h
+include/glib-2.0/glib/gversionmacros.h
+include/glib-2.0/glib/gwin32.h
+include/glib-2.0/gmodule.h
+include/glib-2.0/gobject/gbinding.h
+include/glib-2.0/gobject/gboxed.h
+include/glib-2.0/gobject/gclosure.h
+include/glib-2.0/gobject/genums.h
+include/glib-2.0/gobject/glib-enumtypes.h
+include/glib-2.0/gobject/glib-types.h
+include/glib-2.0/gobject/gmarshal.h
+include/glib-2.0/gobject/gobject-autocleanups.h
+include/glib-2.0/gobject/gobject.h
+include/glib-2.0/gobject/gobjectnotifyqueue.c
+include/glib-2.0/gobject/gparam.h
+include/glib-2.0/gobject/gparamspecs.h
+include/glib-2.0/gobject/gsignal.h
+include/glib-2.0/gobject/gsourceclosure.h
+include/glib-2.0/gobject/gtype.h
+include/glib-2.0/gobject/gtypemodule.h
+include/glib-2.0/gobject/gtypeplugin.h
+include/glib-2.0/gobject/gvalue.h
+include/glib-2.0/gobject/gvaluearray.h
+include/glib-2.0/gobject/gvaluecollector.h
+include/glib-2.0/gobject/gvaluetypes.h
+${PLIST.fam}lib/gio/modules/libgiofam.so
 lib/glib-2.0/include/glibconfig.h
-lib/libgio-2.0.la
-lib/libglib-2.0.la
-lib/libgmodule-2.0.la
-lib/libgobject-2.0.la
-lib/libgthread-2.0.la
+lib/libgio-2.0.so
+lib/libgio-2.0.so.0
+lib/libgio-2.0.so.0.6000.2
+lib/libglib-2.0.so
+lib/libglib-2.0.so.0
+lib/libglib-2.0.so.0.6000.2
+lib/libgmodule-2.0.so
+lib/libgmodule-2.0.so.0
+lib/libgmodule-2.0.so.0.6000.2
+lib/libgobject-2.0.so
+lib/libgobject-2.0.so.0
+lib/libgobject-2.0.so.0.6000.2
+lib/libgthread-2.0.so
+lib/libgthread-2.0.so.0
+lib/libgthread-2.0.so.0.6000.2
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -290,12 +304,8 @@ lib/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/bash-completion/completions/gapplication
-share/bash-completion/completions/gdbus
-share/bash-completion/completions/gresource
-share/bash-completion/completions/gsettings
-share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.5600.2-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5600.2-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6000.2-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.2-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py
@@ -303,414 +313,6 @@ share/glib-2.0/gdb/gobject_gdb.py
 share/glib-2.0/gettext/po/Makefile.in.in
 share/glib-2.0/schemas/gschema.dtd
 share/glib-2.0/valgrind/glib.supp
-share/gtk-doc/html/gio/GAction.html
-share/gtk-doc/html/gio/GActionGroup.html
-share/gtk-doc/html/gio/GActionMap.html
-share/gtk-doc/html/gio/GAppInfo.html
-share/gtk-doc/html/gio/GAppInfoMonitor.html
-share/gtk-doc/html/gio/GApplication.html
-share/gtk-doc/html/gio/GApplicationCommandLine.html
-share/gtk-doc/html/gio/GAsyncInitable.html
-share/gtk-doc/html/gio/GAsyncResult.html
-share/gtk-doc/html/gio/GBufferedInputStream.html
-share/gtk-doc/html/gio/GBufferedOutputStream.html
-share/gtk-doc/html/gio/GBytesIcon.html
-share/gtk-doc/html/gio/GCancellable.html
-share/gtk-doc/html/gio/GCharsetConverter.html
-share/gtk-doc/html/gio/GConverter.html
-share/gtk-doc/html/gio/GCredentials.html
-share/gtk-doc/html/gio/GDBusActionGroup.html
-share/gtk-doc/html/gio/GDBusAuthObserver.html
-share/gtk-doc/html/gio/GDBusConnection.html
-share/gtk-doc/html/gio/GDBusInterface.html
-share/gtk-doc/html/gio/GDBusInterfaceSkeleton.html
-share/gtk-doc/html/gio/GDBusMenuModel.html
-share/gtk-doc/html/gio/GDBusMessage.html
-share/gtk-doc/html/gio/GDBusMethodInvocation.html
-share/gtk-doc/html/gio/GDBusObject.html
-share/gtk-doc/html/gio/GDBusObjectManager.html
-share/gtk-doc/html/gio/GDBusObjectManagerClient.html
-share/gtk-doc/html/gio/GDBusObjectManagerServer.html
-share/gtk-doc/html/gio/GDBusObjectProxy.html
-share/gtk-doc/html/gio/GDBusObjectSkeleton.html
-share/gtk-doc/html/gio/GDBusProxy.html
-share/gtk-doc/html/gio/GDBusServer.html
-share/gtk-doc/html/gio/GDataInputStream.html
-share/gtk-doc/html/gio/GDataOutputStream.html
-share/gtk-doc/html/gio/GDatagramBased.html
-share/gtk-doc/html/gio/GDrive.html
-share/gtk-doc/html/gio/GDtlsClientConnection.html
-share/gtk-doc/html/gio/GDtlsConnection.html
-share/gtk-doc/html/gio/GDtlsServerConnection.html
-share/gtk-doc/html/gio/GEmblem.html
-share/gtk-doc/html/gio/GEmblemedIcon.html
-share/gtk-doc/html/gio/GFile.html
-share/gtk-doc/html/gio/GFileDescriptorBased.html
-share/gtk-doc/html/gio/GFileEnumerator.html
-share/gtk-doc/html/gio/GFileIOStream.html
-share/gtk-doc/html/gio/GFileIcon.html
-share/gtk-doc/html/gio/GFileInfo.html
-share/gtk-doc/html/gio/GFileInputStream.html
-share/gtk-doc/html/gio/GFileMonitor.html
-share/gtk-doc/html/gio/GFileOutputStream.html
-share/gtk-doc/html/gio/GFilenameCompleter.html
-share/gtk-doc/html/gio/GFilterInputStream.html
-share/gtk-doc/html/gio/GFilterOutputStream.html
-share/gtk-doc/html/gio/GIOModule.html
-share/gtk-doc/html/gio/GIOStream.html
-share/gtk-doc/html/gio/GIcon.html
-share/gtk-doc/html/gio/GInetAddress.html
-share/gtk-doc/html/gio/GInetAddressMask.html
-share/gtk-doc/html/gio/GInetSocketAddress.html
-share/gtk-doc/html/gio/GInitable.html
-share/gtk-doc/html/gio/GInputStream.html
-share/gtk-doc/html/gio/GListModel.html
-share/gtk-doc/html/gio/GListStore.html
-share/gtk-doc/html/gio/GLoadableIcon.html
-share/gtk-doc/html/gio/GMemoryInputStream.html
-share/gtk-doc/html/gio/GMemoryOutputStream.html
-share/gtk-doc/html/gio/GMenu.html
-share/gtk-doc/html/gio/GMenuModel.html
-share/gtk-doc/html/gio/GMount.html
-share/gtk-doc/html/gio/GMountOperation.html
-share/gtk-doc/html/gio/GNetworkAddress.html
-share/gtk-doc/html/gio/GNetworkMonitor.html
-share/gtk-doc/html/gio/GNetworkService.html
-share/gtk-doc/html/gio/GNotification.html
-share/gtk-doc/html/gio/GOutputStream.html
-share/gtk-doc/html/gio/GPermission.html
-share/gtk-doc/html/gio/GPollableInputStream.html
-share/gtk-doc/html/gio/GPollableOutputStream.html
-share/gtk-doc/html/gio/GPropertyAction.html
-share/gtk-doc/html/gio/GProxy.html
-share/gtk-doc/html/gio/GProxyAddress.html
-share/gtk-doc/html/gio/GProxyAddressEnumerator.html
-share/gtk-doc/html/gio/GProxyResolver.html
-share/gtk-doc/html/gio/GRemoteActionGroup.html
-share/gtk-doc/html/gio/GResolver.html
-share/gtk-doc/html/gio/GResource.html
-share/gtk-doc/html/gio/GSeekable.html
-share/gtk-doc/html/gio/GSettings.html
-share/gtk-doc/html/gio/GSettingsBackend.html
-share/gtk-doc/html/gio/GSimpleAction.html
-share/gtk-doc/html/gio/GSimpleActionGroup.html
-share/gtk-doc/html/gio/GSimpleAsyncResult.html
-share/gtk-doc/html/gio/GSimpleIOStream.html
-share/gtk-doc/html/gio/GSimplePermission.html
-share/gtk-doc/html/gio/GSimpleProxyResolver.html
-share/gtk-doc/html/gio/GSocket.html
-share/gtk-doc/html/gio/GSocketAddress.html
-share/gtk-doc/html/gio/GSocketAddressEnumerator.html
-share/gtk-doc/html/gio/GSocketClient.html
-share/gtk-doc/html/gio/GSocketConnectable.html
-share/gtk-doc/html/gio/GSocketConnection.html
-share/gtk-doc/html/gio/GSocketControlMessage.html
-share/gtk-doc/html/gio/GSocketListener.html
-share/gtk-doc/html/gio/GSocketService.html
-share/gtk-doc/html/gio/GSrvTarget.html
-share/gtk-doc/html/gio/GSubprocess.html
-share/gtk-doc/html/gio/GSubprocessLauncher.html
-share/gtk-doc/html/gio/GTask.html
-share/gtk-doc/html/gio/GTcpConnection.html
-share/gtk-doc/html/gio/GTcpWrapperConnection.html
-share/gtk-doc/html/gio/GTestDBus.html
-share/gtk-doc/html/gio/GThemedIcon.html
-share/gtk-doc/html/gio/GThreadedSocketService.html
-share/gtk-doc/html/gio/GTlsBackend.html
-share/gtk-doc/html/gio/GTlsCertificate.html
-share/gtk-doc/html/gio/GTlsClientConnection.html
-share/gtk-doc/html/gio/GTlsConnection.html
-share/gtk-doc/html/gio/GTlsDatabase.html
-share/gtk-doc/html/gio/GTlsFileDatabase.html
-share/gtk-doc/html/gio/GTlsInteraction.html
-share/gtk-doc/html/gio/GTlsPassword.html
-share/gtk-doc/html/gio/GTlsServerConnection.html
-share/gtk-doc/html/gio/GUnixConnection.html
-share/gtk-doc/html/gio/GUnixCredentialsMessage.html
-share/gtk-doc/html/gio/GUnixFDList.html
-share/gtk-doc/html/gio/GUnixFDMessage.html
-share/gtk-doc/html/gio/GUnixInputStream.html
-share/gtk-doc/html/gio/GUnixOutputStream.html
-share/gtk-doc/html/gio/GUnixSocketAddress.html
-share/gtk-doc/html/gio/GVfs.html
-share/gtk-doc/html/gio/GVolume.html
-share/gtk-doc/html/gio/GVolumeMonitor.html
-share/gtk-doc/html/gio/GZlibCompressor.html
-share/gtk-doc/html/gio/GZlibDecompressor.html
-share/gtk-doc/html/gio/annotation-glossary.html
-share/gtk-doc/html/gio/api-index-full.html
-share/gtk-doc/html/gio/application.html
-share/gtk-doc/html/gio/async.html
-share/gtk-doc/html/gio/ch01.html
-share/gtk-doc/html/gio/ch02.html
-share/gtk-doc/html/gio/ch03.html
-share/gtk-doc/html/gio/ch32.html
-share/gtk-doc/html/gio/ch33.html
-share/gtk-doc/html/gio/ch33s02.html
-share/gtk-doc/html/gio/ch33s03.html
-share/gtk-doc/html/gio/ch34.html
-share/gtk-doc/html/gio/ch34s02.html
-share/gtk-doc/html/gio/ch34s03.html
-share/gtk-doc/html/gio/ch34s04.html
-share/gtk-doc/html/gio/ch34s05.html
-share/gtk-doc/html/gio/ch34s06.html
-share/gtk-doc/html/gio/ch34s07.html
-share/gtk-doc/html/gio/ch35.html
-share/gtk-doc/html/gio/ch35s02.html
-share/gtk-doc/html/gio/ch35s03.html
-share/gtk-doc/html/gio/ch35s04.html
-share/gtk-doc/html/gio/conversion.html
-share/gtk-doc/html/gio/data-models.html
-share/gtk-doc/html/gio/extending-gio.html
-share/gtk-doc/html/gio/extending.html
-share/gtk-doc/html/gio/failable_initialization.html
-share/gtk-doc/html/gio/file_mon.html
-share/gtk-doc/html/gio/file_ops.html
-share/gtk-doc/html/gio/gapplication-tool.html
-share/gtk-doc/html/gio/gdbus-codegen.html
-share/gtk-doc/html/gio/gdbus-convenience.html
-share/gtk-doc/html/gio/gdbus-example-gdbus-codegen.html
-share/gtk-doc/html/gio/gdbus-lowlevel.html
-share/gtk-doc/html/gio/gdbus.html
-share/gtk-doc/html/gio/gio-D-Bus-Addresses.html
-share/gtk-doc/html/gio/gio-D-Bus-Introspection-Data.html
-share/gtk-doc/html/gio/gio-D-Bus-Utilities.html
-share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html
-share/gtk-doc/html/gio/gio-Extension-Points.html
-share/gtk-doc/html/gio/gio-GActionGroup-exporter.html
-share/gtk-doc/html/gio/gio-GContentType.html
-share/gtk-doc/html/gio/gio-GConverterInputstream.html
-share/gtk-doc/html/gio/gio-GConverterOutputstream.html
-share/gtk-doc/html/gio/gio-GDBusError.html
-share/gtk-doc/html/gio/gio-GFileAttribute.html
-share/gtk-doc/html/gio/gio-GIOError.html
-share/gtk-doc/html/gio/gio-GIOScheduler.html
-share/gtk-doc/html/gio/gio-GMenuModel-exporter.html
-share/gtk-doc/html/gio/gio-GSettingsSchema-GSettingsSchemaSource.html
-share/gtk-doc/html/gio/gio-GWin32InputStream.html
-share/gtk-doc/html/gio/gio-GWin32OutputStream.html
-share/gtk-doc/html/gio/gio-GWin32RegistryKey.html
-share/gtk-doc/html/gio/gio-Owning-Bus-Names.html
-share/gtk-doc/html/gio/gio-TLS-Overview.html
-share/gtk-doc/html/gio/gio-Unix-Mounts.html
-share/gtk-doc/html/gio/gio-Watching-Bus-Names.html
-share/gtk-doc/html/gio/gio-gnetworking.h.html
-share/gtk-doc/html/gio/gio-gpollableutils.html
-share/gtk-doc/html/gio/gio-hierarchy.html
-share/gtk-doc/html/gio/gio-querymodules.html
-share/gtk-doc/html/gio/gio.devhelp2
-share/gtk-doc/html/gio/gio.html
-share/gtk-doc/html/gio/glib-compile-resources.html
-share/gtk-doc/html/gio/glib-compile-schemas.html
-share/gtk-doc/html/gio/gresource-tool.html
-share/gtk-doc/html/gio/gsettings-tool.html
-share/gtk-doc/html/gio/gvfs-overview.png
-share/gtk-doc/html/gio/highlevel-socket.html
-share/gtk-doc/html/gio/home.png
-share/gtk-doc/html/gio/icons.html
-share/gtk-doc/html/gio/index.html
-share/gtk-doc/html/gio/left-insensitive.png
-share/gtk-doc/html/gio/left.png
-share/gtk-doc/html/gio/menu-example.png
-share/gtk-doc/html/gio/menu-model.png
-share/gtk-doc/html/gio/migrating.html
-share/gtk-doc/html/gio/networking.html
-share/gtk-doc/html/gio/permissions.html
-share/gtk-doc/html/gio/pt01.html
-share/gtk-doc/html/gio/pt02.html
-share/gtk-doc/html/gio/registry.html
-share/gtk-doc/html/gio/resolver.html
-share/gtk-doc/html/gio/resources.html
-share/gtk-doc/html/gio/right-insensitive.png
-share/gtk-doc/html/gio/right.png
-share/gtk-doc/html/gio/running-gio-apps.html
-share/gtk-doc/html/gio/settings.html
-share/gtk-doc/html/gio/streaming.html
-share/gtk-doc/html/gio/style.css
-share/gtk-doc/html/gio/subprocesses.html
-share/gtk-doc/html/gio/testing.html
-share/gtk-doc/html/gio/tls.html
-share/gtk-doc/html/gio/tools.html
-share/gtk-doc/html/gio/types.html
-share/gtk-doc/html/gio/up-insensitive.png
-share/gtk-doc/html/gio/up.png
-share/gtk-doc/html/gio/utils.html
-share/gtk-doc/html/gio/volume_mon.html
-share/gtk-doc/html/glib/Sorted_binary_tree_breadth-first_traversal.svg
-share/gtk-doc/html/glib/Sorted_binary_tree_inorder.svg
-share/gtk-doc/html/glib/Sorted_binary_tree_postorder.svg
-share/gtk-doc/html/glib/Sorted_binary_tree_preorder.svg
-share/gtk-doc/html/glib/annotation-glossary.html
-share/gtk-doc/html/glib/api-index-full.html
-share/gtk-doc/html/glib/deprecated.html
-share/gtk-doc/html/glib/file-name-encodings.png
-share/gtk-doc/html/glib/glib-Arrays.html
-share/gtk-doc/html/glib/glib-Asynchronous-Queues.html
-share/gtk-doc/html/glib/glib-Atomic-Operations.html
-share/gtk-doc/html/glib/glib-Automatic-String-Completion.html
-share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html
-share/gtk-doc/html/glib/glib-Base64-Encoding.html
-share/gtk-doc/html/glib/glib-Basic-Types.html
-share/gtk-doc/html/glib/glib-Bookmark-file-parser.html
-share/gtk-doc/html/glib/glib-Bounds-checked-integer-arithmetic.html
-share/gtk-doc/html/glib/glib-Byte-Arrays.html
-share/gtk-doc/html/glib/glib-Byte-Order-Macros.html
-share/gtk-doc/html/glib/glib-Caches.html
-share/gtk-doc/html/glib/glib-Character-Set-Conversion.html
-share/gtk-doc/html/glib/glib-Commandline-option-parser.html
-share/gtk-doc/html/glib/glib-Data-Checksums.html
-share/gtk-doc/html/glib/glib-Data-HMACs.html
-share/gtk-doc/html/glib/glib-Datasets.html
-share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html
-share/gtk-doc/html/glib/glib-Deprecated-Thread-APIs.html
-share/gtk-doc/html/glib/glib-Double-ended-Queues.html
-share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html
-share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html
-share/gtk-doc/html/glib/glib-Error-Reporting.html
-share/gtk-doc/html/glib/glib-File-Utilities.html
-share/gtk-doc/html/glib/glib-GDateTime.html
-share/gtk-doc/html/glib/glib-GTimeZone.html
-share/gtk-doc/html/glib/glib-GUuid.html
-share/gtk-doc/html/glib/glib-GVariant.html
-share/gtk-doc/html/glib/glib-GVariantType.html
-share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
-share/gtk-doc/html/glib/glib-Hash-Tables.html
-share/gtk-doc/html/glib/glib-Hook-Functions.html
-share/gtk-doc/html/glib/glib-Hostname-Utilities.html
-share/gtk-doc/html/glib/glib-I18N.html
-share/gtk-doc/html/glib/glib-IO-Channels.html
-share/gtk-doc/html/glib/glib-Key-value-file-parser.html
-share/gtk-doc/html/glib/glib-Keyed-Data-Lists.html
-share/gtk-doc/html/glib/glib-Lexical-Scanner.html
-share/gtk-doc/html/glib/glib-Memory-Allocation.html
-share/gtk-doc/html/glib/glib-Memory-Slices.html
-share/gtk-doc/html/glib/glib-Message-Logging.html
-share/gtk-doc/html/glib/glib-Miscellaneous-Macros.html
-share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html
-share/gtk-doc/html/glib/glib-N-ary-Trees.html
-share/gtk-doc/html/glib/glib-Numerical-Definitions.html
-share/gtk-doc/html/glib/glib-Perl-compatible-regular-expressions.html
-share/gtk-doc/html/glib/glib-Pointer-Arrays.html
-share/gtk-doc/html/glib/glib-Quarks.html
-share/gtk-doc/html/glib/glib-Random-Numbers.html
-share/gtk-doc/html/glib/glib-Relations-and-Tuples.html
-share/gtk-doc/html/glib/glib-Sequences.html
-share/gtk-doc/html/glib/glib-Shell-related-Utilities.html
-share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html
-share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html
-share/gtk-doc/html/glib/glib-Spawning-Processes.html
-share/gtk-doc/html/glib/glib-Standard-Macros.html
-share/gtk-doc/html/glib/glib-String-Chunks.html
-share/gtk-doc/html/glib/glib-String-Utility-Functions.html
-share/gtk-doc/html/glib/glib-Strings.html
-share/gtk-doc/html/glib/glib-Testing.html
-share/gtk-doc/html/glib/glib-The-Main-Event-Loop.html
-share/gtk-doc/html/glib/glib-Thread-Pools.html
-share/gtk-doc/html/glib/glib-Threads.html
-share/gtk-doc/html/glib/glib-Timers.html
-share/gtk-doc/html/glib/glib-Trash-Stacks.html
-share/gtk-doc/html/glib/glib-Type-Conversion-Macros.html
-share/gtk-doc/html/glib/glib-UNIX-specific-utilities-and-integration.html
-share/gtk-doc/html/glib/glib-URI-Functions.html
-share/gtk-doc/html/glib/glib-Unicode-Manipulation.html
-share/gtk-doc/html/glib/glib-Version-Information.html
-share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html
-share/gtk-doc/html/glib/glib-Windows-Compatibility-Functions.html
-share/gtk-doc/html/glib/glib-building.html
-share/gtk-doc/html/glib/glib-changes.html
-share/gtk-doc/html/glib/glib-compiling.html
-share/gtk-doc/html/glib/glib-core.html
-share/gtk-doc/html/glib/glib-cross-compiling.html
-share/gtk-doc/html/glib/glib-data-types.html
-share/gtk-doc/html/glib/glib-fundamentals.html
-share/gtk-doc/html/glib/glib-gettextize.html
-share/gtk-doc/html/glib/glib-programming.html
-share/gtk-doc/html/glib/glib-regex-syntax.html
-share/gtk-doc/html/glib/glib-resources.html
-share/gtk-doc/html/glib/glib-running.html
-share/gtk-doc/html/glib/glib-utilities.html
-share/gtk-doc/html/glib/glib.devhelp2
-share/gtk-doc/html/glib/glib.html
-share/gtk-doc/html/glib/gtester-report.html
-share/gtk-doc/html/glib/gtester.html
-share/gtk-doc/html/glib/gvariant-format-strings.html
-share/gtk-doc/html/glib/gvariant-text.html
-share/gtk-doc/html/glib/home.png
-share/gtk-doc/html/glib/index.html
-share/gtk-doc/html/glib/left-insensitive.png
-share/gtk-doc/html/glib/left.png
-share/gtk-doc/html/glib/mainloop-states.gif
-share/gtk-doc/html/glib/right-insensitive.png
-share/gtk-doc/html/glib/right.png
-share/gtk-doc/html/glib/style.css
-share/gtk-doc/html/glib/tools.html
-share/gtk-doc/html/glib/up-insensitive.png
-share/gtk-doc/html/glib/up.png
-share/gtk-doc/html/gobject/GBinding.html
-share/gtk-doc/html/gobject/GTypeModule.html
-share/gtk-doc/html/gobject/GTypePlugin.html
-share/gtk-doc/html/gobject/annotation-glossary.html
-share/gtk-doc/html/gobject/api-index-full.html
-share/gtk-doc/html/gobject/ch01s02.html
-share/gtk-doc/html/gobject/chapter-gobject.html
-share/gtk-doc/html/gobject/chapter-gtype.html
-share/gtk-doc/html/gobject/chapter-intro.html
-share/gtk-doc/html/gobject/chapter-signal.html
-share/gtk-doc/html/gobject/glib-genmarshal.html
-share/gtk-doc/html/gobject/glib-mkenums.html
-share/gtk-doc/html/gobject/glue.png
-share/gtk-doc/html/gobject/gobject-Boxed-Types.html
-share/gtk-doc/html/gobject/gobject-Closures.html
-share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html
-share/gtk-doc/html/gobject/gobject-GParamSpec.html
-share/gtk-doc/html/gobject/gobject-Generic-values.html
-share/gtk-doc/html/gobject/gobject-Signals.html
-share/gtk-doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html
-share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html
-share/gtk-doc/html/gobject/gobject-Type-Information.html
-share/gtk-doc/html/gobject/gobject-Value-arrays.html
-share/gtk-doc/html/gobject/gobject-Varargs-Value-Collection.html
-share/gtk-doc/html/gobject/gobject-memory.html
-share/gtk-doc/html/gobject/gobject-properties.html
-share/gtk-doc/html/gobject/gobject-query.html
-share/gtk-doc/html/gobject/gobject.devhelp2
-share/gtk-doc/html/gobject/gtype-conventions.html
-share/gtk-doc/html/gobject/gtype-instantiable-classed.html
-share/gtk-doc/html/gobject/gtype-non-instantiable-classed.html
-share/gtk-doc/html/gobject/gtype-non-instantiable.html
-share/gtk-doc/html/gobject/home.png
-share/gtk-doc/html/gobject/howto-gobject-chainup.html
-share/gtk-doc/html/gobject/howto-gobject-code.html
-share/gtk-doc/html/gobject/howto-gobject-construction.html
-share/gtk-doc/html/gobject/howto-gobject-destruction.html
-share/gtk-doc/html/gobject/howto-gobject-methods.html
-share/gtk-doc/html/gobject/howto-gobject.html
-share/gtk-doc/html/gobject/howto-interface-implement.html
-share/gtk-doc/html/gobject/howto-interface-override.html
-share/gtk-doc/html/gobject/howto-interface-prerequisite.html
-share/gtk-doc/html/gobject/howto-interface-properties.html
-share/gtk-doc/html/gobject/howto-interface.html
-share/gtk-doc/html/gobject/howto-signals.html
-share/gtk-doc/html/gobject/index.html
-share/gtk-doc/html/gobject/left-insensitive.png
-share/gtk-doc/html/gobject/left.png
-share/gtk-doc/html/gobject/pr01.html
-share/gtk-doc/html/gobject/pt01.html
-share/gtk-doc/html/gobject/pt02.html
-share/gtk-doc/html/gobject/pt03.html
-share/gtk-doc/html/gobject/right-insensitive.png
-share/gtk-doc/html/gobject/right.png
-share/gtk-doc/html/gobject/rn01.html
-share/gtk-doc/html/gobject/rn02.html
-share/gtk-doc/html/gobject/signal.html
-share/gtk-doc/html/gobject/style.css
-share/gtk-doc/html/gobject/tools-ginspector.html
-share/gtk-doc/html/gobject/tools-gob.html
-share/gtk-doc/html/gobject/tools-gtkdoc.html
-share/gtk-doc/html/gobject/tools-refdb.html
-share/gtk-doc/html/gobject/tools-vala.html
-share/gtk-doc/html/gobject/up-insensitive.png
-share/gtk-doc/html/gobject/up.png
 share/locale/af/LC_MESSAGES/glib20.mo
 share/locale/am/LC_MESSAGES/glib20.mo
 share/locale/an/LC_MESSAGES/glib20.mo
@@ -809,4 +411,3 @@ share/locale/yi/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_HK/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
-@pkgdir lib/gio/modules

Index: pkgsrc/devel/glib2/buildlink3.mk
diff -u pkgsrc/devel/glib2/buildlink3.mk:1.29 pkgsrc/devel/glib2/buildlink3.mk:1.30
--- pkgsrc/devel/glib2/buildlink3.mk:1.29       Mon Apr 23 08:26:50 2018
+++ pkgsrc/devel/glib2/buildlink3.mk    Mon Jun  3 09:53:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2018/04/23 08:26:50 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2019/06/03 09:53:50 prlw1 Exp $
 
 BUILDLINK_TREE+=       glib2
 
@@ -8,8 +8,8 @@ GLIB2_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.4.0
 BUILDLINK_ABI_DEPENDS.glib2+=  glib2>=2.34.0
 BUILDLINK_PKGSRCDIR.glib2?=    ../../devel/glib2
-BUILDLINK_INCDIRS.glib2+=      include/glib/glib-2.0
-BUILDLINK_INCDIRS.glib2+=      include/glib/gio-unix-2.0
+BUILDLINK_INCDIRS.glib2+=      include/glib-2.0
+BUILDLINK_INCDIRS.glib2+=      include/gio-unix-2.0
 BUILDLINK_INCDIRS.glib2+=      lib/glib-2.0/include
 
 TOOL_DEPENDS+= glib2-tools-[0-9]*:../../devel/glib2-tools
@@ -19,9 +19,7 @@ TOOL_DEPENDS+=        glib2-tools-[0-9]*:../../
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
-.if empty(MACHINE_PLATFORM:MIRIX-5*)
 .include "../../mk/pthread.buildlink3.mk"
-.endif
 .endif # GLIB2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -glib2

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.237 pkgsrc/devel/glib2/distinfo:1.238
--- pkgsrc/devel/glib2/distinfo:1.237   Fri Oct 19 16:44:15 2018
+++ pkgsrc/devel/glib2/distinfo Mon Jun  3 09:53:50 2019
@@ -1,38 +1,24 @@
-$NetBSD: distinfo,v 1.237 2018/10/19 16:44:15 leot Exp $
+$NetBSD: distinfo,v 1.238 2019/06/03 09:53:50 prlw1 Exp $
 
-SHA1 (glib-2.56.2.tar.xz) = 8b18a92f81a8d033abfb43a628bae3bbaf71800c
-RMD160 (glib-2.56.2.tar.xz) = 8fe9fd51a84ebe0f61b5cb2ab97325baa51c4eb3
-SHA512 (glib-2.56.2.tar.xz) = 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
-Size (glib-2.56.2.tar.xz) = 8041756 bytes
-SHA1 (patch-Makefile.in) = 4d587eb9ff27ff2b3489c59388319142e2fb6ced
-SHA1 (patch-aa) = 01bdbcb6e49e440eefba966471a986215daec2e9
-SHA1 (patch-af) = f21f5c5f799189885a3826fde8ad079f599ae26b
-SHA1 (patch-ah) = d523967c88fc06f46de1d7f2eb04be65db04ada2
-SHA1 (patch-aha) = ade66edd87a5e76a1256bd8bcdc9bc3dd614885c
-SHA1 (patch-ak) = 040c679220988b31bd9d3e5c80a4fc6c2551e067
-SHA1 (patch-al) = af8428eeb6ce5e4dd70ddf972693df18d6c26d50
-SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-an) = 47986cfa2374ad4a89887bee5896d477a31f651f
-SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
-SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3
-SHA1 (patch-cl) = 58e5b4a3e8cf0750ceadba30e379954d800f77f7
-SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
+SHA1 (glib-2.60.2.tar.xz) = 8aa8586f0b1fd13c2717adf7ac3e6427bee651b6
+RMD160 (glib-2.60.2.tar.xz) = 8d18a8e4b43071afc35762eff3618a88a7112f57
+SHA512 (glib-2.60.2.tar.xz) = 38479c8e48fda5adaa5f7ac8e1f09c184be48adf38ab614eb69f8e11301a1b0235767abf556e09fd4d5df345822db5b3dc85d1c53d05fdba1c1b40f75b61777b
+Size (glib-2.60.2.tar.xz) = 4587388 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
-SHA1 (patch-gio_gdbus-2.0_codegen_gdbus-codegen.in) = ccbb10335fb477e347993444d68d5e88d9e93050
+SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 21c806f1a9884000b6a1683bc2fd1276b3c3544f
 SHA1 (patch-gio_giomodule.c) = 08181ad8d46dde1a028faa246a4852e474610eaa
 SHA1 (patch-gio_glocalfileinfo.c) = 8e0b7e9543ce3c702c468f56e7ecf418d70b049f
-SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
+SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 18fc55be06dfa4ebf7128b8d1888aaff3b2b95c0
-SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511
-SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
-SHA1 (patch-glib_gtimezone.c) = 3f72bc2ed4447d60871e66984a5e3a80ca8c75f4
+SHA1 (patch-gio_meson.build) = 5983ff37da260558d0f367feed75d4c0ed1bd6fd
+SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d
+SHA1 (patch-glib_meson.build) = 477cbc2324a81bb2a406487daef71cfc2140719c
 SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8
 SHA1 (patch-gmodule_gmodule-dl.c) = b678a04debbc79ebb67d91db7716990658e76da4
 SHA1 (patch-gmodule_gmodule-dyld.c) = 5adf62970d9cff22d451307aaa0b00d975dab138
 SHA1 (patch-gmodule_gmodule-win32.c) = 477a861f8590a62c3dbc0aa4ad728cc86ebb34dd
 SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a
-SHA1 (patch-gobject_Makefile.am) = 6eed6b57f5ff0aa0dfb623110b23a3ff78aa4e75
-SHA1 (patch-gobject_Makefile.in) = a4768ff7b0607a8a4dfbb2cff087a987b451fd18
-SHA1 (patch-gobject_glib-genmarshal.in) = f21ca416d4eb4ad5a8ce3ffa053f8bcd2be8953a
-SHA1 (patch-gobject_glib-mkenums.in) = 651713a9c1fd83aea5060f996b58b35fbe3a43c7
+SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
+SHA1 (patch-gobject_meson.build) = 5e7c8508dbc228d01960e563bdba40cbf10db489
+SHA1 (patch-meson.build) = f4731d32655f0b4b28cc0dddc4d553c65e857385

Index: pkgsrc/devel/glib2-tools/Makefile
diff -u pkgsrc/devel/glib2-tools/Makefile:1.6 pkgsrc/devel/glib2-tools/Makefile:1.7
--- pkgsrc/devel/glib2-tools/Makefile:1.6       Thu Apr 25 07:32:45 2019
+++ pkgsrc/devel/glib2-tools/Makefile   Mon Jun  3 09:53:50 2019
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.6 2019/04/25 07:32:45 maya Exp $
+# $NetBSD: Makefile,v 1.7 2019/06/03 09:53:50 prlw1 Exp $
 
-PKGREVISION= 1
 .include "../../devel/glib2/Makefile.common"
 
 PKGNAME:=      ${PKGNAME:S/glib2/glib2-tools/}
@@ -8,6 +7,9 @@ CATEGORIES=     devel gnome
 
 COMMENT=       GLib2/gobject python-dependent tools
 
+DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo
+PATCHDIR=      ${.CURDIR}/../../devel/glib2/patches
+
 NO_BUILD=              yes
 
 PYSCRIPTS=             glib-genmarshal glib-mkenums
@@ -17,6 +19,7 @@ do-configure:
 .for f in ${PYSCRIPTS}
        cd ${WRKSRC}/gobject \
        && ${SED} \
+               -e "s,/usr/bin/env ,," \
                -e "s,@PYTHON@,${PYTHONBIN}," \
                -e "s,@VERSION@,${PKGVERSION}," \
                ${f}.in > ${f}

Index: pkgsrc/devel/glib2/patches/patch-gio_gresource-tool.c
diff -u pkgsrc/devel/glib2/patches/patch-gio_gresource-tool.c:1.1 pkgsrc/devel/glib2/patches/patch-gio_gresource-tool.c:1.2
--- pkgsrc/devel/glib2/patches/patch-gio_gresource-tool.c:1.1   Thu Jul 12 14:43:26 2012
+++ pkgsrc/devel/glib2/patches/patch-gio_gresource-tool.c       Mon Jun  3 09:53:50 2019
@@ -1,8 +1,10 @@
-$NetBSD: patch-gio_gresource-tool.c,v 1.1 2012/07/12 14:43:26 jperkin Exp $
+$NetBSD: patch-gio_gresource-tool.c,v 1.2 2019/06/03 09:53:50 prlw1 Exp $
 
---- gio/gresource-tool.c.orig  Thu Jul 12 09:13:01 2012
-+++ gio/gresource-tool.c       Thu Jul 12 09:13:06 2012
-@@ -31,6 +31,11 @@
+Solaris fix
+
+--- gio/gresource-tool.c.orig  2019-05-03 13:43:28.000000000 +0000
++++ gio/gresource-tool.c
+@@ -29,6 +29,11 @@
  #include <locale.h>
  
  #ifdef HAVE_LIBELF
@@ -13,4 +15,4 @@ $NetBSD: patch-gio_gresource-tool.c,v 1.
 +#  endif
  #include <libelf.h>
  #include <gelf.h>
- #include <sys/mman.h>
+ #endif
Index: pkgsrc/devel/glib2/patches/patch-glib_gmain.c
diff -u pkgsrc/devel/glib2/patches/patch-glib_gmain.c:1.1 pkgsrc/devel/glib2/patches/patch-glib_gmain.c:1.2
--- pkgsrc/devel/glib2/patches/patch-glib_gmain.c:1.1   Sun Jan 25 06:54:28 2015
+++ pkgsrc/devel/glib2/patches/patch-glib_gmain.c       Mon Jun  3 09:53:50 2019
@@ -1,9 +1,9 @@
-$NetBSD: patch-glib_gmain.c,v 1.1 2015/01/25 06:54:28 pho Exp $
+$NetBSD: patch-glib_gmain.c,v 1.2 2019/06/03 09:53:50 prlw1 Exp $
 
 Imported patch from the upstream Bugzilla:
 
   Bug 728123 - glib2 @2.40.0 issues a "Got weird mach timebase info" error (Macports, PPC)
-  https://bugzilla.gnome.org/show_bug.cgi?id=728123
+  https://gitlab.gnome.org/GNOME/glib/issues/858
 
 Tested on powerpc-apple-darwin9.
 

Index: pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in
diff -u pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in:1.4 pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in:1.5
--- pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in:1.4        Sun Apr  1 20:26:25 2018
+++ pkgsrc/devel/glib2/patches/patch-gobject_glib-mkenums.in    Mon Jun  3 09:53:50 2019
@@ -1,17 +1,9 @@
-$NetBSD: patch-gobject_glib-mkenums.in,v 1.4 2018/04/01 20:26:25 joerg Exp $
+$NetBSD: patch-gobject_glib-mkenums.in,v 1.5 2019/06/03 09:53:50 prlw1 Exp $
 
-- Revert 4395a897 Use env to run the Python-based tools
-  https://bugzilla.gnome.org/show_bug.cgi?id=788527
 - Do not print failing characters that might not be ASCII
 
 --- gobject/glib-mkenums.in.orig       2018-01-08 20:00:49.000000000 +0000
 +++ gobject/glib-mkenums.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env @PYTHON@
-+#!@PYTHON@
- 
- # If the code below looks horrible and unpythonic, do not panic.
- #
 @@ -88,9 +88,8 @@ else:
  # https://bugzilla.gnome.org/show_bug.cgi?id=785113#c20
  def replace_and_warn(err):

Index: pkgsrc/sysutils/Makefile
diff -u pkgsrc/sysutils/Makefile:1.814 pkgsrc/sysutils/Makefile:1.815
--- pkgsrc/sysutils/Makefile:1.814      Wed May 29 03:24:02 2019
+++ pkgsrc/sysutils/Makefile    Mon Jun  3 09:53:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.814 2019/05/29 03:24:02 thorpej Exp $
+# $NetBSD: Makefile,v 1.815 2019/06/03 09:53:51 prlw1 Exp $
 #
 
 COMMENT=       System utilities
@@ -194,7 +194,6 @@ SUBDIR+=    gdmap
 SUBDIR+=       genpasswd
 SUBDIR+=       gentoo
 SUBDIR+=       gfm
-SUBDIR+=       gio-fam
 SUBDIR+=       gkrellm
 SUBDIR+=       gkrellm-est
 SUBDIR+=       gkrellm-server

Added files:

Index: pkgsrc/devel/gdbus-codegen/distinfo
diff -u /dev/null pkgsrc/devel/gdbus-codegen/distinfo:1.1
--- /dev/null   Mon Jun  3 09:53:51 2019
+++ pkgsrc/devel/gdbus-codegen/distinfo Mon Jun  3 09:53:50 2019
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+
+SHA1 (glib-2.60.2.tar.xz) = 8aa8586f0b1fd13c2717adf7ac3e6427bee651b6
+RMD160 (glib-2.60.2.tar.xz) = 8d18a8e4b43071afc35762eff3618a88a7112f57
+SHA512 (glib-2.60.2.tar.xz) = 38479c8e48fda5adaa5f7ac8e1f09c184be48adf38ab614eb69f8e11301a1b0235767abf556e09fd4d5df345822db5b3dc85d1c53d05fdba1c1b40f75b61777b
+Size (glib-2.60.2.tar.xz) = 4587388 bytes
+SHA1 (patch-meson.build) = 6877b395f02619ea93b648119373ac1b53438c59

Index: pkgsrc/devel/gdbus-codegen/patches/patch-meson.build
diff -u /dev/null pkgsrc/devel/gdbus-codegen/patches/patch-meson.build:1.1
--- /dev/null   Mon Jun  3 09:53:51 2019
+++ pkgsrc/devel/gdbus-codegen/patches/patch-meson.build        Mon Jun  3 09:53:50 2019
@@ -0,0 +1,26 @@
+$NetBSD: patch-meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+
+Turn into a meson.build file which meson will accept, and
+subsitute some variables.
+
+--- meson.build.orig   2019-04-15 10:54:04.000000000 +0000
++++ meson.build
+@@ -1,3 +1,5 @@
++project('gdbus_codegen')
++
+ gdbus_codegen_files = [
+   '__init__.py',
+   'codegen.py',
+@@ -9,9 +11,9 @@ gdbus_codegen_files = [
+ ]
+ 
+ gdbus_codegen_conf = configuration_data()
+-gdbus_codegen_conf.set('VERSION', glib_version)
+-gdbus_codegen_conf.set('PYTHON', python_name)
+-gdbus_codegen_conf.set('DATADIR', glib_datadir)
++gdbus_codegen_conf.set('VERSION', '@VERSION@')
++gdbus_codegen_conf.set('PYTHON', '@PYTHON@')
++gdbus_codegen_conf.set('DATADIR', '@DATADIR@')
+ 
+ # Install gdbus-codegen executable
+ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',

Index: pkgsrc/devel/glib2/options.mk
diff -u /dev/null pkgsrc/devel/glib2/options.mk:1.21
--- /dev/null   Mon Jun  3 09:53:51 2019
+++ pkgsrc/devel/glib2/options.mk       Mon Jun  3 09:53:50 2019
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.21 2019/06/03 09:53:50 prlw1 Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.glib2
+PKG_SUPPORTED_OPTIONS= fam
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=   fam
+.if !empty(PKG_OPTIONS:Mfam)
+MESON_ARGS+=   -Dfam=true
+PLIST.fam=     yes
+.include "../../mk/fam.buildlink3.mk"
+.endif

Index: pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build:1.1
--- /dev/null   Mon Jun  3 09:53:51 2019
+++ pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build  Mon Jun  3 09:53:50 2019
@@ -0,0 +1,33 @@
+$NetBSD: patch-gio_gdbus-2.0_codegen_meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+
+Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
+
+--- gio/gdbus-2.0/codegen/meson.build.orig     2019-04-15 10:54:04.000000000 +0000
++++ gio/gdbus-2.0/codegen/meson.build
+@@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_d
+ # Install gdbus-codegen executable
+ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
+   output : 'gdbus-codegen',
+-  install : true,
++  install : false,
+   install_dir : get_option('bindir'),
+   configuration : gdbus_codegen_conf
+ )
+@@ -28,7 +28,7 @@ codegen_dir = join_paths(get_option('dat
+ gdbus_codegen_built_files = []
+ gdbus_codegen_built_files += configure_file(input : 'config.py.in',
+                                             output : 'config.py',
+-                                            install : true,
++                                            install : false,
+                                             install_dir : codegen_dir,
+                                             configuration : gdbus_codegen_conf)
+ 
+@@ -36,7 +36,7 @@ foreach f : gdbus_codegen_files
+   # Copy these into the builddir so that gdbus-codegen can be used uninstalled
+   # and then install it too so that it can be used after installation
+   gdbus_codegen_built_files += configure_file(input : f, output : f,
+-                                              install : true,
++                                              install : false,
+                                               install_dir : codegen_dir,
+                                               copy : true)
+ endforeach
Index: pkgsrc/devel/glib2/patches/patch-gio_meson.build
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.1
--- /dev/null   Mon Jun  3 09:53:51 2019
+++ pkgsrc/devel/glib2/patches/patch-gio_meson.build    Mon Jun  3 09:53:50 2019
@@ -0,0 +1,11 @@
+$NetBSD: patch-gio_meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+
+Don't build tests, as have strong dependency on libdl.
+
+--- gio/meson.build.orig       2019-05-03 13:43:28.000000000 +0000
++++ gio/meson.build
+@@ -994,4 +994,3 @@ if enable_systemtap
+ endif
+ 
+ subdir('fam')
+-subdir('tests')
Index: pkgsrc/devel/glib2/patches/patch-glib_meson.build
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.1
--- /dev/null   Mon Jun  3 09:53:51 2019
+++ pkgsrc/devel/glib2/patches/patch-glib_meson.build   Mon Jun  3 09:53:50 2019
@@ -0,0 +1,39 @@
+$NetBSD: patch-glib_meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+
+- Don't bother with gtester as it's slated for deprecation anyway:
+  https://gitlab.gnome.org/GNOME/glib/issues/1441
+- Don't build tests
+
+--- glib/meson.build.orig      2019-04-15 10:54:04.000000000 +0000
++++ glib/meson.build
+@@ -324,24 +324,8 @@ if host_system == 'windows'
+       include_directories : configinc,
+       dependencies : [libglib_dep])
+   endif
+-else
+-  gtester = executable('gtester', 'gtester.c',
+-    install : true,
+-    include_directories : configinc,
+-    dependencies : [libglib_dep])
+ endif
+ 
+-report_conf = configuration_data()
+-report_conf.set('GLIB_VERSION', glib_version)
+-report_conf.set('PYTHON', python_name)
+-configure_file(
+-  input: 'gtester-report.in',
+-  output: 'gtester-report',
+-  install_dir: get_option('bindir'),
+-  configuration: report_conf,
+-  install_mode: 'rwxr-xr-x'
+-)
+-
+ install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
+ 
+ gdb_conf = configuration_data()
+@@ -370,5 +354,3 @@ if enable_systemtap
+     install_dir : tapset_install_dir,
+     install : true)
+ endif
+-
+-subdir('tests')
Index: pkgsrc/devel/glib2/patches/patch-gobject_meson.build
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gobject_meson.build:1.1
--- /dev/null   Mon Jun  3 09:53:51 2019
+++ pkgsrc/devel/glib2/patches/patch-gobject_meson.build        Mon Jun  3 09:53:50 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-gobject_meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+
+Leave glib-genmarshal and glib-mkenums to devel/glib2-tools.
+ 
+--- gobject/meson.build.orig   2019-04-15 10:54:04.000000000 +0000
++++ gobject/meson.build
+@@ -75,7 +75,7 @@ foreach tool: python_tools
+     input : tool + '.in',
+     output : tool,
+     configuration : python_tools_conf,
+-    install : true,
++    install : false,
+     install_dir : glib_bindir,
+   )
+ 
Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-meson.build:1.1
--- /dev/null   Mon Jun  3 09:53:51 2019
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Mon Jun  3 09:53:50 2019
@@ -0,0 +1,32 @@
+$NetBSD: patch-meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+
+- Don't insist that python binary is called "python3".
+  (Requires meson >= 0.50.0)
+- Don't install bash completion scripts.
+
+--- meson.build.orig   2019-05-03 13:43:28.000000000 +0000
++++ meson.build
+@@ -1886,9 +1886,11 @@ elif meson.get_cross_property('have_strl
+   glib_conf.set('HAVE_STRLCPY', 1)
+ endif
+ 
+-python = import('python').find_installation('python3')
+-# used for '#!/usr/bin/env <name>'
+-python_name = 'python3'
++python = import('python').find_installation('python3', required: false)
++if not python.found()
++  python = import('python').find_installation()
++endif
++python_name = python.path()
+ 
+ python_version = python.language_version()
+ python_version_req = '>=3.4'
+@@ -1897,7 +1899,7 @@ if not python_version.version_compare(py
+ endif
+ 
+ # Determine which user environment-dependent files that we want to install
+-have_bash = find_program('bash', required : false).found() # For completion scripts
++have_bash = false # For completion scripts
+ have_sh = find_program('sh', required : false).found() # For glib-gettextize
+ 
+ # Some installed tests require a custom environment



Home | Main Index | Thread Index | Old Index