6 files changed, 33 insertions, 72 deletions

diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index d8b5eb2db7d3..ceb6db889c0e 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gamin
-PORTVERSION=	0.1.8
-PORTREVISION=	1
+PORTVERSION=	0.1.9
 CATEGORIES?=	devel
 MASTER_SITES=	http://www.gnome.org/~veillard/gamin/sources/
 
diff --git a/devel/gamin/distinfo b/devel/gamin/distinfo
index 12270a48aefd..fffc0de2e3ad 100644
--- a/devel/gamin/distinfo
+++ b/devel/gamin/distinfo
@@ -1,3 +1,3 @@
-MD5 (gamin-0.1.8.tar.gz) = 985022c8b1b993e471d528fd0e14ffbe
-SHA256 (gamin-0.1.8.tar.gz) = be22f69b4797db510f4270ff0e228dd027e99e561ac5f5d38be595be7e82d203
-SIZE (gamin-0.1.8.tar.gz) = 564530
+MD5 (gamin-0.1.9.tar.gz) = 2d3a6a70df090ed923238e381e6c2982
+SHA256 (gamin-0.1.9.tar.gz) = 19e2c620e84da678b629d4acb07d93f47a2e5075982892646f77520bb277f239
+SIZE (gamin-0.1.9.tar.gz) = 645429
diff --git a/devel/gamin/files/patch-server_gam_fs.c b/devel/gamin/files/patch-server_gam_fs.c
index 342eb8f0af0e..2fcc2420971d 100644
--- a/devel/gamin/files/patch-server_gam_fs.c
+++ b/devel/gamin/files/patch-server_gam_fs.c
@@ -1,5 +1,5 @@
---- server/gam_fs.c.orig	Fri Aug  5 18:31:46 2005
-+++ server/gam_fs.c	Sat Feb 11 01:44:04 2006
+--- server/gam_fs.c.orig	2007-07-04 09:36:49.000000000 -0400
++++ server/gam_fs.c	2007-08-10 15:05:41.000000000 -0400
 @@ -7,6 +7,11 @@
  #include <string.h>
  #include <errno.h>
@@ -116,7 +116,7 @@
 +
 +			if (!g_hash_table_lookup (fs_hash, fs->fsname)) {
 +				if (fs->flags & MNT_LOCAL)
-+					gam_fs_set (fs->fsname, GFS_MT_KERNEL, 0);
++					gam_fs_set (fs->fsname, GFS_MT_DEFAULT, 0);
 +				else
 +					gam_fs_set (fs->fsname, GFS_MT_POLL, 5);
 +
@@ -147,21 +147,15 @@
  }
  
  gam_fs_mon_type
-@@ -209,10 +300,13 @@ gam_fs_get_mon_type (const char *path)
- 
+@@ -210,7 +301,11 @@ gam_fs_get_mon_type (const char *path)
  	props = gam_fs_find_fs_props (path);
  
--	if (!props)
--		return GFS_MT_KERNEL;
--
--	return props->mon_type;
-+#if (defined(ENABLE_INOTIFY) || defined(ENABLE_DNOTIFY) || defined(ENABLE_KQUEUE) || defined(ENABLE_HURD_MACH_NOTIFY)) && defined(USE_GAMIN_POLLER)
-+	if (props)
-+		return props->mon_type;
-+#elif !defined(USE_GAMIN_POLLER)
-+	return GFS_MT_KERNEL;
+ 	if (!props)
++#ifdef USE_GAMIN_POLLER
++		return GFS_MT_POLL;
++#else
+ 		return GFS_MT_DEFAULT;
 +#endif
-+	return GFS_MT_POLL;
- }
  
- int
+ 	return props->mon_type;
+ }
diff --git a/devel/gamin/files/patch-server_gam_kqueue.c b/devel/gamin/files/patch-server_gam_kqueue.c
index 5495fd44b3d3..df4437e31664 100644
--- a/devel/gamin/files/patch-server_gam_kqueue.c
+++ b/devel/gamin/files/patch-server_gam_kqueue.c
@@ -1,5 +1,5 @@
---- server/gam_kqueue.c.orig	Wed Aug 10 17:50:32 2005
-+++ server/gam_kqueue.c	Wed May 23 23:50:39 2007
+--- server/gam_kqueue.c.orig	2007-07-04 09:50:41.000000000 -0400
++++ server/gam_kqueue.c	2007-08-10 15:03:59.000000000 -0400
 @@ -10,9 +10,10 @@
   *       FAM should do: we do not call g_dir_open() if the file is a
   *       symbolic link).
@@ -37,15 +37,6 @@
  #include <sys/types.h>
  #include <sys/sysctl.h>
  #include <sys/stat.h>
