diff --git a/packages/l/libx11/xmake.lua b/packages/l/libx11/xmake.lua
index 2b70ddb6a..60dac5eac 100644
--- a/packages/l/libx11/xmake.lua
+++ b/packages/l/libx11/xmake.lua
@@ -6,7 +6,9 @@ package("libx11")
     set_urls("https://www.x.org/archive/individual/lib/libX11-$(version).tar.bz2")
     add_versions("1.6.9", "9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1")
 
-    add_deps("pkg-config", "util-macros", "xtrans", "libxcb", "xorgproto")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "util-macros", "xtrans", "libxcb", "xorgproto")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxau/xmake.lua b/packages/l/libxau/xmake.lua
index 2ea2089af..32cb6a588 100644
--- a/packages/l/libxau/xmake.lua
+++ b/packages/l/libxau/xmake.lua
@@ -6,7 +6,9 @@ package("libxau")
     set_urls("https://www.x.org/archive/individual/lib/libXau-$(version).tar.bz2")
     add_versions("1.0.9", "ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec")
 
-    add_deps("pkg-config", "util-macros", "xorgproto")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "util-macros", "xorgproto")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxcb/xmake.lua b/packages/l/libxcb/xmake.lua
index 194142e88..b56b91156 100644
--- a/packages/l/libxcb/xmake.lua
+++ b/packages/l/libxcb/xmake.lua
@@ -6,7 +6,9 @@ package("libxcb")
     set_urls("https://xcb.freedesktop.org/dist/libxcb-$(version).tar.bz2")
     add_versions("1.13.1", "a89fb7af7a11f43d2ce84a844a4b38df688c092bf4b67683aef179cdf2a647c4")
 
-    add_deps("autoconf", "python 3.x", "xcb-proto", "libpthread-stubs", "libxau", "libxdmcp")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "python 3.x", "xcb-proto", "libpthread-stubs", "libxau", "libxdmcp")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxcursor/xmake.lua b/packages/l/libxcursor/xmake.lua
index 344539aa7..f4723ca06 100644
--- a/packages/l/libxcursor/xmake.lua
+++ b/packages/l/libxcursor/xmake.lua
@@ -6,7 +6,9 @@ package("libxcursor")
     set_urls("https://www.x.org/archive/individual/lib/libXcursor-$(version).tar.bz2")
     add_versions("1.2.0", "3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782")
 
-    add_deps("pkg-config", "util-macros", "libx11", "libxfixes", "libxrender")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "util-macros", "libx11", "libxfixes", "libxrender")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxdmcp/xmake.lua b/packages/l/libxdmcp/xmake.lua
index a7768bc8d..58d4c8f7b 100644
--- a/packages/l/libxdmcp/xmake.lua
+++ b/packages/l/libxdmcp/xmake.lua
@@ -6,7 +6,9 @@ package("libxdmcp")
     set_urls("https://www.x.org/archive/individual/lib/libXdmcp-$(version).tar.bz2")
     add_versions("1.1.3", "20523b44aaa513e17c009e873ad7bbc301507a3224c232610ce2e099011c6529")
 
-    add_deps("pkg-config", "xorgproto")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "xorgproto")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxext/xmake.lua b/packages/l/libxext/xmake.lua
index 6f0fd4b0d..dcf46b111 100644
--- a/packages/l/libxext/xmake.lua
+++ b/packages/l/libxext/xmake.lua
@@ -6,7 +6,9 @@ package("libxext")
     set_urls("https://www.x.org/archive/individual/lib/libXext-$(version).tar.bz2")
     add_versions("1.3.4", "59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b")
 
-    add_deps("pkg-config", "libx11", "xorgproto")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "libx11", "xorgproto")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxfixes/xmake.lua b/packages/l/libxfixes/xmake.lua
index c0b56d9cd..7b1be947e 100644
--- a/packages/l/libxfixes/xmake.lua
+++ b/packages/l/libxfixes/xmake.lua
@@ -6,7 +6,9 @@ package("libxfixes")
     set_urls("https://www.x.org/archive/individual/lib/libXfixes-$(version).tar.bz2")
     add_versions("5.0.3", "de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6")
 
-    add_deps("pkg-config", "libx11", "xorgproto")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "libx11", "xorgproto")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxi/xmake.lua b/packages/l/libxi/xmake.lua
index 36f2d40c3..b4bb4522a 100644
--- a/packages/l/libxi/xmake.lua
+++ b/packages/l/libxi/xmake.lua
@@ -6,7 +6,9 @@ package("libxi")
     set_urls("https://www.x.org/archive/individual/lib/libXi-$(version).tar.bz2")
     add_versions("1.7.10", "36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061")
 
