xf86-video-*: Add avoid-duplicate.mk

42 files changed, 128 insertions, 47 deletions

diff --git a/x11/xf86-video-amdgpu/Makefile b/x11/xf86-video-amdgpu/Makefile
index b35c780babe..7da84032443 100644
--- a/x11/xf86-video-amdgpu/Makefile
+++ b/x11/xf86-video-amdgpu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/11/02 08:20:25 nia Exp $
+# $NetBSD: Makefile,v 1.21 2021/12/02 18:15:25 nia Exp $
 
 DISTNAME=	xf86-video-amdgpu-19.1.0
 CATEGORIES=	x11
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-amdgpu
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-apm/Makefile b/x11/xf86-video-apm/Makefile
index fe61b1aa072..fe56f6e0e0f 100644
--- a/x11/xf86-video-apm/Makefile
+++ b/x11/xf86-video-apm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/11/02 08:20:25 nia Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:25 nia Exp $
 
 DISTNAME=	xf86-video-apm-1.3.0
 CATEGORIES=	x11
@@ -17,6 +17,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-apm
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-ark/Makefile b/x11/xf86-video-ark/Makefile
index 02192017c60..f63b06881ae 100644
--- a/x11/xf86-video-ark/Makefile
+++ b/x11/xf86-video-ark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/11/02 08:20:25 nia Exp $
+# $NetBSD: Makefile,v 1.21 2021/12/02 18:15:26 nia Exp $
 
 DISTNAME=	xf86-video-ark-0.7.5
 PKGREVISION=	5
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-ark
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-ast/Makefile b/x11/xf86-video-ast/Makefile
index 79fe0070e20..1cf0f7aa9a0 100644
--- a/x11/xf86-video-ast/Makefile
+++ b/x11/xf86-video-ast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/11/02 08:20:25 nia Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:26 nia Exp $
 
 DISTNAME=	xf86-video-ast-1.1.5
 PKGREVISION=	1
@@ -18,5 +18,7 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-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 59c19d0454e..7695e3e4584 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2021/11/02 08:20:25 nia Exp $
+# $NetBSD: Makefile,v 1.54 2021/12/02 18:15:26 nia Exp $
 
 DISTNAME=	xf86-video-ati-19.1.0
 PKGREVISION=	1
@@ -25,11 +25,12 @@ CONFIGURE_ARGS+=	--enable-glamor
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
-BUILDLINK_API_DEPENDS.modular-xorg-server+=	modular-xorg-server>=1.18.1
-.include "../../x11/modular-xorg-server/buildlink3.mk"
-
+X11_BUILTIN_NAME=	xf86-video-ati
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.58
 .include "../../x11/libdrm/buildlink3.mk"
+BUILDLINK_API_DEPENDS.modular-xorg-server+=	modular-xorg-server>=1.18.1
+.include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-chips/Makefile b/x11/xf86-video-chips/Makefile
index 981d2785f8f..2020ef78dfa 100644
--- a/x11/xf86-video-chips/Makefile
+++ b/x11/xf86-video-chips/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/11/02 08:20:26 nia Exp $
+# $NetBSD: Makefile,v 1.25 2021/12/02 18:15:26 nia Exp $
 
 DISTNAME=	xf86-video-chips-1.4.0
 CATEGORIES=	x11
@@ -17,6 +17,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-chips
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-cirrus/Makefile b/x11/xf86-video-cirrus/Makefile
index 78f942d5b53..6c02b2a9357 100644
--- a/x11/xf86-video-cirrus/Makefile
+++ b/x11/xf86-video-cirrus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/11/02 08:20:26 nia Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:26 nia Exp $
 
 DISTNAME=	xf86-video-cirrus-1.5.3
 PKGREVISION=	2
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-cirrus
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-dummy/Makefile b/x11/xf86-video-dummy/Makefile
index 0b571e7296c..3454e2de9d0 100644
--- a/x11/xf86-video-dummy/Makefile
+++ b/x11/xf86-video-dummy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/11/02 08:20:26 nia Exp $
+# $NetBSD: Makefile,v 1.13 2021/12/02 18:15:26 nia Exp $
 
 DISTNAME=	xf86-video-dummy-0.3.8
 PKGREVISION=	1
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-dummy
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
diff --git a/x11/xf86-video-fbdev/Makefile b/x11/xf86-video-fbdev/Makefile
index 5f35927518d..d714369ae6e 100644
--- a/x11/xf86-video-fbdev/Makefile
+++ b/x11/xf86-video-fbdev/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/11/02 08:20:26 nia Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/02 18:15:26 nia Exp $
 
 DISTNAME=	xf86-video-fbdev-0.5.0
 CATEGORIES=	x11
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-fbdev
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile
index 49386c61a47..06be5b59f46 100644
--- a/x11/xf86-video-glint/Makefile
+++ b/x11/xf86-video-glint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/11/02 08:20:26 nia Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:26 nia Exp $
 
 DISTNAME=	xf86-video-glint-1.2.9
 PKGREVISION=	1
