summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/rhythmbox-devel/Makefile6
-rw-r--r--audio/rhythmbox/Makefile6
-rw-r--r--deskutils/notification-daemon/Makefile4
-rw-r--r--deskutils/tomboy/Makefile6
-rw-r--r--devel/dbus-glib/Makefile32
-rw-r--r--devel/dbus-glib/distinfo3
-rw-r--r--devel/dbus-glib/pkg-descr3
-rw-r--r--devel/dbus-glib/pkg-plist11
-rw-r--r--devel/dbus-sharp/Makefile5
-rw-r--r--devel/dbus/Makefile64
-rw-r--r--devel/dbus/distinfo3
-rw-r--r--devel/dbus/files/dbus.in39
-rw-r--r--devel/dbus/files/patch-bus_bus.c11
-rw-r--r--devel/dbus/files/patch-bus_session.conf.in10
-rw-r--r--devel/dbus/files/patch-bus_system.conf.in10
-rw-r--r--devel/dbus/files/patch-dbus-1.pc.in9
-rw-r--r--devel/dbus/files/patch-dbus_Makefile.in11
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c94
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c11
-rw-r--r--devel/dbus/pkg-descr8
-rw-r--r--devel/dbus/pkg-install38
-rw-r--r--devel/dbus/pkg-plist47
-rw-r--r--devel/py-dbus/Makefile31
-rw-r--r--devel/py-dbus/distinfo3
-rw-r--r--devel/py-dbus/pkg-descr3
-rw-r--r--devel/py-dbus/pkg-plist36
-rw-r--r--graphics/evince/Makefile5
-rw-r--r--irc/xchat-gnome/Makefile4
-rw-r--r--irc/xchat/Makefile6
-rw-r--r--mail/evolution/Makefile5
-rw-r--r--multimedia/bmpx-devel/Makefile4
-rw-r--r--multimedia/bmpx/Makefile4
-rw-r--r--net-im/gaim-devel/Makefile4
-rw-r--r--net-im/pidgin/Makefile4
-rw-r--r--net/ekiga/Makefile4
-rw-r--r--net/liferea/Makefile4
-rw-r--r--polish/gnugadu2/Makefile4
-rw-r--r--sysutils/hal/Makefile4
-rw-r--r--sysutils/policykit/Makefile6
-rw-r--r--www/epiphany/Makefile5
-rw-r--r--x11/gnome-screensaver/Makefile5
-rw-r--r--x11/gnome-session/Makefile5
-rw-r--r--x11/yelp/Makefile5
43 files changed, 533 insertions, 49 deletions
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 0c474ff98..9f9c0e141 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.63 2006/06/29 05:21:11 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.64 2006/07/21 20:46:53 mezz Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.9.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
@@ -20,7 +20,7 @@ COMMENT= Audio player for the Gnome 2 desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.0:${PORTSDIR}/audio/libid3tag \
totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
- dbus-1.2:${PORTSDIR}/devel/dbus \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.2.8:${PORTSDIR}/devel/libsoup \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 0c474ff98..9f9c0e141 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.63 2006/06/29 05:21:11 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.64 2006/07/21 20:46:53 mezz Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.9.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
@@ -20,7 +20,7 @@ COMMENT= Audio player for the Gnome 2 desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.0:${PORTSDIR}/audio/libid3tag \
totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
- dbus-1.2:${PORTSDIR}/devel/dbus \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.2.8:${PORTSDIR}/devel/libsoup \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 917e23d33..adfa26ad4 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -7,14 +7,14 @@
PORTNAME= notification-daemon
PORTVERSION= 0.3.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.galago-project.org/files/releases/source/notification-daemon/
MAINTAINER= andreas@syndrom23.de
COMMENT= Send small notifications to your desktop
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus \
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy:${PORTSDIR}/x11-toolkits/libsexy \
popt.0:${PORTSDIR}/devel/popt
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 6b6a0ce1c..ba33178ec 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -3,12 +3,12 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $Id: Makefile,v 1.6 2006-08-11 22:02:16 marcus Exp $
+# $Id: Makefile,v 1.7 2006-10-07 17:10:04 marcus Exp $
#
PORTNAME= tomboy
PORTVERSION= 0.3.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,7 +18,7 @@ MAINTAINER= bsd-sharp-list@forge.novell.com
COMMENT= Personal note taking system for the GNOME desktop
LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell \
- dbus-glib-1.2:${PORTSDIR}/devel/dbus
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
BUILD_DEPENDS= gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20
RUN_DEPENDS= gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
new file mode 100644
index 000000000..1abde4b11
--- /dev/null
+++ b/devel/dbus-glib/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for: D-BUS
+# Date Created: 22 June 2004
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/dbus/Makefile,v 1.52 2006/06/14 05:03:44 marcus Exp $
+#
+
+PORTNAME= dbus
+PORTVERSION= 0.71
+CATEGORIES= devel gnome
+MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-glib/
+PKGNAMESUFFIX= -glib
+DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GLib bindings for the D-BUS messaging system
+
+LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
+
+USE_GNOME= gnomehack glib20
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \
+ --disable-doxygen-docs \
+ --disable-xml-docs
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+PLIST_SUB= VERSION="1.0"
+
+.include <bsd.port.mk>
diff --git a/devel/dbus-glib/distinfo b/devel/dbus-glib/distinfo
new file mode 100644
index 000000000..77979418b
--- /dev/null
+++ b/devel/dbus-glib/distinfo
@@ -0,0 +1,3 @@
+MD5 (dbus-glib-0.71.tar.gz) = 4e1e7348b26ee8b6485452113f4221cc
+SHA256 (dbus-glib-0.71.tar.gz) = b58a489fdd35a70d241f512bc08f3b6d9d8e05110f4a1d5341cff6a0b7d854b7
+SIZE (dbus-glib-0.71.tar.gz) = 566889
diff --git a/devel/dbus-glib/pkg-descr b/devel/dbus-glib/pkg-descr
new file mode 100644
index 000000000..bc3c57d8f
--- /dev/null
+++ b/devel/dbus-glib/pkg-descr
@@ -0,0 +1,3 @@
+GLib bindings for the D-BUS interprocess messaging system.
+
+WWW: http://www.freedesktop.org/wiki/Software_2fDBusBindings
diff --git a/devel/dbus-glib/pkg-plist b/devel/dbus-glib/pkg-plist
new file mode 100644
index 000000000..abc3049f9
--- /dev/null
+++ b/devel/dbus-glib/pkg-plist
@@ -0,0 +1,11 @@
+bin/dbus-binding-tool
+include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h
+include/dbus-%%VERSION%%/dbus/dbus-glib-error-enum.h
+include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h
+include/dbus-%%VERSION%%/dbus/dbus-glib.h
+include/dbus-%%VERSION%%/dbus/dbus-gtype-specialized.h
+lib/libdbus-glib-1.a
+lib/libdbus-glib-1.la
+lib/libdbus-glib-1.so
+lib/libdbus-glib-1.so.2
+libdata/pkgconfig/dbus-glib-1.pc
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 81aa74e88..9eeb8f9e7 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -3,7 +3,7 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $Id: Makefile,v 1.2 2006-10-03 20:26:06 ahze Exp $
+# $Id: Makefile,v 1.3 2006-10-07 17:10:05 marcus Exp $
#
PORTVERSION= 0.62
@@ -14,7 +14,7 @@ PKGNAMESUFFIX= -sharp
MAINTAINER= bsd-sharp-list@forge.novell.com
COMMENT= Mono interface to the D-BUS messaging system
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
BUILD_DEPENDS= monodoc:${PORTSDIR}/devel/mono-tools
RUN_DEPENDS= monodoc:${PORTSDIR}/devel/mono-tools
@@ -34,6 +34,7 @@ CONFIGURE_ARGS= --enable-mono \
--disable-gcj \
--disable-gtk \
--disable-qt \
+ --with-test-socket-dir=${WRKDIR} \
--with-system-pid-file=/var/run/dbus.pid \
--with-system-socket=/var/run/dbus \
--with-session-socket-dir=/var/tmp \
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
new file mode 100644
index 000000000..fff867bc6
--- /dev/null
+++ b/devel/dbus/Makefile
@@ -0,0 +1,64 @@
+# New ports collection makefile for: D-BUS
+# Date Created: 22 June 2004
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/dbus/Makefile,v 1.52 2006/06/14 05:03:44 marcus Exp $
+#
+
+PORTNAME= dbus
+PORTVERSION= 0.93
+CATEGORIES= devel gnome
+MASTER_SITES= http://dbus.freedesktop.org/releases/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A message bus system for inter-application communication
+
+LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
+
+USE_GNOME= gnomehack libxml2
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+INSTALLS_SHLIB= yes
+CONFIGURE_ARGS=--localstatedir=/var \
+ --with-test-socket-dir=${WRKDIR} \
+ --with-system-pid-file=/var/run/dbus/dbus.pid \
+ --with-system-socket=/var/run/dbus/dbus.pipe \
+ --with-session-socket-dir=/var/tmp \
+ --disable-doxygen-docs \
+ --disable-xml-docs
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+USE_RC_SUBR= dbus
+
+PLIST_SUB= VERSION="1.0"
+
+MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
+ dbus-monitor.1 dbus-send.1
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
+ ${WRKSRC}/bus/session.conf.in \
+ ${WRKSRC}/bus/system.conf.in
+
+pre-su-install:
+ @for i in 15 9 ; do \
+ if [ -f /var/run/dbus/dbus.pid ]; then \
+ kill -$${i} $$(${CAT} /var/run/dbus/dbus.pid) 2>/dev/null || ${TRUE} ; \
+ sleep 3 ; \
+ fi ; \
+ done
+ @if [ -f /var/run/dbus/dbus.pid ]; then \
+ ${RM} -f /var/run/dbus/dbus.pid ; \
+ fi
+
+post-install:
+.if !defined(PACKAGE_BUILDING)
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+ ${MKDIR} ${X11BASE}/etc/dbus-1/system.d
+ ${MKDIR} ${X11BASE}/share/dbus-1/services
+
+.include <bsd.port.post.mk>
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
new file mode 100644
index 000000000..6f41a76bd
--- /dev/null
+++ b/devel/dbus/distinfo
@@ -0,0 +1,3 @@
+MD5 (dbus-0.93.tar.gz) = 0770dce874c76f7364d055e4648900fb
+SHA256 (dbus-0.93.tar.gz) = bdb6a229bc87944e46b656d6e568f9bf9e8fedcb0e1ca53f48f3ed333915168b
+SIZE (dbus-0.93.tar.gz) = 1340600
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
new file mode 100644
index 000000000..e05be9718
--- /dev/null
+++ b/devel/dbus/files/dbus.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/devel/dbus/files/dbus.in,v 1.8 2006/06/10 19:03:48 marcus Exp $
+#
+# PROVIDE: dbus
+# REQUIRE: DAEMON
+#
+# Add the following lines to /etc/rc.conf to enable the D-BUS messaging system:
+#
+# dbus_enable="YES"
+#
+
+dbus_enable=${dbus_enable-"NO"}
+dbus_flags=${dbus_flags-"--system"}
+
+. %%RC_SUBR%%
+
+name=dbus
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/dbus-daemon"
+pidfile="/var/run/dbus/${name}.pid"
+
+start_precmd="dbus_prestart"
+stop_postcmd="dbus_poststop"
+
+dbus_prestart()
+{
+ mkdir -p $(dirname $pidfile)
+}
+
+dbus_poststop()
+{
+ rm -f $pidfile
+}
+
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/devel/dbus/files/patch-bus_bus.c b/devel/dbus/files/patch-bus_bus.c
new file mode 100644
index 000000000..857d6379f
--- /dev/null
+++ b/devel/dbus/files/patch-bus_bus.c
@@ -0,0 +1,11 @@
+--- bus/bus.c.orig Thu Jun 30 23:55:41 2005
++++ bus/bus.c Thu Jun 30 23:56:04 2005
+@@ -486,7 +486,7 @@ process_config_every_time (BusContext
+
+ _dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
+ (DBusForeachFunction) bus_watch_directory,
+- NULL);
++ bus_context_get_loop (context));
+
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+ retval = TRUE;
diff --git a/devel/dbus/files/patch-bus_session.conf.in b/devel/dbus/files/patch-bus_session.conf.in
new file mode 100644
index 000000000..955de7132
--- /dev/null
+++ b/devel/dbus/files/patch-bus_session.conf.in
@@ -0,0 +1,10 @@
+--- bus/session.conf.in.orig Mon Jun 6 22:18:31 2005
++++ bus/session.conf.in Mon Jun 6 22:31:35 2005
+@@ -11,6 +11,7 @@
+ <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen>
+
+ <servicedir>@EXPANDED_DATADIR@/dbus-1/services</servicedir>
++ <servicedir>%%X11BASE%%/share/dbus-1/services</servicedir>
+
+ <policy context="default">
+ <!-- Allow everything to be sent -->
diff --git a/devel/dbus/files/patch-bus_system.conf.in b/devel/dbus/files/patch-bus_system.conf.in
new file mode 100644
index 000000000..cfb3f879e
--- /dev/null
+++ b/devel/dbus/files/patch-bus_system.conf.in
@@ -0,0 +1,10 @@
+--- bus/system.conf.in.orig Wed May 3 02:08:16 2006
++++ bus/system.conf.in Wed May 3 02:09:58 2006
+@@ -52,6 +52,7 @@
+ <!-- Config files are placed here that among other things, punch
+ holes in the above policy for specific services. -->
+ <includedir>system.d</includedir>
++ <includedir>%%X11BASE%%/etc/dbus-1/system.d</includedir>
+
+ <!-- This is included last so local configuration can override what's
+ in this standard file -->
diff --git a/devel/dbus/files/patch-dbus-1.pc.in b/devel/dbus/files/patch-dbus-1.pc.in
new file mode 100644
index 000000000..1b96c24f5
--- /dev/null
+++ b/devel/dbus/files/patch-dbus-1.pc.in
@@ -0,0 +1,9 @@
+--- dbus-1.pc.in.orig Tue Jun 22 14:50:57 2004
++++ dbus-1.pc.in Tue Jun 22 14:54:24 2004
+@@ -7,5 +7,5 @@
+ Description: Free desktop message bus
+ Version: @VERSION@
+ Libs: -L${libdir} -ldbus-1
+-Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
++Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include
+
diff --git a/devel/dbus/files/patch-dbus_Makefile.in b/devel/dbus/files/patch-dbus_Makefile.in
new file mode 100644
index 000000000..42a58caed
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_Makefile.in
@@ -0,0 +1,11 @@
+--- dbus/Makefile.in.orig Fri Jan 21 19:43:46 2005
++++ dbus/Makefile.in Fri Jan 21 19:44:43 2005
+@@ -360,7 +360,7 @@
+ @HAVE_GLIB_TRUE@ $(DBUS_GLIB_BUILT_INCLUDES)
+
+ dbusincludedir = $(includedir)/dbus-1.0/dbus
+-dbusarchincludedir = $(libdir)/dbus-1.0/include/dbus
++dbusarchincludedir = $(includedir)/dbus-1.0/include/dbus
+ lib_LTLIBRARIES = libdbus-1.la
+ dbusinclude_HEADERS = \
+ dbus.h \
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
new file mode 100644
index 000000000..42a750966
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
@@ -0,0 +1,94 @@
+--- dbus/dbus-sysdeps-unix.c.orig Thu Sep 14 01:07:11 2006
++++ dbus/dbus-sysdeps-unix.c Sat Oct 7 12:23:40 2006
+@@ -719,16 +719,16 @@ write_credentials_byte (int
+ {
+ int bytes_written;
+ char buf[1] = { '\0' };
+-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
+- struct {
++#if defined(HAVE_CMSGCRED)
++ union {
+ struct cmsghdr hdr;
+- struct cmsgcred cred;
++ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+ } cmsg;
+ struct iovec iov;
+ struct msghdr msg;
+ #endif
+
+-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
++#if defined(HAVE_CMSGCRED)
+ iov.iov_base = buf;
+ iov.iov_len = 1;
+
+@@ -736,10 +736,10 @@ write_credentials_byte (int
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+
+- msg.msg_control = &cmsg;
+- msg.msg_controllen = sizeof (cmsg);
++ msg.msg_control = (caddr_t) &cmsg;
++ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+ memset (&cmsg, 0, sizeof (cmsg));
+- cmsg.hdr.cmsg_len = sizeof (cmsg);
++ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+ cmsg.hdr.cmsg_level = SOL_SOCKET;
+ cmsg.hdr.cmsg_type = SCM_CREDS;
+ #endif
+@@ -748,7 +748,7 @@ write_credentials_byte (int
+
+ again:
+
+-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
++#if defined(HAVE_CMSGCRED)
+ bytes_written = sendmsg (server_fd, &msg, 0);
+ #else
+ bytes_written = write (server_fd, buf, 1);
+@@ -806,9 +806,10 @@ _dbus_read_credentials_unix_socket (int
+ char buf;
+
+ #ifdef HAVE_CMSGCRED
+- struct {
++ struct cmsgcred *cred;
++ union {
+ struct cmsghdr hdr;
+- struct cmsgcred cred;
++ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+ } cmsg;
+
+ #elif defined(LOCAL_CREDS)
+@@ -845,8 +846,8 @@ _dbus_read_credentials_unix_socket (int
+
+ #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
+ memset (&cmsg, 0, sizeof (cmsg));
+- msg.msg_control = &cmsg;
+- msg.msg_controllen = sizeof (cmsg);
++ msg.msg_control = (caddr_t) &cmsg;
++ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+ #endif
+
+ again:
+@@ -869,7 +870,8 @@ _dbus_read_credentials_unix_socket (int
+ }
+
+ #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
+- if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
++ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
++ || cmsg.hdr.cmsg_type != SCM_CREDS)
+ {
+ dbus_set_error (error, DBUS_ERROR_FAILED,
+ "Message from recvmsg() was not SCM_CREDS");
+@@ -897,9 +899,10 @@ _dbus_read_credentials_unix_socket (int
+ cr_len, (int) sizeof (cr), _dbus_strerror (errno));
+ }
+ #elif defined(HAVE_CMSGCRED)
+- credentials->pid = cmsg.cred.cmcred_pid;
+- credentials->uid = cmsg.cred.cmcred_euid;
+- credentials->gid = cmsg.cred.cmcred_groups[0];
++ cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
++ credentials->pid = cred->cmcred_pid;
++ credentials->uid = cred->cmcred_euid;
++ credentials->gid = cred->cmcred_groups[0];
+ #elif defined(LOCAL_CREDS)
+ credentials->pid = DBUS_PID_UNSET;
+ credentials->uid = cmsg.cred.sc_uid;
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
new file mode 100644
index 000000000..28701094b
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
@@ -0,0 +1,11 @@
+--- dbus/dbus-sysdeps-util-unix.c.orig Sat Oct 7 12:33:47 2006
++++ dbus/dbus-sysdeps-util-unix.c Sat Oct 7 12:34:13 2006
+@@ -502,7 +502,7 @@ static dbus_bool_t
+ dirent_buf_size(DIR * dirp, size_t *size)
+ {
+ long name_max;
+-# if defined(HAVE_FPATHCONF) && defined(HAVE_DIRFD) \
++# if defined(HAVE_FPATHCONF) && ( defined(HAVE_DIRFD) || defined(dirfd) )\
+ && defined(_PC_NAME_MAX)
+ name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX);
+ if (name_max == -1)
diff --git a/devel/dbus/pkg-descr b/devel/dbus/pkg-descr
new file mode 100644
index 000000000..2a1c3cc0a
--- /dev/null
+++ b/devel/dbus/pkg-descr
@@ -0,0 +1,8 @@
+D-BUS supplies both a system daemon (for events such as "new hardware device
+added" or "printer queue changed") and a per-user-login-session daemon (for
+general IPC needs among user applications). Also, the message bus is built on
+top of a general one-to-one message passing framework, which can be used by
+any two apps to communicate directly (without going through the message bus
+daemon).
+
+WWW: http://www.freedesktop.org/Software/dbus
diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install
new file mode 100644
index 000000000..06f47528d
--- /dev/null
+++ b/devel/dbus/pkg-install
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+ USER=messagebus
+ GROUP=${USER}
+ UID=556
+ GID=${UID}
+ PW=/usr/sbin/pw
+
+ if ${PW} group show "${GROUP}" 2>/dev/null; then
+ echo "You already have a group \"${GROUP}\", so I will use it."
+ else
+ if ${PW} groupadd ${GROUP} -g ${GID}; then
+ echo "Added group \"${GROUP}\"."
+ else
+ echo "Adding group \"${GROUP}\" failed..."
+ exit 1
+ fi
+ fi
+
+ if ${PW} user show "${USER}" 2>/dev/null; then
+ echo "You already have a user \"${USER}\", so I will use it."
+ else
+ if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+ -d "/nonexistent" -s /sbin/nologin -c "D-BUS Daemon User"
+ then
+ echo "Added user \"${USER}\"."
+ else
+ echo "Adding user \"${USER}\" failed..."
+ exit 1
+ fi
+ fi
+
+ /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus
+ exit 0
+ ;;
+esac
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
new file mode 100644
index 000000000..e1703343c
--- /dev/null
+++ b/devel/dbus/pkg-plist
@@ -0,0 +1,47 @@
+bin/dbus-cleanup-sockets
+bin/dbus-daemon
+bin/dbus-launch
+bin/dbus-monitor
+bin/dbus-send
+etc/dbus-1/session.conf
+etc/dbus-1/system.conf
+include/dbus-%%VERSION%%/dbus/dbus-address.h
+include/dbus-%%VERSION%%/dbus/dbus-bus.h
+include/dbus-%%VERSION%%/dbus/dbus-connection.h
+include/dbus-%%VERSION%%/dbus/dbus-errors.h
+include/dbus-%%VERSION%%/dbus/dbus-macros.h
+include/dbus-%%VERSION%%/dbus/dbus-memory.h
+include/dbus-%%VERSION%%/dbus/dbus-message.h
+include/dbus-%%VERSION%%/dbus/dbus-pending-call.h
+include/dbus-%%VERSION%%/dbus/dbus-protocol.h
+include/dbus-%%VERSION%%/dbus/dbus-server.h
+include/dbus-%%VERSION%%/dbus/dbus-shared.h
+include/dbus-%%VERSION%%/dbus/dbus-signature.h
+include/dbus-%%VERSION%%/dbus/dbus-threads.h
+include/dbus-%%VERSION%%/dbus/dbus-types.h
+include/dbus-%%VERSION%%/dbus/dbus.h
+include/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h
+lib/libdbus-1.a
+lib/libdbus-1.la
+lib/libdbus-1.so
+lib/libdbus-1.so.3
+libdata/pkgconfig/dbus-1.pc
+@exec mkdir -p %D/etc/dbus-1/system.d
+@exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d
+@exec mkdir -p %D/share/dbus-1/services
+@exec mkdir -p %%X11BASE%%/share/dbus-1/services
+@dirrmtry share/dbus-1/services
+@dirrmtry share/dbus-1
+@unexec rmdir %%X11BASE%%/share/dbus-1/services 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/dbus-1 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/etc/dbus-1/system.d 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/etc/dbus-1 2>/dev/null || true
+@dirrm include/dbus-%%VERSION%%/include/dbus
+@dirrm include/dbus-%%VERSION%%/include
+@dirrm include/dbus-%%VERSION%%/dbus
+@dirrm include/dbus-%%VERSION%%
+@dirrm etc/dbus-1/system.d
+@dirrm etc/dbus-1
+@unexec rm -f /var/run/dbus/dbus.pid
+@unexec rm -f /var/run/dbus/dbus.pipe
+@unexec rmdir /var/run/dbus 2>/dev/null || true
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
new file mode 100644
index 000000000..ec462ab21
--- /dev/null
+++ b/devel/py-dbus/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for: D-BUS
+# Date Created: 22 June 2004
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/dbus/Makefile,v 1.52 2006/06/14 05:03:44 marcus Exp $
+#
+
+PORTNAME= dbus
+PORTVERSION= 0.71
+CATEGORIES= devel gnome python
+MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= ${PORTNAME}-python-${PORTVERSION}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Python bindings for the D-BUS messaging system
+
+BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+RUN_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex \
+ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+
+USE_PYTHON= yes
+USE_GMAKE= yes
+USE_PYDISTUTILS=yes
+
+post-install:
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/dbus
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/dbus
+
+.include <bsd.port.mk>
diff --git a/devel/py-dbus/distinfo b/devel/py-dbus/distinfo
new file mode 100644
index 000000000..3a92835e9
--- /dev/null
+++ b/devel/py-dbus/distinfo
@@ -0,0 +1,3 @@
+MD5 (dbus-python-0.71.tar.gz) = ee893bc87b784a8c2285f5041b5e7033
+SHA256 (dbus-python-0.71.tar.gz) = 4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
+SIZE (dbus-python-0.71.tar.gz) = 137613
diff --git a/devel/py-dbus/pkg-descr b/devel/py-dbus/pkg-descr
new file mode 100644
index 000000000..3c46c16da
--- /dev/null
+++ b/devel/py-dbus/pkg-descr
@@ -0,0 +1,3 @@
+Python bindings for the D-BUS interprocess messaging system.
+
+WWW: http://www.freedesktop.org/wiki/Software_2fDBusBindings
diff --git a/devel/py-dbus/pkg-plist b/devel/py-dbus/pkg-plist
new file mode 100644
index 000000000..76158ca38
--- /dev/null
+++ b/devel/py-dbus/pkg-plist
@@ -0,0 +1,36 @@
+%%PYTHON_SITELIBDIR%%/dbus/__init__.py
+%%PYTHON_SITELIBDIR%%/dbus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.py
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_util.py
+%%PYTHON_SITELIBDIR%%/dbus/_util.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_util.pyo
+%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.so
+%%PYTHON_SITELIBDIR%%/dbus/dbus_glib_bindings.so
+%%PYTHON_SITELIBDIR%%/dbus/decorators.py
+%%PYTHON_SITELIBDIR%%/dbus/decorators.pyc
+%%PYTHON_SITELIBDIR%%/dbus/decorators.pyo
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.py
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/dbus/glib.py
+%%PYTHON_SITELIBDIR%%/dbus/glib.pyc
+%%PYTHON_SITELIBDIR%%/dbus/glib.pyo
+%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.py
+%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.pyc
+%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.pyo
+%%PYTHON_SITELIBDIR%%/dbus/matchrules.py
+%%PYTHON_SITELIBDIR%%/dbus/matchrules.pyc
+%%PYTHON_SITELIBDIR%%/dbus/matchrules.pyo
+%%PYTHON_SITELIBDIR%%/dbus/proxies.py
+%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc
+%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo
+%%PYTHON_SITELIBDIR%%/dbus/service.py
+%%PYTHON_SITELIBDIR%%/dbus/service.pyc
+%%PYTHON_SITELIBDIR%%/dbus/service.pyo
+%%PYTHON_SITELIBDIR%%/dbus/types.py
+%%PYTHON_SITELIBDIR%%/dbus/types.pyc
+%%PYTHON_SITELIBDIR%%/dbus/types.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/dbus
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 134043552..5ddacca69 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,11 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/evince/Makefile,v 1.55 2006/08/08 00:52:43 ahze Exp $
+# $MCom: ports/graphics/evince/Makefile,v 1.56 2006/09/04 23:09:38 ahze Exp $
#
PORTNAME= evince
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
@@ -90,7 +91,7 @@ CONFIGURE_ARGS+= --disable-djvu
#.endif
.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
.endif
.if defined(WITH_COMICS)
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index e250087ca..bc966333c 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xchat
PORTVERSION= 0.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= irc gnome ipv6
MASTER_SITES= http://releases.navi.cx/xchat-gnome/
PKGNAMESUFFIX= -gnome
@@ -33,7 +33,7 @@ INSTALLS_ICONS= yes
INSTALLS_OMF= yes
.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+= --enable-dbus
USE_GNOME+= gconf2
GCONF_SCHEMAS+= xchat_gnome_url_handler.schemas
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index cafcc8f98..8f499a4e3 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/irc/xchat/Makefile,v 1.1 2006/07/18 13:25:39 ahze Exp $
+# $MCom: ports/irc/xchat/Makefile,v 1.2 2006/07/27 15:34:50 marcus Exp $
PORTNAME= xchat
PORTVERSION= 2.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= irc gnome ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://xchat.org/files/source/2.6/
@@ -59,7 +59,7 @@ PLIST_SUB+= TCL="@comment "
.endif
.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+=--enable-dbus
USE_GNOME+= gconf2
GCONF_SCHEMAS= apps_xchat_url_handler.schemas
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 738d10d2c..214162559 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution/Makefile,v 1.117 2006/09/26 22:27:10 mezz Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.118 2006/10/03 01:57:47 ahze Exp $
#
PORTNAME= evolution
PORTVERSION= 2.8.1
+PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -100,7 +101,7 @@ PLIST_SUB+= GSTREAMER="@comment "
.endif
.if defined(WITH_DBUS)
-LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
PLIST_SUB+= DBUS=""
.else
PLIST_SUB+= DBUS="@comment "
diff --git a/multimedia/bmpx-devel/Makefile b/multimedia/bmpx-devel/Makefile
index ccd08f257..4dba18498 100644
--- a/multimedia/bmpx-devel/Makefile
+++ b/multimedia/bmpx-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmpx
PORTVERSION= 0.21.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://files.beep-media-player.org/releases/${PORTVERSION:C/\.[0-9]*$//}/
PKGNAMESUFFIX= -devel
@@ -23,7 +23,7 @@ LIB_DEPENDS= tag.5:${PORTSDIR}/audio/taglib \
gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
boost_date_time.3:${PORTSDIR}/devel/boost \
- dbus-1.2:${PORTSDIR}/devel/dbus
+ dbus-1.3:${PORTSDIR}/devel/dbus
CONFLICTS= bmpx-[0-9]*
diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index 83987543f..31f50c3ee 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmpx
PORTVERSION= 0.20.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://files.beep-media-player.org/releases/${PORTVERSION:C/\.[0-9]*$//}/
@@ -21,7 +21,7 @@ LIB_DEPENDS= tag.5:${PORTSDIR}/audio/taglib \
glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
boost_date_time.3:${PORTSDIR}/devel/boost \
- dbus-1.2:${PORTSDIR}/devel/dbus
+ dbus-1.3:${PORTSDIR}/devel/dbus
CONFLICTS= bmpx-devel-[0-9]*
diff --git a/net-im/gaim-devel/Makefile b/net-im/gaim-devel/Makefile
index 7f0171eac..520f05341 100644
--- a/net-im/gaim-devel/Makefile
+++ b/net-im/gaim-devel/Makefile
@@ -3,12 +3,12 @@
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/gaim-devel/Makefile,v 1.2 2006/09/20 16:22:00 marcus Exp $
+# $MCom: ports/net-im/gaim-devel/Makefile,v 1.3 2006/09/30 16:04:04 marcus Exp $
#
PORTNAME= gaim
PORTVERSION= 2.0.0.b3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 7f0171eac..520f05341 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -3,12 +3,12 @@
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/gaim-devel/Makefile,v 1.2 2006/09/20 16:22:00 marcus Exp $
+# $MCom: ports/net-im/gaim-devel/Makefile,v 1.3 2006/09/30 16:04:04 marcus Exp $
#
PORTNAME= gaim
PORTVERSION= 2.0.0.b3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 35d0a17e7..f16cb3270 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ekiga
PORTVERSION= 2.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--disable-avahi
.endif
.ifndef (WITHOUT_DBUS)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+=--enable-dbus
PLIST_SUB+= DBUS:=""
.else
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 09d8ec249..4f9a2fcf2 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,7 +7,7 @@
PORTNAME= liferea
PORTVERSION= 1.0.23
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= liferea
@@ -63,7 +63,7 @@ PLIST_SUB+= XUL="@comment "
.ifdef WITHOUT_DBUS
CONFIGURE_ARGS+=--disable-dbus
.else
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
.endif
post-patch:
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index a64db60e0..b6fdf2011 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnugadu2
PORTVERSION= 2.2.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= polish net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ggadu
@@ -116,7 +116,7 @@ CONFIGURE_ARGS+= --without-gtkspell
.endif
.if defined(WITH_DBUS)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+= --with-dbus \
--with-dbus-dir=${PREFIX}/share/dbus-1/services
PLIST_SUB+= DBUS:=""
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 014886d9d..b6f5e669e 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/hal/Makefile,v 1.22 2006/09/16 20:26:45 marcus Exp $
+# $MCom: ports/sysutils/hal/Makefile,v 1.23 2006/09/17 19:54:19 marcus Exp $
#
PORTNAME= hal
PORTVERSION= ${HALVERSION}.${SNAPVERSION}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= sysutils
MASTER_SITES= http://www.marcuscom.com/downloads/
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index 42c425312..b59cd7c3a 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/policykit/Makefile,v 1.9 2006/06/16 05:19:02 marcus Exp $
+# $MCom: ports/sysutils/policykit/Makefile,v 1.10 2006/09/10 00:51:13 mezz Exp $
#
PORTNAME= policykit
PORTVERSION= 0.1.20060514
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.marcuscom.com/downloads/
DISTNAME= PolicyKit-${PORTVERSION}
@@ -16,7 +16,7 @@ DISTNAME= PolicyKit-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Framework for controlling access to system-wide components
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus-glib
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 30aed2738..de84f16f0 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.124 2006/09/03 20:42:39 ahze Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.125 2006/10/03 12:21:51 ahze Exp $
#
PORTNAME= epiphany
PORTVERSION= 2.16.1
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= An extremely lightweight and simple web browser for GNOME 2
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
USE_LDCONFIG= yes
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 0ebf9c841..f3249a0a5 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.55 2006/09/05 01:23:26 ahze Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.56 2006/10/03 12:43:41 ahze Exp $
#
PORTNAME= gnome-screensaver
PORTVERSION= 2.16.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,7 +17,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME screen saver and locker
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
USE_BZIP2= yes
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 021eeb4ed..df59a69d6 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-session/Makefile,v 1.93 2006/09/04 20:34:29 marcus Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.94 2006/10/03 11:42:10 ahze Exp $
#
PORTNAME= gnome-session
PORTVERSION= 2.16.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -23,7 +24,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Session component for the GNOME 2 desktop
BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus \
+LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus-glib \
gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 40d32f41d..e992bd13f 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.103 2006/09/04 18:57:05 marcus Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.104 2006/10/03 00:50:52 ahze Exp $
#
PORTNAME= yelp
PORTVERSION= 2.16.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,7 +17,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A help browser for the GNOME 2 desktop
-LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_GECKO= firefox seamonkey xulrunner firefox-devel<->firefox
USE_GETTEXT= yes