Attachment 176937 Details for Bug 214454 – update to 1.10.12

[patch] update to 1.10.12

dbus.diff (text/plain), 5.90 KB, created by Ruslan Makhmatkhanov on 2016-11-12 20:02:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ruslan Makhmatkhanov

Created: 2016-11-12 20:02:12 UTC

Size: 5.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 425984)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	dbus
>-PORTVERSION=	1.8.20
>+PORTVERSION=	1.10.12
> CATEGORIES=	devel gnome
> MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
> 
>@@ -9,22 +9,25 @@
> 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 @@
> 		${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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 425984)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-bus__session.conf.in
>===================================================================
>--- files/patch-bus__session.conf.in	(revision 425984)
>+++ files/patch-bus__session.conf.in	(nonexistent)
>@@ -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 @@
>-   
>-   <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>
>- 
>
>Property changes on: files/patch-bus__session.conf.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-bus__system.conf.in
>===================================================================
>--- files/patch-bus__system.conf.in	(revision 425984)
>+++ files/patch-bus__system.conf.in	(nonexistent)
>@@ -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 @@
>-   
>-   <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>
>- 
>
>Property changes on: files/patch-bus__system.conf.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 425984)
>+++ pkg-plist	(working copy)
>@@ -4,9 +4,13 @@
> 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,9 +32,12 @@
> 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
>@@ -37,11 +44,13 @@
> %%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

Actions: View | Diff

Attachments on bug 214454: 176937