@@ -20,6 +20,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-glint
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-i128/Makefile b/x11/xf86-video-i128/Makefile
index ef7c004af6f..0ac2716f524 100644
--- a/x11/xf86-video-i128/Makefile
+++ b/x11/xf86-video-i128/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/11/02 08:20:26 nia Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:26 nia Exp $
 
 DISTNAME=	xf86-video-i128-1.4.0
 CATEGORIES=	x11
@@ -17,6 +17,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-i128
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-i740/Makefile b/x11/xf86-video-i740/Makefile
index 9aadfde7dfc..379155d6c8e 100644
--- a/x11/xf86-video-i740/Makefile
+++ b/x11/xf86-video-i740/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/11/02 08:20:27 nia Exp $
+# $NetBSD: Makefile,v 1.25 2021/12/02 18:15:27 nia Exp $
 
 DISTNAME=	xf86-video-i740-1.4.0
 CATEGORIES=	x11
@@ -17,6 +17,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-i740
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index 708e0465f90..de83c74826c 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2021/11/09 12:04:43 nia Exp $
+# $NetBSD: Makefile,v 1.49 2021/12/02 18:15:27 nia Exp $
 
 PKGNAME=	xf86-video-intel-2.99.917.20200515
 COMMIT_ID=	5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc
@@ -42,6 +42,8 @@ BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.7
 pre-configure:
 	cd ${WRKSRC} && autoreconf -vif
 
+X11_BUILTIN_NAME=	xf86-video-intel
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
diff --git a/x11/xf86-video-mach64/Makefile b/x11/xf86-video-mach64/Makefile
index f10791eec5a..dc314bcb9e1 100644
--- a/x11/xf86-video-mach64/Makefile
+++ b/x11/xf86-video-mach64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/11/02 08:20:27 nia Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:27 nia Exp $
 
 DISTNAME=	xf86-video-mach64-6.9.6
 CATEGORIES=	x11
@@ -22,6 +22,8 @@ RELRO_SUPPORTED=	partial
 CPPFLAGS.SunOS+=	-D__EXTENSIONS__
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-mach64
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-mga/Makefile b/x11/xf86-video-mga/Makefile
index 8465ddb1107..aae4f18ab4d 100644
--- a/x11/xf86-video-mga/Makefile
+++ b/x11/xf86-video-mga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/11/02 08:20:27 nia Exp $
+# $NetBSD: Makefile,v 1.28 2021/12/02 18:15:27 nia Exp $
 
 DISTNAME=	xf86-video-mga-2.0.0
 CATEGORIES=	x11
@@ -19,6 +19,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-mga
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-neomagic/Makefile b/x11/xf86-video-neomagic/Makefile
index 3137de88d64..15647c8c07a 100644
--- a/x11/xf86-video-neomagic/Makefile
+++ b/x11/xf86-video-neomagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/11/02 08:20:27 nia Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:27 nia Exp $
 
 DISTNAME=	xf86-video-neomagic-1.3.0
 CATEGORIES=	x11
