x11: Add avoid-duplicate.mk to Xorg library packages

38 files changed, 115 insertions, 60 deletions

diff --git a/x11/libFS/Makefile b/x11/libFS/Makefile
index f4c3b3b7457..ea4b496a0d0 100644
--- a/x11/libFS/Makefile
+++ b/x11/libFS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/01/18 23:35:50 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2021/12/01 13:01:12 nia Exp $
 
 DISTNAME=		libFS-1.0.8
 CATEGORIES=		x11 devel
@@ -17,8 +17,9 @@ PKGCONFIG_OVERRIDE+=	libfs.pc.in
 
 CONFIGURE_ARGS.NetBSD+=	--disable-malloc0returnsnull
 
+X11_BUILTIN_NAME?=		libFS
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 7c385c55690..eeafa4effbe 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/01/18 23:35:50 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:12 nia Exp $
 
 DISTNAME=		libICE-1.0.10
 CATEGORIES=		x11 devel
@@ -17,8 +17,9 @@ PKGCONFIG_OVERRIDE+=	ice.pc.in
 
 .include "options.mk"
 
+X11_BUILTIN_NAME?=		libICE
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index e092f3fc9dd..940e16083dc 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/01/18 23:35:50 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2021/12/01 13:01:13 nia Exp $
 
 DISTNAME=		libSM-1.2.3
 CATEGORIES=		x11 devel
@@ -19,8 +19,9 @@ CONFIGURE_ARGS+=	--without-libuuid
 
 .include "options.mk"
 
+X11_BUILTIN_NAME?=		libSM
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index e96b7f9619f..4d1102b90f9 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2021/06/06 21:05:08 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2021/12/01 13:01:13 nia Exp $
 
 DISTNAME=		libX11-1.7.2
 CATEGORIES=		x11 devel
@@ -44,6 +44,8 @@ CONFIGURE_ENV+=		CC_FOR_BUILD=${NATIVE_CC:Q}
 TOOL_DEPENDS+=		xorgproto-[0-9]*:../../x11/xorgproto
 .endif
 
+X11_BUILTIN_NAME?=		libX11
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 4aa866f36c9..e43f00d14d8 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/01/18 23:35:50 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/01 13:01:13 nia Exp $
 
 DISTNAME=		libXScrnSaver-1.2.3
 CATEGORIES=		x11
@@ -17,8 +17,9 @@ PKGCONFIG_OVERRIDE+=	xscrnsaver.pc.in
 
 CONFIGURE_ARGS.NetBSD+=	--disable-malloc0returnsnull
 
+X11_BUILTIN_NAME?=		libXScrnSaver
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index f0791eebb50..b24a35443dc 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/01/18 23:35:50 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2021/12/01 13:01:13 nia Exp $
 
 DISTNAME=		libXau-1.0.9
 CATEGORIES=		x11 devel
@@ -20,8 +20,9 @@ PKGCONFIG_OVERRIDE+=	xau.pc.in
 
 CPPFLAGS.OSF1+=		-pthread # Required by compiler if including pthread.h
 
+X11_BUILTIN_NAME?=		libXau
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index abbdac39312..ac70ea2cb9c 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/01 13:01:13 nia Exp $
 
 DISTNAME=		libXcomposite-0.4.5
 CATEGORIES=		x11 devel
@@ -16,9 +16,10 @@ USE_TOOLS+=		pkg-config
 
 PKGCONFIG_OVERRIDE+=	xcomposite.pc.in
 
+X11_BUILTIN_NAME?=		libXcomposite
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 0f57cd0b3d2..c961358c336 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2021/12/01 13:01:13 nia Exp $
 
 DISTNAME=		libXdamage-1.1.5
 CATEGORIES=		x11 devel
@@ -16,6 +16,8 @@ USE_TOOLS+=		pkg-config
 
 PKGCONFIG_OVERRIDE+=	xdamage.pc.in
 
+X11_BUILTIN_NAME?=		libXdamage
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 7a257ef001a..2822246ebd4 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/01 13:01:13 nia Exp $
 
 DISTNAME=		libXdmcp-1.1.3
 CATEGORIES=		x11
@@ -14,7 +14,8 @@ USE_TOOLS+=		pkg-config
 PKGCONFIG_OVERRIDE+=	xdmcp.pc.in
 GNU_CONFIGURE=		yes
 
+X11_BUILTIN_NAME?=		libXdmcp
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 328e34dc951..f6ecffbbcd6 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2021/12/01 13:01:13 nia Exp $
 
 DISTNAME=		libXext-1.3.4
 CATEGORIES=		x11 devel
@@ -24,6 +24,8 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
 
+X11_BUILTIN_NAME?=		libXext
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.6
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index 29de036d4ea..f18121b4626 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/01 13:01:13 nia Exp $
 
 DISTNAME=		libXfixes-5.0.3
 PKGREVISION=		1
