Index: head/devel/dbus/Makefile
===================================================================
--- head/devel/dbus/Makefile	(revision 210595)
+++ head/devel/dbus/Makefile	(revision 210596)
@@ -1,65 +1,67 @@
 # New ports collection makefile for:   D-BUS
 # Date Created:			22 June 2004
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	dbus
 PORTVERSION?=	1.1.20
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A message bus system for inter-application communication
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_GNOME?=	gnomehack gnometarget libxml2 ltverhack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	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/system_bus_socket \
 		--with-session-socket-dir=/var/tmp \
 		--disable-doxygen-docs \
 		--disable-xml-docs
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .if !defined(DBUS_SLAVE)
 USE_RC_SUBR=	dbus
 USE_GNOME_SUBR=	yes
 
 PLIST_SUB=	VERSION="1.0"
 
 MAN1=		dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
 		dbus-monitor.1 dbus-send.1 dbus-uuidgen.1
 
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
+.else
+CONFIGURE_ARGS+=--without-x
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/dbus/dbus-sysdeps-unix.c
 	@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
 		${WRKSRC}/dbus/Makefile.in \
 		${WRKSRC}/tools/Makefile.in
 
 .if !defined(DBUS_SLAVE)
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	${MKDIR} ${PREFIX}/share/dbus-1/interfaces
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/devel/dbus/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.68
\ No newline at end of property
+1.69
\ No newline at end of property
Index: head/devel/dbus/files/patch-tools_dbus-launch.c
===================================================================
--- head/devel/dbus/files/patch-tools_dbus-launch.c	(nonexistent)
+++ head/devel/dbus/files/patch-tools_dbus-launch.c	(revision 210596)
@@ -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 ();

Property changes on: head/devel/dbus/files/patch-tools_dbus-launch.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property