CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 26 12:00:18 UTC 2022

Modified Files:
        pkgsrc/security/tor-browser: Makefile
        pkgsrc/www/firefox78: mozilla-common.mk

Log Message:
tor-browser: use python 3.9 or older for building

the next version will support 3.10

(Only relevant if you set your default to python 3.10)


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/security/tor-browser/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/firefox78/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/tor-browser/Makefile
diff -u pkgsrc/security/tor-browser/Makefile:1.101 pkgsrc/security/tor-browser/Makefile:1.102
--- pkgsrc/security/tor-browser/Makefile:1.101  Wed Dec  8 16:06:24 2021
+++ pkgsrc/security/tor-browser/Makefile        Wed Jan 26 12:00:18 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2021/12/08 16:06:24 adam Exp $
+# $NetBSD: Makefile,v 1.102 2022/01/26 12:00:18 wiz Exp $
 #
 # How to update this package:
 #
@@ -34,6 +34,9 @@ UNLIMIT_RESOURCES+=   datasize virtualsize
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/src-//}
 
+# as of 10.5.10, 11.x is fine with python 3.10
+PYTHON_VERSIONS_INCOMPATIBLE=  310
+
 MOZILLA_DIR=   # empty
 
 DEPENDS+=      tor-[0-9]*:../../net/tor

Index: pkgsrc/www/firefox78/mozilla-common.mk
diff -u pkgsrc/www/firefox78/mozilla-common.mk:1.13 pkgsrc/www/firefox78/mozilla-common.mk:1.14
--- pkgsrc/www/firefox78/mozilla-common.mk:1.13 Sat Nov 13 23:51:01 2021
+++ pkgsrc/www/firefox78/mozilla-common.mk      Wed Jan 26 12:00:18 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.13 2021/11/13 23:51:01 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.14 2022/01/26 12:00:18 wiz Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -6,7 +6,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE+= 27
 PYTHON_FOR_BUILD_ONLY=         tool
 ALL_ENV+=                      PYTHON3=${PYTHONBIN}