pkgsrc-WIP-changes archive

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

wip/glib2: remove (mechanical cleanup) Parameters considered: - pkgsrc/ devel/glib2 exists - pkgsrc (2.44.1nb1) >= wip (2.34.3) - doc/CHANGES-2015 : Updated to 2.42.2 [prlw1 2015-03-14] - doc/CHANGES-2015: Updated to 2.44.1 [prlw1 2015-06-10] - wip/glib2 last touched [ wiz 2014-10-09] - package does not appear to be actively used to stage updates - manual inspection of diff revealed no uncommitted improvements



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Wed Sep 23 04:40:05 2015 +0200
Changeset:	d1cd12e3a49588452c57208825cb122504ef11e6

Removed Files:
	glib2/DEINSTALL
	glib2/DESCR
	glib2/INSTALL
	glib2/Makefile
	glib2/Makefile.common
	glib2/PLIST
	glib2/README
	glib2/buildlink3.mk
	glib2/distinfo
	glib2/files/modules.tmpl
	glib2/files/schemas.tmpl
	glib2/hacks.mk
	glib2/modules.mk
	glib2/options.mk
	glib2/patches/patch-aa
	glib2/patches/patch-ab
	glib2/patches/patch-ac
	glib2/patches/patch-ae
	glib2/patches/patch-af
	glib2/patches/patch-ah
	glib2/patches/patch-aha
	glib2/patches/patch-ai
	glib2/patches/patch-aj
	glib2/patches/patch-ak
	glib2/patches/patch-al
	glib2/patches/patch-am
	glib2/patches/patch-an
	glib2/patches/patch-ap
	glib2/patches/patch-aq
	glib2/patches/patch-at
	glib2/patches/patch-ba
	glib2/patches/patch-cb
	glib2/patches/patch-cc
	glib2/patches/patch-cd
	glib2/patches/patch-ce
	glib2/patches/patch-cf
	glib2/patches/patch-cg
	glib2/patches/patch-ci
	glib2/patches/patch-cj
	glib2/patches/patch-ck
	glib2/patches/patch-cl
	glib2/patches/patch-cm
	glib2/patches/patch-cn
	glib2/patches/patch-gio_gdummyfile.c
	glib2/patches/patch-gio_gresource-tool.c
	glib2/patches/patch-glib_goption.c
	glib2/patches/patch-glib_tests_include.c
	glib2/schemas.mk

Log Message:
wip/glib2: remove (mechanical cleanup)
Parameters considered:
- pkgsrc/devel/glib2 exists
- pkgsrc (2.44.1nb1) >= wip (2.34.3)
- doc/CHANGES-2015: Updated to 2.42.2 [prlw1 2015-03-14]
- doc/CHANGES-2015: Updated to 2.44.1 [prlw1 2015-06-10]
- wip/glib2 last touched [wiz 2014-10-09]
- package does not appear to be actively used to stage updates
- manual inspection of diff revealed no uncommitted improvements

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d1cd12e3a49588452c57208825cb122504ef11e6

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

diffstat:
 glib2/DEINSTALL                          |  19 -
 glib2/DESCR                              |   6 -
 glib2/INSTALL                            |  19 -
 glib2/Makefile                           |  63 ---
 glib2/Makefile.common                    |  89 ----
 glib2/PLIST                              | 797 -------------------------------
 glib2/README                             |  11 -
 glib2/buildlink3.mk                      |  20 -
 glib2/distinfo                           |  38 --
 glib2/files/modules.tmpl                 |  18 -
 glib2/files/schemas.tmpl                 |  18 -
 glib2/hacks.mk                           |  33 --
 glib2/modules.mk                         |  23 -
 glib2/options.mk                         |  32 --
 glib2/patches/patch-aa                   | 259 ----------
 glib2/patches/patch-ab                   |  76 ---
 glib2/patches/patch-ac                   |  21 -
 glib2/patches/patch-ae                   |  16 -
 glib2/patches/patch-af                   |  23 -
 glib2/patches/patch-ah                   |  22 -
 glib2/patches/patch-aha                  |  13 -
 glib2/patches/patch-ai                   |  18 -
 glib2/patches/patch-aj                   |  16 -
 glib2/patches/patch-ak                   | 171 -------
 glib2/patches/patch-al                   |  22 -
 glib2/patches/patch-am                   |  14 -
 glib2/patches/patch-an                   |  22 -
 glib2/patches/patch-ap                   | 102 ----
 glib2/patches/patch-aq                   |  68 ---
 glib2/patches/patch-at                   |  25 -
 glib2/patches/patch-ba                   | 198 --------
 glib2/patches/patch-cb                   |  13 -
 glib2/patches/patch-cc                   |  16 -
 glib2/patches/patch-cd                   |  41 --
 glib2/patches/patch-ce                   |  15 -
 glib2/patches/patch-cf                   |  14 -
 glib2/patches/patch-cg                   |  12 -
 glib2/patches/patch-ci                   |  16 -
 glib2/patches/patch-cj                   |  73 ---
 glib2/patches/patch-ck                   |  23 -
 glib2/patches/patch-cl                   |  27 --
 glib2/patches/patch-cm                   |  32 --
 glib2/patches/patch-cn                   |  19 -
 glib2/patches/patch-gio_gdummyfile.c     |  68 ---
 glib2/patches/patch-gio_gresource-tool.c |  16 -
 glib2/patches/patch-glib_goption.c       |  17 -
 glib2/patches/patch-glib_tests_include.c |  17 -
 glib2/schemas.mk                         |  29 --
 48 files changed, 2720 deletions(-)

