summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/libFS/Makefile4
-rw-r--r--x11/libICE/Makefile4
-rw-r--r--x11/libSM/Makefile4
-rw-r--r--x11/libX11/Makefile4
-rw-r--r--x11/libXScrnSaver/Makefile4
-rw-r--r--x11/libXau/Makefile4
-rw-r--r--x11/libXcomposite/Makefile4
-rw-r--r--x11/libXdamage/Makefile4
-rw-r--r--x11/libXdmcp/Makefile4
-rw-r--r--x11/libXext/Makefile4
-rw-r--r--x11/libXfixes/Makefile4
-rw-r--r--x11/libXfont/Makefile4
-rw-r--r--x11/libXfont2/Makefile4
-rw-r--r--x11/libXft/Makefile4
-rw-r--r--x11/libXi/Makefile4
-rw-r--r--x11/libXinerama/Makefile4
-rw-r--r--x11/libXmu/Makefile4
-rw-r--r--x11/libXpm/Makefile4
-rw-r--r--x11/libXpresent/Makefile4
-rw-r--r--x11/libXrandr/Makefile4
-rw-r--r--x11/libXres/Makefile4
-rw-r--r--x11/libXt/Makefile4
-rw-r--r--x11/libXtst/Makefile4
-rw-r--r--x11/libXv/Makefile4
-rw-r--r--x11/libXvMC/Makefile4
-rw-r--r--x11/libdrm/Makefile4
-rw-r--r--x11/liboldXrandr/Makefile4
-rw-r--r--x11/libxcb/Makefile4
-rw-r--r--x11/libxshmfence/Makefile4
-rw-r--r--x11/modular-xorg-server/Makefile4
-rw-r--r--x11/pixman/Makefile4
-rw-r--r--x11/xauth/Makefile4
-rw-r--r--x11/xbitmaps/Makefile4
-rw-r--r--x11/xcursor/Makefile4
-rw-r--r--x11/xf86-input-acecad/Makefile4
-rw-r--r--x11/xf86-input-elographics/Makefile4
-rw-r--r--x11/xf86-input-fpit/Makefile4
-rw-r--r--x11/xf86-input-hyperpen/Makefile4
-rw-r--r--x11/xf86-input-joystick/Makefile4
-rw-r--r--x11/xf86-input-keyboard/Makefile4
-rw-r--r--x11/xf86-input-mouse/Makefile4
-rw-r--r--x11/xf86-input-mutouch/Makefile4
-rw-r--r--x11/xf86-input-penmount/Makefile4
-rw-r--r--x11/xf86-input-vmmouse/Makefile4
-rw-r--r--x11/xf86-input-void/Makefile4
-rw-r--r--x11/xf86-input-ws/Makefile4
-rw-r--r--x11/xf86-video-amdgpu/Makefile4
-rw-r--r--x11/xf86-video-apm/Makefile4
-rw-r--r--x11/xf86-video-ark/Makefile4
-rw-r--r--x11/xf86-video-ast/Makefile4
-rw-r--r--x11/xf86-video-ati/Makefile4
-rw-r--r--x11/xf86-video-chips/Makefile4
-rw-r--r--x11/xf86-video-cirrus/Makefile4
-rw-r--r--x11/xf86-video-dummy/Makefile4
-rw-r--r--x11/xf86-video-fbdev/Makefile4
-rw-r--r--x11/xf86-video-glint/Makefile4
-rw-r--r--x11/xf86-video-i128/Makefile4
-rw-r--r--x11/xf86-video-i740/Makefile4
-rw-r--r--x11/xf86-video-intel/Makefile4
-rw-r--r--x11/xf86-video-mach64/Makefile4
-rw-r--r--x11/xf86-video-mga/Makefile4
-rw-r--r--x11/xf86-video-neomagic/Makefile4
-rw-r--r--x11/xf86-video-nouveau/Makefile4
-rw-r--r--x11/xf86-video-nv/Makefile4
-rw-r--r--x11/xf86-video-openchrome/Makefile4
-rw-r--r--x11/xf86-video-qxl/Makefile4
-rw-r--r--x11/xf86-video-r128/Makefile4
-rw-r--r--x11/xf86-video-rendition/Makefile4
-rw-r--r--x11/xf86-video-s3/Makefile4
-rw-r--r--x11/xf86-video-s3virge/Makefile4
-rw-r--r--x11/xf86-video-savage/Makefile4
-rw-r--r--x11/xf86-video-siliconmotion/Makefile4
-rw-r--r--x11/xf86-video-sis/Makefile4
-rw-r--r--x11/xf86-video-suncg14/Makefile4
-rw-r--r--x11/xf86-video-suncg3/Makefile4
-rw-r--r--x11/xf86-video-suncg6/Makefile4
-rw-r--r--x11/xf86-video-sunffb/Makefile4
-rw-r--r--x11/xf86-video-sunleo/Makefile4
-rw-r--r--x11/xf86-video-suntcx/Makefile4
-rw-r--r--x11/xf86-video-tdfx/Makefile4
-rw-r--r--x11/xf86-video-tga/Makefile4
-rw-r--r--x11/xf86-video-trident/Makefile4
-rw-r--r--x11/xf86-video-tseng/Makefile4
-rw-r--r--x11/xf86-video-vboxvideo/Makefile4
-rw-r--r--x11/xf86-video-vesa/Makefile4
-rw-r--r--x11/xf86-video-vmware/Makefile4
-rw-r--r--x11/xf86-video-voodoo/Makefile4
-rw-r--r--x11/xf86-video-wsfb/Makefile4
-rw-r--r--x11/xinit/Makefile4
-rw-r--r--x11/xtrans/Makefile4
90 files changed, 177 insertions, 183 deletions
diff --git a/x11/libFS/Makefile b/x11/libFS/Makefile
index ea4b496a0d0..35ce5740a18 100644
--- a/x11/libFS/Makefile
+++ b/x11/libFS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/12/01 13:01:12 nia Exp $
+# $NetBSD: Makefile,v 1.21 2022/04/10 08:53:14 nia Exp $
DISTNAME= libFS-1.0.8
CATEGORIES= x11 devel
@@ -17,7 +17,7 @@ PKGCONFIG_OVERRIDE+= libfs.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
-X11_BUILTIN_NAME?= libFS
+X11_LIB_NAME?= libFS
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index eeafa4effbe..9a5812f23fb 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:12 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/04/10 08:53:14 nia Exp $
DISTNAME= libICE-1.0.10
CATEGORIES= x11 devel
@@ -17,7 +17,7 @@ PKGCONFIG_OVERRIDE+= ice.pc.in
.include "options.mk"
-X11_BUILTIN_NAME?= libICE
+X11_LIB_NAME?= libICE
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 940e16083dc..7debc0bc404 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/12/01 13:01:13 nia Exp $
+# $NetBSD: Makefile,v 1.18 2022/04/10 08:53:14 nia Exp $
DISTNAME= libSM-1.2.3
CATEGORIES= x11 devel
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --without-libuuid
.include "options.mk"
-X11_BUILTIN_NAME?= libSM
+X11_LIB_NAME?= libSM
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../x11/libICE/buildlink3.mk"
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 15bc9e588a4..1e520f691a7 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2022/04/03 18:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2022/04/10 08:53:14 nia Exp $
DISTNAME= libX11-1.7.5
CATEGORIES= x11 devel
@@ -44,7 +44,7 @@ CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
TOOL_DEPENDS+= xorgproto-[0-9]*:../../x11/xorgproto
.endif
-X11_BUILTIN_NAME?= libX11
+X11_LIB_NAME?= libX11
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index e43f00d14d8..ab00600195c 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/12/01 13:01:13 nia Exp $
+# $NetBSD: Makefile,v 1.16 2022/04/10 08:53:14 nia Exp $
DISTNAME= libXScrnSaver-1.2.3
CATEGORIES= x11
@@ -17,7 +17,7 @@ PKGCONFIG_OVERRIDE+= xscrnsaver.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
-X11_BUILTIN_NAME?= libXScrnSaver
+X11_LIB_NAME?= libXScrnSaver
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index b24a35443dc..47d59c61146 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/12/01 13:01:13 nia Exp $
+# $NetBSD: Makefile,v 1.19 2022/04/10 08:53:15 nia Exp $
DISTNAME= libXau-1.0.9
CATEGORIES= x11 devel
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+= xau.pc.in
CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h
-X11_BUILTIN_NAME?= libXau
+X11_LIB_NAME?= libXau
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index ac70ea2cb9c..a8fb1e291b8 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/12/01 13:01:13 nia Exp $
+# $NetBSD: Makefile,v 1.15 2022/04/10 08:53:15 nia Exp $
DISTNAME= libXcomposite-0.4.5
CATEGORIES= x11 devel
@@ -16,7 +16,7 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= xcomposite.pc.in
-X11_BUILTIN_NAME?= libXcomposite
+X11_LIB_NAME?= libXcomposite
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index c961358c336..1ffe5bebfe5 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/12/01 13:01:13 nia Exp $
+# $NetBSD: Makefile,v 1.14 2022/04/10 08:53:15 nia Exp $
DISTNAME= libXdamage-1.1.5
CATEGORIES= x11 devel
@@ -16,7 +16,7 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= xdamage.pc.in
-X11_BUILTIN_NAME?= libXdamage
+X11_LIB_NAME?= libXdamage
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 2822246ebd4..d10cc538347 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/12/01 13:01:13 nia Exp $
+# $NetBSD: Makefile,v 1.13 2022/04/10 08:53:15 nia Exp $
DISTNAME= libXdmcp-1.1.3
CATEGORIES= x11
@@ -14,7 +14,7 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= xdmcp.pc.in
GNU_CONFIGURE= yes
-X11_BUILTIN_NAME?= libXdmcp
+X11_LIB_NAME?= libXdmcp
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index f6ecffbbcd6..2225d811835 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/12/01 13:01:13 nia Exp $
+# $NetBSD: Makefile,v 1.28 2022/04/10 08:53:15 nia Exp $
DISTNAME= libXext-1.3.4
CATEGORIES= x11 devel
@@ -24,7 +24,7 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-X11_BUILTIN_NAME?= libXext
+X11_LIB_NAME?= libXext
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index f18121b4626..d91ac462fa1 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/12/01 13:01:13 nia Exp $
+# $NetBSD: Makefile,v 1.16 2022/04/10 08:53:15 nia Exp $
DISTNAME= libXfixes-5.0.3
PKGREVISION= 1
@@ -19,7 +19,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= LIB_MAN_SUFFIX=3
PKGCONFIG_OVERRIDE+= xfixes.pc.in
-X11_BUILTIN_NAME?= libXfixes
+X11_LIB_NAME?= libXfixes
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile
index 285eae7cde5..8057a4144b3 100644
--- a/x11/libXfont/Makefile
+++ b/x11/libXfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2021/12/01 13:01:14 nia Exp $
+# $NetBSD: Makefile,v 1.45 2022/04/10 08:53:15 nia Exp $
DISTNAME= libXfont-1.5.4
PKGREVISION= 2
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+= xfont.pc.in
CONFIGURE_ARGS+= --disable-devel-docs
-X11_BUILTIN_NAME?= libXfont
+X11_LIB_NAME?= libXfont
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/libXfont2/Makefile b/x11/libXfont2/Makefile
index b0bf2982756..361c3847fba 100644
--- a/x11/libXfont2/Makefile
+++ b/x11/libXfont2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/12/01 13:01:14 nia Exp $
+# $NetBSD: Makefile,v 1.13 2022/04/10 08:53:15 nia Exp $
DISTNAME= libXfont2-2.0.5
CATEGORIES= x11 devel fonts
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+= xfont2.pc.in
CONFIGURE_ARGS+= --disable-devel-docs
CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE
-X11_BUILTIN_NAME?= libXfont2
+X11_LIB_NAME?= libXfont2
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile
index 194a7cd18b7..5a9edbd2037 100644
--- a/x11/libXft/Makefile
+++ b/x11/libXft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/12/01 13:01:14 nia Exp $
+# $NetBSD: Makefile,v 1.25 2022/04/10 08:53:15 nia Exp $
DISTNAME= libXft-2.3.4
CATEGORIES= x11 fonts
@@ -16,7 +16,7 @@ USE_LIBTOOL= YES
USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE= xft.pc.in
-X11_BUILTIN_NAME?= libXft
+X11_LIB_NAME?= libXft
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 0f9c46cb116..12e9ddd4767 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2021/12/01 13:01:14 nia Exp $
+# $NetBSD: Makefile,v 1.39 2022/04/10 08:53:16 nia Exp $
DISTNAME= libXi-1.8
CATEGORIES= x11 devel
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+= xi.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
-X11_BUILTIN_NAME?= libXi
+X11_LIB_NAME?= libXi
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 87bca7122c9..ebc95a00e2e 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/12/01 13:01:14 nia Exp $
+# $NetBSD: Makefile,v 1.19 2022/04/10 08:53:16 nia Exp $
DISTNAME= libXinerama-1.1.4
CATEGORIES= x11
@@ -18,7 +18,7 @@ PKGCONFIG_OVERRIDE+= xinerama.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
-X11_BUILTIN_NAME?= libXinerama
+X11_LIB_NAME?= libXinerama
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXmu/Makefile b/x11/libXmu/Makefile
index f4f6239b380..7c1743e822a 100644
--- a/x11/libXmu/Makefile
+++ b/x11/libXmu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/12/01 13:01:14 nia Exp $
+# $NetBSD: Makefile,v 1.15 2022/04/10 08:53:16 nia Exp $
DISTNAME= libXmu-1.1.3
CATEGORIES= x11 devel
@@ -15,7 +15,7 @@ PKGCONFIG_OVERRIDE+= xmuu.pc.in
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-X11_BUILTIN_NAME?= libXmu
+X11_LIB_NAME?= libXmu
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index ae43c7d9622..658ef84ffa6 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/12/05 18:15:47 nia Exp $
+# $NetBSD: Makefile,v 1.23 2022/04/10 08:53:16 nia Exp $
DISTNAME= libXpm-3.5.13
CATEGORIES= graphics x11
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS:Q} \
SXPM_LIBS=${SXPM_LIBS:Q}
.endif
-X11_BUILTIN_NAME?= libXpm
+X11_LIB_NAME?= libXpm
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/libXpresent/Makefile b/x11/libXpresent/Makefile
index ec9c67fffb5..75bfc524bad 100644
--- a/x11/libXpresent/Makefile
+++ b/x11/libXpresent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/12/01 13:01:14 nia Exp $
+# $NetBSD: Makefile,v 1.5 2022/04/10 08:53:16 nia Exp $
DISTNAME= libXpresent-1.0.0
PKGREVISION= 1
@@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= xpresent.pc.in
GNU_CONFIGURE= yes
-X11_BUILTIN_NAME?= libXpresent
+X11_LIB_NAME?= libXpresent
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 5eda8e1926c..40a953fc879 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -1,5 +1,3 @@
-# $NetBSD: Makefile,v 1.23 2021/12/01 13:01:15 nia Exp $
-
DISTNAME= libXrandr-1.5.2
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
@@ -20,7 +18,7 @@ PKGCONFIG_OVERRIDE+= xrandr.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
-X11_BUILTIN_NAME?= libXrandr
+X11_LIB_NAME?= libXrandr
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index c72ffdd6901..9629be4f125 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:15 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/04/10 08:53:16 nia Exp $
DISTNAME= libXres-1.2.1
CATEGORIES= x11
@@ -17,7 +17,7 @@ PKGCONFIG_OVERRIDE+= xres.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
-X11_BUILTIN_NAME?= libXres
+X11_LIB_NAME?= libXres
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index 267e4961f64..79ceac1621b 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2021/12/01 13:01:15 nia Exp $
+# $NetBSD: Makefile,v 1.30 2022/04/10 08:53:16 nia Exp $
DISTNAME= libXt-1.2.1
CATEGORIES= x11 devel
@@ -33,7 +33,7 @@ CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h
TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
-X11_BUILTIN_NAME?= libXt
+X11_LIB_NAME?= libXt
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 9eccd95074c..0057b0017bc 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:15 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/04/10 08:53:16 nia Exp $
DISTNAME= libXtst-1.2.3
PKGREVISION= 1
@@ -33,7 +33,7 @@ SUBST_FILES.sofix+= man/XTestCompareCursorWithWindow.man
SUBST_STAGE.sofix= post-configure
SUBST_MESSAGE.sofix= Fix .so arguments.
-X11_BUILTIN_NAME?= libXtst
+X11_LIB_NAME?= libXtst
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index bd5e2324d2e..5a2ebdd64ca 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2021/12/01 13:01:15 nia Exp $
+# $NetBSD: Makefile,v 1.20 2022/04/10 08:53:17 nia Exp $
DISTNAME= libXv-1.0.11
PKGREVISION= 1
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
-X11_BUILTIN_NAME?= libXv
+X11_LIB_NAME?= libXv
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index d2e92bdaef7..67683458606 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/03/30 21:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/04/10 08:53:17 nia Exp $
DISTNAME= libXvMC-1.0.13
CATEGORIES= x11
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+= xvmc-wrapper.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
-X11_BUILTIN_NAME?= libXvMC
+X11_LIB_NAME?= libXvMC
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile
index da5118f0a86..4762aec61de 100644
--- a/x11/libdrm/Makefile
+++ b/x11/libdrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2022/04/04 11:23:07 riastradh Exp $
+# $NetBSD: Makefile,v 1.101 2022/04/10 08:53:17 nia Exp $
DISTNAME= libdrm-2.4.110
CATEGORIES= x11 graphics
@@ -93,7 +93,7 @@ MESON_ARGS+= -Dvalgrind=false
LDFLAGS.NetBSD+= -lpci
CPPFLAGS.SunOS+= -D__EXTENSIONS__ # posix_memalign, ...
-X11_BUILTIN_NAME?= libdrm
+X11_LIB_NAME?= libdrm
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../devel/meson/build.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/liboldXrandr/Makefile b/x11/liboldXrandr/Makefile
index 03e3907afcd..def07e6d615 100644
--- a/x11/liboldXrandr/Makefile
+++ b/x11/liboldXrandr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/12/01 13:01:15 nia Exp $
+# $NetBSD: Makefile,v 1.8 2022/04/10 08:53:17 nia Exp $
DISTNAME= libXrandr-1.0.2
PKGNAME= Xrandr-1.0.2
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= xrandr.pc.in
-X11_BUILTIN_NAME?= Xrandr
+X11_LIB_NAME?= Xrandr
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libXext/buildlink3.mk"
BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 26284046459..1885dca6fe7 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2021/12/01 13:01:15 nia Exp $
+# $NetBSD: Makefile,v 1.37 2022/04/10 08:53:17 nia Exp $
DISTNAME= libxcb-1.14
CATEGORIES= x11
@@ -87,7 +87,7 @@ post-extract:
### so it's not needed (nor should it ever be, really).
###
#.include "../../devel/gperf/buildlink3.mk"
-X11_BUILTIN_NAME?= libxcb
+X11_LIB_NAME?= libxcb
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
PYTHON_FOR_BUILD_ONLY= tool
.include "../../lang/python/application.mk"
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index 0d96a9ba0b3..182d4b2f527 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:16 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/04/10 08:53:17 nia Exp $
DISTNAME= libxshmfence-1.3
PKGREVISION= 3
@@ -35,7 +35,7 @@ pre-configure:
.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
-X11_BUILTIN_NAME?= libxshmfence
+X11_LIB_NAME?= libxshmfence
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index d1d8e794b13..e28bfd930f8 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.131 2021/12/03 13:05:59 nia Exp $
+# $NetBSD: Makefile,v 1.132 2022/04/10 08:53:17 nia Exp $
DISTNAME= xorg-server-${XORG_VERSION}
PKGNAME= modular-${DISTNAME}
@@ -21,6 +21,6 @@ CONFIGURE_ARGS+= --disable-kdrive
.include "options.mk"
-X11_BUILTIN_NAME= modular-xorg-server
+X11_BIN_NAME= X
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 40cde42c59c..2ec0970046d 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2021/12/01 13:01:16 nia Exp $
+# $NetBSD: Makefile,v 1.79 2022/04/10 08:53:17 nia Exp $
DISTNAME= pixman-0.40.0
PKGREVISION= 2
@@ -24,6 +24,6 @@ USE_TOOLS+= pkg-config perl
PKGCONFIG_OVERRIDE+= pixman-1.pc.in
PKGCONFIG_OVERRIDE+= pixman-1-uninstalled.pc.in
-X11_BUILTIN_NAME?= pixman
+X11_LIB_NAME?= pixman
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index eef4fd48caf..7702303c15b 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/12/01 13:01:16 nia Exp $
+# $NetBSD: Makefile,v 1.15 2022/04/10 08:53:17 nia Exp $
DISTNAME= xauth-1.1.1
CATEGORIES= x11
@@ -13,7 +13,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE
-X11_BUILTIN_NAME= xauth
+X11_BIN_NAME= xauth
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index 8c28e37bd12..05b5d0d6208 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/12/01 13:01:16 nia Exp $
+# $NetBSD: Makefile,v 1.10 2022/04/10 08:53:18 nia Exp $
DISTNAME= xbitmaps-1.1.2
CATEGORIES= x11 devel
@@ -11,6 +11,4 @@ COMMENT= Common X11 bitmaps
GNU_CONFIGURE= yes
-X11_BUILTIN_NAME= xbitmaps
-.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile
index 89ecb30f595..87f3260b0af 100644
--- a/x11/xcursor/Makefile
+++ b/x11/xcursor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2021/12/05 19:07:07 nia Exp $
+# $NetBSD: Makefile,v 1.30 2022/04/10 08:53:18 nia Exp $
#
DISTNAME= libXcursor-1.1.2
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+= xcursor.pc.in
BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
-X11_BUILTIN_NAME= xcursor
+X11_LIB= libXcursor
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
diff --git a/x11/xf86-input-acecad/Makefile b/x11/xf86-input-acecad/Makefile
index 59a79d75b57..22c8ec5dd64 100644
--- a/x11/xf86-input-acecad/Makefile
+++ b/x11/xf86-input-acecad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/12/03 12:50:13 nia Exp $
+# $NetBSD: Makefile,v 1.13 2022/04/10 08:53:18 nia Exp $
DISTNAME= xf86-input-acecad-1.5.0
PKGREVISION= 5
@@ -19,7 +19,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-input-acecad
+X11_DRV_NAME= acecad
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-input-elographics/Makefile b/x11/xf86-input-elographics/Makefile
index a40aa5f455c..65c30c9423e 100644
--- a/x11/xf86-input-elographics/Makefile
+++ b/x11/xf86-input-elographics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/12/03 12:50:13 nia Exp $
+# $NetBSD: Makefile,v 1.10 2022/04/10 08:53:18 nia Exp $
DISTNAME= xf86-input-elographics-1.4.2
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-input-elographics
+X11_DRV_NAME= elographics
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-input-fpit/Makefile b/x11/xf86-input-fpit/Makefile
index e7c48de8cc7..a58957bdfe0 100644
--- a/x11/xf86-input-fpit/Makefile
+++ b/x11/xf86-input-fpit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/12/03 12:50:13 nia Exp $
+# $NetBSD: Makefile,v 1.9 2022/04/10 08:53:18 nia Exp $
DISTNAME= xf86-input-fpit-1.4.0
PKGREVISION= 2
@@ -19,7 +19,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-input-fpit
+X11_DRV_NAME= fpit
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-input-hyperpen/Makefile b/x11/xf86-input-hyperpen/Makefile
index fe7319dd56e..6cb15acebb7 100644
--- a/x11/xf86-input-hyperpen/Makefile
+++ b/x11/xf86-input-hyperpen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/12/03 12:50:13 nia Exp $
+# $NetBSD: Makefile,v 1.10 2022/04/10 08:53:18 nia Exp $
DISTNAME= xf86-input-hyperpen-1.4.1
PKGREVISION= 2
@@ -20,7 +20,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-input-hyperpen
+X11_DRV_NAME= hyperpen
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-input-joystick/Makefile b/x11/xf86-input-joystick/Makefile
index 107572a89c4..e88f7d8dd85 100644
--- a/x11/xf86-input-joystick/Makefile
+++ b/x11/xf86-input-joystick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/12/03 12:50:13 nia Exp $
+# $NetBSD: Makefile,v 1.13 2022/04/10 08:53:18 nia Exp $
DISTNAME= xf86-input-joystick-1.6.3
PKGREVISION= 2
@@ -28,7 +28,7 @@ SUBST_FILES.usbhid+= src/backend_bsd.c
SUBST_SED.usbhid= -e 's,dev/usb/,bus/u4b/,g'
SUBST_MESSAGE.usbhid= Correct usbhid include paths
-X11_BUILTIN_NAME= xf86-input-joystick
+X11_DRV_NAME= joystick
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile
index bbb5a4c3914..c0603fb748d 100644
--- a/x11/xf86-input-keyboard/Makefile
+++ b/x11/xf86-input-keyboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/12/03 12:50:13 nia Exp $
+# $NetBSD: Makefile,v 1.31 2022/04/10 08:53:18 nia Exp $
DISTNAME= xf86-input-keyboard-1.9.0
PKGREVISION= 3
@@ -19,7 +19,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-input-keyboard
+X11_DRV_NAME= keyboard
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile
index 9e726286435..f404495e550 100644
--- a/x11/xf86-input-mouse/Makefile
+++ b/x11/xf86-input-mouse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2021/12/03 12:50:13 nia Exp $
+# $NetBSD: Makefile,v 1.34 2022/04/10 08:53:18 nia Exp $
DISTNAME= xf86-input-mouse-1.9.3
CATEGORIES= x11
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-input-mouse
+X11_DRV_NAME= mouse
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-input-mutouch/Makefile b/x11/xf86-input-mutouch/Makefile
index f86d3196e26..c382ef7fbdf 100644
--- a/x11/xf86-input-mutouch/Makefile
+++ b/x11/xf86-input-mutouch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/12/03 12:50:13 nia Exp $
+# $NetBSD: Makefile,v 1.10 2022/04/10 08:53:19 nia Exp $
DISTNAME= xf86-input-mutouch-1.3.0
PKGREVISION= 2
@@ -19,7 +19,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-input-mutouch
+X11_DRV_NAME= mutouch
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-input-penmount/Makefile b/x11/xf86-input-penmount/Makefile
index e8c5e72e9b1..9e858899a31 100644
--- a/x11/xf86-input-penmount/Makefile
+++ b/x11/xf86-input-penmount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/12/03 12:50:14 nia Exp $
+# $NetBSD: Makefile,v 1.13 2022/04/10 08:53:19 nia Exp $
DISTNAME= xf86-input-penmount-1.5.0
PKGREVISION= 5
@@ -19,7 +19,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-input-penmount
+X11_DRV_NAME= penmount
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-input-vmmouse/Makefile b/x11/xf86-input-vmmouse/Makefile
index 18a2385eb1b..0e8bc4b8e7b 100644
--- a/x11/xf86-input-vmmouse/Makefile
+++ b/x11/xf86-input-vmmouse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/12/03 12:50:14 nia Exp $
+# $NetBSD: Makefile,v 1.28 2022/04/10 08:53:19 nia Exp $
DISTNAME= xf86-input-vmmouse-13.1.0
PKGREVISION= 2
@@ -25,7 +25,7 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
# Currently libudev is unsupported in pkgsrc
CONFIGURE_ARGS+= --without-libudev
-X11_BUILTIN_NAME= xf86-input-vmmouse
+X11_DRV_NAME= vmmouse
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-input-void/Makefile b/x11/xf86-input-void/Makefile
index 7955096adc0..9d2bf9ae259 100644
--- a/x11/xf86-input-void/Makefile
+++ b/x11/xf86-input-void/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/12/03 12:50:14 nia Exp $
+# $NetBSD: Makefile,v 1.21 2022/04/10 08:53:19 nia Exp $
DISTNAME= xf86-input-void-1.4.1
PKGREVISION= 2
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-input-void
+X11_DRV_NAME= void
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-input-ws/Makefile b/x11/xf86-input-ws/Makefile
index 5ccfe456f58..4686857db72 100644
--- a/x11/xf86-input-ws/Makefile
+++ b/x11/xf86-input-ws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/12/03 12:50:14 nia Exp $
+# $NetBSD: Makefile,v 1.7 2022/04/10 08:53:19 nia Exp $
DISTNAME= xf86-input-ws-1.3.0.20151010
PKGREVISION= 2
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
RELRO_SUPPORTED= partial
-X11_BUILTIN_NAME= xf86-input-ws
+X11_DRV_NAME= ws
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-amdgpu/Makefile b/x11/xf86-video-amdgpu/Makefile
index 7da84032443..68be12702e0 100644
--- a/x11/xf86-video-amdgpu/Makefile
+++ b/x11/xf86-video-amdgpu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/12/02 18:15:25 nia Exp $
+# $NetBSD: Makefile,v 1.22 2022/04/10 08:53:19 nia Exp $
DISTNAME= xf86-video-amdgpu-19.1.0
CATEGORIES= x11
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-amdgpu
+X11_DRV_NAME= amdgpu
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libdrm/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-apm/Makefile b/x11/xf86-video-apm/Makefile
index fe56f6e0e0f..96b999c1b45 100644
--- a/x11/xf86-video-apm/Makefile
+++ b/x11/xf86-video-apm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:25 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/04/10 08:53:19 nia Exp $
DISTNAME= xf86-video-apm-1.3.0
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-apm
+X11_DRV_NAME= apm
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-ark/Makefile b/x11/xf86-video-ark/Makefile
index f63b06881ae..a9a7b79f33d 100644
--- a/x11/xf86-video-ark/Makefile
+++ b/x11/xf86-video-ark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/12/02 18:15:26 nia Exp $
+# $NetBSD: Makefile,v 1.22 2022/04/10 08:53:19 nia Exp $
DISTNAME= xf86-video-ark-0.7.5
PKGREVISION= 5
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-ark
+X11_DRV_NAME= ark
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-ast/Makefile b/x11/xf86-video-ast/Makefile
index 1cf0f7aa9a0..d636f5e3731 100644
--- a/x11/xf86-video-ast/Makefile
+++ b/x11/xf86-video-ast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:26 nia Exp $
+# $NetBSD: Makefile,v 1.25 2022/04/10 08:53:19 nia Exp $
DISTNAME= xf86-video-ast-1.1.5
PKGREVISION= 1
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-ast
+X11_DRV_NAME= ast
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile
index 7695e3e4584..d9d25bbc04e 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2021/12/02 18:15:26 nia Exp $
+# $NetBSD: Makefile,v 1.55 2022/04/10 08:53:20 nia Exp $
DISTNAME= xf86-video-ati-19.1.0
PKGREVISION= 1
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --enable-glamor
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-ati
+X11_DRV_NAME= ati
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../devel/zlib/buildlink3.mk"
BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.58
diff --git a/x11/xf86-video-chips/Makefile b/x11/xf86-video-chips/Makefile
index 2020ef78dfa..8c84c1404de 100644
--- a/x11/xf86-video-chips/Makefile
+++ b/x11/xf86-video-chips/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2021/12/02 18:15:26 nia Exp $
+# $NetBSD: Makefile,v 1.26 2022/04/10 08:53:20 nia Exp $
DISTNAME= xf86-video-chips-1.4.0
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-chips
+X11_DRV_NAME= chips
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-cirrus/Makefile b/x11/xf86-video-cirrus/Makefile
index 6c02b2a9357..b08136febfb 100644
--- a/x11/xf86-video-cirrus/Makefile
+++ b/x11/xf86-video-cirrus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:26 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/04/10 08:53:20 nia Exp $
DISTNAME= xf86-video-cirrus-1.5.3
PKGREVISION= 2
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-cirrus
+X11_DRV_NAME= cirrus
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-dummy/Makefile b/x11/xf86-video-dummy/Makefile
index 3454e2de9d0..9c8aadac4bc 100644
--- a/x11/xf86-video-dummy/Makefile
+++ b/x11/xf86-video-dummy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/12/02 18:15:26 nia Exp $
+# $NetBSD: Makefile,v 1.14 2022/04/10 08:53:20 nia Exp $
DISTNAME= xf86-video-dummy-0.3.8
PKGREVISION= 1
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-dummy
+X11_DRV_NAME= dummy
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-fbdev/Makefile b/x11/xf86-video-fbdev/Makefile
index d714369ae6e..b6fac4a2568 100644
--- a/x11/xf86-video-fbdev/Makefile
+++ b/x11/xf86-video-fbdev/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/12/02 18:15:26 nia Exp $
+# $NetBSD: Makefile,v 1.16 2022/04/10 08:53:20 nia Exp $
DISTNAME= xf86-video-fbdev-0.5.0
CATEGORIES= x11
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-fbdev
+X11_DRV_NAME= fbdev
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile
index 06be5b59f46..e939bd75e31 100644
--- a/x11/xf86-video-glint/Makefile
+++ b/x11/xf86-video-glint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:26 nia Exp $
+# $NetBSD: Makefile,v 1.25 2022/04/10 08:53:20 nia Exp $
DISTNAME= xf86-video-glint-1.2.9
PKGREVISION= 1
@@ -20,7 +20,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-glint
+X11_DRV_NAME= glint
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-i128/Makefile b/x11/xf86-video-i128/Makefile
index 0ac2716f524..ca6a309e9d6 100644
--- a/x11/xf86-video-i128/Makefile
+++ b/x11/xf86-video-i128/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:26 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/04/10 08:53:20 nia Exp $
DISTNAME= xf86-video-i128-1.4.0
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-i128
+X11_DRV_NAME= i128
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-i740/Makefile b/x11/xf86-video-i740/Makefile
index 379155d6c8e..d9806a729fc 100644
--- a/x11/xf86-video-i740/Makefile
+++ b/x11/xf86-video-i740/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2021/12/02 18:15:27 nia Exp $
+# $NetBSD: Makefile,v 1.26 2022/04/10 08:53:20 nia Exp $
DISTNAME= xf86-video-i740-1.4.0
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-i740
+X11_DRV_NAME= i740
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index 6e736d03730..f53c1d58d78 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2022/03/15 18:53:42 tnn Exp $
+# $NetBSD: Makefile,v 1.52 2022/04/10 08:53:21 nia Exp $
PKGNAME= xf86-video-intel-2.99.917.20210115
COMMIT_ID= 31486f40f8e8f8923ca0799aea84b58799754564
@@ -46,7 +46,7 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
pre-configure:
cd ${WRKSRC} && autoreconf -vif
-X11_BUILTIN_NAME= xf86-video-intel
+X11_DRV_NAME= intel
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-mach64/Makefile b/x11/xf86-video-mach64/Makefile
index dc314bcb9e1..b652a551717 100644
--- a/x11/xf86-video-mach64/Makefile
+++ b/x11/xf86-video-mach64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:27 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/04/10 08:53:21 nia Exp $
DISTNAME= xf86-video-mach64-6.9.6
CATEGORIES= x11
@@ -22,7 +22,7 @@ RELRO_SUPPORTED= partial
CPPFLAGS.SunOS+= -D__EXTENSIONS__
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-mach64
+X11_DRV_NAME= mach64
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
diff --git a/x11/xf86-video-mga/Makefile b/x11/xf86-video-mga/Makefile
index aae4f18ab4d..dc72ea0271a 100644
--- a/x11/xf86-video-mga/Makefile
+++ b/x11/xf86-video-mga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2021/12/02 18:15:27 nia Exp $
+# $NetBSD: Makefile,v 1.29 2022/04/10 08:53:21 nia Exp $
DISTNAME= xf86-video-mga-2.0.0
CATEGORIES= x11
@@ -19,7 +19,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-mga
+X11_DRV_NAME= mga
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-neomagic/Makefile b/x11/xf86-video-neomagic/Makefile
index 15647c8c07a..11ecdb2f443 100644
--- a/x11/xf86-video-neomagic/Makefile
+++ b/x11/xf86-video-neomagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:27 nia Exp $
+# $NetBSD: Makefile,v 1.25 2022/04/10 08:53:21 nia Exp $
DISTNAME= xf86-video-neomagic-1.3.0
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-neomagic
+X11_DRV_NAME= neomagic
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-nouveau/Makefile b/x11/xf86-video-nouveau/Makefile
index d25d248deaa..526861eb391 100644
--- a/x11/xf86-video-nouveau/Makefile
+++ b/x11/xf86-video-nouveau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/12/02 18:15:27 nia Exp $
+# $NetBSD: Makefile,v 1.16 2022/04/10 08:53:21 nia Exp $
DISTNAME= xf86-video-nouveau-1.0.16
CATEGORIES= x11
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-nouveau
+X11_DRV_NAME= nouveau
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
diff --git a/x11/xf86-video-nv/Makefile b/x11/xf86-video-nv/Makefile
index 20c1cfd92c9..cfc86b24ce6 100644
--- a/x11/xf86-video-nv/Makefile
+++ b/x11/xf86-video-nv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2021/12/02 18:15:27 nia Exp $
+# $NetBSD: Makefile,v 1.36 2022/04/10 08:53:21 nia Exp $
DISTNAME= xf86-video-nv-2.1.21
PKGREVISION= 1
@@ -19,7 +19,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-nv
+X11_DRV_NAME= nv
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
diff --git a/x11/xf86-video-openchrome/Makefile b/x11/xf86-video-openchrome/Makefile
index a4d550b8d6e..cfd82b6bfb1 100644
--- a/x11/xf86-video-openchrome/Makefile
+++ b/x11/xf86-video-openchrome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:27 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/04/10 08:53:21 nia Exp $
DISTNAME= xf86-video-openchrome-0.6.0
PKGREVISION= 1
@@ -29,7 +29,7 @@ PLIST_VARS+= XvMC
PLIST.XvMC= yes
.endif
-X11_BUILTIN_NAME= xf86-video-openchrome
+X11_DRV_NAME= openchrome
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/libXvMC/buildlink3.mk"
diff --git a/x11/xf86-video-qxl/Makefile b/x11/xf86-video-qxl/Makefile
index a057a069bf5..307e4db4d8e 100644
--- a/x11/xf86-video-qxl/Makefile
+++ b/x11/xf86-video-qxl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/12/02 18:15:28 nia Exp $
+# $NetBSD: Makefile,v 1.12 2022/04/10 08:53:21 nia Exp $
DISTNAME= xf86-video-qxl-0.1.5
PKGREVISION= 1
@@ -22,7 +22,7 @@ RELRO_SUPPORTED= partial
CPPFLAGS.SunOS+= -D__EXTENSIONS__
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-qxl
+X11_DRV_NAME= qxl
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libXext/buildlink3.mk"
BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.46
diff --git a/x11/xf86-video-r128/Makefile b/x11/xf86-video-r128/Makefile
index bdb085a3062..66cf0409081 100644
--- a/x11/xf86-video-r128/Makefile
+++ b/x11/xf86-video-r128/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2021/12/02 18:15:28 nia Exp $
+# $NetBSD: Makefile,v 1.26 2022/04/10 08:53:21 nia Exp $
DISTNAME= xf86-video-r128-6.12.0
CATEGORIES= x11
@@ -21,7 +21,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-r128
+X11_DRV_NAME= r128
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-rendition/Makefile b/x11/xf86-video-rendition/Makefile
index 5a3eebefb6e..2a2082ea2fe 100644
--- a/x11/xf86-video-rendition/Makefile
+++ b/x11/xf86-video-rendition/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:28 nia Exp $
+# $NetBSD: Makefile,v 1.25 2022/04/10 08:53:22 nia Exp $
DISTNAME= xf86-video-rendition-4.2.7
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-rendition
+X11_DRV_NAME= rendition
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-s3/Makefile b/x11/xf86-video-s3/Makefile
index eccddbf45c9..d4fa06f543d 100644
--- a/x11/xf86-video-s3/Makefile
+++ b/x11/xf86-video-s3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:28 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/04/10 08:53:22 nia Exp $
DISTNAME= xf86-video-s3-0.7.0
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-s3
+X11_DRV_NAME= s3
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-s3virge/Makefile b/x11/xf86-video-s3virge/Makefile
index 1c667eab094..939cd4814c0 100644
--- a/x11/xf86-video-s3virge/Makefile
+++ b/x11/xf86-video-s3virge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:28 nia Exp $
+# $NetBSD: Makefile,v 1.25 2022/04/10 08:53:22 nia Exp $
DISTNAME= xf86-video-s3virge-1.11.0
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-s3virage
+X11_DRV_NAME= s3virage
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-savage/Makefile b/x11/xf86-video-savage/Makefile
index 2fcc16f6332..18c044180d2 100644
--- a/x11/xf86-video-savage/Makefile
+++ b/x11/xf86-video-savage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/12/02 18:15:28 nia Exp $
+# $NetBSD: Makefile,v 1.27 2022/04/10 08:53:22 nia Exp $
DISTNAME= xf86-video-savage-2.3.9
PKGREVISION= 1
@@ -20,7 +20,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-savage
+X11_DRV_NAME= savage
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-siliconmotion/Makefile b/x11/xf86-video-siliconmotion/Makefile
index 0f0e0ab3091..2b56f3ae113 100644
--- a/x11/xf86-video-siliconmotion/Makefile
+++ b/x11/xf86-video-siliconmotion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:28 nia Exp $
+# $NetBSD: Makefile,v 1.25 2022/04/10 08:53:22 nia Exp $
DISTNAME= xf86-video-siliconmotion-1.7.9
PKGREVISION= 1
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-siliconmotion
+X11_DRV_NAME= siliconmotion
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile
index ab2a6dc6201..84adf615034 100644
--- a/x11/xf86-video-sis/Makefile
+++ b/x11/xf86-video-sis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2021/12/02 18:15:28 nia Exp $
+# $NetBSD: Makefile,v 1.32 2022/04/10 08:53:22 nia Exp $
DISTNAME= xf86-video-sis-0.12.0
CATEGORIES= x11
@@ -24,7 +24,7 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-sis
+X11_DRV_NAME= sis
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-suncg14/Makefile b/x11/xf86-video-suncg14/Makefile
index edee3db69a2..d9d62d8494b 100644
--- a/x11/xf86-video-suncg14/Makefile
+++ b/x11/xf86-video-suncg14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/12/02 18:17:54 nia Exp $
+# $NetBSD: Makefile,v 1.14 2022/04/10 08:53:22 nia Exp $
DISTNAME= xf86-video-suncg14-1.1.2
PKGREVISION= 5
@@ -23,7 +23,7 @@ ONLY_FOR_PLATFORM+= *-*-sparc *-*-sparc64
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-suncg14
+X11_DRV_NAME= suncg14
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-suncg3/Makefile b/x11/xf86-video-suncg3/Makefile
index 5c7d3086069..523d7476ccd 100644
--- a/x11/xf86-video-suncg3/Makefile
+++ b/x11/xf86-video-suncg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/12/02 18:17:54 nia Exp $
+# $NetBSD: Makefile,v 1.14 2022/04/10 08:53:22 nia Exp $
DISTNAME= xf86-video-suncg3-1.1.2
PKGREVISION= 5
@@ -21,7 +21,7 @@ ONLY_FOR_PLATFORM+= *-*-sparc *-*-sparc64
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-suncg3
+X11_DRV_NAME= suncg3
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-suncg6/Makefile b/x11/xf86-video-suncg6/Makefile
index ef1c8c10cf0..c503af8cb64 100644
--- a/x11/xf86-video-suncg6/Makefile
+++ b/x11/xf86-video-suncg6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/12/02 18:17:54 nia Exp $
+# $NetBSD: Makefile,v 1.10 2022/04/10 08:53:22 nia Exp $
DISTNAME= xf86-video-suncg6-1.1.2
PKGREVISION= 2
@@ -22,7 +22,7 @@ ONLY_FOR_PLATFORM+= *-*-sparc *-*-sparc64
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-suncg6
+X11_DRV_NAME= suncg6
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-sunffb/Makefile b/x11/xf86-video-sunffb/Makefile
index 3cf44ba223b..9932ad41e51 100644
--- a/x11/xf86-video-sunffb/Makefile
+++ b/x11/xf86-video-sunffb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/12/02 18:17:54 nia Exp $
+# $NetBSD: Makefile,v 1.14 2022/04/10 08:53:23 nia Exp $
DISTNAME= xf86-video-sunffb-1.2.2
PKGREVISION= 5
@@ -23,7 +23,7 @@ ONLY_FOR_PLATFORM+= *-*-sparc *-*-sparc64
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-sunffb
+X11_DRV_NAME= sunffb
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-sunleo/Makefile b/x11/xf86-video-sunleo/Makefile
index 20f1865c0b6..e384ac4a331 100644
--- a/x11/xf86-video-sunleo/Makefile
+++ b/x11/xf86-video-sunleo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/12/02 18:17:55 nia Exp $
+# $NetBSD: Makefile,v 1.7 2022/04/10 08:53:23 nia Exp $
DISTNAME= xf86-video-sunleo-1.2.2
PKGREVISION= 1
@@ -21,7 +21,7 @@ ONLY_FOR_PLATFORM+= *-*-sparc *-*-sparc64
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-sunleo
+X11_DRV_NAME= sunleo
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-suntcx/Makefile b/x11/xf86-video-suntcx/Makefile
index 00cce3c7b0e..308d4260918 100644
--- a/x11/xf86-video-suntcx/Makefile
+++ b/x11/xf86-video-suntcx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/12/02 18:17:55 nia Exp $
+# $NetBSD: Makefile,v 1.10 2022/04/10 08:53:23 nia Exp $
DISTNAME= xf86-video-suntcx-1.1.2
PKGREVISION= 2
@@ -22,7 +22,7 @@ ONLY_FOR_PLATFORM+= *-*-sparc *-*-sparc64
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-suntcx
+X11_DRV_NAME= suntcx
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile
index b5e71724831..f450b550121 100644
--- a/x11/xf86-video-tdfx/Makefile
+++ b/x11/xf86-video-tdfx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/12/02 18:15:29 nia Exp $
+# $NetBSD: Makefile,v 1.27 2022/04/10 08:53:23 nia Exp $
DISTNAME= xf86-video-tdfx-1.5.0
CATEGORIES= x11
@@ -19,7 +19,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-tdfx
+X11_DRV_NAME= tdfx
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-tga/Makefile b/x11/xf86-video-tga/Makefile
index cb555a5e476..9bf993da49f 100644
--- a/x11/xf86-video-tga/Makefile
+++ b/x11/xf86-video-tga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/12/02 18:15:29 nia Exp $
+# $NetBSD: Makefile,v 1.21 2022/04/10 08:53:23 nia Exp $
DISTNAME= xf86-video-tga-1.2.2
PKGREVISION= 5
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-tga
+X11_DRV_NAME= tga
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-trident/Makefile b/x11/xf86-video-trident/Makefile
index 313d4112e56..d7cbde9875f 100644
--- a/x11/xf86-video-trident/Makefile
+++ b/x11/xf86-video-trident/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:29 nia Exp $
+# $NetBSD: Makefile,v 1.25 2022/04/10 08:53:23 nia Exp $
DISTNAME= xf86-video-trident-1.3.8
PKGREVISION= 1
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-trident
+X11_DRV_NAME= trident
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-tseng/Makefile b/x11/xf86-video-tseng/Makefile
index 2ae5551f776..e6efd4df9c9 100644
--- a/x11/xf86-video-tseng/Makefile
+++ b/x11/xf86-video-tseng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/12/02 18:15:29 nia Exp $
+# $NetBSD: Makefile,v 1.23 2022/04/10 08:53:23 nia Exp $
DISTNAME= xf86-video-tseng-1.2.5
PKGREVISION= 5
@@ -18,7 +18,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-tseng
+X11_DRV_NAME= tseng
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-vboxvideo/Makefile b/x11/xf86-video-vboxvideo/Makefile
index 94661926f33..b55a81df46a 100644
--- a/x11/xf86-video-vboxvideo/Makefile
+++ b/x11/xf86-video-vboxvideo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/12/02 18:15:30 nia Exp $
+# $NetBSD: Makefile,v 1.7 2022/04/10 08:53:23 nia Exp $
DISTNAME= xf86-video-vboxvideo-1.0.0
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-vboxvideo
+X11_DRV_NAME= vboxvideo
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-vesa/Makefile b/x11/xf86-video-vesa/Makefile
index a6c28917f4e..476ae75a974 100644
--- a/x11/xf86-video-vesa/Makefile
+++ b/x11/xf86-video-vesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2021/12/02 18:15:30 nia Exp $
+# $NetBSD: Makefile,v 1.29 2022/04/10 08:53:23 nia Exp $
DISTNAME= xf86-video-vesa-2.5.0
CATEGORIES= x11
@@ -17,7 +17,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-vesa
+X11_DRV_NAME= vesa
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
diff --git a/x11/xf86-video-vmware/Makefile b/x11/xf86-video-vmware/Makefile
index 33035e5765f..0246b215e2e 100644
--- a/x11/xf86-video-vmware/Makefile
+++ b/x11/xf86-video-vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2021/12/02 18:15:30 nia Exp $
+# $NetBSD: Makefile,v 1.32 2022/04/10 08:53:24 nia Exp $
DISTNAME= xf86-video-vmware-13.3.0
CATEGORIES= x11
@@ -35,7 +35,7 @@ pre-configure:
find ${BUILDLINK_DIR} -name xatracker.pc -delete
.endif
-X11_BUILTIN_NAME= xf86-video-vmware
+X11_DRV_NAME= vmware
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-voodoo/Makefile b/x11/xf86-video-voodoo/Makefile
index 65a018373e3..9511081f3ab 100644
--- a/x11/xf86-video-voodoo/Makefile
+++ b/x11/xf86-video-voodoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/12/02 18:15:30 nia Exp $
+# $NetBSD: Makefile,v 1.9 2022/04/10 08:53:24 nia Exp $
DISTNAME= xf86-video-voodoo-1.2.5
PKGREVISION= 2
@@ -21,7 +21,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-voodoo
+X11_DRV_NAME= voodoo
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../sysutils/libpciaccess/buildlink3.mk"
diff --git a/x11/xf86-video-wsfb/Makefile b/x11/xf86-video-wsfb/Makefile
index 226ca5fc685..84a103cc65e 100644
--- a/x11/xf86-video-wsfb/Makefile
+++ b/x11/xf86-video-wsfb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:30 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/04/10 08:53:24 nia Exp $
DISTNAME= xf86-video-wsfb-0.4.0
PKGREVISION= 9
@@ -20,7 +20,7 @@ RELRO_SUPPORTED= partial
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-X11_BUILTIN_NAME= xf86-video-wsfb
+X11_DRV_NAME= wsfb
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index e0a028fcc5c..f4ae25903bd 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2021/12/03 13:03:19 nia Exp $
+# $NetBSD: Makefile,v 1.30 2022/04/10 08:53:24 nia Exp $
DISTNAME= xinit-1.4.1
CATEGORIES= x11
@@ -24,7 +24,7 @@ INSTALL_MAKE_FLAGS+= xinitrcdir=${PREFIX}/share/examples/xinit
CONF_FILES= ${PREFIX}/share/examples/xinit/xinitrc ${PREFIX}/etc/X11/xinit/xinitrc
MAKE_DIRS= ${PREFIX}/etc/X11/xinit
-X11_BUILTIN_NAME= xinit
+X11_BIN_NAME= xinit
.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index e1f1e4bc796..0125e8fea67 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2021/12/01 13:01:17 nia Exp $
+# $NetBSD: Makefile,v 1.30 2022/04/10 08:53:24 nia Exp $
DISTNAME= xtrans-1.4.0
CATEGORIES= x11 net
@@ -13,6 +13,4 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= xtrans.pc.in
-X11_BUILTIN_NAME= xtrans
-.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../mk/bsd.pkg.mk"