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

- better COMMENT

Browse Source 
- fix locations in dbus-daemon.1 (spotted by ajacoutot)
This commit is contained in:
jasper 2008-04-20 21:00:19 +00:00
parent 8619467cf2
commit 34f422b70d
2 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/dbus/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2008/03/23 12:50:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.15 2008/04/20 21:00:19 jasper Exp $
COMMENT= message system
COMMENT= message bus system
DISTNAME= dbus-1.0.2
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
SHARED_LIBS += dbus-1 6.0 # .5.0
CATEGORIES= x11
@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP= Yes
WANTLIB= ICE X11 Xau Xdmcp SM c expat pthread
MASTER_SITES= ${HOMEPAGE}releases/dbus/
MASTER_SITES= ${HOMEPAGE}/releases/dbus/
SEPARATE_BUILD= simple
@ -42,6 +42,6 @@ FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/examples/dbus
pre-install:
@perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \
${WRKSRC}/tools/dbus-uuidgen.1
${WRKSRC}/tools/dbus-uuidgen.1 ${WRKSRC}/bus/dbus-daemon.1
.include <bsd.port.mk>

44
x11/dbus/patches/patch-bus_dbus-daemon_1 Normal file
View File

@ -0,0 +1,44 @@
$OpenBSD: patch-bus_dbus-daemon_1,v 1.1 2008/04/20 21:00:19 jasper Exp $
--- bus/dbus-daemon.1.orig Sun Apr 20 22:54:14 2008
+++ bus/dbus-daemon.1 Sun Apr 20 22:54:17 2008
@@ -30,9 +30,9 @@ a different configuration file.
.PP
The \-\-session option is equivalent to
-"\-\-config-file=/usr/local/etc/dbus-1/session.conf" and the \-\-system
+"\-\-config-file=!!SYSCONFDIR!!/dbus-1/session.conf" and the \-\-system
option is equivalent to
-"\-\-config-file=/usr/local/etc/dbus-1/system.conf". By creating
+"\-\-config-file=!!SYSCONFDIR!!/dbus-1/system.conf". By creating
additional configuration files and using the \-\-config-file option,
additional special-purpose message bus daemons could be created.
@@ -106,8 +106,8 @@ document is documentation, not specification.
.PP
The standard systemwide and per-session message bus setups are
-configured in the files "/usr/local/etc/dbus-1/system.conf" and
-"/usr/local/etc/dbus-1/session.conf". These files normally
+configured in the files "!!SYSCONFDIR!!/dbus-1/system.conf" and
+"!!SYSCONFDIR!!/dbus-1/session.conf". These files normally
<include> a system-local.conf or session-local.conf; you can put local
overrides in those files to avoid modifying the primary configuration
files.
@@ -169,7 +169,7 @@ Only files ending in ".conf" are included.
This is intended to allow extension of the system bus by particular
packages. For example, if CUPS wants to be able to send out
notification of printer queue changes, it could install a file to
-/usr/local/etc/dbus-1/system.d that allowed all apps to receive
+!!SYSCONFDIR!!/dbus-1/system.d that allowed all apps to receive
this message and allowed the printer daemon user to send it.
.TP
@@ -264,7 +264,7 @@ otherwise try your favorite search engine.
.PP
The <standard_session_servicedirs/> option is only relevant to the
per-user-session bus daemon defined in
-/usr/local/etc/dbus-1/session.conf. Putting it in any other
+!!SYSCONFDIR!!/dbus-1/session.conf. Putting it in any other
configuration file would probably be nonsense.
.TP