diff options
| author | marcus <marcus@FreeBSD.org> | 2009-04-17 01:32:57 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2009-04-17 01:32:57 +0800 |
| commit | 4c307e498c76dffd75094a8b4789b5aafae56edb (patch) | |
| tree | 540cbc4999dfd481546c463a4a221d6624a71c2e /devel | |
| parent | ff0bac39d5b16903e236fb9e0b6b2371c0dd4020 (diff) | |
| download | freebsd-ports-gnome-4c307e498c76dffd75094a8b4789b5aafae56edb.tar.gz freebsd-ports-gnome-4c307e498c76dffd75094a8b4789b5aafae56edb.tar.zst freebsd-ports-gnome-4c307e498c76dffd75094a8b4789b5aafae56edb.zip | |
Fix a number of long-standing bugs with gamin.
* Do not use kernel notifications for paths like /mnt and /media. This
will allow such volumes to be unmounted. This matches the behvaior
of Linux.
* Allow the "poll" directive in gaminrc files to have an effect.
* Add some verbiage to pkg-message to instruct users how to configure
gamin [1]
PR: 131121 [1]
Submitted by: Graham Todd <gtodd@bellanet.org> (based on) [1]
Reported by: countless users
Approved by: portmgr (implicit)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gamin/Makefile | 3 | ||||
| -rw-r--r-- | devel/gamin/files/patch-server_gam_server.c | 14 | ||||
| -rw-r--r-- | devel/gamin/pkg-message | 10 |
3 files changed, 24 insertions, 3 deletions
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index 9a1a9cedb1a8..1ad36da74534 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -8,6 +8,7 @@ PORTNAME= gamin PORTVERSION= 0.1.10 +PORTREVISION?= 1 CATEGORIES?= devel MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/ @@ -20,7 +21,7 @@ USE_GNOME?= gnomehack _glib20 USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} diff --git a/devel/gamin/files/patch-server_gam_server.c b/devel/gamin/files/patch-server_gam_server.c index 282dc28f098e..886a93c70cdd 100644 --- a/devel/gamin/files/patch-server_gam_server.c +++ b/devel/gamin/files/patch-server_gam_server.c @@ -1,5 +1,5 @@ --- server/gam_server.c.orig 2007-07-04 09:36:49.000000000 -0400 -+++ server/gam_server.c 2007-08-10 15:09:14.000000000 -0400 ++++ server/gam_server.c 2009-04-15 22:37:01.000000000 -0400 @@ -32,7 +32,7 @@ #include "gam_server.h" #include "gam_channel.h" @@ -9,7 +9,17 @@ #ifdef ENABLE_INOTIFY #include "gam_inotify.h" #endif -@@ -438,7 +438,7 @@ gam_server_get_kernel_handler (void) +@@ -200,7 +200,8 @@ gam_add_subscription(GamSubscription * s + return gam_poll_add_subscription (sub); + else + #endif +- return gam_kernel_add_subscription (sub); ++ /*return gam_kernel_add_subscription (sub);*/ ++ return gam_poll_add_subscription (sub); + } else { + gam_fs_mon_type type; + type = gam_fs_get_mon_type (path); +@@ -438,7 +439,7 @@ gam_server_get_kernel_handler (void) GamPollHandler gam_server_get_poll_handler (void) { diff --git a/devel/gamin/pkg-message b/devel/gamin/pkg-message index 1e1ea39bbb04..28586c6c63c3 100644 --- a/devel/gamin/pkg-message +++ b/devel/gamin/pkg-message @@ -13,4 +13,14 @@ reboot the system: kern.maxfiles="25000" +The behavior of gamin can be controlled via the various gaminrc files. +See http://www.gnome.org/~veillard/gamin/config.html on how to create +these files. In particular, if you find gam_server is taking up too much +CPU time polling for changes, something like the following may help +in one of the gaminrc files: + +# reduce polling frequency to once per 10 seconds +# for UFS file systems in order to lower CPU load +fsset ufs poll 10 + =============================================================================== |