Sun Mar 20 15:19:21 2022 UTC ()
dbus: build fix for x11 option


(wiz)
diff -r1.130 -r1.131 pkgsrc/sysutils/dbus/Makefile
diff -r1.14 -r1.15 pkgsrc/sysutils/dbus/options.mk
cvs diff -r1.130 -r1.131 pkgsrc/sysutils/dbus/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/Makefile 2022/03/20 13:37:13 1.130
+++ pkgsrc/sysutils/dbus/Makefile 2022/03/20 15:19:21 1.131
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.130 2022/03/20 13:37:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.131 2022/03/20 15:19:21 wiz Exp $
2 2
3DISTNAME= dbus-1.14.0 3DISTNAME= dbus-1.14.0
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= https://dbus.freedesktop.org/releases/dbus/ 6MASTER_SITES= https://dbus.freedesktop.org/releases/dbus/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.freedesktop.org/Software/dbus 10HOMEPAGE= https://www.freedesktop.org/Software/dbus
11COMMENT= Message bus system 11COMMENT= Message bus system
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14CONFLICTS+= dbus-glib<0.71 14CONFLICTS+= dbus-glib<0.71
15CONFLICTS+= py27-dbus<0.71 15CONFLICTS+= py27-dbus<0.71
16 16
17BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto 17BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
cvs diff -r1.14 -r1.15 pkgsrc/sysutils/dbus/options.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/dbus/options.mk 2022/03/20 13:37:13 1.14
+++ pkgsrc/sysutils/dbus/options.mk 2022/03/20 15:19:21 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.14 2022/03/20 13:37:13 wiz Exp $ 1# $NetBSD: options.mk,v 1.15 2022/03/20 15:19:21 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.dbus 3PKG_OPTIONS_VAR= PKG_OPTIONS.dbus
4PKG_SUPPORTED_OPTIONS+= debug x11 4PKG_SUPPORTED_OPTIONS+= debug x11
5PKG_SUGGESTED_OPTIONS= x11 5PKG_SUGGESTED_OPTIONS= x11
6 6
7.if (${OPSYS} == "NetBSD" || \ 7.if (${OPSYS} == "NetBSD" || \
8 ${OPSYS} == "FreeBSD" || \ 8 ${OPSYS} == "FreeBSD" || \
9 ${OPSYS} == "OpenBSD" || \ 9 ${OPSYS} == "OpenBSD" || \
10 ${OPSYS} == "Darwin" || \ 10 ${OPSYS} == "Darwin" || \
11 ${OPSYS} == "DragonFly") 11 ${OPSYS} == "DragonFly")
12PKG_SUPPORTED_OPTIONS+= kqueue 12PKG_SUPPORTED_OPTIONS+= kqueue
13PKG_SUGGESTED_OPTIONS+= kqueue 13PKG_SUGGESTED_OPTIONS+= kqueue
14.endif 14.endif
@@ -25,29 +25,29 @@ CONFIGURE_ARGS+= --enable-asserts @@ -25,29 +25,29 @@ CONFIGURE_ARGS+= --enable-asserts
25CONFIGURE_ARGS+= --enable-verbose-mode 25CONFIGURE_ARGS+= --enable-verbose-mode
26.else 26.else
27CONFIGURE_ARGS+= --disable-asserts 27CONFIGURE_ARGS+= --disable-asserts
28CONFIGURE_ARGS+= --disable-verbose-mode 28CONFIGURE_ARGS+= --disable-verbose-mode
29.endif 29.endif
30 30
31.if !empty(PKG_OPTIONS:Mkqueue) 31.if !empty(PKG_OPTIONS:Mkqueue)
32CONFIGURE_ARGS+= --enable-kqueue 32CONFIGURE_ARGS+= --enable-kqueue
33.else 33.else
34CONFIGURE_ARGS+= --disable-kqueue 34CONFIGURE_ARGS+= --disable-kqueue
35.endif 35.endif
36 36
37.if !empty(PKG_OPTIONS:Mx11) 37.if !empty(PKG_OPTIONS:Mx11)
38CONFIGURE_ARGS+= --with-x 38CONFIGURE_ARGS+= --with-x=auto
 39CONFIGURE_ARGS+= --enable-x11-autolaunch
39. include "../../x11/libX11/buildlink3.mk" 40. include "../../x11/libX11/buildlink3.mk"
40CPPFLAGS+= -DDBUS_BUILD_X11 
41BUILDLINK_DEPMETHOD.libXt= build 41BUILDLINK_DEPMETHOD.libXt= build
42. include "../../x11/libXt/buildlink3.mk" 42. include "../../x11/libXt/buildlink3.mk"
43.else 43.else
44CONFIGURE_ARGS+= --without-x 44CONFIGURE_ARGS+= --without-x
45.endif 45.endif
46 46
47.if !empty(PKG_OPTIONS:Mlaunchd) 47.if !empty(PKG_OPTIONS:Mlaunchd)
48MESSAGE_SRC+= MESSAGE.launchd 48MESSAGE_SRC+= MESSAGE.launchd
49PLIST.launchd= yes 49PLIST.launchd= yes
50CONFIGURE_ARGS+= --enable-launchd 50CONFIGURE_ARGS+= --enable-launchd
51CONFIGURE_ARGS+= --with-launchd-agent-dir=${PREFIX}/Library/LaunchAgents 51CONFIGURE_ARGS+= --with-launchd-agent-dir=${PREFIX}/Library/LaunchAgents
52.else 52.else
53CONFIGURE_ARGS+= --disable-launchd 53CONFIGURE_ARGS+= --disable-launchd