carto: Updated to build with Node.js version 22

gis/carto/Portfile

@@ -5,7 +5,7 @@ PortGroup           github 1.0
 
 github.setup        mapbox carto 1.2.0 v
 github.tarball_from archive
-revision            0
+revision            1
 
 checksums           rmd160  400300a4bb39c9db3500e8919c2822813d1269c3 \
                     sha256  46c454f544828152995f025e39afdfbdc172bf1c3866a95b1b703f068a904ff5 \
@@ -28,16 +28,34 @@ long_description    CartoCSS (short: Carto) is a language for map \
                     the Mapnik renderer and is able to generate Mapnik \
                     XML and a JSON variant of Mapnik XML.
 
-depends_lib-append  path:bin/node:nodejs16
+depends_lib-append  path:bin/node:nodejs22
 
 depends_build-append \
-                    path:bin/npm:npm7
+                    path:bin/npm:npm10
 
-patchfiles          package-json.diff \
-                    package-lock-json.diff
+patchfiles          bin-carto.diff \
+                    lib-carto-mml-js.diff \
+                    lib-carto-parser-js.diff \
+                    lib-carto-tree-rule-js.diff \
+                    package-json.diff \
+                    package-lock-json.diff \
+                    test-rendering-fontset-duplication-mml.diff \
+                    test-rendering-fontset-duplication-result.diff \
+                    test-rendering-zoomlevels-mml.diff \
+                    test-rendering-zoomlevels-result.diff \
+                    test-rule-test-js.diff
 
 use_configure       no
 
