summaryrefslogtreecommitdiff
path: root/mail/thunderbird52
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-06-04 13:47:19 +0000
committernia <nia@pkgsrc.org>2020-06-04 13:47:19 +0000
commit9b93e0c4a6ec2f0c2ca13fe05a704268ad64dfc4 (patch)
treec059392068e32379795532b8468989090dfd9346 /mail/thunderbird52
parentc927e3be5fe8f2accf0890e26ba590850923422e (diff)
downloadpkgsrc-9b93e0c4a6ec2f0c2ca13fe05a704268ad64dfc4.tar.gz
Switch legacy mozilla software over to ffmpeg4
While here, clean up options.mk. Bump PKGREVISIONs
Diffstat (limited to 'mail/thunderbird52')
-rw-r--r--mail/thunderbird52/Makefile6
-rw-r--r--mail/thunderbird52/options.mk17
2 files changed, 8 insertions, 15 deletions
diff --git a/mail/thunderbird52/Makefile b/mail/thunderbird52/Makefile
index 4439ecebd51..c5df9b729c2 100644
--- a/mail/thunderbird52/Makefile
+++ b/mail/thunderbird52/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2020/06/02 08:24:15 adam Exp $
+# $NetBSD: Makefile,v 1.13 2020/06/04 13:47:19 nia Exp $
DISTNAME= thunderbird-${TB_VER}.source
PKGNAME= thunderbird${TB_VER:C/\..*$//}-${TB_VER}
-PKGREVISION= 10
+PKGREVISION= 11
TB_VER= 52.9.1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
@@ -24,6 +24,8 @@ CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.sub
CONFIGURE_ARGS+= --enable-application=mail
# Disable WebRTC support for Thunderbird unconditionally.
CONFIGURE_ARGS+= --disable-webrtc
+CONFIGURE_ARGS+= --disable-dbus
+CONFIGURE_ARGS+= --disable-gnomeui
NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird
NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird-bin
diff --git a/mail/thunderbird52/options.mk b/mail/thunderbird52/options.mk
index 4164e148402..c97252ab558 100644
--- a/mail/thunderbird52/options.mk
+++ b/mail/thunderbird52/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2018/12/16 08:29:48 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2020/06/04 13:47:19 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.thunderbird52
@@ -6,15 +6,14 @@ PKG_OPTIONS_REQUIRED_GROUPS= gtk
PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
PKG_SUGGESTED_OPTIONS= gtk3
-PKG_SUPPORTED_OPTIONS= alsa debug mozilla-jemalloc gnome \
+PKG_SUPPORTED_OPTIONS= alsa debug mozilla-jemalloc \
official-mozilla-branding pulseaudio \
mozilla-lightning
PKG_SUGGESTED_OPTIONS+= mozilla-lightning
-PLIST_VARS+= branding nobranding debug gnome jemalloc
+PLIST_VARS+= branding nobranding debug jemalloc
-PKG_SUGGESTED_OPTIONS.Linux+= alsa mozilla-jemalloc
-PKG_SUGGESTED_OPTIONS.*+= pulseaudio
+PKG_SUGGESTED_OPTIONS.Linux+= alsa pulseaudio mozilla-jemalloc
.include "../../mk/bsd.options.mk"
@@ -42,14 +41,6 @@ CONFIGURE_ARGS+= --enable-alsa
CONFIGURE_ARGS+= --disable-alsa
.endif
-.if !empty(PKG_OPTIONS:Mgnome)
-.include "../../devel/libgnomeui/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-dbus --enable-gnomeui
-PLIST.gnome= yes
-.else
-CONFIGURE_ARGS+= --disable-dbus --disable-gnomeui
-.endif
-
.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
PLIST.jemalloc= yes
CONFIGURE_ARGS+= --enable-jemalloc