summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2012-08-16 22:28:17 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2012-08-16 22:28:17 +0800
commit8c70124424f4d5583e958414ebfcab65dedc6b0b (patch)
treecbd86ac89d4ebc6b0a6fc2310e4af2e24811cc26
parentda3fe2576da4996791c0e613f2b7fdd1c9321c13 (diff)
downloadmarcuscom-ports-8c70124424f4d5583e958414ebfcab65dedc6b0b.tar
marcuscom-ports-8c70124424f4d5583e958414ebfcab65dedc6b0b.tar.gz
marcuscom-ports-8c70124424f4d5583e958414ebfcab65dedc6b0b.tar.bz2
marcuscom-ports-8c70124424f4d5583e958414ebfcab65dedc6b0b.tar.lz
marcuscom-ports-8c70124424f4d5583e958414ebfcab65dedc6b0b.tar.xz
marcuscom-ports-8c70124424f4d5583e958414ebfcab65dedc6b0b.tar.zst
marcuscom-ports-8c70124424f4d5583e958414ebfcab65dedc6b0b.zip
Update to 1.6.4.
Don't remove dbus files from /var, this will kill the running daemon. Add a pkg-deinstall to point people at which files to remove if they want. Upstream also fixed a c++11 error in a header [1] Reported by: rakuco [1] git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17036 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--devel/dbus/Makefile4
-rw-r--r--devel/dbus/distinfo4
-rw-r--r--devel/dbus/pkg-deinstall15
-rw-r--r--devel/dbus/pkg-plist5
4 files changed, 19 insertions, 9 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 3f7716101..e472b2780 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/dbus/Makefile,v 1.54 2012/05/16 18:19:33 kwm Exp $
+# $MCom: ports/devel/dbus/Makefile,v 1.55 2012/06/17 12:08:06 kwm Exp $
#
PORTNAME= dbus
-PORTVERSION= 1.6.0
+PORTVERSION= 1.6.4
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 9150531c0..9cc0121f6 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dbus-1.6.0.tar.gz) = f0dda7e5f1c4a5bac4c690c602fbd7dce67907b967fa6986466e022c31e055ee
-SIZE (dbus-1.6.0.tar.gz) = 1925858
+SHA256 (dbus-1.6.4.tar.gz) = 5fba6b7a415d761a843fb8e0aee72db61cf13057a9ef8cdc795e5d369dc74cf1
+SIZE (dbus-1.6.4.tar.gz) = 1927446
diff --git a/devel/dbus/pkg-deinstall b/devel/dbus/pkg-deinstall
new file mode 100644
index 000000000..247b885bb
--- /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 manualy:"
+ echo ""
+ echo "/var/run/dbus /var/db/dbus"
+ echo ""
+ ;;
+esac
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index bb5bcd0eb..0b806979b 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -46,8 +46,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