diff options
| -rw-r--r-- | www/firefox68/mozilla-common.mk | 9 | ||||
| -rw-r--r-- | www/firefox68/options.mk | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk index 4e05195fdd9..40d6ceb5b72 100644 --- a/www/firefox68/mozilla-common.mk +++ b/www/firefox68/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.5 2019/12/08 20:09:41 nia Exp $ +# $NetBSD: mozilla-common.mk,v 1.6 2019/12/22 14:33:58 gdt Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -165,13 +165,6 @@ PLIST.tremor= yes PLIST.vorbis= yes .endif -.include "../../mk/pkg-build-options.mk" - -PLIST_VARS+= wayland -.if !empty(PKG_BUILD_OPTIONS.gtk3:Mwayland) -PLIST.wayland= yes -.endif - # See ${WRKSRC}/mozglue/build/moz.build: libmozglue is built and # installed as a shared library on these platforms. .if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" # or Android diff --git a/www/firefox68/options.mk b/www/firefox68/options.mk index e03d7aa1b45..332260757c6 100644 --- a/www/firefox68/options.mk +++ b/www/firefox68/options.mk @@ -1,10 +1,11 @@ -# $NetBSD: options.mk,v 1.2 2019/11/04 22:09:55 rillig Exp $ +# $NetBSD: options.mk,v 1.3 2019/12/22 14:33:58 gdt Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox PKG_SUPPORTED_OPTIONS= official-mozilla-branding PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus +#PKG_SUPPORTED_OPTIONS+= wayland PLIST_VARS+= gnome jemalloc debug .if ${OPSYS} == "Linux" @@ -100,3 +101,9 @@ PLIST.webrtc= yes .else CONFIGURE_ARGS+= --disable-webrtc .endif + +PLIST_VARS+= wayland +.if !empty(PKG_OPTIONS:Mwayland) +# \todo Instead of using an option, determine if gtk3 was built with wayland. +PLIST.wayland= yes +.endif |