@@ -17,5 +17,7 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-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 6b074df6b56..d25d248deaa 100644
--- a/x11/xf86-video-nouveau/Makefile
+++ b/x11/xf86-video-nouveau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/11/02 08:20:28 nia Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/02 18:15:27 nia Exp $
 
 DISTNAME=	xf86-video-nouveau-1.0.16
 CATEGORIES=	x11
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-nouveau
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-nv/Makefile b/x11/xf86-video-nv/Makefile
index d4d0692cc8e..20c1cfd92c9 100644
--- a/x11/xf86-video-nv/Makefile
+++ b/x11/xf86-video-nv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2021/11/02 08:20:28 nia Exp $
+# $NetBSD: Makefile,v 1.35 2021/12/02 18:15:27 nia Exp $
 
 DISTNAME=	xf86-video-nv-2.1.21
 PKGREVISION=	1
@@ -19,8 +19,9 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-nv
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-
 .include "../../x11/libdrm/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/xf86-video-openchrome/Makefile b/x11/xf86-video-openchrome/Makefile
index 038e97164a9..a4d550b8d6e 100644
--- a/x11/xf86-video-openchrome/Makefile
+++ b/x11/xf86-video-openchrome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/11/02 08:20:28 nia Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:27 nia Exp $
 
 DISTNAME=	xf86-video-openchrome-0.6.0
 PKGREVISION=	1
@@ -29,6 +29,8 @@ PLIST_VARS+=		XvMC
 PLIST.XvMC=		yes
 .endif
 
+X11_BUILTIN_NAME=	xf86-video-openchrome
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/libXvMC/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xf86-video-qxl/Makefile b/x11/xf86-video-qxl/Makefile
index fd80fee6638..a057a069bf5 100644
--- a/x11/xf86-video-qxl/Makefile
+++ b/x11/xf86-video-qxl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/11/02 08:20:28 nia Exp $
+# $NetBSD: Makefile,v 1.11 2021/12/02 18:15:28 nia Exp $
 
 DISTNAME=	xf86-video-qxl-0.1.5
 PKGREVISION=	1
@@ -22,6 +22,8 @@ RELRO_SUPPORTED=	partial
 CPPFLAGS.SunOS+=	-D__EXTENSIONS__
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-qxl
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/libXext/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.46
 .include "../../x11/libdrm/buildlink3.mk"
diff --git a/x11/xf86-video-r128/Makefile b/x11/xf86-video-r128/Makefile
index 39f1279ca3f..bdb085a3062 100644
--- a/x11/xf86-video-r128/Makefile
+++ b/x11/xf86-video-r128/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/11/02 08:20:28 nia Exp $
+# $NetBSD: Makefile,v 1.25 2021/12/02 18:15:28 nia Exp $
 
 DISTNAME=	xf86-video-r128-6.12.0
 CATEGORIES=	x11
@@ -21,8 +21,9 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-r128
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-rendition/Makefile b/x11/xf86-video-rendition/Makefile
index 6442b74db0c..5a3eebefb6e 100644
--- a/x11/xf86-video-rendition/Makefile
+++ b/x11/xf86-video-rendition/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/11/02 08:20:28 nia Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:28 nia Exp $
 
 DISTNAME=	xf86-video-rendition-4.2.7
 CATEGORIES=	x11
@@ -17,6 +17,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-rendition
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-s3/Makefile b/x11/xf86-video-s3/Makefile
index 18291d659cc..eccddbf45c9 100644
--- a/x11/xf86-video-s3/Makefile
+++ b/x11/xf86-video-s3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/11/02 08:20:28 nia Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:28 nia Exp $
 
 DISTNAME=	xf86-video-s3-0.7.0
 CATEGORIES=	x11
@@ -17,6 +17,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-s3
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-s3virge/Makefile b/x11/xf86-video-s3virge/Makefile
index 7bf9aeb659d..1c667eab094 100644
--- a/x11/xf86-video-s3virge/Makefile
+++ b/x11/xf86-video-s3virge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/11/02 08:20:28 nia Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:28 nia Exp $
 
 DISTNAME=	xf86-video-s3virge-1.11.0
 CATEGORIES=	x11
@@ -17,6 +17,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-s3virage
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-savage/Makefile b/x11/xf86-video-savage/Makefile
index d0d1404df84..2fcc16f6332 100644
--- a/x11/xf86-video-savage/Makefile
+++ b/x11/xf86-video-savage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2021/11/02 08:20:28 nia Exp $
+# $NetBSD: Makefile,v 1.26 2021/12/02 18:15:28 nia Exp $
 
 DISTNAME=	xf86-video-savage-2.3.9
 PKGREVISION=	1
