CVS commit: src/sys

2022-11-25 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Nov 25 22:17:20 UTC 2022

Modified Files:
src/sys/arch/arm/fdt: acpi_fdt.c
src/sys/dev: smbios_platform.c

Log Message:
move the creation of machdep.smbios into platform_init().

"dmidecode -d /dev/smbios" now works on x86.  also tested on arm64 (lx2k.)


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/fdt/acpi_fdt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/smbios_platform.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/fdt/acpi_fdt.c
diff -u src/sys/arch/arm/fdt/acpi_fdt.c:1.23 src/sys/arch/arm/fdt/acpi_fdt.c:1.24
--- src/sys/arch/arm/fdt/acpi_fdt.c:1.23	Sat Aug  7 16:18:43 2021
+++ src/sys/arch/arm/fdt/acpi_fdt.c	Fri Nov 25 22:17:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_fdt.c,v 1.23 2021/08/07 16:18:43 thorpej Exp $ */
+/* $NetBSD: acpi_fdt.c,v 1.24 2022/11/25 22:17:20 mrg Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill 
@@ -30,7 +30,7 @@
 #include "opt_efi.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi_fdt.c,v 1.23 2021/08/07 16:18:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_fdt.c,v 1.24 2022/11/25 22:17:20 mrg Exp $");
 
 #include 
 #include 
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_fdt.c,v
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
@@ -63,7 +62,6 @@ static void	acpi_fdt_attach(device_t, de
 static void	acpi_fdt_poweroff(device_t);
 
 static void	acpi_fdt_smbios_init(device_t);
-static void	acpi_fdt_sysctl_init(void);
 
 extern struct arm32_bus_dma_tag acpi_coherent_dma_tag;
 
@@ -124,8 +122,6 @@ acpi_fdt_attach(device_t parent, device_
 	aa.aa_dmat = NULL;
 	aa.aa_dmat64 = NULL;
 	config_found(self, , NULL, CFARGS_NONE);
-
-	acpi_fdt_sysctl_init();
 }
 
 static void
@@ -226,27 +222,3 @@ acpi_fdt_smbios_init(device_t dev)
 		AcpiOsUnmapMemory(sh, sizeof(*sh));
 	}
 }
-
-static void
-acpi_fdt_sysctl_init(void)
-{
-	const struct sysctlnode *rnode;
-	int error;
-
-	if (smbios_table == 0) {
-		return;
-	}
-
-	error = sysctl_createv(NULL, 0, NULL, ,
-	CTLFLAG_PERMANENT, CTLTYPE_NODE, "machdep", NULL,
-	NULL, 0, NULL, 0, CTL_MACHDEP, CTL_EOL);
-	if (error) {
-		return;
-	}
-
-	(void)sysctl_createv(NULL, 0, , NULL,
-	CTLFLAG_PERMANENT | CTLFLAG_READONLY | CTLFLAG_HEX, CTLTYPE_QUAD,
-	"smbios", SYSCTL_DESCR("SMBIOS table pointer"),
-	NULL, 0, _table, sizeof(smbios_table),
-	CTL_CREATE, CTL_EOL);
-}

Index: src/sys/dev/smbios_platform.c
diff -u src/sys/dev/smbios_platform.c:1.1 src/sys/dev/smbios_platform.c:1.2
--- src/sys/dev/smbios_platform.c:1.1	Wed Jul 21 23:26:15 2021
+++ src/sys/dev/smbios_platform.c	Fri Nov 25 22:17:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: smbios_platform.c,v 1.1 2021/07/21 23:26:15 jmcneill Exp $ */
+/* $NetBSD: smbios_platform.c,v 1.2 2022/11/25 22:17:20 mrg Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill 
@@ -29,7 +29,7 @@
 #include "isa.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: smbios_platform.c,v 1.1 2021/07/21 23:26:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbios_platform.c,v 1.2 2022/11/25 22:17:20 mrg Exp $");
 
 #include 
 #include 
@@ -76,6 +76,20 @@ platform_init(void)
 	struct smbios_slot *pslot;
 	int nisa, nother;
 
+	if (smbios_entry.hdrphys) {
+		int err;
+
+		err = sysctl_createv(NULL, 0, NULL, NULL,
+		CTLFLAG_PERMANENT | CTLFLAG_READONLY | CTLFLAG_HEX |
+		CTLFLAG_IMMEDIATE, CTLTYPE_QUAD,
+		"smbios", SYSCTL_DESCR("SMBIOS table pointer"),
+		NULL, smbios_entry.hdrphys, 0, 0,
+		CTL_MACHDEP, CTL_CREATE, CTL_EOL);
+		if (err != 0 && err != EEXIST)
+			printf("platform: sysctl_createv "
+			"(machdep.smbios) failed, err = %d\n", err);
+	}
+	
 	smbios.cookie = 0;
 	if (smbios_find_table(SMBIOS_TYPE_SYSTEM, )) {
 		psys = smbios.tblhdr;



CVS commit: src/sys

2022-11-25 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Nov 25 22:17:20 UTC 2022

Modified Files:
src/sys/arch/arm/fdt: acpi_fdt.c
src/sys/dev: smbios_platform.c

Log Message:
move the creation of machdep.smbios into platform_init().

"dmidecode -d /dev/smbios" now works on x86.  also tested on arm64 (lx2k.)


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/fdt/acpi_fdt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/smbios_platform.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/x86/pci

2022-11-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Nov 24 21:03:38 UTC 2022

Modified Files:
src/sys/arch/x86/pci: amdzentemp.c

Log Message:
match zen3 "cezanne" (ryzen 5000-series APU.)


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/pci/amdzentemp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/pci/amdzentemp.c
diff -u src/sys/arch/x86/pci/amdzentemp.c:1.15 src/sys/arch/x86/pci/amdzentemp.c:1.16
--- src/sys/arch/x86/pci/amdzentemp.c:1.15	Sat Oct  1 15:50:05 2022
+++ src/sys/arch/x86/pci/amdzentemp.c	Thu Nov 24 21:03:38 2022
@@ -1,4 +1,4 @@
-/*  $NetBSD: amdzentemp.c,v 1.15 2022/10/01 15:50:05 msaitoh Exp $ */
+/*  $NetBSD: amdzentemp.c,v 1.16 2022/11/24 21:03:38 mrg Exp $ */
 /*  $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $   */
 
 /*
@@ -53,7 +53,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: amdzentemp.c,v 1.15 2022/10/01 15:50:05 msaitoh Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdzentemp.c,v 1.16 2022/11/24 21:03:38 mrg Exp $ ");
 
 #include 
 #include 
@@ -398,6 +398,7 @@ amdzentemp_probe_ccd_sensors19h(struct a
 	switch (model) {
 	case 0x00 ... 0x0f: /* Zen3 EPYC "Milan" */
 	case 0x20 ... 0x2f: /* Zen3 Ryzen "Vermeer" */
+	case 0x50 ... 0x5f: /* Zen3 Ryzen "Cezanne" */
 		maxreg = 8;
 		break;
 	case 0x60 ... 0x6f: /* Zen4 Ryzen "Raphael" */



CVS commit: src/sys/arch/x86/pci

2022-11-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Nov 24 21:03:38 UTC 2022

Modified Files:
src/sys/arch/x86/pci: amdzentemp.c

Log Message:
match zen3 "cezanne" (ryzen 5000-series APU.)


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/pci/amdzentemp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/xlsclients/dist

2022-11-13 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Nov 14 06:41:04 UTC 2022

Update of /cvsroot/xsrc/external/mit/xlsclients/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv25199

Log Message:
initial import of xlsclients-1.1.5

Status:

Vendor Tag: xorg
Release Tags:   xlsclients-1-1-5

U xsrc/external/mit/xlsclients/dist/Makefile.am
U xsrc/external/mit/xlsclients/dist/INSTALL
U xsrc/external/mit/xlsclients/dist/config.guess
U xsrc/external/mit/xlsclients/dist/Makefile.in
U xsrc/external/mit/xlsclients/dist/config.sub
U xsrc/external/mit/xlsclients/dist/strnlen.c
N xsrc/external/mit/xlsclients/dist/README.md
U xsrc/external/mit/xlsclients/dist/configure
U xsrc/external/mit/xlsclients/dist/COPYING
U xsrc/external/mit/xlsclients/dist/ChangeLog
U xsrc/external/mit/xlsclients/dist/compile
U xsrc/external/mit/xlsclients/dist/aclocal.m4
U xsrc/external/mit/xlsclients/dist/configure.ac
U xsrc/external/mit/xlsclients/dist/strnlen.h
U xsrc/external/mit/xlsclients/dist/install-sh
U xsrc/external/mit/xlsclients/dist/xlsclients.c
U xsrc/external/mit/xlsclients/dist/missing
U xsrc/external/mit/xlsclients/dist/depcomp
U xsrc/external/mit/xlsclients/dist/config.h.in
U xsrc/external/mit/xlsclients/dist/man/xlsclients.man
U xsrc/external/mit/xlsclients/dist/man/Makefile.am
U xsrc/external/mit/xlsclients/dist/man/Makefile.in

No conflicts created by this import



CVS import: xsrc/external/mit/xlsatoms/dist

2022-11-13 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Nov 14 06:41:03 UTC 2022

Update of /cvsroot/xsrc/external/mit/xlsatoms/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv19215

Log Message:
initial import of xlsatoms-1.1.4

Status:

Vendor Tag: xorg
Release Tags:   xlsatoms-1-1-4

U xsrc/external/mit/xlsatoms/dist/config.guess
U xsrc/external/mit/xlsatoms/dist/Makefile.in
U xsrc/external/mit/xlsatoms/dist/INSTALL
U xsrc/external/mit/xlsatoms/dist/install-sh
U xsrc/external/mit/xlsatoms/dist/aclocal.m4
U xsrc/external/mit/xlsatoms/dist/Makefile.am
U xsrc/external/mit/xlsatoms/dist/config.h.in
U xsrc/external/mit/xlsatoms/dist/missing
U xsrc/external/mit/xlsatoms/dist/xlsatoms.c
U xsrc/external/mit/xlsatoms/dist/depcomp
U xsrc/external/mit/xlsatoms/dist/README.md
U xsrc/external/mit/xlsatoms/dist/configure
U xsrc/external/mit/xlsatoms/dist/compile
U xsrc/external/mit/xlsatoms/dist/config.sub
U xsrc/external/mit/xlsatoms/dist/configure.ac
U xsrc/external/mit/xlsatoms/dist/ChangeLog
U xsrc/external/mit/xlsatoms/dist/COPYING
U xsrc/external/mit/xlsatoms/dist/man/Makefile.in
U xsrc/external/mit/xlsatoms/dist/man/Makefile.am
U xsrc/external/mit/xlsatoms/dist/man/xlsatoms.man

No conflicts created by this import



CVS import: xsrc/external/mit/xlsatoms/dist

2022-11-13 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Nov 14 06:41:03 UTC 2022

Update of /cvsroot/xsrc/external/mit/xlsatoms/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv19215

Log Message:
initial import of xlsatoms-1.1.4

Status:

Vendor Tag: xorg
Release Tags:   xlsatoms-1-1-4

U xsrc/external/mit/xlsatoms/dist/config.guess
U xsrc/external/mit/xlsatoms/dist/Makefile.in
U xsrc/external/mit/xlsatoms/dist/INSTALL
U xsrc/external/mit/xlsatoms/dist/install-sh
U xsrc/external/mit/xlsatoms/dist/aclocal.m4
U xsrc/external/mit/xlsatoms/dist/Makefile.am
U xsrc/external/mit/xlsatoms/dist/config.h.in
U xsrc/external/mit/xlsatoms/dist/missing
U xsrc/external/mit/xlsatoms/dist/xlsatoms.c
U xsrc/external/mit/xlsatoms/dist/depcomp
U xsrc/external/mit/xlsatoms/dist/README.md
U xsrc/external/mit/xlsatoms/dist/configure
U xsrc/external/mit/xlsatoms/dist/compile
U xsrc/external/mit/xlsatoms/dist/config.sub
U xsrc/external/mit/xlsatoms/dist/configure.ac
U xsrc/external/mit/xlsatoms/dist/ChangeLog
U xsrc/external/mit/xlsatoms/dist/COPYING
U xsrc/external/mit/xlsatoms/dist/man/Makefile.in
U xsrc/external/mit/xlsatoms/dist/man/Makefile.am
U xsrc/external/mit/xlsatoms/dist/man/xlsatoms.man

No conflicts created by this import



CVS import: xsrc/external/mit/xlsclients/dist

2022-11-13 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Nov 14 06:41:04 UTC 2022

Update of /cvsroot/xsrc/external/mit/xlsclients/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv25199

Log Message:
initial import of xlsclients-1.1.5

Status:

Vendor Tag: xorg
Release Tags:   xlsclients-1-1-5

U xsrc/external/mit/xlsclients/dist/Makefile.am
U xsrc/external/mit/xlsclients/dist/INSTALL
U xsrc/external/mit/xlsclients/dist/config.guess
U xsrc/external/mit/xlsclients/dist/Makefile.in
U xsrc/external/mit/xlsclients/dist/config.sub
U xsrc/external/mit/xlsclients/dist/strnlen.c
N xsrc/external/mit/xlsclients/dist/README.md
U xsrc/external/mit/xlsclients/dist/configure
U xsrc/external/mit/xlsclients/dist/COPYING
U xsrc/external/mit/xlsclients/dist/ChangeLog
U xsrc/external/mit/xlsclients/dist/compile
U xsrc/external/mit/xlsclients/dist/aclocal.m4
U xsrc/external/mit/xlsclients/dist/configure.ac
U xsrc/external/mit/xlsclients/dist/strnlen.h
U xsrc/external/mit/xlsclients/dist/install-sh
U xsrc/external/mit/xlsclients/dist/xlsclients.c
U xsrc/external/mit/xlsclients/dist/missing
U xsrc/external/mit/xlsclients/dist/depcomp
U xsrc/external/mit/xlsclients/dist/config.h.in
U xsrc/external/mit/xlsclients/dist/man/xlsclients.man
U xsrc/external/mit/xlsclients/dist/man/Makefile.am
U xsrc/external/mit/xlsclients/dist/man/Makefile.in

No conflicts created by this import



CVS commit: src/external/mit/xorg/lib/pixman/test

2022-11-13 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Nov 13 21:57:12 UTC 2022

Modified Files:
src/external/mit/xorg/lib/pixman/test: Makefile

Log Message:
add a 'check' target to run the tests (needs to be on the same arch as host.)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/pixman/test/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/pixman/test/Makefile
diff -u src/external/mit/xorg/lib/pixman/test/Makefile:1.1 src/external/mit/xorg/lib/pixman/test/Makefile:1.2
--- src/external/mit/xorg/lib/pixman/test/Makefile:1.1	Sun Nov 13 09:36:37 2022
+++ src/external/mit/xorg/lib/pixman/test/Makefile	Sun Nov 13 21:57:12 2022
@@ -1,5 +1,5 @@
 
-#	$NetBSD: Makefile,v 1.1 2022/11/13 09:36:37 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2022/11/13 21:57:12 mrg Exp $
 
 NOINSTALL=1
 NOMAN=1
@@ -56,5 +56,12 @@ LDADD+=		-lpixman-1
 
 .PATH:	${X11SRCDIR.pixman}/test
 
+check:
+.for test in ${PROGS}
+	echo -n "Starting ${test}: "; date
+	./${test} && echo Passed: ${test}
+.endfor
+	echo -n "Done: "; date
+
 .include 
 .include 



CVS commit: src/external/mit/xorg/lib/pixman/test

2022-11-13 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Nov 13 21:57:12 UTC 2022

Modified Files:
src/external/mit/xorg/lib/pixman/test: Makefile

Log Message:
add a 'check' target to run the tests (needs to be on the same arch as host.)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/pixman/test/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/pixman

2022-11-13 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Nov 13 09:36:37 UTC 2022

Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Added Files:
src/external/mit/xorg/lib/pixman: Makefile.cflags
src/external/mit/xorg/lib/pixman/test: Makefile

Log Message:
add build infrastructure to build the pixman tests

not built or installed by default.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/pixman/Makefile.cflags
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/pixman/test/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.40 src/external/mit/xorg/lib/pixman/Makefile:1.41
--- src/external/mit/xorg/lib/pixman/Makefile:1.40	Sat Nov 12 07:43:33 2022
+++ src/external/mit/xorg/lib/pixman/Makefile	Sun Nov 13 09:36:37 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.40 2022/11/12 07:43:33 mrg Exp $
+#	$NetBSD: Makefile,v 1.41 2022/11/13 09:36:37 mrg Exp $
 
 NOLINT=	1	# defined
 
@@ -54,20 +54,20 @@ COPTS.pixman-mmx.c=	-mmmx -fvisibility=h
 .  if defined(HAVE_LLVM)
 COPTS.pixman-mmx.c+=	-Wno-error=attributes
 .  endif
-CPPFLAGS+=		-DUSE_X86_MMX
+#CPPFLAGS+=		-DUSE_X86_MMX
 MKDEPFLAGS+=		-mmmx
 . endif
 SRCS+=	pixman-sse2.c pixman-ssse3.c
 COPTS.pixman-sse2.c=	-msse2 -fvisibility=hidden
 COPTS.pixman-ssse3.c=	-msse3 -mssse3 -fvisibility=hidden
-CPPFLAGS+=		-DUSE_SSE2 -DUSE_SSSE3
+#CPPFLAGS+=		-DUSE_SSE2 -DUSE_SSSE3
 MKDEPFLAGS+=		-msse2 -msse3 -mssse3 -fvisibility=hidden
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc"
 SRCS+=	pixman-vmx.c
 COPTS.pixman-vmx.c=	-maltivec
-CPPFLAGS+=		-DUSE_VMX
+#CPPFLAGS+=		-DUSE_VMX
 MKDEPFLAGS+=		-maltivec
 .endif
 
@@ -76,21 +76,18 @@ MKDEPFLAGS+=		-maltivec
 SRCS+=		pixman-arm-simd.c 		\
 		pixman-arm-simd-asm.S		\
 		pixman-arm-simd-asm-scaled.S
-CPPFLAGS+=	-DUSE_ARM_SIMD
 # ARM NEON
 SRCS+=		pixman-arm-neon.c		\
 		pixman-arm-neon-asm.S		\
 		pixman-arm-neon-asm-bilinear.S
-CPPFLAGS+=	-DUSE_ARM_NEON
 
 AFLAGS+=	${${ACTIVE_CC} == "clang" :? -fno-integrated-as :}
 # ARM iwMMX
 #SRCS+=		pixman-mmx.c
 #COPTS.pixman-mmx.c=	-mcpu=iwmmxt
-#CPPFLAGS+=	-DUSE_ARM_IWMMXT
 .endif
 
-.if !empty(MACHINE_ARCH:Maarch64*) && 0
+.if !empty(MACHINE_ARCH:Maarch64*)
 # ARM64 NEON
 SRCS+=		pixman-arm-neon.c			\
 		pixman-arma64-neon-asm.S		\
@@ -104,7 +101,7 @@ CPPFLAGS+=	-DUSE_ARM_A64_NEON
 .if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
 # Loongson MMI
 SRCS+=		pixman-mmx.c
-CPPFLAGS+=	-DUSE_LOONGSON_MMI
+#CPPFLAGS+=	-DUSE_LOONGSON_MMI
 # SIMD instructions use floatpoint registers so we need to enable their use
 COPTS.pixman-mmx.c=	-march=loongson2f -mhard-float -Wa,-mhard-float
 .endif
@@ -114,14 +111,11 @@ COPTS.pixman-mmx.c=	-march=loongson2f -m
 COPTS.pixman-fast-path.c+=	-O1
 .endif
 
+.include "Makefile.cflags"
+
 INCS=	pixman.h pixman-version.h
 INCSDIR=${X11INCDIR}/pixman-1
 
-CPPFLAGS+=	-DHAVE_CONFIG_H \
-		-I${X11SRCDIR.pixman}/../include \
-		-I${X11SRCDIR.pixman}/../combine \
-		-I${X11SRCDIR.pixman}/pixman
-
 # With pixman 0.28.3, HAVE_PTHREAD_SETSPECIFIC is much faster than TLS
 CPPFLAGS+=	-DHAVE_PTHREAD_SETSPECIFIC
 #CPPFLAGS+=	-DTLS=__thread

Added files:

Index: src/external/mit/xorg/lib/pixman/Makefile.cflags
diff -u /dev/null src/external/mit/xorg/lib/pixman/Makefile.cflags:1.1
--- /dev/null	Sun Nov 13 09:36:37 2022
+++ src/external/mit/xorg/lib/pixman/Makefile.cflags	Sun Nov 13 09:36:37 2022
@@ -0,0 +1,31 @@
+#	$NetBSD: Makefile.cflags,v 1.1 2022/11/13 09:36:37 mrg Exp $
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+. if ${MACHINE_ARCH} == "i386"
+CPPFLAGS+=		-DUSE_X86_MMX
+. endif
+CPPFLAGS+=		-DUSE_SSE2 -DUSE_SSSE3
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc"
+CPPFLAGS+=		-DUSE_VMX
+.endif
+
+.if !empty(MACHINE_ARCH:Mearm*)
+CPPFLAGS+=	-DUSE_ARM_SIMD
+CPPFLAGS+=	-DUSE_ARM_NEON
+#CPPFLAGS+=	-DUSE_ARM_IWMMXT
+.endif
+
+.if !empty(MACHINE_ARCH:Maarch64*)
+CPPFLAGS+=	-DUSE_ARM_A64_NEON
+.endif
+
+.if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
+CPPFLAGS+=	-DUSE_LOONGSON_MMI
+.endif
+
+CPPFLAGS+=	-DHAVE_CONFIG_H \
+		-I${X11SRCDIR.pixman}/../include \
+		-I${X11SRCDIR.pixman}/../combine \
+		-I${X11SRCDIR.pixman}/pixman

Index: src/external/mit/xorg/lib/pixman/test/Makefile
diff -u /dev/null src/external/mit/xorg/lib/pixman/test/Makefile:1.1
--- /dev/null	Sun Nov 13 09:36:37 2022
+++ src/external/mit/xorg/lib/pixman/test/Makefile	Sun Nov 13 09:36:37 2022
@@ -0,0 +1,60 @@
+
+#	$NetBSD: Makefile,v 1.1 2022/11/13 09:36:37 mrg Exp $
+
+NOINSTALL=1
+NOMAN=1
+
+.include 
+
+PROGS=	\
+	oob-test			\
+	infinite-loop			\
+	trap-crasher			\
+	fence-image-self-test		\
+	region-translate-test		\
+	fetch-test			\
+	a1-trap-test			\
+	prng-test			\
+	radial-invalid			\
+	pdf-op-test			\
+	region-test			\
+	combiner-test			\
+	

CVS commit: src/external/mit/xorg/lib/pixman

2022-11-13 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Nov 13 09:36:37 UTC 2022

Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Added Files:
src/external/mit/xorg/lib/pixman: Makefile.cflags
src/external/mit/xorg/lib/pixman/test: Makefile

Log Message:
add build infrastructure to build the pixman tests

not built or installed by default.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/pixman/Makefile.cflags
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/pixman/test/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/bin/xlogo

2022-11-12 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Nov 13 05:26:07 UTC 2022

Modified Files:
src/external/mit/xorg/bin/xlogo: Makefile

Log Message:
add -D_CONST_X_STRING, like new upstream


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xlogo/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/bin/xlogo/Makefile
diff -u src/external/mit/xorg/bin/xlogo/Makefile:1.4 src/external/mit/xorg/bin/xlogo/Makefile:1.5
--- src/external/mit/xorg/bin/xlogo/Makefile:1.4	Wed May  9 08:39:55 2018
+++ src/external/mit/xorg/bin/xlogo/Makefile	Sun Nov 13 05:26:07 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2022/11/13 05:26:07 mrg Exp $
 
 .include 
 
@@ -7,6 +7,7 @@ SRCS=	xlogo.c Logo.c RenderLogo.c
 
 CPPFLAGS+=	-DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2/freetype
+CPPFLAGS+=	-D_CONST_X_STRING
 
 APPDEFS=XLogo XLogo-color
 



CVS commit: src/external/mit/xorg/bin/xlogo

2022-11-12 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Nov 13 05:26:07 UTC 2022

Modified Files:
src/external/mit/xorg/bin/xlogo: Makefile

Log Message:
add -D_CONST_X_STRING, like new upstream


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xlogo/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 05:24:25 UTC 2022

Modified Files:
xsrc/external/mit/xlogo/dist: compile
Removed Files:
xsrc/external/mit/xkbevd/dist: README
xsrc/external/mit/xkill/dist: README

Log Message:
merge xkbevd 1.1.5, xkill 1.0.6, and xlogo 1.0.6


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbevd/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkill/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xlogo/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 05:24:25 UTC 2022

Modified Files:
xsrc/external/mit/xlogo/dist: compile
Removed Files:
xsrc/external/mit/xkbevd/dist: README
xsrc/external/mit/xkill/dist: README

Log Message:
merge xkbevd 1.1.5, xkill 1.0.6, and xlogo 1.0.6


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbevd/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkill/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xlogo/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xlogo/dist/compile
diff -u xsrc/external/mit/xlogo/dist/compile:1.3 xsrc/external/mit/xlogo/dist/compile:1.4
--- xsrc/external/mit/xlogo/dist/compile:1.3	Sun Mar  3 21:38:01 2019
+++ xsrc/external/mit/xlogo/dist/compile	Sun Nov 13 05:24:24 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:



CVS import: xsrc/external/mit/xlogo/dist

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 05:23:33 UTC 2022

Update of /cvsroot/xsrc/external/mit/xlogo/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28276

Log Message:
initial import of xlogo-1.0.6

Status:

Vendor Tag: xorg
Release Tags:   xlogo-1-0-6

C xsrc/external/mit/xlogo/dist/compile
U xsrc/external/mit/xlogo/dist/aclocal.m4
U xsrc/external/mit/xlogo/dist/install-sh
U xsrc/external/mit/xlogo/dist/config.h.in
U xsrc/external/mit/xlogo/dist/COPYING
U xsrc/external/mit/xlogo/dist/Logo.h
U xsrc/external/mit/xlogo/dist/RenderLogo.c
U xsrc/external/mit/xlogo/dist/depcomp
U xsrc/external/mit/xlogo/dist/README.md
U xsrc/external/mit/xlogo/dist/missing
U xsrc/external/mit/xlogo/dist/configure.ac
U xsrc/external/mit/xlogo/dist/xlogo.c
U xsrc/external/mit/xlogo/dist/configure
U xsrc/external/mit/xlogo/dist/ChangeLog
U xsrc/external/mit/xlogo/dist/LogoP.h
U xsrc/external/mit/xlogo/dist/INSTALL
U xsrc/external/mit/xlogo/dist/Makefile.in
U xsrc/external/mit/xlogo/dist/Logo.c
U xsrc/external/mit/xlogo/dist/config.sub
U xsrc/external/mit/xlogo/dist/config.guess
U xsrc/external/mit/xlogo/dist/Makefile.am
U xsrc/external/mit/xlogo/dist/xlogo.h
U xsrc/external/mit/xlogo/dist/RenderLogo.h
U xsrc/external/mit/xlogo/dist/app-defaults/XLogo-color
U xsrc/external/mit/xlogo/dist/app-defaults/XLogo
U xsrc/external/mit/xlogo/dist/man/xlogo.man
U xsrc/external/mit/xlogo/dist/man/Makefile.in
U xsrc/external/mit/xlogo/dist/man/Makefile.am

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xlogo/dist



CVS import: xsrc/external/mit/xkill/dist

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 05:23:32 UTC 2022

Update of /cvsroot/xsrc/external/mit/xkill/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28554

Log Message:
initial import of xkill-1.0.6

Status:

Vendor Tag: xorg
Release Tags:   xkill-1-0-6

U xsrc/external/mit/xkill/dist/compile
U xsrc/external/mit/xkill/dist/xkill.c
U xsrc/external/mit/xkill/dist/COPYING
U xsrc/external/mit/xkill/dist/config.sub
U xsrc/external/mit/xkill/dist/configure.ac
U xsrc/external/mit/xkill/dist/config.h.in
U xsrc/external/mit/xkill/dist/depcomp
U xsrc/external/mit/xkill/dist/missing
U xsrc/external/mit/xkill/dist/install-sh
U xsrc/external/mit/xkill/dist/INSTALL
U xsrc/external/mit/xkill/dist/aclocal.m4
U xsrc/external/mit/xkill/dist/Makefile.am
U xsrc/external/mit/xkill/dist/config.guess
U xsrc/external/mit/xkill/dist/ChangeLog
N xsrc/external/mit/xkill/dist/README.md
U xsrc/external/mit/xkill/dist/configure
U xsrc/external/mit/xkill/dist/Makefile.in
U xsrc/external/mit/xkill/dist/man/Makefile.am
U xsrc/external/mit/xkill/dist/man/xkill.man
U xsrc/external/mit/xkill/dist/man/Makefile.in

No conflicts created by this import



CVS import: xsrc/external/mit/xlogo/dist

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 05:23:33 UTC 2022

Update of /cvsroot/xsrc/external/mit/xlogo/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28276

Log Message:
initial import of xlogo-1.0.6

Status:

Vendor Tag: xorg
Release Tags:   xlogo-1-0-6