@@ -19,6 +19,8 @@ USE_TOOLS+=		pkg-config
 CONFIGURE_ENV+=		LIB_MAN_SUFFIX=3
 PKGCONFIG_OVERRIDE+=	xfixes.pc.in
 
+X11_BUILTIN_NAME?=		libXfixes
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libX11+=		libX11>=1.6
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile
index aa9b5d31f37..285eae7cde5 100644
--- a/x11/libXfont/Makefile
+++ b/x11/libXfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2021/12/01 13:01:14 nia Exp $
 
 DISTNAME=		libXfont-1.5.4
 PKGREVISION=		2
@@ -20,12 +20,12 @@ PKGCONFIG_OVERRIDE+=	xfont.pc.in
 
 CONFIGURE_ARGS+=	--disable-devel-docs
 
+X11_BUILTIN_NAME?=		libXfont
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/libfontenc/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXfont2/Makefile b/x11/libXfont2/Makefile
index 4c311212891..b0bf2982756 100644
--- a/x11/libXfont2/Makefile
+++ b/x11/libXfont2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/08/02 10:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/01 13:01:14 nia Exp $
 
 DISTNAME=		libXfont2-2.0.5
 CATEGORIES=		x11 devel fonts
@@ -20,8 +20,9 @@ PKGCONFIG_OVERRIDE+=	xfont2.pc.in
 CONFIGURE_ARGS+=	--disable-devel-docs
 CPPFLAGS.NetBSD+=	-D_OPENBSD_SOURCE
 
+X11_BUILTIN_NAME?=		libXfont2
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/libfontenc/buildlink3.mk"
diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile
index e4d2a2a82b8..194a7cd18b7 100644
--- a/x11/libXft/Makefile
+++ b/x11/libXft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/08/02 10:47:05 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/01 13:01:14 nia Exp $
 
 DISTNAME=	libXft-2.3.4
 CATEGORIES=	x11 fonts
@@ -16,6 +16,8 @@ USE_LIBTOOL=		YES
 USE_TOOLS+=		pkg-config
 PKGCONFIG_OVERRIDE=	xft.pc.in
 
+X11_BUILTIN_NAME?=		libXft
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 8732bf86aaa..0f9c46cb116 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2021/09/16 08:39:06 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2021/12/01 13:01:14 nia Exp $
 
 DISTNAME=		libXi-1.8
 CATEGORIES=		x11 devel
@@ -19,6 +19,8 @@ PKGCONFIG_OVERRIDE+=	xi.pc.in
 
 CONFIGURE_ARGS.NetBSD+=	--disable-malloc0returnsnull
 
+X11_BUILTIN_NAME?=		libXi
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 BUILDLINK_API_DEPENDS.libX11+=		libX11>=1.6
 BUILDLINK_API_DEPENDS.libXext+=		libXext>=1.1
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 6ad91bded98..87bca7122c9 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/01/18 23:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2021/12/01 13:01:14 nia Exp $
 
 DISTNAME=	libXinerama-1.1.4
 CATEGORIES=	x11
@@ -18,8 +18,9 @@ PKGCONFIG_OVERRIDE+=	xinerama.pc.in
 
 CONFIGURE_ARGS.NetBSD+=	--disable-malloc0returnsnull
 
+X11_BUILTIN_NAME?=		libXinerama
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/libXmu/Makefile b/x11/libXmu/Makefile
index 2f67746b886..f4f6239b380 100644
--- a/x11/libXmu/Makefile
+++ b/x11/libXmu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/01/18 23:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/01 13:01:14 nia Exp $
 
 DISTNAME=		libXmu-1.1.3
 CATEGORIES=		x11 devel
@@ -15,10 +15,9 @@ PKGCONFIG_OVERRIDE+=	xmuu.pc.in
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 
+X11_BUILTIN_NAME?=		libXmu
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index d304eab2c67..b8e2ea138b4 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/01/18 23:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2021/12/01 13:01:14 nia Exp $
 
 DISTNAME=		libXpm-3.5.13
 CATEGORIES=		graphics x11
@@ -40,8 +40,9 @@ CONFIGURE_ARGS+=	XPM_CFLAGS=${XPM_CFLAGS:Q} \
 			SXPM_LIBS=${SXPM_LIBS:Q}
 .endif
 
+X11_BUILTIN_NAME?=		libXmu
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/libXpresent/Makefile b/x11/libXpresent/Makefile
index b7f8b166fc0..ec9c67fffb5 100644
--- a/x11/libXpresent/Makefile
+++ b/x11/libXpresent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/18 23:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/01 13:01:14 nia Exp $
 
 DISTNAME=		libXpresent-1.0.0
 PKGREVISION=		1
