summaryrefslogtreecommitdiff
path: root/sysutils/dbus
diff options
context:
space:
mode:
authorchuck <chuck>2008-11-15 03:59:10 +0000
committerchuck <chuck>2008-11-15 03:59:10 +0000
commit74b616146485add089a1bbb23ea2e0912a3aa2b3 (patch)
treecc89460a896bbbdbe3e421a152d8580a13ba8029 /sysutils/dbus
parent176f84b984b0db10135e222df6819167ffd942df (diff)
downloadpkgsrc-74b616146485add089a1bbb23ea2e0912a3aa2b3.tar.gz
on darwin configure script picks up private per-user tmp directory
in /var/folders/xx/...+++... via the TMPDIR environment and cheerfully installs it in /usr/pkg/etc/dbus-1/session.conf meaning that only the user who installed the package will be able to write to that directory... except that dbus rejects directories with "+"'s in the filename so it won't work anyway. use configure --with-session-socket-dir=/tmp to work around this. found a description of this issue here: http://wiki.gnucash.org/wiki/MacOSX/Quartz in the "Running from the commandline" section. dbus also cannot cope with $DISPLAY containing "/" chars (like in darwin ... /tmp/launch-kcvznx/:0 ) so get rid of the ":" as described here: https://trac.macports.org/attachment/ticket/16833/patch-dbus-launch-x11.c.diff
Diffstat (limited to 'sysutils/dbus')
-rw-r--r--sysutils/dbus/Makefile6
-rw-r--r--sysutils/dbus/distinfo3
-rw-r--r--sysutils/dbus/patches/patch-am13
3 files changed, 20 insertions, 2 deletions
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index 6cf7a41b371..05a69182ed7 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/10/12 11:15:22 tron Exp $
+# $NetBSD: Makefile,v 1.35 2008/11/15 03:59:10 chuck Exp $
DISTNAME= dbus-1.2.4
CATEGORIES= sysutils
@@ -34,6 +34,10 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS_GROUPS= enable disable with without
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+= --with-session-socket-dir=/tmp
+.endif
+
CONFIGURE_ARGS.Linux= abstract-sockets dnotify selinux
CONFIGURE_ARGS.docs= doxygen-docs xml-docs
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index e9e7c3bfa96..89b496f7c24 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2008/10/12 11:15:22 tron Exp $
+$NetBSD: distinfo,v 1.28 2008/11/15 03:59:10 chuck Exp $
SHA1 (dbus-1.2.4.tar.gz) = 913d796b79802b6ee6ca2b0ef59c670f3fd79774
RMD160 (dbus-1.2.4.tar.gz) = 0441eb8b668ed70250e484b02fe6a83c05c9a088
@@ -10,3 +10,4 @@ SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654
SHA1 (patch-ai) = a45bd8d29955e9c14a4d8b3f44b42242d70c1cd8
SHA1 (patch-ak) = 56c0a917e770b8d6ffc37ec7ab8beb631dd8ef72
SHA1 (patch-al) = fad2f4df4537b2a3e21aaef29138060724ba8286
+SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
diff --git a/sysutils/dbus/patches/patch-am b/sysutils/dbus/patches/patch-am
new file mode 100644
index 00000000000..3ba58e51336
--- /dev/null
+++ b/sysutils/dbus/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2008/11/15 03:59:10 chuck Exp $
+
+--- tools/dbus-launch-x11.c.orig 2008-11-14 22:45:04.000000000 -0500
++++ tools/dbus-launch-x11.c 2008-11-14 22:45:44.000000000 -0500
+@@ -143,7 +143,7 @@
+ */
+ for (p = display; *p; ++p)
+ {
+- if (*p == ':')
++ if (*p == ':' || *p == '/')
+ *p = '_';
+ }
+