CVS commit: pkgsrc/mail/thunderbird

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan  7 15:41:22 UTC 2020

Modified Files:
        pkgsrc/mail/thunderbird: PLIST options.mk

Log Message:
thunderbird: handle wayland support like in the firefox packages

Sort PLIST while here.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/mail/thunderbird/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mail/thunderbird/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/mail/thunderbird/PLIST
diff -u pkgsrc/mail/thunderbird/PLIST:1.74 pkgsrc/mail/thunderbird/PLIST:1.75
--- pkgsrc/mail/thunderbird/PLIST:1.74  Sun Dec 29 00:51:06 2019
+++ pkgsrc/mail/thunderbird/PLIST       Tue Jan  7 15:41:22 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.74 2019/12/29 00:51:06 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.75 2020/01/07 15:41:22 wiz Exp $
 bin/thunderbird
 lib/thunderbird/actors/AudioPlaybackChild.jsm
 lib/thunderbird/actors/AutoplayChild.jsm
@@ -2942,7 +2942,6 @@ lib/thunderbird/chrome/messenger/content
 lib/thunderbird/chrome/messenger/content/messenger/SearchDialog.xul
 lib/thunderbird/chrome/messenger/content/messenger/SmtpServerEdit.js
 lib/thunderbird/chrome/messenger/content/messenger/SmtpServerEdit.xul
-lib/thunderbird/chrome/messenger/content/messenger/schemas/messageDisplayAction.json
 lib/thunderbird/chrome/messenger/content/messenger/about-support/aboutSupport.js
 lib/thunderbird/chrome/messenger/content/messenger/about-support/aboutSupport.xhtml
 lib/thunderbird/chrome/messenger/content/messenger/about-support/accounts.js
@@ -3286,6 +3285,7 @@ lib/thunderbird/chrome/messenger/content
 lib/thunderbird/chrome/messenger/content/messenger/schemas/menus.json
 lib/thunderbird/chrome/messenger/content/messenger/schemas/menus_child.json
 lib/thunderbird/chrome/messenger/content/messenger/schemas/messageDisplay.json
+lib/thunderbird/chrome/messenger/content/messenger/schemas/messageDisplayAction.json
 lib/thunderbird/chrome/messenger/content/messenger/schemas/messages.json
 lib/thunderbird/chrome/messenger/content/messenger/schemas/pkcs11.json
 lib/thunderbird/chrome/messenger/content/messenger/schemas/tabs.json
@@ -4497,6 +4497,7 @@ lib/thunderbird/libldif60.so
 lib/thunderbird/liblgpllibs.so
 lib/thunderbird/libmozgtk.so
 lib/thunderbird/libmozsqlite3.so
+${PLIST.wayland}lib/thunderbird/libmozwayland.so
 lib/thunderbird/libprldap60.so
 lib/thunderbird/libxul.so
 lib/thunderbird/localization/en-US/branding/brand.ftl

Index: pkgsrc/mail/thunderbird/options.mk
diff -u pkgsrc/mail/thunderbird/options.mk:1.20 pkgsrc/mail/thunderbird/options.mk:1.21
--- pkgsrc/mail/thunderbird/options.mk:1.20     Sun Dec 16 08:12:15 2018
+++ pkgsrc/mail/thunderbird/options.mk  Tue Jan  7 15:41:22 2020
@@ -1,14 +1,19 @@
-# $NetBSD: options.mk,v 1.20 2018/12/16 08:12:15 ryoon Exp $
+# $NetBSD: options.mk,v 1.21 2020/01/07 15:41:22 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.thunderbird
 
 PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc gnome \
                        official-mozilla-branding oss pulseaudio \
-                       mozilla-lightning
+                       mozilla-lightning wayland
 PKG_SUGGESTED_OPTIONS+=        mozilla-lightning
 
 PLIST_VARS+=           branding nobranding debug gnome jemalloc
 
+.include "../../devel/wayland/platform.mk"
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+=        wayland
+.endif
+
 .if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=        pulseaudio mozilla-jemalloc dbus
 .else
@@ -80,3 +85,9 @@ NO_BIN_ON_FTP=                ${RESTRICTED}
 CONFIGURE_ARGS+=       --disable-official-branding
 PLIST.nobranding=      yes
 .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