+test.run yes
+test.cmd            "npm"
+
+post-patch {
+    file delete -force ${worksrcpath}/.eslintrc.yml
+    xinstall -m 0644 -W ${filespath} eslint.config.mjs ${worksrcpath}
+    file delete -force ${worksrcpath}/test/eclint.test.js
+}
+
 build               {}
 
 destroot {

gis/carto/files/bin-carto.diff

@@ -0,0 +1,10 @@
+--- /Users/frank/tmp/carto-1.2.0/bin/carto	2019-01-28 18:19:04
++++ bin/carto	2025-05-13 17:04:48
+@@ -10,6 +10,7 @@
+ var existsSync = require('fs').existsSync || require('path').existsSync
+
+ var yargs = require('yargs')
++            .version(false)
+             .usage("Usage: $0 <source MML file>")
+             .options('h', {alias:'help', describe:'Display this help message'})
+             .options('v', {alias:'version', boolean:true, describe:'Display version information'})

gis/carto/files/eslint.config.mjs

@@ -0,0 +1,237 @@
+import { defineConfig} from "eslint/config";
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default defineConfig([{
+    extends: compat.extends("eslint:recommended"),
+
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.node,
+            ...globals.mocha,
+        },
+
+        ecmaVersion: 2015,
+        sourceType: "module",
+    },
+
+    files: ["**/*.js"],
+
+    rules: {
+        "accessor-pairs": 2,
+        "array-bracket-spacing": 0,
+        "array-callback-return": 2,
+        "arrow-body-style": 2,
+        "arrow-parens": 2,
+        "arrow-spacing": 2,
+        "block-scoped-var": 0,
+        "block-spacing": [2, "always"],
+        "brace-style": 0,
+        "callback-return": 2,
+        camelcase: 0,
+        "comma-spacing": 0,
+        "comma-style": [2, "last"],
+        complexity: 0,
+        "computed-property-spacing": 0,
+        "consistent-return": 0,
+        "consistent-this": 2,
+        curly: 0,
+        "default-case": 0,
+        "dot-location": [2, "property"],
+        "dot-notation": 0,
+        "eol-last": 2,
+        eqeqeq: 0,
+        "func-names": 0,
+        "func-style": 0,
+        "generator-star-spacing": 2,
+        "global-require": 0,
+        "guard-for-in": 0,
+        "handle-callback-err": 2,
+        "id-blacklist": 2,
+        "id-length": 0,
+        "id-match": 2,
+        indent: 0,
+        "init-declarations": 0,
+        "jsx-quotes": 2,
+        "key-spacing": 0,
+
+        "keyword-spacing": [2, {
+            after: true,
+            before: true,
+        }],
+
+        "linebreak-style": [2, "unix"],
+        "lines-around-comment": 2,
+        "max-depth": 0,
+        "max-len": 0,
+        "max-nested-callbacks": 2,
+        "max-params": 0,
+        "new-parens": 2,
+        "newline-after-var": 0,
+        "newline-per-chained-call": 0,
+        "no-alert": 2,
+        "no-array-constructor": 2,
+        "no-bitwise": 0,
+        "no-caller": 2,
+        "no-cond-assign": [2, "except-parens"],
+        "no-confusing-arrow": 2,
+        "no-console": 0,
+        "no-control-regex": 0,
+        "no-continue": 0,
+        "no-div-regex": 2,
+        "no-else-return": 0,
+        "no-empty-function": 0,
+        "no-eq-null": 2,
+        "no-eval": 2,
+        "no-extend-native": 2,
+        "no-extra-bind": 2,
+        "no-extra-label": 2,
+        "no-extra-parens": 0,
+        "no-floating-decimal": 2,
+        "no-implicit-globals": 0,
+        "no-implied-eval": 2,
+        "no-inline-comments": 0,
+        "no-inner-declarations": [2, "functions"],
+        "no-invalid-this": 2,
+        "no-iterator": 2,
+        "no-label-var": 2,
+        "no-labels": 2,
+        "no-lone-blocks": 2,
+        "no-lonely-if": 0,
+        "no-loop-func": 0,
+        "no-magic-numbers": 0,
+        "no-misleading-character-class": 0,
+        "no-mixed-requires": 0,
+        "no-multi-spaces": 0,
+        "no-multi-str": 2,
+
+        "no-multiple-empty-lines": [2, {
+            max: 3,
+        }],
+
+        "no-native-reassign": 2,
+        "no-negated-condition": 0,
+        "no-nested-ternary": 0,
+        "no-new": 2,
+        "no-new-func": 2,
+        "no-new-object": 2,
+        "no-new-require": 2,
+        "no-new-wrappers": 2,
+        "no-octal-escape": 0,
+        "no-param-reassign": 0,
+        "no-path-concat": 2,
+        "no-plusplus": 0,
+        "no-process-env": 2,
+        "no-process-exit": 2,
+        "no-proto": 2,
+        "no-restricted-imports": 2,
+        "no-restricted-modules": 2,
+        "no-restricted-syntax": 2,
+        "no-return-assign": 0,
+        "no-script-url": 2,
+        "no-self-compare": 2,
+        "no-sequences": 0,
+        "no-shadow": 0,
+        "no-shadow-restricted-names": 2,
+        "no-spaced-func": 0,
+        "no-sync": 0,
+        "no-ternary": 0,
+        "no-throw-literal": 2,
+        "no-trailing-spaces": 2,
+        "no-undef-init": 2,
+        "no-undefined": 0,
+        "no-underscore-dangle": 0,
+        "no-unmodified-loop-condition": 0,
+
+        "no-unneeded-ternary": [2, {
+            defaultAssignment: true,
+        }],
+
+        "no-unused-expressions": 0,
+        "no-unused-vars": 0,
+        "no-use-before-define": 0,
+        "no-useless-call": 2,
+        "no-useless-concat": 2,
+        "no-useless-constructor": 2,
+        "no-var": 0,
+        "no-void": 2,
+        "no-warning-comments": 0,
+        "no-whitespace-before-property": 2,
+        "no-with": 2,
+        "object-curly-spacing": 0,
+        "object-shorthand": 0,
+        "one-var": 0,
+        "one-var-declaration-per-line": 0,
+        "operator-assignment": 0,
+        "operator-linebreak": 0,
+        "padded-blocks": 0,
+        "prefer-arrow-callback": 0,
+        "prefer-const": 2,
+        "prefer-reflect": 0,
+        "prefer-rest-params": 0,
+        "prefer-spread": 0,
+        "prefer-template": 0,
+        "quote-props": 0,
+        quotes: 0,
+        radix: [2, "always"],
+        "require-jsdoc": 0,
+        "require-yield": 2,
+        semi: 0,
+
+        "semi-spacing": [2, {
+            after: true,
+            before: false,
+        }],
+
+        "sort-imports": 2,
+        "sort-vars": 0,
+        "space-before-blocks": 0,
+        "space-before-function-paren": 0,
+        "space-in-parens": 0,
+        "space-infix-ops": 0,
+        "space-unary-ops": 0,
+        "spaced-comment": 0,
+        strict: [2, "never"],
+        "template-curly-spacing": 2,
+        "valid-jsdoc": 0,
+        "vars-on-top": 0,
+        "wrap-regex": 0,
+        "yield-star-spacing": 2,
+        yoda: 0,
+        "no-useless-escape": 0,
+    },
+},
+{
+    extends: compat.extends("eslint:recommended"),
+
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.node,
+            ...globals.mocha,
+        },
+
+        ecmaVersion: 2015,
+        sourceType: "module",
+    },
+
+    files: ["./bin/carto"],
+
+    rules: {
+        "no-misleading-character-class": 0,
+        "no-unused-vars": 0,
+    },
+},
+]);

