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: Wed Dec 1 13:01:17 UTC 2021
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/pixman: Makefile
pkgsrc/x11/xauth: Makefile
pkgsrc/x11/xbitmaps: Makefile
pkgsrc/x11/xcb-proto: Makefile
pkgsrc/x11/xcb-util: Makefile
pkgsrc/x11/xcursor: Makefile
pkgsrc/x11/xkeyboard-config: Makefile
pkgsrc/x11/xorgproto: Makefile
pkgsrc/x11/xtrans: Makefile
Log Message:
x11: Add avoid-duplicate.mk to Xorg library packages
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/libFS/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/libICE/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/libSM/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/libX11/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/libXScrnSaver/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/libXau/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libXcomposite/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libXdamage/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/libXdmcp/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/libXext/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/libXfixes/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/libXfont/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/libXfont2/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/libXft/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/x11/libXi/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/libXinerama/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libXmu/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/libXpm/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXpresent/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/libXrandr/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/libXres/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/libXt/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/libXtst/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/libXv/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/libXvMC/Makefile
cvs rdiff -u -r1.96 -r1.97 pkgsrc/x11/libdrm/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/liboldXrandr/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/libxcb/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/libxshmfence/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/x11/pixman/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/xauth/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xbitmaps/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xcb-proto/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xcb-util/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/xcursor/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/xkeyboard-config/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xorgproto/Makefile
cvs rdiff -u -r1.28 -r1.29 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.19 pkgsrc/x11/libFS/Makefile:1.20
--- pkgsrc/x11/libFS/Makefile:1.19 Sat Jan 18 23:35:50 2020
+++ pkgsrc/x11/libFS/Makefile Wed Dec 1 13:01:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/01/18 23:35:50 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2021/12/01 13:01:12 nia Exp $
DISTNAME= libFS-1.0.8
CATEGORIES= x11 devel
@@ -17,8 +17,9 @@ PKGCONFIG_OVERRIDE+= libfs.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
+X11_BUILTIN_NAME?= libFS
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libICE/Makefile
diff -u pkgsrc/x11/libICE/Makefile:1.15 pkgsrc/x11/libICE/Makefile:1.16
--- pkgsrc/x11/libICE/Makefile:1.15 Sat Jan 18 23:35:50 2020
+++ pkgsrc/x11/libICE/Makefile Wed Dec 1 13:01:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/01/18 23:35:50 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:12 nia Exp $
DISTNAME= libICE-1.0.10
CATEGORIES= x11 devel
@@ -17,8 +17,9 @@ PKGCONFIG_OVERRIDE+= ice.pc.in
.include "options.mk"
+X11_BUILTIN_NAME?= libICE
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libSM/Makefile
diff -u pkgsrc/x11/libSM/Makefile:1.16 pkgsrc/x11/libSM/Makefile:1.17
--- pkgsrc/x11/libSM/Makefile:1.16 Sat Jan 18 23:35:50 2020
+++ pkgsrc/x11/libSM/Makefile Wed Dec 1 13:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/01/18 23:35:50 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2021/12/01 13:01:13 nia Exp $
DISTNAME= libSM-1.2.3
CATEGORIES= x11 devel
@@ -19,8 +19,9 @@ CONFIGURE_ARGS+= --without-libuuid
.include "options.mk"
+X11_BUILTIN_NAME?= libSM
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
Index: pkgsrc/x11/libX11/Makefile
diff -u pkgsrc/x11/libX11/Makefile:1.58 pkgsrc/x11/libX11/Makefile:1.59
--- pkgsrc/x11/libX11/Makefile:1.58 Sun Jun 6 21:05:08 2021
+++ pkgsrc/x11/libX11/Makefile Wed Dec 1 13:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2021/06/06 21:05:08 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2021/12/01 13:01:13 nia Exp $
DISTNAME= libX11-1.7.2
CATEGORIES= x11 devel
@@ -44,6 +44,8 @@ CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_C
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"
Index: pkgsrc/x11/libXScrnSaver/Makefile
diff -u pkgsrc/x11/libXScrnSaver/Makefile:1.14 pkgsrc/x11/libXScrnSaver/Makefile:1.15
--- pkgsrc/x11/libXScrnSaver/Makefile:1.14 Sat Jan 18 23:35:50 2020
+++ pkgsrc/x11/libXScrnSaver/Makefile Wed Dec 1 13:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/01/18 23:35:50 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/01 13:01:13 nia Exp $
DISTNAME= libXScrnSaver-1.2.3
CATEGORIES= x11
@@ -17,8 +17,9 @@ PKGCONFIG_OVERRIDE+= xscrnsaver.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
+X11_BUILTIN_NAME?= libXScrnSaver
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
Index: pkgsrc/x11/libXau/Makefile
diff -u pkgsrc/x11/libXau/Makefile:1.17 pkgsrc/x11/libXau/Makefile:1.18
--- pkgsrc/x11/libXau/Makefile:1.17 Sat Jan 18 23:35:50 2020
+++ pkgsrc/x11/libXau/Makefile Wed Dec 1 13:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/01/18 23:35:50 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2021/12/01 13:01:13 nia Exp $
DISTNAME= libXau-1.0.9
CATEGORIES= x11 devel
@@ -20,8 +20,9 @@ PKGCONFIG_OVERRIDE+= xau.pc.in
CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h
+X11_BUILTIN_NAME?= libXau
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../mk/pthread.buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXcomposite/Makefile
diff -u pkgsrc/x11/libXcomposite/Makefile:1.13 pkgsrc/x11/libXcomposite/Makefile:1.14
--- pkgsrc/x11/libXcomposite/Makefile:1.13 Sat Jan 18 23:35:51 2020
+++ pkgsrc/x11/libXcomposite/Makefile Wed Dec 1 13:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/01 13:01:13 nia Exp $
DISTNAME= libXcomposite-0.4.5
CATEGORIES= x11 devel
@@ -16,9 +16,10 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= xcomposite.pc.in
+X11_BUILTIN_NAME?= libXcomposite
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXdamage/Makefile
diff -u pkgsrc/x11/libXdamage/Makefile:1.12 pkgsrc/x11/libXdamage/Makefile:1.13
--- pkgsrc/x11/libXdamage/Makefile:1.12 Sat Jan 18 23:35:51 2020
+++ pkgsrc/x11/libXdamage/Makefile Wed Dec 1 13:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2021/12/01 13:01:13 nia Exp $
DISTNAME= libXdamage-1.1.5
CATEGORIES= x11 devel
@@ -16,6 +16,8 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= xdamage.pc.in
+X11_BUILTIN_NAME?= libXdamage
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
Index: pkgsrc/x11/libXdmcp/Makefile
diff -u pkgsrc/x11/libXdmcp/Makefile:1.11 pkgsrc/x11/libXdmcp/Makefile:1.12
--- pkgsrc/x11/libXdmcp/Makefile:1.11 Sat Jan 18 23:35:51 2020
+++ pkgsrc/x11/libXdmcp/Makefile Wed Dec 1 13:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/01 13:01:13 nia Exp $
DISTNAME= libXdmcp-1.1.3
CATEGORIES= x11
@@ -14,7 +14,8 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= xdmcp.pc.in
GNU_CONFIGURE= yes
+X11_BUILTIN_NAME?= libXdmcp
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXext/Makefile
diff -u pkgsrc/x11/libXext/Makefile:1.26 pkgsrc/x11/libXext/Makefile:1.27
--- pkgsrc/x11/libXext/Makefile:1.26 Sat Jan 18 23:35:51 2020
+++ pkgsrc/x11/libXext/Makefile Wed Dec 1 13:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2021/12/01 13:01:13 nia Exp $
DISTNAME= libXext-1.3.4
CATEGORIES= x11 devel
@@ -24,6 +24,8 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PR
.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"
Index: pkgsrc/x11/libXfixes/Makefile
diff -u pkgsrc/x11/libXfixes/Makefile:1.14 pkgsrc/x11/libXfixes/Makefile:1.15
--- pkgsrc/x11/libXfixes/Makefile:1.14 Sat Jan 18 23:35:51 2020
+++ pkgsrc/x11/libXfixes/Makefile Wed Dec 1 13:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/01 13:01:13 nia Exp $
DISTNAME= libXfixes-5.0.3
PKGREVISION= 1
@@ -19,6 +19,8 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= LIB_MAN_SUFFIX=3
PKGCONFIG_OVERRIDE+= xfixes.pc.in
+X11_BUILTIN_NAME?= libXfixes
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
Index: pkgsrc/x11/libXfont/Makefile
diff -u pkgsrc/x11/libXfont/Makefile:1.43 pkgsrc/x11/libXfont/Makefile:1.44
--- pkgsrc/x11/libXfont/Makefile:1.43 Sat Jan 18 23:35:51 2020
+++ pkgsrc/x11/libXfont/Makefile Wed Dec 1 13:01:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2020/01/18 23:35:51 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2021/12/01 13:01:14 nia Exp $
DISTNAME= libXfont-1.5.4
PKGREVISION= 2
@@ -20,12 +20,12 @@ PKGCONFIG_OVERRIDE+= xfont.pc.in
CONFIGURE_ARGS+= --disable-devel-docs
+X11_BUILTIN_NAME?= libXfont
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXfont2/Makefile
diff -u pkgsrc/x11/libXfont2/Makefile:1.11 pkgsrc/x11/libXfont2/Makefile:1.12
--- pkgsrc/x11/libXfont2/Makefile:1.11 Mon Aug 2 10:41:14 2021
+++ pkgsrc/x11/libXfont2/Makefile Wed Dec 1 13:01:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/08/02 10:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/01 13:01:14 nia Exp $
DISTNAME= libXfont2-2.0.5
CATEGORIES= x11 devel fonts
@@ -20,8 +20,9 @@ PKGCONFIG_OVERRIDE+= xfont2.pc.in
CONFIGURE_ARGS+= --disable-devel-docs
CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE
+X11_BUILTIN_NAME?= libXfont2
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
Index: pkgsrc/x11/libXft/Makefile
diff -u pkgsrc/x11/libXft/Makefile:1.23 pkgsrc/x11/libXft/Makefile:1.24
--- pkgsrc/x11/libXft/Makefile:1.23 Mon Aug 2 10:47:05 2021
+++ pkgsrc/x11/libXft/Makefile Wed Dec 1 13:01:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/08/02 10:47:05 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/01 13:01:14 nia Exp $
DISTNAME= libXft-2.3.4
CATEGORIES= x11 fonts
@@ -16,6 +16,8 @@ USE_LIBTOOL= YES
USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE= xft.pc.in
+X11_BUILTIN_NAME?= libXft
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
Index: pkgsrc/x11/libXi/Makefile
diff -u pkgsrc/x11/libXi/Makefile:1.37 pkgsrc/x11/libXi/Makefile:1.38
--- pkgsrc/x11/libXi/Makefile:1.37 Thu Sep 16 08:39:06 2021
+++ pkgsrc/x11/libXi/Makefile Wed Dec 1 13:01:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2021/09/16 08:39:06 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2021/12/01 13:01:14 nia Exp $
DISTNAME= libXi-1.8
CATEGORIES= x11 devel
@@ -19,6 +19,8 @@ PKGCONFIG_OVERRIDE+= xi.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
+X11_BUILTIN_NAME?= libXi
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1
.include "../../x11/libX11/buildlink3.mk"
Index: pkgsrc/x11/libXinerama/Makefile
diff -u pkgsrc/x11/libXinerama/Makefile:1.17 pkgsrc/x11/libXinerama/Makefile:1.18
--- pkgsrc/x11/libXinerama/Makefile:1.17 Sat Jan 18 23:35:52 2020
+++ pkgsrc/x11/libXinerama/Makefile Wed Dec 1 13:01:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/01/18 23:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2021/12/01 13:01:14 nia Exp $
DISTNAME= libXinerama-1.1.4
CATEGORIES= x11
@@ -18,8 +18,9 @@ PKGCONFIG_OVERRIDE+= xinerama.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
+X11_BUILTIN_NAME?= libXinerama
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
Index: pkgsrc/x11/libXmu/Makefile
diff -u pkgsrc/x11/libXmu/Makefile:1.13 pkgsrc/x11/libXmu/Makefile:1.14
--- pkgsrc/x11/libXmu/Makefile:1.13 Sat Jan 18 23:35:52 2020
+++ pkgsrc/x11/libXmu/Makefile Wed Dec 1 13:01:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/01/18 23:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/01 13:01:14 nia Exp $
DISTNAME= libXmu-1.1.3
CATEGORIES= x11 devel
@@ -15,10 +15,9 @@ PKGCONFIG_OVERRIDE+= xmuu.pc.in
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
+X11_BUILTIN_NAME?= libXmu
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
-.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXpm/Makefile
diff -u pkgsrc/x11/libXpm/Makefile:1.20 pkgsrc/x11/libXpm/Makefile:1.21
--- pkgsrc/x11/libXpm/Makefile:1.20 Sat Jan 18 23:35:52 2020
+++ pkgsrc/x11/libXpm/Makefile Wed Dec 1 13:01:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/01/18 23:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2021/12/01 13:01:14 nia Exp $
DISTNAME= libXpm-3.5.13
CATEGORIES= graphics x11
@@ -40,8 +40,9 @@ CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS
SXPM_LIBS=${SXPM_LIBS:Q}
.endif
+X11_BUILTIN_NAME?= libXmu
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
Index: pkgsrc/x11/libXpresent/Makefile
diff -u pkgsrc/x11/libXpresent/Makefile:1.3 pkgsrc/x11/libXpresent/Makefile:1.4
--- pkgsrc/x11/libXpresent/Makefile:1.3 Sat Jan 18 23:35:52 2020
+++ pkgsrc/x11/libXpresent/Makefile Wed Dec 1 13:01:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/18 23:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/01 13:01:14 nia Exp $
DISTNAME= libXpresent-1.0.0
PKGREVISION= 1
@@ -15,6 +15,8 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= xpresent.pc.in
GNU_CONFIGURE= yes
+X11_BUILTIN_NAME?= libXpresent
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
Index: pkgsrc/x11/libXrandr/Makefile
diff -u pkgsrc/x11/libXrandr/Makefile:1.22 pkgsrc/x11/libXrandr/Makefile:1.23
--- pkgsrc/x11/libXrandr/Makefile:1.22 Sat Jan 18 23:35:52 2020
+++ pkgsrc/x11/libXrandr/Makefile Wed Dec 1 13:01:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/01/18 23:35:52 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2021/12/01 13:01:15 nia Exp $
DISTNAME= libXrandr-1.5.2
CATEGORIES= x11 devel
@@ -20,6 +20,8 @@ PKGCONFIG_OVERRIDE+= xrandr.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
+X11_BUILTIN_NAME?= libXrandr
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
Index: pkgsrc/x11/libXres/Makefile
diff -u pkgsrc/x11/libXres/Makefile:1.15 pkgsrc/x11/libXres/Makefile:1.16
--- pkgsrc/x11/libXres/Makefile:1.15 Wed Mar 31 20:25:01 2021
+++ pkgsrc/x11/libXres/Makefile Wed Dec 1 13:01:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/03/31 20:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:15 nia Exp $
DISTNAME= libXres-1.2.1
CATEGORIES= x11
@@ -17,8 +17,9 @@ PKGCONFIG_OVERRIDE+= xres.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
+X11_BUILTIN_NAME?= libXres
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
Index: pkgsrc/x11/libXt/Makefile
diff -u pkgsrc/x11/libXt/Makefile:1.28 pkgsrc/x11/libXt/Makefile:1.29
--- pkgsrc/x11/libXt/Makefile:1.28 Sun Jan 24 15:54:00 2021
+++ pkgsrc/x11/libXt/Makefile Wed Dec 1 13:01:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2021/01/24 15:54:00 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2021/12/01 13:01:15 nia Exp $
DISTNAME= libXt-1.2.1
CATEGORIES= x11 devel
@@ -33,6 +33,8 @@ CPPFLAGS.OSF1+= -pthread # Required by
TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
+X11_BUILTIN_NAME?= libXt
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
Index: pkgsrc/x11/libXtst/Makefile
diff -u pkgsrc/x11/libXtst/Makefile:1.15 pkgsrc/x11/libXtst/Makefile:1.16
--- pkgsrc/x11/libXtst/Makefile:1.15 Sat Jan 18 23:35:53 2020
+++ pkgsrc/x11/libXtst/Makefile Wed Dec 1 13:01:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/01/18 23:35:53 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:15 nia Exp $
DISTNAME= libXtst-1.2.3
PKGREVISION= 1
@@ -33,8 +33,9 @@ SUBST_FILES.sofix+= man/XTestCompareCurs
SUBST_STAGE.sofix= post-configure
SUBST_MESSAGE.sofix= Fix .so arguments.
+X11_BUILTIN_NAME?= libXtst
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
Index: pkgsrc/x11/libXv/Makefile
diff -u pkgsrc/x11/libXv/Makefile:1.18 pkgsrc/x11/libXv/Makefile:1.19
--- pkgsrc/x11/libXv/Makefile:1.18 Sat Jan 18 23:35:53 2020
+++ pkgsrc/x11/libXv/Makefile Wed Dec 1 13:01:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/01/18 23:35:53 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2021/12/01 13:01:15 nia Exp $
DISTNAME= libXv-1.0.11
PKGREVISION= 1
@@ -17,8 +17,9 @@ USE_TOOLS+= pkg-config
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
+X11_BUILTIN_NAME?= libXv
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
Index: pkgsrc/x11/libXvMC/Makefile
diff -u pkgsrc/x11/libXvMC/Makefile:1.17 pkgsrc/x11/libXvMC/Makefile:1.18
--- pkgsrc/x11/libXvMC/Makefile:1.17 Sat Jan 18 23:35:53 2020
+++ pkgsrc/x11/libXvMC/Makefile Wed Dec 1 13:01:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/01/18 23:35:53 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2021/12/01 13:01:15 nia Exp $
DISTNAME= libXvMC-1.0.12
CATEGORIES= x11
@@ -19,8 +19,9 @@ PKGCONFIG_OVERRIDE+= xvmc-wrapper.pc.in
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
+X11_BUILTIN_NAME?= libXvMC
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
Index: pkgsrc/x11/libdrm/Makefile
diff -u pkgsrc/x11/libdrm/Makefile:1.96 pkgsrc/x11/libdrm/Makefile:1.97
--- pkgsrc/x11/libdrm/Makefile:1.96 Tue Jul 20 09:43:22 2021
+++ pkgsrc/x11/libdrm/Makefile Wed Dec 1 13:01:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2021/07/20 09:43:22 tnn Exp $
+# $NetBSD: Makefile,v 1.97 2021/12/01 13:01:15 nia Exp $
DISTNAME= libdrm-2.4.100
CATEGORIES= x11 graphics
@@ -60,4 +60,6 @@ PLIST.arm= yes
PLIST.kms= yes
.endif
+X11_BUILTIN_NAME?= libdrm
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/liboldXrandr/Makefile
diff -u pkgsrc/x11/liboldXrandr/Makefile:1.6 pkgsrc/x11/liboldXrandr/Makefile:1.7
--- pkgsrc/x11/liboldXrandr/Makefile:1.6 Wed Mar 7 11:57:38 2018
+++ pkgsrc/x11/liboldXrandr/Makefile Wed Dec 1 13:01:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:38 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2021/12/01 13:01:15 nia Exp $
DISTNAME= libXrandr-1.0.2
PKGNAME= Xrandr-1.0.2
@@ -19,9 +19,10 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= xrandr.pc.in
-BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
-
+X11_BUILTIN_NAME?= Xrandr
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libXext/buildlink3.mk"
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
.include "../../x11/libXrender/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libxcb/Makefile
diff -u pkgsrc/x11/libxcb/Makefile:1.35 pkgsrc/x11/libxcb/Makefile:1.36
--- pkgsrc/x11/libxcb/Makefile:1.35 Sun Feb 23 22:37:45 2020
+++ pkgsrc/x11/libxcb/Makefile Wed Dec 1 13:01:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2020/02/23 22:37:45 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2021/12/01 13:01:15 nia Exp $
DISTNAME= libxcb-1.14
CATEGORIES= x11
@@ -87,6 +87,8 @@ post-extract:
### so it's not needed (nor should it ever be, really).
###
#.include "../../devel/gperf/buildlink3.mk"
+X11_BUILTIN_NAME?= libxcb
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
PYTHON_FOR_BUILD_ONLY= tool
.include "../../lang/python/application.mk"
BUILDLINK_API_DEPENDS.xcb-proto?= xcb-proto>=1.14
Index: pkgsrc/x11/libxshmfence/Makefile
diff -u pkgsrc/x11/libxshmfence/Makefile:1.15 pkgsrc/x11/libxshmfence/Makefile:1.16
--- pkgsrc/x11/libxshmfence/Makefile:1.15 Sat Aug 21 19:22:12 2021
+++ pkgsrc/x11/libxshmfence/Makefile Wed Dec 1 13:01:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/08/21 19:22:12 mcf Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/01 13:01:16 nia Exp $
DISTNAME= libxshmfence-1.3
PKGREVISION= 3
@@ -35,5 +35,7 @@ pre-configure:
.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
+X11_BUILTIN_NAME?= libxshmfence
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/pixman/Makefile
diff -u pkgsrc/x11/pixman/Makefile:1.77 pkgsrc/x11/pixman/Makefile:1.78
--- pkgsrc/x11/pixman/Makefile:1.77 Mon May 24 19:56:03 2021
+++ pkgsrc/x11/pixman/Makefile Wed Dec 1 13:01:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2021/05/24 19:56:03 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2021/12/01 13:01:16 nia Exp $
DISTNAME= pixman-0.40.0
PKGREVISION= 2
@@ -24,4 +24,6 @@ USE_TOOLS+= pkg-config perl
PKGCONFIG_OVERRIDE+= pixman-1.pc.in
PKGCONFIG_OVERRIDE+= pixman-1-uninstalled.pc.in
+X11_BUILTIN_NAME?= pixman
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xauth/Makefile
diff -u pkgsrc/x11/xauth/Makefile:1.13 pkgsrc/x11/xauth/Makefile:1.14
--- pkgsrc/x11/xauth/Makefile:1.13 Sun Nov 28 23:56:22 2021
+++ pkgsrc/x11/xauth/Makefile Wed Dec 1 13:01:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/11/28 23:56:22 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/01 13:01:16 nia Exp $
DISTNAME= xauth-1.1.1
CATEGORIES= x11
@@ -13,6 +13,8 @@ GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
CPPFLAGS.NetBSD+= -D_OPENBSD_SOURCE
+X11_BUILTIN_NAME= xauth
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xbitmaps/Makefile
diff -u pkgsrc/x11/xbitmaps/Makefile:1.8 pkgsrc/x11/xbitmaps/Makefile:1.9
--- pkgsrc/x11/xbitmaps/Makefile:1.8 Sat Jan 18 23:35:58 2020
+++ pkgsrc/x11/xbitmaps/Makefile Wed Dec 1 13:01:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/01/18 23:35:58 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/12/01 13:01:16 nia Exp $
DISTNAME= xbitmaps-1.1.2
CATEGORIES= x11 devel
@@ -11,4 +11,6 @@ COMMENT= Common X11 bitmaps
GNU_CONFIGURE= yes
+X11_BUILTIN_NAME= xbitmaps
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xcb-proto/Makefile
diff -u pkgsrc/x11/xcb-proto/Makefile:1.23 pkgsrc/x11/xcb-proto/Makefile:1.24
--- pkgsrc/x11/xcb-proto/Makefile:1.23 Wed Apr 21 11:43:02 2021
+++ pkgsrc/x11/xcb-proto/Makefile Wed Dec 1 13:01:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/04/21 11:43:02 adam Exp $
+# $NetBSD: Makefile,v 1.24 2021/12/01 13:01:16 nia Exp $
DISTNAME= xcb-proto-1.14.1
PKGREVISION= 2
@@ -22,6 +22,8 @@ CONFIGURE_ENV+= XMLLLINT=${BUILDLINK_PR
# XXX just for the "configure" check
PYTHON_FOR_BUILD_ONLY= tool
.include "../../lang/python/application.mk"
+X11_BUILTIN_NAME= xcb-proto
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
BUILDLINK_DEPMETHOD.libxml2?= build
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xcb-util/Makefile
diff -u pkgsrc/x11/xcb-util/Makefile:1.12 pkgsrc/x11/xcb-util/Makefile:1.13
--- pkgsrc/x11/xcb-util/Makefile:1.12 Wed Aug 16 20:21:17 2017
+++ pkgsrc/x11/xcb-util/Makefile Wed Dec 1 13:01:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/08/16 20:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2021/12/01 13:01:16 nia Exp $
DISTNAME= xcb-util-0.4.0
CATEGORIES= x11
@@ -19,5 +19,7 @@ PKGCONFIG_OVERRIDE+= xcb-event.pc.in
PKGCONFIG_OVERRIDE+= xcb-aux.pc.in
.include "../../devel/gperf/buildlink3.mk"
+X11_BUILTIN_NAME= xcb-proto
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libxcb/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xcursor/Makefile
diff -u pkgsrc/x11/xcursor/Makefile:1.27 pkgsrc/x11/xcursor/Makefile:1.28
--- pkgsrc/x11/xcursor/Makefile:1.27 Sat Jan 18 23:35:59 2020
+++ pkgsrc/x11/xcursor/Makefile Wed Dec 1 13:01:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/01/18 23:35:59 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2021/12/01 13:01:16 nia Exp $
#
DISTNAME= libXcursor-1.1.2
@@ -23,6 +23,8 @@ PKGCONFIG_OVERRIDE+= xcursor.pc.in
BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
+X11_BUILTIN_NAME= libXcursor
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xkeyboard-config/Makefile
diff -u pkgsrc/x11/xkeyboard-config/Makefile:1.46 pkgsrc/x11/xkeyboard-config/Makefile:1.47
--- pkgsrc/x11/xkeyboard-config/Makefile:1.46 Mon Nov 1 11:56:32 2021
+++ pkgsrc/x11/xkeyboard-config/Makefile Wed Dec 1 13:01:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2021/11/01 11:56:32 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2021/12/01 13:01:16 nia Exp $
DISTNAME= xkeyboard-config-2.34
CATEGORIES= x11
@@ -55,7 +55,8 @@ OWN_DIRS+= ${XKBCOMPDIR}
BUILDLINK_DEPMETHOD.gettext= build # for the configure only
.include "../../devel/gettext-lib/buildlink3.mk"
-
+X11_BUILTIN_NAME= xkeyboard-config
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.4.3
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
Index: pkgsrc/x11/xorgproto/Makefile
diff -u pkgsrc/x11/xorgproto/Makefile:1.18 pkgsrc/x11/xorgproto/Makefile:1.19
--- pkgsrc/x11/xorgproto/Makefile:1.18 Thu Sep 16 08:37:53 2021
+++ pkgsrc/x11/xorgproto/Makefile Wed Dec 1 13:01:17 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/09/16 08:37:53 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2021/12/01 13:01:17 nia Exp $
DISTNAME= xorgproto-2021.5
PKGREVISION= 1
@@ -51,4 +51,6 @@ PKGCONFIG_OVERRIDE+= xineramaproto.pc.in
PKGCONFIG_OVERRIDE+= xproto.pc.in
PKGCONFIG_OVERRIDE+= xproxymngproto.pc.in
+X11_BUILTIN_NAME= xorgproto
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xtrans/Makefile
diff -u pkgsrc/x11/xtrans/Makefile:1.28 pkgsrc/x11/xtrans/Makefile:1.29
--- pkgsrc/x11/xtrans/Makefile:1.28 Sat Jan 18 23:36:13 2020
+++ pkgsrc/x11/xtrans/Makefile Wed Dec 1 13:01:17 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2020/01/18 23:36:13 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2021/12/01 13:01:17 nia Exp $
DISTNAME= xtrans-1.4.0
CATEGORIES= x11 net
@@ -13,4 +13,6 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= xtrans.pc.in
+X11_BUILTIN_NAME= xtrans
+.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index