5 files changed, 50 insertions, 45 deletions

diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index 6f4c21ea032a..4a4af93dc120 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gamin
-PORTVERSION=	0.1.2
-PORTREVISION=	2
+PORTVERSION=	0.1.5
 CATEGORIES?=	devel
 MASTER_SITES=	http://www.gnome.org/~veillard/gamin/sources/
 
@@ -18,7 +17,7 @@ USE_GMAKE=	yes
 USE_GNOME?=	gnomehack glib20
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS?=--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
-		--without-python --disable-debug
+		--without-python
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
diff --git a/devel/gamin/distinfo b/devel/gamin/distinfo
index 6e9b51839d78..78439732c39a 100644
--- a/devel/gamin/distinfo
+++ b/devel/gamin/distinfo
@@ -1,2 +1,2 @@
-MD5 (gamin-0.1.2.tar.gz) = cb43e73d43e2c5d428229dea0288d66d
-SIZE (gamin-0.1.2.tar.gz) = 513784
+MD5 (gamin-0.1.5.tar.gz) = 0fad3fce44466bbb5a5d0450b4700e05
+SIZE (gamin-0.1.5.tar.gz) = 531603
diff --git a/devel/gamin/files/patch-server_gam_connection.c b/devel/gamin/files/patch-server_gam_connection.c
deleted file mode 100644
index 6b49538ee871..000000000000
--- a/devel/gamin/files/patch-server_gam_connection.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- server/gam_connection.c.orig	Wed Jul 13 17:54:01 2005
-+++ server/gam_connection.c	Wed Jul 13 17:54:54 2005
-@@ -30,10 +30,7 @@
-     GMainLoop *loop;            /* the Glib loop used */
-     GIOChannel *source;         /* the Glib I/O Channel used */
-     int request_len;            /* how many bytes of request are valid */
--    union {
--	GAMPacket request;      /* the next request being read */
--	void *request_data;     /* the next request as a char *  */
--    };
-+    GAMPacket request;          /* the next request being read */
-     GamListener *listener;      /* the listener associated with the connection */
- };
- 
-@@ -245,7 +242,7 @@
-     g_assert(data);
-     g_assert(size);
- 
--    *data = (char *) &conn->request_data + conn->request_len;
-+    *data = (char *) &conn->request + conn->request_len;
-     *size = sizeof(GAMPacket) - conn->request_len;
- 
-     return (0);
diff --git a/devel/gamin/files/patch-server_gam_debug_lists.c b/devel/gamin/files/patch-server_gam_debug_lists.c
deleted file mode 100644
index ad850bd90a49..000000000000
--- a/devel/gamin/files/patch-server_gam_debug_lists.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- server/gam_debug_lists.c.orig	Sat Jul 16 18:53:23 2005
-+++ server/gam_debug_lists.c	Sat Jul 16 18:53:43 2005
-@@ -28,6 +28,8 @@
- #include <string.h> /* for memset() debug */
- #include "glib.h"
- 
-+#ifdef GAM_DEBUG_ENABLED
-+
- GList*
- g_list_alloc (void)
- {
-@@ -252,4 +254,4 @@ g_list_length (GList *list)
-   
-   return length;
- }
--
-+#endif /* GAM_DEBUG_ENABLED */
diff --git a/devel/gamin/files/patch-server_gam_server.c b/devel/gamin/files/patch-server_gam_server.c
new file mode 100644
index 000000000000..5a2dca9581cd
--- /dev/null
+++ b/devel/gamin/files/patch-server_gam_server.c
@@ -0,0 +1,46 @@
+--- server/gam_server.c.orig	Wed Aug 10 00:01:21 2005
++++ server/gam_server.c	Wed Aug 10 00:03:41 2005
+@@ -170,9 +170,11 @@ gam_add_subscription(GamSubscription * s
+ 	if (gam_exclude_check (path)) 
+ 	{
+ 		GAM_DEBUG(DEBUG_INFO, "g_a_s: %s excluded\n", path);
++#ifdef ENABLE_INOTIFY
+ 		if (gam_inotify_is_running())
+ 			return gam_poll_add_subscription (sub);
+ 		else
++#endif
+ 			return gam_backend_add_subscription(sub);
+ 	} else {
+ 		gam_fs_mon_type type;
+@@ -211,9 +213,11 @@ gam_remove_subscription(GamSubscription 
+ 
+ 	if (gam_exclude_check (path)) 
+ 	{
++#ifdef ENABLE_INOTIFY
+ 		if (gam_inotify_is_running())
+ 			return gam_poll_remove_subscription (sub);
+ 		else
++#endif
+ 			return gam_backend_remove_subscription(sub);
+ 	} else {
+ 		gam_fs_mon_type type;
+@@ -300,15 +304,19 @@ gam_server_emit_one_event(const char *pa
+ 
+     reqno = gam_subscription_get_reqno(sub);
+ 
++#ifdef ENABLE_INOTIFY
+ 	if (gam_inotify_is_running())
+ 	{
+ 		gam_queue_event(conn, reqno, event, subpath, len);
+ 	} else {
++#endif
+ 		if (gam_send_event(conn, reqno, event, subpath, len) < 0) {
+ 		GAM_DEBUG(DEBUG_INFO, "Failed to send event to PID %d\n",
+ 			  gam_connection_get_pid(conn));
+ 		}
++#ifdef ENABLE_INOTIFY
+ 	}
++#endif
+ }
+ 
+ /**