diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2012-09-08 11:05:41 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2012-09-08 11:05:41 +0000 |
| commit | 60b6ad44cab2e95ea5198b2faa1a86e8f0cd15a1 (patch) | |
| tree | 9902dd988ad967d8fa74fbae588efc18c761a1a1 /devel/dbus | |
| parent | Correct the video.h header so c++ in c++11 mode doesnt break. (diff) | |
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]
Notes
Notes:
svn path=/head/; revision=303893
Diffstat (limited to 'devel/dbus')
| -rw-r--r-- | devel/dbus/Makefile | 2 | ||||
| -rw-r--r-- | devel/dbus/files/patch-dbus_dbus-protocol.h | 11 | ||||
| -rw-r--r-- | devel/dbus/pkg-deinstall | 15 | ||||
| -rw-r--r-- | devel/dbus/pkg-plist | 5 |
4 files changed, 27 insertions, 6 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index d99f82a70170..ec21ae063247 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -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/ diff --git a/devel/dbus/files/patch-dbus_dbus-protocol.h b/devel/dbus/files/patch-dbus_dbus-protocol.h new file mode 100644 index 000000000000..524a2a57a506 --- /dev/null +++ b/devel/dbus/files/patch-dbus_dbus-protocol.h @@ -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" + + /** @} */ + diff --git a/devel/dbus/pkg-deinstall b/devel/dbus/pkg-deinstall new file mode 100644 index 000000000000..8d683e1e46e9 --- /dev/null +++ b/devel/dbus/pkg-deinstall @@ -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 diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist index 850be666b769..36b2791ff443 100644 --- a/devel/dbus/pkg-plist +++ b/devel/dbus/pkg-plist @@ -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 |