[pkgsrc/trunk]: pkgsrc/x11 x11: Add avoid-duplicate.mk to Xorg library packages

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1787bd3a069e
branches:  trunk
changeset: 770500:1787bd3a069e
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Dec 01 13:01:12 2021 +0000

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

diffstat:

 x11/libFS/Makefile            |  5 +++--
 x11/libICE/Makefile           |  5 +++--
 x11/libSM/Makefile            |  5 +++--
 x11/libX11/Makefile           |  4 +++-
 x11/libXScrnSaver/Makefile    |  5 +++--
 x11/libXau/Makefile           |  5 +++--
 x11/libXcomposite/Makefile    |  5 +++--
 x11/libXdamage/Makefile       |  4 +++-
 x11/libXdmcp/Makefile         |  5 +++--
 x11/libXext/Makefile          |  4 +++-
 x11/libXfixes/Makefile        |  4 +++-
 x11/libXfont/Makefile         |  6 +++---
 x11/libXfont2/Makefile        |  5 +++--
 x11/libXft/Makefile           |  4 +++-
 x11/libXi/Makefile            |  4 +++-
 x11/libXinerama/Makefile      |  5 +++--
 x11/libXmu/Makefile           |  7 +++----
 x11/libXpm/Makefile           |  5 +++--
 x11/libXpresent/Makefile      |  4 +++-
 x11/libXrandr/Makefile        |  4 +++-
 x11/libXres/Makefile          |  5 +++--
 x11/libXt/Makefile            |  4 +++-
 x11/libXtst/Makefile          |  5 +++--
 x11/libXv/Makefile            |  5 +++--
 x11/libXvMC/Makefile          |  5 +++--
 x11/libdrm/Makefile           |  4 +++-
 x11/liboldXrandr/Makefile     |  7 ++++---
 x11/libxcb/Makefile           |  4 +++-
 x11/libxshmfence/Makefile     |  4 +++-
 x11/pixman/Makefile           |  4 +++-
 x11/xauth/Makefile            |  4 +++-
 x11/xbitmaps/Makefile         |  4 +++-
 x11/xcb-proto/Makefile        |  4 +++-
 x11/xcb-util/Makefile         |  4 +++-
 x11/xcursor/Makefile          |  4 +++-
 x11/xkeyboard-config/Makefile |  5 +++--
 x11/xorgproto/Makefile        |  4 +++-
 x11/xtrans/Makefile           |  4 +++-
 38 files changed, 115 insertions(+), 60 deletions(-)

diffs (truncated from 715 to 300 lines):

diff -r c02a33b355d8 -r 1787bd3a069e x11/libFS/Makefile
--- a/x11/libFS/Makefile        Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libFS/Makefile        Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libICE/Makefile
--- a/x11/libICE/Makefile       Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libICE/Makefile       Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 
 .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 -r c02a33b355d8 -r 1787bd3a069e x11/libSM/Makefile
--- a/x11/libSM/Makefile        Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libSM/Makefile        Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 
 .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 -r c02a33b355d8 -r 1787bd3a069e x11/libX11/Makefile
--- a/x11/libX11/Makefile       Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libX11/Makefile       Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libXScrnSaver/Makefile
--- a/x11/libXScrnSaver/Makefile        Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXScrnSaver/Makefile        Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libXau/Makefile
--- a/x11/libXau/Makefile       Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXau/Makefile       Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libXcomposite/Makefile
--- a/x11/libXcomposite/Makefile        Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXcomposite/Makefile        Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libXdamage/Makefile
--- a/x11/libXdamage/Makefile   Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXdamage/Makefile   Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libXdmcp/Makefile
--- a/x11/libXdmcp/Makefile     Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXdmcp/Makefile     Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libXext/Makefile
--- a/x11/libXext/Makefile      Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXext/Makefile      Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 
 .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 -r c02a33b355d8 -r 1787bd3a069e x11/libXfixes/Makefile
--- a/x11/libXfixes/Makefile    Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXfixes/Makefile    Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libXfont/Makefile
--- a/x11/libXfont/Makefile     Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXfont/Makefile     Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libXfont2/Makefile
--- a/x11/libXfont2/Makefile    Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXfont2/Makefile    Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libXft/Makefile
--- a/x11/libXft/Makefile       Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXft/Makefile       Wed Dec 01 13:01:12 2021 +0000
@@ -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_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 -r c02a33b355d8 -r 1787bd3a069e x11/libXi/Makefile
--- a/x11/libXi/Makefile        Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXi/Makefile        Wed Dec 01 13:01:12 2021 +0000
@@ -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 @@
 
 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 -r c02a33b355d8 -r 1787bd3a069e x11/libXinerama/Makefile
--- a/x11/libXinerama/Makefile  Wed Dec 01 12:48:17 2021 +0000
+++ b/x11/libXinerama/Makefile  Wed Dec 01 13:01:12 2021 +0000
@@ -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