[pkgsrc/trunk]: pkgsrc/x11 xf86-video-*: Add avoid-duplicate.mk

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8c155e08e9a0
branches:  trunk
changeset: 770560:8c155e08e9a0
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Dec 02 18:15:25 2021 +0000

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

diffstat:

 x11/xf86-video-amdgpu/Makefile        |  4 +++-
 x11/xf86-video-apm/Makefile           |  4 +++-
 x11/xf86-video-ark/Makefile           |  4 +++-
 x11/xf86-video-ast/Makefile           |  4 +++-
 x11/xf86-video-ati/Makefile           |  9 +++++----
 x11/xf86-video-chips/Makefile         |  4 +++-
 x11/xf86-video-cirrus/Makefile        |  4 +++-
 x11/xf86-video-dummy/Makefile         |  4 +++-
 x11/xf86-video-fbdev/Makefile         |  4 +++-
 x11/xf86-video-glint/Makefile         |  4 +++-
 x11/xf86-video-i128/Makefile          |  4 +++-
 x11/xf86-video-i740/Makefile          |  4 +++-
 x11/xf86-video-intel/Makefile         |  4 +++-
 x11/xf86-video-mach64/Makefile        |  4 +++-
 x11/xf86-video-mga/Makefile           |  4 +++-
 x11/xf86-video-neomagic/Makefile      |  4 +++-
 x11/xf86-video-nouveau/Makefile       |  4 +++-
 x11/xf86-video-nv/Makefile            |  5 +++--
 x11/xf86-video-openchrome/Makefile    |  4 +++-
 x11/xf86-video-qxl/Makefile           |  4 +++-
 x11/xf86-video-r128/Makefile          |  5 +++--
 x11/xf86-video-rendition/Makefile     |  4 +++-
 x11/xf86-video-s3/Makefile            |  4 +++-
 x11/xf86-video-s3virge/Makefile       |  4 +++-
 x11/xf86-video-savage/Makefile        |  4 +++-
 x11/xf86-video-siliconmotion/Makefile |  4 +++-
 x11/xf86-video-sis/Makefile           |  4 +++-
 x11/xf86-video-suncg14/Makefile       |  4 +++-
 x11/xf86-video-suncg3/Makefile        |  4 +++-
 x11/xf86-video-suncg6/Makefile        |  4 +++-
 x11/xf86-video-sunffb/Makefile        |  4 +++-
 x11/xf86-video-sunleo/Makefile        |  4 +++-
 x11/xf86-video-suntcx/Makefile        |  4 +++-
 x11/xf86-video-tdfx/Makefile          |  4 +++-
 x11/xf86-video-tga/Makefile           |  4 +++-
 x11/xf86-video-trident/Makefile       |  4 +++-
 x11/xf86-video-tseng/Makefile         |  4 +++-
 x11/xf86-video-vboxvideo/Makefile     |  4 +++-
 x11/xf86-video-vesa/Makefile          |  4 +++-
 x11/xf86-video-vmware/Makefile        |  4 +++-
 x11/xf86-video-voodoo/Makefile        |  4 +++-
 x11/xf86-video-wsfb/Makefile          |  4 +++-
 42 files changed, 128 insertions(+), 47 deletions(-)

diffs (truncated from 764 to 300 lines):

diff -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-amdgpu/Makefile
--- a/x11/xf86-video-amdgpu/Makefile    Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-amdgpu/Makefile    Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-apm/Makefile
--- a/x11/xf86-video-apm/Makefile       Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-apm/Makefile       Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-ark/Makefile
--- a/x11/xf86-video-ark/Makefile       Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-ark/Makefile       Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-ast/Makefile
--- a/x11/xf86-video-ast/Makefile       Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-ast/Makefile       Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-ati/Makefile
--- a/x11/xf86-video-ati/Makefile       Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-ati/Makefile       Thu Dec 02 18:15:25 2021 +0000
@@ -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_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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-chips/Makefile
--- a/x11/xf86-video-chips/Makefile     Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-chips/Makefile     Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-cirrus/Makefile
--- a/x11/xf86-video-cirrus/Makefile    Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-cirrus/Makefile    Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-dummy/Makefile
--- a/x11/xf86-video-dummy/Makefile     Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-dummy/Makefile     Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-fbdev/Makefile
--- a/x11/xf86-video-fbdev/Makefile     Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-fbdev/Makefile     Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-glint/Makefile
--- a/x11/xf86-video-glint/Makefile     Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-glint/Makefile     Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-i128/Makefile
--- a/x11/xf86-video-i128/Makefile      Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-i128/Makefile      Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-i740/Makefile
--- a/x11/xf86-video-i740/Makefile      Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-i740/Makefile      Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-intel/Makefile
--- a/x11/xf86-video-intel/Makefile     Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-intel/Makefile     Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-mach64/Makefile
--- a/x11/xf86-video-mach64/Makefile    Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-mach64/Makefile    Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-mga/Makefile
--- a/x11/xf86-video-mga/Makefile       Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-mga/Makefile       Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-neomagic/Makefile
--- a/x11/xf86-video-neomagic/Makefile  Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-neomagic/Makefile  Thu Dec 02 18:15:25 2021 +0000
@@ -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 @@
 
 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 -r 740bed7b812c -r 8c155e08e9a0 x11/xf86-video-nouveau/Makefile
--- a/x11/xf86-video-nouveau/Makefile   Thu Dec 02 18:14:34 2021 +0000
+++ b/x11/xf86-video-nouveau/Makefile   Thu Dec 02 18:15:25 2021 +0000
@@ -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 $