-    add_deps("pkg-config", "libx11", "libxext", "libxfixes", "xorgproto")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "libx11", "libxext", "libxfixes", "xorgproto")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxinerama/xmake.lua b/packages/l/libxinerama/xmake.lua
index bcdf4ec84..373956ba4 100644
--- a/packages/l/libxinerama/xmake.lua
+++ b/packages/l/libxinerama/xmake.lua
@@ -6,7 +6,9 @@ package("libxinerama")
     set_urls("https://www.x.org/archive/individual/lib/libXinerama-$(version).tar.bz2")
     add_versions("1.1.4", "0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720")
 
-    add_deps("pkg-config", "libx11", "libxext", "xorgproto")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "libx11", "libxext", "xorgproto")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxrandr/xmake.lua b/packages/l/libxrandr/xmake.lua
index c38f2c34a..b21f80287 100644
--- a/packages/l/libxrandr/xmake.lua
+++ b/packages/l/libxrandr/xmake.lua
@@ -6,7 +6,9 @@ package("libxrandr")
     set_urls("https://www.x.org/archive/individual/lib/libXrandr-$(version).tar.bz2")
     add_versions("1.5.2", "8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023")
 
-    add_deps("pkg-config", "libx11", "libxext", "libxrender", "xorgproto")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "libx11", "libxext", "libxrender", "xorgproto")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxrender/xmake.lua b/packages/l/libxrender/xmake.lua
index 4795e9e93..05b4d0c8f 100644
--- a/packages/l/libxrender/xmake.lua
+++ b/packages/l/libxrender/xmake.lua
@@ -6,7 +6,9 @@ package("libxrender")
     set_urls("https://www.x.org/archive/individual/lib/libXrender-$(version).tar.bz2")
     add_versions("0.9.10", "c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949")
 
-    add_deps("pkg-config", "libx11", "xorgproto")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "libx11", "xorgproto")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/l/libxxf86vm/xmake.lua b/packages/l/libxxf86vm/xmake.lua
new file mode 100644
index 000000000..6113f3bb2
--- /dev/null
+++ b/packages/l/libxxf86vm/xmake.lua
@@ -0,0 +1,23 @@
+package("libxxf86vm")
+
+    set_homepage("https://www.x.org/")
+    set_description("X.Org: XFree86-VidMode X extension")
+
+    set_urls("https://www.x.org/archive/individual/lib/libXxf86vm-$(version).tar.bz2")
+    add_versions("1.1.4", "afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57")
+
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "libx11", "libxext", "xorgproto")
+    end
+
+    on_install("macosx", "linux", function (package)
+        local configs = {"--sysconfdir=" .. package:installdir("etc"),
+                         "--localstatedir=" .. package:installdir("var"),
+                         "--disable-dependency-tracking",
+                         "--disable-silent-rules"}
+        import("package.tools.autoconf").install(package, configs)
+    end)
+
+    on_test(function (package)
+        assert(package:has_ctypes("XF86VidModeModeInfo", {includes = {"X11/Xlib.h", "X11/extensions/xf86vmode.h"}}))
+    end)
diff --git a/packages/x/xcb-proto/xmake.lua b/packages/x/xcb-proto/xmake.lua
index 0d7fd02df..7172fd701 100644
--- a/packages/x/xcb-proto/xmake.lua
+++ b/packages/x/xcb-proto/xmake.lua
@@ -6,7 +6,9 @@ package("xcb-proto")
     set_urls("https://xcb.freedesktop.org/dist/xcb-proto-$(version).tar.bz2")
     add_versions("1.13", "7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1")
 
-    add_deps("pkg-config", "python 3.x")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "python 3.x")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),
diff --git a/packages/x/xtrans/xmake.lua b/packages/x/xtrans/xmake.lua
index e3f5ab21b..9da99d255 100644
--- a/packages/x/xtrans/xmake.lua
+++ b/packages/x/xtrans/xmake.lua
@@ -6,7 +6,9 @@ package("xtrans")
     set_urls("https://www.x.org/archive/individual/lib/xtrans-$(version).tar.bz2")
     add_versions("1.4.0", "377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773")
 
-    add_deps("pkg-config", "util-macros", "xorgproto")
+    if is_plat("macosx", "linux") then
+        add_deps("pkg-config", "util-macros", "xorgproto")
+    end
 
     on_install("macosx", "linux", function (package)
         local configs = {"--sysconfdir=" .. package:installdir("etc"),