pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 x11: adapt to new avoid-duplicate.mk usage
details: https://anonhg.NetBSD.org/pkgsrc/rev/cc91276f0641
branches: trunk
changeset: 376612:cc91276f0641
user: nia <nia%pkgsrc.org@localhost>
date: Sun Apr 10 08:53:14 2022 +0000
description:
x11: adapt to new avoid-duplicate.mk usage
diffstat:
x11/libFS/Makefile | 4 ++--
x11/libICE/Makefile | 4 ++--
x11/libSM/Makefile | 4 ++--
x11/libX11/Makefile | 4 ++--
x11/libXScrnSaver/Makefile | 4 ++--
x11/libXau/Makefile | 4 ++--
x11/libXcomposite/Makefile | 4 ++--
x11/libXdamage/Makefile | 4 ++--
x11/libXdmcp/Makefile | 4 ++--
x11/libXext/Makefile | 4 ++--
x11/libXfixes/Makefile | 4 ++--
x11/libXfont/Makefile | 4 ++--
x11/libXfont2/Makefile | 4 ++--
x11/libXft/Makefile | 4 ++--
x11/libXi/Makefile | 4 ++--
x11/libXinerama/Makefile | 4 ++--
x11/libXmu/Makefile | 4 ++--
x11/libXpm/Makefile | 4 ++--
x11/libXpresent/Makefile | 4 ++--
x11/libXrandr/Makefile | 4 +---
x11/libXres/Makefile | 4 ++--
x11/libXt/Makefile | 4 ++--
x11/libXtst/Makefile | 4 ++--
x11/libXv/Makefile | 4 ++--
x11/libXvMC/Makefile | 4 ++--
x11/libdrm/Makefile | 4 ++--
x11/liboldXrandr/Makefile | 4 ++--
x11/libxcb/Makefile | 4 ++--
x11/libxshmfence/Makefile | 4 ++--
x11/modular-xorg-server/Makefile | 4 ++--
x11/pixman/Makefile | 4 ++--
x11/xauth/Makefile | 4 ++--
x11/xbitmaps/Makefile | 4 +---
x11/xcursor/Makefile | 4 ++--
x11/xf86-input-acecad/Makefile | 4 ++--
x11/xf86-input-elographics/Makefile | 4 ++--
x11/xf86-input-fpit/Makefile | 4 ++--
x11/xf86-input-hyperpen/Makefile | 4 ++--
x11/xf86-input-joystick/Makefile | 4 ++--
x11/xf86-input-keyboard/Makefile | 4 ++--
x11/xf86-input-mouse/Makefile | 4 ++--
x11/xf86-input-mutouch/Makefile | 4 ++--
x11/xf86-input-penmount/Makefile | 4 ++--
x11/xf86-input-vmmouse/Makefile | 4 ++--
x11/xf86-input-void/Makefile | 4 ++--
x11/xf86-input-ws/Makefile | 4 ++--
x11/xf86-video-amdgpu/Makefile | 4 ++--
x11/xf86-video-apm/Makefile | 4 ++--
x11/xf86-video-ark/Makefile | 4 ++--
x11/xf86-video-ast/Makefile | 4 ++--
x11/xf86-video-ati/Makefile | 4 ++--
x11/xf86-video-chips/Makefile | 4 ++--
x11/xf86-video-cirrus/Makefile | 4 ++--
x11/xf86-video-dummy/Makefile | 4 ++--
x11/xf86-video-fbdev/Makefile | 4 ++--
x11/xf86-video-glint/Makefile | 4 ++--
x11/xf86-video-i128/Makefile | 4 ++--
x11/xf86-video-i740/Makefile | 4 ++--
x11/xf86-video-intel/Makefile | 4 ++--
x11/xf86-video-mach64/Makefile | 4 ++--
x11/xf86-video-mga/Makefile | 4 ++--
x11/xf86-video-neomagic/Makefile | 4 ++--
x11/xf86-video-nouveau/Makefile | 4 ++--
x11/xf86-video-nv/Makefile | 4 ++--
x11/xf86-video-openchrome/Makefile | 4 ++--
x11/xf86-video-qxl/Makefile | 4 ++--
x11/xf86-video-r128/Makefile | 4 ++--
x11/xf86-video-rendition/Makefile | 4 ++--
x11/xf86-video-s3/Makefile | 4 ++--
x11/xf86-video-s3virge/Makefile | 4 ++--
x11/xf86-video-savage/Makefile | 4 ++--
x11/xf86-video-siliconmotion/Makefile | 4 ++--
x11/xf86-video-sis/Makefile | 4 ++--
x11/xf86-video-suncg14/Makefile | 4 ++--
x11/xf86-video-suncg3/Makefile | 4 ++--
x11/xf86-video-suncg6/Makefile | 4 ++--
x11/xf86-video-sunffb/Makefile | 4 ++--
x11/xf86-video-sunleo/Makefile | 4 ++--
x11/xf86-video-suntcx/Makefile | 4 ++--
x11/xf86-video-tdfx/Makefile | 4 ++--
x11/xf86-video-tga/Makefile | 4 ++--
x11/xf86-video-trident/Makefile | 4 ++--
x11/xf86-video-tseng/Makefile | 4 ++--
x11/xf86-video-vboxvideo/Makefile | 4 ++--
x11/xf86-video-vesa/Makefile | 4 ++--
x11/xf86-video-vmware/Makefile | 4 ++--
x11/xf86-video-voodoo/Makefile | 4 ++--
x11/xf86-video-wsfb/Makefile | 4 ++--
x11/xinit/Makefile | 4 ++--
x11/xtrans/Makefile | 4 +---
90 files changed, 177 insertions(+), 183 deletions(-)
diffs (truncated from 1614 to 300 lines):
diff -r 087869f5a4fa -r cc91276f0641 x11/libFS/Makefile
--- a/x11/libFS/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libFS/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libICE/Makefile
--- a/x11/libICE/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libICE/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
.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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libSM/Makefile
--- a/x11/libSM/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libSM/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
.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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libX11/Makefile
--- a/x11/libX11/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libX11/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXScrnSaver/Makefile
--- a/x11/libXScrnSaver/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXScrnSaver/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXau/Makefile
--- a/x11/libXau/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXau/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXcomposite/Makefile
--- a/x11/libXcomposite/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXcomposite/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXdamage/Makefile
--- a/x11/libXdamage/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXdamage/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXdmcp/Makefile
--- a/x11/libXdmcp/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXdmcp/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXext/Makefile
--- a/x11/libXext/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXext/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
.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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXfixes/Makefile
--- a/x11/libXfixes/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXfixes/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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
diff -r 087869f5a4fa -r cc91276f0641 x11/libXfont/Makefile
--- a/x11/libXfont/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXfont/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXfont2/Makefile
--- a/x11/libXfont2/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXfont2/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXft/Makefile
--- a/x11/libXft/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXft/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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_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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXi/Makefile
--- a/x11/libXi/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXi/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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
diff -r 087869f5a4fa -r cc91276f0641 x11/libXinerama/Makefile
--- a/x11/libXinerama/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXinerama/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
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"
diff -r 087869f5a4fa -r cc91276f0641 x11/libXmu/Makefile
--- a/x11/libXmu/Makefile Sun Apr 10 08:52:01 2022 +0000
+++ b/x11/libXmu/Makefile Sun Apr 10 08:53:14 2022 +0000
@@ -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 @@
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
Home |
Main Index |
Thread Index |
Old Index