-@@ -63,7 +66,7 @@
- #include "gam_kqueue.h"
- #include "gam_event.h"
- #include "gam_server.h"
--#include "gam_poll.h"
-+#include "gam_poll_basic.h"
- 
- /*** tunable constants, modify to tweak the backend aggressivity *************/
- 
 @@ -326,7 +329,7 @@ gam_kqueue_isdir (const char *pathname, 
  static gboolean
  gam_kqueue_get_uint_sysctl (const char *name, unsigned int *value)
@@ -126,24 +117,13 @@
      }
  }
  
-@@ -1167,11 +1187,15 @@ gam_kqueue_init (void)
+@@ -1167,6 +1187,9 @@ gam_kqueue_init (void)
    channel = g_io_channel_unix_new(kq);
    g_io_add_watch(channel, G_IO_IN, gam_kqueue_kevent_cb, NULL);
  
--  
--  gam_poll_set_kernel_handler(NULL, NULL, GAMIN_K_KQUEUE);
--  gam_backend_add_subscription = gam_kqueue_add_subscription;
--  gam_backend_remove_subscription = gam_kqueue_remove_subscription;
--  gam_backend_remove_all_for = gam_kqueue_remove_all_for;
 +#ifdef USE_GAMIN_POLLER
-+  gam_poll_basic_init (); 
++  gam_poll_basic_init ();
 +#endif
-+  gam_server_install_kernel_hooks (GAMIN_K_KQUEUE,
-+                                   gam_kqueue_add_subscription,
-+                                   gam_kqueue_remove_subscription,
-+                                   gam_kqueue_remove_all_for,
-+                                   NULL,
-+                                   NULL);
- 
-   return TRUE;
- }
+   
+   gam_server_install_kernel_hooks(GAMIN_K_KQUEUE,
+   				  gam_kqueue_add_subscription,
diff --git a/devel/gamin/files/patch-server_gam_poll_basic.c b/devel/gamin/files/patch-server_gam_poll_basic.c
index 7517b70fecc3..9a0333149be1 100644
--- a/devel/gamin/files/patch-server_gam_poll_basic.c
+++ b/devel/gamin/files/patch-server_gam_poll_basic.c
@@ -1,14 +1,11 @@
---- server/gam_poll_basic.c.orig	Mon Feb  6 22:55:40 2006
-+++ server/gam_poll_basic.c	Mon Feb  6 22:58:47 2006
-@@ -335,7 +335,11 @@
- 	} else {
- #ifdef VERBOSE_POLL
- 		GAM_DEBUG(DEBUG_INFO, "Poll: poll_file %s unchanged\n", path);
-+#ifdef ST_MTIM_NSEC
+--- server/gam_poll_basic.c.orig	2007-08-10 15:12:29.000000000 -0400
++++ server/gam_poll_basic.c	2007-08-10 15:16:07.000000000 -0400
+@@ -345,7 +345,7 @@ gam_poll_basic_poll_file(GamNode * node)
+ #ifdef ST_MTIM_NSEC
  		GAM_DEBUG(DEBUG_INFO, "%d %d : %d %d\n", node->sbuf.st_mtim.tv_sec, node->sbuf.st_mtim.tv_nsec, sbuf.st_mtim.tv_sec, sbuf.st_mtim.tv_nsec);
-+#else
+ #else
+-		GAM_DEBUG(DEBUG_INFO, "%d : %d\n", node->sbuf.st_mtime, sbuf.st_mtim.tv_nsec);
 +		GAM_DEBUG(DEBUG_INFO, "%d : %d\n", node->sbuf.st_mtime, sbuf.st_mtime);
-+#endif
- #endif
+ #endif /* ST_MTIM_NSEC */
+ #endif /* VERBOSE_POLL */
  	}
- 
diff --git a/devel/gamin/files/patch-server_gam_server.c b/devel/gamin/files/patch-server_gam_server.c
index f593406a5fa9..282dc28f098e 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	Wed Sep 21 18:21:05 2005
-+++ server/gam_server.c	Tue Feb  7 13:12:02 2006
+--- 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
 @@ -32,7 +32,7 @@
  #include "gam_server.h"
  #include "gam_channel.h"
@@ -9,16 +9,7 @@
  #ifdef ENABLE_INOTIFY
  #include "gam_inotify.h"
  #endif
-@@ -164,7 +164,7 @@
- #endif	
- 	}
- 
--	if (gam_poll_generic_init()) {
-+	if (gam_poll_basic_init()) {
- 		GAM_DEBUG(DEBUG_INFO, "Using poll as backend\n");
- 		return(TRUE);
- 	}
-@@ -427,7 +427,7 @@
+@@ -438,7 +438,7 @@ gam_server_get_kernel_handler (void)
  GamPollHandler
  gam_server_get_poll_handler (void)
  {