1 files changed, 102 insertions, 26 deletions

diff --git a/scripts/context/lua/mtx-update.lua b/scripts/context/lua/mtx-update.lua
index d9deb1b36..a3297e804 100644
--- a/scripts/context/lua/mtx-update.lua
+++ b/scripts/context/lua/mtx-update.lua
@@ -164,19 +164,72 @@ update.goodies = {
     },
 }
 
-update.platforms = {
+-- update.platforms = {
+--     ["mswin"]          = "mswin",
+--     ["windows"]        = "mswin",
+--     ["win32"]          = "mswin",
+--     ["win"]            = "mswin",
+--  -- ["mswin"]          = "win32",
+--  -- ["windows"]        = "win32",
+--  -- ["win32"]          = "win32",
+--  -- ["win"]            = "win32",
+--     --
+--  -- ["mswin-64"]       = "mswin-64",
+--  -- ["windows-64"]     = "mswin-64",
+--  -- ["win64"]          = "mswin-64",
+--     ["mswin-64"]       = "win64",
+--     ["windows-64"]     = "win64",
+--     ["win64"]          = "win64",
+--     --
+--     ["linux"]          = "linux",
+--     ["linux-32"]       = "linux",
+--     ["linux32"]        = "linux",
+--     --
+--     ["linux-64"]       = "linux-64",
+--     ["linux64"]        = "linux-64",
+--     --
+--     ["linuxmusl-64"]   = "linuxmusl-64",
+--     --
+--     ["linux-armhf"]    = "linux-armhf",
+--     --
+--     ["freebsd"]        = "freebsd",
+--     --
+--     ["freebsd-amd64"]  = "freebsd-amd64",
+--     --
+--     ["kfreebsd"]       = "kfreebsd-i386",
+--     ["kfreebsd-i386"]  = "kfreebsd-i386",
+--     --
+--     ["kfreebsd-amd64"] = "kfreebsd-amd64",
+--     --
+--     ["linux-ppc"]      = "linux-ppc",
+--     ["ppc"]            = "linux-ppc",
+--     --
+--     ["osx"]            = "osx-intel",
+--     ["macosx"]         = "osx-intel",
+--     ["osx-intel"]      = "osx-intel",
+--     ["osxintel"]       = "osx-intel",
+--     --
+--     ["osx-ppc"]        = "osx-ppc",
+--     ["osx-powerpc"]    = "osx-ppc",
+--     ["osxppc"]         = "osx-ppc",
+--     ["osxpowerpc"]     = "osx-ppc",
+--     --
+--     ["osx-64"]         = "osx-64",
+--     --
+--     ["solaris-intel"]  = "solaris-intel",
+--     --
+--     ["solaris-sparc"]  = "solaris-sparc",
+--     ["solaris"]        = "solaris-sparc",
+--     --
+--     ["unknown"]        = "unknown",
+-- }
+
+local platforms = {
     ["mswin"]          = "mswin",
     ["windows"]        = "mswin",
     ["win32"]          = "mswin",
     ["win"]            = "mswin",
- -- ["mswin"]          = "win32",
- -- ["windows"]        = "win32",
- -- ["win32"]          = "win32",
- -- ["win"]            = "win32",
     --
- -- ["mswin-64"]       = "mswin-64",
- -- ["windows-64"]     = "mswin-64",
- -- ["win64"]          = "mswin-64",
     ["mswin-64"]       = "win64",
     ["windows-64"]     = "win64",
     ["win64"]          = "win64",
@@ -192,34 +245,39 @@ update.platforms = {
     --
     ["linux-armhf"]    = "linux-armhf",
     --
-    ["freebsd"]        = "freebsd",
+    ["openbsd"]        = "openbsd6.5",
+    ["openbsd-i386"]   = "openbsd6.5",
+    ["openbsd-amd64"]  = "openbsd6.5-amd64",
     --
+    ["freebsd"]        = "freebsd",
+    ["freebsd-i386"]   = "freebsd",
     ["freebsd-amd64"]  = "freebsd-amd64",
     --
-    ["kfreebsd"]       = "kfreebsd-i386",
-    ["kfreebsd-i386"]  = "kfreebsd-i386",
-    --
-    ["kfreebsd-amd64"] = "kfreebsd-amd64",
+ -- ["kfreebsd"]       = "kfreebsd-i386",
+ -- ["kfreebsd-i386"]  = "kfreebsd-i386",
+ -- ["kfreebsd-amd64"] = "kfreebsd-amd64",
     --
-    ["linux-ppc"]      = "linux-ppc",
-    ["ppc"]            = "linux-ppc",
+ -- ["linux-ppc"]      = "linux-ppc",
+ -- ["ppc"]            = "linux-ppc",
     --
-    ["osx"]            = "osx-intel",
-    ["macosx"]         = "osx-intel",
-    ["osx-intel"]      = "osx-intel",
-    ["osxintel"]       = "osx-intel",
+ -- ["osx"]            = "osx-intel",
+ -- ["macosx"]         = "osx-intel",
+ -- ["osx-intel"]      = "osx-intel",
+ -- ["osxintel"]       = "osx-intel",
     --
-    ["osx-ppc"]        = "osx-ppc",
-    ["osx-powerpc"]    = "osx-ppc",
-    ["osxppc"]         = "osx-ppc",
-    ["osxpowerpc"]     = "osx-ppc",
+ -- ["osx-ppc"]        = "osx-ppc",
+ -- ["osx-powerpc"]    = "osx-ppc",
+ -- ["osxppc"]         = "osx-ppc",
+ -- ["osxpowerpc"]     = "osx-ppc",
     --
+    ["macosx"]         = "osx-64",
+    ["osx"]            = "osx-64",
     ["osx-64"]         = "osx-64",
     --
-    ["solaris-intel"]  = "solaris-intel",
+ -- ["solaris-intel"]  = "solaris-intel",
     --
-    ["solaris-sparc"]  = "solaris-sparc",
-    ["solaris"]        = "solaris-sparc",
+ -- ["solaris-sparc"]  = "solaris-sparc",
+ -- ["solaris"]        = "solaris-sparc",
     --
     ["unknown"]        = "unknown",
 }
@@ -652,15 +710,33 @@ if scripts.savestate then
         end
     end
 
+    -- old
+
     local valid = update.platforms
     for r in gmatch(environment.argument("platform") or os.platform,"([^, ]+)") do
         if valid[r] then states.set("platforms." .. r, true) end
     end
 
+    -- new
+
+--     local osplatform = environment.arguments.platform or nil
+--     local platform   = platforms[osplatform or os.platform or ""]
+--
+--     if (platform == "unknown" or platform == "" or not platform) and osplatform then
+--         -- catches openbsdN.M kind of specifications
+--         platform = osplatform
+--     elseif not osplatform then
+--         osplatform = platform
+--     end
+--     states.set("platforms." .. platform, true) end
+
+    -- so far
+
     local valid = table.tohash(update.texformats)
     for r in gmatch(environment.argument("formats") or "","([^, ]+)") do
         if valid[r] then states.set("formats." .. r, true) end
     end
+
  -- local valid = table.tohash(update.mpformats)
  -- for r in gmatch(environment.argument("formats") or "","([^, ]+)") do
  --     if valid[r] then states.set("formats." .. r, true) end