gis/carto/files/lib-carto-mml-js.diff

@@ -0,0 +1,11 @@
+--- ../carto-1.2.0~/lib/carto/mml.js	2019-01-28 18:19:04
++++ lib/carto/mml.js	2025-05-12 19:31:10
+@@ -22,7 +22,7 @@
+         env = {};
+
+     try {
+-        mml = yaml.safeLoad(data);
++        mml = yaml.load(data);
+     } catch (err) {
+         env = {};
+         util.error(env, {

gis/carto/files/lib-carto-parser-js.diff

@@ -0,0 +1,37 @@
+--- /Users/frank/tmp/carto-1.2.0/lib/carto/parser.js	2019-01-28 18:19:04
++++ lib/carto/parser.js	2025-05-12 11:06:20
+@@ -244,6 +244,10 @@
+
+             // Sort rules by specificity: this function expects selectors to be
+             // split already.
++            // If the specifity is equal, the definition is compared by the elements
++            // array. Definitions with more elements are 'larger', and definitions
++            // with the same number of elements are sorted alphabetically.
++            // If the elements are also equal, the zoom level of the definition is compared
+             //
+             // Written to be used as a .sort(Function);
+             // argument.
+@@ -256,7 +260,22 @@
+                 if (as[0] != bs[0]) return bs[0] - as[0];
+                 if (as[1] != bs[1]) return bs[1] - as[1];
+                 if (as[2] != bs[2]) return bs[2] - as[2];
+-                return bs[3] - as[3];
++                if (bs[3] != as[3]) return bs[3] - as[3];
++
++                // The definition with the most elements is 'larger'
++                if (a.elements.length != b.elements.length) return b.elements.length - a.elements.length;
++
++                // Sort based on the alphabetic order of each element
++                for (var i = 0; i < a.elements.length; i++) {
++                    if (a.elements[i] != b.elements[i]) {
++                        return a.elements[i].value.localeCompare(b.elements[i].value);
++                    }
++                }
++
++                if (a.zoom != b.zoom) return b.zoom - a.zoom;
++
++                // Order is not defined
++                return 0;
+             };
+
+             return root;

gis/carto/files/lib-carto-tree-rule-js.diff

@@ -0,0 +1,11 @@
+--- /Users/frank/tmp/carto-1.2.0/lib/carto/tree/rule.js	2019-01-28 18:19:04
++++ lib/carto/tree/rule.js	2025-05-12 11:06:20
+@@ -37,7 +37,7 @@
+ };
+
+ tree.Rule.prototype.toString = function() {
+-    return '[' + tree.Zoom.toString(this.zoom) + '] ' + this.name + ': ' + this.value;
++    return '[' + (this.zoom ? this.zoom.toString() : (new tree.Zoom()).toString()) + '] ' + this.name + ': ' + this.value;
+ };
+
+ tree.Rule.prototype.validate = function (env) {