Rely on g_mount_can_unmount() from GLib for the gio-kqueue backend to

choose between kqueue(3) or poll(2) for monitoring. This allows dropping
the need for a gio-kqueue.conf file.
This commit is contained in:
ajacoutot 2012-09-18 13:05:59 +00:00
parent bb3e57117a
commit f3d9095951
5 changed files with 8 additions and 27 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.183 2012/09/07 14:40:59 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.184 2012/09/18 13:05:59 ajacoutot Exp $
COMMENT= general-purpose utility library
@ -7,7 +7,7 @@ DISTNAME= glib-${V}
PKGNAME= ${DISTNAME:S/glib/glib2/}
EXTRACT_SUFX= .tar.xz
REVISION= 2
REVISION= 3
CATEGORIES= devel
@ -77,7 +77,8 @@ BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
devel/libtool
#MASTER_SITES0= http://dmitrymatveev.co.uk/files/
MASTER_SITES0= http://distfiles.bsdfrog.org/
PATCHFILES= glib-gio-kqueue-2.32.1-v1.patch:0
PATCHFILES= glib-gio-kqueue-2.32.4-v3.patch:0
PATCH_DIST_STRIP= -p1
AUTO_ENV= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION}
post-patch:
@ -100,9 +101,4 @@ pre-configure:
${WRKSRC}/gio/gdbusprivate.c \
${WRKSRC}/po/*.po
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/glib2
${INSTALL_DATA} ${FILESDIR}/gio-kqueue.conf \
${PREFIX}/share/examples/glib2
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
SHA256 (glib-2.32.4.tar.xz) = pddCpP2iL7aXWowM/NJJndHICbiv1O9wm9pNEbFn+uI=
SHA256 (glib-gio-kqueue-2.32.1-v1.patch) = oXaLBaL0UkhlGfy1DCgx6jHx3x1LMmhzqlA93agtdDo=
SHA256 (glib-gio-kqueue-2.32.4-v3.patch) = H8wqMyMQKnemBvZ7nYfNC6skI0uKJgL5WHhzpxNfbc4=
SIZE (glib-2.32.4.tar.xz) = 6178556
SIZE (glib-gio-kqueue-2.32.1-v1.patch) = 100340
SIZE (glib-gio-kqueue-2.32.4-v3.patch) = 100892

View File

@ -1,9 +0,0 @@
# $OpenBSD: gio-kqueue.conf,v 1.3 2012/07/12 11:40:52 ajacoutot Exp $
#
# Exclusion list; use polling instead of kqueue(2) for monitoring
# (which prevents clean unmount operations) for the following locations.
# merged with the content of ~/.config/gio-kqueue.conf
/media
/mnt
/run

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2012/08/30 10:08:46 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.20 2012/09/18 13:05:59 ajacoutot Exp $
@conflict glib2-docs-*
@conflict glib2-fam-*
@pkgpath devel/glib2,-docs
@ -344,9 +344,6 @@ share/bash-completion/completions/gdbus
share/bash-completion/completions/gresource
share/bash-completion/completions/gsettings
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/glib2/
share/examples/glib2/gio-kqueue.conf
@sample ${SYSCONFDIR}/gio-kqueue.conf
share/gdb/
share/gdb/auto-load/
share/gdb/auto-load/libglib-2.0.so.0.3200.4-gdb.py

View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.1 2012/08/30 10:08:46 ajacoutot Exp $
$OpenBSD: README,v 1.2 2012/09/18 13:05:59 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -12,6 +12,3 @@ If gio-kqueue needs to handle large directories, the kern.maxfiles
sysctl(8) should be increased by adding an entry in sysctl.conf(5) and
the user's login(1) class modified accordingly by bumping the "cur" and
"max" openfiles limit in login.conf(5).
The ${SYSCONFDIR}/gio-kqueue.conf file contains the paths that should be
monitored using traditional polling instead of kqueue(2).