@@ -20,6 +20,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-savage
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-siliconmotion/Makefile b/x11/xf86-video-siliconmotion/Makefile
index 63217d7f8a0..0f0e0ab3091 100644
--- a/x11/xf86-video-siliconmotion/Makefile
+++ b/x11/xf86-video-siliconmotion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/11/02 08:20:29 nia Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:28 nia Exp $
 
 DISTNAME=	xf86-video-siliconmotion-1.7.9
 PKGREVISION=	1
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-siliconmotion
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile
index f24fd9cf8a0..ab2a6dc6201 100644
--- a/x11/xf86-video-sis/Makefile
+++ b/x11/xf86-video-sis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/11/02 08:20:29 nia Exp $
+# $NetBSD: Makefile,v 1.31 2021/12/02 18:15:28 nia Exp $
 
 DISTNAME=	xf86-video-sis-0.12.0
 CATEGORIES=	x11
@@ -24,6 +24,8 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-sis
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-suncg14/Makefile b/x11/xf86-video-suncg14/Makefile
index 4734264e54a..c13a5a9f02a 100644
--- a/x11/xf86-video-suncg14/Makefile
+++ b/x11/xf86-video-suncg14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/11/02 08:20:29 nia Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/02 18:15:28 nia Exp $
 
 DISTNAME=	xf86-video-suncg14-1.1.2
 PKGREVISION=	5
@@ -21,6 +21,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-suncg14
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
diff --git a/x11/xf86-video-suncg3/Makefile b/x11/xf86-video-suncg3/Makefile
index add579cb842..b5bcfac5363 100644
--- a/x11/xf86-video-suncg3/Makefile
+++ b/x11/xf86-video-suncg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/11/02 08:20:29 nia Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/02 18:15:29 nia Exp $
 
 DISTNAME=	xf86-video-suncg3-1.1.2
 PKGREVISION=	5
@@ -19,6 +19,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-suncg3
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
diff --git a/x11/xf86-video-suncg6/Makefile b/x11/xf86-video-suncg6/Makefile
index c7bb0b17129..d20828179be 100644
--- a/x11/xf86-video-suncg6/Makefile
+++ b/x11/xf86-video-suncg6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/02 08:20:29 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/02 18:15:29 nia Exp $
 
 DISTNAME=	xf86-video-suncg6-1.1.2
 PKGREVISION=	2
@@ -20,6 +20,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-suncg6
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
diff --git a/x11/xf86-video-sunffb/Makefile b/x11/xf86-video-sunffb/Makefile
index 792729e106b..e9114234c96 100644
--- a/x11/xf86-video-sunffb/Makefile
+++ b/x11/xf86-video-sunffb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/11/02 08:20:29 nia Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/02 18:15:29 nia Exp $
 
 DISTNAME=	xf86-video-sunffb-1.2.2
 PKGREVISION=	5
@@ -21,6 +21,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-sunffb
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
diff --git a/x11/xf86-video-sunleo/Makefile b/x11/xf86-video-sunleo/Makefile
index 23bac9683f6..9ed065b34b8 100644
--- a/x11/xf86-video-sunleo/Makefile
+++ b/x11/xf86-video-sunleo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/11/02 08:20:29 nia Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/02 18:15:29 nia Exp $
 
 DISTNAME=	xf86-video-sunleo-1.2.2
 PKGREVISION=	1
@@ -19,6 +19,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-sunleo
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-suntcx/Makefile b/x11/xf86-video-suntcx/Makefile
index feb0804ee90..093a3127816 100644
--- a/x11/xf86-video-suntcx/Makefile
+++ b/x11/xf86-video-suntcx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/02 08:20:29 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/02 18:15:29 nia Exp $
 
 DISTNAME=	xf86-video-suntcx-1.1.2
 PKGREVISION=	2
@@ -20,6 +20,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-suntcx
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile
index 394e7046c91..b5e71724831 100644
--- a/x11/xf86-video-tdfx/Makefile
+++ b/x11/xf86-video-tdfx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2021/11/02 08:20:29 nia Exp $
+# $NetBSD: Makefile,v 1.26 2021/12/02 18:15:29 nia Exp $
 
 DISTNAME=	xf86-video-tdfx-1.5.0
 CATEGORIES=	x11
