[pkgsrc/trunk]: pkgsrc/sysutils/dbus PR 49591: Make launchd integration a pac...

[pho <pho%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed1491834b40
branches:  trunk
changeset: 645034:ed1491834b40
user:      pho <pho%pkgsrc.org@localhost>
date:      Wed Jan 21 13:45:18 2015 +0000

description:
PR 49591: Make launchd integration a package option, disabled by default for now.

launchd integration currently requires manual steps as described in MESSAGE.launchd. We may want to make it default once we have a framework for automatic launchd support.

diffstat:

 sysutils/dbus/Makefile     |  18 +++++++++---------
 sysutils/dbus/PLIST        |   3 ++-
 sysutils/dbus/PLIST.Darwin |   2 --
 sysutils/dbus/options.mk   |  17 ++++++++++++++++-
 4 files changed, 27 insertions(+), 13 deletions(-)

diffs (107 lines):

diff -r 1bed971afb71 -r ed1491834b40 sysutils/dbus/Makefile
--- a/sysutils/dbus/Makefile    Wed Jan 21 13:24:21 2015 +0000
+++ b/sysutils/dbus/Makefile    Wed Jan 21 13:45:18 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2015/01/21 05:38:59 pho Exp $
+# $NetBSD: Makefile,v 1.80 2015/01/21 13:45:18 pho Exp $
 
 DISTNAME=      dbus-1.8.14
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  http://dbus.freedesktop.org/releases/dbus/
 
@@ -38,19 +38,19 @@
 CONFIGURE_ARGS_GROUPS= enable disable with without
 
 .if ${OPSYS} == "Darwin"
-MESSAGE_SRC+=          MESSAGE.launchd
-CONFIGURE_ARGS+=       --with-launchd-agent-dir=${PREFIX}/Library/LaunchAgents
-CONFIGURE_ARGS+=       --with-session-socket-dir=/tmp
+# Prevent the configure script from picking up a per-user tmp
+# directory. See the commit message on revision 1.35
+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+=       ansi
 CONFIGURE_ARGS.disable+=       console-owner-file
 CONFIGURE_ARGS.disable+=       ${CONFIGURE_ARGS.docs}
-CONFIGURE_ARGS.enable=         checks static
+CONFIGURE_ARGS.enable+=                checks static
 ###
 ### XXX the spawn test hangs, and some of these tests may be bogus
 ###
@@ -59,7 +59,7 @@
 #TEST_TARGET=                  check
 #.endif
 
-CONFIGURE_ARGS.with=   dbus-user=${DBUS_USER}
+CONFIGURE_ARGS.with+=  dbus-user=${DBUS_USER}
 CONFIGURE_ARGS.with+=  test-socket-dir=${WRKDIR:Q}
 
 PTHREAD_AUTO_VARS=     yes
@@ -71,7 +71,7 @@
                        ${CONFIGURE_ARGS.Linux}
 .endif
 
-PLIST_VARS+=           linux
+PLIST_VARS+=           linux launchd
 
 CONFIGURE_ARGS+=\
        ${CONFIGURE_ARGS_GROUPS:@.g.@                   \
diff -r 1bed971afb71 -r ed1491834b40 sysutils/dbus/PLIST
--- a/sysutils/dbus/PLIST       Wed Jan 21 13:24:21 2015 +0000
+++ b/sysutils/dbus/PLIST       Wed Jan 21 13:45:18 2015 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.17 2014/04/03 09:09:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2015/01/21 13:45:18 pho Exp $
+${PLIST.launchd}Library/LaunchAgents/org.freedesktop.dbus-session.plist
 bin/dbus-cleanup-sockets
 bin/dbus-daemon
 bin/dbus-launch
diff -r 1bed971afb71 -r ed1491834b40 sysutils/dbus/PLIST.Darwin
--- a/sysutils/dbus/PLIST.Darwin        Wed Jan 21 13:24:21 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2015/01/20 23:45:35 wiz Exp $
-Library/LaunchAgents/org.freedesktop.dbus-session.plist
diff -r 1bed971afb71 -r ed1491834b40 sysutils/dbus/options.mk
--- a/sysutils/dbus/options.mk  Wed Jan 21 13:24:21 2015 +0000
+++ b/sysutils/dbus/options.mk  Wed Jan 21 13:45:18 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2012/09/02 13:02:13 shattered Exp $
+# $NetBSD: options.mk,v 1.8 2015/01/21 13:45:18 pho Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dbus
 PKG_SUPPORTED_OPTIONS+=        debug x11
@@ -13,6 +13,12 @@
 PKG_SUGGESTED_OPTIONS+=        kqueue
 .endif
 
+.if ${OPSYS} == "Darwin"
+# We may want to make it SUGGESTED once we have a framework for
+# launchd support. See PR/49591.
+PKG_SUPPORTED_OPTIONS+=        launchd
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -35,3 +41,12 @@
 .else
 CONFIGURE_ARGS.without=        x
 .endif
+
+.if !empty(PKG_OPTIONS:Mlaunchd)
+MESSAGE_SRC+=                  MESSAGE.launchd
+PLIST.launchd=                 yes
+CONFIGURE_ARGS.enable+=                launchd
+CONFIGURE_ARGS.with+=          launchd-agent-dir=${PREFIX}/Library/LaunchAgents
+.else
+CONFIGURE_ARGS.disable+=       launchd
+.endif