Update to 1.2.24.

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

3 files changed, 6 insertions, 39 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 91cbe70e2..82cc701fc 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/dbus/Makefile,v 1.38 2010/03/13 22:30:46 marcus Exp $
+#   $MCom: ports/devel/dbus/Makefile,v 1.39 2010/03/16 19:33:10 mezz Exp $
 #
 
 PORTNAME=	dbus
-PORTVERSION?=	1.2.20
-PORTREVISION?=	1
+PORTVERSION?=	1.2.24
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 45705976e..09097b134 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.2.20.tar.gz) = 63f4e2412f6599a5e7b10281b9ddc0ac
-SHA256 (dbus-1.2.20.tar.gz) = 0ef086d738710384d525130797ee86a0ce2daebffa7dc4d28386503ef7448011
-SIZE (dbus-1.2.20.tar.gz) = 1672544
+MD5 (dbus-1.2.24.tar.gz) = 565346cecd9cfecf1463540c6086cc2c
+SHA256 (dbus-1.2.24.tar.gz) = f12c748f4a703655e3d4c3db94cdf5a752a0cd0b36958c715804373bd3595c48
+SIZE (dbus-1.2.24.tar.gz) = 1673774
diff --git a/devel/dbus/files/patch-bus_dir-watch-kqueue.c b/devel/dbus/files/patch-bus_dir-watch-kqueue.c
deleted file mode 100644
index 19a03033c..000000000
--- a/devel/dbus/files/patch-bus_dir-watch-kqueue.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- bus/dir-watch-kqueue.c
-+++ bus/dir-watch-kqueue.c
-@@ -139,17 +139,18 @@ out:
- }
- 
- void
--bus_set_watched_dir (BusContext *context, DBusList **directories)
-+bus_set_watched_dirs (BusContext *context, DBusList **directories)
- {
-   int new_fds[MAX_DIRS_TO_WATCH];
-   char *new_dirs[MAX_DIRS_TO_WATCH];
-   DBusList *link;
--  int i, f, fd;
-+  int i, j, f, fd;
-+  struct kevent ev;
- 
-   if (!_init_kqueue (context))
-     goto out;
- 
--  for (i = 0; i < MAX_DIRS_TO_WATCH; i++) {
-+  for (i = 0; i < MAX_DIRS_TO_WATCH; i++)
-     {
-       new_fds[i] = -1;
-       new_dirs[i] = NULL;
-@@ -213,7 +214,7 @@ bus_set_watched_dir (BusContext *context
-                   NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);
-           if (kevent (kq, &ev, 1, NULL, 0, NULL) == -1)
-             {
--              _dbus_warn ("Cannot setup a kevent for '%s'; error '%s'\n", dir, _dbus_strerror (errno));
-+              _dbus_warn ("Cannot setup a kevent for '%s'; error '%s'\n", new_dirs[i], _dbus_strerror (errno));
-               close (fd);
-               goto out;
-             }