Re: pkg/50075 (Making dbus actually work on FreeBSD, DragonFly, and probably more)

[David Shao <davshao%gmail.com@localhost>]

The following reply was made to PR pkg/50075; it has been noted by GNATS.

From: David Shao <davshao%gmail.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/50075 (Making dbus actually work on FreeBSD, DragonFly, and
 probably more)
Date: Mon, 7 Sep 2015 16:10:50 -0700

 As requested I am breaking the proposed changes to dbus into separate
 more easy to understand pieces.  The following patch changes the
 CONFIGURE_ARGS format to a more usual one.  There should be no
 functional changes.
 
 I have only verified this builds but have not installed it because
 without further patches dbus won't actually start as a daemon on
 DragonFly or FreeBSD.
 
 diff -Nurb dbus.orig/Makefile dbus.configure/Makefile
 --- dbus.orig/Makefile    2015-08-30 08:08:00.000000000 -0700
 +++ dbus.configure/Makefile    2015-09-07 15:42:01.358482000 -0700
 @@ -37,16 +37,16 @@
  .if ${OPSYS} == "Darwin"
  # 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
 +CONFIGURE_ARGS+=    --with-session-socket-dir=/tmp
  .endif
 
 -CONFIGURE_ARGS.Linux=    abstract-sockets selinux
 +CONFIGURE_ARGS+=    --without-init-scripts
 +CONFIGURE_ARGS+=    --disable-ansi
 +CONFIGURE_ARGS+=    --disable-console-owner-file
 +CONFIGURE_ARGS+=    --disable-doxygen-docs
 +CONFIGURE_ARGS+=    --enable-checks
 +CONFIGURE_ARGS+=    --enable-static
 
 -CONFIGURE_ARGS.without+=    init-scripts
 -CONFIGURE_ARGS.disable+=    ansi
 -CONFIGURE_ARGS.disable+=    console-owner-file
 -CONFIGURE_ARGS.disable+=    doxygen-docs
 -CONFIGURE_ARGS.enable+=        checks static
  ###
  ### XXX the spawn test hangs, and some of these tests may be bogus
  ###
 @@ -55,27 +55,20 @@
  #TEST_TARGET=            check
  #.endif
 
 -CONFIGURE_ARGS.with+=    dbus-user=${DBUS_USER}
 -CONFIGURE_ARGS.with+=    test-socket-dir=${WRKDIR:Q}
 +CONFIGURE_ARGS+=    --with-dbus-user=${DBUS_USER}
 +CONFIGURE_ARGS+=    --with-test-socket-dir=${WRKDIR:Q}
 
  PTHREAD_AUTO_VARS=    yes
 
  .if ${OPSYS} == "Linux"
  PLIST.linux=        yes
  .else
 -CONFIGURE_ARGS.disable+=\
 -            ${CONFIGURE_ARGS.Linux}
 +CONFIGURE_ARGS+=    --disable-abstract-sockets
 +CONFIGURE_ARGS+=    --disable-selinux
  .endif
 
  PLIST_VARS+=        linux launchd
 
 -CONFIGURE_ARGS+=\
 -    ${CONFIGURE_ARGS_GROUPS:@.g.@            \
 -        ${CONFIGURE_ARGS.${.g.}:@.a.@        \
 -            --${.g.}-${.a.}            \
 -        @}                    \
 -    @:M*}
 -
  RCD_SCRIPTS=        dbus
 
  PKG_GROUPS_VARS+=    DBUS_GROUP
 diff -Nurb dbus.orig/options.mk dbus.configure/options.mk
 --- dbus.orig/options.mk    2015-01-21 05:45:18.000000000 -0800
 +++ dbus.configure/options.mk    2015-09-07 15:57:18.857258000 -0700
 @@ -22,31 +22,33 @@
  .include "../../mk/bsd.options.mk"
 
  .if !empty(PKG_OPTIONS:Mdebug)
 -CONFIGURE_ARGS.enable+=    asserts verbose-mode
 +CONFIGURE_ARGS+=    --enable-asserts
 +CONFIGURE_ARGS+=    --enable-verbose-mode
  .else
 -CONFIGURE_ARGS.disable+= asserts verbose-mode
 +CONFIGURE_ARGS+=    --disable-asserts
 +CONFIGURE_ARGS+=    --disable-verbose-mode
  .endif
 
  .if !empty(PKG_OPTIONS:Mkqueue)
 -CONFIGURE_ARGS.enable+=     kqueue
 +CONFIGURE_ARGS+=     --enable-kqueue
  .else
 -CONFIGURE_ARGS.disable+=    kqueue
 +CONFIGURE_ARGS+=    --disable-kqueue
  .endif
 
  .if !empty(PKG_OPTIONS:Mx11)
 -CONFIGURE_ARGS.with+=    x
 +CONFIGURE_ARGS+=    --with-x
  .  include "../../x11/libX11/buildlink3.mk"
  BUILDLINK_DEPMETHOD.libXt=    build
  .  include "../../x11/libXt/buildlink3.mk"
  .else
 -CONFIGURE_ARGS.without=    x
 +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
 +CONFIGURE_ARGS+=        --enable-launchd
 +CONFIGURE_ARGS+=        --with-launchd-agent-dir=${PREFIX}/Library/LaunchAgents
  .else
 -CONFIGURE_ARGS.disable+=    launchd
 +CONFIGURE_ARGS+=        --disable-launchd
  .endif