CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jun  4 13:47:19 UTC 2020

Modified Files:
        pkgsrc/mail/thunderbird52: Makefile options.mk
        pkgsrc/www/firefox52: Makefile mozilla-common.mk options.mk

Log Message:
Switch legacy mozilla software over to ffmpeg4

While here, clean up options.mk.

Bump PKGREVISIONs


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/thunderbird52/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/thunderbird52/options.mk
cvs rdiff -u -r1.55 -r1.56 pkgsrc/www/firefox52/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/firefox52/mozilla-common.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/firefox52/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/thunderbird52/Makefile
diff -u pkgsrc/mail/thunderbird52/Makefile:1.12 pkgsrc/mail/thunderbird52/Makefile:1.13
--- pkgsrc/mail/thunderbird52/Makefile:1.12     Tue Jun  2 08:24:15 2020
+++ pkgsrc/mail/thunderbird52/Makefile  Thu Jun  4 13:47:19 2020
@@ -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/co
 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

Index: pkgsrc/mail/thunderbird52/options.mk
diff -u pkgsrc/mail/thunderbird52/options.mk:1.1 pkgsrc/mail/thunderbird52/options.mk:1.2
--- pkgsrc/mail/thunderbird52/options.mk:1.1    Sun Dec 16 08:29:48 2018
+++ pkgsrc/mail/thunderbird52/options.mk        Thu Jun  4 13:47:19 2020
@@ -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

Index: pkgsrc/www/firefox52/Makefile
diff -u pkgsrc/www/firefox52/Makefile:1.55 pkgsrc/www/firefox52/Makefile:1.56
--- pkgsrc/www/firefox52/Makefile:1.55  Tue Jun  2 08:24:56 2020
+++ pkgsrc/www/firefox52/Makefile       Thu Jun  4 13:47:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2020/06/02 08:24:56 adam Exp $
+# $NetBSD: Makefile,v 1.56 2020/06/04 13:47:19 nia Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            52.9
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   26
+PKGREVISION=   27
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}

Index: pkgsrc/www/firefox52/mozilla-common.mk
diff -u pkgsrc/www/firefox52/mozilla-common.mk:1.7 pkgsrc/www/firefox52/mozilla-common.mk:1.8
--- pkgsrc/www/firefox52/mozilla-common.mk:1.7  Tue Apr 28 06:56:48 2020
+++ pkgsrc/www/firefox52/mozilla-common.mk      Thu Jun  4 13:47:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.7 2020/04/28 06:56:48 riastradh Exp $
+# $NetBSD: mozilla-common.mk,v 1.8 2020/06/04 13:47:19 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -190,7 +190,7 @@ BUILDLINK_API_DEPENDS.libvpx+=      libvpx>=1
 .include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"
-.include "../../multimedia/ffmpeg3/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
 .include "../../x11/pixman/buildlink3.mk"

Index: pkgsrc/www/firefox52/options.mk
diff -u pkgsrc/www/firefox52/options.mk:1.4 pkgsrc/www/firefox52/options.mk:1.5
--- pkgsrc/www/firefox52/options.mk:1.4 Mon Nov  4 22:09:54 2019
+++ pkgsrc/www/firefox52/options.mk     Thu Jun  4 13:47:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2019/11/04 22:09:54 rillig Exp $
+# $NetBSD: options.mk,v 1.5 2020/06/04 13:47:19 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=          gtk3
 PKG_SUPPORTED_OPTIONS= official-mozilla-branding
 PKG_SUPPORTED_OPTIONS+=        debug debug-info mozilla-jemalloc webrtc
 PKG_SUPPORTED_OPTIONS+=        alsa oss pulseaudio dbus
-PLIST_VARS+=           gnome jemalloc debug
+PLIST_VARS+=           jemalloc debug
 
 .if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=        pulseaudio mozilla-jemalloc dbus