@@ -19,6 +19,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-tdfx
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-tga/Makefile b/x11/xf86-video-tga/Makefile
index 837dc73ed0d..cb555a5e476 100644
--- a/x11/xf86-video-tga/Makefile
+++ b/x11/xf86-video-tga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2021/11/02 08:20:30 nia Exp $
+# $NetBSD: Makefile,v 1.20 2021/12/02 18:15:29 nia Exp $
 
 DISTNAME=	xf86-video-tga-1.2.2
 PKGREVISION=	5
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-tga
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-trident/Makefile b/x11/xf86-video-trident/Makefile
index 53843f01ba3..313d4112e56 100644
--- a/x11/xf86-video-trident/Makefile
+++ b/x11/xf86-video-trident/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/11/02 08:20:30 nia Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/02 18:15:29 nia Exp $
 
 DISTNAME=	xf86-video-trident-1.3.8
 PKGREVISION=	1
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-trident
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-tseng/Makefile b/x11/xf86-video-tseng/Makefile
index 1b0d5ea524d..2ae5551f776 100644
--- a/x11/xf86-video-tseng/Makefile
+++ b/x11/xf86-video-tseng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/11/02 08:20:30 nia Exp $
+# $NetBSD: Makefile,v 1.22 2021/12/02 18:15:29 nia Exp $
 
 DISTNAME=	xf86-video-tseng-1.2.5
 PKGREVISION=	5
@@ -18,6 +18,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-tseng
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-vboxvideo/Makefile b/x11/xf86-video-vboxvideo/Makefile
index 689ebd097f0..94661926f33 100644
--- a/x11/xf86-video-vboxvideo/Makefile
+++ b/x11/xf86-video-vboxvideo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/11/02 08:20:30 nia Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/02 18:15:30 nia Exp $
 
 DISTNAME=	xf86-video-vboxvideo-1.0.0
 CATEGORIES=	x11
@@ -17,5 +17,7 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-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 bb11ce7dbc2..a6c28917f4e 100644
--- a/x11/xf86-video-vesa/Makefile
+++ b/x11/xf86-video-vesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/11/02 08:20:30 nia Exp $
+# $NetBSD: Makefile,v 1.28 2021/12/02 18:15:30 nia Exp $
 
 DISTNAME=	xf86-video-vesa-2.5.0
 CATEGORIES=	x11
@@ -17,6 +17,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-vesa
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/xf86-video-vmware/Makefile b/x11/xf86-video-vmware/Makefile
index a09b001e557..33035e5765f 100644
--- a/x11/xf86-video-vmware/Makefile
+++ b/x11/xf86-video-vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/11/02 08:20:30 nia Exp $
+# $NetBSD: Makefile,v 1.31 2021/12/02 18:15:30 nia Exp $
 
 DISTNAME=	xf86-video-vmware-13.3.0
 CATEGORIES=	x11
@@ -35,6 +35,8 @@ pre-configure:
 	find ${BUILDLINK_DIR} -name xatracker.pc -delete
 .endif
 
+X11_BUILTIN_NAME=	xf86-video-vmware
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=	build
diff --git a/x11/xf86-video-voodoo/Makefile b/x11/xf86-video-voodoo/Makefile
index 917d54c2e9d..65a018373e3 100644
--- a/x11/xf86-video-voodoo/Makefile
+++ b/x11/xf86-video-voodoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/02 08:20:30 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/02 18:15:30 nia Exp $
 
 DISTNAME=	xf86-video-voodoo-1.2.5
 PKGREVISION=	2
@@ -21,6 +21,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-voodoo
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
diff --git a/x11/xf86-video-wsfb/Makefile b/x11/xf86-video-wsfb/Makefile
index fdc79697015..226ca5fc685 100644
--- a/x11/xf86-video-wsfb/Makefile
+++ b/x11/xf86-video-wsfb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/11/02 08:20:30 nia Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/02 18:15:30 nia Exp $
 
 DISTNAME=	xf86-video-wsfb-0.4.0
 PKGREVISION=	9
@@ -20,6 +20,8 @@ RELRO_SUPPORTED=	partial
 
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
+X11_BUILTIN_NAME=	xf86-video-wsfb
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"