[src/trunk]: src/external/mit/xorg/lib Fixup more references to "old" compone...

[rjs <rjs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/21e2396765cf
branches:  trunk
changeset: 377526:21e2396765cf
user:      rjs <rjs%NetBSD.org@localhost>
date:      Sat Jul 15 21:24:46 2023 +0000

description:
Fixup more references to "old" components.

ok mrg@.

diffstat:

 external/mit/xorg/lib/Makefile              |   4 ++--
 external/mit/xorg/lib/dri.old/Makefile      |  10 +++++-----
 external/mit/xorg/lib/gallium.old/Makefile  |   4 ++--
 external/mit/xorg/lib/libGL.old/Makefile    |   4 ++--
 external/mit/xorg/lib/libgbm.old/Makefile   |   4 ++--
 external/mit/xorg/lib/libglapi.old/Makefile |   4 ++--
 external/mit/xorg/lib/libmesa.old.mk        |   4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diffs (143 lines):

diff -r 2d8e7b7ce610 -r 21e2396765cf external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile    Sat Jul 15 21:18:06 2023 +0000
+++ b/external/mit/xorg/lib/Makefile    Sat Jul 15 21:24:46 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.57 2022/07/14 07:41:49 mrg Exp $
+#      $NetBSD: Makefile,v 1.58 2023/07/15 21:24:46 rjs Exp $
 
 # build libraries for xorg
 
@@ -58,7 +58,7 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
 SUBDIR+=libgbm${OLD_SUFFIX}
 .if ${HAVE_XORG_GLAMOR} != "no"
 # libEGL depends upon libgbm
-SUBDIR+=.WAIT libEGL
+SUBDIR+=.WAIT libEGL${OLD_SUFFIX}
 .endif
 
 .include <bsd.buildinstall.mk>
diff -r 2d8e7b7ce610 -r 21e2396765cf external/mit/xorg/lib/dri.old/Makefile
--- a/external/mit/xorg/lib/dri.old/Makefile    Sat Jul 15 21:18:06 2023 +0000
+++ b/external/mit/xorg/lib/dri.old/Makefile    Sat Jul 15 21:24:46 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/07/02 23:56:12 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2023/07/15 21:24:46 rjs Exp $
 
 # Link the mesa_dri_drivers mega driver.
 
@@ -449,8 +449,8 @@ LIBDPLIBS+=         drm_intel       ${.CURDIR}/../lib
 LIBDPLIBS+=    drm_radeon      ${.CURDIR}/../libdrm_radeon
 
 MESA_SRC_MODULES=  main math math_xform vbo tnl swrast ss common asm_c program asm_s
-.include "../libmesa.old.mk"
-.include "../libglsl.old.mk"
+.include "../libmesa${OLD_SUFFIX}.mk"
+.include "../libglsl${OLD_SUFFIX}.mk"
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 SRCS+= streaming-load-memcpy.c
@@ -460,7 +460,7 @@ CPPFLAGS.isl_tiled_memcpy_sse41.c+= -mss
 
 CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wno-error=atomic-alignment :}
 
-.include "../driver.mk"
+.include "../driver${OLD_SUFFIX}.mk"
 
 .for _d in ${DRIVERS}
 SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR} 
