cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak rc script and don't try to install under /var/... we already sample

Browse Source 
it.
This commit is contained in:
ajacoutot 2011-10-29 14:37:42 +00:00
parent 12fbdc6901
commit 3c00c20c0e
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/dbus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.72 2011/09/29 06:57:36 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.73 2011/10/29 14:37:42 ajacoutot Exp $
# OpenBSD has support for monotonic clock (CLOCK_MONOTONIC), however we
# currently don't have most of the _POSIX_* defines in unistd.h (e.g.
@ -11,6 +11,7 @@
COMMENT= message bus system
DISTNAME= dbus-1.4.16
REVISION= 0
EPOCH= 0
SHARED_LIBS += dbus-1 9.1 # .8.6

15
x11/dbus/patches/patch-tools_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-tools_Makefile_in,v 1.14 2011/09/29 06:57:36 ajacoutot Exp $
$OpenBSD: patch-tools_Makefile_in,v 1.15 2011/10/29 14:37:42 ajacoutot Exp $
--- tools/Makefile.in.orig Wed Sep 21 16:27:56 2011
+++ tools/Makefile.in Thu Sep 29 08:49:44 2011
+++ tools/Makefile.in Sat Oct 29 16:12:34 2011
@@ -369,7 +369,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ -15,7 +15,16 @@ $OpenBSD: patch-tools_Makefile_in,v 1.14 2011/09/29 06:57:36 ajacoutot Exp $
#create the /var/lib/data directory for dbus-uuidgen
-localstatelibdir = $(localstatedir)/lib/dbus
+#localstatelibdir = $(localstatedir)/lib/dbus
+localstatelibdir = $(localstatedir)/db/dbus
localstatelib_DATA =
all: all-am
@@ -707,7 +707,7 @@ info: info-am
info-am:
-install-data-am: install-localstatelibDATA
+install-data-am:
install-dvi: install-dvi-am

6
x11/dbus/pkg/dbus_daemon.rc
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: dbus_daemon.rc,v 1.8 2011/08/31 15:09:33 ajacoutot Exp $
# $OpenBSD: dbus_daemon.rc,v 1.9 2011/10/29 14:37:43 ajacoutot Exp $
daemon="${TRUEPREFIX}/bin/dbus-daemon"
daemon_flags="--system"
@ -8,10 +8,6 @@ daemon_flags="--system"
. /etc/rc.d/rc.subr
rc_pre() {
# XXX remove after 5.1 is branched
[ -f ${SYSCONFDIR}/dbus-1/machine-id ] && \
mv ${SYSCONFDIR}/dbus-1/machine-id /var/db/dbus/
rm -f /var/run/dbus/pid
install -d -o _dbus -g _dbus /var/run/dbus
}