Index: devel/dbus/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/dbus/Makefile,v
retrieving revision 1.84
diff -a -u -r1.84 Makefile
--- devel/dbus/Makefile	4 Mar 2011 17:29:27 -0000	1.84
+++ devel/dbus/Makefile	14 Aug 2011 09:43:01 -0000
@@ -2,12 +2,12 @@
 # Date Created:			22 June 2004
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/devel/dbus/Makefile,v 1.84 2011/03/04 17:29:27 kwm Exp $
-#   $MCom: ports/devel/dbus/Makefile,v 1.44 2010/09/28 15:55:46 kwm Exp $
+# $FreeBSD$
+#   $MCom: ports/devel/dbus/Makefile,v 1.49 2011/08/14 09:36:49 kwm Exp $
 #
 
 PORTNAME=	dbus
-PORTVERSION?=	1.4.6
+PORTVERSION?=	1.4.14
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
@@ -28,11 +28,10 @@
 		--with-session-socket-dir=/var/tmp \
 		--disable-doxygen-docs \
 		--disable-xml-docs
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-.if !defined(DBUS_SLAVE)
 USE_RC_SUBR=	dbus
 USE_GNOME_SUBR=	yes
 
@@ -49,9 +48,6 @@
 .else
 CONFIGURE_ARGS+=--without-x
 .endif
-.endif
-
-.include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
@@ -63,12 +59,10 @@
 		s|dummy man2html|dummy man2html_disable|g' \
 			${WRKSRC}/configure
 
-.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>
+.include <bsd.port.mk>
Index: devel/dbus/distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/dbus/distinfo,v
retrieving revision 1.34
diff -a -u -r1.34 distinfo
--- devel/dbus/distinfo	4 Mar 2011 17:29:27 -0000	1.34
+++ devel/dbus/distinfo	14 Aug 2011 09:43:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (dbus-1.4.6.tar.gz) = 753e1e64df2de518ec93bdee9a813a85b3c147a363615412818c3c095cb8a567
-SIZE (dbus-1.4.6.tar.gz) = 1835214
+SHA256 (dbus-1.4.14.tar.gz) = 47f27efc29aa9d1cc64b74e374204084d6fd53191e70dd584b604181059e5877
+SIZE (dbus-1.4.14.tar.gz) = 1880298
Index: devel/dbus/files/dbus.in
===================================================================
RCS file: /home/pcvs/ports/devel/dbus/files/dbus.in,v
retrieving revision 1.17
diff -a -u -r1.17 dbus.in
--- devel/dbus/files/dbus.in	22 Oct 2010 22:32:20 -0000	1.17
+++ devel/dbus/files/dbus.in	14 Aug 2011 09:43:01 -0000
@@ -31,7 +31,7 @@
         mkdir -p /var/db/dbus
     fi
     if [ ! -f /var/db/dbus/machine-id ]; then
-        dbus-uuidgen > /var/db/dbus/machine-id
+        %%PREFIX%%/bin/dbus-uuidgen > /var/db/dbus/machine-id
     fi
 
     mkdir -p $(dirname $pidfile)
Index: devel/dbus/files/patch-bus_Makefile.in
===================================================================
RCS file: devel/dbus/files/patch-bus_Makefile.in
diff -N devel/dbus/files/patch-bus_Makefile.in
--- devel/dbus/files/patch-bus_Makefile.in	24 Mar 2008 03:49:35 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- bus/Makefile.in.orig	2008-01-22 14:45:58.000000000 -0500
-+++ bus/Makefile.in	2008-01-22 15:24:26.000000000 -0500
-@@ -412,7 +412,7 @@ target_vendor = @target_vendor@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- configdir = $(sysconfdir)/dbus-1
--INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@		\
-+INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS)				\
- 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"	\
- 	-DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION
- 
-@@ -476,7 +476,7 @@ dbus_daemon_LDADD = \
- 	$(DBUS_BUS_LIBS)				\
- 	$(top_builddir)/dbus/libdbus-convenience.la
- 
--dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
-+dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- LAUNCH_HELPER_SOURCES = \
- 	$(XML_SOURCES)				\
- 	config-parser-common.c			\
Index: devel/dbus/files/patch-doc_Makefile.in
===================================================================
RCS file: devel/dbus/files/patch-doc_Makefile.in
diff -N devel/dbus/files/patch-doc_Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ devel/dbus/files/patch-doc_Makefile.in	14 Aug 2011 09:43:01 -0000
@@ -0,0 +1,13 @@
+--- doc/Makefile.in.orig	2011-08-14 11:28:23.000000000 +0200
++++ doc/Makefile.in	2011-08-14 11:28:47.000000000 +0200
+@@ -604,8 +604,8 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-dist_docDATA \
+-	install-dist_htmlDATA install-htmlDATA install-man
++install-data-am: install-data-local \
++	install-man
+ 
+ install-dvi: install-dvi-am
+