Remove these ports now that they have been committed to FreeBSD.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8576 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 0 insertions, 656 deletions

diff --git a/devel/gamin/files/patch-libgamin_gam_api.c b/devel/gamin/files/patch-libgamin_gam_api.c
deleted file mode 100644
index 7c46e9335..000000000
--- a/devel/gamin/files/patch-libgamin_gam_api.c
+++ /dev/null
@@ -1,119 +0,0 @@
---- libgamin/gam_api.c.orig	Tue Feb  7 17:49:07 2006
-+++ libgamin/gam_api.c	Tue Feb  7 17:49:13 2006
-@@ -14,6 +14,7 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <sys/uio.h>
-+#include <string.h>
- #include "fam.h"
- #include "gam_protocol.h"
- #include "gam_data.h"
-@@ -421,10 +422,10 @@
- {
-     char data[2] = { 0, 0 };
-     int written;
--#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
--    struct {
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+    union {
- 	    struct cmsghdr hdr;
--	    struct cmsgcred cred;
-+	    char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-     } cmsg;
-     struct iovec iov;
-     struct msghdr msg;
-@@ -436,16 +437,16 @@
-     msg.msg_iov = &iov;
-     msg.msg_iovlen = 1;
- 
--    msg.msg_control = &cmsg;
--    msg.msg_controllen = sizeof (cmsg);
-+    msg.msg_control = (caddr_t) &cmsg;
-+    msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
-     memset (&cmsg, 0, sizeof (cmsg));
--    cmsg.hdr.cmsg_len = sizeof (cmsg);
-+    cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
-     cmsg.hdr.cmsg_level = SOL_SOCKET;
-     cmsg.hdr.cmsg_type = SCM_CREDS;
- #endif
- 
- retry:
--#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-     written = sendmsg(fd, &msg, 0);
- #else
-     written = write(fd, &data[0], 1);
-@@ -647,15 +648,16 @@
-     gid_t c_gid;
- 
- #ifdef HAVE_CMSGCRED
--    struct {
-+    struct cmsgcred *cred;
-+    union {
- 	    struct cmsghdr hdr;
--	    struct cmsgcred cred;
-+	    char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-     } cmsg;
- #endif
- 
-     s_uid = getuid();
- 
--#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
-+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
-     /* Set the socket to receive credentials on the next message */
-     {
-         int on = 1;
-@@ -676,8 +678,8 @@
- 
- #ifdef HAVE_CMSGCRED
-     memset(&cmsg, 0, sizeof(cmsg));
--    msg.msg_control = &cmsg;
--    msg.msg_controllen = sizeof(cmsg);
-+    msg.msg_control = (caddr_t) &cmsg;
-+    msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
- #endif
- 
- retry:
-@@ -694,7 +696,7 @@
-         goto failed;
-     }
- #ifdef HAVE_CMSGCRED
--    if (cmsg.hdr.cmsg_len < sizeof(cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) {
-+    if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) || cmsg.hdr.cmsg_type != SCM_CREDS) {
-         GAM_DEBUG(DEBUG_INFO,
-                   "Message from recvmsg() was not SCM_CREDS\n");
-         goto failed;
-@@ -720,9 +722,10 @@
-             goto failed;
-         }
- #elif defined(HAVE_CMSGCRED)
--        c_pid = cmsg.cred.cmcred_pid;
--        c_uid = cmsg.cred.cmcred_euid;
--        c_gid = cmsg.cred.cmcred_groups[0];
-+        cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
-+        c_pid = cred->cmcred_pid;
-+        c_uid = cred->cmcred_euid;
-+        c_gid = cred->cmcred_groups[0];
- #else /* !SO_PEERCRED && !HAVE_CMSGCRED */
-         GAM_DEBUG(DEBUG_INFO,
-                   "Socket credentials not supported on this OS\n");
-@@ -1283,14 +1286,17 @@
- 
-     // FIXME: drop and reacquire lock while blocked?
-     gamin_data_lock(conn);
--    if (!gamin_data_event_ready(conn)) {
-+    while ((ret = gamin_data_event_ready(conn)) == 0) {
-         if (gamin_read_data(conn, fc->fd, 1) < 0) {
- 	    gamin_try_reconnect(conn, fc->fd);
- 	    FAMErrno = FAM_CONNECT;
- 	    return (-1);
- 	}
-     }
--    ret = gamin_data_read_event(conn, fe);
-+
-+    if (ret > 0)
-+        ret = gamin_data_read_event(conn, fe);
-+
-     gamin_data_unlock(conn);
- 
-     if (ret < 0) {
diff --git a/devel/gamin/files/patch-python_Makefile.in b/devel/gamin/files/patch-python_Makefile.in
deleted file mode 100644
index 3cc568b4e..000000000
--- a/devel/gamin/files/patch-python_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- python/Makefile.in.orig	Mon Feb  6 23:00:32 2006
-+++ python/Makefile.in	Tue Feb  7 08:10:46 2006
-@@ -59,7 +59,7 @@
- pythonLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(python_LTLIBRARIES)
- @WITH_PYTHON_TRUE@am__DEPENDENCIES_1 =  \
--@WITH_PYTHON_TRUE@	$(top_builddir)/libgamin/libgamin-1.la
-+@WITH_PYTHON_TRUE@	-lgamin-1
- @WITH_PYTHON_TRUE@_gamin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am___gamin_la_SOURCES_DIST = gamin.c
- @WITH_PYTHON_TRUE@am__gamin_la_OBJECTS = gamin.lo
-@@ -239,9 +239,9 @@
- 	gamin.c			\
- 	gamin.py
- 
--_gamin_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/libgamin/.libs
-+_gamin_la_LDFLAGS = -module -avoid-version
- @WITH_PYTHON_TRUE@mylibs = \
--@WITH_PYTHON_TRUE@	$(top_builddir)/libgamin/libgamin-1.la
-+@WITH_PYTHON_TRUE@	-lgamin-1
- 
- @WITH_PYTHON_TRUE@python_LTLIBRARIES = _gamin.la
- @WITH_PYTHON_TRUE@_gamin_la_SOURCES = gamin.c
diff --git a/devel/gamin/files/patch-server_gam_channel.c b/devel/gamin/files/patch-server_gam_channel.c
deleted file mode 100644
index 7b5fb8aee..000000000
--- a/devel/gamin/files/patch-server_gam_channel.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- server/gam_channel.c.orig	Tue Aug  9 12:17:39 2005
-+++ server/gam_channel.c	Fri Feb 10 01:22:46 2006
-@@ -7,6 +7,7 @@
- #include <sys/stat.h>
- #include <sys/un.h>
- #include <sys/uio.h>
-+#include <string.h>
- #include "gam_error.h"
- #include "gam_connection.h"
- #include "gam_channel.h"
-@@ -30,10 +31,10 @@ gam_client_conn_send_cred(int fd)
- {
-     char data[2] = { 0, 0 };
-     int written;
--#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
--    struct {
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+    union {
- 	    struct cmsghdr hdr;
--	    struct cmsgcred cred;
-+	    char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-     } cmsg;
-     struct iovec iov;
-     struct msghdr msg;
-@@ -45,16 +46,16 @@ gam_client_conn_send_cred(int fd)
-     msg.msg_iov = &iov;
-     msg.msg_iovlen = 1;
- 
--    msg.msg_control = &cmsg;
--    msg.msg_controllen = sizeof (cmsg);
-+    msg.msg_control = (caddr_t) &cmsg;
-+    msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
-     memset (&cmsg, 0, sizeof (cmsg));
--    cmsg.hdr.cmsg_len = sizeof (cmsg);
-+    cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
-     cmsg.hdr.cmsg_level = SOL_SOCKET;
-     cmsg.hdr.cmsg_type = SCM_CREDS;
- #endif
- 
- retry:
--#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-     written = sendmsg(fd, &msg, 0);
- #else
-     written = write(fd, &data[0], 1);
-@@ -95,15 +96,16 @@ gam_client_conn_check_cred(GIOChannel * 
-     gid_t c_gid;
- 
- #ifdef HAVE_CMSGCRED
--    struct {
-+    struct cmsgcred *cred;
-+    union {
- 	    struct cmsghdr hdr;
--	    struct cmsgcred cred;
-+	    char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-     } cmsg;
- #endif
- 
-     s_uid = getuid();
- 
--#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
-+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
-     /* Set the socket to receive credentials on the next message */
-     {
-         int on = 1;
-@@ -124,8 +126,8 @@ gam_client_conn_check_cred(GIOChannel * 
- 
- #ifdef HAVE_CMSGCRED
-     memset(&cmsg, 0, sizeof(cmsg));
--    msg.msg_control = &cmsg;
--    msg.msg_controllen = sizeof(cmsg);
-+    msg.msg_control = (caddr_t) &cmsg;
-+    msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
- #endif
- 
-   retry:
-@@ -142,7 +144,7 @@ gam_client_conn_check_cred(GIOChannel * 
-         goto failed;
-     }
- #ifdef HAVE_CMSGCRED
--    if (cmsg.hdr.cmsg_len < sizeof(cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) {
-+    if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) || cmsg.hdr.cmsg_type != SCM_CREDS) {
-         GAM_DEBUG(DEBUG_INFO,
-                   "Message from recvmsg() was not SCM_CREDS\n");
-         goto failed;
-@@ -168,9 +170,10 @@ gam_client_conn_check_cred(GIOChannel * 
-             goto failed;
-         }
- #elif defined(HAVE_CMSGCRED)
--	c_pid = cmsg.cred.cmcred_pid;
--	c_uid = cmsg.cred.cmcred_euid;
--	c_gid = cmsg.cred.cmcred_groups[0];
-+	cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
-+	c_pid = cred->cmcred_pid;
-+	c_uid = cred->cmcred_euid;
-+	c_gid = cred->cmcred_groups[0];
- #else /* !SO_PEERCRED && !HAVE_CMSGCRED */
-         GAM_DEBUG(DEBUG_INFO,
-                   "Socket credentials not supported on this OS\n");
-@@ -620,6 +621,7 @@ gam_listen_unix_socket(const char *path)
- {
-     int fd;
-     struct sockaddr_un addr;
-+    struct stat st;
- 
-     fd = socket(PF_UNIX, SOCK_STREAM, 0);
-     if (fd < 0) {
-@@ -640,8 +642,18 @@ gam_listen_unix_socket(const char *path)
-      * some extra protection checks. Also make sure the socket is created
-      * with restricted mode
-      */
--    if (!gam_check_secure_path(path)) {
-+    if (!gam_check_secure_dir()) {
-+	close(fd);
- 	return (-1);
-+    }
-+
-+    if (stat(path, &st) == 0) {
-+        /* bind() will fail if the socket already exists */
-+        if (unlink(path) < 0) {
-+            GAM_DEBUG(DEBUG_INFO, "Failed to remove %s\n", path);
-+            close(fd);
-+            return (-1);
-+        }
-     }
-     strncpy(&addr.sun_path[0], path, (sizeof(addr) - 4) - 1);
-     umask(0077);
diff --git a/devel/gamin/files/patch-server_gam_fs.c b/devel/gamin/files/patch-server_gam_fs.c
deleted file mode 100644
index 342eb8f0a..000000000
--- a/devel/gamin/files/patch-server_gam_fs.c
+++ /dev/null
@@ -1,167 +0,0 @@
---- server/gam_fs.c.orig	Fri Aug  5 18:31:46 2005
-+++ server/gam_fs.c	Sat Feb 11 01:44:04 2006
-@@ -7,6 +7,11 @@
- #include <string.h>
- #include <errno.h>
- #include <glib.h>
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+#endif
- #include "gam_error.h"
- #include "gam_fs.h"
- 
-@@ -21,9 +26,13 @@ typedef struct _gam_fs_properties {
- typedef struct _gam_fs {
- 	char *path;
- 	char *fsname;
-+	guint64 flags;
- } gam_fs;
- 
- static gboolean initialized = FALSE;
-+#ifdef __FreeBSD__
-+static gboolean initializing = FALSE;
-+#endif
- static GList *filesystems = NULL;
- static GList *fs_props = NULL;
- static struct stat mtab_sbuf;
-@@ -110,6 +119,7 @@ gam_fs_filesystem_sort_cb (gconstpointer
- 	return strlen(fsb->path) - strlen (fsa->path);
- }
- 
-+#ifdef __linux__
- static void
- gam_fs_scan_mtab (void)
- {
-@@ -165,10 +175,41 @@ gam_fs_scan_mtab (void)
- 	gam_fs_free_filesystems ();
- 	filesystems = g_list_sort (new_filesystems, gam_fs_filesystem_sort_cb);
- }
-+#endif
-+
-+#ifdef __FreeBSD__
-+static void
-+gam_fs_getmntinfo (void)
-+{
-+	struct statfs *stat;
-+	GList *new_filesystems = NULL;
-+	gam_fs *fs = NULL;
-+        int i, n;
-+
-+	n = getmntinfo(&stat, MNT_NOWAIT);
-+	if (n == -1)
-+		return;
-+
-+	for (i = 0; i < n; i++)
-+	{
-+		fs = g_new0 (gam_fs, 1);
-+		fs->path = g_strdup (stat[i].f_mntonname);
-+		fs->fsname = g_strdup (stat[i].f_fstypename);
-+		fs->flags = stat[i].f_flags;
-+
-+		new_filesystems = g_list_prepend (new_filesystems, fs);
-+	}
-+
-+        /* Replace the old file systems list with the new one */
-+        gam_fs_free_filesystems ();
-+        filesystems = g_list_sort (new_filesystems, gam_fs_filesystem_sort_cb);
-+}
-+#endif
- 
- void
- gam_fs_init (void)
- {
-+#if defined(__linux__)
- 	if (initialized == FALSE)
- 	{
- 		initialized = TRUE;
-@@ -181,6 +222,7 @@ gam_fs_init (void)
- 		if (stat("/etc/mtab", &mtab_sbuf) != 0)
- 		{
- 			GAM_DEBUG(DEBUG_INFO, "Could not stat /etc/mtab\n");
-+                        return;
- 		}
- 		gam_fs_scan_mtab ();
- 	} else {
-@@ -189,6 +231,7 @@ gam_fs_init (void)
- 		if (stat("/etc/mtab", &sbuf) != 0)
- 		{
- 			GAM_DEBUG(DEBUG_INFO, "Could not stat /etc/mtab\n");
-+                        return;
- 		}
- 
- 		/* /etc/mtab has changed */
-@@ -199,6 +242,54 @@ gam_fs_init (void)
- 
- 		mtab_sbuf = sbuf;
- 	}
-+#elif defined(__FreeBSD__)
-+	if (initialized == FALSE && initializing == FALSE)
-+	{
-+		GList *iterator = NULL;
-+		GHashTable *fs_hash = NULL;
-+		gam_fs *fs = NULL;
-+
-+		initialized = TRUE;
-+		initializing = TRUE;
-+
-+		gam_fs_getmntinfo ();
-+
-+		iterator = filesystems;
-+		fs_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-+
-+		while (iterator) {
-+			fs = iterator->data;
-+
-+			if (!g_hash_table_lookup (fs_hash, fs->fsname)) {
-+				if (fs->flags & MNT_LOCAL)
-+					gam_fs_set (fs->fsname, GFS_MT_KERNEL, 0);
-+				else
-+					gam_fs_set (fs->fsname, GFS_MT_POLL, 5);
-+
-+				g_hash_table_insert (fs_hash, g_strdup (fs->fsname), GINT_TO_POINTER (1));
-+			}
-+
-+			iterator = g_list_next (iterator);
-+		}
-+
-+		g_hash_table_destroy (fs_hash);
-+		initializing = FALSE;
-+	} else if (initializing == FALSE) {
-+		struct stat sbuf;
-+
-+		if (stat ("/etc/fstab", &sbuf) != 0) {
-+			GAM_DEBUG(DEBUG_INFO, "Could not stat /etc/fstab\n");
-+			return;
-+		}
-+
-+		if (sbuf.st_mtime != mtab_sbuf.st_mtime) {
-+			GAM_DEBUG(DEBUG_INFO, "Updating list of mounted filesystems\n");
-+			gam_fs_getmntinfo ();
-+		}
-+
-+		mtab_sbuf = sbuf;
-+	}
-+#endif
- }
- 
- gam_fs_mon_type
-@@ -209,10 +300,13 @@ 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;
-+#endif
-+	return GFS_MT_POLL;
- }
- 
- int
diff --git a/devel/gamin/files/patch-server_gam_kqueue.c b/devel/gamin/files/patch-server_gam_kqueue.c
deleted file mode 100644
index fe4d5a51c..000000000
--- a/devel/gamin/files/patch-server_gam_kqueue.c
+++ /dev/null
@@ -1,140 +0,0 @@
---- server/gam_kqueue.c.orig	Wed Aug 10 23:50:32 2005
-+++ server/gam_kqueue.c	Tue Feb 14 10:00:17 2006
-@@ -10,9 +10,10 @@
-  *       FAM should do: we do not call g_dir_open() if the file is a
-  *       symbolic link).
-  *
-- *     * kqueue cannot monitor files residing on anything but a UFS
-- *       file system. If kqueue cannot monitor a file, this backend
-- *       will poll it periodically.
-+ *     * While kqueue is no longer tied to the UFS file system, it is
-+ *       better to not use it for remote file systems (because for
-+ *       such file systems, only local changes are detected by
-+ *       the kernel).
-  *
-  *     * Monitoring a file with kqueue prevents the file system it
-  *       resides on from being unmounted, because kqueue can only
-@@ -28,10 +29,9 @@
-  *           - kqueue needs to be augmented with a filename-based
-  *             monitoring facility;
-  *
-- *           - kqueue needs to be moved out the UFS code.
-- *
-  * Copyright (C) 2005 Joe Marcus Clarke <marcus@FreeBSD.org>
-- * Copyright (C) 2005 Jean-Yves Lefort <jylefort@FreeBSD.org>
-+ * Copyright (C) 2005, 2006 Jean-Yves Lefort <jylefort@FreeBSD.org>
-+ * Copyright (C) 2006 Alex Dupre <ale@FreeBSD.org>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -53,6 +53,9 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/param.h>
-+#ifndef USE_GAMIN_POLLER
-+#include <sys/mount.h>
-+#endif
- #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 *************/
- 
-@@ -509,6 +512,9 @@
- gam_kqueue_monitor_enable_kqueue (Monitor *mon)
- {
-   struct kevent ev[1];
-+#ifndef USE_GAMIN_POLLER
-+  struct statfs sb;
-+#endif
- 
-   if (open_files == max_open_files)
-     {
-@@ -516,26 +522,36 @@
-       return FALSE;
-     }
-   
--  mon->fd = open(mon->pathname, O_RDONLY | O_NOFOLLOW);
-+  mon->fd = open(mon->pathname, O_RDONLY | O_NONBLOCK | O_NOFOLLOW);
-   if (mon->fd < 0)
-     {
-       GAM_DEBUG(DEBUG_INFO, "cannot open %s (%s), falling back to poll\n", mon->pathname, g_strerror(errno));
-       return FALSE;
-     }
- 
-+#ifndef USE_GAMIN_POLLER
-+  if (fstatfs(mon->fd, &sb) == 0 && (sb.f_flags & MNT_LOCAL) == 0)
-+    {
-+      GAM_DEBUG(DEBUG_INFO, "%s resides on a remote file system, falling back to poll\n", mon->pathname);
-+      goto poll;
-+    }
-+#endif
-+
-   EV_SET(ev, mon->fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, VN_NOTE_ALL, 0, mon);
-   if (kevent(kq, ev, G_N_ELEMENTS(ev), NULL, 0, NULL) < 0)
-     {
-       GAM_DEBUG(DEBUG_INFO, "cannot enable kqueue notification for %s (%s), falling back to poll\n", mon->pathname, g_strerror(errno));
--
--      close(mon->fd);
--      mon->fd = -1;
--
--      return FALSE;
-+      goto poll;
-     }
- 
-   open_files++;
-   return TRUE;
-+
-+ poll:
-+  close(mon->fd);
-+  mon->fd = -1;
-+
-+  return FALSE;
- }
- 
- static void
-@@ -840,6 +856,8 @@
-     case GAMIN_EVENT_MOVED:
-       gam_kqueue_sub_monitor_set_missing(smon);
-       break;
-+    default:
-+      break;
-     }
- 
-   gam_server_emit_event(mon->pathname, isdir, event, smon->subs, 1);
-@@ -981,6 +999,8 @@
- 	
-       gam_kqueue_hash_table_remove(fmon->smon->fmons, fmon);
-       break;
-+    default:
-+      break;
-     }
- }
- 
-@@ -1167,11 +1187,15 @@
-   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 (); 
-+#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;
- }
diff --git a/devel/gamin/files/patch-server_gam_node.c b/devel/gamin/files/patch-server_gam_node.c
deleted file mode 100644
index dbf7f638b..000000000
--- a/devel/gamin/files/patch-server_gam_node.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- server/gam_node.c.orig	Thu Feb  9 01:22:56 2006
-+++ server/gam_node.c	Thu Feb  9 01:23:03 2006
-@@ -23,6 +23,7 @@
- #include "gam_event.h"
- #include "gam_node.h"
- #include "gam_error.h"
-+#include "gam_server.h"
- 
- /**
-  * Create a new node
diff --git a/devel/gamin/files/patch-server_gam_poll_basic.c b/devel/gamin/files/patch-server_gam_poll_basic.c
deleted file mode 100644
index 7517b70fe..000000000
--- a/devel/gamin/files/patch-server_gam_poll_basic.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
- 		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
-+		GAM_DEBUG(DEBUG_INFO, "%d : %d\n", node->sbuf.st_mtime, sbuf.st_mtime);
-+#endif
- #endif
- 	}
- 
diff --git a/devel/gamin/files/patch-server_gam_server.c b/devel/gamin/files/patch-server_gam_server.c
deleted file mode 100644
index f593406a5..000000000
--- a/devel/gamin/files/patch-server_gam_server.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- server/gam_server.c.orig	Wed Sep 21 18:21:05 2005
-+++ server/gam_server.c	Tue Feb  7 13:12:02 2006
-@@ -32,7 +32,7 @@
- #include "gam_server.h"
- #include "gam_channel.h"
- #include "gam_subscription.h"
--#include "gam_poll_generic.h"
-+#include "gam_poll_basic.h"
- #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 @@
- GamPollHandler
- gam_server_get_poll_handler (void)
- {
--	return __gam_kernel_handler;
-+	return __gam_poll_handler;
- }
- 
- gboolean
diff --git a/devel/gamin/files/patch-tests_testing.c b/devel/gamin/files/patch-tests_testing.c
deleted file mode 100644
index 35097790d..000000000
--- a/devel/gamin/files/patch-tests_testing.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- tests/testing.c.orig	Thu Oct 27 10:51:03 2005
-+++ tests/testing.c	Tue Feb 14 17:46:01 2006
-@@ -376,11 +376,11 @@ processCommand(char *line, int no)
-         }
-         printf("chmod %s to %s\n", arg, arg2);
-     } else if (!strcmp(command, "chown")) {
-+	struct stat sb;
-         if (args != 3) {
-             fprintf(stderr, "chown line %d: lacks path and owner\n", no);
-             return (-1);
-         }
--		struct stat sb;
- 		if (!lstat (arg, &sb)) {
- 			ret = (S_ISLNK (sb.st_mode)) ?
- 				lchown(arg, strtol(arg2, NULL, 10), -1) :
-@@ -486,9 +486,9 @@ processCommand(char *line, int no)
-             return (-1);
-         }
-         /*
--         * wait at most 3 secs before declaring failure
-+         * wait at most 7 secs before declaring failure
-          */
--        while ((delay < 30) && (testState.nb_events < nb_events + count)) {
-+        while ((delay < 70) && (testState.nb_events < nb_events + count)) {
-             debugLoop(100);
- 
- /*	    printf("+"); fflush(stdout); */