[Midnightbsd-cvs] mports: devel/gamin: Update gamin.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jan 4 14:17:09 EST 2008
Log Message:
-----------
Update gamin.
Modified Files:
--------------
mports/devel/gamin:
Makefile (r1.2 -> r1.3)
distinfo (r1.1 -> r1.2)
pkg-message (r1.1 -> r1.2)
mports/devel/gamin/files:
patch-server_gam_fs.c (r1.1 -> r1.2)
patch-server_gam_kqueue.c (r1.1 -> r1.2)
patch-server_gam_poll_basic.c (r1.1 -> r1.2)
patch-server_gam_server.c (r1.1 -> r1.2)
-------------- next part --------------
Index: pkg-message
===================================================================
RCS file: /home/cvs/mports/devel/gamin/pkg-message,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/gamin/pkg-message -L devel/gamin/pkg-message -u -r1.1 -r1.2
--- devel/gamin/pkg-message
+++ devel/gamin/pkg-message
@@ -1,5 +1,3 @@
-===============================================================================
-
Gamin will only provide realtime notification of changes for at most n files,
where n is the minimum value between (kern.maxfiles * 0.7) and
(kern.maxfilesperproc - 200). Beyond that limit, files will be polled.
@@ -12,5 +10,3 @@
reboot the system:
kern.maxfiles="25000"
-
-===============================================================================
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/gamin/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L devel/gamin/Makefile -L devel/gamin/Makefile -u -r1.2 -r1.3
--- devel/gamin/Makefile
+++ devel/gamin/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= gamin
-PORTVERSION= 0.1.7
-PORTREVISION?= 2
+PORTVERSION= 0.1.9
+PORTREVISION?= 0
CATEGORIES?= devel
MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/
@@ -17,7 +17,8 @@
USE_GMAKE= yes
USE_GNOME?= gnomehack glib20
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
--without-python
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/gamin/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/gamin/distinfo -L devel/gamin/distinfo -u -r1.1 -r1.2
--- devel/gamin/distinfo
+++ devel/gamin/distinfo
@@ -1,3 +1,3 @@
-MD5 (gamin-0.1.7.tar.gz) = 1a1991ffa749b7dc2cc0573d6a2867b8
-SHA256 (gamin-0.1.7.tar.gz) = 8272c64356e1310353f2411b2cabd211468edbf8ce312d58aeef55889e79361a
-SIZE (gamin-0.1.7.tar.gz) = 542061
+MD5 (gamin-0.1.9.tar.gz) = 2d3a6a70df090ed923238e381e6c2982
+SHA256 (gamin-0.1.9.tar.gz) = 19e2c620e84da678b629d4acb07d93f47a2e5075982892646f77520bb277f239
+SIZE (gamin-0.1.9.tar.gz) = 645429
Index: patch-server_gam_kqueue.c
===================================================================
RCS file: /home/cvs/mports/devel/gamin/files/patch-server_gam_kqueue.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/gamin/files/patch-server_gam_kqueue.c -L devel/gamin/files/patch-server_gam_kqueue.c -u -r1.1 -r1.2
--- devel/gamin/files/patch-server_gam_kqueue.c
+++ devel/gamin/files/patch-server_gam_kqueue.c
@@ -1,5 +1,5 @@
---- server/gam_kqueue.c.orig Wed Aug 10 23:50:32 2005
-+++ server/gam_kqueue.c Tue Feb 14 10:00:17 2006
+--- 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,16 +37,16 @@
#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)
+ {
+- unsigned int value_len = sizeof(*value);
++ size_t value_len = sizeof(*value);
-@@ -509,6 +512,9 @@
+ if (sysctlbyname(name, value, &value_len, (void *)NULL, 0) < 0)
+ {
+@@ -509,6 +512,9 @@ static gboolean
gam_kqueue_monitor_enable_kqueue (Monitor *mon)
{
struct kevent ev[1];
@@ -56,7 +56,7 @@
if (open_files == max_open_files)
{
-@@ -516,26 +522,36 @@
+@@ -516,26 +522,36 @@ gam_kqueue_monitor_enable_kqueue (Monito
return FALSE;
}
@@ -99,7 +99,7 @@
}
static void
-@@ -840,6 +856,8 @@
+@@ -840,6 +856,8 @@ gam_kqueue_sub_monitor_emit_event (SubMo
case GAMIN_EVENT_MOVED:
gam_kqueue_sub_monitor_set_missing(smon);
break;
@@ -108,7 +108,7 @@
}
gam_server_emit_event(mon->pathname, isdir, event, smon->subs, 1);
-@@ -981,6 +999,8 @@
+@@ -981,6 +999,8 @@ gam_kqueue_file_monitor_emit_event (File
gam_kqueue_hash_table_remove(fmon->smon->fmons, fmon);
break;
@@ -117,24 +117,13 @@
}
}
-@@ -1167,11 +1187,15 @@
+@@ -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,
Index: patch-server_gam_fs.c
===================================================================
RCS file: /home/cvs/mports/devel/gamin/files/patch-server_gam_fs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/gamin/files/patch-server_gam_fs.c -L devel/gamin/files/patch-server_gam_fs.c -u -r1.1 -r1.2
--- devel/gamin/files/patch-server_gam_fs.c
+++ 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;
+ }
Index: patch-server_gam_server.c
===================================================================
RCS file: /home/cvs/mports/devel/gamin/files/patch-server_gam_server.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/gamin/files/patch-server_gam_server.c -L devel/gamin/files/patch-server_gam_server.c -u -r1.1 -r1.2
--- devel/gamin/files/patch-server_gam_server.c
+++ 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)
{
Index: patch-server_gam_poll_basic.c
===================================================================
RCS file: /home/cvs/mports/devel/gamin/files/patch-server_gam_poll_basic.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/gamin/files/patch-server_gam_poll_basic.c -L devel/gamin/files/patch-server_gam_poll_basic.c -u -r1.1 -r1.2
--- devel/gamin/files/patch-server_gam_poll_basic.c
+++ 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 */
}
-
More information about the Midnightbsd-cvs
mailing list