C xsrc/external/mit/xlogo/dist/compile
U xsrc/external/mit/xlogo/dist/aclocal.m4
U xsrc/external/mit/xlogo/dist/install-sh
U xsrc/external/mit/xlogo/dist/config.h.in
U xsrc/external/mit/xlogo/dist/COPYING
U xsrc/external/mit/xlogo/dist/Logo.h
U xsrc/external/mit/xlogo/dist/RenderLogo.c
U xsrc/external/mit/xlogo/dist/depcomp
U xsrc/external/mit/xlogo/dist/README.md
U xsrc/external/mit/xlogo/dist/missing
U xsrc/external/mit/xlogo/dist/configure.ac
U xsrc/external/mit/xlogo/dist/xlogo.c
U xsrc/external/mit/xlogo/dist/configure
U xsrc/external/mit/xlogo/dist/ChangeLog
U xsrc/external/mit/xlogo/dist/LogoP.h
U xsrc/external/mit/xlogo/dist/INSTALL
U xsrc/external/mit/xlogo/dist/Makefile.in
U xsrc/external/mit/xlogo/dist/Logo.c
U xsrc/external/mit/xlogo/dist/config.sub
U xsrc/external/mit/xlogo/dist/config.guess
U xsrc/external/mit/xlogo/dist/Makefile.am
U xsrc/external/mit/xlogo/dist/xlogo.h
U xsrc/external/mit/xlogo/dist/RenderLogo.h
U xsrc/external/mit/xlogo/dist/app-defaults/XLogo-color
U xsrc/external/mit/xlogo/dist/app-defaults/XLogo
U xsrc/external/mit/xlogo/dist/man/xlogo.man
U xsrc/external/mit/xlogo/dist/man/Makefile.in
U xsrc/external/mit/xlogo/dist/man/Makefile.am

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xlogo/dist



CVS import: xsrc/external/mit/xkill/dist

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 05:23:32 UTC 2022

Update of /cvsroot/xsrc/external/mit/xkill/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28554

Log Message:
initial import of xkill-1.0.6

Status:

Vendor Tag: xorg
Release Tags:   xkill-1-0-6

U xsrc/external/mit/xkill/dist/compile
U xsrc/external/mit/xkill/dist/xkill.c
U xsrc/external/mit/xkill/dist/COPYING
U xsrc/external/mit/xkill/dist/config.sub
U xsrc/external/mit/xkill/dist/configure.ac
U xsrc/external/mit/xkill/dist/config.h.in
U xsrc/external/mit/xkill/dist/depcomp
U xsrc/external/mit/xkill/dist/missing
U xsrc/external/mit/xkill/dist/install-sh
U xsrc/external/mit/xkill/dist/INSTALL
U xsrc/external/mit/xkill/dist/aclocal.m4
U xsrc/external/mit/xkill/dist/Makefile.am
U xsrc/external/mit/xkill/dist/config.guess
U xsrc/external/mit/xkill/dist/ChangeLog
N xsrc/external/mit/xkill/dist/README.md
U xsrc/external/mit/xkill/dist/configure
U xsrc/external/mit/xkill/dist/Makefile.in
U xsrc/external/mit/xkill/dist/man/Makefile.am
U xsrc/external/mit/xkill/dist/man/xkill.man
U xsrc/external/mit/xkill/dist/man/Makefile.in

No conflicts created by this import



CVS import: xsrc/external/mit/xkbevd/dist

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 05:23:31 UTC 2022

Update of /cvsroot/xsrc/external/mit/xkbevd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5896

Log Message:
initial import of xkbevd-1.1.5

Status:

Vendor Tag: xorg
Release Tags:   xkbevd-1-1-5

U xsrc/external/mit/xkbevd/dist/compile
U xsrc/external/mit/xkbevd/dist/aclocal.m4
U xsrc/external/mit/xkbevd/dist/tokens.h
U xsrc/external/mit/xkbevd/dist/install-sh
U xsrc/external/mit/xkbevd/dist/config.h.in
U xsrc/external/mit/xkbevd/dist/cfgparse.c
U xsrc/external/mit/xkbevd/dist/COPYING
U xsrc/external/mit/xkbevd/dist/depcomp
U xsrc/external/mit/xkbevd/dist/example.cf
U xsrc/external/mit/xkbevd/dist/missing
U xsrc/external/mit/xkbevd/dist/cfgparse.y
U xsrc/external/mit/xkbevd/dist/evargs.c
U xsrc/external/mit/xkbevd/dist/utils.h
U xsrc/external/mit/xkbevd/dist/config.guess
U xsrc/external/mit/xkbevd/dist/xkbevd.c
U xsrc/external/mit/xkbevd/dist/configure.ac
U xsrc/external/mit/xkbevd/dist/INSTALL
N xsrc/external/mit/xkbevd/dist/README.md
U xsrc/external/mit/xkbevd/dist/Makefile.in
U xsrc/external/mit/xkbevd/dist/printev.c
U xsrc/external/mit/xkbevd/dist/configure
U xsrc/external/mit/xkbevd/dist/ChangeLog
U xsrc/external/mit/xkbevd/dist/config.sub
U xsrc/external/mit/xkbevd/dist/xkbevd.cf
U xsrc/external/mit/xkbevd/dist/xkbevd.h
U xsrc/external/mit/xkbevd/dist/Makefile.am
U xsrc/external/mit/xkbevd/dist/utils.c
U xsrc/external/mit/xkbevd/dist/ylwrap
U xsrc/external/mit/xkbevd/dist/cfgscan.c
U xsrc/external/mit/xkbevd/dist/man/Makefile.am
U xsrc/external/mit/xkbevd/dist/man/xkbevd.man
U xsrc/external/mit/xkbevd/dist/man/Makefile.in

No conflicts created by this import



CVS import: xsrc/external/mit/xkbevd/dist

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 05:23:31 UTC 2022

Update of /cvsroot/xsrc/external/mit/xkbevd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5896

Log Message:
initial import of xkbevd-1.1.5

Status:

Vendor Tag: xorg
Release Tags:   xkbevd-1-1-5

U xsrc/external/mit/xkbevd/dist/compile
U xsrc/external/mit/xkbevd/dist/aclocal.m4
U xsrc/external/mit/xkbevd/dist/tokens.h
U xsrc/external/mit/xkbevd/dist/install-sh
U xsrc/external/mit/xkbevd/dist/config.h.in
U xsrc/external/mit/xkbevd/dist/cfgparse.c
U xsrc/external/mit/xkbevd/dist/COPYING
U xsrc/external/mit/xkbevd/dist/depcomp
U xsrc/external/mit/xkbevd/dist/example.cf
U xsrc/external/mit/xkbevd/dist/missing
U xsrc/external/mit/xkbevd/dist/cfgparse.y
U xsrc/external/mit/xkbevd/dist/evargs.c
U xsrc/external/mit/xkbevd/dist/utils.h
U xsrc/external/mit/xkbevd/dist/config.guess
U xsrc/external/mit/xkbevd/dist/xkbevd.c
U xsrc/external/mit/xkbevd/dist/configure.ac
U xsrc/external/mit/xkbevd/dist/INSTALL
N xsrc/external/mit/xkbevd/dist/README.md
U xsrc/external/mit/xkbevd/dist/Makefile.in
U xsrc/external/mit/xkbevd/dist/printev.c
U xsrc/external/mit/xkbevd/dist/configure
U xsrc/external/mit/xkbevd/dist/ChangeLog
U xsrc/external/mit/xkbevd/dist/config.sub
U xsrc/external/mit/xkbevd/dist/xkbevd.cf
U xsrc/external/mit/xkbevd/dist/xkbevd.h
U xsrc/external/mit/xkbevd/dist/Makefile.am
U xsrc/external/mit/xkbevd/dist/utils.c
U xsrc/external/mit/xkbevd/dist/ylwrap
U xsrc/external/mit/xkbevd/dist/cfgscan.c
U xsrc/external/mit/xkbevd/dist/man/Makefile.am
U xsrc/external/mit/xkbevd/dist/man/xkbevd.man
U xsrc/external/mit/xkbevd/dist/man/Makefile.in

No conflicts created by this import



CVS commit: xsrc/external/mit/x11perf/dist

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 02:48:37 UTC 2022

Modified Files:
xsrc/external/mit/x11perf/dist: x11perf.c

