Update to 1.4.14.

Remove stale DBUS_SLAVE cruf.
Break out CPPFLAGS from CONFIGURE_ENV.
Add additional x11 depends [1]
Specify full path to dbus-uuidgen. So it can be run on new installs, before ${LOCALBASE}/bin is added to PATH. [2]

Submitted by:	John Prather <john.c.prather@gmail.com> [1]
		Michal Varga <varga.michal@gmail.com> [2]

5 files changed, 25 insertions, 37 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index aad59ed1530c..5f9fc4536f32 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/dbus/Makefile,v 1.44 2010/09/28 15:55:46 kwm Exp $
+#   $MCom: ports/devel/dbus/Makefile,v 1.51 2011/08/30 08:13:48 kwm Exp $
 #
 
 PORTNAME=	dbus
-PORTVERSION?=	1.4.6
-PORTREVISION?=	0
+PORTVERSION=	1.4.14
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -17,7 +17,7 @@ COMMENT=	A message bus system for inter-application communication
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_GNOME?=	gnomehack libxml2 ltverhack
+USE_GNOME=	gnomehack libxml2 ltverhack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
@@ -28,11 +28,10 @@ CONFIGURE_ARGS=--localstatedir=/var \
 		--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
 
@@ -45,13 +44,10 @@ 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_XORG=	x11
+USE_XORG=	ice sm x11
 .else
 CONFIGURE_ARGS+=--without-x
 .endif
-.endif
-
-.include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
@@ -59,16 +55,15 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
 		${WRKSRC}/dbus/Makefile.in \
 		${WRKSRC}/tools/Makefile.in
+	@${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ s|test||g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|THREAD_LIBS -lrt|THREAD_LIBS|g ; \
 		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>
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 4740679b7bb8..462b88bdfe21 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -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
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
index 849e5513cdc2..702a6e1f6b31 100644
--- a/devel/dbus/files/dbus.in
+++ b/devel/dbus/files/dbus.in
@@ -31,7 +31,7 @@ dbus_prestart()
         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)
diff --git a/devel/dbus/files/patch-bus_Makefile.in b/devel/dbus/files/patch-bus_Makefile.in
deleted file mode 100644
index b55c5dc79f22..000000000000
--- a/devel/dbus/files/patch-bus_Makefile.in
+++ /dev/null
@@ -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			\
diff --git a/devel/dbus/files/patch-doc_Makefile.in b/devel/dbus/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..50f0039300a3
--- /dev/null
+++ b/devel/dbus/files/patch-doc_Makefile.in
@@ -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
+