CVS commit: pkgsrc/security/tor-browser

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Mon Aug 17 06:58:02 UTC 2020

Modified Files:
        pkgsrc/security/tor-browser: Makefile options.mk

Log Message:
security/tor-browser: Make dbus an option.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/security/tor-browser/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/tor-browser/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/security/tor-browser/Makefile
diff -u pkgsrc/security/tor-browser/Makefile:1.70 pkgsrc/security/tor-browser/Makefile:1.71
--- pkgsrc/security/tor-browser/Makefile:1.70   Wed Jul 29 07:46:37 2020
+++ pkgsrc/security/tor-browser/Makefile        Mon Aug 17 06:58:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2020/07/29 07:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2020/08/17 06:58:02 riastradh Exp $
 
 DISTNAME=      src-firefox-tor-browser-68.11.0esr-9.5-1-build1
 PKGNAME=       tor-browser-9.5.3
@@ -128,5 +128,4 @@ post-install:
                ${DESTDIR}${PREFIX}/lib/tor-browser/browser/fonts
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/tor-browser/options.mk
diff -u pkgsrc/security/tor-browser/options.mk:1.6 pkgsrc/security/tor-browser/options.mk:1.7
--- pkgsrc/security/tor-browser/options.mk:1.6  Sun Jun  7 13:06:00 2020
+++ pkgsrc/security/tor-browser/options.mk      Mon Aug 17 06:58:02 2020
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.6 2020/06/07 13:06:00 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2020/08/17 06:58:02 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tor-browser
-PKG_SUPPORTED_OPTIONS+=        alsa debug debug-info mozilla-jemalloc pulseaudio
+PKG_SUPPORTED_OPTIONS+=        alsa dbus debug debug-info mozilla-jemalloc pulseaudio
 
-PKG_SUGGESTED_OPTIONS.Linux+=  alsa mozilla-jemalloc
+PKG_SUGGESTED_OPTIONS.Linux+=  alsa dbus mozilla-jemalloc
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -20,6 +20,13 @@ CONFIGURE_ARGS+=     --enable-alsa
 CONFIGURE_ARGS+=       --disable-alsa
 .endif
 
+.if !empty(PKG_OPTIONS:Mdbus)
+CONFIGURE_ARGS+=       --enable-dbus
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-dbus
+.endif
+
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
 CONFIGURE_ARGS+=       --enable-jemalloc
 .else