@@ -474,7 +474,7 @@ SYMLINKS+= mesa_dri_drivers.so.${SHLIB_M
 
 PKGCONFIG=     dri
 PKGDIST.dri=   ${X11SRCDIR.Mesa}/../src/pkgconfig
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL${OLD_SUFFIX}/mesa-ver.mk"
 PKGCONFIG_VERSION.dri= ${MESA_VER}
 
 # XXX remove these from bsd.x11.mk
diff -r 2d8e7b7ce610 -r 21e2396765cf external/mit/xorg/lib/gallium.old/Makefile
--- a/external/mit/xorg/lib/gallium.old/Makefile        Sat Jul 15 21:18:06 2023 +0000
+++ b/external/mit/xorg/lib/gallium.old/Makefile        Sat Jul 15 21:24:46 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/02/07 06:19:03 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/07/15 21:24:46 rjs Exp $
 
 # Transparent struct/union broken
 NOLINT=yes
@@ -1133,7 +1133,7 @@ CPPFLAGS+=        ${CPPFLAGS.${XORG_MACHINE_ARC
 CPPFLAGS.r600_pipe_common.c+=  -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
 CPPFLAGS.si_get.c+=    -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
 
-.include "../driver.mk"
+.include "../driver${OLD_SUFFIX}.mk"
 
 
 .PATH: ${X11SRCDIR.Mesa}/src/gallium/targets/dri
diff -r 2d8e7b7ce610 -r 21e2396765cf external/mit/xorg/lib/libGL.old/Makefile
--- a/external/mit/xorg/lib/libGL.old/Makefile  Sat Jul 15 21:18:06 2023 +0000
+++ b/external/mit/xorg/lib/libGL.old/Makefile  Sat Jul 15 21:24:46 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2023/06/03 21:33:02 lukem Exp $
+#      $NetBSD: Makefile,v 1.5 2023/07/15 21:24:46 rjs Exp $
 
 .include <bsd.own.mk>
 
@@ -216,7 +216,7 @@ MKLINT=no
 
 PKGCONFIG=     gl
 PKGDIST.gl=    ${X11SRCDIR.Mesa}/../src/pkgconfig
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
 PKGCONFIG_VERSION.gl=  ${MESA_VER}
 
 # XXX remove these from bsd.x11.mk
diff -r 2d8e7b7ce610 -r 21e2396765cf external/mit/xorg/lib/libgbm.old/Makefile
--- a/external/mit/xorg/lib/libgbm.old/Makefile Sat Jul 15 21:18:06 2023 +0000
+++ b/external/mit/xorg/lib/libgbm.old/Makefile Sat Jul 15 21:24:46 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2022/09/29 18:58:04 rjs Exp $
+#      $NetBSD: Makefile,v 1.4 2023/07/15 21:24:47 rjs Exp $
 
 .include <bsd.own.mk>
 
@@ -53,7 +53,7 @@ LIBDPLIBS+=   expat   ${NETBSDSRCDIR}/extern
 
 PKGCONFIG=     gbm
 PKGDIST.gbm=   ${X11SRCDIR.Mesa}/../src/pkgconfig
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
 PKGCONFIG_VERSION.gbm= ${MESA_VER}
 
 .include "../libdrm/Makefile.defines"
diff -r 2d8e7b7ce610 -r 21e2396765cf external/mit/xorg/lib/libglapi.old/Makefile
--- a/external/mit/xorg/lib/libglapi.old/Makefile       Sat Jul 15 21:18:06 2023 +0000
+++ b/external/mit/xorg/lib/libglapi.old/Makefile       Sat Jul 15 21:24:46 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2021/07/11 20:53:35 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2023/07/15 21:24:47 rjs Exp $
 
 .include <bsd.own.mk>
 
@@ -37,7 +37,7 @@ CPPFLAGS+= \
 
 CPPFLAGS+=     ${X11FLAGS.THREADLIB}
 
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
 
 CFLAGS+=       -fno-strict-aliasing -fvisibility=hidden -pthread -fno-builtin-memcmp
 
diff -r 2d8e7b7ce610 -r 21e2396765cf external/mit/xorg/lib/libmesa.old.mk
--- a/external/mit/xorg/lib/libmesa.old.mk      Sat Jul 15 21:18:06 2023 +0000
+++ b/external/mit/xorg/lib/libmesa.old.mk      Sat Jul 15 21:24:46 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: libmesa.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $
+#      $NetBSD: libmesa.old.mk,v 1.3 2023/07/15 21:24:46 rjs Exp $
 #
 # Consumer of this Makefile should set MESA_SRC_MODULES.
 
@@ -550,4 +550,4 @@ CPPFLAGS+=  \
 
 CFLAGS+=       -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp -fcommon
 
-.include "libGL/mesa-ver.mk"
+.include "libGL.old/mesa-ver.mk"