Update dbus to 1.12.12.

Remove machine-id copy code, it done it job.
nivit · Feb 25, 2019 · 6186960 · 6186960
1 parent fc28ca1
commit 6186960
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dbus
-PORTVERSION=	1.10.16
-PORTREVISION=	1
+PORTVERSION=	1.12.12
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -16,7 +15,7 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 PORTSCOUT=	limitw:1,even
 
-USES=		cpe gmake libtool localbase pathfix python:build shebangfix
+USES=		cpe gmake libtool localbase pkgconfig python:build shebangfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-test-socket-dir=${WRKDIR} \
@@ -57,5 +56,9 @@ post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	${RM} -r ${STAGEDIR}${DOCSDIR}
+.for file in session.conf system.conf
+	@cd ${STAGEDIR}${ETCDIR}-1/ && \
+		${MV} ${file} ${file}.sample
+.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491087035
-SHA256 (dbus-1.10.16.tar.gz) = a7b0ba6ea3e8d0e08afec5e3030d0245614268276620c536726f8fa6e5c43388
-SIZE (dbus-1.10.16.tar.gz) = 1986063
+TIMESTAMP = 1551020450
+SHA256 (dbus-1.12.12.tar.gz) = 9546f226011a1e5d9d77245fe5549ef25af4694053189d624d0d6ac127ecf5f8
+SIZE (dbus-1.12.12.tar.gz) = 2077301
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
@@ -7,8 +7,8 @@ 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
+@sample %%ETCDIR%%-1/session.conf.sample
+@sample %%ETCDIR%%-1/system.conf.sample
 include/dbus-%%VERSION%%/dbus/dbus-address.h
 include/dbus-%%VERSION%%/dbus/dbus-bus.h
 include/dbus-%%VERSION%%/dbus/dbus-connection.h
@@ -26,11 +26,13 @@ include/dbus-%%VERSION%%/dbus/dbus-syntax.h
 include/dbus-%%VERSION%%/dbus/dbus-threads.h
 include/dbus-%%VERSION%%/dbus/dbus-types.h
 include/dbus-%%VERSION%%/dbus/dbus.h
+lib/cmake/DBus1/DBus1Config.cmake
+lib/cmake/DBus1/DBus1ConfigVersion.cmake
 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.14.10
+lib/libdbus-1.so.3.19.9
 libdata/pkgconfig/dbus-1.pc
 @(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper
 %%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz
@@ -42,17 +44,17 @@ libdata/pkgconfig/dbus-1.pc
 %%MANPAGES%%man/man1/dbus-test-tool.1.gz
 %%MANPAGES%%man/man1/dbus-update-activation-environment.1.gz
 %%MANPAGES%%man/man1/dbus-uuidgen.1.gz
-share/dbus-1/session.conf
-share/dbus-1/system.conf
+%%DATADIR%%-1/session.conf
+%%DATADIR%%-1/system.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/GetAllMatchRules.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-session-disable-stats.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-enable-stats.conf
+share/xml/dbus-1/busconfig.dtd
+share/xml/dbus-1/introspect.dtd
 @dir share/dbus-1/system-services
 @dir share/dbus-1/services
 @dir share/dbus-1/session.d
 @dir share/dbus-1/system.d
 @dir /var/lib/dbus
 @dir /var/lib
 @dir /var/run/dbus
-@comment The following line may be removed after 2018-01-01
-@postexec [ -f /var/lib/dbus/machine-id -o ! -f /var/db/dbus/machine-id ] || cp -p /var/db/dbus/machine-id /var/lib/dbus/