Remove most expired ports that depend on Python 2.7:

Exceptions are:
- mail/mailman, our listservers still use it
- www/chromium, solely because of popular demand,
  upstream is (slowly) working on porting it to Python 3
- ports that have actual patches for Python 3 against
  them (Cinnamon and a few unrelated other ports)
- llvm70 and qt5-webengine because they seem to have a lot
  of dependencies which need further analysis
- sysutils/uefi-edk2-bhyve because bhyve seems to use them
- python2 and python27 themselves

I'm sure there will be complaints, but the nice thing about
a version control system is that we can revert and adjust things.

2020-12-31 audio/ardour: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 audio/mixxx21: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 audio/xmms2: Uses Python 2.7 which is EOLed upstream
2020-12-31 chinese/sunpinyin: Uses Python 2.7 which is EOLed upstream
2020-12-31 databases/arangodb32: Uses Python 2.7 which is EOLed upstream
2020-12-31 databases/arangodb33: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/bzr: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/chromium-gn: Uses deprecated version of python, use devel/gn instead
2020-12-31 devel/electron4: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/electron5: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/electron6: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/electron7: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/gnatpython: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/godot2: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 devel/godot2-tools: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 devel/libhid: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/libosmocore: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/llvm60: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/mongo-cxx-driver: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-06-30 devel/p5-Log-Any-Adapter-Callback: Use devel/p5-Log-Any (Log::Any::Adapter::Capture) instead
2020-12-31 devel/py-backports.functools_lru_cache: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-backports.os: Python 2 is EOL upstream
2020-12-31 devel/py-backports.shutil_get_terminal_size: Python 2 is EOL upstream
2020-12-31 devel/py-backports_abc: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-cheetah: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-dis3: Python 2 only, backport of Python 3
2020-12-31 devel/py-enum34: Will be removed along with python27
2020-12-31 devel/py-functools32: Python 2 only, backport of Python 3
2020-12-31 devel/py-futures: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-more-itertools5: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-pathlib: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-selectors2: Python 2 is EOL upstream
2020-12-31 devel/py-should_dsl: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-singledispatch: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-subprocess32: Python 2 only, following EOL of lang/python27
2020-12-31 devel/py-total-ordering: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-typing: Python 2 only, backport of Python 3
2020-12-31 devel/py-weakrefmethod: Python 2 only, backport of Python 3
2020-12-31 devel/rbtools: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/subversion-lts: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/viewvc: Uses Python 2.7 which is EOLed upstream
2020-12-31 dns/py-dns: Uses Python 2.7 which is EOLed upstream
2020-12-31 editors/atom: Uses Python 2.7 which is EOLed upstream
2020-12-31 emulators/fceux: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 emulators/gem5: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 emulators/nonpareil: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/0ad: Uses deprecated version of python
2020-12-31 games/dangerdeep: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/freera: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/glob2: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/marsnomercy: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/netpanzer: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/pingus: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/renpy: Uses deprecated version of python
2020-12-31 graphics/goxel: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 graphics/py-pillow6: Uses Python 2.7 which is EOLed upstream
2020-12-31 graphics/sk1libs: Uses Python 2.7 which is EOLed upstream
2020-12-31 graphics/uniconvertor: Uses deprecated version of python
2020-12-31 lang/julia10: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/pypy: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/pypy3: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/spidermonkey185: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/spidermonkey24: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/spidermonkey52: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/spidermonkey60: Requires python2 to build
2020-12-31 lang/tolua++: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 mail/getmail: Uses deprecated version of python
2020-12-31 math/gringo: Uses Python 2.7 which is EOLed upstream
2020-12-31 multimedia/ffmpeg2theora: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 multimedia/mimms: Uses Python 2.7 which is EOLed upstream
2020-12-31 net/py-ipaddress: Uses Python 2.7 which is EOLed upstream
2020-12-31 net-p2p/linuxdcpp: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 security/broccoli: Depends lang/python27 which is EOLed upstream
2020-12-31 security/orthrus: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 security/py-backports.ssl_match_hostname: Uses Python 2.7 which is EOLed upstream
2020-12-31 security/sandsifter: Uses deprecated version of python, see https://github.com/rigred/sandsifter/issues/10
2020-12-31 sysutils/cinnamon-control-center: Uses Python 2.7 which is EOLed upstream
2020-12-31 sysutils/ori: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 sysutils/osquery: Uses Python 2.7 which is EOLed upstream
2020-12-31 sysutils/py-shutilwhich: Python 2 only, backport of Python 3
2020-12-31 sysutils/uefi-edk2-bhyve-csm: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/cliqz: Uses deprecated version of python
2020-12-31 www/iridium: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/moinmoin: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/node10: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/node12: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-OhlohWidgetsMacro: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-TracGoogleAnalytics: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-accountmanager: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-advancedticketworkflow: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-autocomplete: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-ccselector: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-customfieldadmin: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-datefield: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-defaultcc: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-devel: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-discussion: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-downloads: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-email2trac: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-email2trac-postfix: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-estimator: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-fivestarvote: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-fullblog: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-fullblognotification: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-graphviz: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-iniadmin: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-keywords: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-keywordsecretticket: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-ldap: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-ldapauthstore: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-math: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-mercurial: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-navadd: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-permredirect: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-privatetickets: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-pydotorgtheme: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-scrumburndown: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-spam-filter: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-subtickets: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-tags: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-themeengine: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-ticketimport: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-tickettemplate: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-timingandestimation: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-tocmacro: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-tweakui: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-vote: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-wikigoodies: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-wikinotification: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-wikitemplates: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-wikitopdf: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-wysiwyg: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-xmlrpc: Uses Python 2.7 which is EOLed upstream

