aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormezz <mezz@FreeBSD.org>2008-04-06 00:45:06 +0800
committermezz <mezz@FreeBSD.org>2008-04-06 00:45:06 +0800
commit385989dfe411fd0639e9d9c53ccb711b717395f4 (patch)
treef2133206f816f691815e2027b77d344fc3ba4ed5
parent2fb99fe5bb8b23fc1806ecca55a525154d6a28e8 (diff)
downloadfreebsd-ports-gnome-385989dfe411fd0639e9d9c53ccb711b717395f4.tar.gz
freebsd-ports-gnome-385989dfe411fd0639e9d9c53ccb711b717395f4.tar.zst
freebsd-ports-gnome-385989dfe411fd0639e9d9c53ccb711b717395f4.zip
-Fix the build with WITHOUT_X11. [1]
-Make WITHOUT_X11 actually works by add --without-x11. Submitted by: Jonathan Hogg <jonathan@significant-whitespace.com> [1]
-rw-r--r--devel/dbus/Makefile2
-rw-r--r--devel/dbus/files/patch-tools_dbus-launch.c12
2 files changed, 14 insertions, 0 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 92de3079975b..1cda3592a78c 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -42,6 +42,8 @@ MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
.if !defined(WITHOUT_X11)
USE_XLIB= yes
+.else
+CONFIGURE_ARGS+=--without-x
.endif
.endif
diff --git a/devel/dbus/files/patch-tools_dbus-launch.c b/devel/dbus/files/patch-tools_dbus-launch.c
new file mode 100644
index 000000000000..1fdf886ad042
--- /dev/null
+++ b/devel/dbus/files/patch-tools_dbus-launch.c
@@ -0,0 +1,12 @@
+--- tools/dbus-launch.c.orig 2008-04-05 11:34:21.000000000 -0500
++++ tools/dbus-launch.c 2008-04-05 11:36:12.000000000 -0500
+@@ -966,7 +966,9 @@
+ char write_pid_fd_as_string[MAX_FD_LEN];
+ char write_address_fd_as_string[MAX_FD_LEN];
+
++#ifdef DBUS_BUILD_X11
+ xdisplay = NULL;
++#endif
+
+ if (close_stderr)
+ do_close_stderr ();