@@ -15,6 +15,8 @@ USE_TOOLS+=		pkg-config
 PKGCONFIG_OVERRIDE+=	xpresent.pc.in
 GNU_CONFIGURE=		yes
 
+X11_BUILTIN_NAME?=		libXpresent
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 3b12cddd1dc..5eda8e1926c 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/01/18 23:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/01 13:01:15 nia Exp $
 
 DISTNAME=		libXrandr-1.5.2
 CATEGORIES=		x11 devel
@@ -20,6 +20,8 @@ PKGCONFIG_OVERRIDE+=	xrandr.pc.in
 
 CONFIGURE_ARGS.NetBSD+=	--disable-malloc0returnsnull
 
+X11_BUILTIN_NAME?=		libXrandr
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.6
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index c48497effc3..c72ffdd6901 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/03/31 20:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:15 nia Exp $
 
 DISTNAME=		libXres-1.2.1
 CATEGORIES=		x11
@@ -17,8 +17,9 @@ PKGCONFIG_OVERRIDE+=	xres.pc.in
 
 CONFIGURE_ARGS.NetBSD+=	--disable-malloc0returnsnull
 
+X11_BUILTIN_NAME?=		libXres
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index 59f0db9a19b..267e4961f64 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2021/01/24 15:54:00 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2021/12/01 13:01:15 nia Exp $
 
 DISTNAME=		libXt-1.2.1
 CATEGORIES=		x11 devel
@@ -33,6 +33,8 @@ 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
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 24003bc4714..9eccd95074c 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/01/18 23:35:53 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:15 nia Exp $
 
 DISTNAME=		libXtst-1.2.3
 PKGREVISION=		1
@@ -33,8 +33,9 @@ SUBST_FILES.sofix+=	man/XTestCompareCursorWithWindow.man
 SUBST_STAGE.sofix=	post-configure
 SUBST_MESSAGE.sofix=	Fix .so arguments.
 
+X11_BUILTIN_NAME?=		libXtst
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 .include "../../x11/xorgproto/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.6
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index a9ee6d3d4a6..bd5e2324d2e 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/01/18 23:35:53 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2021/12/01 13:01:15 nia Exp $
 
 DISTNAME=		libXv-1.0.11
 PKGREVISION=		1
@@ -17,8 +17,9 @@ USE_TOOLS+=		pkg-config
 
 CONFIGURE_ARGS.NetBSD+=	--disable-malloc0returnsnull
 
+X11_BUILTIN_NAME?=		libXv
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.6
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index a18255e5895..299e3d3e950 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/01/18 23:35:53 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2021/12/01 13:01:15 nia Exp $
 
 DISTNAME=		libXvMC-1.0.12
 CATEGORIES=		x11
@@ -19,8 +19,9 @@ PKGCONFIG_OVERRIDE+=	xvmc-wrapper.pc.in
 
 CONFIGURE_ARGS.NetBSD+=	--disable-malloc0returnsnull
 
+X11_BUILTIN_NAME?=		libXvMC
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
-
 BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.6
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile
index a98b0bc5f91..9feae1d9535 100644
--- a/x11/libdrm/Makefile
+++ b/x11/libdrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2021/07/20 09:43:22 tnn Exp $
+# $NetBSD: Makefile,v 1.97 2021/12/01 13:01:15 nia Exp $
 
 DISTNAME=		libdrm-2.4.100
 CATEGORIES=		x11 graphics
@@ -60,4 +60,6 @@ PLIST.arm=	yes
 PLIST.kms=	yes
 .endif
 
+X11_BUILTIN_NAME?=		libdrm
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/liboldXrandr/Makefile b/x11/liboldXrandr/Makefile
index 5f42c49f1dc..03e3907afcd 100644
--- a/x11/liboldXrandr/Makefile
+++ b/x11/liboldXrandr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:38 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2021/12/01 13:01:15 nia Exp $
 
 DISTNAME=		libXrandr-1.0.2
 PKGNAME=		Xrandr-1.0.2
@@ -19,9 +19,10 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=	xrandr.pc.in
 
-BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
-
+X11_BUILTIN_NAME?=		Xrandr
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/libXext/buildlink3.mk"
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 6fda180500d..26284046459 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2020/02/23 22:37:45 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2021/12/01 13:01:15 nia Exp $
 
 DISTNAME=	libxcb-1.14
 CATEGORIES=	x11
@@ -87,6 +87,8 @@ post-extract:
 ###	so it's not needed (nor should it ever be, really).
 ###
 #.include "../../devel/gperf/buildlink3.mk"