Log Message:
merge x11perf 1.6.2.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/x11perf/dist/x11perf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/x11perf/dist/x11perf.c
diff -u xsrc/external/mit/x11perf/dist/x11perf.c:1.2 xsrc/external/mit/x11perf/dist/x11perf.c:1.3
--- xsrc/external/mit/x11perf/dist/x11perf.c:1.2	Sun Jul 19 08:52:58 2015
+++ xsrc/external/mit/x11perf/dist/x11perf.c	Sun Nov 13 02:48:37 2022
@@ -289,12 +289,10 @@ RoundTo3Digits(double d)
 static void 
 ReportTimes(double usecs, int64_t n, char *str, int average)
 {
-double msecsperobj, objspersec;
-
 if(usecs != 0.0)
 {
-msecsperobj = usecs / (1000.0 * (double)n);
-objspersec = (double) n * 100.0 / usecs;
+double msecsperobj = usecs / (1000.0 * (double)n);
+double objspersec = (double) n * 100.0 / usecs;
 
 /* Round obj/sec to 3 significant digits.  Leave msec untouched, to
 	   allow averaging results from several repetitions. */
@@ -324,7 +322,7 @@ static char *program_name;
 static void usage(void) _X_NORETURN;
 
 /*
- * Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obselete)
+ * Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obsolete)
  * If found, remove it from command line.  Don't go past a lone -.
  */
 static char *
@@ -334,9 +332,8 @@ Get_Display_Name(int *pargc, /* MODIFIED
 int argc = *pargc;
 char**pargv = argv+1;
 char*displayname = NULL;
-int i;
 
-for (i = 1; i != argc; i++) {
+for (int i = 1; i != argc; i++) {
 	char *arg = argv[i];
 
 	if (!strcmp (arg, "-display") || !strcmp (arg, "-d")) {
@@ -370,10 +367,9 @@ GetVersion(int *pargc, /* MODIFIED */
 int argc = *pargc;
 char**pargv = argv+1;
 Version version = VERSION1_6;
-int i;
 Boolfound = False;
 
-for (i = 1; i != argc; i++) {
+for (int i = 1; i != argc; i++) {
 	char *arg = argv[i];
 
 	if (!strcmp (arg, "-v1.2")) {
@@ -549,9 +545,7 @@ HardwareSync(XParms xp)
 static void 
 DoHardwareSync(XParms xp, Parms p, int64_t reps)
 {
-int i;
-
-for (i = 0; i != reps; i++) {
+for (int i = 0; i != reps; i++) {
 	HardwareSync(xp);
 	CheckAbort ();
 }
@@ -600,12 +594,11 @@ CreatePerfWindow(XParms xp, int x, int y
 static void 
 CreateClipWindows(XParms xp, int clips)
 {
-int j;
 XWindowAttributesxwa;
 
 (void) XGetWindowAttributes(xp->d, xp->w, );
 if (clips > MAXCLIP) clips = MAXCLIP;
-for (j = 0; j != clips; j++) {
+for (int j = 0; j != clips; j++) {
 	clipWindows[j] = CreatePerfWindow(xp,
 	xwa.x + ws[j].x, xwa.y + ws[j].y, ws[j].width, ws[j].height);
 }
@@ -615,10 +608,8 @@ CreateClipWindows(XParms xp, int clips)
 static void 
 DestroyClipWindows(XParms xp, int clips)
 {
-int j;
-
 if (clips > MAXCLIP) clips = MAXCLIP;
-for (j = 0; j != clips; j++) {
+for (int j = 0; j != clips; j++) {
 	XDestroyWindow(xp->d, clipWindows[j]);
 }
 } /* DestroyClipWindows */
@@ -832,7 +823,6 @@ ProcessTest(XParms xp, Test *test, int f
 {
 double  time, totalTime;
 long long reps;
-int j;
 
 xp->planemask = pm;
 xp->func = func;
@@ -862,7 +852,7 @@ ProcessTest(XParms xp, Test *test, int f
 	CreateClipWindows(xp, test->clips);
 
 	totalTime = 0.0;
-	for (j = 0; j != repeat; j++) {
+	for (int j = 0; j != repeat; j++) {
 	DisplayStatus(xp->d, "Testing", label, j+1);
 	time = DoTest(xp, test, reps);
 	if (abortTest)
@@ -911,7 +901,7 @@ main(int argc, char *argv[])
 
 /* Save away argv, argc, for usage to print out */
 saveargc = argc;
-saveargv = (char **) malloc(argc * sizeof(char *));
+saveargv = malloc(argc * sizeof(char *));
 for (i = 0; i != argc; i++) {
 	saveargv[i] = argv[i];
 }
@@ -922,7 +912,7 @@ main(int argc, char *argv[])
 
 /* Count number of tests */
 ForEachTest(numTests);
-doit = (Bool *)calloc(numTests, sizeof(Bool));
+doit = calloc(numTests, sizeof(Bool));
 
 /* Parse arguments */
 program_name = argv[0];
@@ -1119,7 +1109,6 @@ main(int argc, char *argv[])
 	/* Just print out list of tests for use with .sh programs that
 	   assemble data from different x11perf runs into a nice format */
 	ForEachTest (i) {
-	int child;
 	if (doit[i]) {
 		switch (test[i].testType) {
 		case NONROP:
@@ -1162,7 +1151,7 @@ main(int argc, char *argv[])
 			break;
 		
 		case WINDOW:
-			for (child = 0; child != numSubWindows; child++) {
+			for (int child = 0; child != numSubWindows; child++) {
 			printf ("%s (%ld kids)\n",
 LABELP(i), subWindows[child]);
 			}
@@ -1327,7 +1316,6 @@ main(int argc, char *argv[])
 printf("Sync time 

CVS commit: xsrc/external/mit/x11perf/dist

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 02:48:37 UTC 2022

Modified Files:
xsrc/external/mit/x11perf/dist: x11perf.c

Log Message:
merge x11perf 1.6.2.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/x11perf/dist/x11perf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/x11perf/dist

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 02:48:20 UTC 2022

Update of /cvsroot/xsrc/external/mit/x11perf/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv22025

Log Message:
initial import of x11perf-1.6.2

Status:

Vendor Tag: xorg
Release Tags:   x11perf-1-6-2

U xsrc/external/mit/x11perf/dist/Makefile.am
U xsrc/external/mit/x11perf/dist/do_lines.c
U xsrc/external/mit/x11perf/dist/missing
U xsrc/external/mit/x11perf/dist/do_tests.c
U xsrc/external/mit/x11perf/dist/depcomp
U xsrc/external/mit/x11perf/dist/do_text.c
U xsrc/external/mit/x11perf/dist/do_valgc.c
C xsrc/external/mit/x11perf/dist/x11perf.c
U xsrc/external/mit/x11perf/dist/do_windows.c
U xsrc/external/mit/x11perf/dist/config.guess
U xsrc/external/mit/x11perf/dist/do_rects.c
U xsrc/external/mit/x11perf/dist/x11perfcomp.in
U xsrc/external/mit/x11perf/dist/COPYING
U xsrc/external/mit/x11perf/dist/Makefile.in
U xsrc/external/mit/x11perf/dist/install-sh
U xsrc/external/mit/x11perf/dist/compile
U xsrc/external/mit/x11perf/dist/do_simple.c
U xsrc/external/mit/x11perf/dist/do_tris.c
U xsrc/external/mit/x11perf/dist/aclocal.m4
U xsrc/external/mit/x11perf/dist/bitmaps.c
U xsrc/external/mit/x11perf/dist/do_blt.c
U xsrc/external/mit/x11perf/dist/do_arcs.c
U xsrc/external/mit/x11perf/dist/README.md
U xsrc/external/mit/x11perf/dist/x11perf.h
U xsrc/external/mit/x11perf/dist/configure
U xsrc/external/mit/x11perf/dist/Xmark
U xsrc/external/mit/x11perf/dist/ChangeLog
U xsrc/external/mit/x11perf/dist/fillblnk
U xsrc/external/mit/x11perf/dist/do_traps.c
U xsrc/external/mit/x11perf/dist/do_dots.c
U xsrc/external/mit/x11perf/dist/perfboth
U xsrc/external/mit/x11perf/dist/perfratio
U xsrc/external/mit/x11perf/dist/do_complex.c
U xsrc/external/mit/x11perf/dist/configure.ac
U xsrc/external/mit/x11perf/dist/bitmaps.h
U xsrc/external/mit/x11perf/dist/do_segs.c
U xsrc/external/mit/x11perf/dist/config.sub
U xsrc/external/mit/x11perf/dist/config.h.in
U xsrc/external/mit/x11perf/dist/INSTALL
U xsrc/external/mit/x11perf/dist/do_movewin.c
U xsrc/external/mit/x11perf/dist/man/Xmark.man
U xsrc/external/mit/x11perf/dist/man/x11perfcomp.man
U xsrc/external/mit/x11perf/dist/man/Makefile.in
U xsrc/external/mit/x11perf/dist/man/Makefile.am
U xsrc/external/mit/x11perf/dist/man/x11perf.man

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/x11perf/dist



CVS import: xsrc/external/mit/x11perf/dist

2022-11-12 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 02:48:20 UTC 2022

Update of /cvsroot/xsrc/external/mit/x11perf/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv22025

Log Message:
initial import of x11perf-1.6.2

Status:

Vendor Tag: xorg
Release Tags:   x11perf-1-6-2

U xsrc/external/mit/x11perf/dist/Makefile.am
U xsrc/external/mit/x11perf/dist/do_lines.c
U xsrc/external/mit/x11perf/dist/missing
U xsrc/external/mit/x11perf/dist/do_tests.c
U xsrc/external/mit/x11perf/dist/depcomp
U xsrc/external/mit/x11perf/dist/do_text.c
U xsrc/external/mit/x11perf/dist/do_valgc.c
C xsrc/external/mit/x11perf/dist/x11perf.c
U xsrc/external/mit/x11perf/dist/do_windows.c
U xsrc/external/mit/x11perf/dist/config.guess
U xsrc/external/mit/x11perf/dist/do_rects.c
U xsrc/external/mit/x11perf/dist/x11perfcomp.in
U xsrc/external/mit/x11perf/dist/COPYING
U xsrc/external/mit/x11perf/dist/Makefile.in
U xsrc/external/mit/x11perf/dist/install-sh
U xsrc/external/mit/x11perf/dist/compile
U xsrc/external/mit/x11perf/dist/do_simple.c
U xsrc/external/mit/x11perf/dist/do_tris.c
U xsrc/external/mit/x11perf/dist/aclocal.m4
U xsrc/external/mit/x11perf/dist/bitmaps.c
U xsrc/external/mit/x11perf/dist/do_blt.c
U xsrc/external/mit/x11perf/dist/do_arcs.c
U xsrc/external/mit/x11perf/dist/README.md
U xsrc/external/mit/x11perf/dist/x11perf.h
U xsrc/external/mit/x11perf/dist/configure
U xsrc/external/mit/x11perf/dist/Xmark
U xsrc/external/mit/x11perf/dist/ChangeLog
U xsrc/external/mit/x11perf/dist/fillblnk
U xsrc/external/mit/x11perf/dist/do_traps.c
U xsrc/external/mit/x11perf/dist/do_dots.c
U xsrc/external/mit/x11perf/dist/perfboth
U xsrc/external/mit/x11perf/dist/perfratio
U xsrc/external/mit/x11perf/dist/do_complex.c
U xsrc/external/mit/x11perf/dist/configure.ac
U xsrc/external/mit/x11perf/dist/bitmaps.h
U xsrc/external/mit/x11perf/dist/do_segs.c
U xsrc/external/mit/x11perf/dist/config.sub
U xsrc/external/mit/x11perf/dist/config.h.in
U xsrc/external/mit/x11perf/dist/INSTALL
U xsrc/external/mit/x11perf/dist/do_movewin.c
U xsrc/external/mit/x11perf/dist/man/Xmark.man
U xsrc/external/mit/x11perf/dist/man/x11perfcomp.man
U xsrc/external/mit/x11perf/dist/man/Makefile.in
U xsrc/external/mit/x11perf/dist/man/Makefile.am
U xsrc/external/mit/x11perf/dist/man/x11perf.man

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/x11perf/dist



CVS commit: src/external/mit/xorg/lib/pixman

2022-11-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 07:43:33 UTC 2022

Modified Files:
src/external/mit/xorg/lib/pixman: Makefile

Log Message:
disable arm64 NEON for now.  my X server exits for unknown reasons..


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/pixman/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.39 src/external/mit/xorg/lib/pixman/Makefile:1.40
--- src/external/mit/xorg/lib/pixman/Makefile:1.39	Sat Nov 12 04:00:57 2022
+++ src/external/mit/xorg/lib/pixman/Makefile	Sat Nov 12 07:43:33 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.39 2022/11/12 04:00:57 mrg Exp $
+#	$NetBSD: Makefile,v 1.40 2022/11/12 07:43:33 mrg Exp $
 
 NOLINT=	1	# defined
 
@@ -90,7 +90,7 @@ AFLAGS+=	${${ACTIVE_CC} == "clang" :? -f
 #CPPFLAGS+=	-DUSE_ARM_IWMMXT
 .endif
 
-.if !empty(MACHINE_ARCH:Maarch64*)
+.if !empty(MACHINE_ARCH:Maarch64*) && 0
 # ARM64 NEON
 SRCS+=		pixman-arm-neon.c			\
 		pixman-arma64-neon-asm.S		\



CVS commit: src/external/mit/xorg/lib/pixman

2022-11-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 07:43:33 UTC 2022

Modified Files:
src/external/mit/xorg/lib/pixman: Makefile

Log Message:
disable arm64 NEON for now.  my X server exits for unknown reasons..


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/pixman/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/libXrender/include

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 06:05:13 UTC 2022

Removed Files:
xsrc/external/mit/libXrender/include: config.h

Log Message:
remove unused file.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r0 xsrc/external/mit/libXrender/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/libXrender/include

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 06:05:13 UTC 2022

Removed Files:
xsrc/external/mit/libXrender/include: config.h

Log Message:
remove unused file.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r0 xsrc/external/mit/libXrender/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2022-11-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 04:00:57 UTC 2022

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/pixman: Makefile shlib_version

Log Message:
updates for pixman 0.42.2.

this enables NEON for arm64.  maybe firefox will be faster on pbp...


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/pixman/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.101 src/distrib/sets/lists/xbase/shl.mi:1.102
--- src/distrib/sets/lists/xbase/shl.mi:1.101	Sat Nov 12 02:20:15 2022
+++ src/distrib/sets/lists/xbase/shl.mi	Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.101 2022/11/12 02:20:15 mrg Exp $
+# $NetBSD: shl.mi,v 1.102 2022/11/12 04:00:57 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -202,7 +202,7 @@
 ./usr/X11R7/lib/libpciaccess.so.0.4		xbase-libpciaccess-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.so			xbase-pixman-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.so.2		xbase-pixman-lib		xorg,compatx11file
-./usr/X11R7/lib/libpixman-1.so.2.2		xbase-pixman-lib		xorg,compatx11file
+./usr/X11R7/lib/libpixman-1.so.2.3		xbase-pixman-lib		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-atom.so			xbase-xcb-util-lib		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-atom.so.1		xbase-xcb-util-lib		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-atom.so.1.0		xbase-xcb-util-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.67 src/distrib/sets/lists/xdebug/shl.mi:1.68
--- src/distrib/sets/lists/xdebug/shl.mi:1.67	Sat Nov 12 02:20:15 2022
+++ src/distrib/sets/lists/xdebug/shl.mi	Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.67 2022/11/12 02:20:15 mrg Exp $
+# $NetBSD: shl.mi,v 1.68 2022/11/12 04:00:57 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/lib	base-sys-usr		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	obsolete		obsolete
@@ -67,7 +67,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug	xdebug-libglapi-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug	xdebug-obsolete			xorg,obsolete,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.4.debug	xdebug-libpciaccess-debug		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug	xdebug-pixman-debug		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.3.debug	xdebug-pixman-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug	xdebug-xcb-util-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug	xdebug-xcb-util-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-composite.so.0.1.debug	xdebug-libxcb-debug		xorg,debug,compatx11file

Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.38 src/external/mit/xorg/lib/pixman/Makefile:1.39
--- src/external/mit/xorg/lib/pixman/Makefile:1.38	Mon Apr 26 21:32:49 2021
+++ src/external/mit/xorg/lib/pixman/Makefile	Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.38 2021/04/26 21:32:49 christos Exp $
+#	$NetBSD: Makefile,v 1.39 2022/11/12 04:00:57 mrg Exp $
 
 NOLINT=	1	# defined
 
@@ -90,6 +90,17 @@ AFLAGS+=	${${ACTIVE_CC} == "clang" :? -f
 #CPPFLAGS+=	-DUSE_ARM_IWMMXT
 .endif
 
+.if !empty(MACHINE_ARCH:Maarch64*)
+# ARM64 NEON
+SRCS+=		pixman-arm-neon.c			\
+		pixman-arma64-neon-asm.S		\
+		pixman-arma64-neon-asm-bilinear.S
+CPPFLAGS+=	-DUSE_ARM_A64_NEON
+
+# XXX: not sure if needed?
+#AFLAGS+=	${${ACTIVE_CC} == "clang" :? -fno-integrated-as :}
+.endif
+
 .if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
 # Loongson MMI
 SRCS+=		pixman-mmx.c

Index: src/external/mit/xorg/lib/pixman/shlib_version
diff -u src/external/mit/xorg/lib/pixman/shlib_version:1.6 src/external/mit/xorg/lib/pixman/shlib_version:1.7
--- src/external/mit/xorg/lib/pixman/shlib_version:1.6	Wed Jun  5 09:04:16 2013
+++ src/external/mit/xorg/lib/pixman/shlib_version	Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.6 2013/06/05 09:04:16 mrg Exp $
+#	$NetBSD: shlib_version,v 1.7 2022/11/12 04:00:57 mrg Exp $
 #
 major=2
-minor=2
+minor=3



CVS commit: src

2022-11-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 04:00:57 UTC 2022

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/pixman: Makefile shlib_version

Log Message:
updates for pixman 0.42.2.

this enables NEON for arm64.  maybe firefox will be faster on pbp...


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/pixman/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/pixman

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 03:35:26 UTC 2022

Modified Files:
xsrc/external/mit/pixman/dist/pixman: pixman-arm.c pixman-bits-image.c
pixman-inlines.h pixman-mmx.c pixman-ppc.c pixman-private.h
pixman-x86.c pixman.h
xsrc/external/mit/pixman/include: config.h

Log Message:
merge pixman 0.42.2.

this reverts a local change to pixman.h as upstream have fixed it
in a different way.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/pixman/dist/pixman/pixman-arm.c \
xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c \
xsrc/external/mit/pixman/dist/pixman/pixman-x86.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/pixman/dist/pixman/pixman-inlines.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/pixman/dist/pixman/pixman-mmx.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/pixman/dist/pixman/pixman-private.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/pixman/dist/pixman/pixman.h
cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/pixman/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/pixman/dist/pixman/pixman-arm.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-arm.c:1.2 xsrc/external/mit/pixman/dist/pixman/pixman-arm.c:1.3
--- xsrc/external/mit/pixman/dist/pixman/pixman-arm.c:1.2	Thu Jan 31 22:46:51 2013
+++ xsrc/external/mit/pixman/dist/pixman/pixman-arm.c	Sat Nov 12 03:35:25 2022
@@ -176,6 +176,31 @@ detect_cpu_features (void)
 return features;
 }
 
+#elif defined (_3DS) /* 3DS homebrew (devkitARM) */
+
+static arm_cpu_features_t
+detect_cpu_features (void)
+{
+arm_cpu_features_t features = 0;
+
+features |= ARM_V6;
+
+return features;
+}
+
+#elif defined (PSP2) || defined (__SWITCH__)
+/* Vita (VitaSDK) or Switch (devkitA64) homebrew */
+
+static arm_cpu_features_t
+detect_cpu_features (void)
+{
+arm_cpu_features_t features = 0;
+
+features |= ARM_NEON;
+
+return features;
+}
+
 #elif defined (__NetBSD__) /* NetBSD */
 
 #include 
@@ -254,5 +279,11 @@ _pixman_arm_get_implementations (pixman_
 	imp = _pixman_implementation_create_arm_neon (imp);
 #endif
 
+#ifdef USE_ARM_A64_NEON
+/* neon is a part of aarch64 */
+if (!_pixman_disabled ("arm-neon"))
+imp = _pixman_implementation_create_arm_neon (imp);
+#endif
+
 return imp;
 }
Index: xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c:1.2 xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c:1.3
--- xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c:1.2	Thu Feb  7 13:30:48 2013
+++ xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c	Sat Nov 12 03:35:25 2022
@@ -68,6 +68,24 @@ pixman_have_vmx (void)
 return have_vmx;
 }
 
+#elif defined (__FreeBSD__)
+#include 
+#include 
+
+static pixman_bool_t
+pixman_have_vmx (void)
+{
+
+unsigned long cpufeatures;
+int have_vmx;
+
+if (elf_aux_info(AT_HWCAP, , sizeof(cpufeatures)))
+return FALSE;
+
+have_vmx = cpufeatures & PPC_FEATURE_HAS_ALTIVEC;
+return have_vmx;
+}
+
 #elif defined (__linux__)
 
 #include 
Index: xsrc/external/mit/pixman/dist/pixman/pixman-x86.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-x86.c:1.2 xsrc/external/mit/pixman/dist/pixman/pixman-x86.c:1.3
--- xsrc/external/mit/pixman/dist/pixman/pixman-x86.c:1.2	Thu Oct 13 23:26:59 2016
+++ xsrc/external/mit/pixman/dist/pixman/pixman-x86.c	Sat Nov 12 03:35:25 2022
@@ -190,6 +190,7 @@ detect_cpu_features (void)
 	memcpy (vendor + 8, , 4);
 
 	if (strcmp (vendor, "AuthenticAMD") == 0 ||
+	strcmp (vendor, "HygonGenuine") == 0 ||
 	strcmp (vendor, "Geode by NSC") == 0)
 	{
 	pixman_cpuid (0x8000, , , , );

Index: xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.10 xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.11
--- xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.10	Mon Mar  4 08:36:42 2019
+++ xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c	Sat Nov 12 03:35:25 2022
@@ -35,6 +35,7 @@
 #include "pixman-private.h"
 #include "pixman-combine32.h"
 #include "pixman-inlines.h"
+#include "dither/blue-noise-64x64.h"
 
 /* Fetch functions */
 
@@ -190,8 +191,8 @@ bits_image_fetch_pixel_bilinear_float (b
 *ret = bilinear_interpolation_float (tl, tr, bl, br, distx, disty);
 }
 
-static force_inline void accum_32(int *satot, int *srtot,
-  int *sgtot, int *sbtot,
+static force_inline void accum_32(unsigned int *satot, unsigned int *srtot,
+  unsigned int *sgtot, unsigned int *sbtot,
   const void *p, pixman_fixed_t f)
 {
 uint32_t pixel = *(uint32_t *)p;
@@ -202,8 +203,9 @@ static force_inline void accum_32(int *s
 *satot += (int)ALPHA_8 (pixel) * f;
 }
 
-static force_inline 

CVS commit: xsrc/external/mit/pixman

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 03:35:26 UTC 2022

Modified Files:
xsrc/external/mit/pixman/dist/pixman: pixman-arm.c pixman-bits-image.c
pixman-inlines.h pixman-mmx.c pixman-ppc.c pixman-private.h
pixman-x86.c pixman.h
xsrc/external/mit/pixman/include: config.h

Log Message:
merge pixman 0.42.2.

this reverts a local change to pixman.h as upstream have fixed it
in a different way.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/pixman/dist/pixman/pixman-arm.c \
xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c \
xsrc/external/mit/pixman/dist/pixman/pixman-x86.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/pixman/dist/pixman/pixman-inlines.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/pixman/dist/pixman/pixman-mmx.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/pixman/dist/pixman/pixman-private.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/pixman/dist/pixman/pixman.h
cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/pixman/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/pixman/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 03:24:12 UTC 2022

Update of /cvsroot/xsrc/external/mit/pixman/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv25726

Log Message:
initial import of pixman-0.42.2

Status:

Vendor Tag: xorg
Release Tags:   pixman-0-42-2

U xsrc/external/mit/pixman/dist/depcomp
U xsrc/external/mit/pixman/dist/meson_options.txt
U xsrc/external/mit/pixman/dist/missing
U xsrc/external/mit/pixman/dist/configure
U xsrc/external/mit/pixman/dist/test-driver
U xsrc/external/mit/pixman/dist/Makefile.am
U xsrc/external/mit/pixman/dist/install-sh
U xsrc/external/mit/pixman/dist/Makefile.win32.common
U xsrc/external/mit/pixman/dist/arm-simd-test.S
U xsrc/external/mit/pixman/dist/aclocal.m4
U xsrc/external/mit/pixman/dist/pixman-1.pc.in
U xsrc/external/mit/pixman/dist/ChangeLog
U xsrc/external/mit/pixman/dist/meson.build
U xsrc/external/mit/pixman/dist/AUTHORS
U xsrc/external/mit/pixman/dist/NEWS
U xsrc/external/mit/pixman/dist/compile
U xsrc/external/mit/pixman/dist/config.guess
U xsrc/external/mit/pixman/dist/COPYING
U xsrc/external/mit/pixman/dist/Makefile.in
U xsrc/external/mit/pixman/dist/Makefile.win32
U xsrc/external/mit/pixman/dist/configure.ac
U xsrc/external/mit/pixman/dist/config.sub
U xsrc/external/mit/pixman/dist/ltmain.sh
U xsrc/external/mit/pixman/dist/INSTALL
U xsrc/external/mit/pixman/dist/config.h.in
N xsrc/external/mit/pixman/dist/a64-neon-test.S
U xsrc/external/mit/pixman/dist/README
U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in
U xsrc/external/mit/pixman/dist/neon-test.S
U xsrc/external/mit/pixman/dist/test/infinite-loop.c
U xsrc/external/mit/pixman/dist/test/radial-perf-test.c
U xsrc/external/mit/pixman/dist/test/cover-test.c
U xsrc/external/mit/pixman/dist/test/stress-test.c
U xsrc/external/mit/pixman/dist/test/utils.c
U xsrc/external/mit/pixman/dist/test/region-test.c
U xsrc/external/mit/pixman/dist/test/prng-test.c
U xsrc/external/mit/pixman/dist/test/alphamap.c
U xsrc/external/mit/pixman/dist/test/fetch-test.c
U xsrc/external/mit/pixman/dist/test/lowlevel-blt-bench.c
U xsrc/external/mit/pixman/dist/test/region-translate-test.c
U xsrc/external/mit/pixman/dist/test/utils-prng.h
U xsrc/external/mit/pixman/dist/test/blitters-test.c
U xsrc/external/mit/pixman/dist/test/pixel-test.c
U xsrc/external/mit/pixman/dist/test/scaling-crash-test.c
U xsrc/external/mit/pixman/dist/test/matrix-test.c
U xsrc/external/mit/pixman/dist/test/tolerance-test.c
U xsrc/external/mit/pixman/dist/test/trap-crasher.c
U xsrc/external/mit/pixman/dist/test/filter-reduction-test.c
U xsrc/external/mit/pixman/dist/test/utils.h
U xsrc/external/mit/pixman/dist/test/scaling-helpers-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.in
U xsrc/external/mit/pixman/dist/test/affine-test.c
U xsrc/external/mit/pixman/dist/test/meson.build
U xsrc/external/mit/pixman/dist/test/radial-invalid.c
U xsrc/external/mit/pixman/dist/test/thread-test.c
U xsrc/external/mit/pixman/dist/test/affine-bench.c
U xsrc/external/mit/pixman/dist/test/gradient-crash-test.c
U xsrc/external/mit/pixman/dist/test/combiner-test.c
U xsrc/external/mit/pixman/dist/test/rotate-test.c
U xsrc/external/mit/pixman/dist/test/scaling-bench.c
U xsrc/external/mit/pixman/dist/test/alpha-loop.c
U xsrc/external/mit/pixman/dist/test/pdf-op-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.am
U xsrc/external/mit/pixman/dist/test/composite.c
U xsrc/external/mit/pixman/dist/test/region-contains-test.c
U xsrc/external/mit/pixman/dist/test/oob-test.c
U xsrc/external/mit/pixman/dist/test/check-formats.c
U xsrc/external/mit/pixman/dist/test/composite-traps-test.c
U xsrc/external/mit/pixman/dist/test/utils-prng.c
U xsrc/external/mit/pixman/dist/test/fence-image-self-test.c
U xsrc/external/mit/pixman/dist/test/solid-test.c
U xsrc/external/mit/pixman/dist/test/glyph-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.sources
U xsrc/external/mit/pixman/dist/test/a1-trap-test.c
U xsrc/external/mit/pixman/dist/test/scaling-test.c
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2.h
U xsrc/external/mit/pixman/dist/pixman/pixman-noop.c
U xsrc/external/mit/pixman/dist/pixman/loongson-mmintrin.h
U xsrc/external/mit/pixman/dist/pixman/pixman-edge-accessors.c
C xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c
U xsrc/external/mit/pixman/dist/pixman/pixman-accessor.h
U xsrc/external/mit/pixman/dist/pixman/pixman-conical-gradient.c
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm.h
U xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm-bilinear.S
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2-asm.h
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm.S
C xsrc/external/mit/pixman/dist/pixman/pixman-arm.c
U xsrc/external/mit/pixman/dist/pixman/Makefile.win32
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2-asm.S
U xsrc/external/mit/pixman/dist/pixman/pixman-utils.c
U 

CVS import: xsrc/external/mit/pixman/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 03:24:12 UTC 2022

Update of /cvsroot/xsrc/external/mit/pixman/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv25726

Log Message:
initial import of pixman-0.42.2

Status:

Vendor Tag: xorg
Release Tags:   pixman-0-42-2

U xsrc/external/mit/pixman/dist/depcomp
U xsrc/external/mit/pixman/dist/meson_options.txt
U xsrc/external/mit/pixman/dist/missing
U xsrc/external/mit/pixman/dist/configure
U xsrc/external/mit/pixman/dist/test-driver
U xsrc/external/mit/pixman/dist/Makefile.am
U xsrc/external/mit/pixman/dist/install-sh
U xsrc/external/mit/pixman/dist/Makefile.win32.common
U xsrc/external/mit/pixman/dist/arm-simd-test.S
U xsrc/external/mit/pixman/dist/aclocal.m4
U xsrc/external/mit/pixman/dist/pixman-1.pc.in
U xsrc/external/mit/pixman/dist/ChangeLog
U xsrc/external/mit/pixman/dist/meson.build
U xsrc/external/mit/pixman/dist/AUTHORS
U xsrc/external/mit/pixman/dist/NEWS
U xsrc/external/mit/pixman/dist/compile
U xsrc/external/mit/pixman/dist/config.guess
U xsrc/external/mit/pixman/dist/COPYING
U xsrc/external/mit/pixman/dist/Makefile.in
U xsrc/external/mit/pixman/dist/Makefile.win32
U xsrc/external/mit/pixman/dist/configure.ac
U xsrc/external/mit/pixman/dist/config.sub
U xsrc/external/mit/pixman/dist/ltmain.sh
U xsrc/external/mit/pixman/dist/INSTALL
U xsrc/external/mit/pixman/dist/config.h.in
N xsrc/external/mit/pixman/dist/a64-neon-test.S
U xsrc/external/mit/pixman/dist/README
U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in
U xsrc/external/mit/pixman/dist/neon-test.S
U xsrc/external/mit/pixman/dist/test/infinite-loop.c
U xsrc/external/mit/pixman/dist/test/radial-perf-test.c
U xsrc/external/mit/pixman/dist/test/cover-test.c
U xsrc/external/mit/pixman/dist/test/stress-test.c
U xsrc/external/mit/pixman/dist/test/utils.c
U xsrc/external/mit/pixman/dist/test/region-test.c
U xsrc/external/mit/pixman/dist/test/prng-test.c
U xsrc/external/mit/pixman/dist/test/alphamap.c
U xsrc/external/mit/pixman/dist/test/fetch-test.c
U xsrc/external/mit/pixman/dist/test/lowlevel-blt-bench.c
U xsrc/external/mit/pixman/dist/test/region-translate-test.c
U xsrc/external/mit/pixman/dist/test/utils-prng.h
U xsrc/external/mit/pixman/dist/test/blitters-test.c
U xsrc/external/mit/pixman/dist/test/pixel-test.c
U xsrc/external/mit/pixman/dist/test/scaling-crash-test.c
U xsrc/external/mit/pixman/dist/test/matrix-test.c
U xsrc/external/mit/pixman/dist/test/tolerance-test.c
U xsrc/external/mit/pixman/dist/test/trap-crasher.c
U xsrc/external/mit/pixman/dist/test/filter-reduction-test.c
U xsrc/external/mit/pixman/dist/test/utils.h
U xsrc/external/mit/pixman/dist/test/scaling-helpers-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.in
U xsrc/external/mit/pixman/dist/test/affine-test.c
U xsrc/external/mit/pixman/dist/test/meson.build
U xsrc/external/mit/pixman/dist/test/radial-invalid.c
U xsrc/external/mit/pixman/dist/test/thread-test.c
U xsrc/external/mit/pixman/dist/test/affine-bench.c
U xsrc/external/mit/pixman/dist/test/gradient-crash-test.c
U xsrc/external/mit/pixman/dist/test/combiner-test.c
U xsrc/external/mit/pixman/dist/test/rotate-test.c
U xsrc/external/mit/pixman/dist/test/scaling-bench.c
U xsrc/external/mit/pixman/dist/test/alpha-loop.c
U xsrc/external/mit/pixman/dist/test/pdf-op-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.am
U xsrc/external/mit/pixman/dist/test/composite.c
U xsrc/external/mit/pixman/dist/test/region-contains-test.c
U xsrc/external/mit/pixman/dist/test/oob-test.c
U xsrc/external/mit/pixman/dist/test/check-formats.c
U xsrc/external/mit/pixman/dist/test/composite-traps-test.c
U xsrc/external/mit/pixman/dist/test/utils-prng.c
U xsrc/external/mit/pixman/dist/test/fence-image-self-test.c
U xsrc/external/mit/pixman/dist/test/solid-test.c
U xsrc/external/mit/pixman/dist/test/glyph-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.sources
U xsrc/external/mit/pixman/dist/test/a1-trap-test.c
U xsrc/external/mit/pixman/dist/test/scaling-test.c
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2.h
U xsrc/external/mit/pixman/dist/pixman/pixman-noop.c
U xsrc/external/mit/pixman/dist/pixman/loongson-mmintrin.h
U xsrc/external/mit/pixman/dist/pixman/pixman-edge-accessors.c
C xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c
U xsrc/external/mit/pixman/dist/pixman/pixman-accessor.h
U xsrc/external/mit/pixman/dist/pixman/pixman-conical-gradient.c
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm.h
U xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm-bilinear.S
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2-asm.h
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm.S
C xsrc/external/mit/pixman/dist/pixman/pixman-arm.c
U xsrc/external/mit/pixman/dist/pixman/Makefile.win32
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2-asm.S
U xsrc/external/mit/pixman/dist/pixman/pixman-utils.c
U 

CVS commit: src

2022-11-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 02:20:16 UTC 2022

Modified Files:
src: UPDATING
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libdrm: shlib_version
src/usr.bin/kdump: Makefile.ioctl-c

Log Message:
updates for libdrm 2.4.114.

unfortunately, the i915 ioctls are no longer handled by kdump/ktruss
as the new one conflicts with base.  this needs a clean build in these
dirs (and rescue).  the radeon ioctls have been enabled instead.


To generate a diff of this commit:
cvs rdiff -u -r1.333 -r1.334 src/UPDATING
cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libdrm/shlib_version
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/kdump/Makefile.ioctl-c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/UPDATING
diff -u src/UPDATING:1.333 src/UPDATING:1.334
--- src/UPDATING:1.333	Sat Oct  8 08:21:56 2022
+++ src/UPDATING	Sat Nov 12 02:20:15 2022
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.333 2022/10/08 08:21:56 riastradh Exp $
+$NetBSD: UPDATING,v 1.334 2022/11/12 02:20:15 mrg Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,17 @@ See also: BUILDING, build.sh, Makefile.
 Recent changes:
 ^^^
 
+2022:
+	The new libdrm import worsened the conflict issues for the
+	kdump/ktruss ioctl, and i915 now conflicts with base, and has
+	been turned off.  This will cause update build issues like:
+
+		kdump-ioctl.c:12175:143: error: 'DRM_IOCTL_I915_DESTROY_HEAP'
+		   undeclared here (not in a function);
+		   did you mean 'DRM_IOCTL_MODE_DESTROY_DUMB'?
+
+	You'll need to clean usr.bin/ktruss, usr.bin/kdump, and rescue.
+
 20220921:
 	Since the kernel version was bumped to 9.99.100, the bootloader
 	must be updated on x86 or EFI boot platforms in order to load

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.100 src/distrib/sets/lists/xbase/shl.mi:1.101
--- src/distrib/sets/lists/xbase/shl.mi:1.100	Sat Nov 12 02:03:08 2022
+++ src/distrib/sets/lists/xbase/shl.mi	Sat Nov 12 02:20:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.100 2022/11/12 02:03:08 mrg Exp $
+# $NetBSD: shl.mi,v 1.101 2022/11/12 02:20:15 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -166,7 +166,7 @@
 ./usr/X11R7/lib/libXxf86vm.so.2.0		xbase-libXxf86vm-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm.so			xbase-libdrm-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm.so.3			xbase-libdrm-lib		xorg,compatx11file
-./usr/X11R7/lib/libdrm.so.3.6			xbase-libdrm-lib		xorg,compatx11file
+./usr/X11R7/lib/libdrm.so.3.7			xbase-libdrm-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_radeon.so		xbase-libdrm_radeon-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_radeon.so.0		xbase-libdrm_radeon-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_radeon.so.0.0		xbase-libdrm_radeon-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.66 src/distrib/sets/lists/xdebug/shl.mi:1.67
--- src/distrib/sets/lists/xdebug/shl.mi:1.66	Sat Nov 12 02:03:08 2022
+++ src/distrib/sets/lists/xdebug/shl.mi	Sat Nov 12 02:20:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.66 2022/11/12 02:03:08 mrg Exp $
+# $NetBSD: shl.mi,v 1.67 2022/11/12 02:20:15 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/lib	base-sys-usr		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	obsolete		obsolete
@@ -56,7 +56,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug	xdebug-libXxf86dga-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug	xdebug-libXxf86misc-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug	xdebug-libXxf86vm-debug		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.6.debug	xdebug-libdrm-debug		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.7.debug	xdebug-libdrm-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug	xdebug-libdrm_radeon-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libepoxy.so.0.1.debug	xdebug-libepoxy-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug	xdebug-obsolete		xorg,obsolete,compatx11file

Index: src/external/mit/xorg/lib/libdrm/shlib_version
diff -u src/external/mit/xorg/lib/libdrm/shlib_version:1.8 src/external/mit/xorg/lib/libdrm/shlib_version:1.9
--- src/external/mit/xorg/lib/libdrm/shlib_version:1.8	

CVS commit: src

2022-11-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 02:20:16 UTC 2022

Modified Files:
src: UPDATING
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libdrm: shlib_version
src/usr.bin/kdump: Makefile.ioctl-c

Log Message:
updates for libdrm 2.4.114.

unfortunately, the i915 ioctls are no longer handled by kdump/ktruss
as the new one conflicts with base.  this needs a clean build in these
dirs (and rescue).  the radeon ioctls have been enabled instead.


To generate a diff of this commit:
cvs rdiff -u -r1.333 -r1.334 src/UPDATING
cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libdrm/shlib_version
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/kdump/Makefile.ioctl-c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/libdrm/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 02:07:08 UTC 2022

Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drm.h
xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_bo.c
xsrc/external/mit/libdrm/dist/include/drm: i915_drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Removed Files:
xsrc/external/mit/libdrm/dist/.gitlab-ci: debian-install.sh

Log Message:
merge libdrm 2.4.114.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.31 -r1.32 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/.gitlab-ci/debian-install.sh
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libdrm/dist/xf86atomic.h
diff -u xsrc/external/mit/libdrm/dist/xf86atomic.h:1.14 xsrc/external/mit/libdrm/dist/xf86atomic.h:1.15
--- xsrc/external/mit/libdrm/dist/xf86atomic.h:1.14	Sun Nov  1 09:57:37 2020
+++ xsrc/external/mit/libdrm/dist/xf86atomic.h	Sat Nov 12 02:07:07 2022
@@ -108,7 +108,7 @@ static inline int atomic_add_unless(atom
 	c = atomic_read(v);
 	while (c != unless && (old = atomic_cmpxchg(v, c, c + add)) != c)
 		c = old;
-	return c == unless;
+	return c != unless;
 }
 
 #endif

Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.31 xsrc/external/mit/libdrm/dist/xf86drm.c:1.32
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.31	Mon Jul 11 19:26:44 2022
+++ xsrc/external/mit/libdrm/dist/xf86drm.c	Sat Nov 12 02:07:07 2022
@@ -853,7 +853,7 @@ wait_for_udev:
 }
 #endif
 
-fd = open(buf, O_RDWR | O_CLOEXEC, 0);
+fd = open(buf, O_RDWR | O_CLOEXEC);
 drmMsg("drmOpenDevice: open result is %d, (%s)\n",
fd, fd < 0 ? strerror(errno) : "OK");
 if (fd >= 0)
@@ -873,7 +873,7 @@ wait_for_udev:
 chmod(buf, devmode);
 }
 }
-fd = open(buf, O_RDWR | O_CLOEXEC, 0);
+fd = open(buf, O_RDWR | O_CLOEXEC);
 drmMsg("drmOpenDevice: open result is %d, (%s)\n",
fd, fd < 0 ? strerror(errno) : "OK");
 if (fd >= 0)
@@ -911,7 +911,7 @@ static int drmOpenMinor(int minor, int c
 return -EINVAL;
 
 sprintf(buf, dev_name, DRM_DIR_NAME, minor);
-if ((fd = open(buf, O_RDWR | O_CLOEXEC, 0)) >= 0)
+if ((fd = open(buf, O_RDWR | O_CLOEXEC)) >= 0)
 return fd;
 return -errno;
 }
@@ -1139,7 +1139,7 @@ static int drmOpenByName(const char *nam
 int  retcode;
 
 sprintf(proc_name, "/proc/dri/%d/name", i);
-if ((fd = open(proc_name, O_RDONLY, 0)) >= 0) {
+if ((fd = open(proc_name, O_RDONLY)) >= 0) {
 retcode = read(fd, buf, sizeof(buf)-1);
 close(fd);
 if (retcode) {
@@ -4063,7 +4063,7 @@ out:
 if (get_sysctl_pci_bus_info(maj, min, ) != 0)
 return -EINVAL;
 
-fd = open("/dev/pci", O_RDONLY, 0);
+fd = open("/dev/pci", O_RDONLY);
 if (fd < 0)
 return -errno;
 
@@ -5277,3 +5277,43 @@ drmGetFormatModifierName(uint64_t modifi
 
 return modifier_found;
 }
+
+/**
+ * Get a human-readable name for a DRM FourCC format.
+ *
+ * \param format The format.
+ * \return A malloc'ed string containing the format name. Caller is responsible
+ * for freeing it.
+ */
+drm_public char *
+drmGetFormatName(uint32_t format)
+{
+char *str, code[5];
+const char *be;
+size_t str_size, i;
+
+be = (format & DRM_FORMAT_BIG_ENDIAN) ? "_BE" : "";
+format &= ~DRM_FORMAT_BIG_ENDIAN;
+
+if (format == DRM_FORMAT_INVALID)
+return strdup("INVALID");
+
+code[0] = (char) ((format >> 0) & 0xFF);
+code[1] = (char) ((format >> 8) & 0xFF);
+code[2] = (char) ((format >> 16) & 0xFF);
+code[3] = (char) ((format >> 24) & 0xFF);
+code[4] = '\0';
+
+/* Trim spaces at the end */
+for (i = 3; i > 0 && code[i] == ' '; i--)
+code[i] = '\0';
+
+str_size = strlen(code) + strlen(be) + 1;
+str = malloc(str_size);
+if (!str)
+return NULL;
+
+snprintf(str, str_size, "%s%s", code, be);
+
+return str;
+}

Index: xsrc/external/mit/libdrm/dist/xf86drm.h
diff -u xsrc/external/mit/libdrm/dist/xf86drm.h:1.15 

CVS commit: xsrc/external/mit/libdrm/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 02:07:08 UTC 2022

Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drm.h
xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_bo.c
xsrc/external/mit/libdrm/dist/include/drm: i915_drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Removed Files:
xsrc/external/mit/libdrm/dist/.gitlab-ci: debian-install.sh

Log Message:
merge libdrm 2.4.114.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.31 -r1.32 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/.gitlab-ci/debian-install.sh
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/libdrm/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 02:04:43 UTC 2022

Update of /cvsroot/xsrc/external/mit/libdrm/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12175

Log Message:
initial import of libdrm-2.4.114

Status:

Vendor Tag: xorg
Release Tags:   libdrm-2-4-114

U xsrc/external/mit/libdrm/dist/.editorconfig
U xsrc/external/mit/libdrm/dist/.gitlab-ci.yml
U xsrc/external/mit/libdrm/dist/Android.common.mk
U xsrc/external/mit/libdrm/dist/Android.mk
U xsrc/external/mit/libdrm/dist/CONTRIBUTING.rst
U xsrc/external/mit/libdrm/dist/CleanSpec.mk
U xsrc/external/mit/libdrm/dist/Makefile.sources
U xsrc/external/mit/libdrm/dist/README.rst
U xsrc/external/mit/libdrm/dist/RELEASING
U xsrc/external/mit/libdrm/dist/core-symbols.txt
U xsrc/external/mit/libdrm/dist/gen_table_fourcc.py
U xsrc/external/mit/libdrm/dist/libdrm.pc.in
U xsrc/external/mit/libdrm/dist/libdrm_lists.h
U xsrc/external/mit/libdrm/dist/libdrm_macros.h
U xsrc/external/mit/libdrm/dist/libsync.h
U xsrc/external/mit/libdrm/dist/meson.build
U xsrc/external/mit/libdrm/dist/meson_options.txt
U xsrc/external/mit/libdrm/dist/symbols-check.py
U xsrc/external/mit/libdrm/dist/util_double_list.h
U xsrc/external/mit/libdrm/dist/util_math.h
C xsrc/external/mit/libdrm/dist/xf86atomic.h
C xsrc/external/mit/libdrm/dist/xf86drm.c
C xsrc/external/mit/libdrm/dist/xf86drm.h
U xsrc/external/mit/libdrm/dist/xf86drmHash.c
U xsrc/external/mit/libdrm/dist/xf86drmHash.h
C xsrc/external/mit/libdrm/dist/xf86drmMode.c
C xsrc/external/mit/libdrm/dist/xf86drmMode.h
U xsrc/external/mit/libdrm/dist/xf86drmRandom.c
U xsrc/external/mit/libdrm/dist/xf86drmRandom.h
U xsrc/external/mit/libdrm/dist/xf86drmSL.c
U xsrc/external/mit/libdrm/dist/amdgpu/.editorconfig
U xsrc/external/mit/libdrm/dist/amdgpu/Android.mk
U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbols.txt
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c
C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c
U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c
U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h
U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in
U xsrc/external/mit/libdrm/dist/amdgpu/meson.build
U xsrc/external/mit/libdrm/dist/android/gralloc_handle.h
U xsrc/external/mit/libdrm/dist/data/Android.mk
U xsrc/external/mit/libdrm/dist/data/amdgpu.ids
U xsrc/external/mit/libdrm/dist/data/meson.build
U xsrc/external/mit/libdrm/dist/etnaviv/Android.mk
U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.sources
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv-symbols.txt
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo_cache.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_cmd_stream.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_device.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drm.h
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drmif.h
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_gpu.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_perfmon.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_pipe.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_priv.h
U xsrc/external/mit/libdrm/dist/etnaviv/libdrm_etnaviv.pc.in
U xsrc/external/mit/libdrm/dist/etnaviv/meson.build
U xsrc/external/mit/libdrm/dist/exynos/exynos-symbols.txt
U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c
U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h
U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h
U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c
U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.h
U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h
U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in
U xsrc/external/mit/libdrm/dist/exynos/meson.build
U xsrc/external/mit/libdrm/dist/freedreno/Android.mk
U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources
U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbols.txt
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h
U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in
U xsrc/external/mit/libdrm/dist/freedreno/meson.build
U xsrc/external/mit/libdrm/dist/freedreno/kgsl/README
U 

CVS import: xsrc/external/mit/libdrm/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 02:04:43 UTC 2022

Update of /cvsroot/xsrc/external/mit/libdrm/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12175

Log Message:
initial import of libdrm-2.4.114

Status:

Vendor Tag: xorg
Release Tags:   libdrm-2-4-114

U xsrc/external/mit/libdrm/dist/.editorconfig
U xsrc/external/mit/libdrm/dist/.gitlab-ci.yml
U xsrc/external/mit/libdrm/dist/Android.common.mk
U xsrc/external/mit/libdrm/dist/Android.mk
U xsrc/external/mit/libdrm/dist/CONTRIBUTING.rst
U xsrc/external/mit/libdrm/dist/CleanSpec.mk
U xsrc/external/mit/libdrm/dist/Makefile.sources
U xsrc/external/mit/libdrm/dist/README.rst
U xsrc/external/mit/libdrm/dist/RELEASING
U xsrc/external/mit/libdrm/dist/core-symbols.txt
U xsrc/external/mit/libdrm/dist/gen_table_fourcc.py
U xsrc/external/mit/libdrm/dist/libdrm.pc.in
U xsrc/external/mit/libdrm/dist/libdrm_lists.h
U xsrc/external/mit/libdrm/dist/libdrm_macros.h
U xsrc/external/mit/libdrm/dist/libsync.h
U xsrc/external/mit/libdrm/dist/meson.build
U xsrc/external/mit/libdrm/dist/meson_options.txt
U xsrc/external/mit/libdrm/dist/symbols-check.py
U xsrc/external/mit/libdrm/dist/util_double_list.h
U xsrc/external/mit/libdrm/dist/util_math.h
C xsrc/external/mit/libdrm/dist/xf86atomic.h
C xsrc/external/mit/libdrm/dist/xf86drm.c
C xsrc/external/mit/libdrm/dist/xf86drm.h
U xsrc/external/mit/libdrm/dist/xf86drmHash.c
U xsrc/external/mit/libdrm/dist/xf86drmHash.h
C xsrc/external/mit/libdrm/dist/xf86drmMode.c
C xsrc/external/mit/libdrm/dist/xf86drmMode.h
U xsrc/external/mit/libdrm/dist/xf86drmRandom.c
U xsrc/external/mit/libdrm/dist/xf86drmRandom.h
U xsrc/external/mit/libdrm/dist/xf86drmSL.c
U xsrc/external/mit/libdrm/dist/amdgpu/.editorconfig
U xsrc/external/mit/libdrm/dist/amdgpu/Android.mk
U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbols.txt
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c
C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c
U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c
U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h
U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in
U xsrc/external/mit/libdrm/dist/amdgpu/meson.build
U xsrc/external/mit/libdrm/dist/android/gralloc_handle.h
U xsrc/external/mit/libdrm/dist/data/Android.mk
U xsrc/external/mit/libdrm/dist/data/amdgpu.ids
U xsrc/external/mit/libdrm/dist/data/meson.build
U xsrc/external/mit/libdrm/dist/etnaviv/Android.mk
U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.sources
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv-symbols.txt
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo_cache.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_cmd_stream.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_device.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drm.h
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drmif.h
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_gpu.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_perfmon.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_pipe.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_priv.h
U xsrc/external/mit/libdrm/dist/etnaviv/libdrm_etnaviv.pc.in
U xsrc/external/mit/libdrm/dist/etnaviv/meson.build
U xsrc/external/mit/libdrm/dist/exynos/exynos-symbols.txt
U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c
U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h
U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h
U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c
U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.h
U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h
U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in
U xsrc/external/mit/libdrm/dist/exynos/meson.build
U xsrc/external/mit/libdrm/dist/freedreno/Android.mk
U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources
U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbols.txt
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h
U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in
U xsrc/external/mit/libdrm/dist/freedreno/meson.build
U xsrc/external/mit/libdrm/dist/freedreno/kgsl/README
U 

CVS commit: src

2022-11-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 02:03:09 UTC 2022

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libpciaccess: Makefile shlib_version

Log Message:
updates for libpciaccess 0.17.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libpciaccess/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libpciaccess/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2022-11-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 02:03:09 UTC 2022

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libpciaccess: Makefile shlib_version

Log Message:
updates for libpciaccess 0.17.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libpciaccess/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libpciaccess/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.99 src/distrib/sets/lists/xbase/shl.mi:1.100
--- src/distrib/sets/lists/xbase/shl.mi:1.99	Thu Jul 14 07:41:49 2022
+++ src/distrib/sets/lists/xbase/shl.mi	Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.99 2022/07/14 07:41:49 mrg Exp $
+# $NetBSD: shl.mi,v 1.100 2022/11/12 02:03:08 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -199,7 +199,7 @@
 ./usr/X11R7/lib/liblbxutil.so.2.0		xbase-obsolete		obsolete
 ./usr/X11R7/lib/libpciaccess.so			xbase-libpciaccess-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpciaccess.so.0		xbase-libpciaccess-lib		xorg,compatx11file
-./usr/X11R7/lib/libpciaccess.so.0.3		xbase-libpciaccess-lib		xorg,compatx11file
+./usr/X11R7/lib/libpciaccess.so.0.4		xbase-libpciaccess-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.so			xbase-pixman-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.so.2		xbase-pixman-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.so.2.2		xbase-pixman-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.65 src/distrib/sets/lists/xdebug/shl.mi:1.66
--- src/distrib/sets/lists/xdebug/shl.mi:1.65	Thu Jul 14 07:41:49 2022
+++ src/distrib/sets/lists/xdebug/shl.mi	Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.65 2022/07/14 07:41:49 mrg Exp $
+# $NetBSD: shl.mi,v 1.66 2022/11/12 02:03:08 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/lib	base-sys-usr		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	obsolete		obsolete
@@ -66,7 +66,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug	xdebug-libgbm-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug	xdebug-libglapi-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug	xdebug-obsolete			xorg,obsolete,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug	xdebug-libpciaccess-debug		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.4.debug	xdebug-libpciaccess-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug	xdebug-pixman-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug	xdebug-xcb-util-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug	xdebug-xcb-util-debug		xorg,debug,compatx11file

Index: src/external/mit/xorg/lib/libpciaccess/Makefile
diff -u src/external/mit/xorg/lib/libpciaccess/Makefile:1.10 src/external/mit/xorg/lib/libpciaccess/Makefile:1.11
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.10	Fri Jan 14 19:44:04 2022
+++ src/external/mit/xorg/lib/libpciaccess/Makefile	Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2022/01/14 19:44:04 macallan Exp $
+#	$NetBSD: Makefile,v 1.11 2022/11/12 02:03:08 mrg Exp $
 
 .include 
 
@@ -27,6 +27,8 @@ INCS=	pciaccess.h
 INCSDIR=${X11INCDIR}
 
 PKGDIST=	${LIB}
+PKGCONFIG_SED_FLAGS= \
+	-e "s,@PCIACCESS_LIBS@,-lpci -lz," \
 
 LIBDPLIBS+=	pci	${NETBSDSRCDIR}/lib/libpci \
 		z	${NETBSDSRCDIR}/lib/libz

Index: src/external/mit/xorg/lib/libpciaccess/shlib_version
diff -u src/external/mit/xorg/lib/libpciaccess/shlib_version:1.4 src/external/mit/xorg/lib/libpciaccess/shlib_version:1.5
--- src/external/mit/xorg/lib/libpciaccess/shlib_version:1.4	Sat Jun  1 09:08:01 2013
+++ src/external/mit/xorg/lib/libpciaccess/shlib_version	Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.4 2013/06/01 09:08:01 mrg Exp $
+#	$NetBSD: shlib_version,v 1.5 2022/11/12 02:03:08 mrg Exp $
 #
 major=0
-minor=3
+minor=4



CVS commit: xsrc/external/mit/libpciaccess/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 01:45:26 UTC 2022

Modified Files:
xsrc/external/mit/libpciaccess/dist/m4: libtool.m4 ltoptions.m4
ltsugar.m4 ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libpciaccess/dist/src: common_interface.c
netbsd_pci.c

Log Message:
merge libpciaccess 0.17.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 \
xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libpciaccess/dist/src/common_interface.c
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
diff -u xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.6 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.7
--- xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.6	Sun Mar 11 10:37:32 2018
+++ xsrc/external/mit/libpciaccess/dist/m4/libtool.m4	Sat Nov 12 01:45:25 2022
@@ -1,6 +1,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
+#   Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -31,7 +32,7 @@ m4_define([_LT_COPYING], [dnl
 # along with this program.  If not, see .
 ])
 
-# serial 58 LT_INIT
+# serial 59 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -181,6 +182,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_DECL_FILECMD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
 m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
@@ -219,8 +221,8 @@ esac
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -778,7 +780,7 @@ _LT_EOF
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
+  $SED '$q' "$ltmain" >> "$cfgfile" \
  || (rm -f "$cfgfile"; exit 1)
 
mv -f "$cfgfile" "$ofile" ||
@@ -1042,8 +1044,8 @@ int forced_loaded() { return 2;}
 _LT_EOF
   echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >_MESSAGE_LOG_FD
   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>_MESSAGE_LOG_FD
-  echo "$AR cru libconftest.a conftest.o" >_MESSAGE_LOG_FD
-  $AR cru libconftest.a conftest.o 2>_MESSAGE_LOG_FD
+  echo "$AR $AR_FLAGS libconftest.a conftest.o" >_MESSAGE_LOG_FD
+  $AR $AR_FLAGS libconftest.a conftest.o 2>_MESSAGE_LOG_FD
   echo "$RANLIB libconftest.a" >_MESSAGE_LOG_FD
   $RANLIB libconftest.a 2>_MESSAGE_LOG_FD
   cat > conftest.c << _LT_EOF
@@ -1067,17 +1069,12 @@ _LT_EOF
   _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
 darwin1.*)
   _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-darwin*) # darwin 5.x on
-  # if running on 10.5 or later, the deployment target defaults
-  # to the OS version, if on x86, and 10.4, the deployment
-  # target defaults to 10.4. Don't you love it?
-  case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]][[,.]]*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+darwin*)
+  case $MACOSX_DEPLOYMENT_TARGET,$host in
+10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
+  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+*)
+  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
   esac
 ;;
   esac
@@ -1126,12 +1123,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
 output_verbose_link_cmd=func_echo_all
 _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib 

CVS commit: xsrc/external/mit/libpciaccess/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 01:45:26 UTC 2022

Modified Files:
xsrc/external/mit/libpciaccess/dist/m4: libtool.m4 ltoptions.m4
ltsugar.m4 ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libpciaccess/dist/src: common_interface.c
netbsd_pci.c

Log Message:
merge libpciaccess 0.17.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 \
xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libpciaccess/dist/src/common_interface.c
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/libpciaccess/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 01:44:50 UTC 2022

Update of /cvsroot/xsrc/external/mit/libpciaccess/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv4315

Log Message:
initial import of libpciaccess-0.17

Status:

Vendor Tag: xorg
Release Tags:   libpciaccess-0-17

U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in
U xsrc/external/mit/libpciaccess/dist/configure
U xsrc/external/mit/libpciaccess/dist/config.sub
N xsrc/external/mit/libpciaccess/dist/meson_options.txt
U xsrc/external/mit/libpciaccess/dist/config.h.in
U xsrc/external/mit/libpciaccess/dist/README.md
U xsrc/external/mit/libpciaccess/dist/ChangeLog
U xsrc/external/mit/libpciaccess/dist/INSTALL
U xsrc/external/mit/libpciaccess/dist/configure.ac
U xsrc/external/mit/libpciaccess/dist/config.guess
U xsrc/external/mit/libpciaccess/dist/missing
U xsrc/external/mit/libpciaccess/dist/depcomp
N xsrc/external/mit/libpciaccess/dist/meson.build
U xsrc/external/mit/libpciaccess/dist/install-sh
U xsrc/external/mit/libpciaccess/dist/Makefile.in
U xsrc/external/mit/libpciaccess/dist/ltmain.sh
U xsrc/external/mit/libpciaccess/dist/aclocal.m4
U xsrc/external/mit/libpciaccess/dist/compile
U xsrc/external/mit/libpciaccess/dist/AUTHORS
U xsrc/external/mit/libpciaccess/dist/COPYING
U xsrc/external/mit/libpciaccess/dist/Makefile.am
C xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
C xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4
U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4
U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am
U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c
N xsrc/external/mit/libpciaccess/dist/scanpci/meson.build
U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in
U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c
U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c
U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/x86_pci.h
U xsrc/external/mit/libpciaccess/dist/src/Makefile.am
U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h
U xsrc/external/mit/libpciaccess/dist/src/common_init.c
U xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c
U xsrc/external/mit/libpciaccess/dist/src/Makefile.in
U xsrc/external/mit/libpciaccess/dist/src/common_io.c
U xsrc/external/mit/libpciaccess/dist/src/common_capability.c
N xsrc/external/mit/libpciaccess/dist/src/meson.build
U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h
U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c
C xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c
U xsrc/external/mit/libpciaccess/dist/src/hurd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h
U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c
U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c
C xsrc/external/mit/libpciaccess/dist/src/common_interface.c
U xsrc/external/mit/libpciaccess/dist/src/common_map.c
U xsrc/external/mit/libpciaccess/dist/man/Makefile.in
U xsrc/external/mit/libpciaccess/dist/man/scanpci.man
N xsrc/external/mit/libpciaccess/dist/man/meson.build
U xsrc/external/mit/libpciaccess/dist/man/Makefile.am
U xsrc/external/mit/libpciaccess/dist/include/Makefile.in
U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h
U xsrc/external/mit/libpciaccess/dist/include/Makefile.am

7 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist



CVS import: xsrc/external/mit/libpciaccess/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 01:44:50 UTC 2022

Update of /cvsroot/xsrc/external/mit/libpciaccess/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv4315

Log Message:
initial import of libpciaccess-0.17

Status:

Vendor Tag: xorg
Release Tags:   libpciaccess-0-17

U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in
U xsrc/external/mit/libpciaccess/dist/configure
U xsrc/external/mit/libpciaccess/dist/config.sub
N xsrc/external/mit/libpciaccess/dist/meson_options.txt
U xsrc/external/mit/libpciaccess/dist/config.h.in
U xsrc/external/mit/libpciaccess/dist/README.md
U xsrc/external/mit/libpciaccess/dist/ChangeLog
U xsrc/external/mit/libpciaccess/dist/INSTALL
U xsrc/external/mit/libpciaccess/dist/configure.ac
U xsrc/external/mit/libpciaccess/dist/config.guess
U xsrc/external/mit/libpciaccess/dist/missing
U xsrc/external/mit/libpciaccess/dist/depcomp
N xsrc/external/mit/libpciaccess/dist/meson.build
U xsrc/external/mit/libpciaccess/dist/install-sh
U xsrc/external/mit/libpciaccess/dist/Makefile.in
U xsrc/external/mit/libpciaccess/dist/ltmain.sh
U xsrc/external/mit/libpciaccess/dist/aclocal.m4
U xsrc/external/mit/libpciaccess/dist/compile
U xsrc/external/mit/libpciaccess/dist/AUTHORS
U xsrc/external/mit/libpciaccess/dist/COPYING
U xsrc/external/mit/libpciaccess/dist/Makefile.am
C xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
C xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4
U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4
U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am
U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c
N xsrc/external/mit/libpciaccess/dist/scanpci/meson.build
U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in
U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c
U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c
U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/x86_pci.h
U xsrc/external/mit/libpciaccess/dist/src/Makefile.am
U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h
U xsrc/external/mit/libpciaccess/dist/src/common_init.c
U xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c
U xsrc/external/mit/libpciaccess/dist/src/Makefile.in
U xsrc/external/mit/libpciaccess/dist/src/common_io.c
U xsrc/external/mit/libpciaccess/dist/src/common_capability.c
N xsrc/external/mit/libpciaccess/dist/src/meson.build
U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h
U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c
C xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c
U xsrc/external/mit/libpciaccess/dist/src/hurd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h
U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c
U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c
C xsrc/external/mit/libpciaccess/dist/src/common_interface.c
U xsrc/external/mit/libpciaccess/dist/src/common_map.c
U xsrc/external/mit/libpciaccess/dist/man/Makefile.in
U xsrc/external/mit/libpciaccess/dist/man/scanpci.man
N xsrc/external/mit/libpciaccess/dist/man/meson.build
U xsrc/external/mit/libpciaccess/dist/man/Makefile.am
U xsrc/external/mit/libpciaccess/dist/include/Makefile.in
U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h
U xsrc/external/mit/libpciaccess/dist/include/Makefile.am

7 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist



CVS commit: xsrc/external/mit/xf86-input-mouse/dist/src

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:50:07 UTC 2022

Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: bsd_mouse.c mouse.c pnp.c

Log Message:
merge xf86-input-mouse 1.9.4.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/xf86-input-mouse/dist/src

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:50:07 UTC 2022

Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: bsd_mouse.c mouse.c pnp.c

Log Message:
merge xf86-input-mouse 1.9.4.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.6 xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.7
--- xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.6	Sat Oct 10 21:50:53 2020
+++ xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c	Fri Nov 11 23:50:07 2022
@@ -61,7 +61,7 @@
 
 #define HID_USAGE2(p,u) (((p) << 16) | u)
 
-/* The UMS mices have middle button as number 3 */
+/* The UMS mice have middle button as number 3 */
 #define UMS_BUT(i) ((i) == 0 ? 2 : (i) == 1 ? 0 : (i) == 2 ? 1 : (i))
 #endif /* USBMOUSE_SUPPORT */
 
@@ -83,7 +83,7 @@ static const char *mouseDevs[] = {
 NULL
 };
 #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
-/* Only wsmouse mices are autoconfigured for now on OpenBSD */
+/* Only wsmouse mice are autoconfigured for now on OpenBSD */
 #define DEFAULT_WSMOUSE_DEV "/dev/wsmouse"
 #define DEFAULT_WSMOUSE0_DEV"/dev/wsmouse0"
 
@@ -232,7 +232,7 @@ SetSysMouseRes(InputInfoPtr pInfo, const
 (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 /*
  * As the FreeBSD sysmouse driver defaults to protocol level 0
- * everytime it is opened we enforce protocol level 1 again at
+ * every time it is opened we enforce protocol level 1 again at
  * this point.
  */
 mode.level = 1;
@@ -604,8 +604,10 @@ usbMouseProc(DeviceIntPtr pPointer, int 
 pInfo->fd = -1;
 } else {
 xf86FlushInput(pInfo->fd);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 23
 if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
   pInfo))
+#endif
 AddEnabledDevice(pInfo->fd);
 }
 }
@@ -726,7 +728,7 @@ usbPreInit(InputInfoPtr pInfo, const cha
 return FALSE;
 }
 }
-/* Get USB informations */
+/* Get USB information */
 reportDesc = hid_get_report_desc(pInfo->fd);
 /* Get packet size & iid */
 #ifdef USB_NEW_HID

Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.19 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.20
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.19	Mon Dec 31 12:01:31 2018
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c	Fri Nov 11 23:50:07 2022
@@ -38,7 +38,7 @@
  */
 
 /*
- * [PME-02/08/11] Added suport for drag lock buttons
+ * [PME-02/08/11] Added support for drag lock buttons
  * for use with 4 button trackballs for convenience
  * and to help limited dexterity persons
  */
@@ -176,12 +176,18 @@ static Bool autoGood(MouseDevPtr pMse);
 
 #undef MOUSE
 _X_EXPORT InputDriverRec MOUSE = {
-1,
-"mouse",
-NULL,
-MousePreInit,
-NULL,
-NULL,
+	.driverVersion		= 1,
+	.driverName		= "mouse",
+	.Identify		= NULL,
+	.PreInit		= MousePreInit,
+	.UnInit			= NULL,
+	.module			= NULL,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+	.default_options	= NULL,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 21
+	.capabilities		= 0
+#endif
+#endif
 };
 
 #define RETRY_COUNT 4
@@ -819,8 +825,8 @@ InitProtocols(void)
 !osInfo->CheckProtocol(mouseProtocols[i].name))
 mouseProtocols[i].id = PROT_UNSUP;
 
-#ifdef __NetBSD__
 /* NetBSD uses PROT_BM for "PS/2". */
+#if defined(__NetBSD__)
 for (i = 0; mouseProtocols[i].name; i++)
 if (mouseProtocols[i].id == PROT_PS2)
 mouseProtocols[i].id = PROT_BM;
@@ -1195,7 +1201,7 @@ MouseReadInput(InputInfoPtr pInfo)
 /*
  * Set blocking to -1 on the first call because we know there is data to
  * read. Xisb automatically clears it after one successful read so that
- * succeeding reads are preceeded by a select with a 0 timeout to prevent
+ * succeeding reads are preceded by a select with a 0 timeout to prevent
  * read from blocking indefinitely.
  */
 XisbBlockDuration(pMse->buffer, -1);
@@ -1255,11 +1261,11 @@ MouseReadInput(InputInfoPtr pInfo)
  */
 /*
  * [KAZU-030897]
- * Receive the fourth byte only when preceeding three bytes
+ * Receive the 

CVS import: xsrc/external/mit/xf86-input-mouse/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:31:21 UTC 2022

Update of /cvsroot/xsrc/external/mit/xf86-input-mouse/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5152

Log Message:
initial import of xf86-input-mouse-1.9.4

Status:

Vendor Tag: xorg
Release Tags:   xf86-input-mouse-1-9-4

U xsrc/external/mit/xf86-input-mouse/dist/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/README
U xsrc/external/mit/xf86-input-mouse/dist/INSTALL
U xsrc/external/mit/xf86-input-mouse/dist/config.guess
U xsrc/external/mit/xf86-input-mouse/dist/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/configure
U xsrc/external/mit/xf86-input-mouse/dist/config.sub
U xsrc/external/mit/xf86-input-mouse/dist/ChangeLog
U xsrc/external/mit/xf86-input-mouse/dist/COPYING
U xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in
U xsrc/external/mit/xf86-input-mouse/dist/config.h.in
U xsrc/external/mit/xf86-input-mouse/dist/compile
U xsrc/external/mit/xf86-input-mouse/dist/aclocal.m4
U xsrc/external/mit/xf86-input-mouse/dist/configure.ac
U xsrc/external/mit/xf86-input-mouse/dist/install-sh
U xsrc/external/mit/xf86-input-mouse/dist/depcomp
U xsrc/external/mit/xf86-input-mouse/dist/missing
U xsrc/external/mit/xf86-input-mouse/dist/ltmain.sh
U xsrc/external/mit/xf86-input-mouse/dist/man/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/man/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/man/mousedrv.man
U xsrc/external/mit/xf86-input-mouse/dist/include/xf86-mouse-properties.h
U xsrc/external/mit/xf86-input-mouse/dist/include/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/include/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/src/mousePriv.h
C xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/lnx_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/hurd_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h
U xsrc/external/mit/xf86-input-mouse/dist/src/sun_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/Makefile.in
C xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c
U xsrc/external/mit/xf86-input-mouse/dist/src/compat-api.h
C xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c

3 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-input-mouse/dist



CVS import: xsrc/external/mit/xf86-input-mouse/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:31:21 UTC 2022

Update of /cvsroot/xsrc/external/mit/xf86-input-mouse/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5152

Log Message:
initial import of xf86-input-mouse-1.9.4

Status:

Vendor Tag: xorg
Release Tags:   xf86-input-mouse-1-9-4

U xsrc/external/mit/xf86-input-mouse/dist/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/README
U xsrc/external/mit/xf86-input-mouse/dist/INSTALL
U xsrc/external/mit/xf86-input-mouse/dist/config.guess
U xsrc/external/mit/xf86-input-mouse/dist/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/configure
U xsrc/external/mit/xf86-input-mouse/dist/config.sub
U xsrc/external/mit/xf86-input-mouse/dist/ChangeLog
U xsrc/external/mit/xf86-input-mouse/dist/COPYING
U xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in
U xsrc/external/mit/xf86-input-mouse/dist/config.h.in
U xsrc/external/mit/xf86-input-mouse/dist/compile
U xsrc/external/mit/xf86-input-mouse/dist/aclocal.m4
U xsrc/external/mit/xf86-input-mouse/dist/configure.ac
U xsrc/external/mit/xf86-input-mouse/dist/install-sh
U xsrc/external/mit/xf86-input-mouse/dist/depcomp
U xsrc/external/mit/xf86-input-mouse/dist/missing
U xsrc/external/mit/xf86-input-mouse/dist/ltmain.sh
U xsrc/external/mit/xf86-input-mouse/dist/man/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/man/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/man/mousedrv.man
U xsrc/external/mit/xf86-input-mouse/dist/include/xf86-mouse-properties.h
U xsrc/external/mit/xf86-input-mouse/dist/include/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/include/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/src/mousePriv.h
C xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/lnx_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/hurd_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h
U xsrc/external/mit/xf86-input-mouse/dist/src/sun_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/Makefile.in
C xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c
U xsrc/external/mit/xf86-input-mouse/dist/src/compat-api.h
C xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c

3 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-input-mouse/dist



CVS commit: xsrc/external/mit

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:08:51 UTC 2022

Modified Files:
xsrc/external/mit/sessreg/include: config.h
xsrc/external/mit/xfsinfo/dist: compile
Removed Files:
xsrc/external/mit/rgb/dist: README
xsrc/external/mit/xsetroot/dist: README

Log Message:
merge rgb 1.1.0, sessreg 1.1.3, xfsinfo 1.0.7, and xsetroot 1.1.3


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/rgb/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/sessreg/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfsinfo/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xsetroot/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/sessreg/include/config.h
diff -u xsrc/external/mit/sessreg/include/config.h:1.5 xsrc/external/mit/sessreg/include/config.h:1.6
--- xsrc/external/mit/sessreg/include/config.h:1.5	Mon Jul  8 20:41:24 2019
+++ xsrc/external/mit/sessreg/include/config.h	Fri Nov 11 23:08:51 2022
@@ -59,7 +59,7 @@
 #define PACKAGE_NAME "sessreg"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "sessreg 1.1.1"
+#define PACKAGE_STRING "sessreg 1.1.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "sessreg"
@@ -68,7 +68,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.1"
+#define PACKAGE_VERSION "1.1.3"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -105,7 +105,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "1.1.3"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */

Index: xsrc/external/mit/xfsinfo/dist/compile
diff -u xsrc/external/mit/xfsinfo/dist/compile:1.4 xsrc/external/mit/xfsinfo/dist/compile:1.5
--- xsrc/external/mit/xfsinfo/dist/compile:1.4	Sun Mar  3 08:17:43 2019
+++ xsrc/external/mit/xfsinfo/dist/compile	Fri Nov 11 23:08:51 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:



CVS commit: xsrc/external/mit

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:08:51 UTC 2022

Modified Files:
xsrc/external/mit/sessreg/include: config.h
xsrc/external/mit/xfsinfo/dist: compile
Removed Files:
xsrc/external/mit/rgb/dist: README
xsrc/external/mit/xsetroot/dist: README

Log Message:
merge rgb 1.1.0, sessreg 1.1.3, xfsinfo 1.0.7, and xsetroot 1.1.3


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/rgb/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/sessreg/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfsinfo/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xsetroot/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/xsetroot/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:35 UTC 2022

Update of /cvsroot/xsrc/external/mit/xsetroot/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv27398

Log Message:
initial import of xsetroot-1.1.3

Status:

Vendor Tag: xorg
Release Tags:   xsetroot-1-1-3

U xsrc/external/mit/xsetroot/dist/missing
U xsrc/external/mit/xsetroot/dist/xsetroot.c
U xsrc/external/mit/xsetroot/dist/Makefile.am
U xsrc/external/mit/xsetroot/dist/depcomp
U xsrc/external/mit/xsetroot/dist/config.guess
U xsrc/external/mit/xsetroot/dist/Makefile.in
U xsrc/external/mit/xsetroot/dist/compile
U xsrc/external/mit/xsetroot/dist/config.sub
U xsrc/external/mit/xsetroot/dist/COPYING
U xsrc/external/mit/xsetroot/dist/ChangeLog
N xsrc/external/mit/xsetroot/dist/README.md
U xsrc/external/mit/xsetroot/dist/configure.ac
U xsrc/external/mit/xsetroot/dist/configure
U xsrc/external/mit/xsetroot/dist/INSTALL
U xsrc/external/mit/xsetroot/dist/install-sh
U xsrc/external/mit/xsetroot/dist/config.h.in
U xsrc/external/mit/xsetroot/dist/aclocal.m4
U xsrc/external/mit/xsetroot/dist/man/Makefile.am
U xsrc/external/mit/xsetroot/dist/man/Makefile.in
U xsrc/external/mit/xsetroot/dist/man/xsetroot.man

No conflicts created by this import



CVS import: xsrc/external/mit/xsetroot/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:35 UTC 2022

Update of /cvsroot/xsrc/external/mit/xsetroot/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv27398

Log Message:
initial import of xsetroot-1.1.3

Status:

Vendor Tag: xorg
Release Tags:   xsetroot-1-1-3

U xsrc/external/mit/xsetroot/dist/missing
U xsrc/external/mit/xsetroot/dist/xsetroot.c
U xsrc/external/mit/xsetroot/dist/Makefile.am
U xsrc/external/mit/xsetroot/dist/depcomp
U xsrc/external/mit/xsetroot/dist/config.guess
U xsrc/external/mit/xsetroot/dist/Makefile.in
U xsrc/external/mit/xsetroot/dist/compile
U xsrc/external/mit/xsetroot/dist/config.sub
U xsrc/external/mit/xsetroot/dist/COPYING
U xsrc/external/mit/xsetroot/dist/ChangeLog
N xsrc/external/mit/xsetroot/dist/README.md
U xsrc/external/mit/xsetroot/dist/configure.ac
U xsrc/external/mit/xsetroot/dist/configure
U xsrc/external/mit/xsetroot/dist/INSTALL
U xsrc/external/mit/xsetroot/dist/install-sh
U xsrc/external/mit/xsetroot/dist/config.h.in
U xsrc/external/mit/xsetroot/dist/aclocal.m4
U xsrc/external/mit/xsetroot/dist/man/Makefile.am
U xsrc/external/mit/xsetroot/dist/man/Makefile.in
U xsrc/external/mit/xsetroot/dist/man/xsetroot.man

No conflicts created by this import



CVS import: xsrc/external/mit/xfsinfo/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:34 UTC 2022

Update of /cvsroot/xsrc/external/mit/xfsinfo/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23409

Log Message:
initial import of xfsinfo-1.0.7

Status:

Vendor Tag: xorg
Release Tags:   xfsinfo-1-0-7

U xsrc/external/mit/xfsinfo/dist/README.md
U xsrc/external/mit/xfsinfo/dist/depcomp
U xsrc/external/mit/xfsinfo/dist/missing
U xsrc/external/mit/xfsinfo/dist/configure
U xsrc/external/mit/xfsinfo/dist/aclocal.m4
U xsrc/external/mit/xfsinfo/dist/ChangeLog
U xsrc/external/mit/xfsinfo/dist/install-sh
U xsrc/external/mit/xfsinfo/dist/configure.ac
U xsrc/external/mit/xfsinfo/dist/config.h.in
C xsrc/external/mit/xfsinfo/dist/compile
U xsrc/external/mit/xfsinfo/dist/COPYING
U xsrc/external/mit/xfsinfo/dist/config.sub
U xsrc/external/mit/xfsinfo/dist/Makefile.am
U xsrc/external/mit/xfsinfo/dist/config.guess
U xsrc/external/mit/xfsinfo/dist/INSTALL
U xsrc/external/mit/xfsinfo/dist/xfsinfo.c
U xsrc/external/mit/xfsinfo/dist/Makefile.in
U xsrc/external/mit/xfsinfo/dist/man/Makefile.am
U xsrc/external/mit/xfsinfo/dist/man/xfsinfo.man
U xsrc/external/mit/xfsinfo/dist/man/Makefile.in

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xfsinfo/dist



CVS import: xsrc/external/mit/xfsinfo/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:34 UTC 2022

Update of /cvsroot/xsrc/external/mit/xfsinfo/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23409

Log Message:
initial import of xfsinfo-1.0.7

Status:

Vendor Tag: xorg
Release Tags:   xfsinfo-1-0-7

U xsrc/external/mit/xfsinfo/dist/README.md
U xsrc/external/mit/xfsinfo/dist/depcomp
U xsrc/external/mit/xfsinfo/dist/missing
U xsrc/external/mit/xfsinfo/dist/configure
U xsrc/external/mit/xfsinfo/dist/aclocal.m4
U xsrc/external/mit/xfsinfo/dist/ChangeLog
U xsrc/external/mit/xfsinfo/dist/install-sh
U xsrc/external/mit/xfsinfo/dist/configure.ac
U xsrc/external/mit/xfsinfo/dist/config.h.in
C xsrc/external/mit/xfsinfo/dist/compile
U xsrc/external/mit/xfsinfo/dist/COPYING
U xsrc/external/mit/xfsinfo/dist/config.sub
U xsrc/external/mit/xfsinfo/dist/Makefile.am
U xsrc/external/mit/xfsinfo/dist/config.guess
U xsrc/external/mit/xfsinfo/dist/INSTALL
U xsrc/external/mit/xfsinfo/dist/xfsinfo.c
U xsrc/external/mit/xfsinfo/dist/Makefile.in
U xsrc/external/mit/xfsinfo/dist/man/Makefile.am
U xsrc/external/mit/xfsinfo/dist/man/xfsinfo.man
U xsrc/external/mit/xfsinfo/dist/man/Makefile.in

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xfsinfo/dist



CVS import: xsrc/external/mit/sessreg/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:32 UTC 2022

Update of /cvsroot/xsrc/external/mit/sessreg/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24368

Log Message:
initial import of sessreg-1.1.3

Status:

Vendor Tag: xorg
Release Tags:   sessreg-1-1-3

U xsrc/external/mit/sessreg/dist/Makefile.in
U xsrc/external/mit/sessreg/dist/sessreg.h
U xsrc/external/mit/sessreg/dist/INSTALL
U xsrc/external/mit/sessreg/dist/Makefile.am
U xsrc/external/mit/sessreg/dist/config.guess
U xsrc/external/mit/sessreg/dist/config.sub
U xsrc/external/mit/sessreg/dist/depcomp
U xsrc/external/mit/sessreg/dist/missing
U xsrc/external/mit/sessreg/dist/sessreg.c
U xsrc/external/mit/sessreg/dist/configure.ac
U xsrc/external/mit/sessreg/dist/config.h.in
U xsrc/external/mit/sessreg/dist/ChangeLog
U xsrc/external/mit/sessreg/dist/compile
U xsrc/external/mit/sessreg/dist/AUTHORS
U xsrc/external/mit/sessreg/dist/README.md
U xsrc/external/mit/sessreg/dist/install-sh
U xsrc/external/mit/sessreg/dist/configure
U xsrc/external/mit/sessreg/dist/COPYING
U xsrc/external/mit/sessreg/dist/aclocal.m4
U xsrc/external/mit/sessreg/dist/man/sessreg.man
U xsrc/external/mit/sessreg/dist/man/filenames.sed.c
U xsrc/external/mit/sessreg/dist/man/Makefile.in
U xsrc/external/mit/sessreg/dist/man/Makefile.am

No conflicts created by this import



CVS import: xsrc/external/mit/rgb/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:31 UTC 2022

Update of /cvsroot/xsrc/external/mit/rgb/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1197

Log Message:
initial import of rgb-1.1.0

Status:

Vendor Tag: xorg
Release Tags:   rgb-1-1-0

U xsrc/external/mit/rgb/dist/configure
N xsrc/external/mit/rgb/dist/README.md
U xsrc/external/mit/rgb/dist/showrgb.c
U xsrc/external/mit/rgb/dist/rgb.txt
U xsrc/external/mit/rgb/dist/ChangeLog
U xsrc/external/mit/rgb/dist/config.guess
U xsrc/external/mit/rgb/dist/config.h.in
U xsrc/external/mit/rgb/dist/install-sh
U xsrc/external/mit/rgb/dist/INSTALL
U xsrc/external/mit/rgb/dist/aclocal.m4
U xsrc/external/mit/rgb/dist/rgb.c
U xsrc/external/mit/rgb/dist/depcomp
U xsrc/external/mit/rgb/dist/Makefile.am
U xsrc/external/mit/rgb/dist/missing
U xsrc/external/mit/rgb/dist/COPYING
U xsrc/external/mit/rgb/dist/configure.ac
U xsrc/external/mit/rgb/dist/config.sub
U xsrc/external/mit/rgb/dist/Makefile.in
U xsrc/external/mit/rgb/dist/compile
U xsrc/external/mit/rgb/dist/AUTHORS
U xsrc/external/mit/rgb/dist/others/old-rgb.txt
U xsrc/external/mit/rgb/dist/others/raveling.txt
U xsrc/external/mit/rgb/dist/others/README
U xsrc/external/mit/rgb/dist/others/thomas.txt
U xsrc/external/mit/rgb/dist/man/Makefile.am
U xsrc/external/mit/rgb/dist/man/Makefile.in
U xsrc/external/mit/rgb/dist/man/showrgb.man
U xsrc/external/mit/rgb/dist/man/rgb.man

No conflicts created by this import



CVS import: xsrc/external/mit/sessreg/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:32 UTC 2022

Update of /cvsroot/xsrc/external/mit/sessreg/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24368

Log Message:
initial import of sessreg-1.1.3

Status:

Vendor Tag: xorg
Release Tags:   sessreg-1-1-3

U xsrc/external/mit/sessreg/dist/Makefile.in
U xsrc/external/mit/sessreg/dist/sessreg.h
U xsrc/external/mit/sessreg/dist/INSTALL
U xsrc/external/mit/sessreg/dist/Makefile.am
U xsrc/external/mit/sessreg/dist/config.guess
U xsrc/external/mit/sessreg/dist/config.sub
U xsrc/external/mit/sessreg/dist/depcomp
U xsrc/external/mit/sessreg/dist/missing
U xsrc/external/mit/sessreg/dist/sessreg.c
U xsrc/external/mit/sessreg/dist/configure.ac
U xsrc/external/mit/sessreg/dist/config.h.in
U xsrc/external/mit/sessreg/dist/ChangeLog
U xsrc/external/mit/sessreg/dist/compile
U xsrc/external/mit/sessreg/dist/AUTHORS
U xsrc/external/mit/sessreg/dist/README.md
U xsrc/external/mit/sessreg/dist/install-sh
U xsrc/external/mit/sessreg/dist/configure
U xsrc/external/mit/sessreg/dist/COPYING
U xsrc/external/mit/sessreg/dist/aclocal.m4
U xsrc/external/mit/sessreg/dist/man/sessreg.man
U xsrc/external/mit/sessreg/dist/man/filenames.sed.c
U xsrc/external/mit/sessreg/dist/man/Makefile.in
U xsrc/external/mit/sessreg/dist/man/Makefile.am

No conflicts created by this import



CVS import: xsrc/external/mit/rgb/dist

2022-11-11 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:31 UTC 2022

Update of /cvsroot/xsrc/external/mit/rgb/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1197

Log Message:
initial import of rgb-1.1.0

Status:

Vendor Tag: xorg
Release Tags:   rgb-1-1-0

U xsrc/external/mit/rgb/dist/configure
N xsrc/external/mit/rgb/dist/README.md
U xsrc/external/mit/rgb/dist/showrgb.c
U xsrc/external/mit/rgb/dist/rgb.txt
U xsrc/external/mit/rgb/dist/ChangeLog
U xsrc/external/mit/rgb/dist/config.guess
U xsrc/external/mit/rgb/dist/config.h.in
U xsrc/external/mit/rgb/dist/install-sh
U xsrc/external/mit/rgb/dist/INSTALL
U xsrc/external/mit/rgb/dist/aclocal.m4
U xsrc/external/mit/rgb/dist/rgb.c
U xsrc/external/mit/rgb/dist/depcomp
U xsrc/external/mit/rgb/dist/Makefile.am
U xsrc/external/mit/rgb/dist/missing
U xsrc/external/mit/rgb/dist/COPYING
U xsrc/external/mit/rgb/dist/configure.ac
U xsrc/external/mit/rgb/dist/config.sub
U xsrc/external/mit/rgb/dist/Makefile.in
U xsrc/external/mit/rgb/dist/compile
U xsrc/external/mit/rgb/dist/AUTHORS
U xsrc/external/mit/rgb/dist/others/old-rgb.txt
U xsrc/external/mit/rgb/dist/others/raveling.txt
U xsrc/external/mit/rgb/dist/others/README
U xsrc/external/mit/rgb/dist/others/thomas.txt
U xsrc/external/mit/rgb/dist/man/Makefile.am
U xsrc/external/mit/rgb/dist/man/Makefile.in
U xsrc/external/mit/rgb/dist/man/showrgb.man
U xsrc/external/mit/rgb/dist/man/rgb.man

No conflicts created by this import



CVS commit: xsrc/external/mit/imake/include

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:55:19 UTC 2022

Modified Files:
xsrc/external/mit/imake/include: config.h

Log Message:
update for imake 1.0.9.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/imake/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/imake/include/config.h
diff -u xsrc/external/mit/imake/include/config.h:1.6 xsrc/external/mit/imake/include/config.h:1.7
--- xsrc/external/mit/imake/include/config.h:1.6	Mon Mar 18 04:46:54 2019
+++ xsrc/external/mit/imake/include/config.h	Fri Nov 11 07:55:19 2022
@@ -41,7 +41,7 @@
 #define PACKAGE_NAME "imake"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "imake 1.0.8"
+#define PACKAGE_STRING "imake 1.0.9"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "imake"
@@ -50,7 +50,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.8"
+#define PACKAGE_VERSION "1.0.9"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -59,10 +59,10 @@
 #define PACKAGE_VERSION_MINOR 0
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 8
+#define PACKAGE_VERSION_PATCHLEVEL 9
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.0.8"
+#define VERSION "1.0.9"



CVS commit: xsrc/external/mit/imake/include

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:55:19 UTC 2022

Modified Files:
xsrc/external/mit/imake/include: config.h

Log Message:
update for imake 1.0.9.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/imake/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/imake/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:52:54 UTC 2022

Modified Files:
xsrc/external/mit/imake/dist: compile

Log Message:
merge imake 1.0.9.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/imake/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/imake/dist/compile
diff -u xsrc/external/mit/imake/dist/compile:1.4 xsrc/external/mit/imake/dist/compile:1.5
--- xsrc/external/mit/imake/dist/compile:1.4	Mon Mar 18 04:46:54 2019
+++ xsrc/external/mit/imake/dist/compile	Fri Nov 11 07:52:54 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:



CVS commit: xsrc/external/mit/imake/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:52:54 UTC 2022

Modified Files:
xsrc/external/mit/imake/dist: compile

Log Message:
merge imake 1.0.9.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/imake/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/makedepend/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:52:28 UTC 2022

Update of /cvsroot/xsrc/external/mit/makedepend/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv15030

Log Message:
initial import of makedepend-1.0.7

Status:

Vendor Tag: xorg
Release Tags:   makedepend-1-0-7

U xsrc/external/mit/makedepend/dist/makedepend-config.h.in
U xsrc/external/mit/makedepend/dist/autogen.sh
U xsrc/external/mit/makedepend/dist/include.c
U xsrc/external/mit/makedepend/dist/ifparser.c
U xsrc/external/mit/makedepend/dist/config.guess
U xsrc/external/mit/makedepend/dist/config.sub
U xsrc/external/mit/makedepend/dist/parse.c
U xsrc/external/mit/makedepend/dist/cppsetup.c
U xsrc/external/mit/makedepend/dist/main.c
U xsrc/external/mit/makedepend/dist/def.h
U xsrc/external/mit/makedepend/dist/imakemdep.h
U xsrc/external/mit/makedepend/dist/makedepend.man
U xsrc/external/mit/makedepend/dist/Makefile.in
U xsrc/external/mit/makedepend/dist/COPYING
U xsrc/external/mit/makedepend/dist/ifparser.h
U xsrc/external/mit/makedepend/dist/compile
U xsrc/external/mit/makedepend/dist/AUTHORS
U xsrc/external/mit/makedepend/dist/configure.ac
U xsrc/external/mit/makedepend/dist/Makefile.am
U xsrc/external/mit/makedepend/dist/ChangeLog
U xsrc/external/mit/makedepend/dist/pr.c
U xsrc/external/mit/makedepend/dist/missing
U xsrc/external/mit/makedepend/dist/depcomp
U xsrc/external/mit/makedepend/dist/aclocal.m4
U xsrc/external/mit/makedepend/dist/configure
U xsrc/external/mit/makedepend/dist/test-driver
U xsrc/external/mit/makedepend/dist/install-sh
U xsrc/external/mit/makedepend/dist/README.md
U xsrc/external/mit/makedepend/dist/tests/28045/foo.cpp
U xsrc/external/mit/makedepend/dist/tests/28045/makedep.sh
N xsrc/external/mit/makedepend/dist/tests/1/makedep.sh
N xsrc/external/mit/makedepend/dist/tests/1/one.cpp
N xsrc/external/mit/makedepend/dist/tests/1/two.cpp

No conflicts created by this import



CVS import: xsrc/external/mit/makedepend/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:52:28 UTC 2022

Update of /cvsroot/xsrc/external/mit/makedepend/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv15030

Log Message:
initial import of makedepend-1.0.7

Status:

Vendor Tag: xorg
Release Tags:   makedepend-1-0-7

U xsrc/external/mit/makedepend/dist/makedepend-config.h.in
U xsrc/external/mit/makedepend/dist/autogen.sh
U xsrc/external/mit/makedepend/dist/include.c
U xsrc/external/mit/makedepend/dist/ifparser.c
U xsrc/external/mit/makedepend/dist/config.guess
U xsrc/external/mit/makedepend/dist/config.sub
U xsrc/external/mit/makedepend/dist/parse.c
U xsrc/external/mit/makedepend/dist/cppsetup.c
U xsrc/external/mit/makedepend/dist/main.c
U xsrc/external/mit/makedepend/dist/def.h
U xsrc/external/mit/makedepend/dist/imakemdep.h
U xsrc/external/mit/makedepend/dist/makedepend.man
U xsrc/external/mit/makedepend/dist/Makefile.in
U xsrc/external/mit/makedepend/dist/COPYING
U xsrc/external/mit/makedepend/dist/ifparser.h
U xsrc/external/mit/makedepend/dist/compile
U xsrc/external/mit/makedepend/dist/AUTHORS
U xsrc/external/mit/makedepend/dist/configure.ac
U xsrc/external/mit/makedepend/dist/Makefile.am
U xsrc/external/mit/makedepend/dist/ChangeLog
U xsrc/external/mit/makedepend/dist/pr.c
U xsrc/external/mit/makedepend/dist/missing
U xsrc/external/mit/makedepend/dist/depcomp
U xsrc/external/mit/makedepend/dist/aclocal.m4
U xsrc/external/mit/makedepend/dist/configure
U xsrc/external/mit/makedepend/dist/test-driver
U xsrc/external/mit/makedepend/dist/install-sh
U xsrc/external/mit/makedepend/dist/README.md
U xsrc/external/mit/makedepend/dist/tests/28045/foo.cpp
U xsrc/external/mit/makedepend/dist/tests/28045/makedep.sh
N xsrc/external/mit/makedepend/dist/tests/1/makedep.sh
N xsrc/external/mit/makedepend/dist/tests/1/one.cpp
N xsrc/external/mit/makedepend/dist/tests/1/two.cpp

No conflicts created by this import



CVS import: xsrc/external/mit/imake/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:52:26 UTC 2022

Update of /cvsroot/xsrc/external/mit/imake/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv21655

Log Message:
initial import of imake-1.0.9

Status:

Vendor Tag: xorg
Release Tags:   imake-1-0-9

U xsrc/external/mit/imake/dist/aclocal.m4
U xsrc/external/mit/imake/dist/makeg.man
U xsrc/external/mit/imake/dist/mergelib.man
U xsrc/external/mit/imake/dist/mdepend.cpp
U xsrc/external/mit/imake/dist/install-sh
U xsrc/external/mit/imake/dist/revpath.man
U xsrc/external/mit/imake/dist/config.h.in
U xsrc/external/mit/imake/dist/INSTALL
U xsrc/external/mit/imake/dist/revpath.c
U xsrc/external/mit/imake/dist/mkdirhier.man
U xsrc/external/mit/imake/dist/xmkmf.cpp
U xsrc/external/mit/imake/dist/imake.man
U xsrc/external/mit/imake/dist/cleanlinks.man
U xsrc/external/mit/imake/dist/mkhtmlindex.pl
U xsrc/external/mit/imake/dist/configure.ac
U xsrc/external/mit/imake/dist/imakemdep.h
U xsrc/external/mit/imake/dist/ChangeLog
U xsrc/external/mit/imake/dist/config.guess
U xsrc/external/mit/imake/dist/mergelib.cpp
U xsrc/external/mit/imake/dist/cleanlinks
U xsrc/external/mit/imake/dist/Makefile.in
U xsrc/external/mit/imake/dist/COPYING
U xsrc/external/mit/imake/dist/README.md
C xsrc/external/mit/imake/dist/compile
U xsrc/external/mit/imake/dist/imake.c
U xsrc/external/mit/imake/dist/makeg
U xsrc/external/mit/imake/dist/config.sub
U xsrc/external/mit/imake/dist/mkhtmlindex.man
U xsrc/external/mit/imake/dist/configure
U xsrc/external/mit/imake/dist/ccmakedep.man
U xsrc/external/mit/imake/dist/xmkmf.man
U xsrc/external/mit/imake/dist/Makefile.am
U xsrc/external/mit/imake/dist/mkdirhier
U xsrc/external/mit/imake/dist/missing
U xsrc/external/mit/imake/dist/depcomp
U xsrc/external/mit/imake/dist/mkhtmlindex.sh

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/imake/dist



CVS import: xsrc/external/mit/imake/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:52:26 UTC 2022

Update of /cvsroot/xsrc/external/mit/imake/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv21655

Log Message:
initial import of imake-1.0.9

Status:

Vendor Tag: xorg
Release Tags:   imake-1-0-9

U xsrc/external/mit/imake/dist/aclocal.m4
U xsrc/external/mit/imake/dist/makeg.man
U xsrc/external/mit/imake/dist/mergelib.man
U xsrc/external/mit/imake/dist/mdepend.cpp
U xsrc/external/mit/imake/dist/install-sh
U xsrc/external/mit/imake/dist/revpath.man
U xsrc/external/mit/imake/dist/config.h.in
U xsrc/external/mit/imake/dist/INSTALL
U xsrc/external/mit/imake/dist/revpath.c
U xsrc/external/mit/imake/dist/mkdirhier.man
U xsrc/external/mit/imake/dist/xmkmf.cpp
U xsrc/external/mit/imake/dist/imake.man
U xsrc/external/mit/imake/dist/cleanlinks.man
U xsrc/external/mit/imake/dist/mkhtmlindex.pl
U xsrc/external/mit/imake/dist/configure.ac
U xsrc/external/mit/imake/dist/imakemdep.h
U xsrc/external/mit/imake/dist/ChangeLog
U xsrc/external/mit/imake/dist/config.guess
U xsrc/external/mit/imake/dist/mergelib.cpp
U xsrc/external/mit/imake/dist/cleanlinks
U xsrc/external/mit/imake/dist/Makefile.in
U xsrc/external/mit/imake/dist/COPYING
U xsrc/external/mit/imake/dist/README.md
C xsrc/external/mit/imake/dist/compile
U xsrc/external/mit/imake/dist/imake.c
U xsrc/external/mit/imake/dist/makeg
U xsrc/external/mit/imake/dist/config.sub
U xsrc/external/mit/imake/dist/mkhtmlindex.man
U xsrc/external/mit/imake/dist/configure
U xsrc/external/mit/imake/dist/ccmakedep.man
U xsrc/external/mit/imake/dist/xmkmf.man
U xsrc/external/mit/imake/dist/Makefile.am
U xsrc/external/mit/imake/dist/mkdirhier
U xsrc/external/mit/imake/dist/missing
U xsrc/external/mit/imake/dist/depcomp
U xsrc/external/mit/imake/dist/mkhtmlindex.sh

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/imake/dist



CVS commit: xsrc/external/mit/libXinerama/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:49:34 UTC 2022

Modified Files:
xsrc/external/mit/libXinerama/dist/src: Xinerama.c
Removed Files:
xsrc/external/mit/libXinerama/dist: README

Log Message:
merge libXinerama 1.1.5


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXinerama/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXinerama/dist/src/Xinerama.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXinerama/dist/src/Xinerama.c
diff -u xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.5 xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.6
--- xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.5	Fri Dec 28 22:16:48 2018
+++ xsrc/external/mit/libXinerama/dist/src/Xinerama.c	Fri Nov 11 07:49:34 2022
@@ -101,7 +101,7 @@ Status XPanoramiXQueryVersion(
 {
 XExtDisplayInfo *info = find_display (dpy);
 xPanoramiXQueryVersionReply	rep;
-register xPanoramiXQueryVersionReq  *req;
+xPanoramiXQueryVersionReq  	   *req;
 
 PanoramiXCheckExtension (dpy, info, 0);
 
@@ -136,7 +136,7 @@ Status XPanoramiXGetState (
 {
 XExtDisplayInfo			*info = find_display (dpy);
 xPanoramiXGetStateReply	rep;
-register xPanoramiXGetStateReq	*req;
+xPanoramiXGetStateReq	*req;
 
 PanoramiXCheckExtension (dpy, info, 0);
 
@@ -165,7 +165,7 @@ Status XPanoramiXGetScreenCount (
 {
 XExtDisplayInfo			*info = find_display (dpy);
 xPanoramiXGetScreenCountReply	rep;
-register xPanoramiXGetScreenCountReq	*req;
+xPanoramiXGetScreenCountReq		*req;
 
 PanoramiXCheckExtension (dpy, info, 0);
 
@@ -195,7 +195,7 @@ Status XPanoramiXGetScreenSize (
 {
 XExtDisplayInfo			*info = find_display (dpy);
 xPanoramiXGetScreenSizeReply	rep;
-register xPanoramiXGetScreenSizeReq	*req;
+xPanoramiXGetScreenSizeReq		*req;
 
 PanoramiXCheckExtension (dpy, info, 0);
 
@@ -303,7 +303,7 @@ XineramaQueryScreens(
 if ((rep.number > 0) && (rep.number <= 1024))
 	scrnInfo = Xmalloc(sizeof(XineramaScreenInfo) * rep.number);
 if (scrnInfo != NULL) {
-	int i;
+	CARD32 i;
 
 	for (i = 0; i < rep.number; i++) {
 	xXineramaScreenInfo scratch;



CVS commit: xsrc/external/mit/libXinerama/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:49:34 UTC 2022

Modified Files:
xsrc/external/mit/libXinerama/dist/src: Xinerama.c
Removed Files:
xsrc/external/mit/libXinerama/dist: README

Log Message:
merge libXinerama 1.1.5


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXinerama/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXinerama/dist/src/Xinerama.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/libXinerama/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:48:55 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXinerama/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10909

Log Message:
initial import of libXinerama-1.1.5

Status:

Vendor Tag: xorg
Release Tags:   libXinerama-1-1-5

U xsrc/external/mit/libXinerama/dist/Makefile.am
U xsrc/external/mit/libXinerama/dist/config.guess
U xsrc/external/mit/libXinerama/dist/INSTALL
U xsrc/external/mit/libXinerama/dist/Makefile.in
U xsrc/external/mit/libXinerama/dist/aclocal.m4
U xsrc/external/mit/libXinerama/dist/install-sh
U xsrc/external/mit/libXinerama/dist/ltmain.sh
U xsrc/external/mit/libXinerama/dist/COPYING
U xsrc/external/mit/libXinerama/dist/xinerama.pc.in
U xsrc/external/mit/libXinerama/dist/compile
U xsrc/external/mit/libXinerama/dist/configure
U xsrc/external/mit/libXinerama/dist/configure.ac
N xsrc/external/mit/libXinerama/dist/README.md
U xsrc/external/mit/libXinerama/dist/config.sub
U xsrc/external/mit/libXinerama/dist/missing
U xsrc/external/mit/libXinerama/dist/ChangeLog
U xsrc/external/mit/libXinerama/dist/depcomp
U xsrc/external/mit/libXinerama/dist/config.h.in
U xsrc/external/mit/libXinerama/dist/man/XineramaIsActive.man
U xsrc/external/mit/libXinerama/dist/man/Makefile.in
U xsrc/external/mit/libXinerama/dist/man/XineramaQueryVersion.man
U xsrc/external/mit/libXinerama/dist/man/Makefile.am
U xsrc/external/mit/libXinerama/dist/man/Xinerama.man
U xsrc/external/mit/libXinerama/dist/man/XineramaQueryExtension.man
U xsrc/external/mit/libXinerama/dist/man/XineramaQueryScreens.man
U xsrc/external/mit/libXinerama/dist/include/X11/extensions/Xinerama.h
U xsrc/external/mit/libXinerama/dist/include/X11/extensions/panoramiXext.h
U xsrc/external/mit/libXinerama/dist/src/Makefile.in
C xsrc/external/mit/libXinerama/dist/src/Xinerama.c
U xsrc/external/mit/libXinerama/dist/src/Makefile.am

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXinerama/dist



CVS import: xsrc/external/mit/libXinerama/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 07:48:55 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXinerama/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10909

Log Message:
initial import of libXinerama-1.1.5

Status:

Vendor Tag: xorg
Release Tags:   libXinerama-1-1-5

U xsrc/external/mit/libXinerama/dist/Makefile.am
U xsrc/external/mit/libXinerama/dist/config.guess
U xsrc/external/mit/libXinerama/dist/INSTALL
U xsrc/external/mit/libXinerama/dist/Makefile.in
U xsrc/external/mit/libXinerama/dist/aclocal.m4
U xsrc/external/mit/libXinerama/dist/install-sh
U xsrc/external/mit/libXinerama/dist/ltmain.sh
U xsrc/external/mit/libXinerama/dist/COPYING
U xsrc/external/mit/libXinerama/dist/xinerama.pc.in
U xsrc/external/mit/libXinerama/dist/compile
U xsrc/external/mit/libXinerama/dist/configure
U xsrc/external/mit/libXinerama/dist/configure.ac
N xsrc/external/mit/libXinerama/dist/README.md
U xsrc/external/mit/libXinerama/dist/config.sub
U xsrc/external/mit/libXinerama/dist/missing
U xsrc/external/mit/libXinerama/dist/ChangeLog
U xsrc/external/mit/libXinerama/dist/depcomp
U xsrc/external/mit/libXinerama/dist/config.h.in
U xsrc/external/mit/libXinerama/dist/man/XineramaIsActive.man
U xsrc/external/mit/libXinerama/dist/man/Makefile.in
U xsrc/external/mit/libXinerama/dist/man/XineramaQueryVersion.man
U xsrc/external/mit/libXinerama/dist/man/Makefile.am
U xsrc/external/mit/libXinerama/dist/man/Xinerama.man
U xsrc/external/mit/libXinerama/dist/man/XineramaQueryExtension.man
U xsrc/external/mit/libXinerama/dist/man/XineramaQueryScreens.man
U xsrc/external/mit/libXinerama/dist/include/X11/extensions/Xinerama.h
U xsrc/external/mit/libXinerama/dist/include/X11/extensions/panoramiXext.h
U xsrc/external/mit/libXinerama/dist/src/Makefile.in
C xsrc/external/mit/libXinerama/dist/src/Xinerama.c
U xsrc/external/mit/libXinerama/dist/src/Makefile.am

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXinerama/dist



CVS commit: xsrc/external/mit/libX11/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 04:45:23 UTC 2022

Modified Files:
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c
Removed Files:
xsrc/external/mit/libX11/dist: NEWS
xsrc/external/mit/libX11/dist/src: UIThrStubs.c

Log Message:
merge libX11 1.8.2.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/NEWS
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libX11/dist/src/UIThrStubs.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/libX11/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 04:45:23 UTC 2022

Modified Files:
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c
Removed Files:
xsrc/external/mit/libX11/dist: NEWS
xsrc/external/mit/libX11/dist/src: UIThrStubs.c

Log Message:
merge libX11 1.8.2.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/NEWS
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libX11/dist/src/UIThrStubs.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
diff -u xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.9 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.10
--- xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.9	Wed Jul 13 19:57:48 2022
+++ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre	Fri Nov 11 04:45:23 2022
@@ -14,6 +14,8 @@ XCOMM Spacing versions of accents (mostl
  		: "`"	grave # GRAVE ACCENT
  		: "^"	asciicircum # CIRCUMFLEX ACCENT
  	: "^"	asciicircum # CIRCUMFLEX ACCENT
+  		: "^"	asciicircum # CIRCUMFLEX ACCENT
+  		: "^"	asciicircum # CIRCUMFLEX ACCENT
  		: "°"	degree # DEGREE SIGN
  	: "°"	degree # DEGREE SIGN
   			: "°"	degree # DEGREE SIGN
@@ -22,13 +24,14 @@ XCOMM Spacing versions of accents (mostl
  			: "¯"	macron # MACRON
  		: "¯"	macron # MACRON
   	: "¯"	macron # MACRON
-  	: "¯"	macron # MACRON
+  	: "¯"	macron # MACRON
+  	: "¯"	macron # MACRON
   	: "¯"	macron # MACRON
   	: "¯"	macron # MACRON
  			: "˘"	breve # BREVE
  		: "˘"	breve # BREVE
-  		: "˘"	breve # BREVE
   		: "˘"	breve # BREVE
+  		: "˘"	breve # BREVE
  			: "˙"	abovedot # DOT ABOVE
  		: "˙"	abovedot # DOT ABOVE
   		: "˙"	abovedot # DOT ABOVE
@@ -40,8 +43,8 @@ XCOMM Spacing versions of accents (mostl
  	: "˝"	U2dd # DOUBLE ACUTE ACCENT
  			: "ˇ"	caron # CARON
  		: "ˇ"	caron # CARON
-  		: "ˇ"	caron # CARON
   		: "ˇ"	caron # CARON
+  		: "ˇ"	caron # CARON
  			: "¸"	cedilla # CEDILLA
  		: "¸"	cedilla # CEDILLA
   		: "¸"	cedilla # CEDILLA
@@ -56,17 +59,18 @@ XCOMM Spacing versions of accents (mostl
 XCOMM ASCII characters that may be difficult to access on some keyboards.
   		: "#"	numbersign # NUMBER SIGN
   			: "@"	at # COMMERCIAL AT
+
   	: "["	bracketleft # LEFT SQUARE BRACKET
+  	: "]"	bracketright # RIGHT SQUARE BRACKET
+
   		: "\\"	backslash # REVERSE SOLIDUS
   		: "\\"	backslash # REVERSE SOLIDUS
   		: "\\"	backslash # REVERSE SOLIDUS
-  	: "]"	bracketright # RIGHT SQUARE BRACKET
-
-  		: "^"	asciicircum # CIRCUMFLEX ACCENT
-  		: "^"	asciicircum # CIRCUMFLEX ACCENT
 
   		: "{"	braceleft # LEFT CURLY BRACKET
   		: "{"	braceleft # LEFT CURLY BRACKET
+  	: "}"	braceright # RIGHT CURLY BRACKET
+  	: "}"	braceright # RIGHT CURLY BRACKET
 
   	: "|"	bar # VERTICAL LINE
   	: "|"	bar # VERTICAL LINE
@@ -75,9 +79,6 @@ XCOMM ASCII characters that may be diffi
   			: "|"	bar # VERTICAL LINE
   			: "|"	bar # VERTICAL LINE
 
-  	: "}"	braceright # RIGHT CURLY BRACKET
-  	: "}"	braceright # RIGHT CURLY BRACKET
-
   			: "<"	less # LESS-THAN
   			: "<"	less # LESS-THAN
   			: ">"	greater # GREATER-THAN
@@ -294,6 +295,11 @@ XCOMM Latin-1 Supplement
	: "ª"	ordfeminine # FEMININE ORDINAL INDICATOR
	: "º"	masculine # MASCULINE ORDINAL INDICATOR
	: "º"	masculine # MASCULINE ORDINAL INDICATOR
+ <1>			: "¹"	onesuperior # SUPERSCRIPT ONE
+  <1>		: "¹"	onesuperior # SUPERSCRIPT ONE
+ <1> 		: "¹"	onesuperior # SUPERSCRIPT ONE
+ 		: "¹"	onesuperior # SUPERSCRIPT ONE
+  	: "¹"	onesuperior # SUPERSCRIPT ONE
  <2>			: "²"	twosuperior # SUPERSCRIPT TWO
   <2>		: "²"	twosuperior # SUPERSCRIPT TWO
  <2> 		: "²"	twosuperior # SUPERSCRIPT TWO
@@ -307,11 +313,6 @@ XCOMM Latin-1 Supplement
   			: "µ"	mu # MICRO SIGN
   			: "µ"	mu # MICRO SIGN
   			: "µ"	mu # MICRO SIGN
- <1>			: "¹"	onesuperior # SUPERSCRIPT ONE
-  <1>		: "¹"	onesuperior # SUPERSCRIPT ONE
- <1> 		: "¹"	onesuperior # SUPERSCRIPT ONE
- 		: "¹"	onesuperior # SUPERSCRIPT ONE
-  	: "¹"	onesuperior # SUPERSCRIPT ONE
  <1> <4>			: "¼"	onequarter # VULGAR FRACTION ONE QUARTER
  <1> <2>			: "½"	onehalf # VULGAR FRACTION ONE HALF
  <3> <4>			: "¾"	threequarters # VULGAR FRACTION THREE QUARTERS
@@ -706,20 +707,18 @@ XCOMM Latin Extended-A
  			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
   			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
   			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
-  			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
-  			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
   			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
   			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
   			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH 

CVS import: xsrc/external/mit/libX11/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 04:44:59 UTC 2022

Update of /cvsroot/xsrc/external/mit/libX11/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv11423

Log Message:
initial import of libX11-1.8.2

Status:

Vendor Tag: xorg
Release Tags:   libX11-1-8-2

U xsrc/external/mit/libX11/dist/configure.ac
U xsrc/external/mit/libX11/dist/cpprules.in
U xsrc/external/mit/libX11/dist/INSTALL
U xsrc/external/mit/libX11/dist/ChangeLog
U xsrc/external/mit/libX11/dist/config.sub
U xsrc/external/mit/libX11/dist/configure
U xsrc/external/mit/libX11/dist/x11.pc.in
U xsrc/external/mit/libX11/dist/README.md
U xsrc/external/mit/libX11/dist/COPYING
U xsrc/external/mit/libX11/dist/docbook.am
U xsrc/external/mit/libX11/dist/Makefile.am
U xsrc/external/mit/libX11/dist/test-driver
U xsrc/external/mit/libX11/dist/AUTHORS
U xsrc/external/mit/libX11/dist/compile
U xsrc/external/mit/libX11/dist/x11-xcb.pc.in
U xsrc/external/mit/libX11/dist/ltmain.sh
U xsrc/external/mit/libX11/dist/Makefile.in
U xsrc/external/mit/libX11/dist/install-sh
U xsrc/external/mit/libX11/dist/config.guess
U xsrc/external/mit/libX11/dist/missing
U xsrc/external/mit/libX11/dist/aclocal.m4
U xsrc/external/mit/libX11/dist/depcomp
U xsrc/external/mit/libX11/dist/src/SetFunc.c
U xsrc/external/mit/libX11/dist/src/Backgnd.c
U xsrc/external/mit/libX11/dist/src/SetTSOrig.c
U xsrc/external/mit/libX11/dist/src/GetHColor.c
U xsrc/external/mit/libX11/dist/src/GetProp.c
U xsrc/external/mit/libX11/dist/src/GetStCmap.c
U xsrc/external/mit/libX11/dist/src/GetKCnt.c
U xsrc/external/mit/libX11/dist/src/Xxcbint.h
U xsrc/external/mit/libX11/dist/src/evtomask.c
U xsrc/external/mit/libX11/dist/src/Makefile.am
U xsrc/external/mit/libX11/dist/src/GCMisc.c
U xsrc/external/mit/libX11/dist/src/DrPoint.c
U xsrc/external/mit/libX11/dist/src/PutBEvent.c
U xsrc/external/mit/libX11/dist/src/QuColor.c
U xsrc/external/mit/libX11/dist/src/os2Stubs.c
U xsrc/external/mit/libX11/dist/src/Text16.c
U xsrc/external/mit/libX11/dist/src/FSWrap.c
U xsrc/external/mit/libX11/dist/src/ChkTypWEv.c
U xsrc/external/mit/libX11/dist/src/RaiseWin.c
U xsrc/external/mit/libX11/dist/src/Macros.c
U xsrc/external/mit/libX11/dist/src/GetFPath.c
U xsrc/external/mit/libX11/dist/src/GetImage.c
U xsrc/external/mit/libX11/dist/src/FreePix.c
U xsrc/external/mit/libX11/dist/src/SetFore.c
U xsrc/external/mit/libX11/dist/src/AutoRep.c
U xsrc/external/mit/libX11/dist/src/AllPlanes.c
U xsrc/external/mit/libX11/dist/src/IfEvent.c
U xsrc/external/mit/libX11/dist/src/CirWin.c
U xsrc/external/mit/libX11/dist/src/GetWAttrs.c
U xsrc/external/mit/libX11/dist/src/ImText.c
U xsrc/external/mit/libX11/dist/src/ChkTypEv.c
U xsrc/external/mit/libX11/dist/src/ParseCol.c
U xsrc/external/mit/libX11/dist/src/DrSegs.c
U xsrc/external/mit/libX11/dist/src/UngrabSvr.c
U xsrc/external/mit/libX11/dist/src/ClearArea.c
U xsrc/external/mit/libX11/dist/src/QuExt.c
U xsrc/external/mit/libX11/dist/src/StColor.c
U xsrc/external/mit/libX11/dist/src/Context.c
U xsrc/external/mit/libX11/dist/src/TextExt16.c
U xsrc/external/mit/libX11/dist/src/GetRGBCMap.c
U xsrc/external/mit/libX11/dist/src/Withdraw.c
U xsrc/external/mit/libX11/dist/src/ClDisplay.c
U xsrc/external/mit/libX11/dist/src/QuTextE16.c
U xsrc/external/mit/libX11/dist/src/Depths.c
U xsrc/external/mit/libX11/dist/src/SendEvent.c
U xsrc/external/mit/libX11/dist/src/LiICmaps.c
U xsrc/external/mit/libX11/dist/src/LowerWin.c
U xsrc/external/mit/libX11/dist/src/SetFont.c
U xsrc/external/mit/libX11/dist/src/BdrWidth.c
U xsrc/external/mit/libX11/dist/src/GetPntMap.c
U xsrc/external/mit/libX11/dist/src/Clear.c
U xsrc/external/mit/libX11/dist/src/LockDis.c
U xsrc/external/mit/libX11/dist/src/InitExt.c
U xsrc/external/mit/libX11/dist/src/SetTile.c
U xsrc/external/mit/libX11/dist/src/GrPointer.c
U xsrc/external/mit/libX11/dist/src/GetTxtProp.c
U xsrc/external/mit/libX11/dist/src/PolyTxt16.c
U xsrc/external/mit/libX11/dist/src/GetGeom.c
U xsrc/external/mit/libX11/dist/src/Xrm.c
U xsrc/external/mit/libX11/dist/src/FilterEv.c
U xsrc/external/mit/libX11/dist/src/globals.c
U xsrc/external/mit/libX11/dist/src/DestSubs.c
U xsrc/external/mit/libX11/dist/src/GetSSaver.c
U xsrc/external/mit/libX11/dist/src/ModMap.c
U xsrc/external/mit/libX11/dist/src/DrLines.c
U xsrc/external/mit/libX11/dist/src/UnmapWin.c
U xsrc/external/mit/libX11/dist/src/SetIFocus.c
U xsrc/external/mit/libX11/dist/src/Sync.c
U xsrc/external/mit/libX11/dist/src/UnmapSubs.c
U xsrc/external/mit/libX11/dist/src/ChActPGb.c
U xsrc/external/mit/libX11/dist/src/XErrorDB
U xsrc/external/mit/libX11/dist/src/GrButton.c
U xsrc/external/mit/libX11/dist/src/StNColor.c
U xsrc/external/mit/libX11/dist/src/XlibAsync.c
U xsrc/external/mit/libX11/dist/src/SetTxtProp.c
U xsrc/external/mit/libX11/dist/src/CrPFBData.c
U xsrc/external/mit/libX11/dist/src/Xatomtype.h
U xsrc/external/mit/libX11/dist/src/PixFormats.c
U xsrc/external/mit/libX11/dist/src/QuStipShp.c
U xsrc/external/mit/libX11/dist/src/RdBitF.c
U 

CVS import: xsrc/external/mit/libX11/dist

2022-11-10 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 04:44:59 UTC 2022

Update of /cvsroot/xsrc/external/mit/libX11/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv11423

Log Message:
initial import of libX11-1.8.2

Status:

Vendor Tag: xorg
Release Tags:   libX11-1-8-2

U xsrc/external/mit/libX11/dist/configure.ac
U xsrc/external/mit/libX11/dist/cpprules.in
U xsrc/external/mit/libX11/dist/INSTALL
U xsrc/external/mit/libX11/dist/ChangeLog
U xsrc/external/mit/libX11/dist/config.sub
U xsrc/external/mit/libX11/dist/configure
U xsrc/external/mit/libX11/dist/x11.pc.in
U xsrc/external/mit/libX11/dist/README.md
U xsrc/external/mit/libX11/dist/COPYING
U xsrc/external/mit/libX11/dist/docbook.am
U xsrc/external/mit/libX11/dist/Makefile.am
U xsrc/external/mit/libX11/dist/test-driver
U xsrc/external/mit/libX11/dist/AUTHORS
U xsrc/external/mit/libX11/dist/compile
U xsrc/external/mit/libX11/dist/x11-xcb.pc.in
U xsrc/external/mit/libX11/dist/ltmain.sh
U xsrc/external/mit/libX11/dist/Makefile.in
U xsrc/external/mit/libX11/dist/install-sh
U xsrc/external/mit/libX11/dist/config.guess
U xsrc/external/mit/libX11/dist/missing
U xsrc/external/mit/libX11/dist/aclocal.m4
U xsrc/external/mit/libX11/dist/depcomp
U xsrc/external/mit/libX11/dist/src/SetFunc.c
U xsrc/external/mit/libX11/dist/src/Backgnd.c
U xsrc/external/mit/libX11/dist/src/SetTSOrig.c
U xsrc/external/mit/libX11/dist/src/GetHColor.c
U xsrc/external/mit/libX11/dist/src/GetProp.c
U xsrc/external/mit/libX11/dist/src/GetStCmap.c
U xsrc/external/mit/libX11/dist/src/GetKCnt.c
U xsrc/external/mit/libX11/dist/src/Xxcbint.h
U xsrc/external/mit/libX11/dist/src/evtomask.c
U xsrc/external/mit/libX11/dist/src/Makefile.am
U xsrc/external/mit/libX11/dist/src/GCMisc.c
U xsrc/external/mit/libX11/dist/src/DrPoint.c
U xsrc/external/mit/libX11/dist/src/PutBEvent.c
U xsrc/external/mit/libX11/dist/src/QuColor.c
U xsrc/external/mit/libX11/dist/src/os2Stubs.c
U xsrc/external/mit/libX11/dist/src/Text16.c
U xsrc/external/mit/libX11/dist/src/FSWrap.c
U xsrc/external/mit/libX11/dist/src/ChkTypWEv.c
U xsrc/external/mit/libX11/dist/src/RaiseWin.c
U xsrc/external/mit/libX11/dist/src/Macros.c
U xsrc/external/mit/libX11/dist/src/GetFPath.c
U xsrc/external/mit/libX11/dist/src/GetImage.c
U xsrc/external/mit/libX11/dist/src/FreePix.c
U xsrc/external/mit/libX11/dist/src/SetFore.c
U xsrc/external/mit/libX11/dist/src/AutoRep.c
U xsrc/external/mit/libX11/dist/src/AllPlanes.c
U xsrc/external/mit/libX11/dist/src/IfEvent.c
U xsrc/external/mit/libX11/dist/src/CirWin.c
U xsrc/external/mit/libX11/dist/src/GetWAttrs.c
U xsrc/external/mit/libX11/dist/src/ImText.c
U xsrc/external/mit/libX11/dist/src/ChkTypEv.c
U xsrc/external/mit/libX11/dist/src/ParseCol.c
U xsrc/external/mit/libX11/dist/src/DrSegs.c
U xsrc/external/mit/libX11/dist/src/UngrabSvr.c
U xsrc/external/mit/libX11/dist/src/ClearArea.c
U xsrc/external/mit/libX11/dist/src/QuExt.c
U xsrc/external/mit/libX11/dist/src/StColor.c
U xsrc/external/mit/libX11/dist/src/Context.c
U xsrc/external/mit/libX11/dist/src/TextExt16.c
U xsrc/external/mit/libX11/dist/src/GetRGBCMap.c
U xsrc/external/mit/libX11/dist/src/Withdraw.c
U xsrc/external/mit/libX11/dist/src/ClDisplay.c
U xsrc/external/mit/libX11/dist/src/QuTextE16.c
U xsrc/external/mit/libX11/dist/src/Depths.c
U xsrc/external/mit/libX11/dist/src/SendEvent.c
U xsrc/external/mit/libX11/dist/src/LiICmaps.c
U xsrc/external/mit/libX11/dist/src/LowerWin.c
U xsrc/external/mit/libX11/dist/src/SetFont.c
U xsrc/external/mit/libX11/dist/src/BdrWidth.c
U xsrc/external/mit/libX11/dist/src/GetPntMap.c
U xsrc/external/mit/libX11/dist/src/Clear.c
U xsrc/external/mit/libX11/dist/src/LockDis.c
U xsrc/external/mit/libX11/dist/src/InitExt.c
U xsrc/external/mit/libX11/dist/src/SetTile.c
U xsrc/external/mit/libX11/dist/src/GrPointer.c
U xsrc/external/mit/libX11/dist/src/GetTxtProp.c
U xsrc/external/mit/libX11/dist/src/PolyTxt16.c
U xsrc/external/mit/libX11/dist/src/GetGeom.c
U xsrc/external/mit/libX11/dist/src/Xrm.c
U xsrc/external/mit/libX11/dist/src/FilterEv.c
U xsrc/external/mit/libX11/dist/src/globals.c
U xsrc/external/mit/libX11/dist/src/DestSubs.c
U xsrc/external/mit/libX11/dist/src/GetSSaver.c
U xsrc/external/mit/libX11/dist/src/ModMap.c
U xsrc/external/mit/libX11/dist/src/DrLines.c
U xsrc/external/mit/libX11/dist/src/UnmapWin.c
U xsrc/external/mit/libX11/dist/src/SetIFocus.c
U xsrc/external/mit/libX11/dist/src/Sync.c
U xsrc/external/mit/libX11/dist/src/UnmapSubs.c
U xsrc/external/mit/libX11/dist/src/ChActPGb.c
U xsrc/external/mit/libX11/dist/src/XErrorDB
U xsrc/external/mit/libX11/dist/src/GrButton.c
U xsrc/external/mit/libX11/dist/src/StNColor.c
U xsrc/external/mit/libX11/dist/src/XlibAsync.c
U xsrc/external/mit/libX11/dist/src/SetTxtProp.c
U xsrc/external/mit/libX11/dist/src/CrPFBData.c
U xsrc/external/mit/libX11/dist/src/Xatomtype.h
U xsrc/external/mit/libX11/dist/src/PixFormats.c
U xsrc/external/mit/libX11/dist/src/QuStipShp.c
U xsrc/external/mit/libX11/dist/src/RdBitF.c
U 

CVS commit: src/distrib/sets/lists/xcomp

2022-10-29 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Oct 29 21:06:48 UTC 2022

Modified Files:
src/distrib/sets/lists/xcomp: mi

Log Message:
add new libXpresent manuals.


To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/distrib/sets/lists/xcomp/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.238 src/distrib/sets/lists/xcomp/mi:1.239
--- src/distrib/sets/lists/xcomp/mi:1.238	Fri Aug 12 07:35:55 2022
+++ src/distrib/sets/lists/xcomp/mi	Sat Oct 29 21:06:48 2022
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.238 2022/08/12 07:35:55 mrg Exp $
+#	 $NetBSD: mi,v 1.239 2022/10/29 21:06:48 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2577,6 +2577,14 @@
 ./usr/X11R7/man/cat3/XpStartJob.0			xcomp-obsolete	obsolete
 ./usr/X11R7/man/cat3/XpStartPage.0			xcomp-obsolete	obsolete
 ./usr/X11R7/man/cat3/Xpresent.0xcomp-libXpresent-catman	.cat,xorg
+./usr/X11R7/man/cat3/XPresentFreeInput.0		xcomp-libXpresent-catman	.cat,xorg
+./usr/X11R7/man/cat3/XPresentNotifyMSC.0		xcomp-libXpresent-catman	.cat,xorg
+./usr/X11R7/man/cat3/XPresentPixmap.0			xcomp-libXpresent-catman	.cat,xorg
+./usr/X11R7/man/cat3/XPresentQueryCapabilities.0	xcomp-libXpresent-catman	.cat,xorg
+./usr/X11R7/man/cat3/XPresentQueryExtension.0		xcomp-libXpresent-catman	.cat,xorg
+./usr/X11R7/man/cat3/XPresentQueryVersion.0		xcomp-libXpresent-catman	.cat,xorg
+./usr/X11R7/man/cat3/XPresentSelectInput.0		xcomp-libXpresent-catman	.cat,xorg
+./usr/X11R7/man/cat3/XPresentVersion.0			xcomp-libXpresent-catman	.cat,xorg
 ./usr/X11R7/man/cat3/Xrandr.0xcomp-libXrandr-catman	.cat,xorg
 ./usr/X11R7/man/cat3/XrmCombineDatabase.0		xcomp-libX11-catman	.cat,xorg
 ./usr/X11R7/man/cat3/XrmCombineFileDatabase.0		xcomp-libX11-catman	.cat,xorg
@@ -4043,6 +4051,14 @@
 ./usr/X11R7/man/html3/XpStartJob.html			xcomp-obsolete	obsolete
 ./usr/X11R7/man/html3/XpStartPage.html			xcomp-obsolete	obsolete
 ./usr/X11R7/man/html3/Xpresent.html			xcomp-libXpresent-htmlman	html,xorg
+./usr/X11R7/man/html3/XPresentFreeInput.html		xcomp-libXpresent-htmlman	html,xorg
+./usr/X11R7/man/html3/XPresentNotifyMSC.html		xcomp-libXpresent-htmlman	html,xorg
+./usr/X11R7/man/html3/XPresentPixmap.html		xcomp-libXpresent-htmlman	html,xorg
+./usr/X11R7/man/html3/XPresentQueryCapabilities.html	xcomp-libXpresent-htmlman	html,xorg
+./usr/X11R7/man/html3/XPresentQueryExtension.html	xcomp-libXpresent-htmlman	html,xorg
+./usr/X11R7/man/html3/XPresentQueryVersion.html		xcomp-libXpresent-htmlman	html,xorg
+./usr/X11R7/man/html3/XPresentSelectInput.html		xcomp-libXpresent-htmlman	html,xorg
+./usr/X11R7/man/html3/XPresentVersion.html		xcomp-libXpresent-htmlman	html,xorg
 ./usr/X11R7/man/html3/Xrandr.html			xcomp-libXrandr-htmlman	html,xorg
 ./usr/X11R7/man/html3/XrmCombineDatabase.html		xcomp-libX11-htmlman	html,xorg
 ./usr/X11R7/man/html3/XrmCombineFileDatabase.html	xcomp-libX11-htmlman	html,xorg
@@ -5508,6 +5524,14 @@
 ./usr/X11R7/man/man3/XpStartJob.3			xcomp-obsolete	obsolete
 ./usr/X11R7/man/man3/XpStartPage.3			xcomp-obsolete	obsolete
 ./usr/X11R7/man/man3/Xpresent.3xcomp-libXpresent-man	.man,xorg
+./usr/X11R7/man/man3/XPresentFreeInput.3		xcomp-libXpresent-man	.man,xorg
+./usr/X11R7/man/man3/XPresentNotifyMSC.3		xcomp-libXpresent-man	.man,xorg
+./usr/X11R7/man/man3/XPresentPixmap.3			xcomp-libXpresent-man	.man,xorg
+./usr/X11R7/man/man3/XPresentQueryCapabilities.3	xcomp-libXpresent-man	.man,xorg
+./usr/X11R7/man/man3/XPresentQueryExtension.3		xcomp-libXpresent-man	.man,xorg
+./usr/X11R7/man/man3/XPresentQueryVersion.3		xcomp-libXpresent-man	.man,xorg
+./usr/X11R7/man/man3/XPresentSelectInput.3		xcomp-libXpresent-man	.man,xorg
+./usr/X11R7/man/man3/XPresentVersion.3			xcomp-libXpresent-man	.man,xorg
 ./usr/X11R7/man/man3/Xrandr.3xcomp-libXrandr-man	.man,xorg
 ./usr/X11R7/man/man3/XrmCombineDatabase.3		xcomp-libX11-man	.man,xorg
 ./usr/X11R7/man/man3/XrmCombineFileDatabase.3		xcomp-libX11-man	.man,xorg



CVS commit: src/distrib/sets/lists/xcomp

2022-10-29 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Oct 29 21:06:48 UTC 2022

Modified Files:
src/distrib/sets/lists/xcomp: mi

Log Message:
add new libXpresent manuals.


To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/distrib/sets/lists/xcomp/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib

2022-10-29 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Oct 29 21:06:15 UTC 2022

Modified Files:
src/external/mit/xorg/lib/libXext: Makefile
src/external/mit/xorg/lib/libXmu: Makefile
src/external/mit/xorg/lib/libXpresent: Makefile
src/external/mit/xorg/lib/libxkbfile: Makefile

Log Message:
updates for new libXext, libXmu, libXpresent and libxkbfile.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXext/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXmu/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXpresent/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libxkbfile/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libXext/Makefile
diff -u src/external/mit/xorg/lib/libXext/Makefile:1.10 src/external/mit/xorg/lib/libXext/Makefile:1.11
--- src/external/mit/xorg/lib/libXext/Makefile:1.10	Mon Feb 21 02:13:47 2022
+++ src/external/mit/xorg/lib/libXext/Makefile	Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2022/02/21 02:13:47 uwe Exp $
+#	$NetBSD: Makefile,v 1.11 2022/10/29 21:06:15 mrg Exp $
 
 .include 
 
@@ -25,7 +25,7 @@ SRCS=	DPMS.c \
 	globals.c
 
 CPPFLAGS+=	${X11FLAGS.THREADLIB}
-CPPFLAGS+=	-DHAVE__XEATDATAWORDS
+CPPFLAGS+=	-DHAVE__XEATDATAWORDS -DHAVE_REALLOCARRAY
 
 LIBDPLIBS=	X11	${.CURDIR}/../libX11/dynamic
 

Index: src/external/mit/xorg/lib/libXmu/Makefile
diff -u src/external/mit/xorg/lib/libXmu/Makefile:1.3 src/external/mit/xorg/lib/libXmu/Makefile:1.4
--- src/external/mit/xorg/lib/libXmu/Makefile:1.3	Sun Nov 21 06:01:50 2010
+++ src/external/mit/xorg/lib/libXmu/Makefile	Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/11/21 06:01:50 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2022/10/29 21:06:15 mrg Exp $
 
 .include 
 
@@ -24,7 +24,8 @@ INCS=	Atoms.h CharSet.h CloseHook.h Conv
 INCSDIR=${X11INCDIR}/X11/Xmu
 
 CPPFLAGS+=	${X11FLAGS.THREADLIB}
-CPPFLAGS+=	-DHAS_SNPRINTF
+CPPFLAGS+=	-DHAS_SNPRINTF -DHAVE_REALLOCARRAY -DHAVE_UNAME
+CPPFLAGS+=	-D_CONST_X_STRING
 CPPFLAGS+=	-DXTSTRINGDEFINES	#XTODO is this correct?
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/Xmu
 

Index: src/external/mit/xorg/lib/libXpresent/Makefile
diff -u src/external/mit/xorg/lib/libXpresent/Makefile:1.1 src/external/mit/xorg/lib/libXpresent/Makefile:1.2
--- src/external/mit/xorg/lib/libXpresent/Makefile:1.1	Thu Jul 23 05:46:39 2015
+++ src/external/mit/xorg/lib/libXpresent/Makefile	Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2015/07/23 05:46:39 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2022/10/29 21:06:15 mrg Exp $
 
 .include 
 
@@ -23,7 +23,15 @@ INCSDIR=${X11INCDIR}/X11/extensions
 
 PKGDIST=	${LIB}
 
-MAN=	Xpresent.3
+MAN=	Xpresent.3 \
+	XPresentFreeInput.3 \
+	XPresentNotifyMSC.3 \
+	XPresentPixmap.3 \
+	XPresentQueryCapabilities.3 \
+	XPresentQueryExtension.3 \
+	XPresentQueryVersion.3 \
+	XPresentSelectInput.3 \
+	XPresentVersion.3
 
 .include 
 .include 

Index: src/external/mit/xorg/lib/libxkbfile/Makefile
diff -u src/external/mit/xorg/lib/libxkbfile/Makefile:1.5 src/external/mit/xorg/lib/libxkbfile/Makefile:1.6
--- src/external/mit/xorg/lib/libxkbfile/Makefile:1.5	Sun Oct 13 07:28:09 2019
+++ src/external/mit/xorg/lib/libxkbfile/Makefile	Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2019/10/13 07:28:09 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2022/10/29 21:06:15 mrg Exp $
 
 .include 
 
@@ -11,6 +11,7 @@ SRCS=	cout.c maprules.c srvmisc.c xkbato
 	xkmread.c
 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/extensions
+CPPFLAGS+=	-DHAVE_UNLOCKED_STDIO -DHAVE_STRNDUP -DHAVE_STRCASECMP
 
 INCS=	XKBbells.h XKBconfig.h XKBfile.h XKBrules.h XKM.h XKMformat.h
 INCSDIR=${X11INCDIR}/X11/extensions



CVS commit: src/external/mit/xorg/lib

2022-10-29 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Oct 29 21:06:15 UTC 2022

Modified Files:
src/external/mit/xorg/lib/libXext: Makefile
src/external/mit/xorg/lib/libXmu: Makefile
src/external/mit/xorg/lib/libXpresent: Makefile
src/external/mit/xorg/lib/libxkbfile: Makefile

Log Message:
updates for new libXext, libXmu, libXpresent and libxkbfile.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXext/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXmu/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXpresent/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libxkbfile/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:02:04 UTC 2022

Modified Files:
xsrc/external/mit/libXext/dist/src: XEVI.c XSync.c Xge.c extutil.c
xsrc/external/mit/libXmu/dist/src: CmapAlloc.c
xsrc/external/mit/libXrender/dist/src: Filter.c Xrender.c
xsrc/external/mit/libxkbfile/dist/src: cout.c
xsrc/external/mit/libxshmfence/dist/src: xshmfence_alloc.c
Removed Files:
xsrc/external/mit/libXpresent/dist: README
xsrc/external/mit/libXrender/dist: README
xsrc/external/mit/libxshmfence/dist: README

Log Message:
merge libXext 1.3.5, libbXmu 1.1.4, libXrender 1.0.1, libxkbfile 1.1.1 and
libxshmfence 1.3.1.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXext/dist/src/XEVI.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXext/dist/src/XSync.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXext/dist/src/Xge.c \
xsrc/external/mit/libXext/dist/src/extutil.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXmu/dist/src/CmapAlloc.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXpresent/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXrender/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXrender/dist/src/Filter.c \
xsrc/external/mit/libXrender/dist/src/Xrender.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libxkbfile/dist/src/cout.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libxshmfence/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libxshmfence/dist/src/xshmfence_alloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXext/dist/src/XEVI.c
diff -u xsrc/external/mit/libXext/dist/src/XEVI.c:1.2 xsrc/external/mit/libXext/dist/src/XEVI.c:1.3
--- xsrc/external/mit/libXext/dist/src/XEVI.c:1.2	Mon Sep  7 15:20:53 2020
+++ xsrc/external/mit/libXext/dist/src/XEVI.c	Sat Oct 29 21:02:03 2022
@@ -31,6 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include 
 #include 
 #include 
+#include "reallocarray.h"
 
 static XExtensionInfo *xevi_info;/* needs to move to globals.c */
 static const char *xevi_extension_name = EVINAME;
@@ -126,7 +127,7 @@ Status XeviGetVisualInfo(
 	return BadValue;
 }
 if (!n_visual || !visual) {		/* copy the all visual */
-	temp_visual = (VisualID32 *)Xmalloc(sz_VisualID32 * sz_info);
+	temp_visual = Xcalloc(sz_info, sz_VisualID32);
 	n_visual = 0;
 for (vinfoIndex = 0; vinfoIndex < sz_info; vinfoIndex++)
 	if (notInList(temp_visual, n_visual, vinfo[vinfoIndex].visualid))
@@ -148,7 +149,7 @@ Status XeviGetVisualInfo(
 	return BadValue;
 	}
 	}
-	temp_visual = (VisualID32 *)Xmalloc(sz_VisualID32 * n_visual);
+	temp_visual = Xmallocarray(n_visual, sz_VisualID32);
 for (visualIndex = 0; visualIndex < n_visual; visualIndex++)
 	temp_visual[visualIndex] = visual[visualIndex];
 }
@@ -172,7 +173,7 @@ Status XeviGetVisualInfo(
 	sz_xInfo = rep.n_info * sz_xExtendedVisualInfo;
 	sz_conflict = rep.n_conflicts * sizeof(VisualID);
 	sz_xConflict = rep.n_conflicts * sz_VisualID32;
-	*evi_return = Xmalloc(sz_info + sz_conflict);
+	*evi_return = Xcalloc(sz_info + sz_conflict, 1);
 	temp_xInfo = Xmalloc(sz_xInfo);
 	temp_conflict = Xmalloc(sz_xConflict);
 } else {

Index: xsrc/external/mit/libXext/dist/src/XSync.c
diff -u xsrc/external/mit/libXext/dist/src/XSync.c:1.4 xsrc/external/mit/libXext/dist/src/XSync.c:1.5
--- xsrc/external/mit/libXext/dist/src/XSync.c:1.4	Wed Jul 22 02:23:01 2015
+++ xsrc/external/mit/libXext/dist/src/XSync.c	Sat Oct 29 21:02:03 2022
@@ -358,7 +358,7 @@ XSyncListSystemCounters(Display *dpy, in
 	int i;
 
 	if (rep.nCounters < (INT_MAX / sizeof(XSyncSystemCounter)))
-	list = Xmalloc(rep.nCounters * sizeof(XSyncSystemCounter));
+	list = Xcalloc(rep.nCounters, sizeof(XSyncSystemCounter));
 	if (rep.length < (INT_MAX >> 2)) {
 	replylen = rep.length << 2;
 	pWireSysCounter = Xmalloc (replylen + sizeof(XSyncCounter));

Index: xsrc/external/mit/libXext/dist/src/Xge.c
diff -u xsrc/external/mit/libXext/dist/src/Xge.c:1.6 xsrc/external/mit/libXext/dist/src/Xge.c:1.7
--- xsrc/external/mit/libXext/dist/src/Xge.c:1.6	Wed Jul 22 02:23:01 2015
+++ xsrc/external/mit/libXext/dist/src/Xge.c	Sat Oct 29 21:02:03 2022
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2007-2008 Peter Hutterer
+ * Copyright © 2007-2008 Peter Hutterer
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -39,6 +39,8 @@
 #include 
 #include 
 
+#include "extutilP.h"
+
 /***/
 /*internal data structures */
 /***/
@@ -141,7 +143,7 @@ _xgeCheckExtInit(Display* dpy, XExtDispl
 
 if (!info->data)
 {
-

CVS commit: xsrc/external/mit

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:02:04 UTC 2022

Modified Files:
xsrc/external/mit/libXext/dist/src: XEVI.c XSync.c Xge.c extutil.c
xsrc/external/mit/libXmu/dist/src: CmapAlloc.c
xsrc/external/mit/libXrender/dist/src: Filter.c Xrender.c
xsrc/external/mit/libxkbfile/dist/src: cout.c
xsrc/external/mit/libxshmfence/dist/src: xshmfence_alloc.c
Removed Files:
xsrc/external/mit/libXpresent/dist: README
xsrc/external/mit/libXrender/dist: README
xsrc/external/mit/libxshmfence/dist: README

Log Message:
merge libXext 1.3.5, libbXmu 1.1.4, libXrender 1.0.1, libxkbfile 1.1.1 and
libxshmfence 1.3.1.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXext/dist/src/XEVI.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXext/dist/src/XSync.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXext/dist/src/Xge.c \
xsrc/external/mit/libXext/dist/src/extutil.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXmu/dist/src/CmapAlloc.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXpresent/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXrender/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXrender/dist/src/Filter.c \
xsrc/external/mit/libXrender/dist/src/Xrender.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libxkbfile/dist/src/cout.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libxshmfence/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libxshmfence/dist/src/xshmfence_alloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/libxkbfile/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:00:09 UTC 2022

Update of /cvsroot/xsrc/external/mit/libxkbfile/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv11490

Log Message:
initial import of libxkbfile-1.1.1

Status:

Vendor Tag: xorg
Release Tags:   libxkbfile-1-1-1

U xsrc/external/mit/libxkbfile/dist/Makefile.in
U xsrc/external/mit/libxkbfile/dist/configure.ac
U xsrc/external/mit/libxkbfile/dist/Makefile.am
U xsrc/external/mit/libxkbfile/dist/ltmain.sh
U xsrc/external/mit/libxkbfile/dist/INSTALL
U xsrc/external/mit/libxkbfile/dist/config.sub
U xsrc/external/mit/libxkbfile/dist/xkbfile.pc.in
U xsrc/external/mit/libxkbfile/dist/config.h.in
U xsrc/external/mit/libxkbfile/dist/depcomp
U xsrc/external/mit/libxkbfile/dist/missing
U xsrc/external/mit/libxkbfile/dist/COPYING
U xsrc/external/mit/libxkbfile/dist/config.guess
U xsrc/external/mit/libxkbfile/dist/install-sh
U xsrc/external/mit/libxkbfile/dist/ChangeLog
U xsrc/external/mit/libxkbfile/dist/aclocal.m4
U xsrc/external/mit/libxkbfile/dist/README.md
U xsrc/external/mit/libxkbfile/dist/compile
U xsrc/external/mit/libxkbfile/dist/configure
U xsrc/external/mit/libxkbfile/dist/src/Makefile.in
U xsrc/external/mit/libxkbfile/dist/src/xkbatom.c
U xsrc/external/mit/libxkbfile/dist/src/XKBfileInt.h
U xsrc/external/mit/libxkbfile/dist/src/srvmisc.c
U xsrc/external/mit/libxkbfile/dist/src/xkmout.c
U xsrc/external/mit/libxkbfile/dist/src/magic
U xsrc/external/mit/libxkbfile/dist/src/xkbconfig.c
U xsrc/external/mit/libxkbfile/dist/src/Makefile.am
U xsrc/external/mit/libxkbfile/dist/src/xkbmisc.c
U xsrc/external/mit/libxkbfile/dist/src/xkbdraw.c
U xsrc/external/mit/libxkbfile/dist/src/xkbtext.c
U xsrc/external/mit/libxkbfile/dist/src/xkbbells.c
C xsrc/external/mit/libxkbfile/dist/src/cout.c
U xsrc/external/mit/libxkbfile/dist/src/xkberrs.c
U xsrc/external/mit/libxkbfile/dist/src/xkbout.c
U xsrc/external/mit/libxkbfile/dist/src/xkmread.c
U xsrc/external/mit/libxkbfile/dist/src/maprules.c
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKBfile.h
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKMformat.h
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKM.h
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKBbells.h
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKBconfig.h
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKBrules.h

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libxkbfile/dist



CVS import: xsrc/external/mit/libxshmfence/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:00:11 UTC 2022

Update of /cvsroot/xsrc/external/mit/libxshmfence/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28308

Log Message:
initial import of libxshmfence-1.3.1

Status:

Vendor Tag: xorg
Release Tags:   libxshmfence-1-3-1

U xsrc/external/mit/libxshmfence/dist/depcomp
U xsrc/external/mit/libxshmfence/dist/missing
U xsrc/external/mit/libxshmfence/dist/ltmain.sh
U xsrc/external/mit/libxshmfence/dist/Makefile.in
U xsrc/external/mit/libxshmfence/dist/xshmfence.pc.in
U xsrc/external/mit/libxshmfence/dist/compile
U xsrc/external/mit/libxshmfence/dist/config.guess
U xsrc/external/mit/libxshmfence/dist/config.sub
U xsrc/external/mit/libxshmfence/dist/test-driver
U xsrc/external/mit/libxshmfence/dist/Makefile.am
U xsrc/external/mit/libxshmfence/dist/COPYING
U xsrc/external/mit/libxshmfence/dist/config.h.in
U xsrc/external/mit/libxshmfence/dist/ChangeLog
U xsrc/external/mit/libxshmfence/dist/configure.ac
U xsrc/external/mit/libxshmfence/dist/configure
N xsrc/external/mit/libxshmfence/dist/README.md
U xsrc/external/mit/libxshmfence/dist/install-sh
U xsrc/external/mit/libxshmfence/dist/aclocal.m4
U xsrc/external/mit/libxshmfence/dist/test/Makefile.in
U xsrc/external/mit/libxshmfence/dist/test/xshmfence_test.c
U xsrc/external/mit/libxshmfence/dist/test/Makefile.am
U xsrc/external/mit/libxshmfence/dist/src/xshmfence_futex.h
U xsrc/external/mit/libxshmfence/dist/src/xshmfence_pthread.h
U xsrc/external/mit/libxshmfence/dist/src/xshmfenceint.h
U xsrc/external/mit/libxshmfence/dist/src/Makefile.am
C xsrc/external/mit/libxshmfence/dist/src/xshmfence_alloc.c
U xsrc/external/mit/libxshmfence/dist/src/xshmfence.h
U xsrc/external/mit/libxshmfence/dist/src/xshmfence_futex.c
U xsrc/external/mit/libxshmfence/dist/src/Makefile.in
U xsrc/external/mit/libxshmfence/dist/src/xshmfence_pthread.c

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libxshmfence/dist



CVS import: xsrc/external/mit/libxkbfile/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:00:09 UTC 2022

Update of /cvsroot/xsrc/external/mit/libxkbfile/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv11490

Log Message:
initial import of libxkbfile-1.1.1

Status:

Vendor Tag: xorg
Release Tags:   libxkbfile-1-1-1

U xsrc/external/mit/libxkbfile/dist/Makefile.in
U xsrc/external/mit/libxkbfile/dist/configure.ac
U xsrc/external/mit/libxkbfile/dist/Makefile.am
U xsrc/external/mit/libxkbfile/dist/ltmain.sh
U xsrc/external/mit/libxkbfile/dist/INSTALL
U xsrc/external/mit/libxkbfile/dist/config.sub
U xsrc/external/mit/libxkbfile/dist/xkbfile.pc.in
U xsrc/external/mit/libxkbfile/dist/config.h.in
U xsrc/external/mit/libxkbfile/dist/depcomp
U xsrc/external/mit/libxkbfile/dist/missing
U xsrc/external/mit/libxkbfile/dist/COPYING
U xsrc/external/mit/libxkbfile/dist/config.guess
U xsrc/external/mit/libxkbfile/dist/install-sh
U xsrc/external/mit/libxkbfile/dist/ChangeLog
U xsrc/external/mit/libxkbfile/dist/aclocal.m4
U xsrc/external/mit/libxkbfile/dist/README.md
U xsrc/external/mit/libxkbfile/dist/compile
U xsrc/external/mit/libxkbfile/dist/configure
U xsrc/external/mit/libxkbfile/dist/src/Makefile.in
U xsrc/external/mit/libxkbfile/dist/src/xkbatom.c
U xsrc/external/mit/libxkbfile/dist/src/XKBfileInt.h
U xsrc/external/mit/libxkbfile/dist/src/srvmisc.c
U xsrc/external/mit/libxkbfile/dist/src/xkmout.c
U xsrc/external/mit/libxkbfile/dist/src/magic
U xsrc/external/mit/libxkbfile/dist/src/xkbconfig.c
U xsrc/external/mit/libxkbfile/dist/src/Makefile.am
U xsrc/external/mit/libxkbfile/dist/src/xkbmisc.c
U xsrc/external/mit/libxkbfile/dist/src/xkbdraw.c
U xsrc/external/mit/libxkbfile/dist/src/xkbtext.c
U xsrc/external/mit/libxkbfile/dist/src/xkbbells.c
C xsrc/external/mit/libxkbfile/dist/src/cout.c
U xsrc/external/mit/libxkbfile/dist/src/xkberrs.c
U xsrc/external/mit/libxkbfile/dist/src/xkbout.c
U xsrc/external/mit/libxkbfile/dist/src/xkmread.c
U xsrc/external/mit/libxkbfile/dist/src/maprules.c
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKBfile.h
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKMformat.h
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKM.h
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKBbells.h
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKBconfig.h
U xsrc/external/mit/libxkbfile/dist/include/X11/extensions/XKBrules.h

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libxkbfile/dist



CVS import: xsrc/external/mit/libxshmfence/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:00:11 UTC 2022

Update of /cvsroot/xsrc/external/mit/libxshmfence/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28308

Log Message:
initial import of libxshmfence-1.3.1

Status:

Vendor Tag: xorg
Release Tags:   libxshmfence-1-3-1

U xsrc/external/mit/libxshmfence/dist/depcomp
U xsrc/external/mit/libxshmfence/dist/missing
U xsrc/external/mit/libxshmfence/dist/ltmain.sh
U xsrc/external/mit/libxshmfence/dist/Makefile.in
U xsrc/external/mit/libxshmfence/dist/xshmfence.pc.in
U xsrc/external/mit/libxshmfence/dist/compile
U xsrc/external/mit/libxshmfence/dist/config.guess
U xsrc/external/mit/libxshmfence/dist/config.sub
U xsrc/external/mit/libxshmfence/dist/test-driver
U xsrc/external/mit/libxshmfence/dist/Makefile.am
U xsrc/external/mit/libxshmfence/dist/COPYING
U xsrc/external/mit/libxshmfence/dist/config.h.in
U xsrc/external/mit/libxshmfence/dist/ChangeLog
U xsrc/external/mit/libxshmfence/dist/configure.ac
U xsrc/external/mit/libxshmfence/dist/configure
N xsrc/external/mit/libxshmfence/dist/README.md
U xsrc/external/mit/libxshmfence/dist/install-sh
U xsrc/external/mit/libxshmfence/dist/aclocal.m4
U xsrc/external/mit/libxshmfence/dist/test/Makefile.in
U xsrc/external/mit/libxshmfence/dist/test/xshmfence_test.c
U xsrc/external/mit/libxshmfence/dist/test/Makefile.am
U xsrc/external/mit/libxshmfence/dist/src/xshmfence_futex.h
U xsrc/external/mit/libxshmfence/dist/src/xshmfence_pthread.h
U xsrc/external/mit/libxshmfence/dist/src/xshmfenceint.h
U xsrc/external/mit/libxshmfence/dist/src/Makefile.am
C xsrc/external/mit/libxshmfence/dist/src/xshmfence_alloc.c
U xsrc/external/mit/libxshmfence/dist/src/xshmfence.h
U xsrc/external/mit/libxshmfence/dist/src/xshmfence_futex.c
U xsrc/external/mit/libxshmfence/dist/src/Makefile.in
U xsrc/external/mit/libxshmfence/dist/src/xshmfence_pthread.c

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libxshmfence/dist



CVS import: xsrc/external/mit/libXrender/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:00:06 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXrender/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv27925

Log Message:
initial import of libXrender-0.9.11

Status:

Vendor Tag: xorg
Release Tags:   libXrender-0-9-11

U xsrc/external/mit/libXrender/dist/INSTALL
U xsrc/external/mit/libXrender/dist/ltmain.sh
N xsrc/external/mit/libXrender/dist/Doxyfile.in
U xsrc/external/mit/libXrender/dist/config.h.in
U xsrc/external/mit/libXrender/dist/config.guess
U xsrc/external/mit/libXrender/dist/config.sub
N xsrc/external/mit/libXrender/dist/README.md
U xsrc/external/mit/libXrender/dist/AUTHORS
U xsrc/external/mit/libXrender/dist/compile
U xsrc/external/mit/libXrender/dist/configure
U xsrc/external/mit/libXrender/dist/Makefile.am
U xsrc/external/mit/libXrender/dist/ChangeLog
U xsrc/external/mit/libXrender/dist/COPYING
U xsrc/external/mit/libXrender/dist/configure.ac
U xsrc/external/mit/libXrender/dist/depcomp
U xsrc/external/mit/libXrender/dist/missing
U xsrc/external/mit/libXrender/dist/aclocal.m4
U xsrc/external/mit/libXrender/dist/install-sh
U xsrc/external/mit/libXrender/dist/xrender.pc.in
U xsrc/external/mit/libXrender/dist/Makefile.in
U xsrc/external/mit/libXrender/dist/src/Color.c
U xsrc/external/mit/libXrender/dist/src/Glyph.c
U xsrc/external/mit/libXrender/dist/src/Picture.c
U xsrc/external/mit/libXrender/dist/src/Poly.c
C xsrc/external/mit/libXrender/dist/src/Xrender.c
U xsrc/external/mit/libXrender/dist/src/Xrenderint.h
U xsrc/external/mit/libXrender/dist/src/FillRects.c
U xsrc/external/mit/libXrender/dist/src/AddTrap.c
U xsrc/external/mit/libXrender/dist/src/Composite.c
U xsrc/external/mit/libXrender/dist/src/Cursor.c
U xsrc/external/mit/libXrender/dist/src/Tri.c
U xsrc/external/mit/libXrender/dist/src/Trap.c
U xsrc/external/mit/libXrender/dist/src/Makefile.in
U xsrc/external/mit/libXrender/dist/src/FillRect.c
C xsrc/external/mit/libXrender/dist/src/Filter.c
U xsrc/external/mit/libXrender/dist/src/Makefile.am
U xsrc/external/mit/libXrender/dist/doc/libXrender.txt
U xsrc/external/mit/libXrender/dist/include/X11/extensions/Xrender.h

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXrender/dist



CVS import: xsrc/external/mit/libXrender/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:00:06 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXrender/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv27925

Log Message:
initial import of libXrender-0.9.11

Status:

Vendor Tag: xorg
Release Tags:   libXrender-0-9-11

U xsrc/external/mit/libXrender/dist/INSTALL
U xsrc/external/mit/libXrender/dist/ltmain.sh
N xsrc/external/mit/libXrender/dist/Doxyfile.in
U xsrc/external/mit/libXrender/dist/config.h.in
U xsrc/external/mit/libXrender/dist/config.guess
U xsrc/external/mit/libXrender/dist/config.sub
N xsrc/external/mit/libXrender/dist/README.md
U xsrc/external/mit/libXrender/dist/AUTHORS
U xsrc/external/mit/libXrender/dist/compile
U xsrc/external/mit/libXrender/dist/configure
U xsrc/external/mit/libXrender/dist/Makefile.am
U xsrc/external/mit/libXrender/dist/ChangeLog
U xsrc/external/mit/libXrender/dist/COPYING
U xsrc/external/mit/libXrender/dist/configure.ac
U xsrc/external/mit/libXrender/dist/depcomp
U xsrc/external/mit/libXrender/dist/missing
U xsrc/external/mit/libXrender/dist/aclocal.m4
U xsrc/external/mit/libXrender/dist/install-sh
U xsrc/external/mit/libXrender/dist/xrender.pc.in
U xsrc/external/mit/libXrender/dist/Makefile.in
U xsrc/external/mit/libXrender/dist/src/Color.c
U xsrc/external/mit/libXrender/dist/src/Glyph.c
U xsrc/external/mit/libXrender/dist/src/Picture.c
U xsrc/external/mit/libXrender/dist/src/Poly.c
C xsrc/external/mit/libXrender/dist/src/Xrender.c
U xsrc/external/mit/libXrender/dist/src/Xrenderint.h
U xsrc/external/mit/libXrender/dist/src/FillRects.c
U xsrc/external/mit/libXrender/dist/src/AddTrap.c
U xsrc/external/mit/libXrender/dist/src/Composite.c
U xsrc/external/mit/libXrender/dist/src/Cursor.c
U xsrc/external/mit/libXrender/dist/src/Tri.c
U xsrc/external/mit/libXrender/dist/src/Trap.c
U xsrc/external/mit/libXrender/dist/src/Makefile.in
U xsrc/external/mit/libXrender/dist/src/FillRect.c
C xsrc/external/mit/libXrender/dist/src/Filter.c
U xsrc/external/mit/libXrender/dist/src/Makefile.am
U xsrc/external/mit/libXrender/dist/doc/libXrender.txt
U xsrc/external/mit/libXrender/dist/include/X11/extensions/Xrender.h

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXrender/dist



CVS import: xsrc/external/mit/libXpresent/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:00:03 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXpresent/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv6941

Log Message:
initial import of libXpresent-1.0.1

Status:

Vendor Tag: xorg
Release Tags:   libXpresent-1-0-1

U xsrc/external/mit/libXpresent/dist/Makefile.in
U xsrc/external/mit/libXpresent/dist/install-sh
U xsrc/external/mit/libXpresent/dist/aclocal.m4
U xsrc/external/mit/libXpresent/dist/config.guess
U xsrc/external/mit/libXpresent/dist/Makefile.am
U xsrc/external/mit/libXpresent/dist/INSTALL
U xsrc/external/mit/libXpresent/dist/ltmain.sh
U xsrc/external/mit/libXpresent/dist/missing
U xsrc/external/mit/libXpresent/dist/depcomp
U xsrc/external/mit/libXpresent/dist/config.sub
U xsrc/external/mit/libXpresent/dist/configure.ac
U xsrc/external/mit/libXpresent/dist/xpresent.pc.in
U xsrc/external/mit/libXpresent/dist/config.h.in
N xsrc/external/mit/libXpresent/dist/README.md
U xsrc/external/mit/libXpresent/dist/compile
U xsrc/external/mit/libXpresent/dist/AUTHORS
U xsrc/external/mit/libXpresent/dist/configure
U xsrc/external/mit/libXpresent/dist/ChangeLog
U xsrc/external/mit/libXpresent/dist/COPYING
N xsrc/external/mit/libXpresent/dist/man/XPresentPixmap.man
N xsrc/external/mit/libXpresent/dist/man/XPresentQueryVersion.man
N xsrc/external/mit/libXpresent/dist/man/XPresentVersion.man
N xsrc/external/mit/libXpresent/dist/man/XPresentFreeInput.man
U xsrc/external/mit/libXpresent/dist/man/Makefile.am
N xsrc/external/mit/libXpresent/dist/man/XPresentQueryExtension.man
N xsrc/external/mit/libXpresent/dist/man/XPresentNotifyMSC.man
N xsrc/external/mit/libXpresent/dist/man/XPresentSelectInput.man
U xsrc/external/mit/libXpresent/dist/man/Xpresent.man
N xsrc/external/mit/libXpresent/dist/man/XPresentQueryCapabilities.man
U xsrc/external/mit/libXpresent/dist/man/Makefile.in
N xsrc/external/mit/libXpresent/dist/m4/libtool.m4
N xsrc/external/mit/libXpresent/dist/m4/lt~obsolete.m4
N xsrc/external/mit/libXpresent/dist/m4/ltversion.m4
N xsrc/external/mit/libXpresent/dist/m4/ltsugar.m4
N xsrc/external/mit/libXpresent/dist/m4/ltoptions.m4
U xsrc/external/mit/libXpresent/dist/include/X11/extensions/Xpresent.h
U xsrc/external/mit/libXpresent/dist/src/Makefile.am
U xsrc/external/mit/libXpresent/dist/src/Makefile.in
U xsrc/external/mit/libXpresent/dist/src/Xpresent.c

No conflicts created by this import



CVS import: xsrc/external/mit/libXpresent/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:00:03 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXpresent/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv6941

Log Message:
initial import of libXpresent-1.0.1

Status:

Vendor Tag: xorg
Release Tags:   libXpresent-1-0-1

U xsrc/external/mit/libXpresent/dist/Makefile.in
U xsrc/external/mit/libXpresent/dist/install-sh
U xsrc/external/mit/libXpresent/dist/aclocal.m4
U xsrc/external/mit/libXpresent/dist/config.guess
U xsrc/external/mit/libXpresent/dist/Makefile.am
U xsrc/external/mit/libXpresent/dist/INSTALL
U xsrc/external/mit/libXpresent/dist/ltmain.sh
U xsrc/external/mit/libXpresent/dist/missing
U xsrc/external/mit/libXpresent/dist/depcomp
U xsrc/external/mit/libXpresent/dist/config.sub
U xsrc/external/mit/libXpresent/dist/configure.ac
U xsrc/external/mit/libXpresent/dist/xpresent.pc.in
U xsrc/external/mit/libXpresent/dist/config.h.in
N xsrc/external/mit/libXpresent/dist/README.md
U xsrc/external/mit/libXpresent/dist/compile
U xsrc/external/mit/libXpresent/dist/AUTHORS
U xsrc/external/mit/libXpresent/dist/configure
U xsrc/external/mit/libXpresent/dist/ChangeLog
U xsrc/external/mit/libXpresent/dist/COPYING
N xsrc/external/mit/libXpresent/dist/man/XPresentPixmap.man
N xsrc/external/mit/libXpresent/dist/man/XPresentQueryVersion.man
N xsrc/external/mit/libXpresent/dist/man/XPresentVersion.man
N xsrc/external/mit/libXpresent/dist/man/XPresentFreeInput.man
U xsrc/external/mit/libXpresent/dist/man/Makefile.am
N xsrc/external/mit/libXpresent/dist/man/XPresentQueryExtension.man
N xsrc/external/mit/libXpresent/dist/man/XPresentNotifyMSC.man
N xsrc/external/mit/libXpresent/dist/man/XPresentSelectInput.man
U xsrc/external/mit/libXpresent/dist/man/Xpresent.man
N xsrc/external/mit/libXpresent/dist/man/XPresentQueryCapabilities.man
U xsrc/external/mit/libXpresent/dist/man/Makefile.in
N xsrc/external/mit/libXpresent/dist/m4/libtool.m4
N xsrc/external/mit/libXpresent/dist/m4/lt~obsolete.m4
N xsrc/external/mit/libXpresent/dist/m4/ltversion.m4
N xsrc/external/mit/libXpresent/dist/m4/ltsugar.m4
N xsrc/external/mit/libXpresent/dist/m4/ltoptions.m4
U xsrc/external/mit/libXpresent/dist/include/X11/extensions/Xpresent.h
U xsrc/external/mit/libXpresent/dist/src/Makefile.am
U xsrc/external/mit/libXpresent/dist/src/Makefile.in
U xsrc/external/mit/libXpresent/dist/src/Xpresent.c

No conflicts created by this import



CVS import: xsrc/external/mit/libXmu/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:00:00 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXmu/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5280

Log Message:
initial import of libXmu-1.1.4

Status:

Vendor Tag: xorg
Release Tags:   libXmu-1-1-4

U xsrc/external/mit/libXmu/dist/config.h.in
U xsrc/external/mit/libXmu/dist/install-sh
U xsrc/external/mit/libXmu/dist/aclocal.m4
U xsrc/external/mit/libXmu/dist/config.guess
U xsrc/external/mit/libXmu/dist/xmu.pc.in
U xsrc/external/mit/libXmu/dist/INSTALL
U xsrc/external/mit/libXmu/dist/xmuu.pc.in
U xsrc/external/mit/libXmu/dist/ChangeLog
U xsrc/external/mit/libXmu/dist/configure
U xsrc/external/mit/libXmu/dist/docbook.am
U xsrc/external/mit/libXmu/dist/README.md
U xsrc/external/mit/libXmu/dist/depcomp
U xsrc/external/mit/libXmu/dist/missing
U xsrc/external/mit/libXmu/dist/config.sub
U xsrc/external/mit/libXmu/dist/Makefile.in
U xsrc/external/mit/libXmu/dist/ltmain.sh
N xsrc/external/mit/libXmu/dist/test-driver
U xsrc/external/mit/libXmu/dist/compile
U xsrc/external/mit/libXmu/dist/configure.ac
U xsrc/external/mit/libXmu/dist/COPYING
U xsrc/external/mit/libXmu/dist/Makefile.am
U xsrc/external/mit/libXmu/dist/src/VisCmap.c
U xsrc/external/mit/libXmu/dist/src/WidgetNode.c
N xsrc/external/mit/libXmu/dist/src/reallocarray.c
U xsrc/external/mit/libXmu/dist/src/EditresCom.c
C xsrc/external/mit/libXmu/dist/src/CmapAlloc.c
U xsrc/external/mit/libXmu/dist/src/DefErrMsg.c
U xsrc/external/mit/libXmu/dist/src/ScrOfWin.c
U xsrc/external/mit/libXmu/dist/src/CursorName.c
U xsrc/external/mit/libXmu/dist/src/StrToJust.c
U xsrc/external/mit/libXmu/dist/src/UpdMapHint.c
U xsrc/external/mit/libXmu/dist/src/DrawLogo.c
U xsrc/external/mit/libXmu/dist/src/Initer.c
U xsrc/external/mit/libXmu/dist/src/LocBitmap.c
U xsrc/external/mit/libXmu/dist/src/Lower.c
U xsrc/external/mit/libXmu/dist/src/DrRndRect.c
U xsrc/external/mit/libXmu/dist/src/CloseHook.c
U xsrc/external/mit/libXmu/dist/src/RdBitF.c
U xsrc/external/mit/libXmu/dist/src/StrToGrav.c
U xsrc/external/mit/libXmu/dist/src/StrToBmap.c
U xsrc/external/mit/libXmu/dist/src/CvtCache.c
U xsrc/external/mit/libXmu/dist/src/CvtStdSel.c
U xsrc/external/mit/libXmu/dist/src/Distinct.c
U xsrc/external/mit/libXmu/dist/src/StrToBS.c
N xsrc/external/mit/libXmu/dist/src/Xmuint.h
U xsrc/external/mit/libXmu/dist/src/CrCmap.c
U xsrc/external/mit/libXmu/dist/src/StrToOrnt.c
U xsrc/external/mit/libXmu/dist/src/Atoms.c
U xsrc/external/mit/libXmu/dist/src/DisplayQue.c
U xsrc/external/mit/libXmu/dist/src/LookupCmap.c
U xsrc/external/mit/libXmu/dist/src/ExtAgent.c
U xsrc/external/mit/libXmu/dist/src/StrToWidg.c
U xsrc/external/mit/libXmu/dist/src/StdCmap.c
U xsrc/external/mit/libXmu/dist/src/Makefile.am
U xsrc/external/mit/libXmu/dist/src/GrayPixmap.c
U xsrc/external/mit/libXmu/dist/src/AllCmap.c
U xsrc/external/mit/libXmu/dist/src/ClientWin.c
U xsrc/external/mit/libXmu/dist/src/Clip.c
U xsrc/external/mit/libXmu/dist/src/StrToCurs.c
U xsrc/external/mit/libXmu/dist/src/FToCback.c
U xsrc/external/mit/libXmu/dist/src/CrPixFBit.c
U xsrc/external/mit/libXmu/dist/src/Xct.c
U xsrc/external/mit/libXmu/dist/src/StrToShap.c
U xsrc/external/mit/libXmu/dist/src/DelCmap.c
U xsrc/external/mit/libXmu/dist/src/ShapeWidg.c
U xsrc/external/mit/libXmu/dist/src/Lookup.c
U xsrc/external/mit/libXmu/dist/src/Makefile.in
U xsrc/external/mit/libXmu/dist/src/GetHost.c
U xsrc/external/mit/libXmu/dist/src/StrToLong.c
N xsrc/external/mit/libXmu/dist/test/Makefile.in
N xsrc/external/mit/libXmu/dist/test/EditResStream.c
N xsrc/external/mit/libXmu/dist/test/Makefile.am
U xsrc/external/mit/libXmu/dist/doc/Xmu.xml
U xsrc/external/mit/libXmu/dist/doc/Makefile.am
U xsrc/external/mit/libXmu/dist/doc/xlogo.svg
U xsrc/external/mit/libXmu/dist/doc/Makefile.in
U xsrc/external/mit/libXmu/dist/include/Makefile.in
U xsrc/external/mit/libXmu/dist/include/Makefile.am
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Converters.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Atoms.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Error.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/DisplayQue.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Xct.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/ExtAgent.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/WhitePoint.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/EditresP.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Initer.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/CurUtil.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/StdCmap.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/WinUtil.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Misc.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/CvtCache.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/SysUtil.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Editres.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/StdSel.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/CharSet.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Xmu.h

CVS import: xsrc/external/mit/libXmu/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:00:00 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXmu/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5280

Log Message:
initial import of libXmu-1.1.4

Status:

Vendor Tag: xorg
Release Tags:   libXmu-1-1-4

U xsrc/external/mit/libXmu/dist/config.h.in
U xsrc/external/mit/libXmu/dist/install-sh
U xsrc/external/mit/libXmu/dist/aclocal.m4
U xsrc/external/mit/libXmu/dist/config.guess
U xsrc/external/mit/libXmu/dist/xmu.pc.in
U xsrc/external/mit/libXmu/dist/INSTALL
U xsrc/external/mit/libXmu/dist/xmuu.pc.in
U xsrc/external/mit/libXmu/dist/ChangeLog
U xsrc/external/mit/libXmu/dist/configure
U xsrc/external/mit/libXmu/dist/docbook.am
U xsrc/external/mit/libXmu/dist/README.md
U xsrc/external/mit/libXmu/dist/depcomp
U xsrc/external/mit/libXmu/dist/missing
U xsrc/external/mit/libXmu/dist/config.sub
U xsrc/external/mit/libXmu/dist/Makefile.in
U xsrc/external/mit/libXmu/dist/ltmain.sh
N xsrc/external/mit/libXmu/dist/test-driver
U xsrc/external/mit/libXmu/dist/compile
U xsrc/external/mit/libXmu/dist/configure.ac
U xsrc/external/mit/libXmu/dist/COPYING
U xsrc/external/mit/libXmu/dist/Makefile.am
U xsrc/external/mit/libXmu/dist/src/VisCmap.c
U xsrc/external/mit/libXmu/dist/src/WidgetNode.c
N xsrc/external/mit/libXmu/dist/src/reallocarray.c
U xsrc/external/mit/libXmu/dist/src/EditresCom.c
C xsrc/external/mit/libXmu/dist/src/CmapAlloc.c
U xsrc/external/mit/libXmu/dist/src/DefErrMsg.c
U xsrc/external/mit/libXmu/dist/src/ScrOfWin.c
U xsrc/external/mit/libXmu/dist/src/CursorName.c
U xsrc/external/mit/libXmu/dist/src/StrToJust.c
U xsrc/external/mit/libXmu/dist/src/UpdMapHint.c
U xsrc/external/mit/libXmu/dist/src/DrawLogo.c
U xsrc/external/mit/libXmu/dist/src/Initer.c
U xsrc/external/mit/libXmu/dist/src/LocBitmap.c
U xsrc/external/mit/libXmu/dist/src/Lower.c
U xsrc/external/mit/libXmu/dist/src/DrRndRect.c
U xsrc/external/mit/libXmu/dist/src/CloseHook.c
U xsrc/external/mit/libXmu/dist/src/RdBitF.c
U xsrc/external/mit/libXmu/dist/src/StrToGrav.c
U xsrc/external/mit/libXmu/dist/src/StrToBmap.c
U xsrc/external/mit/libXmu/dist/src/CvtCache.c
U xsrc/external/mit/libXmu/dist/src/CvtStdSel.c
U xsrc/external/mit/libXmu/dist/src/Distinct.c
U xsrc/external/mit/libXmu/dist/src/StrToBS.c
N xsrc/external/mit/libXmu/dist/src/Xmuint.h
U xsrc/external/mit/libXmu/dist/src/CrCmap.c
U xsrc/external/mit/libXmu/dist/src/StrToOrnt.c
U xsrc/external/mit/libXmu/dist/src/Atoms.c
U xsrc/external/mit/libXmu/dist/src/DisplayQue.c
U xsrc/external/mit/libXmu/dist/src/LookupCmap.c
U xsrc/external/mit/libXmu/dist/src/ExtAgent.c
U xsrc/external/mit/libXmu/dist/src/StrToWidg.c
U xsrc/external/mit/libXmu/dist/src/StdCmap.c
U xsrc/external/mit/libXmu/dist/src/Makefile.am
U xsrc/external/mit/libXmu/dist/src/GrayPixmap.c
U xsrc/external/mit/libXmu/dist/src/AllCmap.c
U xsrc/external/mit/libXmu/dist/src/ClientWin.c
U xsrc/external/mit/libXmu/dist/src/Clip.c
U xsrc/external/mit/libXmu/dist/src/StrToCurs.c
U xsrc/external/mit/libXmu/dist/src/FToCback.c
U xsrc/external/mit/libXmu/dist/src/CrPixFBit.c
U xsrc/external/mit/libXmu/dist/src/Xct.c
U xsrc/external/mit/libXmu/dist/src/StrToShap.c
U xsrc/external/mit/libXmu/dist/src/DelCmap.c
U xsrc/external/mit/libXmu/dist/src/ShapeWidg.c
U xsrc/external/mit/libXmu/dist/src/Lookup.c
U xsrc/external/mit/libXmu/dist/src/Makefile.in
U xsrc/external/mit/libXmu/dist/src/GetHost.c
U xsrc/external/mit/libXmu/dist/src/StrToLong.c
N xsrc/external/mit/libXmu/dist/test/Makefile.in
N xsrc/external/mit/libXmu/dist/test/EditResStream.c
N xsrc/external/mit/libXmu/dist/test/Makefile.am
U xsrc/external/mit/libXmu/dist/doc/Xmu.xml
U xsrc/external/mit/libXmu/dist/doc/Makefile.am
U xsrc/external/mit/libXmu/dist/doc/xlogo.svg
U xsrc/external/mit/libXmu/dist/doc/Makefile.in
U xsrc/external/mit/libXmu/dist/include/Makefile.in
U xsrc/external/mit/libXmu/dist/include/Makefile.am
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Converters.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Atoms.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Error.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/DisplayQue.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Xct.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/ExtAgent.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/WhitePoint.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/EditresP.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Initer.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/CurUtil.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/StdCmap.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/WinUtil.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Misc.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/CvtCache.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/SysUtil.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Editres.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/StdSel.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/CharSet.h
U xsrc/external/mit/libXmu/dist/include/X11/Xmu/Xmu.h

CVS import: xsrc/external/mit/libXext/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 20:59:57 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXext/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv602

Log Message:
initial import of libXext-1.3.5

Status:

Vendor Tag: xorg
Release Tags:   libXext-1-3-5

U xsrc/external/mit/libXext/dist/configure
U xsrc/external/mit/libXext/dist/config.guess
U xsrc/external/mit/libXext/dist/README.md
U xsrc/external/mit/libXext/dist/ChangeLog
U xsrc/external/mit/libXext/dist/config.sub
U xsrc/external/mit/libXext/dist/config.h.in
U xsrc/external/mit/libXext/dist/INSTALL
U xsrc/external/mit/libXext/dist/Makefile.am
U xsrc/external/mit/libXext/dist/install-sh
U xsrc/external/mit/libXext/dist/aclocal.m4
U xsrc/external/mit/libXext/dist/ltmain.sh
U xsrc/external/mit/libXext/dist/missing
U xsrc/external/mit/libXext/dist/depcomp
U xsrc/external/mit/libXext/dist/COPYING
U xsrc/external/mit/libXext/dist/Makefile.in
U xsrc/external/mit/libXext/dist/compile
U xsrc/external/mit/libXext/dist/configure.ac
U xsrc/external/mit/libXext/dist/xext.pc.in
U xsrc/external/mit/libXext/dist/AUTHORS
U xsrc/external/mit/libXext/dist/docbook.am
U xsrc/external/mit/libXext/dist/specs/Makefile.am
U xsrc/external/mit/libXext/dist/specs/dpmslib.xml
U xsrc/external/mit/libXext/dist/specs/dbelib.xml
U xsrc/external/mit/libXext/dist/specs/Makefile.in
U xsrc/external/mit/libXext/dist/specs/xtest1.xml
U xsrc/external/mit/libXext/dist/specs/shapelib.xml
U xsrc/external/mit/libXext/dist/specs/synclib.xml
N xsrc/external/mit/libXext/dist/src/reallocarray.c
U xsrc/external/mit/libXext/dist/src/XTestExt1.c
U xsrc/external/mit/libXext/dist/src/DPMS.c
U xsrc/external/mit/libXext/dist/src/XSecurity.c
U xsrc/external/mit/libXext/dist/src/XAppgroup.c
C xsrc/external/mit/libXext/dist/src/extutil.c
U xsrc/external/mit/libXext/dist/src/Makefile.in
U xsrc/external/mit/libXext/dist/src/XShape.c
C xsrc/external/mit/libXext/dist/src/XSync.c
C xsrc/external/mit/libXext/dist/src/XEVI.c
U xsrc/external/mit/libXext/dist/src/XLbx.c
U xsrc/external/mit/libXext/dist/src/Makefile.am
U xsrc/external/mit/libXext/dist/src/XShm.c
U xsrc/external/mit/libXext/dist/src/XMultibuf.c
N xsrc/external/mit/libXext/dist/src/extutilP.h
U xsrc/external/mit/libXext/dist/src/Xdbe.c
U xsrc/external/mit/libXext/dist/src/Xcup.c
N xsrc/external/mit/libXext/dist/src/reallocarray.h
C xsrc/external/mit/libXext/dist/src/Xge.c
U xsrc/external/mit/libXext/dist/src/MITMisc.c
U xsrc/external/mit/libXext/dist/src/globals.c
U xsrc/external/mit/libXext/dist/m4/ltversion.m4
U xsrc/external/mit/libXext/dist/m4/ax_gcc_builtin.m4
U xsrc/external/mit/libXext/dist/m4/libtool.m4
U xsrc/external/mit/libXext/dist/m4/ltoptions.m4
U xsrc/external/mit/libXext/dist/m4/ltsugar.m4
U xsrc/external/mit/libXext/dist/m4/lt~obsolete.m4
U xsrc/external/mit/libXext/dist/man/Makefile.am
U xsrc/external/mit/libXext/dist/man/XdbeDeallocateBackBufferName.man
U xsrc/external/mit/libXext/dist/man/XeviGetVisualInfo.man
U xsrc/external/mit/libXext/dist/man/DPMSCapable.man
U xsrc/external/mit/libXext/dist/man/XdbeBeginIdiom.man
U xsrc/external/mit/libXext/dist/man/XdbeSwapBuffers.man
U xsrc/external/mit/libXext/dist/man/DPMSInfo.man
U xsrc/external/mit/libXext/dist/man/XdbeEndIdiom.man
U xsrc/external/mit/libXext/dist/man/XShmGetImage.man
U xsrc/external/mit/libXext/dist/man/XShapeCombineMask.man
U xsrc/external/mit/libXext/dist/man/XShapeCombineShape.man
U xsrc/external/mit/libXext/dist/man/XShm.man
U xsrc/external/mit/libXext/dist/man/XShape.man
U xsrc/external/mit/libXext/dist/man/XShapeSelectInput.man
U xsrc/external/mit/libXext/dist/man/DPMSForceLevel.man
U xsrc/external/mit/libXext/dist/man/XcupStoreColors.man
U xsrc/external/mit/libXext/dist/man/XeviQueryVersion.man
U xsrc/external/mit/libXext/dist/man/XShapeInputSelected.man
U xsrc/external/mit/libXext/dist/man/XShapeOffsetShape.man
U xsrc/external/mit/libXext/dist/man/XShmPutImage.man
U xsrc/external/mit/libXext/dist/man/Makefile.in
U xsrc/external/mit/libXext/dist/man/XcupGetReservedColormapEntries.man
U xsrc/external/mit/libXext/dist/man/XShmAttach.man
U xsrc/external/mit/libXext/dist/man/Xmbuf.man
U xsrc/external/mit/libXext/dist/man/XdbeFreeVisualInfo.man
U xsrc/external/mit/libXext/dist/man/XmbufGetBufferAttributes.man
U xsrc/external/mit/libXext/dist/man/XShmCreatePixmap.man
U xsrc/external/mit/libXext/dist/man/XmbufDestroyBuffers.man
U xsrc/external/mit/libXext/dist/man/XShapeQueryExtension.man
U xsrc/external/mit/libXext/dist/man/XShmGetEventBase.man
U xsrc/external/mit/libXext/dist/man/XmbufChangeBufferAttributes.man
U xsrc/external/mit/libXext/dist/man/XdbeQueryExtension.man
U xsrc/external/mit/libXext/dist/man/XdbeGetBackBufferAttributes.man
U xsrc/external/mit/libXext/dist/man/DPMSEnable.man
U xsrc/external/mit/libXext/dist/man/XShmPixmapFormat.man
U xsrc/external/mit/libXext/dist/man/XmbufGetVersion.man
U xsrc/external/mit/libXext/dist/man/XShapeGetRectangles.man
U 

CVS import: xsrc/external/mit/libXext/dist

2022-10-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 20:59:57 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXext/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv602

Log Message:
initial import of libXext-1.3.5

Status:

Vendor Tag: xorg
Release Tags:   libXext-1-3-5

U xsrc/external/mit/libXext/dist/configure
U xsrc/external/mit/libXext/dist/config.guess
U xsrc/external/mit/libXext/dist/README.md
U xsrc/external/mit/libXext/dist/ChangeLog
U xsrc/external/mit/libXext/dist/config.sub
U xsrc/external/mit/libXext/dist/config.h.in
U xsrc/external/mit/libXext/dist/INSTALL
U xsrc/external/mit/libXext/dist/Makefile.am
U xsrc/external/mit/libXext/dist/install-sh
U xsrc/external/mit/libXext/dist/aclocal.m4
U xsrc/external/mit/libXext/dist/ltmain.sh
U xsrc/external/mit/libXext/dist/missing
U xsrc/external/mit/libXext/dist/depcomp
U xsrc/external/mit/libXext/dist/COPYING
U xsrc/external/mit/libXext/dist/Makefile.in
U xsrc/external/mit/libXext/dist/compile
U xsrc/external/mit/libXext/dist/configure.ac
U xsrc/external/mit/libXext/dist/xext.pc.in
U xsrc/external/mit/libXext/dist/AUTHORS
U xsrc/external/mit/libXext/dist/docbook.am
U xsrc/external/mit/libXext/dist/specs/Makefile.am
U xsrc/external/mit/libXext/dist/specs/dpmslib.xml
U xsrc/external/mit/libXext/dist/specs/dbelib.xml
U xsrc/external/mit/libXext/dist/specs/Makefile.in
U xsrc/external/mit/libXext/dist/specs/xtest1.xml
U xsrc/external/mit/libXext/dist/specs/shapelib.xml
U xsrc/external/mit/libXext/dist/specs/synclib.xml
N xsrc/external/mit/libXext/dist/src/reallocarray.c
U xsrc/external/mit/libXext/dist/src/XTestExt1.c
U xsrc/external/mit/libXext/dist/src/DPMS.c
U xsrc/external/mit/libXext/dist/src/XSecurity.c
U xsrc/external/mit/libXext/dist/src/XAppgroup.c
C xsrc/external/mit/libXext/dist/src/extutil.c
U xsrc/external/mit/libXext/dist/src/Makefile.in
U xsrc/external/mit/libXext/dist/src/XShape.c
C xsrc/external/mit/libXext/dist/src/XSync.c
C xsrc/external/mit/libXext/dist/src/XEVI.c
U xsrc/external/mit/libXext/dist/src/XLbx.c
U xsrc/external/mit/libXext/dist/src/Makefile.am
U xsrc/external/mit/libXext/dist/src/XShm.c
U xsrc/external/mit/libXext/dist/src/XMultibuf.c
N xsrc/external/mit/libXext/dist/src/extutilP.h
U xsrc/external/mit/libXext/dist/src/Xdbe.c
U xsrc/external/mit/libXext/dist/src/Xcup.c
N xsrc/external/mit/libXext/dist/src/reallocarray.h
C xsrc/external/mit/libXext/dist/src/Xge.c
U xsrc/external/mit/libXext/dist/src/MITMisc.c
U xsrc/external/mit/libXext/dist/src/globals.c
U xsrc/external/mit/libXext/dist/m4/ltversion.m4
U xsrc/external/mit/libXext/dist/m4/ax_gcc_builtin.m4
U xsrc/external/mit/libXext/dist/m4/libtool.m4
U xsrc/external/mit/libXext/dist/m4/ltoptions.m4
U xsrc/external/mit/libXext/dist/m4/ltsugar.m4
U xsrc/external/mit/libXext/dist/m4/lt~obsolete.m4
U xsrc/external/mit/libXext/dist/man/Makefile.am
U xsrc/external/mit/libXext/dist/man/XdbeDeallocateBackBufferName.man
U xsrc/external/mit/libXext/dist/man/XeviGetVisualInfo.man
U xsrc/external/mit/libXext/dist/man/DPMSCapable.man
U xsrc/external/mit/libXext/dist/man/XdbeBeginIdiom.man
U xsrc/external/mit/libXext/dist/man/XdbeSwapBuffers.man
U xsrc/external/mit/libXext/dist/man/DPMSInfo.man
U xsrc/external/mit/libXext/dist/man/XdbeEndIdiom.man
U xsrc/external/mit/libXext/dist/man/XShmGetImage.man
U xsrc/external/mit/libXext/dist/man/XShapeCombineMask.man
U xsrc/external/mit/libXext/dist/man/XShapeCombineShape.man
U xsrc/external/mit/libXext/dist/man/XShm.man
U xsrc/external/mit/libXext/dist/man/XShape.man
U xsrc/external/mit/libXext/dist/man/XShapeSelectInput.man
U xsrc/external/mit/libXext/dist/man/DPMSForceLevel.man
U xsrc/external/mit/libXext/dist/man/XcupStoreColors.man
U xsrc/external/mit/libXext/dist/man/XeviQueryVersion.man
U xsrc/external/mit/libXext/dist/man/XShapeInputSelected.man
U xsrc/external/mit/libXext/dist/man/XShapeOffsetShape.man
U xsrc/external/mit/libXext/dist/man/XShmPutImage.man
U xsrc/external/mit/libXext/dist/man/Makefile.in
U xsrc/external/mit/libXext/dist/man/XcupGetReservedColormapEntries.man
U xsrc/external/mit/libXext/dist/man/XShmAttach.man
U xsrc/external/mit/libXext/dist/man/Xmbuf.man
U xsrc/external/mit/libXext/dist/man/XdbeFreeVisualInfo.man
U xsrc/external/mit/libXext/dist/man/XmbufGetBufferAttributes.man
U xsrc/external/mit/libXext/dist/man/XShmCreatePixmap.man
U xsrc/external/mit/libXext/dist/man/XmbufDestroyBuffers.man
U xsrc/external/mit/libXext/dist/man/XShapeQueryExtension.man
U xsrc/external/mit/libXext/dist/man/XShmGetEventBase.man
U xsrc/external/mit/libXext/dist/man/XmbufChangeBufferAttributes.man
U xsrc/external/mit/libXext/dist/man/XdbeQueryExtension.man
U xsrc/external/mit/libXext/dist/man/XdbeGetBackBufferAttributes.man
U xsrc/external/mit/libXext/dist/man/DPMSEnable.man
U xsrc/external/mit/libXext/dist/man/XShmPixmapFormat.man
U xsrc/external/mit/libXext/dist/man/XmbufGetVersion.man
U xsrc/external/mit/libXext/dist/man/XShapeGetRectangles.man
U 

re: CVS commit: src/sys/external/bsd/drm2/pci

2022-10-28 Thread matthew green
> Modified Files:
>   src/sys/external/bsd/drm2/pci: drm_pci.c
>
> Log Message:
> drm(4): Mark PCI interrupt handlers as MP-safe.

i tested this recently and on one of nvidia or radeon
it wasn't working for me.  i can confirm again next
weekend...


.mrg.


re: CVS commit: src/sys/net

2022-10-24 Thread matthew green
"SAITOH Masanobu" writes:
> Module Name:  src
> Committed By: msaitoh
> Date: Mon Oct 24 07:45:44 UTC 2022
>
> Modified Files:
>   src/sys/net: if_dl.h
>
> Log Message:
> Increase sdl_data so that more then IFNAMSIZ bytes are available.
>
>  - Increase the size of dl_data[] from 12 to 24.
>  - Same as OpenBSD.

isn't this a binary compat issue?  eg, 'struct sockaddr_dl' changes,
and that, and things based upon it, are in user interfaces.  i had
a look and i believe it's a problem, but maybe i missed something.

thanks.


.mrg.


CVS commit: src/sys/dev/usb

2022-10-20 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Oct 21 04:55:12 UTC 2022

Modified Files:
src/sys/dev/usb: ugen.c

Log Message:
ugen(4): convert to USBHIST style debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/sys/dev/usb/ugen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/usb

2022-10-20 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Oct 21 04:55:12 UTC 2022

Modified Files:
src/sys/dev/usb: ugen.c

Log Message:
ugen(4): convert to USBHIST style debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/sys/dev/usb/ugen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.168 src/sys/dev/usb/ugen.c:1.169
--- src/sys/dev/usb/ugen.c:1.168	Sun Sep 26 01:16:09 2021
+++ src/sys/dev/usb/ugen.c	Fri Oct 21 04:55:11 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ugen.c,v 1.168 2021/09/26 01:16:09 thorpej Exp $	*/
+/*	$NetBSD: ugen.c,v 1.169 2022/10/21 04:55:11 mrg Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.168 2021/09/26 01:16:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.169 2022/10/21 04:55:11 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -64,17 +64,50 @@ __KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.1
 #include 
 #include 
 #include 
+#include 
 
 #include "ioconf.h"
 
-#ifdef UGEN_DEBUG
-#define DPRINTF(x)	if (ugendebug) printf x
-#define DPRINTFN(n,x)	if (ugendebug>(n)) printf x
-int	ugendebug = 0;
+#ifdef USB_DEBUG
+#ifndef UGEN_DEBUG
+#define ugendebug 0
 #else
-#define DPRINTF(x)
-#define DPRINTFN(n,x)
-#endif
+int	ugendebug = 0;
+
+SYSCTL_SETUP(sysctl_hw_ugen_setup, "sysctl hw.ugen setup")
+{
+	int err;
+	const struct sysctlnode *rnode;
+	const struct sysctlnode *cnode;
+
+	err = sysctl_createv(clog, 0, NULL, ,
+	CTLFLAG_PERMANENT, CTLTYPE_NODE, "ugen",
+	SYSCTL_DESCR("ugen global controls"),
+	NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
+
+	if (err)
+		goto fail;
+
+	/* control debugging printfs */
+	err = sysctl_createv(clog, 0, , ,
+	CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
+	"debug", SYSCTL_DESCR("Enable debugging output"),
+	NULL, 0, , sizeof(ugendebug), CTL_CREATE, CTL_EOL);
+	if (err)
+		goto fail;
+
+	return;
+fail:
+	aprint_error("%s: sysctl_createv failed (err = %d)\n", __func__, err);
+}
+
+#endif /* UGEN_DEBUG */
+#endif /* USB_DEBUG */
+
+#define DPRINTF(FMT,A,B,C,D)USBHIST_LOGN(ugendebug,1,FMT,A,B,C,D)
+#define DPRINTFN(N,FMT,A,B,C,D) USBHIST_LOGN(ugendebug,N,FMT,A,B,C,D)
+#define UGENHIST_FUNC() USBHIST_FUNC()
+#define UGENHIST_CALLED(name)   USBHIST_CALLED(ugendebug)
 
 #define	UGEN_CHUNK	128	/* chunk size for read */
 #define	UGEN_IBSIZE	1020	/* buffer size */
@@ -438,8 +471,10 @@ ugen_set_config(struct ugen_softc *sc, i
 	usbd_status err;
 	int dir;
 
-	DPRINTFN(1,("ugen_set_config: %s to configno %d, sc=%p\n",
-		device_xname(sc->sc_dev), configno, sc));
+	UGENHIST_FUNC(); UGENHIST_CALLED();
+
+	DPRINTFN(1, "ugen%jd: %s to configno %jd, sc=%jx",
+		device_unit(sc->sc_dev), configno, sc, 0);
 
 	KASSERT(KERNEL_LOCKED_P()); /* sc_is_open */
 
@@ -451,8 +486,8 @@ ugen_set_config(struct ugen_softc *sc, i
 		for (endptno = 1; endptno < USB_MAX_ENDPOINTS; endptno++)
 			if (sc->sc_is_open[endptno]) {
 DPRINTFN(1,
- ("ugen_set_config: %s - endpoint %d is open\n",
-  device_xname(sc->sc_dev), endptno));
+ "%s - endpoint %d is open",
+  endptno, 0, 0, 0);
 return USBD_IN_USE;
 			}
 
@@ -478,7 +513,7 @@ ugen_set_config(struct ugen_softc *sc, i
 		goto out;
 
 	for (ifaceno = 0; ifaceno < niface; ifaceno++) {
-		DPRINTFN(1,("ugen_set_config: ifaceno %d\n", ifaceno));
+		DPRINTFN(1, "ifaceno %jd", ifaceno, 0, 0, 0);
 		err = usbd_device2interface_handle(dev, ifaceno, );
 		if (err)
 			goto out;
@@ -491,10 +526,9 @@ ugen_set_config(struct ugen_softc *sc, i
 			endpt = ed->bEndpointAddress;
 			dir = UE_GET_DIR(endpt) == UE_DIR_IN ? IN : OUT;
 			sce = >sc_endpoints[UE_GET_ADDR(endpt)][dir];
-			DPRINTFN(1,("ugen_set_config: endptno %d, endpt=0x%02x"
-"(%d,%d), sce=%p\n",
-endptno, endpt, UE_GET_ADDR(endpt),
-UE_GET_DIR(endpt), sce));
+			DPRINTFN(1, "endptno %jd, endpt=0x%02jx (%jd,%jd)",
+ endptno, endpt, UE_GET_ADDR(endpt),
+ UE_GET_DIR(endpt));
 			sce->sc = sc;
 			sce->edesc = ed;
 			sce->iface = iface;
@@ -530,13 +564,15 @@ ugenopen(dev_t dev, int flag, int mode, 
 	int error;
 	int opened;
 
+	UGENHIST_FUNC(); UGENHIST_CALLED();
+
 	KASSERT(KERNEL_LOCKED_P()); /* sc_is_open */
 
 	if ((sc = ugenif_acquire(unit)) == NULL)
 		return ENXIO;
 
-	DPRINTFN(5, ("ugenopen: flag=%d, mode=%d, unit=%d endpt=%d\n",
-		 flag, mode, unit, endpt));
+	DPRINTFN(5, "flag=%jd, mode=%jd, unit=%jd endpt=%jd",
+		 flag, mode, unit, endpt);
 
 	/* The control endpoint allows multiple opens. */
 	if (endpt == USB_CONTROL_ENDPOINT) {
@@ -570,8 +606,8 @@ ugenopen(dev_t dev, int flag, int mode, 
 		sce = >sc_endpoints[endpt][dir];
 		sce->state = 0;
 		sce->timeout = USBD_NO_TIMEOUT;
-		DPRINTFN(5, ("ugenopen: sc=%p, endpt=%d, dir=%d, sce=%p\n",
-			 sc, endpt, 

  1   2   3   4   5   6   7   8   9   10   >