Date: Sat, 8 Sep 2012 11:05:42 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r303893 - in head/devel/dbus: . files Message-ID: <201209081105.q88B5gne074770@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sat Sep 8 11:05:41 2012 New Revision: 303893 URL: http://svn.freebsd.org/changeset/ports/303893 Log: Correct the dbus-protocol.h so c++ in c++11 mode doesn't break. While here don't remove the dbus pid file, dbus pipe and machine-id. [1] Now dbus won't die on updates anymore. Submitted by: rakuco@, zeising@ Obtained from: gnome dev repo [1] Added: head/devel/dbus/files/patch-dbus_dbus-protocol.h (contents, props changed) head/devel/dbus/pkg-deinstall (contents, props changed) Modified: head/devel/dbus/Makefile head/devel/dbus/pkg-plist Modified: head/devel/dbus/Makefile ============================================================================== --- head/devel/dbus/Makefile Sat Sep 8 11:02:19 2012 (r303892) +++ head/devel/dbus/Makefile Sat Sep 8 11:05:41 2012 (r303893) @@ -8,7 +8,7 @@ PORTNAME= dbus PORTVERSION= 1.4.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ Added: head/devel/dbus/files/patch-dbus_dbus-protocol.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/dbus/files/patch-dbus_dbus-protocol.h Sat Sep 8 11:05:41 2012 (r303893) @@ -0,0 +1,11 @@ +--- dbus/dbus-protocol.h.orig 2012-09-08 10:15:17.000000000 +0200 ++++ dbus/dbus-protocol.h 2012-09-08 10:16:12.000000000 +0200 +@@ -456,7 +456,7 @@ + /** XML system identifier of the introspection format version 1.0 */ + #define DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" + /** XML document type declaration of the introspection format version 1.0 */ +-#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \""DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"\"\n\""DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER"\">\n" ++#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \"" DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "\"\n\"" DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "\">\n" + + /** @} */ + Added: head/devel/dbus/pkg-deinstall ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/dbus/pkg-deinstall Sat Sep 8 11:05:41 2012 (r303893) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +case $2 in +DEINSTALL) + echo "" + echo "To really remove the dbus port, please remove the following" + echo "directories and the content manualy:" + echo "" + echo "/var/run/dbus /var/db/dbus" + echo "" + ;; +esac Modified: head/devel/dbus/pkg-plist ============================================================================== --- head/devel/dbus/pkg-plist Sat Sep 8 11:02:19 2012 (r303892) +++ head/devel/dbus/pkg-plist Sat Sep 8 11:05:41 2012 (r303893) @@ -45,8 +45,3 @@ libexec/dbus-daemon-launch-helper @dirrm etc/dbus-1/system.d @dirrm etc/dbus-1/session.d @dirrm etc/dbus-1 -@unexec rm -f /var/run/dbus/dbus.pid -@unexec rm -f /var/run/dbus/dbus.pipe -@unexec rmdir /var/run/dbus 2>/dev/null || true -@unexec rm -f /var/db/dbus/machine-id -@unexec rmdir /var/db/dbus 2>/dev/null || true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209081105.q88B5gne074770>