summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES3
-rw-r--r--sysutils/gamin/DESCR11
-rw-r--r--sysutils/gamin/Makefile37
-rw-r--r--sysutils/gamin/PLIST31
-rw-r--r--sysutils/gamin/buildlink3.mk18
-rw-r--r--sysutils/gamin/distinfo9
-rw-r--r--sysutils/gamin/patches/patch-aa13
-rw-r--r--sysutils/gamin/patches/patch-ab30
-rw-r--r--sysutils/gamin/patches/patch-ac15
-rw-r--r--sysutils/gamin/patches/patch-ad26
10 files changed, 192 insertions, 1 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index f791d7ea7d5..b10e11f7242 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10847 2005/08/10 20:57:18 chris Exp $
+$NetBSD: CHANGES,v 1.10848 2005/08/10 21:02:39 jlam Exp $
Changes to the packages collection and infrastructure in 2005:
@@ -573,3 +573,4 @@ Changes to the packages collection and infrastructure in 2005:
Updated net/openafs to 1.3.87 [gendalia 2005-08-10]
Updated graphics/jpegpixi to 1.1.0 [gdt 2005-08-10]
Updated mail/sylpheed-devel to 2.1.0 [chris 2005-08-10]
+ Updated sysutils/gamin to 0.1.5 [jlam 2005-08-10]
diff --git a/sysutils/gamin/DESCR b/sysutils/gamin/DESCR
new file mode 100644
index 00000000000..72c26a99957
--- /dev/null
+++ b/sysutils/gamin/DESCR
@@ -0,0 +1,11 @@
+Gamin is a file and directory monitoring system defined to be a subset
+of the FAM (File Alteration Monitor) system.
+
+The main goals of the project are:
+
+ 1. Minimize the security model of FAM -- the daemon runs under the
+ user account.
+ 2. Simplify the code base, dropping some of the most exotic features
+ of FAM.
+ 3. Provide an API and ABI compatible replacement for FAM.
+ 4. Try to fix some other issues like resource consumption.
diff --git a/sysutils/gamin/Makefile b/sysutils/gamin/Makefile
new file mode 100644
index 00000000000..b16711e215c
--- /dev/null
+++ b/sysutils/gamin/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1.1.1 2005/08/10 21:01:51 jlam Exp $
+
+DISTNAME= gamin-0.1.5
+CATEGORIES= sysutils
+MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/
+
+CONFLICTS= fam-[0-9]*
+
+MAINTAINER= jlam@NetBSD.org
+COMMENT= file alteration monitor
+HOMEPAGE= http://www.gnome.org/~veillard/gamin/
+
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-gtk-doc
+CONFIGURE_ARGS+= --without-threads
+CONFIGURE_ARGS+= --with-html-dir=${DOCDIR}
+
+PKG_SYSCONFSUBDIR= gamin
+DOCDIR= ${PREFIX}/share/doc/gamin
+
+SUBST_CLASSES+= 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}/,"
+
+
+.include "../../devel/glib2/buildlink3.mk"
+
+post-install:
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ cd ${WRKSRC}/doc; for file in *.html *.gif *.txt *.xml; do \
+ ${INSTALL_DATA} $$file ${DOCDIR}/$$file; \
+ done
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gamin/PLIST b/sysutils/gamin/PLIST
new file mode 100644
index 00000000000..3cb3494da03
--- /dev/null
+++ b/sysutils/gamin/PLIST
@@ -0,0 +1,31 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2005/08/10 21:01:51 jlam Exp $
+include/fam.h
+lib/libfam.la
+lib/libgamin-1.la
+lib/libgamin_shared.a
+lib/pkgconfig/gamin.pc
+libexec/gam_server
+share/doc/gamin/FAQ.html
+share/doc/gamin/callbacks.gif
+share/doc/gamin/client_server.gif
+share/doc/gamin/config.html
+share/doc/gamin/contacts.html
+share/doc/gamin/debug.html
+share/doc/gamin/debugging.txt
+share/doc/gamin/devel.html
+share/doc/gamin/differences.html
+share/doc/gamin/downloads.html
+share/doc/gamin/gamin-api.xml
+share/doc/gamin/gamin-refs.xml
+share/doc/gamin/gamin.html
+share/doc/gamin/index.html
+share/doc/gamin/internals.html
+share/doc/gamin/news.html
+share/doc/gamin/overview.html
+share/doc/gamin/python.html
+share/doc/gamin/security.html
+share/doc/gamin/server_structs.gif
+share/doc/gamin/socket.txt
+share/doc/gamin/using.html
+@dirrm share/doc/gamin
+@unexec ${RMDIR} -p %D/lib/pkgconfig 2>/dev/null || ${TRUE}
diff --git a/sysutils/gamin/buildlink3.mk b/sysutils/gamin/buildlink3.mk
new file mode 100644
index 00000000000..8848dfa1648
--- /dev/null
+++ b/sysutils/gamin/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/08/10 21:01:51 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+GAMIN_BUILDLINK3_MK:= ${GAMIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= gamin
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngamin}
+BUILDLINK_PACKAGES+= gamin
+
+.if !empty(GAMIN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gamin+= gamin>=0.1.5
+BUILDLINK_PKGSRCDIR.gamin?= ../../sysutils/gamin
+.endif # GAMIN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gamin/distinfo b/sysutils/gamin/distinfo
new file mode 100644
index 00000000000..ba995a0caa3
--- /dev/null
+++ b/sysutils/gamin/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2005/08/10 21:01:51 jlam 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) = 8438e9dde835be2662d86b5d58c0b13b6e52df21
+SHA1 (patch-ab) = e504cab3278446837e13484210ab480e2610ebae
+SHA1 (patch-ac) = f1d7c9a3bda033b3f737663995a89490d01332b3
+SHA1 (patch-ad) = d82cd54452dab8e912a69b241b1ea3afc38b690c
diff --git a/sysutils/gamin/patches/patch-aa b/sysutils/gamin/patches/patch-aa
new file mode 100644
index 00000000000..b607fc40186
--- /dev/null
+++ b/sysutils/gamin/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2005/08/10 21:01:51 jlam Exp $
+
+--- libgamin/gam_data.c.orig 2005-05-18 14:45:04.000000000 +0000
++++ 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);
+ }
diff --git a/sysutils/gamin/patches/patch-ab b/sysutils/gamin/patches/patch-ab
new file mode 100644
index 00000000000..5f578365c3d
--- /dev/null
+++ b/sysutils/gamin/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1.1.1 2005/08/10 21:01:52 jlam Exp $
+
+--- server/gam_kqueue.c.orig 2005-08-04 08:17:37.000000000 +0000
++++ 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>
+@@ -327,7 +328,7 @@ gam_kqueue_get_uint_sysctl (const char *
+ {
+ unsigned int value_len = sizeof(*value);
+
+- if (sysctlbyname(name, value, &value_len, 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 */
+ }
diff --git a/sysutils/gamin/patches/patch-ac b/sysutils/gamin/patches/patch-ac
new file mode 100644
index 00000000000..533fd3a6646
--- /dev/null
+++ b/sysutils/gamin/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1.1.1 2005/08/10 21:01:52 jlam Exp $
+
+--- server/gam_pidname.c.orig 2005-08-01 15:27:19.000000000 +0000
++++ 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
+
diff --git a/sysutils/gamin/patches/patch-ad b/sysutils/gamin/patches/patch-ad
new file mode 100644
index 00000000000..24e311bfd6e
--- /dev/null
+++ b/sysutils/gamin/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.1.1.1 2005/08/10 21:01:52 jlam Exp $
+
+--- server/gam_server.c.orig 2005-08-09 18:30:12.000000000 +0000
++++ 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:
+ *