pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11
Module Name: pkgsrc
Committed By: nia
Date: Sun Apr 10 08:53:24 UTC 2022
Modified Files:
pkgsrc/x11/libFS: Makefile
pkgsrc/x11/libICE: Makefile
pkgsrc/x11/libSM: Makefile
pkgsrc/x11/libX11: Makefile
pkgsrc/x11/libXScrnSaver: Makefile
pkgsrc/x11/libXau: Makefile
pkgsrc/x11/libXcomposite: Makefile
pkgsrc/x11/libXdamage: Makefile
pkgsrc/x11/libXdmcp: Makefile
pkgsrc/x11/libXext: Makefile
pkgsrc/x11/libXfixes: Makefile
pkgsrc/x11/libXfont: Makefile
pkgsrc/x11/libXfont2: Makefile
pkgsrc/x11/libXft: Makefile
pkgsrc/x11/libXi: Makefile
pkgsrc/x11/libXinerama: Makefile
pkgsrc/x11/libXmu: Makefile
pkgsrc/x11/libXpm: Makefile
pkgsrc/x11/libXpresent: Makefile
pkgsrc/x11/libXrandr: Makefile
pkgsrc/x11/libXres: Makefile
pkgsrc/x11/libXt: Makefile
pkgsrc/x11/libXtst: Makefile
pkgsrc/x11/libXv: Makefile
pkgsrc/x11/libXvMC: Makefile
pkgsrc/x11/libdrm: Makefile
pkgsrc/x11/liboldXrandr: Makefile
pkgsrc/x11/libxcb: Makefile
pkgsrc/x11/libxshmfence: Makefile
pkgsrc/x11/modular-xorg-server: Makefile
pkgsrc/x11/pixman: Makefile
pkgsrc/x11/xauth: Makefile
pkgsrc/x11/xbitmaps: Makefile
pkgsrc/x11/xcursor: Makefile
pkgsrc/x11/xf86-input-acecad: Makefile
pkgsrc/x11/xf86-input-elographics: Makefile
pkgsrc/x11/xf86-input-fpit: Makefile
pkgsrc/x11/xf86-input-hyperpen: Makefile
pkgsrc/x11/xf86-input-joystick: Makefile
pkgsrc/x11/xf86-input-keyboard: Makefile
pkgsrc/x11/xf86-input-mouse: Makefile
pkgsrc/x11/xf86-input-mutouch: Makefile
pkgsrc/x11/xf86-input-penmount: Makefile
pkgsrc/x11/xf86-input-vmmouse: Makefile
pkgsrc/x11/xf86-input-void: Makefile
pkgsrc/x11/xf86-input-ws: Makefile
pkgsrc/x11/xf86-video-amdgpu: Makefile
pkgsrc/x11/xf86-video-apm: Makefile
pkgsrc/x11/xf86-video-ark: Makefile
pkgsrc/x11/xf86-video-ast: Makefile
pkgsrc/x11/xf86-video-ati: Makefile
pkgsrc/x11/xf86-video-chips: Makefile
pkgsrc/x11/xf86-video-cirrus: Makefile
pkgsrc/x11/xf86-video-dummy: Makefile
pkgsrc/x11/xf86-video-fbdev: Makefile
pkgsrc/x11/xf86-video-glint: Makefile
pkgsrc/x11/xf86-video-i128: Makefile
pkgsrc/x11/xf86-video-i740: Makefile
pkgsrc/x11/xf86-video-intel: Makefile
pkgsrc/x11/xf86-video-mach64: Makefile
pkgsrc/x11/xf86-video-mga: Makefile
pkgsrc/x11/xf86-video-neomagic: Makefile
pkgsrc/x11/xf86-video-nouveau: Makefile
pkgsrc/x11/xf86-video-nv: Makefile
pkgsrc/x11/xf86-video-openchrome: Makefile
pkgsrc/x11/xf86-video-qxl: Makefile
pkgsrc/x11/xf86-video-r128: Makefile
pkgsrc/x11/xf86-video-rendition: Makefile
pkgsrc/x11/xf86-video-s3: Makefile
pkgsrc/x11/xf86-video-s3virge: Makefile
pkgsrc/x11/xf86-video-savage: Makefile
pkgsrc/x11/xf86-video-siliconmotion: Makefile
pkgsrc/x11/xf86-video-sis: Makefile
pkgsrc/x11/xf86-video-suncg14: Makefile
pkgsrc/x11/xf86-video-suncg3: Makefile
pkgsrc/x11/xf86-video-suncg6: Makefile
pkgsrc/x11/xf86-video-sunffb: Makefile
pkgsrc/x11/xf86-video-sunleo: Makefile
pkgsrc/x11/xf86-video-suntcx: Makefile
pkgsrc/x11/xf86-video-tdfx: Makefile
pkgsrc/x11/xf86-video-tga: Makefile
pkgsrc/x11/xf86-video-trident: Makefile
pkgsrc/x11/xf86-video-tseng: Makefile
pkgsrc/x11/xf86-video-vboxvideo: Makefile
pkgsrc/x11/xf86-video-vesa: Makefile
pkgsrc/x11/xf86-video-vmware: Makefile
pkgsrc/x11/xf86-video-voodoo: Makefile
pkgsrc/x11/xf86-video-wsfb: Makefile
pkgsrc/x11/xinit: Makefile
pkgsrc/x11/xtrans: Makefile
Log Message:
x11: adapt to new avoid-duplicate.mk usage
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/libFS/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/libICE/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/libSM/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/x11/libX11/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/libXScrnSaver/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/libXau/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/libXcomposite/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libXdamage/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libXdmcp/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/libXext/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/libXfixes/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/x11/libXfont/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libXfont2/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/libXft/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/x11/libXi/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/libXinerama/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/libXmu/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/libXpm/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXpresent/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/libXrandr/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/libXres/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/libXt/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/libXtst/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/libXv/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/libXvMC/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/x11/libdrm/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/liboldXrandr/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/libxcb/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/libxshmfence/Makefile
cvs rdiff -u -r1.131 -r1.132 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/x11/pixman/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/xauth/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xbitmaps/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/xcursor/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xf86-input-acecad/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xf86-input-elographics/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-input-fpit/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xf86-input-hyperpen/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xf86-input-joystick/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/x11/xf86-input-mouse/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xf86-input-mutouch/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xf86-input-penmount/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/xf86-input-vmmouse/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xf86-input-void/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xf86-input-ws/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/xf86-video-amdgpu/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xf86-video-apm/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/xf86-video-ark/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/xf86-video-ast/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/x11/xf86-video-ati/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/xf86-video-chips/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xf86-video-cirrus/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/xf86-video-dummy/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/xf86-video-fbdev/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/xf86-video-glint/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xf86-video-i128/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/xf86-video-i740/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/x11/xf86-video-intel/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xf86-video-mach64/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/xf86-video-mga/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/xf86-video-neomagic/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/xf86-video-nv/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/xf86-video-qxl/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/xf86-video-r128/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/xf86-video-rendition/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xf86-video-s3/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/xf86-video-s3virge/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/xf86-video-savage/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/xf86-video-sis/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/xf86-video-suncg14/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/xf86-video-suncg3/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/xf86-video-sunffb/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xf86-video-sunleo/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xf86-video-suntcx/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/xf86-video-tdfx/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xf86-video-tga/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/xf86-video-trident/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/xf86-video-tseng/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xf86-video-vboxvideo/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/xf86-video-vesa/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/xf86-video-vmware/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-video-voodoo/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xf86-video-wsfb/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/xinit/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/xtrans/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/libFS/Makefile
diff -u pkgsrc/x11/libFS/Makefile:1.20 pkgsrc/x11/libFS/Makefile:1.21
--- pkgsrc/x11/libFS/Makefile:1.20 Wed Dec 1 13:01:12 2021
+++ pkgsrc/x11/libFS/Makefile Sun Apr 10 08:53:14 2022
@@ -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"
Index: pkgsrc/x11/libICE/Makefile
diff -u pkgsrc/x11/libICE/Makefile:1.16 pkgsrc/x11/libICE/Makefile:1.17
--- pkgsrc/x11/libICE/Makefile:1.16 Wed Dec 1 13:01:12 2021
+++ pkgsrc/x11/libICE/Makefile Sun Apr 10 08:53:14 2022
@@ -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"
Index: pkgsrc/x11/libSM/Makefile
diff -u pkgsrc/x11/libSM/Makefile:1.17 pkgsrc/x11/libSM/Makefile:1.18
--- pkgsrc/x11/libSM/Makefile:1.17 Wed Dec 1 13:01:13 2021
+++ pkgsrc/x11/libSM/Makefile Sun Apr 10 08:53:14 2022
@@ -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"
Index: pkgsrc/x11/libX11/Makefile
diff -u pkgsrc/x11/libX11/Makefile:1.63 pkgsrc/x11/libX11/Makefile:1.64
--- pkgsrc/x11/libX11/Makefile:1.63 Sun Apr 3 18:36:44 2022
+++ pkgsrc/x11/libX11/Makefile Sun Apr 10 08:53:14 2022
@@ -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_C
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"
Index: pkgsrc/x11/libXScrnSaver/Makefile
diff -u pkgsrc/x11/libXScrnSaver/Makefile:1.15 pkgsrc/x11/libXScrnSaver/Makefile:1.16
--- pkgsrc/x11/libXScrnSaver/Makefile:1.15 Wed Dec 1 13:01:13 2021
+++ pkgsrc/x11/libXScrnSaver/Makefile Sun Apr 10 08:53:14 2022
@@ -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"
Index: pkgsrc/x11/libXau/Makefile
diff -u pkgsrc/x11/libXau/Makefile:1.18 pkgsrc/x11/libXau/Makefile:1.19
--- pkgsrc/x11/libXau/Makefile:1.18 Wed Dec 1 13:01:13 2021
+++ pkgsrc/x11/libXau/Makefile Sun Apr 10 08:53:15 2022
@@ -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"
Index: pkgsrc/x11/libXcomposite/Makefile
diff -u pkgsrc/x11/libXcomposite/Makefile:1.14 pkgsrc/x11/libXcomposite/Makefile:1.15
--- pkgsrc/x11/libXcomposite/Makefile:1.14 Wed Dec 1 13:01:13 2021
+++ pkgsrc/x11/libXcomposite/Makefile Sun Apr 10 08:53:15 2022
@@ -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"
Index: pkgsrc/x11/libXdamage/Makefile
diff -u pkgsrc/x11/libXdamage/Makefile:1.13 pkgsrc/x11/libXdamage/Makefile:1.14
--- pkgsrc/x11/libXdamage/Makefile:1.13 Wed Dec 1 13:01:13 2021
+++ pkgsrc/x11/libXdamage/Makefile Sun Apr 10 08:53:15 2022
@@ -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"
Index: pkgsrc/x11/libXdmcp/Makefile
diff -u pkgsrc/x11/libXdmcp/Makefile:1.12 pkgsrc/x11/libXdmcp/Makefile:1.13
--- pkgsrc/x11/libXdmcp/Makefile:1.12 Wed Dec 1 13:01:13 2021
+++ pkgsrc/x11/libXdmcp/Makefile Sun Apr 10 08:53:15 2022
@@ -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"
Index: pkgsrc/x11/libXext/Makefile
diff -u pkgsrc/x11/libXext/Makefile:1.27 pkgsrc/x11/libXext/Makefile:1.28
--- pkgsrc/x11/libXext/Makefile:1.27 Wed Dec 1 13:01:13 2021
+++ pkgsrc/x11/libXext/Makefile Sun Apr 10 08:53:15 2022
@@ -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="${PR
.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"
Index: pkgsrc/x11/libXfixes/Makefile
diff -u pkgsrc/x11/libXfixes/Makefile:1.15 pkgsrc/x11/libXfixes/Makefile:1.16
--- pkgsrc/x11/libXfixes/Makefile:1.15 Wed Dec 1 13:01:13 2021
+++ pkgsrc/x11/libXfixes/Makefile Sun Apr 10 08:53:15 2022
@@ -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
Index: pkgsrc/x11/libXfont/Makefile
diff -u pkgsrc/x11/libXfont/Makefile:1.44 pkgsrc/x11/libXfont/Makefile:1.45
--- pkgsrc/x11/libXfont/Makefile:1.44 Wed Dec 1 13:01:14 2021
+++ pkgsrc/x11/libXfont/Makefile Sun Apr 10 08:53:15 2022
@@ -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"
Index: pkgsrc/x11/libXfont2/Makefile
diff -u pkgsrc/x11/libXfont2/Makefile:1.12 pkgsrc/x11/libXfont2/Makefile:1.13
--- pkgsrc/x11/libXfont2/Makefile:1.12 Wed Dec 1 13:01:14 2021
+++ pkgsrc/x11/libXfont2/Makefile Sun Apr 10 08:53:15 2022
@@ -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"
Index: pkgsrc/x11/libXft/Makefile
diff -u pkgsrc/x11/libXft/Makefile:1.24 pkgsrc/x11/libXft/Makefile:1.25
--- pkgsrc/x11/libXft/Makefile:1.24 Wed Dec 1 13:01:14 2021
+++ pkgsrc/x11/libXft/Makefile Sun Apr 10 08:53:15 2022
@@ -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"
Index: pkgsrc/x11/libXi/Makefile
diff -u pkgsrc/x11/libXi/Makefile:1.38 pkgsrc/x11/libXi/Makefile:1.39
--- pkgsrc/x11/libXi/Makefile:1.38 Wed Dec 1 13:01:14 2021
+++ pkgsrc/x11/libXi/Makefile Sun Apr 10 08:53:16 2022
@@ -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
Index: pkgsrc/x11/libXinerama/Makefile
diff -u pkgsrc/x11/libXinerama/Makefile:1.18 pkgsrc/x11/libXinerama/Makefile:1.19
--- pkgsrc/x11/libXinerama/Makefile:1.18 Wed Dec 1 13:01:14 2021
+++ pkgsrc/x11/libXinerama/Makefile Sun Apr 10 08:53:16 2022
@@ -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"
Index: pkgsrc/x11/libXmu/Makefile
diff -u pkgsrc/x11/libXmu/Makefile:1.14 pkgsrc/x11/libXmu/Makefile:1.15
--- pkgsrc/x11/libXmu/Makefile:1.14 Wed Dec 1 13:01:14 2021
+++ pkgsrc/x11/libXmu/Makefile Sun Apr 10 08:53:16 2022
@@ -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"
Index: pkgsrc/x11/libXpm/Makefile
diff -u pkgsrc/x11/libXpm/Makefile:1.22 pkgsrc/x11/libXpm/Makefile:1.23
--- pkgsrc/x11/libXpm/Makefile:1.22 Sun Dec 5 18:15:47 2021
+++ pkgsrc/x11/libXpm/Makefile Sun Apr 10 08:53:16 2022
@@ -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
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"
Index: pkgsrc/x11/libXpresent/Makefile
diff -u pkgsrc/x11/libXpresent/Makefile:1.4 pkgsrc/x11/libXpresent/Makefile:1.5
--- pkgsrc/x11/libXpresent/Makefile:1.4 Wed Dec 1 13:01:14 2021
+++ pkgsrc/x11/libXpresent/Makefile Sun Apr 10 08:53:16 2022
@@ -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"
Index: pkgsrc/x11/libXrandr/Makefile
diff -u pkgsrc/x11/libXrandr/Makefile:1.23 pkgsrc/x11/libXrandr/Makefile:1.24
--- pkgsrc/x11/libXrandr/Makefile:1.23 Wed Dec 1 13:01:15 2021
+++ pkgsrc/x11/libXrandr/Makefile Sun Apr 10 08:53:16 2022
@@ -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"
Index: pkgsrc/x11/libXres/Makefile
diff -u pkgsrc/x11/libXres/Makefile:1.16 pkgsrc/x11/libXres/Makefile:1.17
--- pkgsrc/x11/libXres/Makefile:1.16 Wed Dec 1 13:01:15 2021
+++ pkgsrc/x11/libXres/Makefile Sun Apr 10 08:53:16 2022
@@ -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"
Index: pkgsrc/x11/libXt/Makefile
diff -u pkgsrc/x11/libXt/Makefile:1.29 pkgsrc/x11/libXt/Makefile:1.30
--- pkgsrc/x11/libXt/Makefile:1.29 Wed Dec 1 13:01:15 2021
+++ pkgsrc/x11/libXt/Makefile Sun Apr 10 08:53:16 2022
@@ -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
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"
Index: pkgsrc/x11/libXtst/Makefile
diff -u pkgsrc/x11/libXtst/Makefile:1.16 pkgsrc/x11/libXtst/Makefile:1.17
--- pkgsrc/x11/libXtst/Makefile:1.16 Wed Dec 1 13:01:15 2021
+++ pkgsrc/x11/libXtst/Makefile Sun Apr 10 08:53:16 2022
@@ -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/XTestCompareCurs
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"
Index: pkgsrc/x11/libXv/Makefile
diff -u pkgsrc/x11/libXv/Makefile:1.19 pkgsrc/x11/libXv/Makefile:1.20
--- pkgsrc/x11/libXv/Makefile:1.19 Wed Dec 1 13:01:15 2021
+++ pkgsrc/x11/libXv/Makefile Sun Apr 10 08:53:17 2022
@@ -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
Index: pkgsrc/x11/libXvMC/Makefile
diff -u pkgsrc/x11/libXvMC/Makefile:1.19 pkgsrc/x11/libXvMC/Makefile:1.20
--- pkgsrc/x11/libXvMC/Makefile:1.19 Wed Mar 30 21:53:13 2022
+++ pkgsrc/x11/libXvMC/Makefile Sun Apr 10 08:53:17 2022
@@ -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
Index: pkgsrc/x11/libdrm/Makefile
diff -u pkgsrc/x11/libdrm/Makefile:1.100 pkgsrc/x11/libdrm/Makefile:1.101
--- pkgsrc/x11/libdrm/Makefile:1.100 Mon Apr 4 11:23:07 2022
+++ pkgsrc/x11/libdrm/Makefile Sun Apr 10 08:53:17 2022
@@ -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"
Index: pkgsrc/x11/liboldXrandr/Makefile
diff -u pkgsrc/x11/liboldXrandr/Makefile:1.7 pkgsrc/x11/liboldXrandr/Makefile:1.8
--- pkgsrc/x11/liboldXrandr/Makefile:1.7 Wed Dec 1 13:01:15 2021
+++ pkgsrc/x11/liboldXrandr/Makefile Sun Apr 10 08:53:17 2022
@@ -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
Index: pkgsrc/x11/libxcb/Makefile
diff -u pkgsrc/x11/libxcb/Makefile:1.36 pkgsrc/x11/libxcb/Makefile:1.37
--- pkgsrc/x11/libxcb/Makefile:1.36 Wed Dec 1 13:01:15 2021
+++ pkgsrc/x11/libxcb/Makefile Sun Apr 10 08:53:17 2022
@@ -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"
Index: pkgsrc/x11/libxshmfence/Makefile
diff -u pkgsrc/x11/libxshmfence/Makefile:1.16 pkgsrc/x11/libxshmfence/Makefile:1.17
--- pkgsrc/x11/libxshmfence/Makefile:1.16 Wed Dec 1 13:01:16 2021
+++ pkgsrc/x11/libxshmfence/Makefile Sun Apr 10 08:53:17 2022
@@ -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"
Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.131 pkgsrc/x11/modular-xorg-server/Makefile:1.132
--- pkgsrc/x11/modular-xorg-server/Makefile:1.131 Fri Dec 3 13:05:59 2021
+++ pkgsrc/x11/modular-xorg-server/Makefile Sun Apr 10 08:53:17 2022
@@ -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"
Index: pkgsrc/x11/pixman/Makefile
diff -u pkgsrc/x11/pixman/Makefile:1.78 pkgsrc/x11/pixman/Makefile:1.79
--- pkgsrc/x11/pixman/Makefile:1.78 Wed Dec 1 13:01:16 2021
+++ pkgsrc/x11/pixman/Makefile Sun Apr 10 08:53:17 2022
@@ -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"
Index: pkgsrc/x11/xauth/Makefile
diff -u pkgsrc/x11/xauth/Makefile:1.14 pkgsrc/x11/xauth/Makefile:1.15
--- pkgsrc/x11/xauth/Makefile:1.14 Wed Dec 1 13:01:16 2021
+++ pkgsrc/x11/xauth/Makefile Sun Apr 10 08:53:17 2022
@@ -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"
Index: pkgsrc/x11/xbitmaps/Makefile
diff -u pkgsrc/x11/xbitmaps/Makefile:1.9 pkgsrc/x11/xbitmaps/Makefile:1.10
--- pkgsrc/x11/xbitmaps/Makefile:1.9 Wed Dec 1 13:01:16 2021
+++ pkgsrc/x11/xbitmaps/Makefile Sun Apr 10 08:53:18 2022
@@ -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"
Index: pkgsrc/x11/xcursor/Makefile
diff -u pkgsrc/x11/xcursor/Makefile:1.29 pkgsrc/x11/xcursor/Makefile:1.30
--- pkgsrc/x11/xcursor/Makefile:1.29 Sun Dec 5 19:07:07 2021
+++ pkgsrc/x11/xcursor/Makefile Sun Apr 10 08:53:18 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-acecad/Makefile
diff -u pkgsrc/x11/xf86-input-acecad/Makefile:1.12 pkgsrc/x11/xf86-input-acecad/Makefile:1.13
--- pkgsrc/x11/xf86-input-acecad/Makefile:1.12 Fri Dec 3 12:50:13 2021
+++ pkgsrc/x11/xf86-input-acecad/Makefile Sun Apr 10 08:53:18 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-elographics/Makefile
diff -u pkgsrc/x11/xf86-input-elographics/Makefile:1.9 pkgsrc/x11/xf86-input-elographics/Makefile:1.10
--- pkgsrc/x11/xf86-input-elographics/Makefile:1.9 Fri Dec 3 12:50:13 2021
+++ pkgsrc/x11/xf86-input-elographics/Makefile Sun Apr 10 08:53:18 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-fpit/Makefile
diff -u pkgsrc/x11/xf86-input-fpit/Makefile:1.8 pkgsrc/x11/xf86-input-fpit/Makefile:1.9
--- pkgsrc/x11/xf86-input-fpit/Makefile:1.8 Fri Dec 3 12:50:13 2021
+++ pkgsrc/x11/xf86-input-fpit/Makefile Sun Apr 10 08:53:18 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-hyperpen/Makefile
diff -u pkgsrc/x11/xf86-input-hyperpen/Makefile:1.9 pkgsrc/x11/xf86-input-hyperpen/Makefile:1.10
--- pkgsrc/x11/xf86-input-hyperpen/Makefile:1.9 Fri Dec 3 12:50:13 2021
+++ pkgsrc/x11/xf86-input-hyperpen/Makefile Sun Apr 10 08:53:18 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-joystick/Makefile
diff -u pkgsrc/x11/xf86-input-joystick/Makefile:1.12 pkgsrc/x11/xf86-input-joystick/Makefile:1.13
--- pkgsrc/x11/xf86-input-joystick/Makefile:1.12 Fri Dec 3 12:50:13 2021
+++ pkgsrc/x11/xf86-input-joystick/Makefile Sun Apr 10 08:53:18 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-keyboard/Makefile
diff -u pkgsrc/x11/xf86-input-keyboard/Makefile:1.30 pkgsrc/x11/xf86-input-keyboard/Makefile:1.31
--- pkgsrc/x11/xf86-input-keyboard/Makefile:1.30 Fri Dec 3 12:50:13 2021
+++ pkgsrc/x11/xf86-input-keyboard/Makefile Sun Apr 10 08:53:18 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-mouse/Makefile
diff -u pkgsrc/x11/xf86-input-mouse/Makefile:1.33 pkgsrc/x11/xf86-input-mouse/Makefile:1.34
--- pkgsrc/x11/xf86-input-mouse/Makefile:1.33 Fri Dec 3 12:50:13 2021
+++ pkgsrc/x11/xf86-input-mouse/Makefile Sun Apr 10 08:53:18 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-mutouch/Makefile
diff -u pkgsrc/x11/xf86-input-mutouch/Makefile:1.9 pkgsrc/x11/xf86-input-mutouch/Makefile:1.10
--- pkgsrc/x11/xf86-input-mutouch/Makefile:1.9 Fri Dec 3 12:50:13 2021
+++ pkgsrc/x11/xf86-input-mutouch/Makefile Sun Apr 10 08:53:19 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-penmount/Makefile
diff -u pkgsrc/x11/xf86-input-penmount/Makefile:1.12 pkgsrc/x11/xf86-input-penmount/Makefile:1.13
--- pkgsrc/x11/xf86-input-penmount/Makefile:1.12 Fri Dec 3 12:50:14 2021
+++ pkgsrc/x11/xf86-input-penmount/Makefile Sun Apr 10 08:53:19 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-vmmouse/Makefile
diff -u pkgsrc/x11/xf86-input-vmmouse/Makefile:1.27 pkgsrc/x11/xf86-input-vmmouse/Makefile:1.28
--- pkgsrc/x11/xf86-input-vmmouse/Makefile:1.27 Fri Dec 3 12:50:14 2021
+++ pkgsrc/x11/xf86-input-vmmouse/Makefile Sun Apr 10 08:53:19 2022
@@ -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=
# 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"
Index: pkgsrc/x11/xf86-input-void/Makefile
diff -u pkgsrc/x11/xf86-input-void/Makefile:1.20 pkgsrc/x11/xf86-input-void/Makefile:1.21
--- pkgsrc/x11/xf86-input-void/Makefile:1.20 Fri Dec 3 12:50:14 2021
+++ pkgsrc/x11/xf86-input-void/Makefile Sun Apr 10 08:53:19 2022
@@ -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"
Index: pkgsrc/x11/xf86-input-ws/Makefile
diff -u pkgsrc/x11/xf86-input-ws/Makefile:1.6 pkgsrc/x11/xf86-input-ws/Makefile:1.7
--- pkgsrc/x11/xf86-input-ws/Makefile:1.6 Fri Dec 3 12:50:14 2021
+++ pkgsrc/x11/xf86-input-ws/Makefile Sun Apr 10 08:53:19 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-amdgpu/Makefile
diff -u pkgsrc/x11/xf86-video-amdgpu/Makefile:1.21 pkgsrc/x11/xf86-video-amdgpu/Makefile:1.22
--- pkgsrc/x11/xf86-video-amdgpu/Makefile:1.21 Thu Dec 2 18:15:25 2021
+++ pkgsrc/x11/xf86-video-amdgpu/Makefile Sun Apr 10 08:53:19 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-apm/Makefile
diff -u pkgsrc/x11/xf86-video-apm/Makefile:1.23 pkgsrc/x11/xf86-video-apm/Makefile:1.24
--- pkgsrc/x11/xf86-video-apm/Makefile:1.23 Thu Dec 2 18:15:25 2021
+++ pkgsrc/x11/xf86-video-apm/Makefile Sun Apr 10 08:53:19 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-ark/Makefile
diff -u pkgsrc/x11/xf86-video-ark/Makefile:1.21 pkgsrc/x11/xf86-video-ark/Makefile:1.22
--- pkgsrc/x11/xf86-video-ark/Makefile:1.21 Thu Dec 2 18:15:26 2021
+++ pkgsrc/x11/xf86-video-ark/Makefile Sun Apr 10 08:53:19 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-ast/Makefile
diff -u pkgsrc/x11/xf86-video-ast/Makefile:1.24 pkgsrc/x11/xf86-video-ast/Makefile:1.25
--- pkgsrc/x11/xf86-video-ast/Makefile:1.24 Thu Dec 2 18:15:26 2021
+++ pkgsrc/x11/xf86-video-ast/Makefile Sun Apr 10 08:53:19 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-ati/Makefile
diff -u pkgsrc/x11/xf86-video-ati/Makefile:1.54 pkgsrc/x11/xf86-video-ati/Makefile:1.55
--- pkgsrc/x11/xf86-video-ati/Makefile:1.54 Thu Dec 2 18:15:26 2021
+++ pkgsrc/x11/xf86-video-ati/Makefile Sun Apr 10 08:53:20 2022
@@ -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
Index: pkgsrc/x11/xf86-video-chips/Makefile
diff -u pkgsrc/x11/xf86-video-chips/Makefile:1.25 pkgsrc/x11/xf86-video-chips/Makefile:1.26
--- pkgsrc/x11/xf86-video-chips/Makefile:1.25 Thu Dec 2 18:15:26 2021
+++ pkgsrc/x11/xf86-video-chips/Makefile Sun Apr 10 08:53:20 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-cirrus/Makefile
diff -u pkgsrc/x11/xf86-video-cirrus/Makefile:1.23 pkgsrc/x11/xf86-video-cirrus/Makefile:1.24
--- pkgsrc/x11/xf86-video-cirrus/Makefile:1.23 Thu Dec 2 18:15:26 2021
+++ pkgsrc/x11/xf86-video-cirrus/Makefile Sun Apr 10 08:53:20 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-dummy/Makefile
diff -u pkgsrc/x11/xf86-video-dummy/Makefile:1.13 pkgsrc/x11/xf86-video-dummy/Makefile:1.14
--- pkgsrc/x11/xf86-video-dummy/Makefile:1.13 Thu Dec 2 18:15:26 2021
+++ pkgsrc/x11/xf86-video-dummy/Makefile Sun Apr 10 08:53:20 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-fbdev/Makefile
diff -u pkgsrc/x11/xf86-video-fbdev/Makefile:1.15 pkgsrc/x11/xf86-video-fbdev/Makefile:1.16
--- pkgsrc/x11/xf86-video-fbdev/Makefile:1.15 Thu Dec 2 18:15:26 2021
+++ pkgsrc/x11/xf86-video-fbdev/Makefile Sun Apr 10 08:53:20 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-glint/Makefile
diff -u pkgsrc/x11/xf86-video-glint/Makefile:1.24 pkgsrc/x11/xf86-video-glint/Makefile:1.25
--- pkgsrc/x11/xf86-video-glint/Makefile:1.24 Thu Dec 2 18:15:26 2021
+++ pkgsrc/x11/xf86-video-glint/Makefile Sun Apr 10 08:53:20 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-i128/Makefile
diff -u pkgsrc/x11/xf86-video-i128/Makefile:1.23 pkgsrc/x11/xf86-video-i128/Makefile:1.24
--- pkgsrc/x11/xf86-video-i128/Makefile:1.23 Thu Dec 2 18:15:26 2021
+++ pkgsrc/x11/xf86-video-i128/Makefile Sun Apr 10 08:53:20 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-i740/Makefile
diff -u pkgsrc/x11/xf86-video-i740/Makefile:1.25 pkgsrc/x11/xf86-video-i740/Makefile:1.26
--- pkgsrc/x11/xf86-video-i740/Makefile:1.25 Thu Dec 2 18:15:27 2021
+++ pkgsrc/x11/xf86-video-i740/Makefile Sun Apr 10 08:53:20 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-intel/Makefile
diff -u pkgsrc/x11/xf86-video-intel/Makefile:1.51 pkgsrc/x11/xf86-video-intel/Makefile:1.52
--- pkgsrc/x11/xf86-video-intel/Makefile:1.51 Tue Mar 15 18:53:42 2022
+++ pkgsrc/x11/xf86-video-intel/Makefile Sun Apr 10 08:53:21 2022
@@ -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=
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"
Index: pkgsrc/x11/xf86-video-mach64/Makefile
diff -u pkgsrc/x11/xf86-video-mach64/Makefile:1.23 pkgsrc/x11/xf86-video-mach64/Makefile:1.24
--- pkgsrc/x11/xf86-video-mach64/Makefile:1.23 Thu Dec 2 18:15:27 2021
+++ pkgsrc/x11/xf86-video-mach64/Makefile Sun Apr 10 08:53:21 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-mga/Makefile
diff -u pkgsrc/x11/xf86-video-mga/Makefile:1.28 pkgsrc/x11/xf86-video-mga/Makefile:1.29
--- pkgsrc/x11/xf86-video-mga/Makefile:1.28 Thu Dec 2 18:15:27 2021
+++ pkgsrc/x11/xf86-video-mga/Makefile Sun Apr 10 08:53:21 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-neomagic/Makefile
diff -u pkgsrc/x11/xf86-video-neomagic/Makefile:1.24 pkgsrc/x11/xf86-video-neomagic/Makefile:1.25
--- pkgsrc/x11/xf86-video-neomagic/Makefile:1.24 Thu Dec 2 18:15:27 2021
+++ pkgsrc/x11/xf86-video-neomagic/Makefile Sun Apr 10 08:53:21 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-nouveau/Makefile
diff -u pkgsrc/x11/xf86-video-nouveau/Makefile:1.15 pkgsrc/x11/xf86-video-nouveau/Makefile:1.16
--- pkgsrc/x11/xf86-video-nouveau/Makefile:1.15 Thu Dec 2 18:15:27 2021
+++ pkgsrc/x11/xf86-video-nouveau/Makefile Sun Apr 10 08:53:21 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-nv/Makefile
diff -u pkgsrc/x11/xf86-video-nv/Makefile:1.35 pkgsrc/x11/xf86-video-nv/Makefile:1.36
--- pkgsrc/x11/xf86-video-nv/Makefile:1.35 Thu Dec 2 18:15:27 2021
+++ pkgsrc/x11/xf86-video-nv/Makefile Sun Apr 10 08:53:21 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-openchrome/Makefile
diff -u pkgsrc/x11/xf86-video-openchrome/Makefile:1.23 pkgsrc/x11/xf86-video-openchrome/Makefile:1.24
--- pkgsrc/x11/xf86-video-openchrome/Makefile:1.23 Thu Dec 2 18:15:27 2021
+++ pkgsrc/x11/xf86-video-openchrome/Makefile Sun Apr 10 08:53:21 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-qxl/Makefile
diff -u pkgsrc/x11/xf86-video-qxl/Makefile:1.11 pkgsrc/x11/xf86-video-qxl/Makefile:1.12
--- pkgsrc/x11/xf86-video-qxl/Makefile:1.11 Thu Dec 2 18:15:28 2021
+++ pkgsrc/x11/xf86-video-qxl/Makefile Sun Apr 10 08:53:21 2022
@@ -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
Index: pkgsrc/x11/xf86-video-r128/Makefile
diff -u pkgsrc/x11/xf86-video-r128/Makefile:1.25 pkgsrc/x11/xf86-video-r128/Makefile:1.26
--- pkgsrc/x11/xf86-video-r128/Makefile:1.25 Thu Dec 2 18:15:28 2021
+++ pkgsrc/x11/xf86-video-r128/Makefile Sun Apr 10 08:53:21 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-rendition/Makefile
diff -u pkgsrc/x11/xf86-video-rendition/Makefile:1.24 pkgsrc/x11/xf86-video-rendition/Makefile:1.25
--- pkgsrc/x11/xf86-video-rendition/Makefile:1.24 Thu Dec 2 18:15:28 2021
+++ pkgsrc/x11/xf86-video-rendition/Makefile Sun Apr 10 08:53:22 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-s3/Makefile
diff -u pkgsrc/x11/xf86-video-s3/Makefile:1.23 pkgsrc/x11/xf86-video-s3/Makefile:1.24
--- pkgsrc/x11/xf86-video-s3/Makefile:1.23 Thu Dec 2 18:15:28 2021
+++ pkgsrc/x11/xf86-video-s3/Makefile Sun Apr 10 08:53:22 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-s3virge/Makefile
diff -u pkgsrc/x11/xf86-video-s3virge/Makefile:1.24 pkgsrc/x11/xf86-video-s3virge/Makefile:1.25
--- pkgsrc/x11/xf86-video-s3virge/Makefile:1.24 Thu Dec 2 18:15:28 2021
+++ pkgsrc/x11/xf86-video-s3virge/Makefile Sun Apr 10 08:53:22 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-savage/Makefile
diff -u pkgsrc/x11/xf86-video-savage/Makefile:1.26 pkgsrc/x11/xf86-video-savage/Makefile:1.27
--- pkgsrc/x11/xf86-video-savage/Makefile:1.26 Thu Dec 2 18:15:28 2021
+++ pkgsrc/x11/xf86-video-savage/Makefile Sun Apr 10 08:53:22 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-siliconmotion/Makefile
diff -u pkgsrc/x11/xf86-video-siliconmotion/Makefile:1.24 pkgsrc/x11/xf86-video-siliconmotion/Makefile:1.25
--- pkgsrc/x11/xf86-video-siliconmotion/Makefile:1.24 Thu Dec 2 18:15:28 2021
+++ pkgsrc/x11/xf86-video-siliconmotion/Makefile Sun Apr 10 08:53:22 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-sis/Makefile
diff -u pkgsrc/x11/xf86-video-sis/Makefile:1.31 pkgsrc/x11/xf86-video-sis/Makefile:1.32
--- pkgsrc/x11/xf86-video-sis/Makefile:1.31 Thu Dec 2 18:15:28 2021
+++ pkgsrc/x11/xf86-video-sis/Makefile Sun Apr 10 08:53:22 2022
@@ -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="${PR
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"
Index: pkgsrc/x11/xf86-video-suncg14/Makefile
diff -u pkgsrc/x11/xf86-video-suncg14/Makefile:1.13 pkgsrc/x11/xf86-video-suncg14/Makefile:1.14
--- pkgsrc/x11/xf86-video-suncg14/Makefile:1.13 Thu Dec 2 18:17:54 2021
+++ pkgsrc/x11/xf86-video-suncg14/Makefile Sun Apr 10 08:53:22 2022
@@ -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 *-*-sparc6
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"
Index: pkgsrc/x11/xf86-video-suncg3/Makefile
diff -u pkgsrc/x11/xf86-video-suncg3/Makefile:1.13 pkgsrc/x11/xf86-video-suncg3/Makefile:1.14
--- pkgsrc/x11/xf86-video-suncg3/Makefile:1.13 Thu Dec 2 18:17:54 2021
+++ pkgsrc/x11/xf86-video-suncg3/Makefile Sun Apr 10 08:53:22 2022
@@ -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 *-*-sparc6
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"
Index: pkgsrc/x11/xf86-video-suncg6/Makefile
diff -u pkgsrc/x11/xf86-video-suncg6/Makefile:1.9 pkgsrc/x11/xf86-video-suncg6/Makefile:1.10
--- pkgsrc/x11/xf86-video-suncg6/Makefile:1.9 Thu Dec 2 18:17:54 2021
+++ pkgsrc/x11/xf86-video-suncg6/Makefile Sun Apr 10 08:53:22 2022
@@ -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 *-*-sparc6
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"
Index: pkgsrc/x11/xf86-video-sunffb/Makefile
diff -u pkgsrc/x11/xf86-video-sunffb/Makefile:1.13 pkgsrc/x11/xf86-video-sunffb/Makefile:1.14
--- pkgsrc/x11/xf86-video-sunffb/Makefile:1.13 Thu Dec 2 18:17:54 2021
+++ pkgsrc/x11/xf86-video-sunffb/Makefile Sun Apr 10 08:53:23 2022
@@ -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 *-*-sparc6
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"
Index: pkgsrc/x11/xf86-video-sunleo/Makefile
diff -u pkgsrc/x11/xf86-video-sunleo/Makefile:1.6 pkgsrc/x11/xf86-video-sunleo/Makefile:1.7
--- pkgsrc/x11/xf86-video-sunleo/Makefile:1.6 Thu Dec 2 18:17:55 2021
+++ pkgsrc/x11/xf86-video-sunleo/Makefile Sun Apr 10 08:53:23 2022
@@ -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 *-*-sparc6
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"
Index: pkgsrc/x11/xf86-video-suntcx/Makefile
diff -u pkgsrc/x11/xf86-video-suntcx/Makefile:1.9 pkgsrc/x11/xf86-video-suntcx/Makefile:1.10
--- pkgsrc/x11/xf86-video-suntcx/Makefile:1.9 Thu Dec 2 18:17:55 2021
+++ pkgsrc/x11/xf86-video-suntcx/Makefile Sun Apr 10 08:53:23 2022
@@ -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 *-*-sparc6
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"
Index: pkgsrc/x11/xf86-video-tdfx/Makefile
diff -u pkgsrc/x11/xf86-video-tdfx/Makefile:1.26 pkgsrc/x11/xf86-video-tdfx/Makefile:1.27
--- pkgsrc/x11/xf86-video-tdfx/Makefile:1.26 Thu Dec 2 18:15:29 2021
+++ pkgsrc/x11/xf86-video-tdfx/Makefile Sun Apr 10 08:53:23 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-tga/Makefile
diff -u pkgsrc/x11/xf86-video-tga/Makefile:1.20 pkgsrc/x11/xf86-video-tga/Makefile:1.21
--- pkgsrc/x11/xf86-video-tga/Makefile:1.20 Thu Dec 2 18:15:29 2021
+++ pkgsrc/x11/xf86-video-tga/Makefile Sun Apr 10 08:53:23 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-trident/Makefile
diff -u pkgsrc/x11/xf86-video-trident/Makefile:1.24 pkgsrc/x11/xf86-video-trident/Makefile:1.25
--- pkgsrc/x11/xf86-video-trident/Makefile:1.24 Thu Dec 2 18:15:29 2021
+++ pkgsrc/x11/xf86-video-trident/Makefile Sun Apr 10 08:53:23 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-tseng/Makefile
diff -u pkgsrc/x11/xf86-video-tseng/Makefile:1.22 pkgsrc/x11/xf86-video-tseng/Makefile:1.23
--- pkgsrc/x11/xf86-video-tseng/Makefile:1.22 Thu Dec 2 18:15:29 2021
+++ pkgsrc/x11/xf86-video-tseng/Makefile Sun Apr 10 08:53:23 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-vboxvideo/Makefile
diff -u pkgsrc/x11/xf86-video-vboxvideo/Makefile:1.6 pkgsrc/x11/xf86-video-vboxvideo/Makefile:1.7
--- pkgsrc/x11/xf86-video-vboxvideo/Makefile:1.6 Thu Dec 2 18:15:30 2021
+++ pkgsrc/x11/xf86-video-vboxvideo/Makefile Sun Apr 10 08:53:23 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-vesa/Makefile
diff -u pkgsrc/x11/xf86-video-vesa/Makefile:1.28 pkgsrc/x11/xf86-video-vesa/Makefile:1.29
--- pkgsrc/x11/xf86-video-vesa/Makefile:1.28 Thu Dec 2 18:15:30 2021
+++ pkgsrc/x11/xf86-video-vesa/Makefile Sun Apr 10 08:53:23 2022
@@ -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
Index: pkgsrc/x11/xf86-video-vmware/Makefile
diff -u pkgsrc/x11/xf86-video-vmware/Makefile:1.31 pkgsrc/x11/xf86-video-vmware/Makefile:1.32
--- pkgsrc/x11/xf86-video-vmware/Makefile:1.31 Thu Dec 2 18:15:30 2021
+++ pkgsrc/x11/xf86-video-vmware/Makefile Sun Apr 10 08:53:24 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-voodoo/Makefile
diff -u pkgsrc/x11/xf86-video-voodoo/Makefile:1.8 pkgsrc/x11/xf86-video-voodoo/Makefile:1.9
--- pkgsrc/x11/xf86-video-voodoo/Makefile:1.8 Thu Dec 2 18:15:30 2021
+++ pkgsrc/x11/xf86-video-voodoo/Makefile Sun Apr 10 08:53:24 2022
@@ -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"
Index: pkgsrc/x11/xf86-video-wsfb/Makefile
diff -u pkgsrc/x11/xf86-video-wsfb/Makefile:1.23 pkgsrc/x11/xf86-video-wsfb/Makefile:1.24
--- pkgsrc/x11/xf86-video-wsfb/Makefile:1.23 Thu Dec 2 18:15:30 2021
+++ pkgsrc/x11/xf86-video-wsfb/Makefile Sun Apr 10 08:53:24 2022
@@ -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"
Index: pkgsrc/x11/xinit/Makefile
diff -u pkgsrc/x11/xinit/Makefile:1.29 pkgsrc/x11/xinit/Makefile:1.30
--- pkgsrc/x11/xinit/Makefile:1.29 Fri Dec 3 13:03:19 2021
+++ pkgsrc/x11/xinit/Makefile Sun Apr 10 08:53:24 2022
@@ -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
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"
Index: pkgsrc/x11/xtrans/Makefile
diff -u pkgsrc/x11/xtrans/Makefile:1.29 pkgsrc/x11/xtrans/Makefile:1.30
--- pkgsrc/x11/xtrans/Makefile:1.29 Wed Dec 1 13:01:17 2021
+++ pkgsrc/x11/xtrans/Makefile Sun Apr 10 08:53:24 2022
@@ -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"
Home |
Main Index |
Thread Index |
Old Index