+X11_BUILTIN_NAME?=		libxcb
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 PYTHON_FOR_BUILD_ONLY=	tool
 .include "../../lang/python/application.mk"
 BUILDLINK_API_DEPENDS.xcb-proto?=	xcb-proto>=1.14
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index a91c4e65f99..0d96a9ba0b3 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/08/21 19:22:12 mcf Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:16 nia Exp $
 
 DISTNAME=	libxshmfence-1.3
 PKGREVISION=	3
@@ -35,5 +35,7 @@ pre-configure:
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
+X11_BUILTIN_NAME?=		libxshmfence
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index a649441c363..40cde42c59c 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2021/05/24 19:56:03 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2021/12/01 13:01:16 nia Exp $
 
 DISTNAME=	pixman-0.40.0
 PKGREVISION=	2
@@ -24,4 +24,6 @@ USE_TOOLS+=	pkg-config perl
 PKGCONFIG_OVERRIDE+=	pixman-1.pc.in
 PKGCONFIG_OVERRIDE+=	pixman-1-uninstalled.pc.in
 
+X11_BUILTIN_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 5428c143738..eef4fd48caf 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/11/28 23:56:22 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/01 13:01:16 nia Exp $
 
 DISTNAME=		xauth-1.1.1
 CATEGORIES=		x11
@@ -13,6 +13,8 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 CPPFLAGS.NetBSD+=	-D_OPENBSD_SOURCE
 
+X11_BUILTIN_NAME=	xauth
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index bba558fd1fd..8c28e37bd12 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/01/18 23:35:58 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/01 13:01:16 nia Exp $
 
 DISTNAME=		xbitmaps-1.1.2
 CATEGORIES=		x11 devel
@@ -11,4 +11,6 @@ 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/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 5766c6012b2..0a7d684405e 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/04/21 11:43:02 adam Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/01 13:01:16 nia Exp $
 
 DISTNAME=	xcb-proto-1.14.1
 PKGREVISION=	2
@@ -22,6 +22,8 @@ CONFIGURE_ENV+=		XMLLLINT=${BUILDLINK_PREFIX.libxml2}/bin/xmllint
 # XXX just for the "configure" check
 PYTHON_FOR_BUILD_ONLY=	tool
 .include "../../lang/python/application.mk"
+X11_BUILTIN_NAME=	xcb-proto
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 BUILDLINK_DEPMETHOD.libxml2?=	build
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index c1202da99ae..d38f1ccc8a7 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/08/16 20:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2021/12/01 13:01:16 nia Exp $
 
 DISTNAME=	xcb-util-0.4.0
 CATEGORIES=	x11
@@ -19,5 +19,7 @@ PKGCONFIG_OVERRIDE+=	xcb-event.pc.in
 PKGCONFIG_OVERRIDE+=	xcb-aux.pc.in
 
 .include "../../devel/gperf/buildlink3.mk"
+X11_BUILTIN_NAME=	xcb-proto
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile
index bfa37433ddd..ed4a8032a25 100644
--- a/x11/xcursor/Makefile
+++ b/x11/xcursor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/01/18 23:35:59 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2021/12/01 13:01:16 nia Exp $
 #
 
 DISTNAME=		libXcursor-1.1.2
@@ -23,6 +23,8 @@ PKGCONFIG_OVERRIDE+=	xcursor.pc.in
 
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 
+X11_BUILTIN_NAME=	libXcursor
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 30ebf8c3b12..297e2bb6f3f 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2021/11/01 11:56:32 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2021/12/01 13:01:16 nia Exp $
 
 DISTNAME=		xkeyboard-config-2.34
 CATEGORIES=		x11
@@ -55,7 +55,8 @@ OWN_DIRS+=		${XKBCOMPDIR}
 
 BUILDLINK_DEPMETHOD.gettext=	build	# for the configure only
 .include "../../devel/gettext-lib/buildlink3.mk"
-
+X11_BUILTIN_NAME=	xkeyboard-config
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 BUILDLINK_API_DEPENDS.libX11+=	libX11>=1.4.3
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile
index 6833a5aad64..7bccfcfebc3 100644
--- a/x11/xorgproto/Makefile
+++ b/x11/xorgproto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/09/16 08:37:53 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2021/12/01 13:01:17 nia Exp $
 
 DISTNAME=		xorgproto-2021.5
 PKGREVISION=		1
@@ -51,4 +51,6 @@ PKGCONFIG_OVERRIDE+=	xineramaproto.pc.in
 PKGCONFIG_OVERRIDE+=	xproto.pc.in
 PKGCONFIG_OVERRIDE+=	xproxymngproto.pc.in
 
+X11_BUILTIN_NAME=	xorgproto
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 68a6b2bd790..e1f1e4bc796 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2020/01/18 23:36:13 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2021/12/01 13:01:17 nia Exp $
 
 DISTNAME=		xtrans-1.4.0
 CATEGORIES=		x11 net
@@ -13,4 +13,6 @@ 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"