devel/dbus: update to 1.10.12

- update to 1.10.12
- utilize localbase instead of CFLAGS/LDFLAGS
- remove not applicable patching
- remove couple of patches, that are no more needed: these files in etc/dbus-1
  are now just compatibility stubs. The files were moved to share/dbus-1 in
  new version.

Thanks Antoine Brodin for an exp-run.

PR:		214454
Reviewed by:	kwm
With hat:   gnome

5 files changed, 26 insertions, 37 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 7ae49f128fc8..f01edbe23b15 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -2,29 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	dbus
-PORTVERSION=	1.8.20
+PORTVERSION=	1.10.12
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Message bus system for inter-application communication
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 PORTSCOUT=	limitw:1,even
 
 USE_GNOME=	# empty but we need it for USE_GNOME_SUBR
-USES=		cpe gmake libtool pathfix
+USES=		cpe gmake libtool localbase pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=--localstatedir=/var \
-	        --with-test-socket-dir=${WRKDIR} \
+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=/tmp \
-		--disable-doxygen-docs
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+		--disable-doxygen-docs \
+		--disable-selinux \
+		--disable-apparmor \
+		--disable-systemd
 INSTALL_TARGET=	install-strip
 
 CPE_VENDOR=	d-bus_project
@@ -57,15 +60,11 @@ post-patch:
 		${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
-	@${REINPLACE_CMD} -e 's|install-data-am: install-data-local|install-data-am:|g' \
-		${WRKSRC}/tools/Makefile.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/interfaces
 	@${MKDIR} ${STAGEDIR}/var/run/dbus
 	@${MKDIR} ${STAGEDIR}/var/db/dbus
+	@${RMDIR} ${STAGEDIR}/var/lib/dbus ${STAGEDIR}/var/lib
 
 .include <bsd.port.mk>
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index eb0095153056..efe107cff3bc 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,2 +1,3 @@
-SHA256 (dbus-1.8.20.tar.gz) = 5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a
-SIZE (dbus-1.8.20.tar.gz) = 1871722
+TIMESTAMP = 1477423012
+SHA256 (dbus-1.10.12.tar.gz) = 210a79430b276eafc6406c71705e9140d25b9956d18068df98a70156dc0e475d
+SIZE (dbus-1.10.12.tar.gz) = 1984805
diff --git a/devel/dbus/files/patch-bus__session.conf.in b/devel/dbus/files/patch-bus__session.conf.in
deleted file mode 100644
index 65a834d63907..000000000000
--- a/devel/dbus/files/patch-bus__session.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./bus/session.conf.in.orig	2010-03-23 22:01:27.000000000 +0300
-+++ ./bus/session.conf.in	2010-09-01 19:47:37.427994122 +0400
-@@ -32,6 +32,7 @@
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
-   <include ignore_missing="yes">session-local.conf</include>
-+  <include ignore_missing="yes">session-kde4.conf</include>
- 
-   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
- 
diff --git a/devel/dbus/files/patch-bus__system.conf.in b/devel/dbus/files/patch-bus__system.conf.in
deleted file mode 100644
index 30a18b953c51..000000000000
--- a/devel/dbus/files/patch-bus__system.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./bus/system.conf.in.orig	2009-07-11 02:27:40.000000000 +0400
-+++ ./bus/system.conf.in	2010-09-01 19:47:19.745313755 +0400
-@@ -77,6 +77,7 @@
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
-   <include ignore_missing="yes">system-local.conf</include>
-+  <include ignore_missing="yes">system-kde4.conf</include>
- 
-   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
- 
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index 3c6a0abb52d9..53e40b1cd82d 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -4,9 +4,13 @@ bin/dbus-launch
 bin/dbus-monitor
 bin/dbus-run-session
 bin/dbus-send
+bin/dbus-test-tool
+bin/dbus-update-activation-environment
 bin/dbus-uuidgen
 etc/dbus-1/session.conf
 etc/dbus-1/system.conf
+share/dbus-1/session.conf
+share/dbus-1/system.conf
 include/dbus-%%VERSION%%/dbus/dbus-address.h
 include/dbus-%%VERSION%%/dbus/dbus-bus.h
 include/dbus-%%VERSION%%/dbus/dbus-connection.h
@@ -28,20 +32,25 @@ lib/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h
 lib/libdbus-1.a
 lib/libdbus-1.so
 lib/libdbus-1.so.3
-lib/libdbus-1.so.3.8.13
+lib/libdbus-1.so.3.14.8
 libdata/pkgconfig/dbus-1.pc
 @(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper
+share/doc/dbus/examples/GetAllMatchRules.py
+share/doc/dbus/examples/example-session-disable-stats.conf
+share/doc/dbus/examples/example-system-enable-stats.conf
 %%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz
 %%MANPAGES%%man/man1/dbus-daemon.1.gz
 %%MANPAGES%%man/man1/dbus-launch.1.gz
 %%MANPAGES%%man/man1/dbus-monitor.1.gz
 %%MANPAGES%%man/man1/dbus-run-session.1.gz
 %%MANPAGES%%man/man1/dbus-send.1.gz
+%%MANPAGES%%man/man1/dbus-test-tool.1.gz
+%%MANPAGES%%man/man1/dbus-update-activation-environment.1.gz
 %%MANPAGES%%man/man1/dbus-uuidgen.1.gz
 @dir share/dbus-1/system-services
 @dir share/dbus-1/interfaces
 @dir share/dbus-1/services
-@dir etc/dbus-1/session.d
-@dir etc/dbus-1/system.d
+@dir share/dbus-1/session.d
+@dir share/dbus-1/system.d
 @dir /var/db/dbus
 @dir /var/run/dbus