Update to gamin-0.1.9:

0.1.9: Jul 27 2007:
   - Bug fixes: enable polling when using inotify this fixes support for NFS
      partitions (Alexander Larsson), do not run idle handler if not needed
      reduce wakeups (Alexander Larsson), handling of failure of inotify
      initialization (Robert Clark), force poll support if compiled without
      inotify and dnotify (Ray Strode)
      - Portability: patches to allow compiling again on Hurd and kFreeBSD
      (Michael Banck), patches to ease compilation on OS X (Brendan Cully)

0.1.8: Oct 31 2006:
   - Build and portability fixes: handle sys/inotify.h, Python detection
      (Joseph Sacco), FreeBSD portability fix (Loïc Minier/Petr Salinger),
      out of tree build and install (Loïc Minier), fix build with Sun's
      compiler (James Andrewartha)
   - Bug fixes: pkg-config cflags (Claudio Fontana), debug signal hookup
      fix (Bastien Nocera), client filedescriptor close trouble (Alexander
      Larsson), low filedescriptor handling in the server (Alexander Larsson),
      buffer on connection reset cleanup (Ariel T. Glenn), inotify new backend
      fixes (Alexander Larsson)
   - Improvements: update the inotify backend to the version used by
      gnome-vfs (John McCutchan), minimize the timeouts usage
      to not wake up apps unduely (Alexander Larsson)

0.1.7: Oct 27 2005:
   - Portability fixes (Diego Pettenò, Sjoerd Simons, Daichi Kawahata)
   - A small memory leak fix (Christopher Aillon)
   - Fixes for gam_server segfaults (Ed Catmur, DV)
   - One last patch for Python detection

0.1.6: Sep  8 2005:
   - Large revamp of the inotify back-end (John McCutchan)
   - Code reorganization, changes for polling (John McCutchan)
   - Portability patches for NetBSD (Johnny Lam)
   - Fix compilation without inotify
   - environment variable GAM_TEST_DNOTIFY to force dnotify on inotify kernels
      (John McCutchan)
   - Inotify race conditions fixes (John McCutchan)
   - Removal of some asserts resulting in crashes
   - Applied some testing patches (TomPh)
   - Fixed a memory leak on inotify back-end
   - Python detection fix

7 files changed, 50 insertions, 95 deletions

diff --git a/sysutils/gamin/Makefile b/sysutils/gamin/Makefile
index 28864fef468..d51587ae617 100644
--- a/sysutils/gamin/Makefile
+++ b/sysutils/gamin/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2006/04/13 18:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/08/05 20:03:35 tnn Exp $
 
-DISTNAME=	gamin-0.1.5
-PKGREVISION=	2
+DISTNAME=	gamin-0.1.9
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.gnome.org/~veillard/gamin/sources/
 
-CONFLICTS=	fam-[0-9]*
-
 MAINTAINER=	pkgsrc-users@NetBSD.org
-COMMENT=	File alteration monitor
 HOMEPAGE=	http://www.gnome.org/~veillard/gamin/
+COMMENT=	File alteration monitor
+
+CONFLICTS=	fam-[0-9]*
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
@@ -23,10 +22,16 @@ PKG_SYSCONFSUBDIR=	gamin
 DOCDIR=			${PREFIX}/share/doc/gamin
 
 SUBST_CLASSES+=		sysconfdir
+SUBST_MESSAGE.sysconfdir=fixing up sysconfdir
 SUBST_STAGE.sysconfdir=	pre-configure
 SUBST_FILES.sysconfdir=	doc/config.html doc/gamin.html server/gam_conf.c
 SUBST_SED.sysconfdir=	-e "s,/etc/gamin/,${PKG_SYSCONFDIR}/,"
 
+SUBST_CLASSES+=		versioning
+SUBST_MESSAGE.versioning=removing GNU ld(1) --version-script flag
+SUBST_STAGE.versioning=	pre-configure
+SUBST_FILES.versioning=	libgamin/Makefile.in
+SUBST_SED.versioning=	-e 's|-Wl,--version-script.*sym.version||g'
 
 .include "../../devel/glib2/buildlink3.mk"
 
