From ccb477eab912b078a4385ae36f6c2ed1fbacb4b9 Mon Sep 17 00:00:00 2001 From: richard Date: Sun, 5 Jul 2015 15:21:50 +0000 Subject: Build manpages and xml docs, adding introspect files needed in other packages in order to be able to use 'xsltproc --nonet' (e.g. empathy, upower, ...) Update smf files to better deal with creating /var/run/dbus structures on SunOS update PKGREVISION --- sysutils/dbus/Makefile | 12 +++++++++--- sysutils/dbus/PLIST | 22 +++++++++++++++++++++- sysutils/dbus/files/smf/dbus.sh | 11 ++++++++--- sysutils/dbus/files/smf/manifest.xml | 2 +- 4 files changed, 39 insertions(+), 8 deletions(-) (limited to 'sysutils') diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile index c5e62898bbd..b303e598b30 100644 --- a/sysutils/dbus/Makefile +++ b/sysutils/dbus/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.83 2015/05/14 17:21:06 wiz Exp $ +# $NetBSD: Makefile,v 1.84 2015/07/05 15:21:50 richard Exp $ DISTNAME= dbus-1.8.18 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ @@ -42,12 +43,11 @@ CONFIGURE_ARGS.with+= session-socket-dir=/tmp .endif CONFIGURE_ARGS.Linux= abstract-sockets selinux -CONFIGURE_ARGS.docs= doxygen-docs xml-docs CONFIGURE_ARGS.without+= init-scripts CONFIGURE_ARGS.disable+= ansi CONFIGURE_ARGS.disable+= console-owner-file -CONFIGURE_ARGS.disable+= ${CONFIGURE_ARGS.docs} +CONFIGURE_ARGS.disable+= doxygen-docs CONFIGURE_ARGS.enable+= checks static ### ### XXX the spawn test hangs, and some of these tests may be bogus @@ -111,6 +111,12 @@ BUILDLINK_TRANSFORM+= rm:-lrt .include "options.mk" +BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto + +post-install: + ${INSTALL_DATA} ${WRKSRC}/doc/introspect.* \ + ${DESTDIR}${PREFIX}/share/doc/dbus/ + .include "../../mk/pthread.buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/sysutils/dbus/PLIST b/sysutils/dbus/PLIST index 726cfa018c4..7f277e1aa7e 100644 --- a/sysutils/dbus/PLIST +++ b/sysutils/dbus/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2015/01/21 13:45:18 pho Exp $ +@comment $NetBSD: PLIST,v 1.19 2015/07/05 15:21:50 richard Exp $ ${PLIST.launchd}Library/LaunchAgents/org.freedesktop.dbus-session.plist bin/dbus-cleanup-sockets bin/dbus-daemon @@ -28,8 +28,28 @@ lib/dbus-1.0/include/dbus/dbus-arch-deps.h lib/libdbus-1.la lib/pkgconfig/dbus-1.pc libexec/dbus-daemon-launch-helper +man/man1/dbus-cleanup-sockets.1 +man/man1/dbus-daemon.1 +man/man1/dbus-launch.1 +man/man1/dbus-monitor.1 +man/man1/dbus-run-session.1 +man/man1/dbus-send.1 +man/man1/dbus-uuidgen.1 +share/doc/dbus/dbus-cleanup-sockets.1.html +share/doc/dbus/dbus-daemon.1.html +share/doc/dbus/dbus-faq.html +share/doc/dbus/dbus-launch.1.html +share/doc/dbus/dbus-monitor.1.html +share/doc/dbus/dbus-run-session.1.html +share/doc/dbus/dbus-send.1.html +share/doc/dbus/dbus-specification.html +share/doc/dbus/dbus-test-plan.html +share/doc/dbus/dbus-tutorial.html +share/doc/dbus/dbus-uuidgen.1.html share/doc/dbus/diagram.png share/doc/dbus/diagram.svg +share/doc/dbus/introspect.dtd +share/doc/dbus/introspect.xsl share/doc/dbus/system-activation.txt share/examples/dbus/session.conf share/examples/dbus/system.conf diff --git a/sysutils/dbus/files/smf/dbus.sh b/sysutils/dbus/files/smf/dbus.sh index 60435df4d4c..7a985381960 100755 --- a/sysutils/dbus/files/smf/dbus.sh +++ b/sysutils/dbus/files/smf/dbus.sh @@ -13,11 +13,16 @@ fi if [ ! -f @VARBASE@/db/dbus/machine-id ]; then @PREFIX@/bin/dbus-uuidgen --ensure fi - +pidfile="@VARBASE@/run/dbus/pid" case "$1" in 'start') - if [ -f @VARBASE@/run/dbus/pid ]; then - rm -f @VARBASE@/run/dbus/pid + dir="@VARBASE@/run/dbus" + if ! [ -d $dir ]; then + @MKDIR@ $dir + @CHMOD@ 0755 $dir + @CHOWN@ @DBUS_USER@:@DBUS_GROUP@ $dir + elif [ -f $pidfile ]; then + rm -f $pidfile fi @PREFIX@/bin/dbus-daemon --system err=$? diff --git a/sysutils/dbus/files/smf/manifest.xml b/sysutils/dbus/files/smf/manifest.xml index 6ef87bff577..dc026b0673c 100644 --- a/sysutils/dbus/files/smf/manifest.xml +++ b/sysutils/dbus/files/smf/manifest.xml @@ -19,7 +19,7 @@ exec='@PREFIX@/@SMF_METHOD_FILE.dbus@ start' timeout_seconds='30'> - +