Received: by mail.netbsd.org (Postfix, from userid 605) id 5592084F49; Thu, 16 Sep 2021 21:12:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8D7EA84EAA for ; Thu, 16 Sep 2021 21:12:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id vME6ufirfyFD for ; Thu, 16 Sep 2021 21:12:49 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0AD8584F40 for ; Thu, 16 Sep 2021 21:12:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F1E4DFA97; Thu, 16 Sep 2021 21:12:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1631826768139910" MIME-Version: 1.0 Date: Thu, 16 Sep 2021 21:12:48 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/www/firefox To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210916211248.F1E4DFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1631826768139910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Sep 16 21:12:48 UTC 2021 Modified Files: pkgsrc/www/firefox: Makefile options.mk Log Message: firefox: Use "unofficial" branding Firefox's build system defaults to "nightly" for builds without official branding, and in practice there seems to be very little difference between "nightly" and "unofficial", but this at least makes our choice explicit. Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.493 -r1.494 pkgsrc/www/firefox/Makefile cvs rdiff -u -r1.63 -r1.64 pkgsrc/www/firefox/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1631826768139910 Content-Disposition: inline Content-Length: 1460 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox/Makefile diff -u pkgsrc/www/firefox/Makefile:1.493 pkgsrc/www/firefox/Makefile:1.494 --- pkgsrc/www/firefox/Makefile:1.493 Thu Sep 16 20:47:40 2021 +++ pkgsrc/www/firefox/Makefile Thu Sep 16 21:12:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.493 2021/09/16 20:47:40 nia Exp $ +# $NetBSD: Makefile,v 1.494 2021/09/16 21:12:48 nia Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 91.0 @@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR= .2 DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} EXTRACT_SUFX= .tar.xz Index: pkgsrc/www/firefox/options.mk diff -u pkgsrc/www/firefox/options.mk:1.63 pkgsrc/www/firefox/options.mk:1.64 --- pkgsrc/www/firefox/options.mk:1.63 Fri Aug 13 14:57:52 2021 +++ pkgsrc/www/firefox/options.mk Thu Sep 16 21:12:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.63 2021/08/13 14:57:52 ryoon Exp $ +# $NetBSD: options.mk,v 1.64 2021/09/16 21:12:48 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox @@ -70,6 +70,8 @@ LICENSE= mozilla-trademark-license RESTRICTED= Trademark holder prohibits distribution of modified versions. NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} +.else +CONFIGURE_ARGS+= --with-branding=browser/branding/unofficial .endif .if !empty(PKG_OPTIONS:Mwebrtc) --_----------=_1631826768139910--