diff --git a/sysutils/gamin/buildlink3.mk b/sysutils/gamin/buildlink3.mk
index 0e99991c975..e0b9f6458c2 100644
--- a/sysutils/gamin/buildlink3.mk
+++ b/sysutils/gamin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2007/08/05 20:03:35 tnn Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAMIN_BUILDLINK3_MK:=	${GAMIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	gamin
 .endif
 
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngamin}
 BUILDLINK_PACKAGES+=	gamin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gamin
 
-.if !empty(GAMIN_BUILDLINK3_MK:M+)
+.if ${GAMIN_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.gamin+=	gamin>=0.1.5
-BUILDLINK_ABI_DEPENDS.gamin?=	gamin>=0.1.5nb2
+BUILDLINK_ABI_DEPENDS.gamin+=	gamin>=0.1.9
 BUILDLINK_PKGSRCDIR.gamin?=	../../sysutils/gamin
 .endif	# GAMIN_BUILDLINK3_MK
 
diff --git a/sysutils/gamin/distinfo b/sysutils/gamin/distinfo
index 38d5e95e6ad..dd84eaac6c6 100644
--- a/sysutils/gamin/distinfo
+++ b/sysutils/gamin/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.2 2005/08/30 23:24:33 jlam Exp $
+$NetBSD: distinfo,v 1.3 2007/08/05 20:03:35 tnn Exp $
 
-SHA1 (gamin-0.1.5.tar.gz) = f9f8e4c45c7abb6bb8382bf5d969583f057d1ec3
-RMD160 (gamin-0.1.5.tar.gz) = 757bf10362965f58dd919874a3a35b14627f0c0a
-Size (gamin-0.1.5.tar.gz) = 531603 bytes
-SHA1 (patch-aa) = b4d33eefbed42f889463a58d6f25c2df24970c69
-SHA1 (patch-ab) = 4a282a3b374c3287c2634578b9c701355f0d3455
-SHA1 (patch-ac) = 06f76b4a3354b0621e466484264ac43e92d05c86
-SHA1 (patch-ad) = 37cf3a565c3b028eb58328c6e9d7f57209a1b033
+SHA1 (gamin-0.1.9.tar.gz) = f8f8a4f0701a2c9a69634a60a135298db90d7779
+RMD160 (gamin-0.1.9.tar.gz) = e376f551f7417dd04692e7463b46b9a193d48366
+Size (gamin-0.1.9.tar.gz) = 645429 bytes
+SHA1 (patch-aa) = 0d3700cf3e1abd4dab2f6e801d31e25e352474a0
+SHA1 (patch-ab) = d0f280fc8b2cbedee2d2a38cd67e8eb6aecba66d
+SHA1 (patch-ac) = 6de5969099bbe757dc93f0ca7928a528f53a0f81
 SHA1 (patch-ae) = 4e81484b9110c70b8776bbfb49d64971eca38cdf
 SHA1 (patch-af) = ed7ba9cfd393f3109c9028cf68e3a5909c95d414
diff --git a/sysutils/gamin/patches/patch-aa b/sysutils/gamin/patches/patch-aa
index 6092b346866..2b7525d4b4f 100644
--- a/sysutils/gamin/patches/patch-aa
+++ b/sysutils/gamin/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2005/08/30 23:24:33 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2007/08/05 20:03:35 tnn Exp $
 
---- libgamin/gam_data.c.orig	2005-05-18 10:45:04.000000000 -0400
-+++ libgamin/gam_data.c
-@@ -471,7 +471,7 @@ gamin_data_new(void)
-     }
-     if (is_threaded > 0) {
- 	pthread_mutexattr_init(&attr);
--	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- 	pthread_mutex_init(&ret->lock, &attr);
- 	pthread_mutexattr_destroy(&attr);
-     }
+--- server/gam_poll_basic.c.orig	2007-07-04 15:46:29.000000000 +0200
++++ server/gam_poll_basic.c
+@@ -38,7 +38,6 @@
+ #include "gam_event.h"
+ #include "gam_excludes.h"
+ 
+-#define VERBOSE_POLL
+ 
+ static gboolean gam_poll_basic_add_subscription(GamSubscription * sub);
+ static gboolean gam_poll_basic_remove_subscription(GamSubscription * sub);
diff --git a/sysutils/gamin/patches/patch-ab b/sysutils/gamin/patches/patch-ab
index 1b28ec25b34..20e536cc7d1 100644
--- a/sysutils/gamin/patches/patch-ab
+++ b/sysutils/gamin/patches/patch-ab
@@ -1,37 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2005/08/30 23:24:33 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2007/08/05 20:03:35 tnn Exp $
 
