Received: by mail.netbsd.org (Postfix, from userid 605) id 932F884F9F; Thu, 5 May 2022 08:21:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CBE3B84F9B for ; Thu, 5 May 2022 08:21:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hGnqsl9BEpVT for ; Thu, 5 May 2022 08:21:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2D55984C13 for ; Thu, 5 May 2022 08:21:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2B809FB1A; Thu, 5 May 2022 08:21:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1651738894233730" MIME-Version: 1.0 Date: Thu, 5 May 2022 08:21:34 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20220505082134.2B809FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1651738894233730 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu May 5 08:21:34 UTC 2022 Modified Files: pkgsrc/security/tor-browser: options.mk pkgsrc/www/firefox: options.mk pkgsrc/www/firefox68: options.mk pkgsrc/www/firefox78: options.mk pkgsrc/www/firefox91: options.mk Log Message: firefox*: Use OPSYS_VERSION to numerically compare NetBSD versions To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/tor-browser/options.mk cvs rdiff -u -r1.64 -r1.65 pkgsrc/www/firefox/options.mk cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/firefox68/options.mk cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/firefox78/options.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/firefox91/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1651738894233730 Content-Disposition: inline Content-Length: 3446 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/tor-browser/options.mk diff -u pkgsrc/security/tor-browser/options.mk:1.11 pkgsrc/security/tor-browser/options.mk:1.12 --- pkgsrc/security/tor-browser/options.mk:1.11 Sun May 1 00:22:58 2022 +++ pkgsrc/security/tor-browser/options.mk Thu May 5 08:21:33 2022 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2022/05/01 00:22:58 khorben Exp $ +# $NetBSD: options.mk,v 1.12 2022/05/05 08:21:33 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tor-browser @@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS+= pulseaudio mozil PKG_SUGGESTED_OPTIONS+= dbus .endif -.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 PKG_SUGGESTED_OPTIONS+= webrtc .endif Index: pkgsrc/www/firefox/options.mk diff -u pkgsrc/www/firefox/options.mk:1.64 pkgsrc/www/firefox/options.mk:1.65 --- pkgsrc/www/firefox/options.mk:1.64 Thu Sep 16 21:12:48 2021 +++ pkgsrc/www/firefox/options.mk Thu May 5 08:21:33 2022 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.64 2021/09/16 21:12:48 nia Exp $ +# $NetBSD: options.mk,v 1.65 2022/05/05 08:21:33 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox @@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS+= pulseaudio mozil PKG_SUGGESTED_OPTIONS+= dbus .endif -.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 PKG_SUGGESTED_OPTIONS+= webrtc .endif Index: pkgsrc/www/firefox68/options.mk diff -u pkgsrc/www/firefox68/options.mk:1.12 pkgsrc/www/firefox68/options.mk:1.13 --- pkgsrc/www/firefox68/options.mk:1.12 Wed Nov 18 22:38:22 2020 +++ pkgsrc/www/firefox68/options.mk Thu May 5 08:21:33 2022 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2020/11/18 22:38:22 riastradh Exp $ +# $NetBSD: options.mk,v 1.13 2022/05/05 08:21:33 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox @@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS+= pulseaudio mozil PKG_SUGGESTED_OPTIONS+= dbus .endif -.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 PKG_SUGGESTED_OPTIONS+= webrtc .endif Index: pkgsrc/www/firefox78/options.mk diff -u pkgsrc/www/firefox78/options.mk:1.6 pkgsrc/www/firefox78/options.mk:1.7 --- pkgsrc/www/firefox78/options.mk:1.6 Tue Dec 28 20:05:49 2021 +++ pkgsrc/www/firefox78/options.mk Thu May 5 08:21:33 2022 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2021/12/28 20:05:49 nia Exp $ +# $NetBSD: options.mk,v 1.7 2022/05/05 08:21:33 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox @@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS+= pulseaudio mozil PKG_SUGGESTED_OPTIONS+= dbus .endif -.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 PKG_SUGGESTED_OPTIONS+= webrtc .endif Index: pkgsrc/www/firefox91/options.mk diff -u pkgsrc/www/firefox91/options.mk:1.2 pkgsrc/www/firefox91/options.mk:1.3 --- pkgsrc/www/firefox91/options.mk:1.2 Thu Sep 16 20:45:38 2021 +++ pkgsrc/www/firefox91/options.mk Thu May 5 08:21:33 2022 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2021/09/16 20:45:38 nia Exp $ +# $NetBSD: options.mk,v 1.3 2022/05/05 08:21:33 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox @@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS+= pulseaudio mozil PKG_SUGGESTED_OPTIONS+= dbus .endif -.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 PKG_SUGGESTED_OPTIONS+= webrtc .endif --_----------=_1651738894233730--