diffs:
diff --git a/glib2/DEINSTALL b/glib2/DEINSTALL
deleted file mode 100644
index d04d2a2..0000000
--- a/glib2/DEINSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2013/02/08 03:20:54 outpaddling Exp $
-#
-# Forcibly remove any auto-generated caches.  The cache-regeneration tools
-# should be doing this automatically when there are no more files in the
-# directories they scan, but they don't.  And, anyway, we need to do this
-# if we want in-place updates of glib2 to work correctly.
-#
-
-GIO_MODULES_DIR="@GIO_MODULES_DIR@"
-GLIB_SCHEMAS_DIR="@GLIB_SCHEMAS_DIR@"
-
-case ${STAGE} in
-DEINSTALL)
-	${RM} -f "${GIO_MODULES_DIR}/giomodule.cache"
-	${RM} -f "${GLIB_SCHEMAS_DIR}/gschemas.compiled"
-	;;
-esac
diff --git a/glib2/DESCR b/glib2/DESCR
deleted file mode 100644
index 0b160c0..0000000
--- a/glib2/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-GLib provides the core application building blocks for libraries
-and applications written in C.  It provides the core object system
-used in GNOME, the main loop implementation, and a large set of
-utility functions for strings and common data structures.
-
-This package contains GLib version 2.
diff --git a/glib2/INSTALL b/glib2/INSTALL
deleted file mode 100644
index c55f070..0000000
--- a/glib2/INSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2013/02/08 03:20:54 outpaddling Exp $
-#
-# Generate caches after installing the glib2 package.  This is theorically
-# not needed for a fresh install but is required for in-place updates to
-# work correctly.
-
-GIO_MODULES_DIR="@GIO_MODULES_DIR@"
-GIO_QUERYMODULES="@GIO_QUERYMODULES@"
-GLIB_COMPILE_SCHEMAS="@GLIB_COMPILE_SCHEMAS@"
-GLIB_SCHEMAS_DIR="@GLIB_SCHEMAS_DIR@"
-
-case ${STAGE} in
-POST-INSTALL)
-	"${GIO_QUERYMODULES}" "${GIO_MODULES_DIR}"
-	XDG_DATA_DIRS= "${GLIB_COMPILE_SCHEMAS}" "${GLIB_SCHEMAS_DIR}"
-	;;
-esac
diff --git a/glib2/Makefile b/glib2/Makefile
deleted file mode 100644
index d5a349c..0000000
--- a/glib2/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2013/02/08 03:20:54 outpaddling Exp $
-
-.include "Makefile.common"
-.include "options.mk"
-
-CATEGORIES=		devel
-
-COMMENT=		Some useful routines for C programming (glib2)
-
-USE_TOOLS+=		msgfmt perl:run
-
-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_INTERPRETER_SKIP+=	bin/gdbus-codegen
-
-# need pcre utf8 + unicode-properties
-BUILDLINK_API_DEPENDS.pcre+=	pcre>=8.11
-# 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 ${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
-.endif
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/libffi/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/glib2/Makefile.common b/glib2/Makefile.common
deleted file mode 100644
index d5512f6..0000000
--- a/glib2/Makefile.common
+++ /dev/null
@@ -1,89 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2014/10/09 14:06:27 thomasklausner Exp $
-#
-# used by devel/glib2/Makefile
-# used by devel/gdbus-codegen/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.34.3
-PKGNAME=	${DISTNAME:S/glib/glib2/}
-CATEGORIES=	# empty; redefined in Makefile
-MASTER_SITES=	ftp://ftp.gtk.org/pub/glib/${PKGVERSION_NOREV:R}/ \
-		${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://developer.gnome.org/glib/
-COMMENT=	# empty; redefined in Makefile
-LICENSE=	gnu-lgpl-v2
-
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
-USE_LANGUAGES=		c c++ c99
-USE_LIBTOOL=		yes
-TEST_TARGET=		check
-
-DISTINFO_FILE=		${.CURDIR}/../../wip/glib2/distinfo
-PATCHDIR=		${.CURDIR}/../../wip/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.
-CONFIGURE_ARGS+=	--disable-modular-tests
-
-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=	post-patch
-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
-
-.if ${OPSYS} == "HPUX"
-CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
-.endif
-
-.include "../../mk/dlopen.buildlink3.mk"
-
-.if !empty(MACHINE_PLATFORM:MIRIX-5*)
-CONFIGURE_ARGS+=	--disable-threads
-.else
-.include "../../mk/pthread.buildlink3.mk"
-.endif
-
-SUBST_CLASSES+=		dbusdb
-SUBST_MESSAGE.dbusdb=	Adjust dbus machine uuid path to dbus package
-SUBST_STAGE.dbusdb=	post-patch
-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'
-
-pre-configure:
-	${TOUCH} ${WRKSRC}/configure ${WRKSRC}/aclocal.m4 ${WRKSRC}/config.h.in
diff --git a/glib2/PLIST b/glib2/PLIST
deleted file mode 100644
index 7953edb..0000000
--- a/glib2/PLIST
+++ /dev/null
@@ -1,797 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2013/02/08 03:20:54 outpaddling Exp $
-bin/gdbus
-bin/gio-querymodules
-bin/glib-compile-resources
-bin/glib-compile-schemas
-bin/glib-genmarshal
-bin/glib-gettextize
-bin/glib-mkenums
-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/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/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/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.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/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/gnetworkmonitor.h
-include/glib/glib-2.0/gio/gnetworkservice.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/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/gsimplepermission.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/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/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/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.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
-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/pkgconfig/gio-2.0.pc
-lib/pkgconfig/gio-unix-2.0.pc
-lib/pkgconfig/glib-2.0.pc
-lib/pkgconfig/gmodule-2.0.pc
-lib/pkgconfig/gmodule-export-2.0.pc
-lib/pkgconfig/gmodule-no-export-2.0.pc
-lib/pkgconfig/gobject-2.0.pc
-lib/pkgconfig/gthread-2.0.pc
-share/aclocal/glib-2.0.m4
-share/aclocal/glib-gettext.m4
-share/aclocal/gsettings.m4
-share/gdb/auto-load/libglib-2.0.so.0.3400.3-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.3400.3-gdb.py
-share/glib-2.0/gdb/glib.py
-share/glib-2.0/gdb/gobject.py
-share/glib-2.0/gettext/mkinstalldirs
-share/glib-2.0/gettext/po/Makefile.in.in
-share/glib-2.0/schemas/gschema.dtd
-share/gtk-doc/html/gio/ExampleAnimal.html
-share/gtk-doc/html/gio/ExampleCat.html
-share/gtk-doc/html/gio/ExampleObject.html
-share/gtk-doc/html/gio/ExampleObjectManagerClient.html
-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/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/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/GDrive.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/GInetSocketAddress.html
-share/gtk-doc/html/gio/GInitable.html
-share/gtk-doc/html/gio/GInputStream.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/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/GProxy.html
-share/gtk-doc/html/gio/GProxyAddress.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/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/GSimplePermission.html
-share/gtk-doc/html/gio/GSocket.html
-share/gtk-doc/html/gio/GSocketAddress.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/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-2-18.html
-share/gtk-doc/html/gio/api-index-2-20.html
-share/gtk-doc/html/gio/api-index-2-22.html
-share/gtk-doc/html/gio/api-index-2-24.html
-share/gtk-doc/html/gio/api-index-2-26.html
-share/gtk-doc/html/gio/api-index-2-28.html
-share/gtk-doc/html/gio/api-index-2-30.html
-share/gtk-doc/html/gio/api-index-2-32.html
-share/gtk-doc/html/gio/api-index-2-34.html
-share/gtk-doc/html/gio/api-index-deprecated.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/ch29.html
-share/gtk-doc/html/gio/ch30.html
-share/gtk-doc/html/gio/ch30s02.html
-share/gtk-doc/html/gio/ch30s03.html
-share/gtk-doc/html/gio/ch31.html
-share/gtk-doc/html/gio/ch31s02.html
-share/gtk-doc/html/gio/ch31s03.html
-share/gtk-doc/html/gio/ch31s04.html
-share/gtk-doc/html/gio/ch31s05.html
-share/gtk-doc/html/gio/ch31s06.html
-share/gtk-doc/html/gio/ch31s07.html
-share/gtk-doc/html/gio/ch32.html
-share/gtk-doc/html/gio/ch32s02.html
-share/gtk-doc/html/gio/ch32s03.html
-share/gtk-doc/html/gio/ch32s04.html
-share/gtk-doc/html/gio/ch32s05.html
-share/gtk-doc/html/gio/conversion.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/gdbus-codegen.html
-share/gtk-doc/html/gio/gdbus-convenience.html
-share/gtk-doc/html/gio/gdbus-lowlevel.html
-share/gtk-doc/html/gio/gdbus-org.gtk.GDBus.Example.ObjectManager.Animal.html
-share/gtk-doc/html/gio/gdbus-org.gtk.GDBus.Example.ObjectManager.Cat.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-GInetAddressMask.html
-share/gtk-doc/html/gio/gio-GMenuModel-exporter.html
-share/gtk-doc/html/gio/gio-GResource.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-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-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/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/index.sgml
-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/resolver.html
-share/gtk-doc/html/gio/resources.html
-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/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.png
-share/gtk-doc/html/gio/utils.html
-share/gtk-doc/html/gio/volume_mon.html
-share/gtk-doc/html/glib/annotation-glossary.html
-share/gtk-doc/html/glib/api-index-2-10.html
-share/gtk-doc/html/glib/api-index-2-12.html
-share/gtk-doc/html/glib/api-index-2-14.html
-share/gtk-doc/html/glib/api-index-2-16.html
-share/gtk-doc/html/glib/api-index-2-18.html
-share/gtk-doc/html/glib/api-index-2-2.html
-share/gtk-doc/html/glib/api-index-2-20.html
-share/gtk-doc/html/glib/api-index-2-22.html
-share/gtk-doc/html/glib/api-index-2-24.html
-share/gtk-doc/html/glib/api-index-2-26.html
-share/gtk-doc/html/glib/api-index-2-28.html
-share/gtk-doc/html/glib/api-index-2-30.html
-share/gtk-doc/html/glib/api-index-2-32.html
-share/gtk-doc/html/glib/api-index-2-34.html
-share/gtk-doc/html/glib/api-index-2-4.html
-share/gtk-doc/html/glib/api-index-2-6.html
-share/gtk-doc/html/glib/api-index-2-8.html
-share/gtk-doc/html/glib/api-index-deprecated.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-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-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/index.sgml
-share/gtk-doc/html/glib/left.png
-share/gtk-doc/html/glib/mainloop-states.gif
-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.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-2-10.html
-share/gtk-doc/html/gobject/api-index-2-12.html
-share/gtk-doc/html/gobject/api-index-2-14.html
-share/gtk-doc/html/gobject/api-index-2-18.html
-share/gtk-doc/html/gobject/api-index-2-2.html
-share/gtk-doc/html/gobject/api-index-2-22.html
-share/gtk-doc/html/gobject/api-index-2-24.html
-share/gtk-doc/html/gobject/api-index-2-26.html
-share/gtk-doc/html/gobject/api-index-2-28.html
-share/gtk-doc/html/gobject/api-index-2-30.html
-share/gtk-doc/html/gobject/api-index-2-32.html
-share/gtk-doc/html/gobject/api-index-2-34.html
-share/gtk-doc/html/gobject/api-index-2-4.html
-share/gtk-doc/html/gobject/api-index-2-6.html
-share/gtk-doc/html/gobject/api-index-2-8.html
-share/gtk-doc/html/gobject/api-index-deprecated.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/index.sgml
-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.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.png
-share/locale/af/LC_MESSAGES/glib20.mo
-share/locale/am/LC_MESSAGES/glib20.mo
-share/locale/ar/LC_MESSAGES/glib20.mo
-share/locale/as/LC_MESSAGES/glib20.mo
-share/locale/ast/LC_MESSAGES/glib20.mo
-share/locale/az/LC_MESSAGES/glib20.mo
-share/locale/be/LC_MESSAGES/glib20.mo
-share/locale/be@latin/LC_MESSAGES/glib20.mo
-share/locale/bg/LC_MESSAGES/glib20.mo
-share/locale/bn/LC_MESSAGES/glib20.mo
-share/locale/bn_IN/LC_MESSAGES/glib20.mo
-share/locale/bs/LC_MESSAGES/glib20.mo
-share/locale/ca/LC_MESSAGES/glib20.mo
-share/locale/ca@valencia/LC_MESSAGES/glib20.mo
-share/locale/cs/LC_MESSAGES/glib20.mo
-share/locale/cy/LC_MESSAGES/glib20.mo
-share/locale/da/LC_MESSAGES/glib20.mo
-share/locale/de/LC_MESSAGES/glib20.mo
-share/locale/dz/LC_MESSAGES/glib20.mo
-share/locale/el/LC_MESSAGES/glib20.mo
-share/locale/en@shaw/LC_MESSAGES/glib20.mo
-share/locale/en_CA/LC_MESSAGES/glib20.mo
-share/locale/en_GB/LC_MESSAGES/glib20.mo
-share/locale/eo/LC_MESSAGES/glib20.mo
-share/locale/es/LC_MESSAGES/glib20.mo
-share/locale/et/LC_MESSAGES/glib20.mo
-share/locale/eu/LC_MESSAGES/glib20.mo
-share/locale/fa/LC_MESSAGES/glib20.mo
-share/locale/fi/LC_MESSAGES/glib20.mo
-share/locale/fr/LC_MESSAGES/glib20.mo
-share/locale/ga/LC_MESSAGES/glib20.mo
-share/locale/gl/LC_MESSAGES/glib20.mo
-share/locale/gu/LC_MESSAGES/glib20.mo
-share/locale/he/LC_MESSAGES/glib20.mo
-share/locale/hi/LC_MESSAGES/glib20.mo
-share/locale/hr/LC_MESSAGES/glib20.mo
-share/locale/hu/LC_MESSAGES/glib20.mo
-share/locale/hy/LC_MESSAGES/glib20.mo
-share/locale/id/LC_MESSAGES/glib20.mo
-share/locale/is/LC_MESSAGES/glib20.mo
-share/locale/it/LC_MESSAGES/glib20.mo
-share/locale/ja/LC_MESSAGES/glib20.mo
-share/locale/ka/LC_MESSAGES/glib20.mo
-share/locale/kk/LC_MESSAGES/glib20.mo
-share/locale/kn/LC_MESSAGES/glib20.mo
-share/locale/ko/LC_MESSAGES/glib20.mo
-share/locale/ku/LC_MESSAGES/glib20.mo
-share/locale/lt/LC_MESSAGES/glib20.mo
-share/locale/lv/LC_MESSAGES/glib20.mo
-share/locale/mai/LC_MESSAGES/glib20.mo
-share/locale/mg/LC_MESSAGES/glib20.mo
-share/locale/mk/LC_MESSAGES/glib20.mo
-share/locale/ml/LC_MESSAGES/glib20.mo
-share/locale/mn/LC_MESSAGES/glib20.mo
-share/locale/mr/LC_MESSAGES/glib20.mo
-share/locale/ms/LC_MESSAGES/glib20.mo
-share/locale/nb/LC_MESSAGES/glib20.mo
-share/locale/nds/LC_MESSAGES/glib20.mo
-share/locale/ne/LC_MESSAGES/glib20.mo
-share/locale/nl/LC_MESSAGES/glib20.mo
-share/locale/nn/LC_MESSAGES/glib20.mo
-share/locale/oc/LC_MESSAGES/glib20.mo
-share/locale/or/LC_MESSAGES/glib20.mo
-share/locale/pa/LC_MESSAGES/glib20.mo
-share/locale/pl/LC_MESSAGES/glib20.mo
-share/locale/ps/LC_MESSAGES/glib20.mo
-share/locale/pt/LC_MESSAGES/glib20.mo
-share/locale/pt_BR/LC_MESSAGES/glib20.mo
-share/locale/ro/LC_MESSAGES/glib20.mo
-share/locale/ru/LC_MESSAGES/glib20.mo
-share/locale/rw/LC_MESSAGES/glib20.mo
-share/locale/si/LC_MESSAGES/glib20.mo
-share/locale/sk/LC_MESSAGES/glib20.mo
-share/locale/sl/LC_MESSAGES/glib20.mo
-share/locale/sq/LC_MESSAGES/glib20.mo
-share/locale/sr/LC_MESSAGES/glib20.mo
-share/locale/sr@ije/LC_MESSAGES/glib20.mo
-share/locale/sr@latin/LC_MESSAGES/glib20.mo
-share/locale/sv/LC_MESSAGES/glib20.mo
-share/locale/ta/LC_MESSAGES/glib20.mo
-share/locale/te/LC_MESSAGES/glib20.mo
-share/locale/th/LC_MESSAGES/glib20.mo
-share/locale/tl/LC_MESSAGES/glib20.mo
-share/locale/tr/LC_MESSAGES/glib20.mo
-share/locale/tt/LC_MESSAGES/glib20.mo
-share/locale/ug/LC_MESSAGES/glib20.mo
-share/locale/uk/LC_MESSAGES/glib20.mo
-share/locale/vi/LC_MESSAGES/glib20.mo
-share/locale/wa/LC_MESSAGES/glib20.mo
-share/locale/xh/LC_MESSAGES/glib20.mo
-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
diff --git a/glib2/README b/glib2/README
deleted file mode 100644
index 64833a8..0000000
--- a/glib2/README
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Added patch for gdummyfile.c.
-    gcc 4.6 does not like a variable named "in".
-
-Disabled hack converting libiconv_open calls.
-    Same issue arose in pkg-config.
-    Is this hack obsolete?
-    Does this have to do with PREFER_{NATIVE|PKGSRC}?
-
-Tested on OS X Snow Leopard with Xcode GCC and GCC 4.6.
-
diff --git a/glib2/buildlink3.mk b/glib2/buildlink3.mk
deleted file mode 100644
index b039108..0000000
--- a/glib2/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/02/08 03:20:54 outpaddling Exp $
-
-BUILDLINK_TREE+=	glib2
-
-.if !defined(GLIB2_BUILDLINK3_MK)
-GLIB2_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0
-BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.34.0
-BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/libffi/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.endif # GLIB2_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-glib2
diff --git a/glib2/distinfo b/glib2/distinfo
deleted file mode 100644
index eed6dfd..0000000
--- a/glib2/distinfo
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: distinfo,v 1.1 2013/02/08 03:20:54 outpaddling Exp $
-
-SHA1 (glib-2.34.3.tar.xz) = f2b94ca757191dddba686e54b32b3dfc5ad5d8fb
-RMD160 (glib-2.34.3.tar.xz) = 94508de21d25634f794066de246e9eecf6cbd0f8
-Size (glib-2.34.3.tar.xz) = 6334872 bytes
-SHA1 (patch-aa) = 71405ed89d2abd25edec375d52c43fe50c9f7c82
-SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
-SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
-SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
-SHA1 (patch-af) = 45c46d5d01517563fde21ba1a2fdd7d0485932ca
-SHA1 (patch-ah) = 66761b7994c54651933d50024eb607952565b214
-SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
-SHA1 (patch-ai) = 037e2bb85fbc473c431bbf736dae89825236ff31
-SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
-SHA1 (patch-ak) = 8811ff800b4fa5b258b96e06777f985294175666
-SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
-SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-an) = c93823539ba95a0e182a25714ef5024c91da3a47
-SHA1 (patch-ap) = c5cce246d2dac62d437103d4da361da8b28c66e4
-SHA1 (patch-aq) = 62abf831880ccd0529ae0af30a735ac3d01e5084
-SHA1 (patch-at) = f4c4a2fbe84eb8b361fb342f3c3b0b5a226d1794
-SHA1 (patch-ba) = f4233cd4e0109f9bee5630c655b0ab7b22ba0c61
-SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
-SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
-SHA1 (patch-cd) = 312e2f322b295ddec613f9ce9760ecafeab69047
-SHA1 (patch-ce) = ab978e9acfbfcd4e1249cbc2f9ab7e503d62a53f
-SHA1 (patch-cf) = 7aec3254eb3edfa71da72f7a9c218d148a036bd4
-SHA1 (patch-cg) = be18840e9c56bf1c2c4c2759dfc73097d463923a
-SHA1 (patch-ci) = fcf75fc77bfcdaee8911f759d63978cd627d6ebb
-SHA1 (patch-cj) = e9d10c82a30049b358003b93585280ea26e12e22
-SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
-SHA1 (patch-cl) = eb00468c5c5c70dd41803a2a263204686959a415
-SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
-SHA1 (patch-cn) = 611ad0a210fda4b22d7efbffe6a8e0db8ee92b05
-SHA1 (patch-gio_gdummyfile.c) = ea76e5f749924c78382b9678020fd3211551d5be
-SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
-SHA1 (patch-glib_goption.c) = 323297aa328b85493f156792b4baa0cb04fa82ad
-SHA1 (patch-glib_tests_include.c) = 95f7d34e6e03849316bbfac1541eec4582b92ffc
diff --git a/glib2/files/modules.tmpl b/glib2/files/modules.tmpl
deleted file mode 100644
index 6615aa0..0000000
--- a/glib2/files/modules.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: modules.tmpl,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-#
-# Rebuild the GIO modules database.
-#
-
-GIO_MODULES_DIR="@GIO_MODULES_DIR@"
-GIO_QUERYMODULES="@GIO_QUERYMODULES@"
-
-case ${STAGE} in
-POST-INSTALL)
-	${GIO_QUERYMODULES} ${GIO_MODULES_DIR}
-	;;
-POST-DEINSTALL)
-	${GIO_QUERYMODULES} ${GIO_MODULES_DIR}
-	;;
-*)
-	;;
-esac
diff --git a/glib2/files/schemas.tmpl b/glib2/files/schemas.tmpl
deleted file mode 100644
index 98e1e35..0000000
--- a/glib2/files/schemas.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: schemas.tmpl,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-#
-# Recompile the GSettings schemas.
-#
-
-GLIB_SCHEMAS_DIR="@GLIB_SCHEMAS_DIR@"
-GLIB_COMPILE_SCHEMAS="@GLIB_COMPILE_SCHEMAS@"
-
-case "${STAGE}" in
-POST-INSTALL)
-	XDG_DATA_DIRS= "${GLIB_COMPILE_SCHEMAS}" "${GLIB_SCHEMAS_DIR}"
-	;;
-POST-DEINSTALL)
-	XDG_DATA_DIRS= "${GLIB_COMPILE_SCHEMAS}" "${GLIB_SCHEMAS_DIR}"
-	;;
-*)
-	;;
-esac
diff --git a/glib2/hacks.mk b/glib2/hacks.mk
deleted file mode 100644
index 8225c1e..0000000
--- a/glib2/hacks.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2013/02/08 03:20:54 outpaddling Exp $
-
-.if !defined(GLIB2_HACKS_MK)
-GLIB2_HACKS_MK=	# defined
-
-# Build without optimization. Avoids crash in libgobject on gtk2
-# initialization. Bug is triggered regardless of whether we're using gcc or
-# aCC.
-.if !empty(MACHINE_PLATFORM:MHPUX-*-hppa)
-PKG_HACKS+=	hppa-codegen
-CFLAGS:=	-O0 ${CFLAGS:C/[+,-]O[0-9]?//g}
-.endif
-
-#.if ${OPSYS} == "Darwin"
-#CHECK_BUILTIN.libiconv:=	yes
-#. include "../../converters/libiconv/builtin.mk"
-#CHECK_BUILTIN.libiconv:=	no
-#PKG_HACKS+=		darwin-iconv
-#SUBST_CLASSES+=		iconv
-#SUBST_STAGE.iconv=	pre-configure
-#SUBST_MESSAGE.iconv=	Changing libiconv_open to iconv_open.
-#SUBST_FILES.iconv=	configure
-#SUBST_SED.iconv=	-e 's,libiconv_open,iconv_open,g'
-#.endif
-
-# Work around unresolved symbol g_test_config_vars during build
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Msunpro)
-PKG_HACKS+=		sunpro-visibility
-CONFIGURE_ARGS+=	--disable-visibility
-.endif
-
-.endif
diff --git a/glib2/modules.mk b/glib2/modules.mk
deleted file mode 100644
index f37759a..0000000
--- a/glib2/modules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: modules.mk,v 1.1 2013/02/08 03:20:54 outpaddling Exp $
-#
-# This Makefile fragment is intended to be included by packages that install
-# GIO modules.  It takes care of rebuilding the corresponding databases at
-# (de)installation time.
-#
-
-.if !defined(GIO_MODULES_MK)
-GIO_MODULES_MK=	# defined
-
-GIO_QUERYMODULES=	${BUILDLINK_PREFIX.glib2}/bin/gio-querymodules
-
-FILES_SUBST+=		GIO_MODULES_DIR=${GIO_MODULES_DIR:Q}
-FILES_SUBST+=		GIO_QUERYMODULES=${GIO_QUERYMODULES:Q}
-GIO_MODULES_DIR=${BUILDLINK_PREFIX.glib2}/lib/gio/modules
-INSTALL_TEMPLATES+=	../../devel/glib2/files/modules.tmpl
-DEINSTALL_TEMPLATES+=	../../devel/glib2/files/modules.tmpl
-
-TOOLS_NOOP+=	gio-querymodules
-
-.include "../../devel/glib2/buildlink3.mk"
-
-.endif			# GIO_MODULES_MK
diff --git a/glib2/options.mk b/glib2/options.mk
deleted file mode 100644
index de9e402..0000000
--- a/glib2/options.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2013/02/08 03:20:54 outpaddling Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.glib2
-PKG_SUPPORTED_OPTIONS=	kqueue
-PKG_SUGGESTED_OPTIONS=	# empty
-
-# We really should be doing this by default.  However, the kqueue patch is not
-# official, needs some more testing and, due to the way it is written, forces
-# us to run autoconf.  If the code gets integrated upstream, there is no reason
-# for us to provide a 'kqueue' option here and it should just go away.
-#
-#.if exists(/usr/include/sys/event.h)
-#PKG_SUGGESTED_OPTIONS+=	kqueue
-#.endif
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-.if $(PKG_OPTIONS:Mkqueue)
-PATCH_SITES=		http://distfiles.bsdfrog.org/
-PATCHFILES=		glib-gio-kqueue-2.32.4-v3.patch
-PATCH_DIST_STRIP=	-p1
-
-BUILD_DEPENDS+=	gtk-doc>=1.17nb1:../../textproc/gtk-doc
-USE_TOOLS+=	aclocal autoconf autoheader automake
-pre-configure: regen-autotools
-regen-autotools:
-	cd ${WRKSRC} && aclocal
-	cd ${WRKSRC} && automake -acf
-	cd ${WRKSRC} && autoheader
-	cd ${WRKSRC} && autoconf
-.endif
diff --git a/glib2/patches/patch-aa b/glib2/patches/patch-aa
deleted file mode 100644
index 2d3c047..0000000
--- a/glib2/patches/patch-aa
+++ /dev/null
@@ -1,259 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- configure.orig	2012-09-24 01:26:24.000000000 +0000
-+++ configure
-@@ -721,6 +721,7 @@ GIO
- GSPAWN
- GLIB_DEBUG_FLAGS
- G_MODULE_NEED_USCORE
-+G_MODULE_BROKEN_DLOPEN_NULL
- G_MODULE_BROKEN_RTLD_GLOBAL
- G_MODULE_HAVE_DLERROR
- G_MODULE_LDFLAGS
-@@ -21565,6 +21566,8 @@ else
- # ifdef _MSC_VER
- #  include <malloc.h>
- #  define alloca _alloca
-+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-+#   include <stdlib.h>
- # else
- #  ifdef HAVE_ALLOCA_H
- #   include <alloca.h>
-@@ -22610,8 +22613,8 @@ else
- fi
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler" >&5
--$as_echo_n "checking whether using Sun Studio C compiler... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler visibility" >&5
-+$as_echo_n "checking whether using Sun Studio C compiler visibility... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -24210,16 +24213,48 @@ fi
- 
- case $host in
-   *-*-solaris* )
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler with C99" >&5
-+$as_echo_n "checking whether using Sun Studio C compiler with C99... " >&6; }
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#if defined(__STDC_VERSION__) || (__STDC_VERSION__ - 0 >= 199901L)
-+#else
-+# include "error: this is STD C99."
-+#endif
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+   g_have_sunstudio_c99=yes
-+else
-+   g_have_sunstudio_c99=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $g_have_sunstudio_c99" >&5
-+$as_echo "$g_have_sunstudio_c99" >&6; }
-+    if test $g_have_sunstudio_c99 = yes; then
-+
-+$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
-+
-+    else
- 
- $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
- 
- 
- $as_echo "#define _XOPEN_SOURCE 2" >>confdefs.h
- 
-+    fi
-+
- 
- $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
- 
--     ;;
-+    ;;
- esac
- 
- if test "$ac_cv_func_statfs" = yes; then :
-@@ -25231,10 +25266,11 @@ if test x"$glib_native_win32" = xyes; th
-     G_MODULE_LDFLAGS=
- else
-   export SED
--  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+  G_MODULE_LDFLAGS=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- fi
- G_MODULE_NEED_USCORE=0
- G_MODULE_BROKEN_RTLD_GLOBAL=0
-+G_MODULE_BROKEN_DLOPEN_NULL=0
- G_MODULE_HAVE_DLERROR=0
- if test -z "$G_MODULE_IMPL"; then
-   case "$host" in
-@@ -25452,13 +25488,13 @@ if  test "$G_MODULE_IMPL" = "G_MODULE_IM
- 	LIBS="$G_MODULE_LIBS $LIBS"
- 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
- 	echo "void glib_plugin_test(void) { }" > plugin.c
--	${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
-+	${SHELL} libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
- 		${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
--	${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
-+	${SHELL} libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
- 		${LDFLAGS} -module -o plugin.la -export-dynamic \
- 		-shrext ".o" -avoid-version plugin.lo \
- 		-rpath /dont/care >/dev/null 2>&1
--	eval `./libtool --config | grep ^objdir`
-+	eval `libtool --config | grep ^objdir`
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5
- $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; }
- if ${glib_cv_rtldglobal_broken+:} false; then :
-@@ -25568,6 +25604,56 @@ fi
- 	LIBS="$LIBS_orig"
- 
- fi
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen(NULL, 0) brokenness" >&5
-+$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; }
-+if ${glib_cv_dlopennull_broken+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+		if test "$cross_compiling" = yes; then :
-+  glib_cv_dlopennull_broken=no
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#ifndef RTLD_GLOBAL
-+#  define RTLD_GLOBAL 0
-+#endif
-+#ifndef RTLD_LAZY
-+#  define RTLD_LAZY 0
-+#endif
-+int gettext;
-+int main () {
-+    void *handle;
-+    handle = dlopen ("libm.so", RTLD_GLOBAL | RTLD_LAZY);
-+    if (!handle) return 0;
-+    handle = dlopen (NULL, 0);
-+    if (!handle) return 0;
-+    handle = dlsym (handle, "sin");
-+    return handle == NULL;
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  glib_cv_dlopennull_broken=no
-+else
-+  glib_cv_dlopennull_broken=yes
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_dlopennull_broken" >&5
-+$as_echo "$glib_cv_dlopennull_broken" >&6; }
-+	if test "x$glib_cv_dlopennull_broken" = "xyes"; then
-+		G_MODULE_BROKEN_DLOPEN_NULL=1
-+	else
-+		G_MODULE_BROKEN_DLOPEN_NULL=0
-+	fi
- if test -z "$G_MODULE_IMPL"; then
- 	G_MODULE_IMPL=0
-         G_MODULE_SUPPORTED=false
-@@ -25578,7 +25664,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the suffix of module shared libraries" >&5
- $as_echo_n "checking for the suffix of module shared libraries... " >&6; }
- export SED
--shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
-+shrext_cmds=`libtool --config | grep '^shrext_cmds='`
- eval $shrext_cmds
- module=yes eval std_shrext=$shrext_cmds
- # chop the initial dot
-@@ -25602,6 +25688,7 @@ fi
- 
- 
- 
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
- $as_echo_n "checking for gspawn implementation... " >&6; }
- case "$host" in
-@@ -26543,62 +26630,8 @@ if  test x"$have_threads" = xposix; then
-       G_THREAD_LIBS="-lpthread -lthread"
-       ;;
-     *)
--      for flag in pthread pthreads mt; do
--        glib_save_CFLAGS="$CFLAGS"
--        CFLAGS="$CFLAGS -$flag"
--        if test "$cross_compiling" = yes; then :
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#include <pthread.h>
--int check_me = 0;
--void* func(void* data) {check_me = 42; return &check_me;}
--int main()
-- { pthread_t t;
--   void *ret;
--   pthread_create (&t, 0, func, 0);
--   pthread_join (t, &ret);
--   return (check_me != 42 || ret != &check_me);
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  glib_flag_works=yes
--else
--  glib_flag_works=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#include <pthread.h>
--int check_me = 0;
--void* func(void* data) {check_me = 42; return &check_me;}
--int main()
-- { pthread_t t;
--   void *ret;
--   pthread_create (&t, 0, func, 0);
--   pthread_join (t, &ret);
--   return (check_me != 42 || ret != &check_me);
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  glib_flag_works=yes
--else
--  glib_flag_works=no
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--        CFLAGS="$glib_save_CFLAGS"
--        if test $glib_flag_works = yes ; then
--           G_THREAD_CFLAGS=-$flag
--        G_THREAD_LIBS=-$flag
--        break;
--        fi
--      done
-+      G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+      G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
-        ;;
-   esac
- 
-@@ -27112,6 +27145,7 @@ case $host in
-     ;;
-   *-*-openbsd*)
-     LDFLAGS="$LDFLAGS -pthread"
-+    G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
-     ;;
-   *)
-     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
diff --git a/glib2/patches/patch-ab b/glib2/patches/patch-ab
deleted file mode 100644
index 8e1434a..0000000
--- a/glib2/patches/patch-ab
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=140329
-
---- gmodule/gmodule.c.orig	2012-03-12 00:42:42.000000000 +0000
-+++ gmodule/gmodule.c
-@@ -800,6 +800,31 @@ g_module_error (void)
-   return g_private_get (&module_error_private);
- }
- 
-+static void
-+g_module_symbol_aux (GModule           *module,
-+                    const gchar        *symbol_name,
-+                    gpointer           *symbol)
-+{
-+  gpointer hdl = module->handle;
-+#if defined (G_MODULE_BROKEN_DLOPEN_NULL) && defined(__NetBSD__) && defined(RTLD_DEFAULT)
-+  /* use some special handle to access global namespace */
-+  if (module == main_module)
-+    hdl = RTLD_DEFAULT;
-+#endif
-+
-+#ifdef G_MODULE_NEED_USCORE
-+  {
-+    gchar *name;
-+
-+    name = g_strconcat ("_", symbol_name, NULL);
-+    *symbol = _g_module_symbol (module->handle, name);
-+    g_free (name);
-+  }
-+#else
-+  *symbol = _g_module_symbol (module->handle, symbol_name);
-+#endif
-+}
-+
- /**
-  * g_module_symbol:
-  * @module: a #GModule
-@@ -828,17 +853,28 @@ g_module_symbol (GModule     *module,
-   
-   g_rec_mutex_lock (&g_module_global_lock);
- 
--#ifdef	G_MODULE_NEED_USCORE
-+#ifdef	G_MODULE_BROKEN_DLOPEN_NULL
-+  if (module == main_module)
-   {
--    gchar *name;
--
--    name = g_strconcat ("_", symbol_name, NULL);
--    *symbol = _g_module_symbol (module->handle, name);
--    g_free (name);
-+      g_module_symbol_aux(module, symbol_name, symbol);
-+      if (*symbol == NULL)
-+        {
-+          for (module = modules; module; module = module->next)
-+            {
-+              g_module_symbol_aux(module, symbol_name, symbol);
-+              if (*symbol != NULL)
-+                {
-+                  g_module_set_error (NULL);
-+                  break;
-   }
--#else	/* !G_MODULE_NEED_USCORE */
--  *symbol = _g_module_symbol (module->handle, symbol_name);
--#endif	/* !G_MODULE_NEED_USCORE */
-+            }
-+        }
-+    }
-+  else
-+    g_module_symbol_aux(module, symbol_name, symbol);
-+#else  /* !G_MODULE_BROKEN_DLOPEN_NULL */
-+  g_module_symbol_aux(module, symbol_name, symbol);
-+#endif /* G_MODULE_BROKEN_DLOPEN_NULL */
-   
-   module_error = g_module_error ();
-   if (module_error)
diff --git a/glib2/patches/patch-ac b/glib2/patches/patch-ac
deleted file mode 100644
index 736efb4..0000000
--- a/glib2/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=107626
-
---- gmodule/gmodule-dyld.c.orig	2008-09-02 15:09:12.000000000 +0000
-+++ gmodule/gmodule-dyld.c
-@@ -120,7 +120,13 @@ _g_module_symbol (gpointer     handle,
-       if (NSIsSymbolNameDefined (symbol_name))
- 	sym = NSLookupAndBindSymbol (symbol_name);
-       else
--	sym = NULL;
-+	{
-+	  GModule *mod;
-+	  for (mod = modules, sym = NULL; mod && !sym; mod = mod->next)
-+	    {
-+	      sym = NSLookupSymbolInModule (mod->handle, symbol_name);
-+	    }
-+	}
-     }
-   else
-     sym = NSLookupSymbolInModule (handle, symbol_name);
diff --git a/glib2/patches/patch-ae b/glib2/patches/patch-ae
deleted file mode 100644
index f1adcfa..0000000
--- a/glib2/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=140329
-
---- gmodule/gmoduleconf.h.in.orig	2004-02-24 15:00:19.000000000 +0100
-+++ gmodule/gmoduleconf.h.in
-@@ -45,6 +45,9 @@ extern "C" {
- #if	(@G_MODULE_BROKEN_RTLD_GLOBAL@)
- #define G_MODULE_BROKEN_RTLD_GLOBAL
- #endif
-+#if	(@G_MODULE_BROKEN_DLOPEN_NULL@)
-+#define G_MODULE_BROKEN_DLOPEN_NULL
-+#endif
- 
- #ifdef __cplusplus
- }
diff --git a/glib2/patches/patch-af b/glib2/patches/patch-af
deleted file mode 100644
index 209f4df..0000000
--- a/glib2/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- glib/libcharset/Makefile.in.orig	2010-09-27 16:10:13.000000000 +0000
-+++ glib/libcharset/Makefile.in
-@@ -776,18 +776,6 @@ lcov-clean:
- # run tests in cwd as part of make check
- check-local: test-nonrecursive
- install-exec-local: all-local
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	if test -f $(charset_alias); then \
--	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
--	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
--	  rm -f $(charset_tmp) ; \
--	else \
--	  if test @GLIBC21@ = no; then \
--	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
--	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
--	    rm -f $(charset_tmp) ; \
--	  fi ; \
--	fi
- 
- uninstall-local: all-local
- 	if test -f $(charset_alias); then \
diff --git a/glib2/patches/patch-ah b/glib2/patches/patch-ah
deleted file mode 100644
index 7009a01..0000000
--- a/glib2/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- glib/gutils.c.orig	2012-03-12 00:42:42.000000000 +0000
-+++ glib/gutils.c
-@@ -1991,7 +1991,7 @@ g_get_system_data_dirs (void)
-       gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
- 
-       if (!data_dirs || !data_dirs[0])
--          data_dirs = "/usr/local/share/:/usr/share/";
-+          data_dirs = PREFIX "/share/";
- 
-       data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
- #endif
-@@ -2053,7 +2053,7 @@ g_get_system_config_dirs (void)
-       conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
- 
-       if (!conf_dirs || !conf_dirs[0])
--          conf_dirs = "/etc/xdg";
-+          conf_dirs = PKG_SYSCONFDIR "/xdg";
- 
-       conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
- #endif
diff --git a/glib2/patches/patch-aha b/glib2/patches/patch-aha
deleted file mode 100644
index d1b9e02..0000000
--- a/glib2/patches/patch-aha
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aha,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- glib/gcharset.c.orig	2012-03-31 18:03:03.000000000 +0000
-+++ glib/gcharset.c
-@@ -295,7 +295,7 @@ unalias_lang (char *lang)
-   int i;
- 
-   if (!alias_table)
--    read_aliases ("/usr/share/locale/locale.alias");
-+    read_aliases (PREFIX "/" PKGLOCALEDIR "/locale/locale.alias");
- 
-   i = 0;
-   while ((p = g_hash_table_lookup (alias_table, lang)) && (strcmp (p, lang) != 0))
diff --git a/glib2/patches/patch-ai b/glib2/patches/patch-ai
deleted file mode 100644
index 8c6e6fb..0000000
--- a/glib2/patches/patch-ai
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583321
-
---- glib/gmain.c.orig	2011-10-14 04:03:10.000000000 +0000
-+++ glib/gmain.c
-@@ -4538,7 +4538,11 @@ ensure_unix_signal_handler_installed_unl
- 
-   action.sa_handler = g_unix_signal_handler;
-   sigemptyset (&action.sa_mask);
-+#ifdef SA_RESTART
-   action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
-+#else /* QNX */
-+  action.sa_flags = SA_NOCLDSTOP;
-+#endif
-   sigaction (signum, &action, NULL);
- }
- 
diff --git a/glib2/patches/patch-aj b/glib2/patches/patch-aj
deleted file mode 100644
index f154d74..0000000
--- a/glib2/patches/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-PR 41601, connected to http://bugzilla.gnome.org/show_bug.cgi?id=133344
-
---- glib/giounix.c.orig	2009-05-26 20:10:02.000000000 +0200
-+++ glib/giounix.c	2009-08-03 12:12:10.649001950 +0200
-@@ -33,6 +33,9 @@
- 
- #include "config.h"
- 
-+#ifdef __SunOS
-+#define _XOPEN_SOURCE 600
-+#endif
- #define _POSIX_SOURCE		/* for SSIZE_MAX */
- 
- #include <sys/types.h>
diff --git a/glib2/patches/patch-ak b/glib2/patches/patch-ak
deleted file mode 100644
index 6d19850..0000000
--- a/glib2/patches/patch-ak
+++ /dev/null
@@ -1,171 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-First chunk: automake-1.13 compat.
-
---- configure.ac.orig	2013-01-21 15:53:29.000000000 +0000
-+++ configure.ac
-@@ -291,7 +291,7 @@ AC_TRY_COMPILE(,[class a { int b; } c;],
- AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
- AC_LANG_RESTORE
- 
--AM_PROG_CC_STDC
-+AC_PROG_CC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
- 
-@@ -864,7 +864,7 @@ int main (int argc, char **argv)
- AC_MSG_RESULT($g_have_gnuc_visibility)
- AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
- 
--AC_MSG_CHECKING([whether using Sun Studio C compiler])
-+AC_MSG_CHECKING([whether using Sun Studio C compiler visibility])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
- #else
- # include "error: this is not Sun Studio."
-@@ -1115,10 +1115,22 @@ AC_CHECK_TYPE([struct ip_mreqn], [
- 
- case $host in
-   *-*-solaris* )
--     AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
--     AC_DEFINE(_XOPEN_SOURCE,          2, Needed to get declarations for msg_control and msg_controllen on Solaris)
--     AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
--     ;;
-+    AC_MSG_CHECKING([whether using Sun Studio C compiler with C99])
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__STDC_VERSION__) || (__STDC_VERSION__ - 0 >= 199901L)
-+#else
-+# include "error: this is STD C99."
-+#endif
-+    ]], [[]])], [ g_have_sunstudio_c99=yes ], [ g_have_sunstudio_c99=no ])
-+    AC_MSG_RESULT($g_have_sunstudio_c99)
-+    if test $g_have_sunstudio_c99 = yes; then
-+      AC_DEFINE(_XOPEN_SOURCE,          600, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+    else
-+      AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+      AC_DEFINE(_XOPEN_SOURCE,          2, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+    fi
-+
-+    AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+    ;;
- esac
- 
- dnl
-@@ -1477,11 +1489,12 @@ if test x"$glib_native_win32" = xyes; th
-   G_MODULE_LDFLAGS=
- else
-   export SED
--  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+  G_MODULE_LDFLAGS=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- fi
- dnl G_MODULE_IMPL= don't reset, so cmd-line can override
- G_MODULE_NEED_USCORE=0
- G_MODULE_BROKEN_RTLD_GLOBAL=0
-+G_MODULE_BROKEN_DLOPEN_NULL=0
- G_MODULE_HAVE_DLERROR=0
- dnl *** force native WIN32 shared lib loader 
- if test -z "$G_MODULE_IMPL"; then
-@@ -1542,13 +1555,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODUL
- 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
- dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
- 	echo "void glib_plugin_test(void) { }" > plugin.c
--	${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
-+	${SHELL} libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
- 		${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
--	${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
-+	${SHELL} libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
- 		${LDFLAGS} -module -o plugin.la -export-dynamic \
- 		-shrext ".o" -avoid-version plugin.lo \
- 		-rpath /dont/care >/dev/null 2>&1
--	eval `./libtool --config | grep ^objdir`
-+	eval `libtool --config | grep ^objdir`
- 	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
- 		glib_cv_rtldglobal_broken,[
- 		AC_TRY_RUN([
-@@ -1611,6 +1624,38 @@ dnl *** check for having dlerror()
- 		[G_MODULE_HAVE_DLERROR=0])
- 	LIBS="$LIBS_orig"
- ])
-+dnl *** check for dlopen(NULL, 0) brokenness
-+	AC_CACHE_CHECK([for dlopen(NULL, 0) brokenness],
-+		glib_cv_dlopennull_broken,[
-+		AC_TRY_RUN([
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#ifndef RTLD_GLOBAL
-+#  define RTLD_GLOBAL 0
-+#endif
-+#ifndef RTLD_LAZY
-+#  define RTLD_LAZY 0
-+#endif
-+int gettext;
-+int main () {
-+    void *handle;
-+    handle = dlopen ("libm.so", RTLD_GLOBAL | RTLD_LAZY);
-+    if (!handle) return 0;
-+    handle = dlopen (NULL, 0);
-+    if (!handle) return 0;
-+    handle = dlsym (handle, "sin");
-+    return handle == NULL;
-+}
-+		],
-+		[glib_cv_dlopennull_broken=no],
-+		[glib_cv_dlopennull_broken=yes],
-+		[glib_cv_dlopennull_broken=no])
-+	])
-+	if test "x$glib_cv_dlopennull_broken" = "xyes"; then
-+		G_MODULE_BROKEN_DLOPEN_NULL=1
-+	else
-+		G_MODULE_BROKEN_DLOPEN_NULL=0
-+	fi
- dnl *** done, have we got an implementation?
- if test -z "$G_MODULE_IMPL"; then
- 	G_MODULE_IMPL=0
-@@ -1621,7 +1666,7 @@ fi
- 
- AC_MSG_CHECKING(for the suffix of module shared libraries)
- export SED
--shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
-+shrext_cmds=`libtool --config | grep '^shrext_cmds='`
- eval $shrext_cmds
- module=yes eval std_shrext=$shrext_cmds
- # chop the initial dot
-@@ -1640,6 +1685,7 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
- AC_SUBST(G_MODULE_LDFLAGS)
- AC_SUBST(G_MODULE_HAVE_DLERROR)
- AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
-+AC_SUBST(G_MODULE_BROKEN_DLOPEN_NULL)
- AC_SUBST(G_MODULE_NEED_USCORE)
- AC_SUBST(GLIB_DEBUG_FLAGS)
- 
-@@ -2021,22 +2067,8 @@ AS_IF([ test x"$have_threads" = xposix],
-       G_THREAD_LIBS="-lpthread -lthread"
-       ;;
-     *)
--      for flag in pthread pthreads mt; do
--        glib_save_CFLAGS="$CFLAGS"
--        CFLAGS="$CFLAGS -$flag"
--        AC_TRY_RUN(glib_thread_test(0),
--                   glib_flag_works=yes,
--                   glib_flag_works=no,
--                   [AC_LINK_IFELSE([AC_LANG_SOURCE(glib_thread_test(0))],
--                                   glib_flag_works=yes,
--                                   glib_flag_works=no)])
--        CFLAGS="$glib_save_CFLAGS"
--        if test $glib_flag_works = yes ; then
--           G_THREAD_CFLAGS=-$flag
--        G_THREAD_LIBS=-$flag
--        break;
--        fi
--      done
-+      G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+      G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
-        ;;
-   esac
- ])
-@@ -2322,6 +2354,7 @@ case $host in
-     ;;
-   *-*-openbsd*)
-     LDFLAGS="$LDFLAGS -pthread"
-+    G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
-     ;;
-   *)
-     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
diff --git a/glib2/patches/patch-al b/glib2/patches/patch-al
deleted file mode 100644
index 929e4c6..0000000
--- a/glib2/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583329
-
---- glib/tests/convert.c.orig	2008-09-02 15:09:28.000000000 +0000
-+++ glib/tests/convert.c
-@@ -76,6 +76,7 @@ test_one_half (void)
-   g_assert (strcmp (out, "\xbd") == 0);
-   g_free (out);
- 
-+#if 0 /* these 2 tests depend on GNU iconv specific behaviour */
-   out = g_convert (in, -1, 
- 		   "ISO-8859-15", "UTF-8",
- 		   &bytes_read, &bytes_written,
-@@ -99,6 +100,7 @@ test_one_half (void)
-   g_assert (bytes_written == 1);
-   g_assert (strcmp (out, "a") == 0);
-   g_free (out);
-+#endif
- }
- 
- static void
diff --git a/glib2/patches/patch-am b/glib2/patches/patch-am
deleted file mode 100644
index e6e41ed..0000000
--- a/glib2/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- gio/tests/converter-stream.c.orig	2012-09-03 14:24:05.000000000 +0000
-+++ gio/tests/converter-stream.c
-@@ -1173,7 +1173,9 @@ main (int   argc,
-   CharsetTest charset_tests[] = {
-     { "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 },
-     { "/converter-input-stream/charset/latin1->utf8", "ISO-8859-1", "\305rr Sant\351", "UTF-8", "\303\205rr Sant\303\251", 0 },
-+#if 0 /* this depends on GNU iconv specific behaviour */
-     { "/converter-input-stream/charset/fallbacks", "UTF-8", "Some characters just don't fit into latin1: πא", "ISO-8859-1", "Some characters just don't fit into latin1: \\CF\\80\\D7\\90", 4 },
-+#endif
-   };
- 
-   gint i;
diff --git a/glib2/patches/patch-an b/glib2/patches/patch-an
deleted file mode 100644
index 893d637..0000000
--- a/glib2/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- gio/Makefile.in.orig	2012-09-24 01:26:29.000000000 +0000
-+++ gio/Makefile.in
-@@ -802,7 +802,7 @@ EXTRA_DIST = gdbusdaemon.c gdbusdaemon.h
- 	gschema.dtd gconstructor_as_data.h $(NULL) $(completion_DATA)
- TEST_PROGS = 
- NULL = 
--SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \
-+SUBDIRS = $(am__append_1) $(am__append_4) \
- 	$(am__append_8) $(am__append_11) . $(am__append_14) \
- 	$(am__append_21)
- @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
-@@ -3511,7 +3511,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-completionDATA install-data-local \
-+install-data-am: install-data-local \
- 	install-dist_schemaDATA install-gioincludeHEADERS \
- 	install-giounixincludeHEADERS install-giowin32includeHEADERS
- 	@$(NORMAL_INSTALL)
diff --git a/glib2/patches/patch-ap b/glib2/patches/patch-ap
deleted file mode 100644
index 4dc8136..0000000
--- a/glib2/patches/patch-ap
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- gio/gcredentials.c.orig	2012-11-10 03:18:53.000000000 +0000
-+++ gio/gcredentials.c
-@@ -32,6 +32,9 @@
- #include <sys/socket.h>
- #include <string.h>
- #endif
-+#ifdef __NetBSD__
-+#include <string.h>
-+#endif
- #include <stdlib.h>
- 
- #include <gobject/gvaluecollector.h>
-@@ -90,8 +93,14 @@ struct _GCredentials
-   struct ucred native;
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-   struct cmsgcred native;
--#elif defined(__OpenBSD__)
-+#elif defined(__OpenBSD__) && !defined(__MirBSD__)
-   struct sockpeercred native;
-+#elif defined(__NetBSD__) || defined(__MirBSD__)
-+  struct {
-+    pid_t pid;
-+    uid_t uid;
-+    gid_t gid;
-+  } native;
- #else
- #ifdef __GNUC__
- #warning Please add GCredentials support for your OS
-@@ -136,7 +145,7 @@ g_credentials_class_init (GCredentialsCl
- static void
- g_credentials_init (GCredentials *credentials)
- {
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
-   credentials->native.pid = getpid ();
-   credentials->native.uid = geteuid ();
-   credentials->native.gid = getegid ();
-@@ -192,7 +201,7 @@ g_credentials_to_string (GCredentials *c
-   g_return_val_if_fail (G_IS_CREDENTIALS (credentials), NULL);
- 
-   ret = g_string_new ("GCredentials:");
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
-   g_string_append (ret, "linux-ucred:");
-   if (credentials->native.pid != -1)
-     g_string_append_printf (ret, "pid=%" G_GINT64_FORMAT ",", (gint64) credentials->native.pid);
-@@ -257,7 +266,7 @@ g_credentials_is_same_user (GCredentials
-   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- 
-   ret = FALSE;
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
-   if (credentials->native.uid == other_credentials->native.uid)
-     ret = TRUE;
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-@@ -305,7 +314,7 @@ g_credentials_get_native (GCredentials  
- 
-   ret = NULL;
- 
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
-   if (native_type != G_CREDENTIALS_TYPE_LINUX_UCRED)
-     {
-       g_warning ("g_credentials_get_native: Trying to get credentials of type %d but only "
-@@ -366,7 +375,7 @@ g_credentials_set_native (GCredentials  
-                           GCredentialsType  native_type,
-                           gpointer          native)
- {
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
-   if (native_type != G_CREDENTIALS_TYPE_LINUX_UCRED)
-     {
-       g_warning ("g_credentials_set_native: Trying to set credentials of type %d "
-@@ -375,7 +384,7 @@ g_credentials_set_native (GCredentials  
-     }
-   else
-     {
--      memcpy (&credentials->native, native, sizeof (struct ucred));
-+      memcpy (&credentials->native, native, sizeof (credentials->native));
-     }
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-   if (native_type != G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED)
-@@ -433,7 +442,7 @@ g_credentials_get_unix_user (GCredential
-   g_return_val_if_fail (G_IS_CREDENTIALS (credentials), -1);
-   g_return_val_if_fail (error == NULL || *error == NULL, -1);
- 
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
-   ret = credentials->native.uid;
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-   ret = credentials->native.cmcred_euid;
-@@ -479,7 +488,7 @@ g_credentials_set_unix_user (GCredential
-   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- 
-   ret = FALSE;
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
-   credentials->native.uid = uid;
-   ret = TRUE;
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff --git a/glib2/patches/patch-aq b/glib2/patches/patch-aq
deleted file mode 100644
index 66f74ca..0000000
--- a/glib2/patches/patch-aq
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- gio/gsocket.c.orig	2012-11-10 03:27:29.000000000 +0000
-+++ gio/gsocket.c
-@@ -37,6 +37,9 @@
- #include <signal.h>
- #include <string.h>
- #include <stdlib.h>
-+#ifdef __NetBSD__
-+#include <sys/un.h>
-+#endif
- 
- #ifndef G_OS_WIN32
- # include <fcntl.h>
-@@ -2381,7 +2384,7 @@ g_socket_check_connect_result (GSocket  
- gssize
- g_socket_get_available_bytes (GSocket *socket)
- {
--#ifndef G_OS_WIN32
-+#ifdef G_OS_WIN32
-   gulong avail = 0;
- #else
-   gint avail = 0;
-@@ -4311,7 +4314,7 @@ g_socket_get_credentials (GSocket   *soc
- 
-   ret = NULL;
- 
--#if defined(__linux__) || defined(__OpenBSD__)
-+#if defined(__linux__) || (defined(__OpenBSD__) && !defined(__MirBSD__))
-   {
-     socklen_t optlen;
- #if defined(__linux__)
-@@ -4346,6 +4349,35 @@ g_socket_get_credentials (GSocket   *soc
-                                   &native_creds);
-       }
-   }
-+#elif defined(__NetBSD__) && defined(LOCAL_PEEREID)
-+  {
-+    struct unpcbid cred;
-+    socklen_t len = sizeof(cred);
-+    if (getsockopt(socket->priv->fd, 0, LOCAL_PEEREID, &cred, &len) < 0)
-+      {
-+	int errsv = get_socket_errno ();
-+	g_set_error (error,
-+		     G_IO_ERROR,
-+		     socket_io_error_from_errno (errsv),
-+		     _("Unable to get pending error: %s"),
-+		     socket_strerror (errsv));
-+      }
-+    else
-+      {
-+	struct {
-+ 		pid_t pid;
-+		uid_t uid;
-+		gid_t gid;
-+	} native_creds;
-+	native_creds.uid = cred.unp_euid;
-+	native_creds.gid = cred.unp_egid;
-+	native_creds.pid = cred.unp_pid;
-+	ret = g_credentials_new ();
-+	g_credentials_set_native (ret,
-+				  G_CREDENTIALS_TYPE_LINUX_UCRED,
-+				  &native_creds);
-+      }
-+  }
- #else
-   g_set_error_literal (error,
-                        G_IO_ERROR,
diff --git a/glib2/patches/patch-at b/glib2/patches/patch-at
deleted file mode 100644
index 275c0a9..0000000
--- a/glib2/patches/patch-at
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-at,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-open() can be variadic, the ABI is incompatible eg. on amd64
-
---- glib/gstdio.h.orig	2011-08-29 18:29:04.000000000 +0000
-+++ glib/gstdio.h
-@@ -62,7 +62,6 @@ typedef struct stat GStatBuf;
- 
- #ifndef __GTK_DOC_IGNORE__
- #define g_chmod   chmod
--#define g_open    open
- #define g_creat   creat
- #define g_rename  rename
- #define g_mkdir   mkdir
-@@ -77,6 +76,10 @@ typedef struct stat GStatBuf;
- int g_access (const gchar *filename,
- 	      int          mode);
- 
-+int g_open (const gchar *filename,
-+	    int flags,
-+	    int mode);
-+
- int g_chdir  (const gchar *path);
- 
- int g_unlink (const gchar *filename);
diff --git a/glib2/patches/patch-ba b/glib2/patches/patch-ba
deleted file mode 100644
index d7ba9f0..0000000
--- a/glib2/patches/patch-ba
+++ /dev/null
@@ -1,198 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583330
-
---- gio/gunixmounts.c.orig	2012-03-18 02:35:25.000000000 +0000
-+++ gio/gunixmounts.c
-@@ -155,6 +155,9 @@ struct _GUnixMountMonitor {
-   GFileMonitor *fstab_monitor;
-   GFileMonitor *mtab_monitor;
- 
-+  guint mount_poller_source;
-+  GList *mount_poller_mounts;
-+
-   GSource *proc_mounts_watch_source;
- };
- 
-@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_moni
- static GList *_g_get_unix_mounts (void);
- static GList *_g_get_unix_mount_points (void);
- 
-+static guint64 mount_poller_time = 0;
-+
- G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
- 
- #define MOUNT_POLL_INTERVAL 4000
-@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
- #endif
- 
- #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
-+#include <sys/param.h>
- #include <sys/ucred.h>
- #include <sys/mount.h>
- #include <fstab.h>
-@@ -243,22 +249,30 @@ g_unix_is_mount_path_system_internal (co
-     "/",              /* we already have "Filesystem root" in Nautilus */ 
-     "/bin",
-     "/boot",
-+    "/compat/linux/proc",
-+    "/compat/linux/sys",
-     "/dev",
-     "/etc",
-     "/home",
-     "/lib",
-     "/lib64",
-+    "/libexec",
-     "/live/cow",
-     "/live/image",
-     "/media",
-     "/mnt",
-     "/opt",
-+    "/rescue",
-     "/root",
-     "/sbin",
-     "/srv",
-     "/tmp",
-     "/usr",
-+    "/usr/X11R6",
-     "/usr/local",
-+    "/usr/obj",
-+    "/usr/ports",
-+    "/usr/src",
-     "/var",
-     "/var/crash",
-     "/var/local",
-@@ -602,7 +616,7 @@ get_mtab_monitor_file (void)
- static GList *
- _g_get_unix_mounts (void)
- {
--#if defined(HAVE_GETVFSSTAT)
-+#if defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__)
-   struct statvfs *mntent = NULL;
- #elif defined(HAVE_GETFSSTAT)
-   struct statfs *mntent = NULL;
-@@ -615,7 +629,7 @@ _g_get_unix_mounts (void)
-   GList *return_list;
-   
-   /* Pass NOWAIT to avoid blocking trying to update NFS mounts. */
--#if defined(HAVE_GETVFSSTAT)
-+#if defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__)
-   num_mounts = getvfsstat (NULL, 0, ST_NOWAIT);
- #elif defined(HAVE_GETFSSTAT)
-   num_mounts = getfsstat (NULL, 0, MNT_NOWAIT);
-@@ -625,7 +639,7 @@ _g_get_unix_mounts (void)
- 
-   bufsize = num_mounts * sizeof (*mntent);
-   mntent = g_malloc (bufsize);
--#if defined(HAVE_GETVFSSTAT)
-+#if defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__)
-   num_mounts = getvfsstat (mntent, bufsize, ST_NOWAIT);
- #elif defined(HAVE_GETFSSTAT)
-   num_mounts = getfsstat (mntent, bufsize, MNT_NOWAIT);
-@@ -641,9 +655,15 @@ _g_get_unix_mounts (void)
-       
-       mount_entry->mount_path = g_strdup (mntent[i].f_mntonname);
-       mount_entry->device_path = g_strdup (mntent[i].f_mntfromname);
-+#if defined(__digital__)
-+      mount_entry->filesystem_type = g_strdup ("unknown");
-+#else
-       mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
--#if defined(HAVE_GETVFSSTAT)
-+#endif
-+#if defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__)
-       if (mntent[i].f_flag & ST_RDONLY)
-+#elif defined(__digital__)
-+      if (mntent[i].f_flags & M_RDONLY)
- #elif defined(HAVE_GETFSSTAT)
-       if (mntent[i].f_flags & MNT_RDONLY)
- #endif
-@@ -1122,6 +1142,10 @@ get_mounts_timestamp (void)
-       if (stat (monitor_file, &buf) == 0)
- 	return (guint64)buf.st_mtime;
-     }
-+  else
-+    {
-+      return mount_poller_time;
-+    }
-   return 0;
- }
- 
-@@ -1267,6 +1291,13 @@ g_unix_mount_monitor_finalize (GObject *
-       g_object_unref (monitor->mtab_monitor);
-     }
- 
-+  if (monitor->mount_poller_source > 0)
-+    {
-+      g_source_remove (monitor->mount_poller_source);
-+      g_list_foreach (monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL);
-+      g_list_free (monitor->mount_poller_mounts);
-+    }
-+
-   the_mount_monitor = NULL;
- 
-   G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-@@ -1358,6 +1389,51 @@ proc_mounts_changed (GIOChannel   *chann
-   return TRUE;
- }
- 
-+static gboolean
-+mount_change_poller (gpointer user_data)
-+{
-+  GUnixMountMonitor *mount_monitor;
-+  GList *current_mounts;
-+  gboolean has_changed = FALSE;
-+
-+  mount_monitor = user_data;
-+  current_mounts = _g_get_unix_mounts ();
-+
-+  if (g_list_length (current_mounts) != g_list_length (mount_monitor->mount_poller_mounts))
-+    {
-+      g_list_foreach (mount_monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL);
-+      has_changed = TRUE;
-+    }
-+  else
-+    {
-+      int i;
-+
-+      for (i = 0; i < g_list_length (current_mounts); i++)
-+        {
-+          GUnixMountEntry *m1;
-+         GUnixMountEntry *m2;
-+
-+         m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
-+         m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
-+          if (! has_changed && g_unix_mount_compare (m1, m2) != 0)
-+            has_changed = TRUE;
-+
-+         g_unix_mount_free (m2);
-+       }
-+    }
-+
-+  g_list_free (mount_monitor->mount_poller_mounts);
-+  mount_monitor->mount_poller_mounts = current_mounts;
-+
-+  if (has_changed)
-+    {
-+      mount_poller_time = (guint64)time (NULL);
-+      g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
-+    }
-+
-+  return TRUE;
-+}
-+
- static void
- g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
- {
-@@ -1412,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon
-           g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
-         }
-     }
-+  else
-+    {
-+      monitor->mount_poller_mounts = _g_get_unix_mounts ();
-+      mount_poller_time = (guint64)time (NULL);
-+      monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor);
-+    }
- }
- 
- /**
diff --git a/glib2/patches/patch-cb b/glib2/patches/patch-cb
deleted file mode 100644
index 1d1ac6c..0000000
--- a/glib2/patches/patch-cb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- gio/xdgmime/xdgmime.c.orig	2008-09-02 15:09:17.000000000 +0000
-+++ gio/xdgmime/xdgmime.c
-@@ -257,7 +257,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
- 
-   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-   if (xdg_data_dirs == NULL)
--    xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+    xdg_data_dirs = PREFIX "/share/";
- 
-   ptr = xdg_data_dirs;
- 
diff --git a/glib2/patches/patch-cc b/glib2/patches/patch-cc
deleted file mode 100644
index 9ee3f57..0000000
--- a/glib2/patches/patch-cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=562334
-
---- glib/gbacktrace.h.orig	2009-03-13 04:09:59.000000000 +0000
-+++ glib/gbacktrace.h
-@@ -32,6 +32,9 @@
- #define __G_BACKTRACE_H__
- 
- #include <glib/gtypes.h>
-+#ifdef __sun__
-+#include <sys/select.h>
-+#endif
- #include <signal.h>
- 
- G_BEGIN_DECLS
diff --git a/glib2/patches/patch-cd b/glib2/patches/patch-cd
deleted file mode 100644
index 3d042f6..0000000
--- a/glib2/patches/patch-cd
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-sysutils/gio-fam builds the gio/fam backend as a separate module.  Force it
-to link against the installed version of glib2, as it is not rebuilt by the
-package.
-
---- gio/fam/Makefile.in.orig	2012-03-11 23:56:05.000000000 +0000
-+++ gio/fam/Makefile.in
-@@ -87,10 +87,7 @@ am__uninstall_files_from_dir = { \
- am__installdirs = "$(DESTDIR)$(giomoduledir)"
- LTLIBRARIES = $(giomodule_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
--	$(top_builddir)/gobject/libgobject-2.0.la \
--	$(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__objects_1 =
- am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
- 	libgiofam_la-fam-module.lo \
-@@ -403,9 +400,7 @@ libgiofam_la_CFLAGS = \
- 
- libgiofam_la_LDFLAGS = $(module_flags)
- libgiofam_la_LIBADD = \
--		$(top_builddir)/gio/libgio-2.0.la \
--		$(top_builddir)/gobject/libgobject-2.0.la \
--		$(top_builddir)/glib/libglib-2.0.la \
-+		$$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \
- 		$(GLIB_LIBS) \
- 		$(FAM_LIBS) \
- 		$(NULL)
-@@ -843,9 +838,6 @@ lcov-clean:
- check-local: test-nonrecursive
- 
- install-data-hook:
--	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
--		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
--	fi
- 
- uninstall-local:
- 	$(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodule.cache
diff --git a/glib2/patches/patch-ce b/glib2/patches/patch-ce
deleted file mode 100644
index 520765d..0000000
--- a/glib2/patches/patch-ce
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-Fix inconsistency of .hidden attributes, leading to link error on amd64,
-reported by Tobias Nygren.
-
---- glib/gatomic.c.orig	2012-03-12 00:42:41.000000000 +0000
-+++ glib/gatomic.c
-@@ -22,6 +22,7 @@
- #include "config.h"
- 
- #include "gatomic.h"
-+#include "gthreadprivate.h"
- 
- /**
-  * SECTION:atomic_operations
diff --git a/glib2/patches/patch-cf b/glib2/patches/patch-cf
deleted file mode 100644
index eb9b14e..0000000
--- a/glib2/patches/patch-cf
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cf,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- gio/gnetworkingprivate.h.orig	2012-03-31 18:24:51.000000000 +0000
-+++ gio/gnetworkingprivate.h
-@@ -51,6 +51,9 @@
- #include <arpa/inet.h>
- #include <arpa/nameser.h>
- #if defined(HAVE_ARPA_NAMESER_COMPAT_H) && !defined(GETSHORT)
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#endif
- #include <arpa/nameser_compat.h>
- #endif
- #include <net/if.h>
diff --git a/glib2/patches/patch-cg b/glib2/patches/patch-cg
deleted file mode 100644
index e2d57f7..0000000
--- a/glib2/patches/patch-cg
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cg,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- glib/gmem.c.orig	2012-03-19 00:29:05.000000000 +0000
-+++ glib/gmem.c
-@@ -42,6 +42,7 @@
- #include "gbacktrace.h"
- #include "gtestutils.h"
- #include "gthread.h"
-+#include "gthreadprivate.h"
- #include "glib_trace.h"
- 
- #define MEM_PROFILE_TABLE_SIZE 4096
diff --git a/glib2/patches/patch-ci b/glib2/patches/patch-ci
deleted file mode 100644
index 3b2cbad..0000000
--- a/glib2/patches/patch-ci
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ci,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-needed for calls to major() & minor()
-
---- gio/gdbusmessage.c.orig	2010-11-10 14:02:41.786659900 -0600
-+++ gio/gdbusmessage.c	2010-11-10 14:03:53.567042800 -0600
-@@ -52,6 +52,9 @@
- 
- #ifdef G_OS_UNIX
- #include "gunixfdlist.h"
-+#ifdef __sun
-+#include <sys/mkdev.h>
-+#endif
- #endif
- 
- #include "glibintl.h"
diff --git a/glib2/patches/patch-cj b/glib2/patches/patch-cj
deleted file mode 100644
index 63c67ac..0000000
--- a/glib2/patches/patch-cj
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-cj,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-The mem-overflow test contains a declaration of an empty struct, which breaks
-on at least SunPro cc, and presumably some other non-gcc compilers.  Skip this
-test for now, pending a better fix.
-https://bugzilla.gnome.org/show_bug.cgi?id=641350
-
---- glib/tests/Makefile.in.orig	2012-03-24 03:02:45.000000000 +0000
-+++ glib/tests/Makefile.in
-@@ -71,7 +71,7 @@ am__EXEEXT_3 = testing$(EXEEXT) option-c
- 	strfuncs$(EXEEXT) string$(EXEEXT) markup-parse$(EXEEXT) \
- 	markup-collect$(EXEEXT) markup-escape$(EXEEXT) \
- 	markup-subparser$(EXEEXT) array-test$(EXEEXT) bytes$(EXEEXT) \
--	hostutils$(EXEEXT) gvariant$(EXEEXT) mem-overflow$(EXEEXT) \
-+	hostutils$(EXEEXT) gvariant$(EXEEXT) \
- 	utf8-performance$(EXEEXT) utils$(EXEEXT) regex$(EXEEXT) \
- 	base64$(EXEEXT) sequence$(EXEEXT) scannerapi$(EXEEXT) \
- 	shell$(EXEEXT) collate$(EXEEXT) utf8-pointer$(EXEEXT) \
-@@ -229,8 +229,6 @@ markup_parse_DEPENDENCIES = $(progs_ldad
- markup_subparser_SOURCES = markup-subparser.c
- markup_subparser_OBJECTS = markup-subparser.$(OBJEXT)
- markup_subparser_DEPENDENCIES = $(progs_ldadd)
--mem_overflow_SOURCES = mem-overflow.c
--mem_overflow_OBJECTS = mem-overflow.$(OBJEXT)
- mem_overflow_DEPENDENCIES = $(progs_ldadd)
- mutex_SOURCES = mutex.c
- mutex_OBJECTS = mutex.$(OBJEXT)
-@@ -394,7 +392,7 @@ SOURCES = $(1bit_emufutex_SOURCES) 1bit-
- 	$(gwakeup_fallback_SOURCES) hash.c hmac.c hook.c hostutils.c \
- 	include.c $(keyfile_SOURCES) list.c logging.c mainloop.c \
- 	mappedfile.c markup-collect.c markup-escape.c markup-parse.c \
--	markup-subparser.c mem-overflow.c mutex.c node.c once.c \
-+	markup-subparser.c mutex.c node.c once.c \
- 	$(option_argv0_SOURCES) $(option_context_SOURCES) pattern.c \
- 	private.c $(protocol_SOURCES) queue.c $(rand_SOURCES) \
- 	rec-mutex.c regex.c rwlock.c scannerapi.c sequence.c shell.c \
-@@ -415,7 +413,7 @@ DIST_SOURCES = $(1bit_emufutex_SOURCES) 
- 	$(am__gwakeup_fallback_SOURCES_DIST) hash.c hmac.c hook.c \
- 	hostutils.c include.c $(keyfile_SOURCES) list.c logging.c \
- 	mainloop.c mappedfile.c markup-collect.c markup-escape.c \
--	markup-parse.c markup-subparser.c mem-overflow.c mutex.c \
-+	markup-parse.c markup-subparser.c mutex.c \
- 	node.c once.c $(option_argv0_SOURCES) \
- 	$(option_context_SOURCES) pattern.c private.c \
- 	$(protocol_SOURCES) queue.c $(rand_SOURCES) rec-mutex.c \
-@@ -679,7 +677,7 @@ EXTRA_DIST = 4096-random-bytes keyfilete
- TEST_PROGS = testing option-context option-argv0 keyfile fileutils \
- 	test-printf protocol rand strfuncs string markup-parse \
- 	markup-collect markup-escape markup-subparser array-test bytes \
--	hostutils gvariant mem-overflow utf8-performance utils regex \
-+	hostutils gvariant utf8-performance utils regex \
- 	base64 sequence scannerapi shell collate utf8-pointer \
- 	utf8-validate utf8-misc unicode checksum hmac hash cache date \
- 	node convert list slist queue tree uri dir pattern logging \
-@@ -973,9 +971,7 @@ markup-parse$(EXEEXT): $(markup_parse_OB
- markup-subparser$(EXEEXT): $(markup_subparser_OBJECTS) $(markup_subparser_DEPENDENCIES) $(EXTRA_markup_subparser_DEPENDENCIES) 
- 	@rm -f markup-subparser$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(markup_subparser_OBJECTS) $(markup_subparser_LDADD) $(LIBS)
--mem-overflow$(EXEEXT): $(mem_overflow_OBJECTS) $(mem_overflow_DEPENDENCIES) $(EXTRA_mem_overflow_DEPENDENCIES) 
--	@rm -f mem-overflow$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(mem_overflow_OBJECTS) $(mem_overflow_LDADD) $(LIBS)
-+
- mutex$(EXEEXT): $(mutex_OBJECTS) $(mutex_DEPENDENCIES) $(EXTRA_mutex_DEPENDENCIES) 
- 	@rm -f mutex$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(mutex_OBJECTS) $(mutex_LDADD) $(LIBS)
-@@ -1142,7 +1138,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-escape.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-parse.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-subparser.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem-overflow.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mutex.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/once.Po@am__quote@
diff --git a/glib2/patches/patch-ck b/glib2/patches/patch-ck
deleted file mode 100644
index 7645db5..0000000
--- a/glib2/patches/patch-ck
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- glib/libcharset/Makefile.am.orig	2011-06-05 23:18:49.000000000 +0000
-+++ glib/libcharset/Makefile.am
-@@ -25,18 +25,6 @@ EXTRA_DIST += 			\
- charset_alias = $(DESTDIR)$(libdir)/charset.alias
- charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
- install-exec-local: all-local
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	if test -f $(charset_alias); then \
--	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
--	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
--	  rm -f $(charset_tmp) ; \
--	else \
--	  if test @GLIBC21@ = no; then \
--	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
--	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
--	    rm -f $(charset_tmp) ; \
--	  fi ; \
--	fi
- 
- uninstall-local: all-local
- 	if test -f $(charset_alias); then \
diff --git a/glib2/patches/patch-cl b/glib2/patches/patch-cl
deleted file mode 100644
index dff654e..0000000
--- a/glib2/patches/patch-cl
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-cl,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- gio/Makefile.am.orig	2012-07-14 20:33:13.000000000 +0000
-+++ gio/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
- 
- NULL =
- 
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
- 
- if OS_UNIX
- SUBDIRS += xdgmime
-@@ -722,13 +722,6 @@ gdbus_LDADD = libgio-2.0.la \
- 	$(top_builddir)/glib/libglib-2.0.la 		\
- 	$(top_builddir)/gobject/libgobject-2.0.la
- 
--completiondir = $(datadir)/bash-completion/completions
--completion_DATA = \
--	completion/gdbus				\
--	completion/gsettings				\
--	completion/gresource
--EXTRA_DIST += $(completion_DATA)
--
- # ------------------------------------------------------------------------
- # gresource tool
- 
diff --git a/glib2/patches/patch-cm b/glib2/patches/patch-cm
deleted file mode 100644
index 9192bdb..0000000
--- a/glib2/patches/patch-cm
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-cm,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-sysutils/gio-fam builds the gio/fam backend as a separate module.  Force it
-to link against the installed version of glib2, as it is not rebuilt by the
-package.
-
---- gio/fam/Makefile.am.orig	2012-03-11 23:55:40.000000000 +0000
-+++ gio/fam/Makefile.am
-@@ -25,11 +25,9 @@ libgiofam_la_CFLAGS = \
- 	-DGIO_COMPILATION		\
- 	-DG_DISABLE_DEPRECATED
- 
--libgiofam_la_LDFLAGS = $(module_flags)
-+libgiofam_la_LDFLAGS = $(module_flags) \
-+		$$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0)
- libgiofam_la_LIBADD = \
--		$(top_builddir)/gio/libgio-2.0.la \
--		$(top_builddir)/gobject/libgobject-2.0.la \
--		$(top_builddir)/glib/libglib-2.0.la \
- 		$(GLIB_LIBS) \
- 		$(FAM_LIBS) \
- 		$(NULL)
-@@ -41,9 +39,6 @@ RUN_QUERY_MODULES=true
- endif
- 
- install-data-hook:
--	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
--		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
--	fi
- 
- uninstall-local:
- 	$(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodule.cache
diff --git a/glib2/patches/patch-cn b/glib2/patches/patch-cn
deleted file mode 100644
index a2ad451..0000000
--- a/glib2/patches/patch-cn
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-cn,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-The mem-overflow test contains a declaration of an empty struct, which breaks
-on at least SunPro cc, and presumably some other non-gcc compilers.  Skip this
-test for now, pending a better fix.
-https://bugzilla.gnome.org/show_bug.cgi?id=641350
-
---- glib/tests/Makefile.am.orig	2011-06-05 23:18:49.000000000 +0000
-+++ glib/tests/Makefile.am
-@@ -77,9 +77,6 @@ hostutils_LDADD     = $(progs_ldadd)
- TEST_PROGS         += gvariant
- gvariant_LDADD      = $(progs_ldadd)
- 
--TEST_PROGS         += mem-overflow
--mem_overflow_LDADD  = $(progs_ldadd)
--
- TEST_PROGS              += utf8-performance
- utf8_performance_SOURCES = utf8-performance.c
- utf8_performance_LDADD   = $(progs_ldadd)
diff --git a/glib2/patches/patch-gio_gdummyfile.c b/glib2/patches/patch-gio_gdummyfile.c
deleted file mode 100644
index 9536bc4..0000000
--- a/glib2/patches/patch-gio_gdummyfile.c
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-gio_gdummyfile.c,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
---- gio/gdummyfile.c.orig	2012-11-20 14:27:01.000000000 +0000
-+++ gio/gdummyfile.c
-@@ -446,7 +446,7 @@ unescape_string (const gchar *escaped_st
- 		 const gchar *escaped_string_end,
- 		 const gchar *illegal_characters)
- {
--  const gchar *in;
-+  const gchar *inp;
-   gchar *out, *result;
-   gint character;
-   
-@@ -459,19 +459,19 @@ unescape_string (const gchar *escaped_st
-   result = g_malloc (escaped_string_end - escaped_string + 1);
- 	
-   out = result;
--  for (in = escaped_string; in < escaped_string_end; in++) 
-+  for (inp = escaped_string; inp < escaped_string_end; inp++) 
-     {
--      character = *in;
--      if (*in == '%') 
-+      character = *inp;
-+      if (*inp == '%') 
-         {
--          in++;
--          if (escaped_string_end - in < 2)
-+          inp++;
-+          if (escaped_string_end - inp < 2)
- 	    {
- 	      g_free (result);
- 	      return NULL;
- 	    }
-       
--          character = unescape_character (in);
-+          character = unescape_character (inp);
-       
-           /* Check for an illegal character. We consider '\0' illegal here. */
-           if (character <= 0 ||
-@@ -481,7 +481,7 @@ unescape_string (const gchar *escaped_st
- 	      g_free (result);
- 	      return NULL;
- 	    }
--          in++; /* The other char will be eaten in the loop header */
-+          inp++; /* The other char will be eaten in the loop header */
-         }
-       *out++ = (char)character;
-     }
-@@ -521,7 +521,7 @@ GDecodedUri *
- _g_decode_uri (const char *uri)
- {
-   GDecodedUri *decoded;
--  const char *p, *in, *hier_part_start, *hier_part_end, *query_start, *fragment_start;
-+  const char *p, *inp, *hier_part_start, *hier_part_end, *query_start, *fragment_start;
-   char *out;
-   char c;
- 
-@@ -556,8 +556,8 @@ _g_decode_uri (const char *uri)
-   
-   decoded->scheme = g_malloc (p - uri);
-   out = decoded->scheme;
--  for (in = uri; in < p - 1; in++)
--    *out++ = g_ascii_tolower (*in);
-+  for (inp = uri; inp < p - 1; inp++)
-+    *out++ = g_ascii_tolower (*inp);
-   *out = 0;
- 
-   hier_part_start = p;
diff --git a/glib2/patches/patch-gio_gresource-tool.c b/glib2/patches/patch-gio_gresource-tool.c
deleted file mode 100644
index 042c330..0000000
--- a/glib2/patches/patch-gio_gresource-tool.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-gio_gresource-tool.c,v 1.1 2013/02/08 03:20:55 outpaddling 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 @@
- #include <locale.h>
- 
- #ifdef HAVE_LIBELF
-+/* Solaris native libelf does not support largefile in 32-bit mode */
-+#  if defined(__sun) && defined(__i386)
-+#    undef  _FILE_OFFSET_BITS
-+#    define _FILE_OFFSET_BITS   32
-+#  endif
- #include <libelf.h>
- #include <gelf.h>
- #include <sys/mman.h>
diff --git a/glib2/patches/patch-glib_goption.c b/glib2/patches/patch-glib_goption.c
deleted file mode 100644
index 18e3bc3..0000000
--- a/glib2/patches/patch-glib_goption.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-glib_goption.c,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-This is needed on MirBSD, which does not have nitems
-in sys/param.h, contrary to OpenBSD.
---- glib/goption.c.orig	Sun Mar 11 22:19:05 2012
-+++ glib/goption.c
-@@ -146,6 +146,10 @@
- #include <sys/sysctl.h>
- #endif
- 
-+#ifndef nitems
-+#define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
-+#endif
-+
- #include "goption.h"
- 
- #include "gprintf.h"
diff --git a/glib2/patches/patch-glib_tests_include.c b/glib2/patches/patch-glib_tests_include.c
deleted file mode 100644
index 2ee5316..0000000
--- a/glib2/patches/patch-glib_tests_include.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-glib_tests_include.c,v 1.1 2013/02/08 03:20:55 outpaddling Exp $
-
-SunOS requires _XOPEN_SOURCE etc. to be set correctly when compiling C99.
-
---- glib/tests/include.c.orig	2012-04-13 01:39:20.000000000 +0200
-+++ glib/tests/include.c	2012-05-08 15:05:36.027464330 +0200
-@@ -1,8 +1,10 @@
- /* Test case for bug 659866 */
- 
-+#ifndef __sun
- #define _POSIX_C_SOURCE 199309L
- #undef _GNU_SOURCE
- #undef _XOPEN_SOURCE
-+#endif
- #include <pthread.h>
- #include <glib.h>
- 
diff --git a/glib2/schemas.mk b/glib2/schemas.mk
deleted file mode 100644
index c5f33ce..0000000
--- a/glib2/schemas.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: schemas.mk,v 1.1 2013/02/08 03:20:54 outpaddling Exp $
-#
-# This Makefile fragment is intended to be included by packages that install
-# GSettings schemas.  It takes care of rebuilding the corresponding databases
-# at (de)installation time.
-#
-
-.if !defined(GLIB_SCHEMAS_MK)
-GLIB_SCHEMAS_MK=	# defined
-
-GLIB_COMPILE_SCHEMAS=	${BUILDLINK_PREFIX.glib2}/bin/glib-compile-schemas
-
-FILES_SUBST+=		GLIB_SCHEMAS_DIR=${GLIB_SCHEMAS_DIR:Q}
-FILES_SUBST+=		GLIB_COMPILE_SCHEMAS=${GLIB_COMPILE_SCHEMAS:Q}
-GLIB_SCHEMAS_DIR=${BUILDLINK_PREFIX.glib2}/share/glib-2.0/schemas
-INSTALL_TEMPLATES+=	../../devel/glib2/files/schemas.tmpl
-DEINSTALL_TEMPLATES+=	../../devel/glib2/files/schemas.tmpl
-
-TOOLS_NOOP+=		glib-compile-schemas
-# Adding glib-compile-schemas to TOOLS_NOOP is not enough to mock out all
-# calls to this tool.  Some packages do 'pkg-config --variable
-# glib_compile_schemas gio-2.0' to get the path to the binary.  Do a best
-# effort here by overriding the possibly-defined GLIB_COMPILE_SCHEMAS
-# variable in the offending Makefiles.
-MAKE_FLAGS+=		GLIB_COMPILE_SCHEMAS=glib-compile-schemas
-
-.include "../../devel/glib2/buildlink3.mk"
-
-.endif			# GLIB_SCHEMAS_MK


Home | Main Index | Thread Index | Old Index