---- server/gam_kqueue.c.orig	2005-08-04 04:17:37.000000000 -0400
+--- server/gam_kqueue.c.orig	2007-07-04 15:50:41.000000000 +0200
 +++ server/gam_kqueue.c
-@@ -52,6 +52,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #include <sys/stat.h>
-@@ -325,9 +326,9 @@ gam_kqueue_isdir (const char *pathname, 
+@@ -326,7 +326,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);
  
--  if (sysctlbyname(name, value, &value_len, NULL, 0) < 0)
-+  if (sysctlbyname(name, value, &value_len, (void *)NULL, 0) < 0)
+   if (sysctlbyname(name, value, &value_len, (void *)NULL, 0) < 0)
      {
-       gam_error(DEBUG_INFO, "unable to retrieve %s: %s\n", name, g_strerror(errno));
-       return FALSE;
-@@ -1031,7 +1032,7 @@ gam_kqueue_kevent_cb (GIOChannel *source
-     }
- 
-   for (i = 0; i < nevents; i++)
--    MONITOR(ev[i].udata)->handle_kevent(ev[i].udata, &ev[i]);
-+    MONITOR(ev[i].udata)->handle_kevent(MONITOR(ev[i].udata), &ev[i]);
-   
-   return TRUE;			/* keep source */
- }
-@@ -1134,8 +1135,10 @@ gam_kqueue_init (void)
+@@ -1135,8 +1135,10 @@ gam_kqueue_init (void)
  
    if (! gam_kqueue_get_uint_sysctl("kern.maxfiles", &maxfiles))
      return FALSE;
@@ -42,7 +22,7 @@ $NetBSD: patch-ab,v 1.2 2005/08/30 23:24:33 jlam Exp $
  
    /*
     * We make sure to:
-@@ -1144,9 +1147,13 @@ gam_kqueue_init (void)
+@@ -1145,9 +1147,13 @@ gam_kqueue_init (void)
     */
  
    maxfiles *= CFG_GLOBAL_FILE_RESERVE_RATIO;
diff --git a/sysutils/gamin/patches/patch-ac b/sysutils/gamin/patches/patch-ac
index d60ca275163..b7439bbb375 100644
--- a/sysutils/gamin/patches/patch-ac
+++ b/sysutils/gamin/patches/patch-ac
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2005/08/30 23:24:33 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2007/08/05 20:03:35 tnn Exp $
 
---- server/gam_pidname.c.orig	2005-08-01 11:27:19.000000000 -0400
-+++ server/gam_pidname.c
-@@ -7,9 +7,9 @@
- 
- char *gam_get_pidname (int pid)
- {
-+    gchar *pidname = NULL;
- #ifdef HAVE_LINUX
-     gchar *procname;
--    gchar *pidname = NULL;
-     FILE *fp;
- #endif
+--- doc/Makefile.in.orig	2007-07-27 16:36:39.000000000 +0200
++++ doc/Makefile.in
+@@ -359,7 +359,7 @@ uninstall-am: uninstall-info-am
+ 	uninstall-info-am
+ 
+ 
+-all: web $(top_srcdir)/NEWS
++all:
+ 
+ web: $(PAGES)
  
diff --git a/sysutils/gamin/patches/patch-ad b/sysutils/gamin/patches/patch-ad
deleted file mode 100644
index 6bb6f90e9b5..00000000000
--- a/sysutils/gamin/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/08/30 23:24:33 jlam Exp $
-
---- server/gam_server.c.orig	2005-08-09 14:30:12.000000000 -0400
-+++ server/gam_server.c
-@@ -56,6 +56,21 @@ gboolean (*gam_backend_add_subscription)
- gboolean (*gam_backend_remove_subscription) (GamSubscription *sub);
- gboolean (*gam_backend_remove_all_for)   (GamListener *listener);
- 
-+#ifndef ENABLE_INOTIFY
-+/**
-+ * gam_inotify_is_running
-+ *
-+ * Unless built with inotify support, always
-+ * return false.
-+ */
-+gboolean
-+gam_inotify_is_running(void)
-+{
-+	return FALSE;
-+}
-+#endif
-+
-+
- /**
-  * gam_exit:
-  *