1 files changed, 0 insertions, 247 deletions

diff --git a/lang/spidermonkey185/files/patch-c++11 b/lang/spidermonkey185/files/patch-c++11
deleted file mode 100644
index 95a68426f5de..000000000000
--- a/lang/spidermonkey185/files/patch-c++11
+++ /dev/null
@@ -1,247 +0,0 @@
-jsapi.cpp:3988:16: error: cannot initialize return object of type 'JSIdArray *' with an rvalue of type 'bool'
-        return false;
-               ^~~~~
-jsarray.cpp:497:1: error: non-constant-expression cannot be narrowed from type 'intptr_t' (aka 'long') to 'uintptr_t' (aka 'unsigned long') in initializer list [-Wc++11-narrowing]
-JS_DEFINE_CALLINFO_3(extern, BOOL, js_EnsureDenseArrayCapacity, CONTEXT, OBJECT, INT32,
-^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-./jsbuiltins.h:350:5: note: expanded from macro 'JS_DEFINE_CALLINFO_3'
-    _JS_DEFINE_CALLINFO(linkage, op,                                                              \
-    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-./jsbuiltins.h:294:11: note: expanded from macro '_JS_DEFINE_CALLINFO'
-        { (intptr_t) &name, argtypes, nanojit::ABI_FASTCALL, isPure, storeAccSet _JS_CI_NAME(name) }; \
-          ^~~~~~~~~~~~~~~~
-jsfun.cpp:2054:16: error: cannot initialize return object of type 'JSString *' with an rvalue of type 'bool'
-        return false;
-               ^~~~~
-jsfun.cpp:2660:20: error: cannot initialize return object of type 'const js::Shape *' with an rvalue of type 'bool'
-            return false;
-                   ^~~~~
-jsiter.cpp:428:20: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'bool'
-            return false;
-                   ^~~~~
-jsparse.cpp:3355:20: error: cannot initialize return object of type 'JSParseNode *' with an rvalue of type 'bool'
-            return false;
-                   ^~~~~
-jsstr.cpp:1737:24: error: cannot initialize return object of type 'const RegExpPair *' with an rvalue of type 'bool'
-                return false;
-                       ^~~~~
-jsstr.cpp:3403:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'JSIntn' (aka 'int')
-        return JS_FALSE;
-               ^~~~~~~~
-./jstypes.h:395:18: note: expanded from macro 'JS_FALSE'
-#define JS_FALSE (JSIntn)0
-                 ^~~~~~~~~
-jstypedarray.cpp:1337:20: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'bool'
-            return false;
-                   ^~~~~
-jstypedarray.cpp:1671:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'bool'
-        return false;
-               ^~~~~
-jsxml.cpp:285:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'JSIntn' (aka 'int')
-        return JS_FALSE;
-               ^~~~~~~~
-jsxml.cpp:434:20: error: cannot initialize return object of type 'JSString *' with an rvalue of type 'JSIntn' (aka 'int')
-            return JS_FALSE;
-                   ^~~~~~~~
-./jstypes.h:395:18: note: expanded from macro 'JS_FALSE'
-#define JS_FALSE (JSIntn)0
-                 ^~~~~~~~~
-./methodjit/InvokeHelpers.cpp:731:16: error: cannot initialize return object of type 'void *' with an rvalue of type 'bool'
-        return false;
-               ^~~~~
-./nanojit/NativeX64.cpp:1902:59: error: constant expression evaluates to 9223372036854775808 which cannot be narrowed to type 'int64_t' (aka 'long') [-Wc++11-narrowing]
-    static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
-                                                          ^~~~~~~~~~~~~~~~~~~~
-./nanojit/NativeX64.cpp:1902:59: note: insert an explicit cast to silence this issue
-    static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
-                                                          ^~~~~~~~~~~~~~~~~~~~
-                                                          static_cast<int64_t>( )
-./nanojit/RegAlloc.h:189:24: error: non-constant-expression cannot be narrowed from type 'int' to 'nanojit::Register' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
-        Register r = { (sizeof(RegisterMask) == 4) ? lsbSet32(mask) : lsbSet64(mask) };
-                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-./nanojit/RegAlloc.h:189:24: note: insert an explicit cast to silence this issue
-        Register r = { (sizeof(RegisterMask) == 4) ? lsbSet32(mask) : lsbSet64(mask) };
-                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-                       static_cast<Register>(                                       )
-./nanojit/RegAlloc.h:197:24: error: non-constant-expression cannot be narrowed from type 'int' to 'nanojit::Register' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
-        Register r = { (sizeof(RegisterMask) == 4) ? msbSet32(mask) : msbSet64(mask) };
-                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-./nanojit/RegAlloc.h:197:24: note: insert an explicit cast to silence this issue
-        Register r = { (sizeof(RegisterMask) == 4) ? msbSet32(mask) : msbSet64(mask) };
-                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-                       static_cast<Register>(                                       )
-
---- jsapi.cpp.orig	2011-03-31 19:08:36 UTC
-+++ jsapi.cpp
-@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *obj)
-     AutoIdVector props(cx);
-     JSIdArray *ida;
-     if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida))
--        return false;
-+        return NULL;
-     for (size_t n = 0; n < size_t(ida->length); ++n)
-         JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]);
-     return ida;
---- jsbuiltins.h.orig	2011-03-31 19:08:36 UTC
-+++ jsbuiltins.h
-@@ -284,14 +284,14 @@ struct ClosureVarInfo;
- #define _JS_DEFINE_CALLINFO(linkage, name, crtype, cargtypes, argtypes, isPure, storeAccSet)      \
-     _JS_TN_LINKAGE(linkage, crtype) name cargtypes;                                               \
-     _JS_CI_LINKAGE(linkage) const nanojit::CallInfo _JS_CALLINFO(name) =                          \
--        { (intptr_t) &name, argtypes, nanojit::ABI_CDECL, isPure, storeAccSet _JS_CI_NAME(name) };\
-+        { (uintptr_t) &name, argtypes, nanojit::ABI_CDECL, isPure, storeAccSet _JS_CI_NAME(name) };\
-     JS_STATIC_ASSERT_IF(isPure, (storeAccSet) == nanojit::ACCSET_NONE);
- 
- #else
- #define _JS_DEFINE_CALLINFO(linkage, name, crtype, cargtypes, argtypes, isPure, storeAccSet)      \
-     _JS_TN_LINKAGE(linkage, crtype) FASTCALL name cargtypes;                                      \
-     _JS_CI_LINKAGE(linkage) const nanojit::CallInfo _JS_CALLINFO(name) =                          \
--        { (intptr_t) &name, argtypes, nanojit::ABI_FASTCALL, isPure, storeAccSet _JS_CI_NAME(name) }; \
-+        { (uintptr_t) &name, argtypes, nanojit::ABI_FASTCALL, isPure, storeAccSet _JS_CI_NAME(name) }; \
-     JS_STATIC_ASSERT_IF(isPure, (storeAccSet) == nanojit::ACCSET_NONE);
- #endif
- 
---- jsfun.cpp.orig	2011-03-31 19:08:36 UTC
-+++ jsfun.cpp
-@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObject *obj, uintN
- 
-     JSString *str = JS_DecompileFunction(cx, fun, indent);
-     if (!str)
--        return false;
-+        return NULL;
- 
-     if (!indent)
-         cx->compartment->toSourceCache.put(fun, str);
-@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSContext *cx, JSOb
-     const Shape *shape = funobj->nativeLookup(id);
-     if (!shape) {
-         if (!ResolveInterpretedFunctionPrototype(cx, funobj))
--            return false;
-+            return NULL;
-         shape = funobj->nativeLookup(id);
-     }
-     JS_ASSERT(!shape->configurable());
---- jsiter.cpp.orig	2011-03-31 19:08:36 UTC
-+++ jsiter.cpp
-@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN flags)
-          */
-         JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
-         if (!obj)
--            return false;
-+            return NULL;
-         obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
-         obj->setMap(cx->compartment->emptyEnumeratorShape);
-         return obj;
---- jsparse.cpp.orig	2011-03-31 19:08:36 UTC
-+++ jsparse.cpp
-@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, FunctionType type
-     if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
-         JS_ASSERT(pn->pn_cookie.isFree());
-         if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
--            return false;
-+            return NULL;
-     }
- 
-     pn->pn_blockid = outertc->blockid();
---- jsstr.cpp.orig	2011-03-31 19:08:36 UTC
-+++ jsstr.cpp
-@@ -1734,7 +1734,7 @@ class RegExpGuard
-         if (flat) {
-             patstr = flattenPattern(cx, fm.patstr);
-             if (!patstr)
--                return false;
-+                return NULL;
-         } else {
-             patstr = fm.patstr;
-         }
-@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObject *obj)
-                                  UndefinedValue(), NULL, NULL,
-                                  JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
-                                  NULL)) {
--        return JS_FALSE;
-+        return NULL;
-     }
- 
-     return proto;
---- jstypedarray.cpp.orig	2011-03-31 19:08:36 UTC
-+++ jstypedarray.cpp
-@@ -1334,7 +1334,7 @@ class TypedArrayTemplate
-         if (size != 0 && count >= INT32_MAX / size) {
-             JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
-                                  JSMSG_NEED_DIET, "size and count");
--            return false;
-+            return NULL;
-         }
- 
-         int32 bytelen = size * count;
-@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint atype, uintN 
- 
-       default:
-         JS_NOT_REACHED("shouldn't have gotten here");
--        return false;
-+        return NULL;
-     }
- }
- 
---- jsxml.cpp.orig	2011-03-31 19:08:36 UTC
-+++ jsxml.cpp
-@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearString *prefix,
- 
-     obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass);
-     if (!obj)
--        return JS_FALSE;
-+        return NULL;
-     JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal()));
-     JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal()));
-     JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared()));
-@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSObject *obj)
-         size_t length = str->length();
-         jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
-         if (!chars)
--            return JS_FALSE;
-+            return NULL;
-         *chars = '@';
-         const jschar *strChars = str->getChars(cx);
-         if (!strChars) {
---- methodjit/InvokeHelpers.cpp.orig	2011-03-31 19:08:36 UTC
-+++ methodjit/InvokeHelpers.cpp
-@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx)
- {
-     JSStackFrame *fp = cx->fp();
-     if (fp->hasImacropc())
--        return false;
-+        return NULL;
- 
-     JSScript *script = fp->script();
-     return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc);
---- nanojit/NativeX64.cpp.orig	2011-03-31 19:08:36 UTC
-+++ nanojit/NativeX64.cpp
-@@ -1899,7 +1899,7 @@ namespace nanojit
-          }
-     }
- 
--    static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
-+    static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {(int64_t)0x8000000000000000LL,0};
- 
-     void Assembler::asm_fneg(LIns *ins) {
-         Register rr, ra;
---- nanojit/RegAlloc.h.orig	2011-03-31 19:08:36 UTC
-+++ nanojit/RegAlloc.h
-@@ -186,7 +186,7 @@ namespace nanojit
-     inline Register lsReg(RegisterMask mask) {
-         // This is faster than it looks; we rely on the C++ optimizer
-         // to strip the dead branch and inline just one alternative.
--        Register r = { (sizeof(RegisterMask) == 4) ? lsbSet32(mask) : lsbSet64(mask) };
-+        Register r = { (sizeof(RegisterMask) == 4) ? (Register)lsbSet32(mask) : (Register)lsbSet64(mask) };
-         return r;
-     }
- 
-@@ -194,7 +194,7 @@ namespace nanojit
-     inline Register msReg(RegisterMask mask) {
-         // This is faster than it looks; we rely on the C++ optimizer
-         // to strip the dead branch and inline just one alternative.
--        Register r = { (sizeof(RegisterMask) == 4) ? msbSet32(mask) : msbSet64(mask) };
-+        Register r = { (sizeof(RegisterMask) == 4) ? (Register)msbSet32(mask) : (Register)msbSet64(mask) };
-         return r;
-     }
-