CVS commit: pkgsrc/sysutils/dbus

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Mar 20 15:19:21 UTC 2022

Modified Files:
        pkgsrc/sysutils/dbus: Makefile options.mk

Log Message:
dbus: build fix for x11 option


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 pkgsrc/sysutils/dbus/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/dbus/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/dbus/Makefile
diff -u pkgsrc/sysutils/dbus/Makefile:1.130 pkgsrc/sysutils/dbus/Makefile:1.131
--- pkgsrc/sysutils/dbus/Makefile:1.130 Sun Mar 20 13:37:13 2022
+++ pkgsrc/sysutils/dbus/Makefile       Sun Mar 20 15:19:21 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.130 2022/03/20 13:37:13 wiz Exp $
+# $NetBSD: Makefile,v 1.131 2022/03/20 15:19:21 wiz Exp $
 
 DISTNAME=      dbus-1.14.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  https://dbus.freedesktop.org/releases/dbus/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/sysutils/dbus/options.mk
diff -u pkgsrc/sysutils/dbus/options.mk:1.14 pkgsrc/sysutils/dbus/options.mk:1.15
--- pkgsrc/sysutils/dbus/options.mk:1.14        Sun Mar 20 13:37:13 2022
+++ pkgsrc/sysutils/dbus/options.mk     Sun Mar 20 15:19:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2022/03/20 13:37:13 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2022/03/20 15:19:21 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dbus
 PKG_SUPPORTED_OPTIONS+=        debug x11
@@ -35,9 +35,9 @@ CONFIGURE_ARGS+=      --disable-kqueue
 .endif
 
 .if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+=       --with-x
+CONFIGURE_ARGS+=       --with-x=auto
+CONFIGURE_ARGS+=       --enable-x11-autolaunch
 .  include "../../x11/libX11/buildlink3.mk"
-CPPFLAGS+=             -DDBUS_BUILD_X11
 BUILDLINK_DEPMETHOD.libXt=     build
 .  include "../../x11/libXt/buildlink3.mk"
 .else