CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Jul 11 06:16:23 UTC 2022

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
KNF. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.739 -r1.740 src/sys/dev/pci/if_wm.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/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Jul 11 06:16:23 UTC 2022

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
KNF. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.739 -r1.740 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.739 src/sys/dev/pci/if_wm.c:1.740
--- src/sys/dev/pci/if_wm.c:1.739	Mon Jul 11 06:15:27 2022
+++ src/sys/dev/pci/if_wm.c	Mon Jul 11 06:16:23 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.739 2022/07/11 06:15:27 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.740 2022/07/11 06:16:23 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.739 2022/07/11 06:15:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.740 2022/07/11 06:16:23 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -321,7 +321,7 @@ struct wm_softc;
 #endif
 
 #ifdef WM_EVENT_COUNTERS
-#define WM_Q_EVCNT_DEFINE(qname, evname)\
+#define WM_Q_EVCNT_DEFINE(qname, evname) \
 	char qname##_##evname##_evcnt_name[sizeof("qname##XX##evname")]; \
 	struct evcnt qname##_ev_##evname
 
@@ -2049,8 +2049,8 @@ wm_attach(device_t parent, device_t self
 aprint_error_dev(sc->sc_dev,
 "WARNING: I/O BAR at zero.\n");
 			} else if (pci_mapreg_map(pa, i, PCI_MAPREG_TYPE_IO,
-	0, >sc_iot, >sc_ioh,
-	NULL, >sc_ios) == 0) {
+			0, >sc_iot, >sc_ioh, NULL, >sc_ios)
+			== 0) {
 sc->sc_flags |= WM_F_IOH_VALID;
 			} else
 aprint_error_dev(sc->sc_dev,
@@ -3114,13 +3114,11 @@ alloc_retry:
 	 * If we're a i82544 or greater (except i82547), we can do
 	 * TCP segmentation offload.
 	 */
-	if (sc->sc_type >= WM_T_82544 && sc->sc_type != WM_T_82547) {
+	if (sc->sc_type >= WM_T_82544 && sc->sc_type != WM_T_82547)
 		ifp->if_capabilities |= IFCAP_TSOv4;
-	}
 
-	if (sc->sc_type >= WM_T_82571) {
+	if (sc->sc_type >= WM_T_82571)
 		ifp->if_capabilities |= IFCAP_TSOv6;
-	}
 
 	sc->sc_tx_process_limit = WM_TX_PROCESS_LIMIT_DEFAULT;
 	sc->sc_tx_intr_process_limit = WM_TX_INTR_PROCESS_LIMIT_DEFAULT;
@@ -7245,8 +7243,10 @@ wm_alloc_txrx_queues(struct wm_softc *sc
 
 		for (j = 0; j < WM_NTXSEGS; j++) {
 			snprintf(txq->txq_txseg_evcnt_names[j],
-			sizeof(txq->txq_txseg_evcnt_names[j]), "txq%02dtxseg%d", i, j);
-			evcnt_attach_dynamic(>txq_ev_txseg[j], EVCNT_TYPE_MISC,
+			sizeof(txq->txq_txseg_evcnt_names[j]),
+			"txq%02dtxseg%d", i, j);
+			evcnt_attach_dynamic(>txq_ev_txseg[j],
+			EVCNT_TYPE_MISC,
 			NULL, xname, txq->txq_txseg_evcnt_names[j]);
 		}
 
@@ -7531,10 +7531,15 @@ wm_init_rx_regs(struct wm_softc *sc, str
 
 		if ((sc->sc_flags & WM_F_NEWQUEUE) != 0) {
 			if (MCLBYTES & ((1 << SRRCTL_BSIZEPKT_SHIFT) - 1))
-panic("%s: MCLBYTES %d unsupported for 82575 or higher\n", __func__, MCLBYTES);
+panic("%s: MCLBYTES %d unsupported for 82575 "
+"or higher\n", __func__, MCLBYTES);
 
-			/* Currently, support SRRCTL_DESCTYPE_ADV_ONEBUF only. */
-			CSR_WRITE(sc, WMREG_SRRCTL(qid), SRRCTL_DESCTYPE_ADV_ONEBUF
+			/*
+			 * Currently, support SRRCTL_DESCTYPE_ADV_ONEBUF
+			 * only.
+			 */
+			CSR_WRITE(sc, WMREG_SRRCTL(qid),
+			SRRCTL_DESCTYPE_ADV_ONEBUF
 			| (MCLBYTES >> SRRCTL_BSIZEPKT_SHIFT));
 			CSR_WRITE(sc, WMREG_RXDCTL(qid), RXDCTL_QUEUE_ENABLE
 			| RXDCTL_PTHRESH(16) | RXDCTL_HTHRESH(8)
@@ -9255,15 +9260,15 @@ wm_rxdesc_ensure_checksum(struct wm_rxqu
 
 	if (!wm_rxdesc_is_set_status(sc, status, WRX_ST_IXSM, 0, 0)) {
 		if (wm_rxdesc_is_set_status(sc, status,
-			WRX_ST_IPCS, EXTRXC_STATUS_IPCS, NQRXC_STATUS_IPCS)) {
+		WRX_ST_IPCS, EXTRXC_STATUS_IPCS, NQRXC_STATUS_IPCS)) {
 			WM_Q_EVCNT_INCR(rxq, ipsum);
 			m->m_pkthdr.csum_flags |= M_CSUM_IPv4;
 			if (wm_rxdesc_is_set_error(sc, errors,
-WRX_ER_IPE, EXTRXC_ERROR_IPE, NQRXC_ERROR_IPE))
+			WRX_ER_IPE, EXTRXC_ERROR_IPE, NQRXC_ERROR_IPE))
 m->m_pkthdr.csum_flags |= M_CSUM_IPv4_BAD;
 		}
 		if (wm_rxdesc_is_set_status(sc, status,
-			WRX_ST_TCPCS, EXTRXC_STATUS_TCPCS, NQRXC_STATUS_L4I)) {
+		WRX_ST_TCPCS, EXTRXC_STATUS_TCPCS, NQRXC_STATUS_L4I)) {
 			/*
 			 * Note: we don't know if this was TCP or UDP,
 			 * so we just set both bits, and expect the
@@ -9318,9 +9323,8 @@ wm_rxeof(struct wm_rxqueue *rxq, u_int l
 		uint8_t rsstype = wm_rxdesc_get_rsstype(rxq, i);
 #endif
 
-		if (!wm_rxdesc_dd(rxq, i, status)) {
+		if (!wm_rxdesc_dd(rxq, i, status))
 			break;
-		}
 
 		if (limit-- == 0) {
 			more = true;
@@ -9523,10 +9527,9 @@ wm_linkintr_gmii(struct wm_softc *sc, ui
 	if ((sc->sc_type == WM_T_ICH8) && (link == false))
 		wm_gig_downshift_workaround_ich8lan(sc);
 
-	if ((sc->sc_type == WM_T_ICH8)
-	&& (sc->sc_phytype == WMPHY_IGP_3)) {
+	if ((sc->sc_type == WM_T_ICH8) && (sc->sc_phytype == WMPHY_IGP_3))
 		

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Jul 11 06:15:27 UTC 2022

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
Consistently use semicolon. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.738 -r1.739 src/sys/dev/pci/if_wm.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/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Jul 11 06:15:27 UTC 2022

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
Consistently use semicolon. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.738 -r1.739 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.738 src/sys/dev/pci/if_wm.c:1.739
--- src/sys/dev/pci/if_wm.c:1.738	Wed Jul  6 06:33:49 2022
+++ src/sys/dev/pci/if_wm.c	Mon Jul 11 06:15:27 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.738 2022/07/06 06:33:49 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.739 2022/07/11 06:15:27 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.738 2022/07/06 06:33:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.739 2022/07/11 06:15:27 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -323,7 +323,7 @@ struct wm_softc;
 #ifdef WM_EVENT_COUNTERS
 #define WM_Q_EVCNT_DEFINE(qname, evname)\
 	char qname##_##evname##_evcnt_name[sizeof("qname##XX##evname")]; \
-	struct evcnt qname##_ev_##evname;
+	struct evcnt qname##_ev_##evname
 
 #define WM_Q_EVCNT_ATTACH(qname, evname, q, qnum, xname, evtype)	\
 	do {\
@@ -342,7 +342,7 @@ struct wm_softc;
 	WM_Q_EVCNT_ATTACH(qname, evname, q, qnum, xname, EVCNT_TYPE_INTR)
 
 #define WM_Q_EVCNT_DETACH(qname, evname, q, qnum)	\
-	evcnt_detach(&(q)->qname##_ev_##evname);
+	evcnt_detach(&(q)->qname##_ev_##evname)
 #endif /* WM_EVENT_COUNTERS */
 
 struct wm_txqueue {
@@ -409,27 +409,27 @@ struct wm_txqueue {
 	uint32_t txq_bytes;		/* for AIM */
 #ifdef WM_EVENT_COUNTERS
 	/* TX event counters */
-	WM_Q_EVCNT_DEFINE(txq, txsstall)/* Stalled due to no txs */
-	WM_Q_EVCNT_DEFINE(txq, txdstall)/* Stalled due to no txd */
-	WM_Q_EVCNT_DEFINE(txq, fifo_stall)  /* FIFO stalls (82547) */
-	WM_Q_EVCNT_DEFINE(txq, txdw)	/* Tx descriptor interrupts */
-	WM_Q_EVCNT_DEFINE(txq, txqe)	/* Tx queue empty interrupts */
+	WM_Q_EVCNT_DEFINE(txq, txsstall);   /* Stalled due to no txs */
+	WM_Q_EVCNT_DEFINE(txq, txdstall);   /* Stalled due to no txd */
+	WM_Q_EVCNT_DEFINE(txq, fifo_stall); /* FIFO stalls (82547) */
+	WM_Q_EVCNT_DEFINE(txq, txdw);	/* Tx descriptor interrupts */
+	WM_Q_EVCNT_DEFINE(txq, txqe);	/* Tx queue empty interrupts */
 	/* XXX not used? */
 
-	WM_Q_EVCNT_DEFINE(txq, ipsum)	/* IP checksums comp. */
-	WM_Q_EVCNT_DEFINE(txq, tusum)	/* TCP/UDP cksums comp. */
-	WM_Q_EVCNT_DEFINE(txq, tusum6)	/* TCP/UDP v6 cksums comp. */
-	WM_Q_EVCNT_DEFINE(txq, tso)	/* TCP seg offload (IPv4) */
-	WM_Q_EVCNT_DEFINE(txq, tso6)	/* TCP seg offload (IPv6) */
-	WM_Q_EVCNT_DEFINE(txq, tsopain)	/* Painful header manip. for TSO */
-	WM_Q_EVCNT_DEFINE(txq, pcqdrop)	/* Pkt dropped in pcq */
-	WM_Q_EVCNT_DEFINE(txq, descdrop)/* Pkt dropped in MAC desc ring */
+	WM_Q_EVCNT_DEFINE(txq, ipsum);	/* IP checksums comp. */
+	WM_Q_EVCNT_DEFINE(txq, tusum);	/* TCP/UDP cksums comp. */
+	WM_Q_EVCNT_DEFINE(txq, tusum6);	/* TCP/UDP v6 cksums comp. */
+	WM_Q_EVCNT_DEFINE(txq, tso);	/* TCP seg offload (IPv4) */
+	WM_Q_EVCNT_DEFINE(txq, tso6);	/* TCP seg offload (IPv6) */
+	WM_Q_EVCNT_DEFINE(txq, tsopain);/* Painful header manip. for TSO */
+	WM_Q_EVCNT_DEFINE(txq, pcqdrop);/* Pkt dropped in pcq */
+	WM_Q_EVCNT_DEFINE(txq, descdrop);   /* Pkt dropped in MAC desc ring */
 	/* other than toomanyseg */
 
-	WM_Q_EVCNT_DEFINE(txq, toomanyseg)  /* Pkt dropped(toomany DMA segs) */
-	WM_Q_EVCNT_DEFINE(txq, defrag)	/* m_defrag() */
-	WM_Q_EVCNT_DEFINE(txq, underrun)/* Tx underrun */
-	WM_Q_EVCNT_DEFINE(txq, skipcontext) /* Tx skip wrong cksum context */
+	WM_Q_EVCNT_DEFINE(txq, toomanyseg); /* Pkt dropped(toomany DMA segs) */
+	WM_Q_EVCNT_DEFINE(txq, defrag);	/* m_defrag() */
+	WM_Q_EVCNT_DEFINE(txq, underrun);   /* Tx underrun */
+	WM_Q_EVCNT_DEFINE(txq, skipcontext); /* Tx skip wrong cksum context */
 
 	char txq_txseg_evcnt_names[WM_NTXSEGS][sizeof("txqXXtxsegXXX")];
 	struct evcnt txq_ev_txseg[WM_NTXSEGS]; /* Tx packets w/ N segments */
@@ -471,11 +471,11 @@ struct wm_rxqueue {
 	uint32_t rxq_bytes;		/* for AIM */
 #ifdef WM_EVENT_COUNTERS
 	/* RX event counters */
-	WM_Q_EVCNT_DEFINE(rxq, intr)	/* Interrupts */
-	WM_Q_EVCNT_DEFINE(rxq, defer)	/* Rx deferred processing */
+	WM_Q_EVCNT_DEFINE(rxq, intr);	/* Interrupts */
+	WM_Q_EVCNT_DEFINE(rxq, defer);	/* Rx deferred processing */
 
-	WM_Q_EVCNT_DEFINE(rxq, ipsum)	/* IP checksums checked */
-	WM_Q_EVCNT_DEFINE(rxq, tusum)	/* TCP/UDP cksums checked */
+	WM_Q_EVCNT_DEFINE(rxq, ipsum);	/* IP checksums checked */
+	WM_Q_EVCNT_DEFINE(rxq, tusum);	/* TCP/UDP cksums checked */
 #endif
 };
 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:32:19 UTC 2022

Modified Files:
xsrc/external/mit/appres/dist: compile
xsrc/external/mit/listres/dist: compile
Removed Files:
xsrc/external/mit/appres/dist: README
xsrc/external/mit/editres/dist: README
xsrc/external/mit/listres/dist: README

Log Message:
merge appres 1.0.6, editres 1.0.8, and listres 1.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/appres/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/appres/dist/compile
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/editres/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/listres/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/listres/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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:32:19 UTC 2022

Modified Files:
xsrc/external/mit/appres/dist: compile
xsrc/external/mit/listres/dist: compile
Removed Files:
xsrc/external/mit/appres/dist: README
xsrc/external/mit/editres/dist: README
xsrc/external/mit/listres/dist: README

Log Message:
merge appres 1.0.6, editres 1.0.8, and listres 1.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/appres/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/appres/dist/compile
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/editres/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/listres/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/listres/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/appres/dist/compile
diff -u xsrc/external/mit/appres/dist/compile:1.3 xsrc/external/mit/appres/dist/compile:1.4
--- xsrc/external/mit/appres/dist/compile:1.3	Sun Mar 11 07:23:59 2018
+++ xsrc/external/mit/appres/dist/compile	Mon Jul 11 07:32:18 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:

Index: xsrc/external/mit/listres/dist/compile
diff -u xsrc/external/mit/listres/dist/compile:1.3 xsrc/external/mit/listres/dist/compile:1.4
--- xsrc/external/mit/listres/dist/compile:1.3	Sun Mar 11 07:23:59 2018
+++ xsrc/external/mit/listres/dist/compile	Mon Jul 11 07:32:19 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)
 # 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:00:23 UTC 2022

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

Log Message:
initial import of bitmap-1.1.0

Status:

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

U xsrc/external/mit/bitmap/dist/Dialog.h
U xsrc/external/mit/bitmap/dist/Handlers.c
U xsrc/external/mit/bitmap/dist/install-sh
U xsrc/external/mit/bitmap/dist/ChangeLog
U xsrc/external/mit/bitmap/dist/BitmapP.h
U xsrc/external/mit/bitmap/dist/aclocal.m4
U xsrc/external/mit/bitmap/dist/configure
U xsrc/external/mit/bitmap/dist/README.md
U xsrc/external/mit/bitmap/dist/Makefile.in
U xsrc/external/mit/bitmap/dist/INSTALL
U xsrc/external/mit/bitmap/dist/configure.ac
N xsrc/external/mit/bitmap/dist/test-driver
U xsrc/external/mit/bitmap/dist/Makefile.am
U xsrc/external/mit/bitmap/dist/Graphics.c
U xsrc/external/mit/bitmap/dist/Bitmap.c
U xsrc/external/mit/bitmap/dist/COPYING
U xsrc/external/mit/bitmap/dist/config.h.in
U xsrc/external/mit/bitmap/dist/ReqMach.c
U xsrc/external/mit/bitmap/dist/Requests.h
U xsrc/external/mit/bitmap/dist/atobm.c
U xsrc/external/mit/bitmap/dist/Dialog.c
U xsrc/external/mit/bitmap/dist/compile
U xsrc/external/mit/bitmap/dist/config.sub
U xsrc/external/mit/bitmap/dist/AUTHORS
U xsrc/external/mit/bitmap/dist/bmtoa.c
U xsrc/external/mit/bitmap/dist/config.guess
U xsrc/external/mit/bitmap/dist/CutPaste.c
U xsrc/external/mit/bitmap/dist/Bitmap.h
U xsrc/external/mit/bitmap/dist/BitEdit.c
U xsrc/external/mit/bitmap/dist/autogen.sh
U xsrc/external/mit/bitmap/dist/depcomp
U xsrc/external/mit/bitmap/dist/missing
N xsrc/external/mit/bitmap/dist/bitmaps/Down
N xsrc/external/mit/bitmap/dist/bitmaps/RotateLeft
N xsrc/external/mit/bitmap/dist/bitmaps/Dashes
N xsrc/external/mit/bitmap/dist/bitmaps/FlipHoriz
N xsrc/external/mit/bitmap/dist/bitmaps/Excl
N xsrc/external/mit/bitmap/dist/bitmaps/Right
N xsrc/external/mit/bitmap/dist/bitmaps/FlipVert
N xsrc/external/mit/bitmap/dist/bitmaps/RotateRight
N xsrc/external/mit/bitmap/dist/bitmaps/Term
N xsrc/external/mit/bitmap/dist/bitmaps/Up
N xsrc/external/mit/bitmap/dist/bitmaps/Stipple
N xsrc/external/mit/bitmap/dist/bitmaps/Fold
N xsrc/external/mit/bitmap/dist/bitmaps/Left
N xsrc/external/mit/bitmap/dist/test/round-trip-test.in
U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap-nocase
U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap
U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap-color
U xsrc/external/mit/bitmap/dist/man/atobm.man
U xsrc/external/mit/bitmap/dist/man/bmtoa.man
U xsrc/external/mit/bitmap/dist/man/bitmap.man
U xsrc/external/mit/bitmap/dist/man/Makefile.in
U xsrc/external/mit/bitmap/dist/man/Makefile.am

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:00:23 UTC 2022

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

Log Message:
initial import of bitmap-1.1.0

Status:

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

U xsrc/external/mit/bitmap/dist/Dialog.h
U xsrc/external/mit/bitmap/dist/Handlers.c
U xsrc/external/mit/bitmap/dist/install-sh
U xsrc/external/mit/bitmap/dist/ChangeLog
U xsrc/external/mit/bitmap/dist/BitmapP.h
U xsrc/external/mit/bitmap/dist/aclocal.m4
U xsrc/external/mit/bitmap/dist/configure
U xsrc/external/mit/bitmap/dist/README.md
U xsrc/external/mit/bitmap/dist/Makefile.in
U xsrc/external/mit/bitmap/dist/INSTALL
U xsrc/external/mit/bitmap/dist/configure.ac
N xsrc/external/mit/bitmap/dist/test-driver
U xsrc/external/mit/bitmap/dist/Makefile.am
U xsrc/external/mit/bitmap/dist/Graphics.c
U xsrc/external/mit/bitmap/dist/Bitmap.c
U xsrc/external/mit/bitmap/dist/COPYING
U xsrc/external/mit/bitmap/dist/config.h.in
U xsrc/external/mit/bitmap/dist/ReqMach.c
U xsrc/external/mit/bitmap/dist/Requests.h
U xsrc/external/mit/bitmap/dist/atobm.c
U xsrc/external/mit/bitmap/dist/Dialog.c
U xsrc/external/mit/bitmap/dist/compile
U xsrc/external/mit/bitmap/dist/config.sub
U xsrc/external/mit/bitmap/dist/AUTHORS
U xsrc/external/mit/bitmap/dist/bmtoa.c
U xsrc/external/mit/bitmap/dist/config.guess
U xsrc/external/mit/bitmap/dist/CutPaste.c
U xsrc/external/mit/bitmap/dist/Bitmap.h
U xsrc/external/mit/bitmap/dist/BitEdit.c
U xsrc/external/mit/bitmap/dist/autogen.sh
U xsrc/external/mit/bitmap/dist/depcomp
U xsrc/external/mit/bitmap/dist/missing
N xsrc/external/mit/bitmap/dist/bitmaps/Down
N xsrc/external/mit/bitmap/dist/bitmaps/RotateLeft
N xsrc/external/mit/bitmap/dist/bitmaps/Dashes
N xsrc/external/mit/bitmap/dist/bitmaps/FlipHoriz
N xsrc/external/mit/bitmap/dist/bitmaps/Excl
N xsrc/external/mit/bitmap/dist/bitmaps/Right
N xsrc/external/mit/bitmap/dist/bitmaps/FlipVert
N xsrc/external/mit/bitmap/dist/bitmaps/RotateRight
N xsrc/external/mit/bitmap/dist/bitmaps/Term
N xsrc/external/mit/bitmap/dist/bitmaps/Up
N xsrc/external/mit/bitmap/dist/bitmaps/Stipple
N xsrc/external/mit/bitmap/dist/bitmaps/Fold
N xsrc/external/mit/bitmap/dist/bitmaps/Left
N xsrc/external/mit/bitmap/dist/test/round-trip-test.in
U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap-nocase
U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap
U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap-color
U xsrc/external/mit/bitmap/dist/man/atobm.man
U xsrc/external/mit/bitmap/dist/man/bmtoa.man
U xsrc/external/mit/bitmap/dist/man/bitmap.man
U xsrc/external/mit/bitmap/dist/man/Makefile.in
U xsrc/external/mit/bitmap/dist/man/Makefile.am

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:00:25 UTC 2022

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

Log Message:
initial import of iceauth-1.0.9

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:00:25 UTC 2022

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

Log Message:
initial import of iceauth-1.0.9

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:00:28 UTC 2022

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

Log Message:
initial import of xclipboard-1.1.4

Status:

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

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:00:28 UTC 2022

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

Log Message:
initial import of xclipboard-1.1.4

Status:

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

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:00:29 UTC 2022

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

Log Message:
initial import of xclock-1.1.1

Status:

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

U xsrc/external/mit/xclock/dist/clmask.bit
U xsrc/external/mit/xclock/dist/Makefile.am
U xsrc/external/mit/xclock/dist/configure.ac
U xsrc/external/mit/xclock/dist/missing
U xsrc/external/mit/xclock/dist/depcomp
U xsrc/external/mit/xclock/dist/Makefile.in
U xsrc/external/mit/xclock/dist/COPYING
U xsrc/external/mit/xclock/dist/config.sub
U xsrc/external/mit/xclock/dist/xclock.c
U xsrc/external/mit/xclock/dist/compile
C xsrc/external/mit/xclock/dist/Clock.c
U xsrc/external/mit/xclock/dist/ClockP.h
U xsrc/external/mit/xclock/dist/clock.bit
U xsrc/external/mit/xclock/dist/ChangeLog
U xsrc/external/mit/xclock/dist/config.rpath
U xsrc/external/mit/xclock/dist/configure
U xsrc/external/mit/xclock/dist/README.md
U xsrc/external/mit/xclock/dist/Clock.h
U xsrc/external/mit/xclock/dist/install-sh
U xsrc/external/mit/xclock/dist/config.guess
U xsrc/external/mit/xclock/dist/aclocal.m4
U xsrc/external/mit/xclock/dist/INSTALL
U xsrc/external/mit/xclock/dist/config.h.in
U xsrc/external/mit/xclock/dist/app-defaults/XClock-color
U xsrc/external/mit/xclock/dist/app-defaults/XClock
U xsrc/external/mit/xclock/dist/man/Makefile.in
U xsrc/external/mit/xclock/dist/man/Makefile.am
U xsrc/external/mit/xclock/dist/man/xclock.man

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:00:29 UTC 2022

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

Log Message:
initial import of xclock-1.1.1

Status:

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

U xsrc/external/mit/xclock/dist/clmask.bit
U xsrc/external/mit/xclock/dist/Makefile.am
U xsrc/external/mit/xclock/dist/configure.ac
U xsrc/external/mit/xclock/dist/missing
U xsrc/external/mit/xclock/dist/depcomp
U xsrc/external/mit/xclock/dist/Makefile.in
U xsrc/external/mit/xclock/dist/COPYING
U xsrc/external/mit/xclock/dist/config.sub
U xsrc/external/mit/xclock/dist/xclock.c
U xsrc/external/mit/xclock/dist/compile
C xsrc/external/mit/xclock/dist/Clock.c
U xsrc/external/mit/xclock/dist/ClockP.h
U xsrc/external/mit/xclock/dist/clock.bit
U xsrc/external/mit/xclock/dist/ChangeLog
U xsrc/external/mit/xclock/dist/config.rpath
U xsrc/external/mit/xclock/dist/configure
U xsrc/external/mit/xclock/dist/README.md
U xsrc/external/mit/xclock/dist/Clock.h
U xsrc/external/mit/xclock/dist/install-sh
U xsrc/external/mit/xclock/dist/config.guess
U xsrc/external/mit/xclock/dist/aclocal.m4
U xsrc/external/mit/xclock/dist/INSTALL
U xsrc/external/mit/xclock/dist/config.h.in
U xsrc/external/mit/xclock/dist/app-defaults/XClock-color
U xsrc/external/mit/xclock/dist/app-defaults/XClock
U xsrc/external/mit/xclock/dist/man/Makefile.in
U xsrc/external/mit/xclock/dist/man/Makefile.am
U xsrc/external/mit/xclock/dist/man/xclock.man

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:00:26 UTC 2022

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

Log Message:
initial import of xcalc-1.1.1

Status:

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

U xsrc/external/mit/xcalc/dist/configure.ac
U xsrc/external/mit/xcalc/dist/ChangeLog
U xsrc/external/mit/xcalc/dist/config.h.in
U xsrc/external/mit/xcalc/dist/missing
U xsrc/external/mit/xcalc/dist/actions.c
U xsrc/external/mit/xcalc/dist/depcomp
U xsrc/external/mit/xcalc/dist/configure
U xsrc/external/mit/xcalc/dist/README.md
U xsrc/external/mit/xcalc/dist/config.sub
U xsrc/external/mit/xcalc/dist/xcalc.h
U xsrc/external/mit/xcalc/dist/COPYING
U xsrc/external/mit/xcalc/dist/compile
U xsrc/external/mit/xcalc/dist/Makefile.in
U xsrc/external/mit/xcalc/dist/math.c
U xsrc/external/mit/xcalc/dist/Makefile.am
U xsrc/external/mit/xcalc/dist/aclocal.m4
U xsrc/external/mit/xcalc/dist/INSTALL
U xsrc/external/mit/xcalc/dist/install-sh
U xsrc/external/mit/xcalc/dist/config.guess
U xsrc/external/mit/xcalc/dist/xcalc.c
U xsrc/external/mit/xcalc/dist/app-defaults/XCalc-color
U xsrc/external/mit/xcalc/dist/app-defaults/XCalc
U xsrc/external/mit/xcalc/dist/man/Makefile.am
U xsrc/external/mit/xcalc/dist/man/xcalc.man
U xsrc/external/mit/xcalc/dist/man/Makefile.in

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:00:26 UTC 2022

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

Log Message:
initial import of xcalc-1.1.1

Status:

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

U xsrc/external/mit/xcalc/dist/configure.ac
U xsrc/external/mit/xcalc/dist/ChangeLog
U xsrc/external/mit/xcalc/dist/config.h.in
U xsrc/external/mit/xcalc/dist/missing
U xsrc/external/mit/xcalc/dist/actions.c
U xsrc/external/mit/xcalc/dist/depcomp
U xsrc/external/mit/xcalc/dist/configure
U xsrc/external/mit/xcalc/dist/README.md
U xsrc/external/mit/xcalc/dist/config.sub
U xsrc/external/mit/xcalc/dist/xcalc.h
U xsrc/external/mit/xcalc/dist/COPYING
U xsrc/external/mit/xcalc/dist/compile
U xsrc/external/mit/xcalc/dist/Makefile.in
U xsrc/external/mit/xcalc/dist/math.c
U xsrc/external/mit/xcalc/dist/Makefile.am
U xsrc/external/mit/xcalc/dist/aclocal.m4
U xsrc/external/mit/xcalc/dist/INSTALL
U xsrc/external/mit/xcalc/dist/install-sh
U xsrc/external/mit/xcalc/dist/config.guess
U xsrc/external/mit/xcalc/dist/xcalc.c
U xsrc/external/mit/xcalc/dist/app-defaults/XCalc-color
U xsrc/external/mit/xcalc/dist/app-defaults/XCalc
U xsrc/external/mit/xcalc/dist/man/Makefile.am
U xsrc/external/mit/xcalc/dist/man/xcalc.man
U xsrc/external/mit/xcalc/dist/man/Makefile.in

No conflicts created by this import

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 11 08:05:08 UTC 2022

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

Log Message:
find new bitmaps location.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/bitmap/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/bitmap/Makefile
diff -u src/external/mit/xorg/bin/bitmap/Makefile:1.4 src/external/mit/xorg/bin/bitmap/Makefile:1.5
--- src/external/mit/xorg/bin/bitmap/Makefile:1.4	Fri May 31 09:14:18 2013
+++ src/external/mit/xorg/bin/bitmap/Makefile	Mon Jul 11 08:05:08 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2013/05/31 09:14:18 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2022/07/11 08:05:08 mrg Exp $
 
 .include 
 
@@ -20,7 +20,7 @@ DPADD+=	${LIBXAW} ${LIBXMU} ${LIBXT} ${L
 
 SUBDIR=	bmtoa atobm app-defaults
 
-.PATH:	${X11SRCDIR.bitmap}
+.PATH:	${X11SRCDIR.bitmap} ${X11SRCDIR.bitmap}/bitmaps
 
 CWARNFLAGS.clang+=	-Wno-format
 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 11 08:05:08 UTC 2022

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

Log Message:
find new bitmaps location.


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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:11 UTC 2022

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

Log Message:
initial import of xdpyinfo-1.3.3

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:11 UTC 2022

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

Log Message:
initial import of xdpyinfo-1.3.3

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:13 UTC 2022

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

Log Message:
initial import of xedit-1.2.3

Status:

Vendor Tag: xorg
Release Tags:   xedit-1-2-3

U xsrc/external/mit/xedit/dist/AUTHORS
U xsrc/external/mit/xedit/dist/strcasecmp.c
C xsrc/external/mit/xedit/dist/compile
U xsrc/external/mit/xedit/dist/ispell.c
U xsrc/external/mit/xedit/dist/config.guess
U xsrc/external/mit/xedit/dist/COPYING
U xsrc/external/mit/xedit/dist/util.c
U xsrc/external/mit/xedit/dist/Makefile.am
U xsrc/external/mit/xedit/dist/aclocal.m4
U xsrc/external/mit/xedit/dist/missing
U xsrc/external/mit/xedit/dist/hash.c
U xsrc/external/mit/xedit/dist/install-sh
U xsrc/external/mit/xedit/dist/commands.c
U xsrc/external/mit/xedit/dist/xedit.h
U xsrc/external/mit/xedit/dist/depcomp
U xsrc/external/mit/xedit/dist/README
U xsrc/external/mit/xedit/dist/Makefile.in
U xsrc/external/mit/xedit/dist/options.c
U xsrc/external/mit/xedit/dist/INSTALL
U xsrc/external/mit/xedit/dist/util.h
U xsrc/external/mit/xedit/dist/lisp.c
U xsrc/external/mit/xedit/dist/realpath.c
U xsrc/external/mit/xedit/dist/config.h.in
U xsrc/external/mit/xedit/dist/hook.c
U xsrc/external/mit/xedit/dist/ChangeLog
U xsrc/external/mit/xedit/dist/configure.ac
U xsrc/external/mit/xedit/dist/config.sub
U xsrc/external/mit/xedit/dist/configure
U xsrc/external/mit/xedit/dist/xedit.c
U xsrc/external/mit/xedit/dist/ar-lib
U xsrc/external/mit/xedit/dist/tags.c
U xsrc/external/mit/xedit/dist/man/xedit.man
U xsrc/external/mit/xedit/dist/man/Makefile.am
U xsrc/external/mit/xedit/dist/man/Makefile.in
U xsrc/external/mit/xedit/dist/app-defaults/Xedit-color
U xsrc/external/mit/xedit/dist/app-defaults/Xedit
U xsrc/external/mit/xedit/dist/app-defaults/Xedit-sample
U xsrc/external/mit/xedit/dist/lisp/xedit.h
U xsrc/external/mit/xedit/dist/lisp/private.h
U xsrc/external/mit/xedit/dist/lisp/core.h
U xsrc/external/mit/xedit/dist/lisp/TODO
U xsrc/external/mit/xedit/dist/lisp/math.h
U xsrc/external/mit/xedit/dist/lisp/compile.c
U xsrc/external/mit/xedit/dist/lisp/regex.h
U xsrc/external/mit/xedit/dist/lisp/hash.h
U xsrc/external/mit/xedit/dist/lisp/pathname.h
U xsrc/external/mit/xedit/dist/lisp/read.c
U xsrc/external/mit/xedit/dist/lisp/package.c
U xsrc/external/mit/xedit/dist/lisp/write.h
U xsrc/external/mit/xedit/dist/lisp/bytecode.h
U xsrc/external/mit/xedit/dist/lisp/time.h
U xsrc/external/mit/xedit/dist/lisp/debugger.h
U xsrc/external/mit/xedit/dist/lisp/lsp.c
U xsrc/external/mit/xedit/dist/lisp/format.h
U xsrc/external/mit/xedit/dist/lisp/setenv.c
U xsrc/external/mit/xedit/dist/lisp/struct.c
U xsrc/external/mit/xedit/dist/lisp/internal.h
U xsrc/external/mit/xedit/dist/lisp/mathimp.c
U xsrc/external/mit/xedit/dist/lisp/string.c
U xsrc/external/mit/xedit/dist/lisp/io.c
U xsrc/external/mit/xedit/dist/lisp/require.h
U xsrc/external/mit/xedit/dist/lisp/stream.c
U xsrc/external/mit/xedit/dist/lisp/lisp.c
U xsrc/external/mit/xedit/dist/lisp/helper.h
U xsrc/external/mit/xedit/dist/lisp/hash.c
U xsrc/external/mit/xedit/dist/lisp/pathname.c
U xsrc/external/mit/xedit/dist/lisp/read.h
U xsrc/external/mit/xedit/dist/lisp/regex.c
U xsrc/external/mit/xedit/dist/lisp/math.c
U xsrc/external/mit/xedit/dist/lisp/xedit.c
U xsrc/external/mit/xedit/dist/lisp/core.c
U xsrc/external/mit/xedit/dist/lisp/README
U xsrc/external/mit/xedit/dist/lisp/getenv.c
U xsrc/external/mit/xedit/dist/lisp/require.c
U xsrc/external/mit/xedit/dist/lisp/stream.h
U xsrc/external/mit/xedit/dist/lisp/lisp.h
U xsrc/external/mit/xedit/dist/lisp/helper.c
U xsrc/external/mit/xedit/dist/lisp/struct.h
U xsrc/external/mit/xedit/dist/lisp/string.h
U xsrc/external/mit/xedit/dist/lisp/io.h
U xsrc/external/mit/xedit/dist/lisp/debugger.c
U xsrc/external/mit/xedit/dist/lisp/format.c
U xsrc/external/mit/xedit/dist/lisp/package.h
U xsrc/external/mit/xedit/dist/lisp/write.c
U xsrc/external/mit/xedit/dist/lisp/bytecode.c
U xsrc/external/mit/xedit/dist/lisp/time.c
U xsrc/external/mit/xedit/dist/lisp/mp/mp.c
U xsrc/external/mit/xedit/dist/lisp/mp/mpi.c
U xsrc/external/mit/xedit/dist/lisp/mp/mp.h
U xsrc/external/mit/xedit/dist/lisp/mp/mpr.c
U xsrc/external/mit/xedit/dist/lisp/modules/xaw.c
U xsrc/external/mit/xedit/dist/lisp/modules/indent.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/x11.c
U xsrc/external/mit/xedit/dist/lisp/modules/xt.c
U xsrc/external/mit/xedit/dist/lisp/modules/xedit.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/syntax.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/psql.c
U xsrc/external/mit/xedit/dist/lisp/modules/lisp.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/auto.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/sh.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/xlog.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/python.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/c.lsp
U 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:13 UTC 2022

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

Log Message:
initial import of xedit-1.2.3

Status:

Vendor Tag: xorg
Release Tags:   xedit-1-2-3

U xsrc/external/mit/xedit/dist/AUTHORS
U xsrc/external/mit/xedit/dist/strcasecmp.c
C xsrc/external/mit/xedit/dist/compile
U xsrc/external/mit/xedit/dist/ispell.c
U xsrc/external/mit/xedit/dist/config.guess
U xsrc/external/mit/xedit/dist/COPYING
U xsrc/external/mit/xedit/dist/util.c
U xsrc/external/mit/xedit/dist/Makefile.am
U xsrc/external/mit/xedit/dist/aclocal.m4
U xsrc/external/mit/xedit/dist/missing
U xsrc/external/mit/xedit/dist/hash.c
U xsrc/external/mit/xedit/dist/install-sh
U xsrc/external/mit/xedit/dist/commands.c
U xsrc/external/mit/xedit/dist/xedit.h
U xsrc/external/mit/xedit/dist/depcomp
U xsrc/external/mit/xedit/dist/README
U xsrc/external/mit/xedit/dist/Makefile.in
U xsrc/external/mit/xedit/dist/options.c
U xsrc/external/mit/xedit/dist/INSTALL
U xsrc/external/mit/xedit/dist/util.h
U xsrc/external/mit/xedit/dist/lisp.c
U xsrc/external/mit/xedit/dist/realpath.c
U xsrc/external/mit/xedit/dist/config.h.in
U xsrc/external/mit/xedit/dist/hook.c
U xsrc/external/mit/xedit/dist/ChangeLog
U xsrc/external/mit/xedit/dist/configure.ac
U xsrc/external/mit/xedit/dist/config.sub
U xsrc/external/mit/xedit/dist/configure
U xsrc/external/mit/xedit/dist/xedit.c
U xsrc/external/mit/xedit/dist/ar-lib
U xsrc/external/mit/xedit/dist/tags.c
U xsrc/external/mit/xedit/dist/man/xedit.man
U xsrc/external/mit/xedit/dist/man/Makefile.am
U xsrc/external/mit/xedit/dist/man/Makefile.in
U xsrc/external/mit/xedit/dist/app-defaults/Xedit-color
U xsrc/external/mit/xedit/dist/app-defaults/Xedit
U xsrc/external/mit/xedit/dist/app-defaults/Xedit-sample
U xsrc/external/mit/xedit/dist/lisp/xedit.h
U xsrc/external/mit/xedit/dist/lisp/private.h
U xsrc/external/mit/xedit/dist/lisp/core.h
U xsrc/external/mit/xedit/dist/lisp/TODO
U xsrc/external/mit/xedit/dist/lisp/math.h
U xsrc/external/mit/xedit/dist/lisp/compile.c
U xsrc/external/mit/xedit/dist/lisp/regex.h
U xsrc/external/mit/xedit/dist/lisp/hash.h
U xsrc/external/mit/xedit/dist/lisp/pathname.h
U xsrc/external/mit/xedit/dist/lisp/read.c
U xsrc/external/mit/xedit/dist/lisp/package.c
U xsrc/external/mit/xedit/dist/lisp/write.h
U xsrc/external/mit/xedit/dist/lisp/bytecode.h
U xsrc/external/mit/xedit/dist/lisp/time.h
U xsrc/external/mit/xedit/dist/lisp/debugger.h
U xsrc/external/mit/xedit/dist/lisp/lsp.c
U xsrc/external/mit/xedit/dist/lisp/format.h
U xsrc/external/mit/xedit/dist/lisp/setenv.c
U xsrc/external/mit/xedit/dist/lisp/struct.c
U xsrc/external/mit/xedit/dist/lisp/internal.h
U xsrc/external/mit/xedit/dist/lisp/mathimp.c
U xsrc/external/mit/xedit/dist/lisp/string.c
U xsrc/external/mit/xedit/dist/lisp/io.c
U xsrc/external/mit/xedit/dist/lisp/require.h
U xsrc/external/mit/xedit/dist/lisp/stream.c
U xsrc/external/mit/xedit/dist/lisp/lisp.c
U xsrc/external/mit/xedit/dist/lisp/helper.h
U xsrc/external/mit/xedit/dist/lisp/hash.c
U xsrc/external/mit/xedit/dist/lisp/pathname.c
U xsrc/external/mit/xedit/dist/lisp/read.h
U xsrc/external/mit/xedit/dist/lisp/regex.c
U xsrc/external/mit/xedit/dist/lisp/math.c
U xsrc/external/mit/xedit/dist/lisp/xedit.c
U xsrc/external/mit/xedit/dist/lisp/core.c
U xsrc/external/mit/xedit/dist/lisp/README
U xsrc/external/mit/xedit/dist/lisp/getenv.c
U xsrc/external/mit/xedit/dist/lisp/require.c
U xsrc/external/mit/xedit/dist/lisp/stream.h
U xsrc/external/mit/xedit/dist/lisp/lisp.h
U xsrc/external/mit/xedit/dist/lisp/helper.c
U xsrc/external/mit/xedit/dist/lisp/struct.h
U xsrc/external/mit/xedit/dist/lisp/string.h
U xsrc/external/mit/xedit/dist/lisp/io.h
U xsrc/external/mit/xedit/dist/lisp/debugger.c
U xsrc/external/mit/xedit/dist/lisp/format.c
U xsrc/external/mit/xedit/dist/lisp/package.h
U xsrc/external/mit/xedit/dist/lisp/write.c
U xsrc/external/mit/xedit/dist/lisp/bytecode.c
U xsrc/external/mit/xedit/dist/lisp/time.c
U xsrc/external/mit/xedit/dist/lisp/mp/mp.c
U xsrc/external/mit/xedit/dist/lisp/mp/mpi.c
U xsrc/external/mit/xedit/dist/lisp/mp/mp.h
U xsrc/external/mit/xedit/dist/lisp/mp/mpr.c
U xsrc/external/mit/xedit/dist/lisp/modules/xaw.c
U xsrc/external/mit/xedit/dist/lisp/modules/indent.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/x11.c
U xsrc/external/mit/xedit/dist/lisp/modules/xt.c
U xsrc/external/mit/xedit/dist/lisp/modules/xedit.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/syntax.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/psql.c
U xsrc/external/mit/xedit/dist/lisp/modules/lisp.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/auto.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/sh.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/xlog.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/python.lsp
U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/c.lsp
U 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:18 UTC 2022

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

Log Message:
initial import of xfs-1.2.1

Status:

Vendor Tag: xorg
Release Tags:   xfs-1-2-1

U xsrc/external/mit/xfs/dist/ChangeLog
U xsrc/external/mit/xfs/dist/missing
U xsrc/external/mit/xfs/dist/Makefile.am
U xsrc/external/mit/xfs/dist/depcomp
U xsrc/external/mit/xfs/dist/configure
N xsrc/external/mit/xfs/dist/README.md
U xsrc/external/mit/xfs/dist/config.sub
U xsrc/external/mit/xfs/dist/Makefile.in
U xsrc/external/mit/xfs/dist/compile
U xsrc/external/mit/xfs/dist/COPYING
U xsrc/external/mit/xfs/dist/configure.ac
U xsrc/external/mit/xfs/dist/devbook.am
U xsrc/external/mit/xfs/dist/config.guess
U xsrc/external/mit/xfs/dist/INSTALL
U xsrc/external/mit/xfs/dist/aclocal.m4
U xsrc/external/mit/xfs/dist/install-sh
U xsrc/external/mit/xfs/dist/config.h.in
U xsrc/external/mit/xfs/dist/config/Makefile.in
U xsrc/external/mit/xfs/dist/config/Makefile.am
U xsrc/external/mit/xfs/dist/config/config.cpp
U xsrc/external/mit/xfs/dist/man/Makefile.in
U xsrc/external/mit/xfs/dist/man/xfs.man
U xsrc/external/mit/xfs/dist/man/Makefile.am
U xsrc/external/mit/xfs/dist/doc/Makefile.am
U xsrc/external/mit/xfs/dist/doc/Makefile.in
U xsrc/external/mit/xfs/dist/doc/xfs-design.xml
U xsrc/external/mit/xfs/dist/m4/ax_define_dir.m4
U xsrc/external/mit/xfs/dist/include/clientstr.h
U xsrc/external/mit/xfs/dist/include/fsevents.h
U xsrc/external/mit/xfs/dist/include/fsresource.h
U xsrc/external/mit/xfs/dist/include/assert.h
U xsrc/external/mit/xfs/dist/include/authstr.h
U xsrc/external/mit/xfs/dist/include/access.h
U xsrc/external/mit/xfs/dist/include/difsfnst.h
U xsrc/external/mit/xfs/dist/include/closestr.h
U xsrc/external/mit/xfs/dist/include/difsutils.h
U xsrc/external/mit/xfs/dist/include/difs.h
U xsrc/external/mit/xfs/dist/include/globals.h
U xsrc/external/mit/xfs/dist/include/osstruct.h
U xsrc/external/mit/xfs/dist/include/client.h
U xsrc/external/mit/xfs/dist/include/swaprep.h
U xsrc/external/mit/xfs/dist/include/auth.h
U xsrc/external/mit/xfs/dist/include/os.h
U xsrc/external/mit/xfs/dist/include/swapreq.h
U xsrc/external/mit/xfs/dist/include/site.h
U xsrc/external/mit/xfs/dist/include/closure.h
U xsrc/external/mit/xfs/dist/include/misc.h
U xsrc/external/mit/xfs/dist/include/extentst.h
U xsrc/external/mit/xfs/dist/include/difsfn.h
U xsrc/external/mit/xfs/dist/include/servermd.h
U xsrc/external/mit/xfs/dist/include/dispatch.h
U xsrc/external/mit/xfs/dist/difs/fontinfo.c
U xsrc/external/mit/xfs/dist/difs/fonts.c
U xsrc/external/mit/xfs/dist/difs/globals.c
U xsrc/external/mit/xfs/dist/difs/main.c
U xsrc/external/mit/xfs/dist/difs/atom.c
U xsrc/external/mit/xfs/dist/difs/initfonts.c
U xsrc/external/mit/xfs/dist/difs/resource.c
U xsrc/external/mit/xfs/dist/difs/difsutils.c
U xsrc/external/mit/xfs/dist/difs/tables.c
U xsrc/external/mit/xfs/dist/difs/charinfo.c
U xsrc/external/mit/xfs/dist/difs/swaprep.c
U xsrc/external/mit/xfs/dist/difs/extensions.c
U xsrc/external/mit/xfs/dist/difs/swapreq.c
U xsrc/external/mit/xfs/dist/difs/events.c
U xsrc/external/mit/xfs/dist/difs/dispatch.c
U xsrc/external/mit/xfs/dist/os/osglue.c
C xsrc/external/mit/xfs/dist/os/connection.c
U xsrc/external/mit/xfs/dist/os/error.c
U xsrc/external/mit/xfs/dist/os/config.c
U xsrc/external/mit/xfs/dist/os/xfstrans.c
U xsrc/external/mit/xfs/dist/os/access.c
U xsrc/external/mit/xfs/dist/os/osinit.c
U xsrc/external/mit/xfs/dist/os/osdep.h
U xsrc/external/mit/xfs/dist/os/utils.c
U xsrc/external/mit/xfs/dist/os/configstr.h
U xsrc/external/mit/xfs/dist/os/io.c
U xsrc/external/mit/xfs/dist/os/waitfor.c
U xsrc/external/mit/xfs/dist/os/daemon.c

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:18 UTC 2022

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

Log Message:
initial import of xfs-1.2.1

Status:

Vendor Tag: xorg
Release Tags:   xfs-1-2-1

U xsrc/external/mit/xfs/dist/ChangeLog
U xsrc/external/mit/xfs/dist/missing
U xsrc/external/mit/xfs/dist/Makefile.am
U xsrc/external/mit/xfs/dist/depcomp
U xsrc/external/mit/xfs/dist/configure
N xsrc/external/mit/xfs/dist/README.md
U xsrc/external/mit/xfs/dist/config.sub
U xsrc/external/mit/xfs/dist/Makefile.in
U xsrc/external/mit/xfs/dist/compile
U xsrc/external/mit/xfs/dist/COPYING
U xsrc/external/mit/xfs/dist/configure.ac
U xsrc/external/mit/xfs/dist/devbook.am
U xsrc/external/mit/xfs/dist/config.guess
U xsrc/external/mit/xfs/dist/INSTALL
U xsrc/external/mit/xfs/dist/aclocal.m4
U xsrc/external/mit/xfs/dist/install-sh
U xsrc/external/mit/xfs/dist/config.h.in
U xsrc/external/mit/xfs/dist/config/Makefile.in
U xsrc/external/mit/xfs/dist/config/Makefile.am
U xsrc/external/mit/xfs/dist/config/config.cpp
U xsrc/external/mit/xfs/dist/man/Makefile.in
U xsrc/external/mit/xfs/dist/man/xfs.man
U xsrc/external/mit/xfs/dist/man/Makefile.am
U xsrc/external/mit/xfs/dist/doc/Makefile.am
U xsrc/external/mit/xfs/dist/doc/Makefile.in
U xsrc/external/mit/xfs/dist/doc/xfs-design.xml
U xsrc/external/mit/xfs/dist/m4/ax_define_dir.m4
U xsrc/external/mit/xfs/dist/include/clientstr.h
U xsrc/external/mit/xfs/dist/include/fsevents.h
U xsrc/external/mit/xfs/dist/include/fsresource.h
U xsrc/external/mit/xfs/dist/include/assert.h
U xsrc/external/mit/xfs/dist/include/authstr.h
U xsrc/external/mit/xfs/dist/include/access.h
U xsrc/external/mit/xfs/dist/include/difsfnst.h
U xsrc/external/mit/xfs/dist/include/closestr.h
U xsrc/external/mit/xfs/dist/include/difsutils.h
U xsrc/external/mit/xfs/dist/include/difs.h
U xsrc/external/mit/xfs/dist/include/globals.h
U xsrc/external/mit/xfs/dist/include/osstruct.h
U xsrc/external/mit/xfs/dist/include/client.h
U xsrc/external/mit/xfs/dist/include/swaprep.h
U xsrc/external/mit/xfs/dist/include/auth.h
U xsrc/external/mit/xfs/dist/include/os.h
U xsrc/external/mit/xfs/dist/include/swapreq.h
U xsrc/external/mit/xfs/dist/include/site.h
U xsrc/external/mit/xfs/dist/include/closure.h
U xsrc/external/mit/xfs/dist/include/misc.h
U xsrc/external/mit/xfs/dist/include/extentst.h
U xsrc/external/mit/xfs/dist/include/difsfn.h
U xsrc/external/mit/xfs/dist/include/servermd.h
U xsrc/external/mit/xfs/dist/include/dispatch.h
U xsrc/external/mit/xfs/dist/difs/fontinfo.c
U xsrc/external/mit/xfs/dist/difs/fonts.c
U xsrc/external/mit/xfs/dist/difs/globals.c
U xsrc/external/mit/xfs/dist/difs/main.c
U xsrc/external/mit/xfs/dist/difs/atom.c
U xsrc/external/mit/xfs/dist/difs/initfonts.c
U xsrc/external/mit/xfs/dist/difs/resource.c
U xsrc/external/mit/xfs/dist/difs/difsutils.c
U xsrc/external/mit/xfs/dist/difs/tables.c
U xsrc/external/mit/xfs/dist/difs/charinfo.c
U xsrc/external/mit/xfs/dist/difs/swaprep.c
U xsrc/external/mit/xfs/dist/difs/extensions.c
U xsrc/external/mit/xfs/dist/difs/swapreq.c
U xsrc/external/mit/xfs/dist/difs/events.c
U xsrc/external/mit/xfs/dist/difs/dispatch.c
U xsrc/external/mit/xfs/dist/os/osglue.c
C xsrc/external/mit/xfs/dist/os/connection.c
U xsrc/external/mit/xfs/dist/os/error.c
U xsrc/external/mit/xfs/dist/os/config.c
U xsrc/external/mit/xfs/dist/os/xfstrans.c
U xsrc/external/mit/xfs/dist/os/access.c
U xsrc/external/mit/xfs/dist/os/osinit.c
U xsrc/external/mit/xfs/dist/os/osdep.h
U xsrc/external/mit/xfs/dist/os/utils.c
U xsrc/external/mit/xfs/dist/os/configstr.h
U xsrc/external/mit/xfs/dist/os/io.c
U xsrc/external/mit/xfs/dist/os/waitfor.c
U xsrc/external/mit/xfs/dist/os/daemon.c

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:19 UTC 2022

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

Log Message:
initial import of xload-1.1.4

Status:

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

U xsrc/external/mit/xload/dist/config.sub
U xsrc/external/mit/xload/dist/Makefile.am
U xsrc/external/mit/xload/dist/get_load.c
U xsrc/external/mit/xload/dist/get_rload.c
U xsrc/external/mit/xload/dist/xload.h
U xsrc/external/mit/xload/dist/INSTALL
U xsrc/external/mit/xload/dist/Makefile.in
U xsrc/external/mit/xload/dist/config.guess
U xsrc/external/mit/xload/dist/missing
U xsrc/external/mit/xload/dist/depcomp
U xsrc/external/mit/xload/dist/configure.ac
U xsrc/external/mit/xload/dist/install-sh
U xsrc/external/mit/xload/dist/aclocal.m4
C xsrc/external/mit/xload/dist/compile
U xsrc/external/mit/xload/dist/ChangeLog
U xsrc/external/mit/xload/dist/config.h.in
N xsrc/external/mit/xload/dist/README.md
U xsrc/external/mit/xload/dist/xload.bit
U xsrc/external/mit/xload/dist/configure
U xsrc/external/mit/xload/dist/xload.c
U xsrc/external/mit/xload/dist/COPYING
U xsrc/external/mit/xload/dist/m4/ax_define_dir.m4
U xsrc/external/mit/xload/dist/man/Makefile.am
U xsrc/external/mit/xload/dist/man/xload.man
U xsrc/external/mit/xload/dist/man/Makefile.in
U xsrc/external/mit/xload/dist/app-defaults/XLoad

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:19 UTC 2022

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

Log Message:
initial import of xload-1.1.4

Status:

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

U xsrc/external/mit/xload/dist/config.sub
U xsrc/external/mit/xload/dist/Makefile.am
U xsrc/external/mit/xload/dist/get_load.c
U xsrc/external/mit/xload/dist/get_rload.c
U xsrc/external/mit/xload/dist/xload.h
U xsrc/external/mit/xload/dist/INSTALL
U xsrc/external/mit/xload/dist/Makefile.in
U xsrc/external/mit/xload/dist/config.guess
U xsrc/external/mit/xload/dist/missing
U xsrc/external/mit/xload/dist/depcomp
U xsrc/external/mit/xload/dist/configure.ac
U xsrc/external/mit/xload/dist/install-sh
U xsrc/external/mit/xload/dist/aclocal.m4
C xsrc/external/mit/xload/dist/compile
U xsrc/external/mit/xload/dist/ChangeLog
U xsrc/external/mit/xload/dist/config.h.in
N xsrc/external/mit/xload/dist/README.md
U xsrc/external/mit/xload/dist/xload.bit
U xsrc/external/mit/xload/dist/configure
U xsrc/external/mit/xload/dist/xload.c
U xsrc/external/mit/xload/dist/COPYING
U xsrc/external/mit/xload/dist/m4/ax_define_dir.m4
U xsrc/external/mit/xload/dist/man/Makefile.am
U xsrc/external/mit/xload/dist/man/xload.man
U xsrc/external/mit/xload/dist/man/Makefile.in
U xsrc/external/mit/xload/dist/app-defaults/XLoad

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:15 UTC 2022

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

Log Message:
initial import of xfontsel-1.1.0

Status:

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

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:15 UTC 2022

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

Log Message:
initial import of xfontsel-1.1.0

Status:

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

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:21 UTC 2022

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

Log Message:
initial import of xlsfonts-1.0.7

Status:

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

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:40:21 UTC 2022

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

Log Message:
initial import of xlsfonts-1.0.7

Status:

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

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

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

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

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:49:36 UTC 2022

Modified Files:
xsrc/external/mit/xconsole/dist: xconsole.c
xsrc/external/mit/xmodmap/dist: handle.c
Removed Files:
xsrc/external/mit/xcmsdb/dist: README
xsrc/external/mit/xconsole/dist: README
xsrc/external/mit/xwud/dist: README

Log Message:
merge xcmsdb 1.0.6, xconsole 1.0.8, xmodmap 1.0.11, and xwud 1.0.6.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xcmsdb/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xconsole/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xconsole/dist/xconsole.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xmodmap/dist/handle.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xwud/dist/README

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

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:49:36 UTC 2022

Modified Files:
xsrc/external/mit/xconsole/dist: xconsole.c
xsrc/external/mit/xmodmap/dist: handle.c
Removed Files:
xsrc/external/mit/xcmsdb/dist: README
xsrc/external/mit/xconsole/dist: README
xsrc/external/mit/xwud/dist: README

Log Message:
merge xcmsdb 1.0.6, xconsole 1.0.8, xmodmap 1.0.11, and xwud 1.0.6.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xcmsdb/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xconsole/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xconsole/dist/xconsole.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xmodmap/dist/handle.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xwud/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/xconsole/dist/xconsole.c
diff -u xsrc/external/mit/xconsole/dist/xconsole.c:1.5 xsrc/external/mit/xconsole/dist/xconsole.c:1.6
--- xsrc/external/mit/xconsole/dist/xconsole.c:1.5	Mon Mar 17 09:20:46 2014
+++ xsrc/external/mit/xconsole/dist/xconsole.c	Mon Jul 11 08:49:36 2022
@@ -178,7 +178,6 @@ static XrmOptionDescRec options[] = {
 # if defined(TIOCCONS) || defined(SRIOCSREDIR)
 #  define USE_PTY
 static int  tty_fd, pty_fd;
-static char ttydev[64], ptydev[64];
 # endif
 #endif
 
@@ -188,7 +187,7 @@ static char ttydev[64], ptydev[64];
 #endif
 
 #ifdef USE_PTY
-static int get_pty(int *pty, int *tty, char *ttydev, char *ptydev);
+static int get_pty(int *pty, int *tty);
 #endif
 
 #ifdef USE_OSM
@@ -243,7 +242,7 @@ OpenConsole(void)
 #endif
 
 #ifdef USE_PTY
-		if (!input && get_pty (_fd, _fd, ttydev, ptydev) == 0)
+		if (!input && get_pty (_fd, _fd) == 0)
 		{
 # ifdef TIOCCONS
 		int on = 1;
@@ -789,14 +788,17 @@ ScrollLine(Widget w)
  */
 
 static int
-get_pty(int *pty, int *tty, char *ttydev, char *ptydev)
+get_pty(int *pty, int *tty)
 {
 #ifdef HAS_OPENPTY
 	if (openpty(pty, tty, NULL, NULL, NULL) == -1) {
 		return 1;
 	}
 	return 0;
-#elif defined (SVR4) || defined (USE_PTS)
+#else
+	static char ttydev[64], ptydev[64];
+
+#if defined (SVR4) || defined (USE_PTS)
 #if defined (_AIX)
 	if ((*pty = open ("/dev/ptc", O_RDWR)) < 0)
 #else
@@ -823,14 +825,6 @@ get_pty(int *pty, int *tty, char *ttydev
 #else
 	static int devindex, letter = 0;
 
-#ifdef sgi
-	{
-	char *slave;
-	slave = _getpty (pty, O_RDWR, 0622, 0);
-	if ((*tty = open (slave, O_RDWR)) != -1)
-		return 0;
-	}
-#else
 	strcpy (ttydev, "/dev/ttyxx");
 	strcpy (ptydev, "/dev/ptyxx");
 	while (PTYCHAR1[letter]) {
@@ -857,7 +851,6 @@ get_pty(int *pty, int *tty, char *ttydev
 	devindex = 0;
 	(void) letter++;
 	}
-#endif /* sgi else not sgi */
 #endif /* USE_GET_PSEUDOTTY */
 #endif /* SVR4 */
 	/*
@@ -865,6 +858,7 @@ get_pty(int *pty, int *tty, char *ttydev
 	 * condition and let our caller terminate cleanly.
 	 */
 	return(1);
+#endif /* HAS_OPENPTY */
 }
 #endif
 

Index: xsrc/external/mit/xmodmap/dist/handle.c
diff -u xsrc/external/mit/xmodmap/dist/handle.c:1.2 xsrc/external/mit/xmodmap/dist/handle.c:1.3
--- xsrc/external/mit/xmodmap/dist/handle.c:1.2	Sun Jul 19 23:13:49 2015
+++ xsrc/external/mit/xmodmap/dist/handle.c	Mon Jul 11 08:49:36 2022
@@ -37,6 +37,7 @@ from The Open Group.
 #include "xmodmap.h"
 #include "wq.h"
 #include 
+#include 
 
 #ifdef HAVE_STRNCASECMP
 #include 
@@ -59,6 +60,26 @@ struct wq work_queue = {NULL, NULL};
  * common utility routines
  */
 
+/*
+ * This is a combination of reallocf() and reallocarray().
+ * If the realloc fails, it frees the old pointer so it doesn't leak.
+ */
+static void *
+reallocfarray(void *old, size_t num, size_t size)
+{
+static void *new;
+
+if (size > 0 && num > (SIZE_MAX / size)) /* overflow would happen */
+new = NULL;
+else
+new = realloc(old, num * size);
+
+if (new == NULL)
+free(old);
+
+return new;
+}
+
 static KeyCode *
 KeysymToKeycodes(Display *dpy, KeySym keysym, int *pnum_kcs)
 {
@@ -72,7 +93,12 @@ KeysymToKeycodes(Display *dpy, KeySym ke
 		if (!kcs)
 		kcs = malloc(sizeof(KeyCode));
 		else
-		kcs = realloc(kcs, sizeof(KeyCode) * (*pnum_kcs + 1));
+		kcs = reallocfarray(kcs, (*pnum_kcs + 1), sizeof(KeyCode));
+		if (!kcs) {
+		fprintf(stderr, "attempt to allocate %ld byte keycode set",
+			(long) ((*pnum_kcs + 1) * sizeof (KeyCode)));
+		return NULL;
+		}
 		kcs[*pnum_kcs] = i;
 		*pnum_kcs += 1;
 		break;
@@ -690,7 +716,7 @@ do_remove(char *line, int len)
 	}
 	if (nc + num_kcs > tot) {
 	tot = nc + num_kcs;
-	kclist = realloc(kclist, tot * sizeof(KeyCode));
+	kclist = reallocfarray(kclist, tot, sizeof(KeyCode));
 	if (!kclist) {
 		badmsg ("attempt to allocate %ld byte keycode list",
 			(long) (tot * sizeof (KeyCode)));
@@ -708,6 +734,7 @@ do_remove(char *line, int len)
 if (!uop) {
 	badmsg ("attempt to allocate %ld byte 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:01:46 UTC 2022

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

Log Message:
initial import of xorgproto-2022.1

Status:

Vendor Tag: xorg
Release Tags:   xorgproto-2022-1

U xsrc/external/mit/xorgproto/dist/Makefile.am
U xsrc/external/mit/xorgproto/dist/configure
U xsrc/external/mit/xorgproto/dist/configure.ac
U xsrc/external/mit/xorgproto/dist/aclocal.m4
U xsrc/external/mit/xorgproto/dist/compositeproto.txt
U xsrc/external/mit/xorgproto/dist/damageproto.txt
U xsrc/external/mit/xorgproto/dist/dri2proto.txt
U xsrc/external/mit/xorgproto/dist/dri3proto.txt
U xsrc/external/mit/xorgproto/dist/fixesproto.txt
U xsrc/external/mit/xorgproto/dist/PM_spec
U xsrc/external/mit/xorgproto/dist/presentproto.txt
U xsrc/external/mit/xorgproto/dist/randrproto.txt
U xsrc/external/mit/xorgproto/dist/renderproto.txt
U xsrc/external/mit/xorgproto/dist/resproto.txt
U xsrc/external/mit/xorgproto/dist/xv-protocol-v2.txt
U xsrc/external/mit/xorgproto/dist/Makefile.in
U xsrc/external/mit/xorgproto/dist/applewmproto.pc.in
U xsrc/external/mit/xorgproto/dist/bigreqsproto.pc.in
U xsrc/external/mit/xorgproto/dist/compositeproto.pc.in
U xsrc/external/mit/xorgproto/dist/damageproto.pc.in
U xsrc/external/mit/xorgproto/dist/dmxproto.pc.in
U xsrc/external/mit/xorgproto/dist/dpmsproto.pc.in
U xsrc/external/mit/xorgproto/dist/dri2proto.pc.in
U xsrc/external/mit/xorgproto/dist/dri3proto.pc.in
U xsrc/external/mit/xorgproto/dist/evieproto.pc.in
U xsrc/external/mit/xorgproto/dist/fixesproto.pc.in
U xsrc/external/mit/xorgproto/dist/fontcacheproto.pc.in
U xsrc/external/mit/xorgproto/dist/fontsproto.pc.in
U xsrc/external/mit/xorgproto/dist/glproto.pc.in
U xsrc/external/mit/xorgproto/dist/inputproto.pc.in
U xsrc/external/mit/xorgproto/dist/kbproto.pc.in
U xsrc/external/mit/xorgproto/dist/lg3dproto.pc.in
U xsrc/external/mit/xorgproto/dist/presentproto.pc.in
U xsrc/external/mit/xorgproto/dist/printproto.pc.in
U xsrc/external/mit/xorgproto/dist/randrproto.pc.in
U xsrc/external/mit/xorgproto/dist/recordproto.pc.in
U xsrc/external/mit/xorgproto/dist/renderproto.pc.in
U xsrc/external/mit/xorgproto/dist/resourceproto.pc.in
U xsrc/external/mit/xorgproto/dist/scrnsaverproto.pc.in
U xsrc/external/mit/xorgproto/dist/trapproto.pc.in
U xsrc/external/mit/xorgproto/dist/videoproto.pc.in
U xsrc/external/mit/xorgproto/dist/windowswmproto.pc.in
U xsrc/external/mit/xorgproto/dist/xcalibrateproto.pc.in
U xsrc/external/mit/xorgproto/dist/xcmiscproto.pc.in
U xsrc/external/mit/xorgproto/dist/xextproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86bigfontproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86dgaproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86driproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86miscproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86rushproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86vidmodeproto.pc.in
U xsrc/external/mit/xorgproto/dist/xineramaproto.pc.in
U xsrc/external/mit/xorgproto/dist/xproto.pc.in
U xsrc/external/mit/xorgproto/dist/xproxymngproto.pc.in
U xsrc/external/mit/xorgproto/dist/AUTHORS
U xsrc/external/mit/xorgproto/dist/INSTALL
U xsrc/external/mit/xorgproto/dist/README.md
U xsrc/external/mit/xorgproto/dist/compile
U xsrc/external/mit/xorgproto/dist/config.guess
U xsrc/external/mit/xorgproto/dist/config.sub
U xsrc/external/mit/xorgproto/dist/install-sh
U xsrc/external/mit/xorgproto/dist/missing
U xsrc/external/mit/xorgproto/dist/test-driver
U xsrc/external/mit/xorgproto/dist/COPYING-applewmproto
U xsrc/external/mit/xorgproto/dist/COPYING-bigreqsproto
U xsrc/external/mit/xorgproto/dist/COPYING-compositeproto
U xsrc/external/mit/xorgproto/dist/COPYING-damageproto
U xsrc/external/mit/xorgproto/dist/COPYING-dmxproto
U xsrc/external/mit/xorgproto/dist/COPYING-dri2proto
U xsrc/external/mit/xorgproto/dist/COPYING-dri3proto
U xsrc/external/mit/xorgproto/dist/COPYING-evieproto
U xsrc/external/mit/xorgproto/dist/COPYING-fixesproto
U xsrc/external/mit/xorgproto/dist/COPYING-fontcacheproto
U xsrc/external/mit/xorgproto/dist/COPYING-fontsproto
U xsrc/external/mit/xorgproto/dist/COPYING-glproto
U xsrc/external/mit/xorgproto/dist/COPYING-inputproto
U xsrc/external/mit/xorgproto/dist/COPYING-kbproto
U xsrc/external/mit/xorgproto/dist/COPYING-lg3dproto
U xsrc/external/mit/xorgproto/dist/COPYING-pmproto
U xsrc/external/mit/xorgproto/dist/COPYING-presentproto
U xsrc/external/mit/xorgproto/dist/COPYING-printproto
U xsrc/external/mit/xorgproto/dist/COPYING-randrproto
U xsrc/external/mit/xorgproto/dist/COPYING-recordproto
U xsrc/external/mit/xorgproto/dist/COPYING-renderproto
U xsrc/external/mit/xorgproto/dist/COPYING-resourceproto
U xsrc/external/mit/xorgproto/dist/COPYING-scrnsaverproto
U xsrc/external/mit/xorgproto/dist/COPYING-trapproto
U xsrc/external/mit/xorgproto/dist/COPYING-videoproto
U xsrc/external/mit/xorgproto/dist/COPYING-windowswmproto
U xsrc/external/mit/xorgproto/dist/COPYING-x11proto
U 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:01:46 UTC 2022

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

Log Message:
initial import of xorgproto-2022.1

Status:

Vendor Tag: xorg
Release Tags:   xorgproto-2022-1

U xsrc/external/mit/xorgproto/dist/Makefile.am
U xsrc/external/mit/xorgproto/dist/configure
U xsrc/external/mit/xorgproto/dist/configure.ac
U xsrc/external/mit/xorgproto/dist/aclocal.m4
U xsrc/external/mit/xorgproto/dist/compositeproto.txt
U xsrc/external/mit/xorgproto/dist/damageproto.txt
U xsrc/external/mit/xorgproto/dist/dri2proto.txt
U xsrc/external/mit/xorgproto/dist/dri3proto.txt
U xsrc/external/mit/xorgproto/dist/fixesproto.txt
U xsrc/external/mit/xorgproto/dist/PM_spec
U xsrc/external/mit/xorgproto/dist/presentproto.txt
U xsrc/external/mit/xorgproto/dist/randrproto.txt
U xsrc/external/mit/xorgproto/dist/renderproto.txt
U xsrc/external/mit/xorgproto/dist/resproto.txt
U xsrc/external/mit/xorgproto/dist/xv-protocol-v2.txt
U xsrc/external/mit/xorgproto/dist/Makefile.in
U xsrc/external/mit/xorgproto/dist/applewmproto.pc.in
U xsrc/external/mit/xorgproto/dist/bigreqsproto.pc.in
U xsrc/external/mit/xorgproto/dist/compositeproto.pc.in
U xsrc/external/mit/xorgproto/dist/damageproto.pc.in
U xsrc/external/mit/xorgproto/dist/dmxproto.pc.in
U xsrc/external/mit/xorgproto/dist/dpmsproto.pc.in
U xsrc/external/mit/xorgproto/dist/dri2proto.pc.in
U xsrc/external/mit/xorgproto/dist/dri3proto.pc.in
U xsrc/external/mit/xorgproto/dist/evieproto.pc.in
U xsrc/external/mit/xorgproto/dist/fixesproto.pc.in
U xsrc/external/mit/xorgproto/dist/fontcacheproto.pc.in
U xsrc/external/mit/xorgproto/dist/fontsproto.pc.in
U xsrc/external/mit/xorgproto/dist/glproto.pc.in
U xsrc/external/mit/xorgproto/dist/inputproto.pc.in
U xsrc/external/mit/xorgproto/dist/kbproto.pc.in
U xsrc/external/mit/xorgproto/dist/lg3dproto.pc.in
U xsrc/external/mit/xorgproto/dist/presentproto.pc.in
U xsrc/external/mit/xorgproto/dist/printproto.pc.in
U xsrc/external/mit/xorgproto/dist/randrproto.pc.in
U xsrc/external/mit/xorgproto/dist/recordproto.pc.in
U xsrc/external/mit/xorgproto/dist/renderproto.pc.in
U xsrc/external/mit/xorgproto/dist/resourceproto.pc.in
U xsrc/external/mit/xorgproto/dist/scrnsaverproto.pc.in
U xsrc/external/mit/xorgproto/dist/trapproto.pc.in
U xsrc/external/mit/xorgproto/dist/videoproto.pc.in
U xsrc/external/mit/xorgproto/dist/windowswmproto.pc.in
U xsrc/external/mit/xorgproto/dist/xcalibrateproto.pc.in
U xsrc/external/mit/xorgproto/dist/xcmiscproto.pc.in
U xsrc/external/mit/xorgproto/dist/xextproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86bigfontproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86dgaproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86driproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86miscproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86rushproto.pc.in
U xsrc/external/mit/xorgproto/dist/xf86vidmodeproto.pc.in
U xsrc/external/mit/xorgproto/dist/xineramaproto.pc.in
U xsrc/external/mit/xorgproto/dist/xproto.pc.in
U xsrc/external/mit/xorgproto/dist/xproxymngproto.pc.in
U xsrc/external/mit/xorgproto/dist/AUTHORS
U xsrc/external/mit/xorgproto/dist/INSTALL
U xsrc/external/mit/xorgproto/dist/README.md
U xsrc/external/mit/xorgproto/dist/compile
U xsrc/external/mit/xorgproto/dist/config.guess
U xsrc/external/mit/xorgproto/dist/config.sub
U xsrc/external/mit/xorgproto/dist/install-sh
U xsrc/external/mit/xorgproto/dist/missing
U xsrc/external/mit/xorgproto/dist/test-driver
U xsrc/external/mit/xorgproto/dist/COPYING-applewmproto
U xsrc/external/mit/xorgproto/dist/COPYING-bigreqsproto
U xsrc/external/mit/xorgproto/dist/COPYING-compositeproto
U xsrc/external/mit/xorgproto/dist/COPYING-damageproto
U xsrc/external/mit/xorgproto/dist/COPYING-dmxproto
U xsrc/external/mit/xorgproto/dist/COPYING-dri2proto
U xsrc/external/mit/xorgproto/dist/COPYING-dri3proto
U xsrc/external/mit/xorgproto/dist/COPYING-evieproto
U xsrc/external/mit/xorgproto/dist/COPYING-fixesproto
U xsrc/external/mit/xorgproto/dist/COPYING-fontcacheproto
U xsrc/external/mit/xorgproto/dist/COPYING-fontsproto
U xsrc/external/mit/xorgproto/dist/COPYING-glproto
U xsrc/external/mit/xorgproto/dist/COPYING-inputproto
U xsrc/external/mit/xorgproto/dist/COPYING-kbproto
U xsrc/external/mit/xorgproto/dist/COPYING-lg3dproto
U xsrc/external/mit/xorgproto/dist/COPYING-pmproto
U xsrc/external/mit/xorgproto/dist/COPYING-presentproto
U xsrc/external/mit/xorgproto/dist/COPYING-printproto
U xsrc/external/mit/xorgproto/dist/COPYING-randrproto
U xsrc/external/mit/xorgproto/dist/COPYING-recordproto
U xsrc/external/mit/xorgproto/dist/COPYING-renderproto
U xsrc/external/mit/xorgproto/dist/COPYING-resourceproto
U xsrc/external/mit/xorgproto/dist/COPYING-scrnsaverproto
U xsrc/external/mit/xorgproto/dist/COPYING-trapproto
U xsrc/external/mit/xorgproto/dist/COPYING-videoproto
U xsrc/external/mit/xorgproto/dist/COPYING-windowswmproto
U xsrc/external/mit/xorgproto/dist/COPYING-x11proto
U 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:42:43 UTC 2022

Modified Files:
xsrc/external/mit/xfontsel/dist: compile
xsrc/external/mit/xfs/dist/os: connection.c
xsrc/external/mit/xload/dist: compile
xsrc/external/mit/xlsfonts/dist: compile xlsfonts.c
Added Files:
xsrc/external/mit/xedit/dist: compile
Removed Files:
xsrc/external/mit/xdpyinfo/dist: README
xsrc/external/mit/xfontsel/dist: README
xsrc/external/mit/xfs/dist: README
xsrc/external/mit/xload/dist: README
xsrc/external/mit/xlsfonts/dist: README

Log Message:
merge xdpyinfo 1.3.3, xedit 1.2.3, xfontsel 1.1.0, xfs 1.2.1, xload 1.1.4,
and xlsfonts 1.0.7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xdpyinfo/dist/README
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xedit/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfontsel/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfontsel/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfs/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfs/dist/os/connection.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xload/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xload/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xlsfonts/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xlsfonts/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xlsfonts/dist/xlsfonts.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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:42:43 UTC 2022

Modified Files:
xsrc/external/mit/xfontsel/dist: compile
xsrc/external/mit/xfs/dist/os: connection.c
xsrc/external/mit/xload/dist: compile
xsrc/external/mit/xlsfonts/dist: compile xlsfonts.c
Added Files:
xsrc/external/mit/xedit/dist: compile
Removed Files:
xsrc/external/mit/xdpyinfo/dist: README
xsrc/external/mit/xfontsel/dist: README
xsrc/external/mit/xfs/dist: README
xsrc/external/mit/xload/dist: README
xsrc/external/mit/xlsfonts/dist: README

Log Message:
merge xdpyinfo 1.3.3, xedit 1.2.3, xfontsel 1.1.0, xfs 1.2.1, xload 1.1.4,
and xlsfonts 1.0.7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xdpyinfo/dist/README
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xedit/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfontsel/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfontsel/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfs/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfs/dist/os/connection.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xload/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xload/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xlsfonts/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xlsfonts/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xlsfonts/dist/xlsfonts.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/xfontsel/dist/compile
diff -u xsrc/external/mit/xfontsel/dist/compile:1.3 xsrc/external/mit/xfontsel/dist/compile:1.4
--- xsrc/external/mit/xfontsel/dist/compile:1.3	Sun Mar 11 08:15:23 2018
+++ xsrc/external/mit/xfontsel/dist/compile	Mon Jul 11 08:42:42 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:

Index: xsrc/external/mit/xfs/dist/os/connection.c
diff -u xsrc/external/mit/xfs/dist/os/connection.c:1.3 xsrc/external/mit/xfs/dist/os/connection.c:1.4
--- xsrc/external/mit/xfs/dist/os/connection.c:1.3	Sun Mar 11 10:08:03 2018
+++ xsrc/external/mit/xfs/dist/os/connection.c	Mon Jul 11 08:42:42 2022
@@ -480,7 +480,7 @@ CloseDownConnection(ClientPtr client)
 /
  * IgnoreClient
  *Removes one client from input masks.
- *Must have cooresponding call to AttendClient.
+ *Must have corresponding call to AttendClient.
  /
 
 static fd_set IgnoredClientsWithInput;

Index: xsrc/external/mit/xload/dist/compile
diff -u xsrc/external/mit/xload/dist/compile:1.4 xsrc/external/mit/xload/dist/compile:1.5
--- xsrc/external/mit/xload/dist/compile:1.4	Sun Mar 11 08:35:14 2018
+++ xsrc/external/mit/xload/dist/compile	Mon Jul 11 08:42:43 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
@@ 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:48:02 UTC 2022

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

Log Message:
initial import of xcmsdb-1.0.6

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:48:04 UTC 2022

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

Log Message:
initial import of xconsole-1.0.8

Status:

Vendor Tag: xorg
Release Tags:   xconsole-1-0-8

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:48:01 UTC 2022

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

Log Message:
initial import of setxkbmap-1.3.3

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:48:01 UTC 2022

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

Log Message:
initial import of setxkbmap-1.3.3

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:48:02 UTC 2022

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

Log Message:
initial import of xcmsdb-1.0.6

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:48:07 UTC 2022

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

Log Message:
initial import of xwud-1.0.6

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:48:05 UTC 2022

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

Log Message:
initial import of xmodmap-1.0.11

Status:

Vendor Tag: xorg
Release Tags:   xmodmap-1-0-11

U xsrc/external/mit/xmodmap/dist/autogen.sh
U xsrc/external/mit/xmodmap/dist/xmodmap.h
U xsrc/external/mit/xmodmap/dist/Makefile.am
U xsrc/external/mit/xmodmap/dist/swap.km
U xsrc/external/mit/xmodmap/dist/missing
U xsrc/external/mit/xmodmap/dist/depcomp
U xsrc/external/mit/xmodmap/dist/configure
U xsrc/external/mit/xmodmap/dist/configure.ac
U xsrc/external/mit/xmodmap/dist/Makefile.in
U xsrc/external/mit/xmodmap/dist/COPYING
U xsrc/external/mit/xmodmap/dist/config.sub
U xsrc/external/mit/xmodmap/dist/README.md
U xsrc/external/mit/xmodmap/dist/wq.h
U xsrc/external/mit/xmodmap/dist/compile
U xsrc/external/mit/xmodmap/dist/ChangeLog
U xsrc/external/mit/xmodmap/dist/AUTHORS
U xsrc/external/mit/xmodmap/dist/config.guess
U xsrc/external/mit/xmodmap/dist/xmodmap.c
U xsrc/external/mit/xmodmap/dist/exec.c
U xsrc/external/mit/xmodmap/dist/install-sh
U xsrc/external/mit/xmodmap/dist/pf.c
U xsrc/external/mit/xmodmap/dist/aclocal.m4
U xsrc/external/mit/xmodmap/dist/config.h.in
C xsrc/external/mit/xmodmap/dist/handle.c
U xsrc/external/mit/xmodmap/dist/INSTALL
U xsrc/external/mit/xmodmap/dist/man/Makefile.in
U xsrc/external/mit/xmodmap/dist/man/Makefile.am
U xsrc/external/mit/xmodmap/dist/man/xmodmap.man

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:48:07 UTC 2022

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

Log Message:
initial import of xwud-1.0.6

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:48:04 UTC 2022

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

Log Message:
initial import of xconsole-1.0.8

Status:

Vendor Tag: xorg
Release Tags:   xconsole-1-0-8

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:48:05 UTC 2022

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

Log Message:
initial import of xmodmap-1.0.11

Status:

Vendor Tag: xorg
Release Tags:   xmodmap-1-0-11

U xsrc/external/mit/xmodmap/dist/autogen.sh
U xsrc/external/mit/xmodmap/dist/xmodmap.h
U xsrc/external/mit/xmodmap/dist/Makefile.am
U xsrc/external/mit/xmodmap/dist/swap.km
U xsrc/external/mit/xmodmap/dist/missing
U xsrc/external/mit/xmodmap/dist/depcomp
U xsrc/external/mit/xmodmap/dist/configure
U xsrc/external/mit/xmodmap/dist/configure.ac
U xsrc/external/mit/xmodmap/dist/Makefile.in
U xsrc/external/mit/xmodmap/dist/COPYING
U xsrc/external/mit/xmodmap/dist/config.sub
U xsrc/external/mit/xmodmap/dist/README.md
U xsrc/external/mit/xmodmap/dist/wq.h
U xsrc/external/mit/xmodmap/dist/compile
U xsrc/external/mit/xmodmap/dist/ChangeLog
U xsrc/external/mit/xmodmap/dist/AUTHORS
U xsrc/external/mit/xmodmap/dist/config.guess
U xsrc/external/mit/xmodmap/dist/xmodmap.c
U xsrc/external/mit/xmodmap/dist/exec.c
U xsrc/external/mit/xmodmap/dist/install-sh
U xsrc/external/mit/xmodmap/dist/pf.c
U xsrc/external/mit/xmodmap/dist/aclocal.m4
U xsrc/external/mit/xmodmap/dist/config.h.in
C xsrc/external/mit/xmodmap/dist/handle.c
U xsrc/external/mit/xmodmap/dist/INSTALL
U xsrc/external/mit/xmodmap/dist/man/Makefile.in
U xsrc/external/mit/xmodmap/dist/man/Makefile.am
U xsrc/external/mit/xmodmap/dist/man/xmodmap.man

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

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

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 11 08:51:22 UTC 2022

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

Log Message:
link in xrandr.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/setxkbmap/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/setxkbmap

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 11 08:51:22 UTC 2022

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

Log Message:
link in xrandr.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/setxkbmap/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/setxkbmap/Makefile
diff -u src/external/mit/xorg/bin/setxkbmap/Makefile:1.4 src/external/mit/xorg/bin/setxkbmap/Makefile:1.5
--- src/external/mit/xorg/bin/setxkbmap/Makefile:1.4	Sun Jul 19 22:30:58 2015
+++ src/external/mit/xorg/bin/setxkbmap/Makefile	Mon Jul 11 08:51:22 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2015/07/19 22:30:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2022/07/11 08:51:22 mrg Exp $
 
 .include 
 
@@ -7,8 +7,8 @@ PROG=	setxkbmap
 CPPFLAGS+=	-DDFLT_XKB_CONFIG_ROOT=\"${X11LIBDIR}/xkb\" \
 		-D__XKBDEFRULES__=${__XKBDEFRULES__}
 
-LDADD+=	-lxkbfile -lXext -lX11
-DPADD+=	${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
+LDADD+=	-lXrandr -lxkbfile -lXext -lX11
+DPADD+=	${LIBXRANDR} ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
 
 .PATH:	${X11SRCDIR.${PROG}}
 .PATH:	${X11SRCDIR.${PROG}}/man

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:31:31 UTC 2022

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

Log Message:
initial import of appres-1.0.6

Status:

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

U xsrc/external/mit/appres/dist/Makefile.in
U xsrc/external/mit/appres/dist/appres.c
U xsrc/external/mit/appres/dist/depcomp
U xsrc/external/mit/appres/dist/missing
U xsrc/external/mit/appres/dist/COPYING
U xsrc/external/mit/appres/dist/Makefile.am
U xsrc/external/mit/appres/dist/configure
N xsrc/external/mit/appres/dist/README.md
U xsrc/external/mit/appres/dist/configure.ac
U xsrc/external/mit/appres/dist/install-sh
C xsrc/external/mit/appres/dist/compile
U xsrc/external/mit/appres/dist/ChangeLog
U xsrc/external/mit/appres/dist/aclocal.m4
U xsrc/external/mit/appres/dist/AUTHORS
U xsrc/external/mit/appres/dist/config.guess
U xsrc/external/mit/appres/dist/config.h.in
U xsrc/external/mit/appres/dist/config.sub
U xsrc/external/mit/appres/dist/INSTALL
U xsrc/external/mit/appres/dist/man/appres.man
U xsrc/external/mit/appres/dist/man/Makefile.in
U xsrc/external/mit/appres/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/appres/dist

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:31:32 UTC 2022

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

Log Message:
initial import of editres-1.0.8

Status:

Vendor Tag: xorg
Release Tags:   editres-1-0-8

U xsrc/external/mit/editres/dist/AUTHORS
U xsrc/external/mit/editres/dist/compile
U xsrc/external/mit/editres/dist/handler.c
U xsrc/external/mit/editres/dist/widgets.c
U xsrc/external/mit/editres/dist/wtree.c
U xsrc/external/mit/editres/dist/COPYING
U xsrc/external/mit/editres/dist/setvalues.c
U xsrc/external/mit/editres/dist/config.sub
U xsrc/external/mit/editres/dist/depcomp
U xsrc/external/mit/editres/dist/configure
U xsrc/external/mit/editres/dist/missing
U xsrc/external/mit/editres/dist/actions.c
U xsrc/external/mit/editres/dist/config.h.in
N xsrc/external/mit/editres/dist/README.md
U xsrc/external/mit/editres/dist/configure.ac
U xsrc/external/mit/editres/dist/ChangeLog
U xsrc/external/mit/editres/dist/INSTALL
U xsrc/external/mit/editres/dist/install-sh
U xsrc/external/mit/editres/dist/aclocal.m4
U xsrc/external/mit/editres/dist/config.guess
U xsrc/external/mit/editres/dist/editresP.h
U xsrc/external/mit/editres/dist/Makefile.am
U xsrc/external/mit/editres/dist/editres.c
U xsrc/external/mit/editres/dist/utils.c
U xsrc/external/mit/editres/dist/svpopup.c
U xsrc/external/mit/editres/dist/comm.c
U xsrc/external/mit/editres/dist/Makefile.in
U xsrc/external/mit/editres/dist/geometry.c
U xsrc/external/mit/editres/dist/man/editres.man
U xsrc/external/mit/editres/dist/man/Makefile.am
U xsrc/external/mit/editres/dist/man/Makefile.in
U xsrc/external/mit/editres/dist/app-defaults/Editres
U xsrc/external/mit/editres/dist/app-defaults/Editres-color

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:31:31 UTC 2022

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

Log Message:
initial import of appres-1.0.6

Status:

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

U xsrc/external/mit/appres/dist/Makefile.in
U xsrc/external/mit/appres/dist/appres.c
U xsrc/external/mit/appres/dist/depcomp
U xsrc/external/mit/appres/dist/missing
U xsrc/external/mit/appres/dist/COPYING
U xsrc/external/mit/appres/dist/Makefile.am
U xsrc/external/mit/appres/dist/configure
N xsrc/external/mit/appres/dist/README.md
U xsrc/external/mit/appres/dist/configure.ac
U xsrc/external/mit/appres/dist/install-sh
C xsrc/external/mit/appres/dist/compile
U xsrc/external/mit/appres/dist/ChangeLog
U xsrc/external/mit/appres/dist/aclocal.m4
U xsrc/external/mit/appres/dist/AUTHORS
U xsrc/external/mit/appres/dist/config.guess
U xsrc/external/mit/appres/dist/config.h.in
U xsrc/external/mit/appres/dist/config.sub
U xsrc/external/mit/appres/dist/INSTALL
U xsrc/external/mit/appres/dist/man/appres.man
U xsrc/external/mit/appres/dist/man/Makefile.in
U xsrc/external/mit/appres/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/appres/dist

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:31:34 UTC 2022

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

Log Message:
initial import of listres-1.0.5

Status:

Vendor Tag: xorg
Release Tags:   listres-1-0-5

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:31:34 UTC 2022

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

Log Message:
initial import of listres-1.0.5

Status:

Vendor Tag: xorg
Release Tags:   listres-1-0-5

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:31:32 UTC 2022

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

Log Message:
initial import of editres-1.0.8

Status:

Vendor Tag: xorg
Release Tags:   editres-1-0-8

U xsrc/external/mit/editres/dist/AUTHORS
U xsrc/external/mit/editres/dist/compile
U xsrc/external/mit/editres/dist/handler.c
U xsrc/external/mit/editres/dist/widgets.c
U xsrc/external/mit/editres/dist/wtree.c
U xsrc/external/mit/editres/dist/COPYING
U xsrc/external/mit/editres/dist/setvalues.c
U xsrc/external/mit/editres/dist/config.sub
U xsrc/external/mit/editres/dist/depcomp
U xsrc/external/mit/editres/dist/configure
U xsrc/external/mit/editres/dist/missing
U xsrc/external/mit/editres/dist/actions.c
U xsrc/external/mit/editres/dist/config.h.in
N xsrc/external/mit/editres/dist/README.md
U xsrc/external/mit/editres/dist/configure.ac
U xsrc/external/mit/editres/dist/ChangeLog
U xsrc/external/mit/editres/dist/INSTALL
U xsrc/external/mit/editres/dist/install-sh
U xsrc/external/mit/editres/dist/aclocal.m4
U xsrc/external/mit/editres/dist/config.guess
U xsrc/external/mit/editres/dist/editresP.h
U xsrc/external/mit/editres/dist/Makefile.am
U xsrc/external/mit/editres/dist/editres.c
U xsrc/external/mit/editres/dist/utils.c
U xsrc/external/mit/editres/dist/svpopup.c
U xsrc/external/mit/editres/dist/comm.c
U xsrc/external/mit/editres/dist/Makefile.in
U xsrc/external/mit/editres/dist/geometry.c
U xsrc/external/mit/editres/dist/man/editres.man
U xsrc/external/mit/editres/dist/man/Makefile.am
U xsrc/external/mit/editres/dist/man/Makefile.in
U xsrc/external/mit/editres/dist/app-defaults/Editres
U xsrc/external/mit/editres/dist/app-defaults/Editres-color

No conflicts created by this import

CVS commit: src/sys/net

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Jul 11 07:36:56 UTC 2022

Modified Files:
src/sys/net: if.c

Log Message:
Grammar in a comment.


To generate a diff of this commit:
cvs rdiff -u -r1.507 -r1.508 src/sys/net/if.c

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

CVS commit: src/sys/net

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Jul 11 07:36:56 UTC 2022

Modified Files:
src/sys/net: if.c

Log Message:
Grammar in a comment.


To generate a diff of this commit:
cvs rdiff -u -r1.507 -r1.508 src/sys/net/if.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/net/if.c
diff -u src/sys/net/if.c:1.507 src/sys/net/if.c:1.508
--- src/sys/net/if.c:1.507	Fri Jul  8 07:02:47 2022
+++ src/sys/net/if.c	Mon Jul 11 07:36:56 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.507 2022/07/08 07:02:47 skrll Exp $	*/
+/*	$NetBSD: if.c,v 1.508 2022/07/11 07:36:56 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.507 2022/07/08 07:02:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.508 2022/07/11 07:36:56 skrll Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1867,8 +1867,8 @@ ifa_remove(struct ifnet *ifp, struct ifa
 	KASSERT(ifa->ifa_ifp == ifp);
 	/*
 	 * Check MP-safety for IFEF_MPSAFE drivers.
-	 * if_is_deactivated indicates ifa_remove is called form if_detach
-	 * where is safe even if IFNET_LOCK isn't held.
+	 * if_is_deactivated indicates ifa_remove is called fromm if_detach
+	 * where it is safe even if IFNET_LOCK isn't held.
 	 */
 	KASSERT(!if_is_mpsafe(ifp) || if_is_deactivated(ifp) || IFNET_LOCKED(ifp));
 

CVS commit: src/sys/net

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Jul 11 07:40:58 UTC 2022

Modified Files:
src/sys/net: if.c

Log Message:
KNF two comments.


To generate a diff of this commit:
cvs rdiff -u -r1.508 -r1.509 src/sys/net/if.c

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

CVS commit: src/sys/net

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Jul 11 07:40:58 UTC 2022

Modified Files:
src/sys/net: if.c

Log Message:
KNF two comments.


To generate a diff of this commit:
cvs rdiff -u -r1.508 -r1.509 src/sys/net/if.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/net/if.c
diff -u src/sys/net/if.c:1.508 src/sys/net/if.c:1.509
--- src/sys/net/if.c:1.508	Mon Jul 11 07:36:56 2022
+++ src/sys/net/if.c	Mon Jul 11 07:40:58 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.508 2022/07/11 07:36:56 skrll Exp $	*/
+/*	$NetBSD: if.c,v 1.509 2022/07/11 07:40:58 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.508 2022/07/11 07:36:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.509 2022/07/11 07:40:58 skrll Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -2424,7 +2424,8 @@ if_link_state_change_work(struct work *w
 	KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	s = splnet();
 
-	/* Pop a link state change from the queue and process it.
+	/*
+	 * Pop a link state change from the queue and process it.
 	 * If there is nothing to process then if_detach() has been called.
 	 * We keep if_link_scheduled = true so the queue can safely drain
 	 * without more work being queued. */
@@ -3869,7 +3870,8 @@ if_flags_set(ifnet_t *ifp, const u_short
 		if (cantflags != 0)
 			ifp->if_flags ^= cantflags;
 
-/* Traditionally, we do not call if_ioctl after
+/*
+		 * Traditionally, we do not call if_ioctl after
  * setting/clearing only IFF_PROMISC if the interface
  * isn't IFF_UP.  Uphold that tradition.
 		 */

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:03:31 UTC 2022

Modified Files:
xsrc/external/mit/xclipboard/dist: compile
xsrc/external/mit/xclock/dist: Clock.c
Removed Files:
xsrc/external/mit/bitmap/dist: Dashes Down Excl FlipHoriz FlipVert Fold
Left Right RotateLeft RotateRight Stipple Term Up
xsrc/external/mit/iceauth/dist: README
xsrc/external/mit/xclipboard/dist: README

Log Message:
merge bitmap 1.1.0, iceauth 1.0.9, xclipboard 1.1.4, and xclock 1.1.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/bitmap/dist/Dashes \
xsrc/external/mit/bitmap/dist/Down xsrc/external/mit/bitmap/dist/Excl \
xsrc/external/mit/bitmap/dist/FlipHoriz \
xsrc/external/mit/bitmap/dist/FlipVert xsrc/external/mit/bitmap/dist/Fold \
xsrc/external/mit/bitmap/dist/Left xsrc/external/mit/bitmap/dist/Right \
xsrc/external/mit/bitmap/dist/RotateLeft \
xsrc/external/mit/bitmap/dist/RotateRight \
xsrc/external/mit/bitmap/dist/Stipple xsrc/external/mit/bitmap/dist/Term \
xsrc/external/mit/bitmap/dist/Up
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/iceauth/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xclipboard/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xclipboard/dist/compile
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xclock/dist/Clock.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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:03:31 UTC 2022

Modified Files:
xsrc/external/mit/xclipboard/dist: compile
xsrc/external/mit/xclock/dist: Clock.c
Removed Files:
xsrc/external/mit/bitmap/dist: Dashes Down Excl FlipHoriz FlipVert Fold
Left Right RotateLeft RotateRight Stipple Term Up
xsrc/external/mit/iceauth/dist: README
xsrc/external/mit/xclipboard/dist: README

Log Message:
merge bitmap 1.1.0, iceauth 1.0.9, xclipboard 1.1.4, and xclock 1.1.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/bitmap/dist/Dashes \
xsrc/external/mit/bitmap/dist/Down xsrc/external/mit/bitmap/dist/Excl \
xsrc/external/mit/bitmap/dist/FlipHoriz \
xsrc/external/mit/bitmap/dist/FlipVert xsrc/external/mit/bitmap/dist/Fold \
xsrc/external/mit/bitmap/dist/Left xsrc/external/mit/bitmap/dist/Right \
xsrc/external/mit/bitmap/dist/RotateLeft \
xsrc/external/mit/bitmap/dist/RotateRight \
xsrc/external/mit/bitmap/dist/Stipple xsrc/external/mit/bitmap/dist/Term \
xsrc/external/mit/bitmap/dist/Up
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/iceauth/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xclipboard/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xclipboard/dist/compile
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xclock/dist/Clock.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/xclipboard/dist/compile
diff -u xsrc/external/mit/xclipboard/dist/compile:1.3 xsrc/external/mit/xclipboard/dist/compile:1.4
--- xsrc/external/mit/xclipboard/dist/compile:1.3	Mon Mar 17 09:20:46 2014
+++ xsrc/external/mit/xclipboard/dist/compile	Mon Jul 11 08:03:31 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-2013 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:

Index: xsrc/external/mit/xclock/dist/Clock.c
diff -u xsrc/external/mit/xclock/dist/Clock.c:1.3 xsrc/external/mit/xclock/dist/Clock.c:1.4
--- xsrc/external/mit/xclock/dist/Clock.c:1.3	Mon Jul 15 04:54:47 2019
+++ xsrc/external/mit/xclock/dist/Clock.c	Mon Jul 11 08:03:31 2022
@@ -25,7 +25,6 @@ Except as contained in this notice, the 
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
-
 Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
 All Rights Reserved
@@ -76,9 +75,10 @@ SOFTWARE.
 /* $XFree86: xc/programs/xclock/Clock.c,v 3.25 2003/07/04 16:24:30 eich Exp $ */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
 #endif
 
+#define _GNU_SOURCE
 #include 
 #include 
 #include 
@@ -87,6 +87,7 @@ SOFTWARE.
 #include 
 #include 
 #include 
+#include 
 #if !defined(NO_I18N) && defined(HAVE_ICONV) && defined(HAVE_NL_LANGINFO)
 #include 
 #include 
@@ -108,15 +109,14 @@ SOFTWARE.
 #endif
 
 #ifndef NO_I18N
-#include  /* for getenv() */
+#include  /* for getenv() */
 #include 
-extern Boolean no_locale; /* if True, use old (unlocalized) behaviour */
+extern Boolean no_locale;   /* if True, use old (unlocalized) behaviour */
 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 09:13:32 UTC 2022

Modified Files:
xsrc/external/mit/mkfontscale/dist: mkfontscale.c
xsrc/external/mit/twm/dist/man: twm.man
xsrc/external/mit/twm/dist/src: util.c util.h
xsrc/external/mit/xauth/dist: process.c
xsrc/external/mit/xdm/dist: compile
xsrc/external/mit/xdm/dist/greeter: Login.c
xsrc/external/mit/xdm/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4
xsrc/external/mit/xdm/dist/man: xdm.man
xsrc/external/mit/xdm/dist/xdm: dm.c
Removed Files:
xsrc/external/mit/twm/dist: README
xsrc/external/mit/xauth/dist/tests: test_xauth.c

Log Message:
merge mkfontscale 1.2.2, twm 1.0.12, xauth 1.1.2, and xdm 1.1.13.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/mkfontscale/dist/mkfontscale.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/twm/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/twm/dist/man/twm.man
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/twm/dist/src/util.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/twm/dist/src/util.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xauth/dist/process.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xauth/dist/tests/test_xauth.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdm/dist/compile
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xdm/dist/greeter/Login.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdm/dist/m4/libtool.m4 \
xsrc/external/mit/xdm/dist/m4/ltoptions.m4 \
xsrc/external/mit/xdm/dist/m4/ltsugar.m4 \
xsrc/external/mit/xdm/dist/m4/ltversion.m4 \
xsrc/external/mit/xdm/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdm/dist/man/xdm.man
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdm/dist/xdm/dm.c

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/twm

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 11 09:16:06 UTC 2022

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

Log Message:
updates for twm 1.0.12.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/twm/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/twm

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 11 09:16:06 UTC 2022

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

Log Message:
updates for twm 1.0.12.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/twm/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/twm/Makefile
diff -u src/external/mit/xorg/bin/twm/Makefile:1.8 src/external/mit/xorg/bin/twm/Makefile:1.9
--- src/external/mit/xorg/bin/twm/Makefile:1.8	Fri Sep 13 10:31:46 2019
+++ src/external/mit/xorg/bin/twm/Makefile	Mon Jul 11 09:16:06 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2019/09/13 10:31:46 maya Exp $
+#	$NetBSD: Makefile,v 1.9 2022/07/11 09:16:06 mrg Exp $
 
 .include 
 
@@ -16,8 +16,13 @@ X11EXTRAMANTRANSFORMS+=	__datadir__/X11/
 TWMDIR=			${X11SRCDIR.${PROG}}
 
 CPPFLAGS+=		-I. -I${TWMDIR}/src
-CPPFLAGS+=		-DHAVE_MKSTEMP -DXORG_RELEASE=${XORG_RELEASE} \
-			-DXVENDORNAME=${XVENDORNAME}
+CPPFLAGS+=		-DHAVE_MKSTEMP \
+			-DHAVE_XRANDR \
+			-DXORG_RELEASE=${XORG_RELEASE} \
+			-DXVENDORNAME=${XVENDORNAME} \
+			-DAPP_NAME=\"twm\" \
+			-DAPP_CLASS=\"twm\" \
+			-DAPP_VERSION=\"$(VERSION)\"
 
 CPPFLAGS.parse.c=	-DSYSTEM_INIT_FILE=\"${TWMCONFIGDIR}/system.twmrc\"
 
@@ -33,14 +38,14 @@ deftwmrc.c: system.twmrc deftwmrc.sed
 	echo ' * This file is generated automatically from the default' >>$@
 	echo ' * twm bindings file system.twmrc by the twm Makefile.' >>$@
 	echo ' */' >>$@
-	echo 'char *defTwmrc[] = {' >>$@
+	echo 'const unsigned char *defTwmrc[] = {' >>$@
 	${TOOL_SED} -f ${TWMDIR}/src/deftwmrc.sed \
 	 < ${TWMDIR}/src/system.twmrc >>$@
 	echo '(char *) 0 };' >>$@
 
 
-LDADD+=	-lXmu -lXt -lSM -lICE -lXext -lX11
-DPADD+=	${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+=	-lXrandr -lXmu -lXt -lSM -lICE -lXext -lX11
+DPADD+=	${LIBXRANDR} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
 .PATH:	${TWMDIR}/src ${TWMDIR}/man
 
@@ -52,3 +57,6 @@ COPTS.util.c+=	-Wno-error
 
 .include 
 .include 
+
+# Needs bsd.x11.mk
+VERSION!=		${PRINT_PACKAGE_VERSION} ${X11SRCDIR.twm}/configure

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 09:08:05 UTC 2022

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

Log Message:
initial import of mkfontscale-1.2.2

Status:

Vendor Tag: xorg
Release Tags:   mkfontscale-1-2-2

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 09:08:11 UTC 2022

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

Log Message:
initial import of xauth-1.1.2

Status:

Vendor Tag: xorg
Release Tags:   xauth-1-1-2

U xsrc/external/mit/xauth/dist/install-sh
U xsrc/external/mit/xauth/dist/Makefile.in
U xsrc/external/mit/xauth/dist/xauth.h
U xsrc/external/mit/xauth/dist/COPYING
U xsrc/external/mit/xauth/dist/config.guess
U xsrc/external/mit/xauth/dist/aclocal.m4
U xsrc/external/mit/xauth/dist/compile
U xsrc/external/mit/xauth/dist/ChangeLog
U xsrc/external/mit/xauth/dist/Makefile.am
U xsrc/external/mit/xauth/dist/depcomp
U xsrc/external/mit/xauth/dist/missing
U xsrc/external/mit/xauth/dist/README.md
U xsrc/external/mit/xauth/dist/test-driver
U xsrc/external/mit/xauth/dist/configure
U xsrc/external/mit/xauth/dist/INSTALL
U xsrc/external/mit/xauth/dist/config.h.in
U xsrc/external/mit/xauth/dist/xauth.c
U xsrc/external/mit/xauth/dist/config.sub
U xsrc/external/mit/xauth/dist/gethost.c
C xsrc/external/mit/xauth/dist/process.c
U xsrc/external/mit/xauth/dist/parsedpy.c
U xsrc/external/mit/xauth/dist/configure.ac
U xsrc/external/mit/xauth/dist/man/Makefile.in
U xsrc/external/mit/xauth/dist/man/Makefile.am
U xsrc/external/mit/xauth/dist/man/xauth.man
U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.script
U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.stdout
U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.stdout
U xsrc/external/mit/xauth/dist/tests/setup-sourced
U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stderr
U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.script
U xsrc/external/mit/xauth/dist/tests/040-xauth-source.stdout
U xsrc/external/mit/xauth/dist/tests/Makefile.am
N xsrc/external/mit/xauth/dist/tests/test_xauth
U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.stdout
U xsrc/external/mit/xauth/dist/tests/040-xauth-source.script
U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stdout
U xsrc/external/mit/xauth/dist/tests/Makefile.in
U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.script
U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.script

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 09:08:14 UTC 2022

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

Log Message:
initial import of xdm-1.1.13

Status:

Vendor Tag: xorg
Release Tags:   xdm-1-1-13

U xsrc/external/mit/xdm/dist/README.md
U xsrc/external/mit/xdm/dist/configure
U xsrc/external/mit/xdm/dist/ChangeLog
U xsrc/external/mit/xdm/dist/config.h.in
U xsrc/external/mit/xdm/dist/install-sh
U xsrc/external/mit/xdm/dist/config.guess
U xsrc/external/mit/xdm/dist/aclocal.m4
U xsrc/external/mit/xdm/dist/INSTALL
U xsrc/external/mit/xdm/dist/Makefile.in
U xsrc/external/mit/xdm/dist/depcomp
U xsrc/external/mit/xdm/dist/ltmain.sh
U xsrc/external/mit/xdm/dist/configure.ac
U xsrc/external/mit/xdm/dist/missing
U xsrc/external/mit/xdm/dist/Makefile.am
U xsrc/external/mit/xdm/dist/COPYING
U xsrc/external/mit/xdm/dist/xdm.service.in
U xsrc/external/mit/xdm/dist/config.sub
C xsrc/external/mit/xdm/dist/compile
U xsrc/external/mit/xdm/dist/AUTHORS
U xsrc/external/mit/xdm/dist/xdm/reset.c
U xsrc/external/mit/xdm/dist/xdm/choose.c
U xsrc/external/mit/xdm/dist/xdm/session.c
U xsrc/external/mit/xdm/dist/xdm/genauth.c
U xsrc/external/mit/xdm/dist/xdm/xdmauth.c
U xsrc/external/mit/xdm/dist/xdm/file.c
U xsrc/external/mit/xdm/dist/xdm/access.c
U xsrc/external/mit/xdm/dist/xdm/server.c
U xsrc/external/mit/xdm/dist/xdm/rpcauth.c
U xsrc/external/mit/xdm/dist/xdm/policy.c
U xsrc/external/mit/xdm/dist/xdm/socket.c
U xsrc/external/mit/xdm/dist/xdm/netaddr.c
U xsrc/external/mit/xdm/dist/xdm/mitauth.c
U xsrc/external/mit/xdm/dist/xdm/krb5auth.c
U xsrc/external/mit/xdm/dist/xdm/error.c
U xsrc/external/mit/xdm/dist/xdm/protodpy.c
U xsrc/external/mit/xdm/dist/xdm/Makefile.am
U xsrc/external/mit/xdm/dist/xdm/dpylist.c
U xsrc/external/mit/xdm/dist/xdm/daemon.c
U xsrc/external/mit/xdm/dist/xdm/xdmcp.c
U xsrc/external/mit/xdm/dist/xdm/prngc.c
U xsrc/external/mit/xdm/dist/xdm/Makefile.in
C xsrc/external/mit/xdm/dist/xdm/dm.c
U xsrc/external/mit/xdm/dist/xdm/util.c
U xsrc/external/mit/xdm/dist/xdm/resource.c
U xsrc/external/mit/xdm/dist/xdm/auth.c
U xsrc/external/mit/xdm/dist/greeter/greet.c
U xsrc/external/mit/xdm/dist/greeter/LoginP.h
U xsrc/external/mit/xdm/dist/greeter/Login.h
U xsrc/external/mit/xdm/dist/greeter/verify.c
U xsrc/external/mit/xdm/dist/greeter/Makefile.in
U xsrc/external/mit/xdm/dist/greeter/Makefile.am
C xsrc/external/mit/xdm/dist/greeter/Login.c
U xsrc/external/mit/xdm/dist/config/Xsession.in
U xsrc/external/mit/xdm/dist/config/Makefile.am
U xsrc/external/mit/xdm/dist/config/Xservers.ws.in
U xsrc/external/mit/xdm/dist/config/xdm-config.in
U xsrc/external/mit/xdm/dist/config/Xaccess
U xsrc/external/mit/xdm/dist/config/GiveConsole
U xsrc/external/mit/xdm/dist/config/Makefile.in
U xsrc/external/mit/xdm/dist/config/Xstartup.in
U xsrc/external/mit/xdm/dist/config/xorg.xpm
U xsrc/external/mit/xdm/dist/config/TakeConsole
U xsrc/external/mit/xdm/dist/config/xorg-bw.xpm
U xsrc/external/mit/xdm/dist/config/Xsetup_0
U xsrc/external/mit/xdm/dist/config/Xservers.fs
U xsrc/external/mit/xdm/dist/config/Xreset.in
U xsrc/external/mit/xdm/dist/config/README
U xsrc/external/mit/xdm/dist/config/Xresources.in
U xsrc/external/mit/xdm/dist/config/Xwilling
U xsrc/external/mit/xdm/dist/xdmshell/Makefile.in
U xsrc/external/mit/xdm/dist/xdmshell/xdmshell.c
U xsrc/external/mit/xdm/dist/xdmshell/Makefile.am
C xsrc/external/mit/xdm/dist/m4/ltsugar.m4
U xsrc/external/mit/xdm/dist/m4/ax_define_dir.m4
C xsrc/external/mit/xdm/dist/m4/lt~obsolete.m4
C xsrc/external/mit/xdm/dist/m4/libtool.m4
C xsrc/external/mit/xdm/dist/m4/ltversion.m4
C xsrc/external/mit/xdm/dist/m4/ltoptions.m4
U xsrc/external/mit/xdm/dist/man/xdmshell.man
U xsrc/external/mit/xdm/dist/man/Makefile.in
C xsrc/external/mit/xdm/dist/man/xdm.man
U xsrc/external/mit/xdm/dist/man/Makefile.am
U xsrc/external/mit/xdm/dist/chooser/Makefile.am
U xsrc/external/mit/xdm/dist/chooser/chooser.c
U xsrc/external/mit/xdm/dist/chooser/Makefile.in
U xsrc/external/mit/xdm/dist/include/dm_error.h
U xsrc/external/mit/xdm/dist/include/greet.h
U xsrc/external/mit/xdm/dist/include/dm.h
U xsrc/external/mit/xdm/dist/include/dm_auth.h
U xsrc/external/mit/xdm/dist/include/Makefile.am
U xsrc/external/mit/xdm/dist/include/Makefile.in
U xsrc/external/mit/xdm/dist/include/dm_socket.h
U xsrc/external/mit/xdm/dist/app-defaults/Chooser
U xsrc/external/mit/xdm/dist/app-defaults/Makefile.am
U xsrc/external/mit/xdm/dist/app-defaults/Makefile.in

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 09:08:05 UTC 2022

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

Log Message:
initial import of mkfontscale-1.2.2

Status:

Vendor Tag: xorg
Release Tags:   mkfontscale-1-2-2

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 09:08:09 UTC 2022

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

Log Message:
initial import of twm-1.0.12

Status:

Vendor Tag: xorg
Release Tags:   twm-1-0-12

U xsrc/external/mit/twm/dist/config.h.in
U xsrc/external/mit/twm/dist/config.sub
U xsrc/external/mit/twm/dist/configure
N xsrc/external/mit/twm/dist/README.md
U xsrc/external/mit/twm/dist/configure.ac
U xsrc/external/mit/twm/dist/INSTALL
U xsrc/external/mit/twm/dist/ChangeLog
U xsrc/external/mit/twm/dist/config.guess
U xsrc/external/mit/twm/dist/Makefile.am
U xsrc/external/mit/twm/dist/depcomp
U xsrc/external/mit/twm/dist/missing
U xsrc/external/mit/twm/dist/COPYING
U xsrc/external/mit/twm/dist/ylwrap
U xsrc/external/mit/twm/dist/aclocal.m4
U xsrc/external/mit/twm/dist/install-sh
U xsrc/external/mit/twm/dist/Makefile.in
U xsrc/external/mit/twm/dist/compile
U xsrc/external/mit/twm/dist/src/add_window.h
C xsrc/external/mit/twm/dist/src/lex.c
U xsrc/external/mit/twm/dist/src/iconmgr.c
U xsrc/external/mit/twm/dist/src/twm.h
U xsrc/external/mit/twm/dist/src/version.c
U xsrc/external/mit/twm/dist/src/deftwmrc.sed
U xsrc/external/mit/twm/dist/src/gc.c
U xsrc/external/mit/twm/dist/src/list.h
U xsrc/external/mit/twm/dist/src/system.twmrc
U xsrc/external/mit/twm/dist/src/cursor.c
C xsrc/external/mit/twm/dist/src/util.h
U xsrc/external/mit/twm/dist/src/siconify.bm
U xsrc/external/mit/twm/dist/src/events.c
U xsrc/external/mit/twm/dist/src/icons.c
C xsrc/external/mit/twm/dist/src/gram.h
C xsrc/external/mit/twm/dist/src/deftwmrc.c
U xsrc/external/mit/twm/dist/src/session.c
U xsrc/external/mit/twm/dist/src/menus.h
U xsrc/external/mit/twm/dist/src/screen.h
U xsrc/external/mit/twm/dist/src/resize.h
U xsrc/external/mit/twm/dist/src/parse.c
U xsrc/external/mit/twm/dist/src/Makefile.in
U xsrc/external/mit/twm/dist/src/gc.h
U xsrc/external/mit/twm/dist/src/list.c
U xsrc/external/mit/twm/dist/src/gram.y
U xsrc/external/mit/twm/dist/src/twm.c
U xsrc/external/mit/twm/dist/src/version.h
U xsrc/external/mit/twm/dist/src/iconmgr.h
U xsrc/external/mit/twm/dist/src/add_window.c
U xsrc/external/mit/twm/dist/src/lex.l
U xsrc/external/mit/twm/dist/src/resize.c
U xsrc/external/mit/twm/dist/src/parse.h
U xsrc/external/mit/twm/dist/src/Makefile.am
U xsrc/external/mit/twm/dist/src/session.h
U xsrc/external/mit/twm/dist/src/menus.c
U xsrc/external/mit/twm/dist/src/events.h
U xsrc/external/mit/twm/dist/src/icons.h
C xsrc/external/mit/twm/dist/src/gram.c
C xsrc/external/mit/twm/dist/src/util.c
U xsrc/external/mit/twm/dist/sample-twmrc/lemke.twmrc
U xsrc/external/mit/twm/dist/sample-twmrc/jim.twmrc
U xsrc/external/mit/twm/dist/sample-twmrc/keith.twmrc
C xsrc/external/mit/twm/dist/man/twm.man
U xsrc/external/mit/twm/dist/man/Makefile.in
U xsrc/external/mit/twm/dist/man/Makefile.am

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 09:08:09 UTC 2022

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

Log Message:
initial import of twm-1.0.12

Status:

Vendor Tag: xorg
Release Tags:   twm-1-0-12

U xsrc/external/mit/twm/dist/config.h.in
U xsrc/external/mit/twm/dist/config.sub
U xsrc/external/mit/twm/dist/configure
N xsrc/external/mit/twm/dist/README.md
U xsrc/external/mit/twm/dist/configure.ac
U xsrc/external/mit/twm/dist/INSTALL
U xsrc/external/mit/twm/dist/ChangeLog
U xsrc/external/mit/twm/dist/config.guess
U xsrc/external/mit/twm/dist/Makefile.am
U xsrc/external/mit/twm/dist/depcomp
U xsrc/external/mit/twm/dist/missing
U xsrc/external/mit/twm/dist/COPYING
U xsrc/external/mit/twm/dist/ylwrap
U xsrc/external/mit/twm/dist/aclocal.m4
U xsrc/external/mit/twm/dist/install-sh
U xsrc/external/mit/twm/dist/Makefile.in
U xsrc/external/mit/twm/dist/compile
U xsrc/external/mit/twm/dist/src/add_window.h
C xsrc/external/mit/twm/dist/src/lex.c
U xsrc/external/mit/twm/dist/src/iconmgr.c
U xsrc/external/mit/twm/dist/src/twm.h
U xsrc/external/mit/twm/dist/src/version.c
U xsrc/external/mit/twm/dist/src/deftwmrc.sed
U xsrc/external/mit/twm/dist/src/gc.c
U xsrc/external/mit/twm/dist/src/list.h
U xsrc/external/mit/twm/dist/src/system.twmrc
U xsrc/external/mit/twm/dist/src/cursor.c
C xsrc/external/mit/twm/dist/src/util.h
U xsrc/external/mit/twm/dist/src/siconify.bm
U xsrc/external/mit/twm/dist/src/events.c
U xsrc/external/mit/twm/dist/src/icons.c
C xsrc/external/mit/twm/dist/src/gram.h
C xsrc/external/mit/twm/dist/src/deftwmrc.c
U xsrc/external/mit/twm/dist/src/session.c
U xsrc/external/mit/twm/dist/src/menus.h
U xsrc/external/mit/twm/dist/src/screen.h
U xsrc/external/mit/twm/dist/src/resize.h
U xsrc/external/mit/twm/dist/src/parse.c
U xsrc/external/mit/twm/dist/src/Makefile.in
U xsrc/external/mit/twm/dist/src/gc.h
U xsrc/external/mit/twm/dist/src/list.c
U xsrc/external/mit/twm/dist/src/gram.y
U xsrc/external/mit/twm/dist/src/twm.c
U xsrc/external/mit/twm/dist/src/version.h
U xsrc/external/mit/twm/dist/src/iconmgr.h
U xsrc/external/mit/twm/dist/src/add_window.c
U xsrc/external/mit/twm/dist/src/lex.l
U xsrc/external/mit/twm/dist/src/resize.c
U xsrc/external/mit/twm/dist/src/parse.h
U xsrc/external/mit/twm/dist/src/Makefile.am
U xsrc/external/mit/twm/dist/src/session.h
U xsrc/external/mit/twm/dist/src/menus.c
U xsrc/external/mit/twm/dist/src/events.h
U xsrc/external/mit/twm/dist/src/icons.h
C xsrc/external/mit/twm/dist/src/gram.c
C xsrc/external/mit/twm/dist/src/util.c
U xsrc/external/mit/twm/dist/sample-twmrc/lemke.twmrc
U xsrc/external/mit/twm/dist/sample-twmrc/jim.twmrc
U xsrc/external/mit/twm/dist/sample-twmrc/keith.twmrc
C xsrc/external/mit/twm/dist/man/twm.man
U xsrc/external/mit/twm/dist/man/Makefile.in
U xsrc/external/mit/twm/dist/man/Makefile.am

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 09:08:11 UTC 2022

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

Log Message:
initial import of xauth-1.1.2

Status:

Vendor Tag: xorg
Release Tags:   xauth-1-1-2

U xsrc/external/mit/xauth/dist/install-sh
U xsrc/external/mit/xauth/dist/Makefile.in
U xsrc/external/mit/xauth/dist/xauth.h
U xsrc/external/mit/xauth/dist/COPYING
U xsrc/external/mit/xauth/dist/config.guess
U xsrc/external/mit/xauth/dist/aclocal.m4
U xsrc/external/mit/xauth/dist/compile
U xsrc/external/mit/xauth/dist/ChangeLog
U xsrc/external/mit/xauth/dist/Makefile.am
U xsrc/external/mit/xauth/dist/depcomp
U xsrc/external/mit/xauth/dist/missing
U xsrc/external/mit/xauth/dist/README.md
U xsrc/external/mit/xauth/dist/test-driver
U xsrc/external/mit/xauth/dist/configure
U xsrc/external/mit/xauth/dist/INSTALL
U xsrc/external/mit/xauth/dist/config.h.in
U xsrc/external/mit/xauth/dist/xauth.c
U xsrc/external/mit/xauth/dist/config.sub
U xsrc/external/mit/xauth/dist/gethost.c
C xsrc/external/mit/xauth/dist/process.c
U xsrc/external/mit/xauth/dist/parsedpy.c
U xsrc/external/mit/xauth/dist/configure.ac
U xsrc/external/mit/xauth/dist/man/Makefile.in
U xsrc/external/mit/xauth/dist/man/Makefile.am
U xsrc/external/mit/xauth/dist/man/xauth.man
U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.script
U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.stdout
U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.stdout
U xsrc/external/mit/xauth/dist/tests/setup-sourced
U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stderr
U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.script
U xsrc/external/mit/xauth/dist/tests/040-xauth-source.stdout
U xsrc/external/mit/xauth/dist/tests/Makefile.am
N xsrc/external/mit/xauth/dist/tests/test_xauth
U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.stdout
U xsrc/external/mit/xauth/dist/tests/040-xauth-source.script
U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stdout
U xsrc/external/mit/xauth/dist/tests/Makefile.in
U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.script
U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.script

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 09:08:14 UTC 2022

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

Log Message:
initial import of xdm-1.1.13

Status:

Vendor Tag: xorg
Release Tags:   xdm-1-1-13

U xsrc/external/mit/xdm/dist/README.md
U xsrc/external/mit/xdm/dist/configure
U xsrc/external/mit/xdm/dist/ChangeLog
U xsrc/external/mit/xdm/dist/config.h.in
U xsrc/external/mit/xdm/dist/install-sh
U xsrc/external/mit/xdm/dist/config.guess
U xsrc/external/mit/xdm/dist/aclocal.m4
U xsrc/external/mit/xdm/dist/INSTALL
U xsrc/external/mit/xdm/dist/Makefile.in
U xsrc/external/mit/xdm/dist/depcomp
U xsrc/external/mit/xdm/dist/ltmain.sh
U xsrc/external/mit/xdm/dist/configure.ac
U xsrc/external/mit/xdm/dist/missing
U xsrc/external/mit/xdm/dist/Makefile.am
U xsrc/external/mit/xdm/dist/COPYING
U xsrc/external/mit/xdm/dist/xdm.service.in
U xsrc/external/mit/xdm/dist/config.sub
C xsrc/external/mit/xdm/dist/compile
U xsrc/external/mit/xdm/dist/AUTHORS
U xsrc/external/mit/xdm/dist/xdm/reset.c
U xsrc/external/mit/xdm/dist/xdm/choose.c
U xsrc/external/mit/xdm/dist/xdm/session.c
U xsrc/external/mit/xdm/dist/xdm/genauth.c
U xsrc/external/mit/xdm/dist/xdm/xdmauth.c
U xsrc/external/mit/xdm/dist/xdm/file.c
U xsrc/external/mit/xdm/dist/xdm/access.c
U xsrc/external/mit/xdm/dist/xdm/server.c
U xsrc/external/mit/xdm/dist/xdm/rpcauth.c
U xsrc/external/mit/xdm/dist/xdm/policy.c
U xsrc/external/mit/xdm/dist/xdm/socket.c
U xsrc/external/mit/xdm/dist/xdm/netaddr.c
U xsrc/external/mit/xdm/dist/xdm/mitauth.c
U xsrc/external/mit/xdm/dist/xdm/krb5auth.c
U xsrc/external/mit/xdm/dist/xdm/error.c
U xsrc/external/mit/xdm/dist/xdm/protodpy.c
U xsrc/external/mit/xdm/dist/xdm/Makefile.am
U xsrc/external/mit/xdm/dist/xdm/dpylist.c
U xsrc/external/mit/xdm/dist/xdm/daemon.c
U xsrc/external/mit/xdm/dist/xdm/xdmcp.c
U xsrc/external/mit/xdm/dist/xdm/prngc.c
U xsrc/external/mit/xdm/dist/xdm/Makefile.in
C xsrc/external/mit/xdm/dist/xdm/dm.c
U xsrc/external/mit/xdm/dist/xdm/util.c
U xsrc/external/mit/xdm/dist/xdm/resource.c
U xsrc/external/mit/xdm/dist/xdm/auth.c
U xsrc/external/mit/xdm/dist/greeter/greet.c
U xsrc/external/mit/xdm/dist/greeter/LoginP.h
U xsrc/external/mit/xdm/dist/greeter/Login.h
U xsrc/external/mit/xdm/dist/greeter/verify.c
U xsrc/external/mit/xdm/dist/greeter/Makefile.in
U xsrc/external/mit/xdm/dist/greeter/Makefile.am
C xsrc/external/mit/xdm/dist/greeter/Login.c
U xsrc/external/mit/xdm/dist/config/Xsession.in
U xsrc/external/mit/xdm/dist/config/Makefile.am
U xsrc/external/mit/xdm/dist/config/Xservers.ws.in
U xsrc/external/mit/xdm/dist/config/xdm-config.in
U xsrc/external/mit/xdm/dist/config/Xaccess
U xsrc/external/mit/xdm/dist/config/GiveConsole
U xsrc/external/mit/xdm/dist/config/Makefile.in
U xsrc/external/mit/xdm/dist/config/Xstartup.in
U xsrc/external/mit/xdm/dist/config/xorg.xpm
U xsrc/external/mit/xdm/dist/config/TakeConsole
U xsrc/external/mit/xdm/dist/config/xorg-bw.xpm
U xsrc/external/mit/xdm/dist/config/Xsetup_0
U xsrc/external/mit/xdm/dist/config/Xservers.fs
U xsrc/external/mit/xdm/dist/config/Xreset.in
U xsrc/external/mit/xdm/dist/config/README
U xsrc/external/mit/xdm/dist/config/Xresources.in
U xsrc/external/mit/xdm/dist/config/Xwilling
U xsrc/external/mit/xdm/dist/xdmshell/Makefile.in
U xsrc/external/mit/xdm/dist/xdmshell/xdmshell.c
U xsrc/external/mit/xdm/dist/xdmshell/Makefile.am
C xsrc/external/mit/xdm/dist/m4/ltsugar.m4
U xsrc/external/mit/xdm/dist/m4/ax_define_dir.m4
C xsrc/external/mit/xdm/dist/m4/lt~obsolete.m4
C xsrc/external/mit/xdm/dist/m4/libtool.m4
C xsrc/external/mit/xdm/dist/m4/ltversion.m4
C xsrc/external/mit/xdm/dist/m4/ltoptions.m4
U xsrc/external/mit/xdm/dist/man/xdmshell.man
U xsrc/external/mit/xdm/dist/man/Makefile.in
C xsrc/external/mit/xdm/dist/man/xdm.man
U xsrc/external/mit/xdm/dist/man/Makefile.am
U xsrc/external/mit/xdm/dist/chooser/Makefile.am
U xsrc/external/mit/xdm/dist/chooser/chooser.c
U xsrc/external/mit/xdm/dist/chooser/Makefile.in
U xsrc/external/mit/xdm/dist/include/dm_error.h
U xsrc/external/mit/xdm/dist/include/greet.h
U xsrc/external/mit/xdm/dist/include/dm.h
U xsrc/external/mit/xdm/dist/include/dm_auth.h
U xsrc/external/mit/xdm/dist/include/Makefile.am
U xsrc/external/mit/xdm/dist/include/Makefile.in
U xsrc/external/mit/xdm/dist/include/dm_socket.h
U xsrc/external/mit/xdm/dist/app-defaults/Chooser
U xsrc/external/mit/xdm/dist/app-defaults/Makefile.am
U xsrc/external/mit/xdm/dist/app-defaults/Makefile.in

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

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

CVS commit: src/sys/arch/powerpc/include

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 09:39:10 UTC 2022

Modified Files:
src/sys/arch/powerpc/include: intr.h

Log Message:
PR 56922: disabel fast softints for powerpc for now.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/include/intr.h

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

CVS commit: src/sys/arch/powerpc/include

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 09:39:10 UTC 2022

Modified Files:
src/sys/arch/powerpc/include: intr.h

Log Message:
PR 56922: disabel fast softints for powerpc for now.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/include/intr.h

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/powerpc/include/intr.h
diff -u src/sys/arch/powerpc/include/intr.h:1.18 src/sys/arch/powerpc/include/intr.h:1.19
--- src/sys/arch/powerpc/include/intr.h:1.18	Tue Mar  2 07:37:27 2021
+++ src/sys/arch/powerpc/include/intr.h	Mon Jul 11 09:39:10 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.18 2021/03/02 07:37:27 rin Exp $ */
+/*	$NetBSD: intr.h,v 1.19 2022/07/11 09:39:10 martin Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -28,13 +28,15 @@
 
 #ifndef _LOCORE
 #include 
-__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.18 2021/03/02 07:37:27 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.19 2022/07/11 09:39:10 martin Exp $");
 #endif
 
 #ifndef _POWERPC_INTR_MACHDEP_H_
 #define _POWERPC_INTR_MACHDEP_H_
 
+#if 0	/* PR port-powerpc/56922: fast softints are broken on powerpc */
 #define	__HAVE_FAST_SOFTINTS	1
+#endif
 
 
 /* Interrupt priority `levels'. */

CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 11 19:35:42 UTC 2022

Modified Files:
src/distrib/sets/lists/xbase: md.amd64 md.evbarm md.i386 shl.mi
src/distrib/sets/lists/xcomp: mi
src/distrib/sets/lists/xdebug: md.amd64 md.evbarm md.evbarm.armeb
md.i386 shl.mi

Log Message:
updates for libdrm 2.4.112.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xbase/md.evbarm
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.233 -r1.234 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xdebug/md.evbarm
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xdebug/md.evbarm.armeb
cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xdebug/shl.mi

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

CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 11 19:35:42 UTC 2022

Modified Files:
src/distrib/sets/lists/xbase: md.amd64 md.evbarm md.i386 shl.mi
src/distrib/sets/lists/xcomp: mi
src/distrib/sets/lists/xdebug: md.amd64 md.evbarm md.evbarm.armeb
md.i386 shl.mi

Log Message:
updates for libdrm 2.4.112.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xbase/md.evbarm
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.233 -r1.234 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xdebug/md.evbarm
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xdebug/md.evbarm.armeb
cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xdebug/shl.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/xbase/md.amd64
diff -u src/distrib/sets/lists/xbase/md.amd64:1.20 src/distrib/sets/lists/xbase/md.amd64:1.21
--- src/distrib/sets/lists/xbase/md.amd64:1.20	Tue Apr 27 03:09:15 2021
+++ src/distrib/sets/lists/xbase/md.amd64	Mon Jul 11 19:35:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.20 2021/04/27 03:09:15 mrg Exp $
+# $NetBSD: md.amd64,v 1.21 2022/07/11 19:35:41 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC.so			xbase-libI810XvMC-lib		xorg,compatx11file
 ./usr/X11R7/lib/libI810XvMC.so.1		xbase-libI810XvMC-lib		xorg,compatx11file
 ./usr/X11R7/lib/libI810XvMC.so.1.0		xbase-libI810XvMC-lib		xorg,compatx11file
@@ -13,13 +13,13 @@
 ./usr/X11R7/lib/libchromeXvMCPro.so.1.0		xbase-libchromeXvMCPro-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_amdgpu.so		xbase-libdrm_amdgpu-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_amdgpu.so.1		xbase-libdrm_amdgpu-lib		xorg,compatx11file
-./usr/X11R7/lib/libdrm_amdgpu.so.1.1		xbase-libdrm_amdgpu-lib		xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu.so.1.2		xbase-libdrm_amdgpu-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_intel.so			xbase-libdrm_intel-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_intel.so.0		xbase-libdrm_intel-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_intel.so.0.2		xbase-libdrm_intel-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau.so		xbase-libdrm_nouveau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau.so.3		xbase-libdrm_nouveau-lib		xorg,compatx11file
-./usr/X11R7/lib/libdrm_nouveau.so.3.0		xbase-libdrm_nouveau-lib		xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau.so.3.1		xbase-libdrm_nouveau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libvdpau.so			xbase-libvdpau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libvdpau.so.1			xbase-libvdpau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libvdpau.so.1.0			xbase-libvdpau-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xbase/md.evbarm
diff -u src/distrib/sets/lists/xbase/md.evbarm:1.8 src/distrib/sets/lists/xbase/md.evbarm:1.9
--- src/distrib/sets/lists/xbase/md.evbarm:1.8	Tue Apr 27 03:09:15 2021
+++ src/distrib/sets/lists/xbase/md.evbarm	Mon Jul 11 19:35:41 2022
@@ -1,10 +1,10 @@
-# $NetBSD: md.evbarm,v 1.8 2021/04/27 03:09:15 mrg Exp $
+# $NetBSD: md.evbarm,v 1.9 2022/07/11 19:35:41 mrg Exp $
 ./usr/X11R7/lib/libdrm_amdgpu.so		xbase-libdrm_amdgpu-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_amdgpu.so.1		xbase-libdrm_amdgpu-lib		xorg,compatx11file
-./usr/X11R7/lib/libdrm_amdgpu.so.1.1		xbase-libdrm_amdgpu-lib		xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu.so.1.2		xbase-libdrm_amdgpu-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau.so		xbase-libdrm_nouveau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau.so.3		xbase-libdrm_nouveau-lib		xorg,compatx11file
-./usr/X11R7/lib/libdrm_nouveau.so.3.0		xbase-libdrm_nouveau-lib		xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau.so.3.1		xbase-libdrm_nouveau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libvdpau.so			xbase-libvdpau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libvdpau.so.1			xbase-libvdpau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libvdpau.so.1.0			xbase-libvdpau-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xbase/md.i386
diff -u src/distrib/sets/lists/xbase/md.i386:1.34 src/distrib/sets/lists/xbase/md.i386:1.35
--- src/distrib/sets/lists/xbase/md.i386:1.34	Tue Apr 27 03:09:15 2021
+++ src/distrib/sets/lists/xbase/md.i386	Mon Jul 11 19:35:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.34 2021/04/27 03:09:15 mrg Exp $
+# $NetBSD: md.i386,v 1.35 2022/07/11 19:35:41 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC.so			xbase-libI810XvMC-lib		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1		xbase-libI810XvMC-lib		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1.0		xbase-libI810XvMC-lib		xorg
@@ -13,13 +13,13 @@
 ./usr/X11R7/lib/libchromeXvMCPro.so.1.0		

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:41:09 UTC 2022

Modified Files:
xsrc/external/mit/xsm/dist: choose.c compile saveutil.c

Log Message:
merge xsm 1.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xsm/dist/choose.c \
xsrc/external/mit/xsm/dist/compile xsrc/external/mit/xsm/dist/saveutil.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/xsm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:41:09 UTC 2022

Modified Files:
xsrc/external/mit/xsm/dist: choose.c compile saveutil.c

Log Message:
merge xsm 1.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xsm/dist/choose.c \
xsrc/external/mit/xsm/dist/compile xsrc/external/mit/xsm/dist/saveutil.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/xsm/dist/choose.c
diff -u xsrc/external/mit/xsm/dist/choose.c:1.3 xsrc/external/mit/xsm/dist/choose.c:1.4
--- xsrc/external/mit/xsm/dist/choose.c:1.3	Sat Feb 28 17:27:14 2015
+++ xsrc/external/mit/xsm/dist/choose.c	Mon Jul 11 19:41:08 2022
@@ -461,7 +461,7 @@ ChooseSessionDeleteXtProc(Widget w, XtPo
 {
 XawListReturnStruct *current;
 int longest;
-char *name;
+String name;
 
 CheckBreakLockCancel ();
 
@@ -555,7 +555,7 @@ ChooseSessionBreakLockXtProc(Widget w, X
 			 XtPointer callData)
 {
 XawListReturnStruct *current;
-char *name;
+String name;
 
 CheckDeleteCancel ();
 
Index: xsrc/external/mit/xsm/dist/compile
diff -u xsrc/external/mit/xsm/dist/compile:1.3 xsrc/external/mit/xsm/dist/compile:1.4
--- xsrc/external/mit/xsm/dist/compile:1.3	Sun Mar 11 08:55:27 2018
+++ xsrc/external/mit/xsm/dist/compile	Mon Jul 11 19:41:08 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:
Index: xsrc/external/mit/xsm/dist/saveutil.c
diff -u xsrc/external/mit/xsm/dist/saveutil.c:1.3 xsrc/external/mit/xsm/dist/saveutil.c:1.4
--- xsrc/external/mit/xsm/dist/saveutil.c:1.3	Sat Feb 28 17:27:14 2015
+++ xsrc/external/mit/xsm/dist/saveutil.c	Mon Jul 11 19:41:08 2022
@@ -204,7 +204,7 @@ ReadSave(const char *session_name, char 
 
 if (state == 5)
 {
-	String strbuf;
+	char *strbuf;
 	int bufsize = 0;
 
 	getnextline(, , f);
@@ -220,13 +220,12 @@ ReadSave(const char *session_name, char 
 	{
 		getnextline(, , f);
 		if((p = strchr(buf, '\n'))) *p = '\0';
-		non_session_aware_clients[i] = (char *) malloc (
-		strlen (buf) + 2);
+		non_session_aware_clients[i] = malloc (strlen (buf) + 2);
 		strcpy (non_session_aware_clients[i], buf);
 		bufsize += (strlen (buf) + 1);
 	}
 
-	strbuf = (String) malloc (bufsize + 1);
+	strbuf = malloc (bufsize + 1);
 	strbuf[0] = '\0';
 
 	for (i = 0; i < non_session_aware_count; i++)
@@ -303,7 +302,7 @@ WriteSave(const char *sm_id)
 ClientRec *client;
 FILE *f;
 List *cl;
-String commands;
+char *commands;
 char *p, *c;
 int count;
 
@@ -311,7 +310,7 @@ WriteSave(const char *sm_id)
 
 if (!f)
 {
-	char msg[256];
+	char msg[36 + sizeof(session_save_file)];
 
 	snprintf (msg, sizeof(msg), "%s: Error creating session save file %s", 
 		  Argv[0], session_save_file);

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:26:45 UTC 2022

Modified Files:
xsrc/external/mit/libdrm/dist: libdrm_lists.h xf86drm.c xf86drmMode.c
xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
xsrc/external/mit/xterm/dist: fontutils.c graphics_sixel.c linedata.c
misc.c ptyx.h resize.c scrollback.c xterm.h xterm.man
Removed Files:
xsrc/external/mit/libdrm/dist/libkms: Android.mk Makefile.sources api.c
dumb.c exynos.c intel.c internal.h kms-symbols.txt libkms.h
libkms.pc.in linux.c meson.build nouveau.c radeon.c vmwgfx.c
xsrc/external/mit/libdrm/dist/tests/kms: kms-steal-crtc.c
kms-universal-planes.c libkms-test-crtc.c libkms-test-device.c
libkms-test-framebuffer.c libkms-test-plane.c libkms-test-screen.c
libkms-test.h meson.build
xsrc/external/mit/libdrm/dist/tests/kmstest: main.c meson.build

Log Message:
merge libdrm 2.4.112, and xterm-372.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/libdrm_lists.h
cvs rdiff -u -r1.30 -r1.31 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/libdrm/dist/libkms/Android.mk
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/libkms/Makefile.sources \
xsrc/external/mit/libdrm/dist/libkms/kms-symbols.txt
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libdrm/dist/libkms/api.c \
xsrc/external/mit/libdrm/dist/libkms/intel.c \
xsrc/external/mit/libdrm/dist/libkms/meson.build \
xsrc/external/mit/libdrm/dist/libkms/nouveau.c \
xsrc/external/mit/libdrm/dist/libkms/vmwgfx.c
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/libkms/dumb.c \
xsrc/external/mit/libdrm/dist/libkms/internal.h \
xsrc/external/mit/libdrm/dist/libkms/radeon.c
cvs rdiff -u -r1.1.1.6 -r0 xsrc/external/mit/libdrm/dist/libkms/exynos.c
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libdrm/dist/libkms/libkms.h \
xsrc/external/mit/libdrm/dist/libkms/libkms.pc.in
cvs rdiff -u -r1.1.1.8 -r0 xsrc/external/mit/libdrm/dist/libkms/linux.c
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/kms-steal-crtc.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-plane.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-screen.c
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/kms-universal-planes.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-crtc.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-device.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-framebuffer.c \
xsrc/external/mit/libdrm/dist/tests/kms/meson.build
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test.h
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/tests/kmstest/main.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libdrm/dist/tests/kmstest/meson.build
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xterm/dist/graphics_sixel.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xterm/dist/resize.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xterm/dist/scrollback.c \
xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xterm/dist/xterm.man

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

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:26:45 UTC 2022

Modified Files:
xsrc/external/mit/libdrm/dist: libdrm_lists.h xf86drm.c xf86drmMode.c
xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
xsrc/external/mit/xterm/dist: fontutils.c graphics_sixel.c linedata.c
misc.c ptyx.h resize.c scrollback.c xterm.h xterm.man
Removed Files:
xsrc/external/mit/libdrm/dist/libkms: Android.mk Makefile.sources api.c
dumb.c exynos.c intel.c internal.h kms-symbols.txt libkms.h
libkms.pc.in linux.c meson.build nouveau.c radeon.c vmwgfx.c
xsrc/external/mit/libdrm/dist/tests/kms: kms-steal-crtc.c
kms-universal-planes.c libkms-test-crtc.c libkms-test-device.c
libkms-test-framebuffer.c libkms-test-plane.c libkms-test-screen.c
libkms-test.h meson.build
xsrc/external/mit/libdrm/dist/tests/kmstest: main.c meson.build

Log Message:
merge libdrm 2.4.112, and xterm-372.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/libdrm_lists.h
cvs rdiff -u -r1.30 -r1.31 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/libdrm/dist/libkms/Android.mk
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/libkms/Makefile.sources \
xsrc/external/mit/libdrm/dist/libkms/kms-symbols.txt
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libdrm/dist/libkms/api.c \
xsrc/external/mit/libdrm/dist/libkms/intel.c \
xsrc/external/mit/libdrm/dist/libkms/meson.build \
xsrc/external/mit/libdrm/dist/libkms/nouveau.c \
xsrc/external/mit/libdrm/dist/libkms/vmwgfx.c
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/libkms/dumb.c \
xsrc/external/mit/libdrm/dist/libkms/internal.h \
xsrc/external/mit/libdrm/dist/libkms/radeon.c
cvs rdiff -u -r1.1.1.6 -r0 xsrc/external/mit/libdrm/dist/libkms/exynos.c
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libdrm/dist/libkms/libkms.h \
xsrc/external/mit/libdrm/dist/libkms/libkms.pc.in
cvs rdiff -u -r1.1.1.8 -r0 xsrc/external/mit/libdrm/dist/libkms/linux.c
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/kms-steal-crtc.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-plane.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-screen.c
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/kms-universal-planes.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-crtc.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-device.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-framebuffer.c \
xsrc/external/mit/libdrm/dist/tests/kms/meson.build
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test.h
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/tests/kmstest/main.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libdrm/dist/tests/kmstest/meson.build
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xterm/dist/graphics_sixel.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xterm/dist/resize.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xterm/dist/scrollback.c \
xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xterm/dist/xterm.man

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/libdrm_lists.h
diff -u xsrc/external/mit/libdrm/dist/libdrm_lists.h:1.2 xsrc/external/mit/libdrm/dist/libdrm_lists.h:1.3
--- xsrc/external/mit/libdrm/dist/libdrm_lists.h:1.2	Sun Jan 21 21:48:54 2018
+++ xsrc/external/mit/libdrm/dist/libdrm_lists.h	Mon Jul 11 19:26:44 2022
@@ -97,18 +97,18 @@ typedef struct _drmMMListHead
 
 #define DRMLISTFOREACHENTRY(__item, __list, __head)\
 	for ((__item) = DRMLISTENTRY(__typeof__(*__item), (__list)->next, __head); \
-	 &(__item)->__head != (__list);\
+	 &(__item)->__head != (__list);\
 	 (__item) = DRMLISTENTRY(__typeof__(*__item),  \
- (__item)->__head.next, __head))
+	 (__item)->__head.next, __head))
 
 #define DRMLISTFOREACHENTRYSAFE(__item, __temp, __list, 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:19:24 UTC 2022

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

Log Message:
initial import of libdrm-2.4.112

Status:

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

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
C 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
C xsrc/external/mit/libdrm/dist/util_double_list.h
U xsrc/external/mit/libdrm/dist/util_math.h
U xsrc/external/mit/libdrm/dist/xf86atomic.h
C xsrc/external/mit/libdrm/dist/xf86drm.c
U 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/.gitlab-ci/debian-install.sh
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
C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c
U 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 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:19:29 UTC 2022

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

Log Message:
initial import of xterm-372

Status:

Vendor Tag: xorg
Release Tags:   xterm-372

U xsrc/external/mit/xterm/dist/testxmc.c
C xsrc/external/mit/xterm/dist/misc.c
U xsrc/external/mit/xterm/dist/trace.h
C xsrc/external/mit/xterm/dist/graphics_sixel.c
C xsrc/external/mit/xterm/dist/xterm.man
U xsrc/external/mit/xterm/dist/error.h
U xsrc/external/mit/xterm/dist/button.c
U xsrc/external/mit/xterm/dist/graphics.h
U xsrc/external/mit/xterm/dist/Makefile.in
U xsrc/external/mit/xterm/dist/sinstall.sh
C xsrc/external/mit/xterm/dist/xterm.h
U xsrc/external/mit/xterm/dist/cachedGCs.c
U xsrc/external/mit/xterm/dist/XTerm.ad
U xsrc/external/mit/xterm/dist/main.c
U xsrc/external/mit/xterm/dist/MANIFEST
U xsrc/external/mit/xterm/dist/resize.man
U xsrc/external/mit/xterm/dist/precompose.h
U xsrc/external/mit/xterm/dist/configure.in
U xsrc/external/mit/xterm/dist/charclass.h
U xsrc/external/mit/xterm/dist/config.guess
U xsrc/external/mit/xterm/dist/256colres.h
U xsrc/external/mit/xterm/dist/main.h
U xsrc/external/mit/xterm/dist/88colres.pl
U xsrc/external/mit/xterm/dist/gen-charsets.pl
U xsrc/external/mit/xterm/dist/graphics_regis.c
U xsrc/external/mit/xterm/dist/VTparse.def
U xsrc/external/mit/xterm/dist/df-install.in
U xsrc/external/mit/xterm/dist/UXTerm.ad
C xsrc/external/mit/xterm/dist/linedata.c
U xsrc/external/mit/xterm/dist/TekPrsTbl.c
C xsrc/external/mit/xterm/dist/ptyx.h
U xsrc/external/mit/xterm/dist/xterm.desktop
U xsrc/external/mit/xterm/dist/version.h
U xsrc/external/mit/xterm/dist/configure
U xsrc/external/mit/xterm/dist/graphics.c
U xsrc/external/mit/xterm/dist/util.c
U xsrc/external/mit/xterm/dist/doublechr.c
U xsrc/external/mit/xterm/dist/ptydata.c
U xsrc/external/mit/xterm/dist/link_axp.com
U xsrc/external/mit/xterm/dist/terminfo
U xsrc/external/mit/xterm/dist/make.com
U xsrc/external/mit/xterm/dist/data.c
U xsrc/external/mit/xterm/dist/minstall.in
U xsrc/external/mit/xterm/dist/THANKS
U xsrc/external/mit/xterm/dist/charproc.c
U xsrc/external/mit/xterm/dist/fontutils.h
U xsrc/external/mit/xterm/dist/graphics_regis.h
U xsrc/external/mit/xterm/dist/screen.c
U xsrc/external/mit/xterm/dist/config.sub
U xsrc/external/mit/xterm/dist/vms.c
U xsrc/external/mit/xterm/dist/xterm.log.html
U xsrc/external/mit/xterm/dist/COPYING
U xsrc/external/mit/xterm/dist/ctlseqs.ms
U xsrc/external/mit/xterm/dist/html.c
U xsrc/external/mit/xterm/dist/README.os390
U xsrc/external/mit/xterm/dist/scrollbar.c
U xsrc/external/mit/xterm/dist/uxterm.desktop
U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad
U xsrc/external/mit/xterm/dist/precompose.c
U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt
U xsrc/external/mit/xterm/dist/xutf8.h
U xsrc/external/mit/xterm/dist/NEWS
U xsrc/external/mit/xterm/dist/plink.sh
U xsrc/external/mit/xterm/dist/graphics_sixel.h
C xsrc/external/mit/xterm/dist/scrollback.c
U xsrc/external/mit/xterm/dist/INSTALL
C xsrc/external/mit/xterm/dist/resize.c
U xsrc/external/mit/xterm/dist/run-tic.sh
U xsrc/external/mit/xterm/dist/charsets.c
U xsrc/external/mit/xterm/dist/xstrings.h
U xsrc/external/mit/xterm/dist/xtermcap.h
U xsrc/external/mit/xterm/dist/svg.c
U xsrc/external/mit/xterm/dist/charclass.c
U xsrc/external/mit/xterm/dist/Tests
U xsrc/external/mit/xterm/dist/input.c
U xsrc/external/mit/xterm/dist/XTerm-col.ad
U xsrc/external/mit/xterm/dist/xutf8.c
U xsrc/external/mit/xterm/dist/Imakefile
U xsrc/external/mit/xterm/dist/wcwidth.h
U xsrc/external/mit/xterm/dist/koi8rxterm
U xsrc/external/mit/xterm/dist/VTparse.h
U xsrc/external/mit/xterm/dist/menu.h
U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl
U xsrc/external/mit/xterm/dist/xstrings.c
U xsrc/external/mit/xterm/dist/xtermcap.c
U xsrc/external/mit/xterm/dist/tabs.c
U xsrc/external/mit/xterm/dist/keysym2ucs.c
U xsrc/external/mit/xterm/dist/menu.c
U xsrc/external/mit/xterm/dist/88colres.h
U xsrc/external/mit/xterm/dist/vms.h
U xsrc/external/mit/xterm/dist/ctlseqs.txt
U xsrc/external/mit/xterm/dist/termcap
U xsrc/external/mit/xterm/dist/aclocal.m4
U xsrc/external/mit/xterm/dist/version.c
U xsrc/external/mit/xterm/dist/install-sh
U xsrc/external/mit/xterm/dist/koi8rxterm.man
U xsrc/external/mit/xterm/dist/256colres.pl
U xsrc/external/mit/xterm/dist/Tekparse.def
U xsrc/external/mit/xterm/dist/xterm_axp.opt
U xsrc/external/mit/xterm/dist/uxterm
C xsrc/external/mit/xterm/dist/fontutils.c
U xsrc/external/mit/xterm/dist/README
U xsrc/external/mit/xterm/dist/xterm.appdata.xml
U xsrc/external/mit/xterm/dist/xterm_io.h
U xsrc/external/mit/xterm/dist/xtermcfg.hin
U xsrc/external/mit/xterm/dist/xterm.dat
U xsrc/external/mit/xterm/dist/data.h
U xsrc/external/mit/xterm/dist/uxterm.man
U xsrc/external/mit/xterm/dist/Tekparse.h
U xsrc/external/mit/xterm/dist/Tekproc.c
U xsrc/external/mit/xterm/dist/keysym2ucs.h
U xsrc/external/mit/xterm/dist/VTPrsTbl.c
U 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:19:24 UTC 2022

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

Log Message:
initial import of libdrm-2.4.112

Status:

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

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
C 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
C xsrc/external/mit/libdrm/dist/util_double_list.h
U xsrc/external/mit/libdrm/dist/util_math.h
U xsrc/external/mit/libdrm/dist/xf86atomic.h
C xsrc/external/mit/libdrm/dist/xf86drm.c
U 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/.gitlab-ci/debian-install.sh
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
C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c
U 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 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:19:29 UTC 2022

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

Log Message:
initial import of xterm-372

Status:

Vendor Tag: xorg
Release Tags:   xterm-372

U xsrc/external/mit/xterm/dist/testxmc.c
C xsrc/external/mit/xterm/dist/misc.c
U xsrc/external/mit/xterm/dist/trace.h
C xsrc/external/mit/xterm/dist/graphics_sixel.c
C xsrc/external/mit/xterm/dist/xterm.man
U xsrc/external/mit/xterm/dist/error.h
U xsrc/external/mit/xterm/dist/button.c
U xsrc/external/mit/xterm/dist/graphics.h
U xsrc/external/mit/xterm/dist/Makefile.in
U xsrc/external/mit/xterm/dist/sinstall.sh
C xsrc/external/mit/xterm/dist/xterm.h
U xsrc/external/mit/xterm/dist/cachedGCs.c
U xsrc/external/mit/xterm/dist/XTerm.ad
U xsrc/external/mit/xterm/dist/main.c
U xsrc/external/mit/xterm/dist/MANIFEST
U xsrc/external/mit/xterm/dist/resize.man
U xsrc/external/mit/xterm/dist/precompose.h
U xsrc/external/mit/xterm/dist/configure.in
U xsrc/external/mit/xterm/dist/charclass.h
U xsrc/external/mit/xterm/dist/config.guess
U xsrc/external/mit/xterm/dist/256colres.h
U xsrc/external/mit/xterm/dist/main.h
U xsrc/external/mit/xterm/dist/88colres.pl
U xsrc/external/mit/xterm/dist/gen-charsets.pl
U xsrc/external/mit/xterm/dist/graphics_regis.c
U xsrc/external/mit/xterm/dist/VTparse.def
U xsrc/external/mit/xterm/dist/df-install.in
U xsrc/external/mit/xterm/dist/UXTerm.ad
C xsrc/external/mit/xterm/dist/linedata.c
U xsrc/external/mit/xterm/dist/TekPrsTbl.c
C xsrc/external/mit/xterm/dist/ptyx.h
U xsrc/external/mit/xterm/dist/xterm.desktop
U xsrc/external/mit/xterm/dist/version.h
U xsrc/external/mit/xterm/dist/configure
U xsrc/external/mit/xterm/dist/graphics.c
U xsrc/external/mit/xterm/dist/util.c
U xsrc/external/mit/xterm/dist/doublechr.c
U xsrc/external/mit/xterm/dist/ptydata.c
U xsrc/external/mit/xterm/dist/link_axp.com
U xsrc/external/mit/xterm/dist/terminfo
U xsrc/external/mit/xterm/dist/make.com
U xsrc/external/mit/xterm/dist/data.c
U xsrc/external/mit/xterm/dist/minstall.in
U xsrc/external/mit/xterm/dist/THANKS
U xsrc/external/mit/xterm/dist/charproc.c
U xsrc/external/mit/xterm/dist/fontutils.h
U xsrc/external/mit/xterm/dist/graphics_regis.h
U xsrc/external/mit/xterm/dist/screen.c
U xsrc/external/mit/xterm/dist/config.sub
U xsrc/external/mit/xterm/dist/vms.c
U xsrc/external/mit/xterm/dist/xterm.log.html
U xsrc/external/mit/xterm/dist/COPYING
U xsrc/external/mit/xterm/dist/ctlseqs.ms
U xsrc/external/mit/xterm/dist/html.c
U xsrc/external/mit/xterm/dist/README.os390
U xsrc/external/mit/xterm/dist/scrollbar.c
U xsrc/external/mit/xterm/dist/uxterm.desktop
U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad
U xsrc/external/mit/xterm/dist/precompose.c
U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt
U xsrc/external/mit/xterm/dist/xutf8.h
U xsrc/external/mit/xterm/dist/NEWS
U xsrc/external/mit/xterm/dist/plink.sh
U xsrc/external/mit/xterm/dist/graphics_sixel.h
C xsrc/external/mit/xterm/dist/scrollback.c
U xsrc/external/mit/xterm/dist/INSTALL
C xsrc/external/mit/xterm/dist/resize.c
U xsrc/external/mit/xterm/dist/run-tic.sh
U xsrc/external/mit/xterm/dist/charsets.c
U xsrc/external/mit/xterm/dist/xstrings.h
U xsrc/external/mit/xterm/dist/xtermcap.h
U xsrc/external/mit/xterm/dist/svg.c
U xsrc/external/mit/xterm/dist/charclass.c
U xsrc/external/mit/xterm/dist/Tests
U xsrc/external/mit/xterm/dist/input.c
U xsrc/external/mit/xterm/dist/XTerm-col.ad
U xsrc/external/mit/xterm/dist/xutf8.c
U xsrc/external/mit/xterm/dist/Imakefile
U xsrc/external/mit/xterm/dist/wcwidth.h
U xsrc/external/mit/xterm/dist/koi8rxterm
U xsrc/external/mit/xterm/dist/VTparse.h
U xsrc/external/mit/xterm/dist/menu.h
U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl
U xsrc/external/mit/xterm/dist/xstrings.c
U xsrc/external/mit/xterm/dist/xtermcap.c
U xsrc/external/mit/xterm/dist/tabs.c
U xsrc/external/mit/xterm/dist/keysym2ucs.c
U xsrc/external/mit/xterm/dist/menu.c
U xsrc/external/mit/xterm/dist/88colres.h
U xsrc/external/mit/xterm/dist/vms.h
U xsrc/external/mit/xterm/dist/ctlseqs.txt
U xsrc/external/mit/xterm/dist/termcap
U xsrc/external/mit/xterm/dist/aclocal.m4
U xsrc/external/mit/xterm/dist/version.c
U xsrc/external/mit/xterm/dist/install-sh
U xsrc/external/mit/xterm/dist/koi8rxterm.man
U xsrc/external/mit/xterm/dist/256colres.pl
U xsrc/external/mit/xterm/dist/Tekparse.def
U xsrc/external/mit/xterm/dist/xterm_axp.opt
U xsrc/external/mit/xterm/dist/uxterm
C xsrc/external/mit/xterm/dist/fontutils.c
U xsrc/external/mit/xterm/dist/README
U xsrc/external/mit/xterm/dist/xterm.appdata.xml
U xsrc/external/mit/xterm/dist/xterm_io.h
U xsrc/external/mit/xterm/dist/xtermcfg.hin
U xsrc/external/mit/xterm/dist/xterm.dat
U xsrc/external/mit/xterm/dist/data.h
U xsrc/external/mit/xterm/dist/uxterm.man
U xsrc/external/mit/xterm/dist/Tekparse.h
U xsrc/external/mit/xterm/dist/Tekproc.c
U xsrc/external/mit/xterm/dist/keysym2ucs.h
U xsrc/external/mit/xterm/dist/VTPrsTbl.c
U 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 11 19:33:33 UTC 2022

Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile shlib_version
src/external/mit/xorg/lib/libdrm_amdgpu: shlib_version
src/external/mit/xorg/lib/libdrm_nouveau: shlib_version
Removed Files:
src/external/mit/xorg/lib/libdrm/kms: Makefile

Log Message:
updates for libdrm 2.4.112.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libdrm/shlib_version
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/libdrm/kms/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/libdrm_amdgpu/shlib_version
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/libdrm_nouveau/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/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.18 src/external/mit/xorg/lib/libdrm/Makefile:1.19
--- src/external/mit/xorg/lib/libdrm/Makefile:1.18	Sun Jul 11 00:43:40 2021
+++ src/external/mit/xorg/lib/libdrm/Makefile	Mon Jul 11 19:33:33 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2021/07/11 00:43:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.19 2022/07/11 19:33:33 mrg Exp $
 
 .include 
 
@@ -12,7 +12,7 @@ INCSDIR=${X11INCDIR}
 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm -I${X11SRCDIR.${LIB}}/../include
 
-SUBDIR=	drm kms
+SUBDIR=	drm
 
 PKGCONFIG=	libdrm
 PKGDIST=	${LIB}

Index: src/external/mit/xorg/lib/libdrm/shlib_version
diff -u src/external/mit/xorg/lib/libdrm/shlib_version:1.7 src/external/mit/xorg/lib/libdrm/shlib_version:1.8
--- src/external/mit/xorg/lib/libdrm/shlib_version:1.7	Tue Apr 27 03:09:16 2021
+++ src/external/mit/xorg/lib/libdrm/shlib_version	Mon Jul 11 19:33:33 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.7 2021/04/27 03:09:16 mrg Exp $
+#	$NetBSD: shlib_version,v 1.8 2022/07/11 19:33:33 mrg Exp $
 #
 major=3
-minor=5
+minor=6

Index: src/external/mit/xorg/lib/libdrm_amdgpu/shlib_version
diff -u src/external/mit/xorg/lib/libdrm_amdgpu/shlib_version:1.2 src/external/mit/xorg/lib/libdrm_amdgpu/shlib_version:1.3
--- src/external/mit/xorg/lib/libdrm_amdgpu/shlib_version:1.2	Tue Apr 27 03:09:16 2021
+++ src/external/mit/xorg/lib/libdrm_amdgpu/shlib_version	Mon Jul 11 19:33:33 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.2 2021/04/27 03:09:16 mrg Exp $
+#	$NetBSD: shlib_version,v 1.3 2022/07/11 19:33:33 mrg Exp $
 #
 major=1
-minor=1
+minor=2

Index: src/external/mit/xorg/lib/libdrm_nouveau/shlib_version
diff -u src/external/mit/xorg/lib/libdrm_nouveau/shlib_version:1.2 src/external/mit/xorg/lib/libdrm_nouveau/shlib_version:1.3
--- src/external/mit/xorg/lib/libdrm_nouveau/shlib_version:1.2	Wed Aug 17 03:10:23 2016
+++ src/external/mit/xorg/lib/libdrm_nouveau/shlib_version	Mon Jul 11 19:33:33 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.2 2016/08/17 03:10:23 mrg Exp $
+#	$NetBSD: shlib_version,v 1.3 2022/07/11 19:33:33 mrg Exp $
 #
 major=3
-minor=0
+minor=1

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul 11 19:33:33 UTC 2022

Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile shlib_version
src/external/mit/xorg/lib/libdrm_amdgpu: shlib_version
src/external/mit/xorg/lib/libdrm_nouveau: shlib_version
Removed Files:
src/external/mit/xorg/lib/libdrm/kms: Makefile

Log Message:
updates for libdrm 2.4.112.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libdrm/shlib_version
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/libdrm/kms/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/libdrm_amdgpu/shlib_version
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/libdrm_nouveau/shlib_version

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:40:44 UTC 2022

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

Log Message:
initial import of xsm-1.0.5

Status:

Vendor Tag: xorg
Release Tags:   xsm-1-0-5

U xsrc/external/mit/xsm/dist/Makefile.am
U xsrc/external/mit/xsm/dist/missing
U xsrc/external/mit/xsm/dist/popup.h
U xsrc/external/mit/xsm/dist/depcomp
U xsrc/external/mit/xsm/dist/prop.c
U xsrc/external/mit/xsm/dist/auth.c
C xsrc/external/mit/xsm/dist/saveutil.c
U xsrc/external/mit/xsm/dist/remote.c
C xsrc/external/mit/xsm/dist/compile
U xsrc/external/mit/xsm/dist/misc.c
U xsrc/external/mit/xsm/dist/system.xsm
U xsrc/external/mit/xsm/dist/config.guess
U xsrc/external/mit/xsm/dist/install-sh
U xsrc/external/mit/xsm/dist/list.c
U xsrc/external/mit/xsm/dist/info.h
U xsrc/external/mit/xsm/dist/xsm.h
U xsrc/external/mit/xsm/dist/save.c
U xsrc/external/mit/xsm/dist/Makefile.in
U xsrc/external/mit/xsm/dist/choose.h
U xsrc/external/mit/xsm/dist/lock.c
U xsrc/external/mit/xsm/dist/aclocal.m4
U xsrc/external/mit/xsm/dist/mainwin.c
U xsrc/external/mit/xsm/dist/log.c
U xsrc/external/mit/xsm/dist/restart.h
U xsrc/external/mit/xsm/dist/README
U xsrc/external/mit/xsm/dist/xtwatch.h
U xsrc/external/mit/xsm/dist/COPYING
U xsrc/external/mit/xsm/dist/signals.c
U xsrc/external/mit/xsm/dist/configure
U xsrc/external/mit/xsm/dist/prop.h
U xsrc/external/mit/xsm/dist/auth.h
U xsrc/external/mit/xsm/dist/ChangeLog
U xsrc/external/mit/xsm/dist/saveutil.h
U xsrc/external/mit/xsm/dist/popup.c
U xsrc/external/mit/xsm/dist/configure.ac
U xsrc/external/mit/xsm/dist/xtwatch.c
U xsrc/external/mit/xsm/dist/INSTALL
U xsrc/external/mit/xsm/dist/mainwin.h
U xsrc/external/mit/xsm/dist/log.h
U xsrc/external/mit/xsm/dist/restart.c
U xsrc/external/mit/xsm/dist/printhex.c
U xsrc/external/mit/xsm/dist/info.c
U xsrc/external/mit/xsm/dist/xsm.c
U xsrc/external/mit/xsm/dist/save.h
C xsrc/external/mit/xsm/dist/choose.c
U xsrc/external/mit/xsm/dist/lock.h
U xsrc/external/mit/xsm/dist/config.h.in
U xsrc/external/mit/xsm/dist/config.sub
U xsrc/external/mit/xsm/dist/list.h
U xsrc/external/mit/xsm/dist/man/Makefile.in
U xsrc/external/mit/xsm/dist/man/Makefile.am
U xsrc/external/mit/xsm/dist/man/xsm.man
U xsrc/external/mit/xsm/dist/app-defaults/XSm

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:40:44 UTC 2022

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

Log Message:
initial import of xsm-1.0.5

Status:

Vendor Tag: xorg
Release Tags:   xsm-1-0-5

U xsrc/external/mit/xsm/dist/Makefile.am
U xsrc/external/mit/xsm/dist/missing
U xsrc/external/mit/xsm/dist/popup.h
U xsrc/external/mit/xsm/dist/depcomp
U xsrc/external/mit/xsm/dist/prop.c
U xsrc/external/mit/xsm/dist/auth.c
C xsrc/external/mit/xsm/dist/saveutil.c
U xsrc/external/mit/xsm/dist/remote.c
C xsrc/external/mit/xsm/dist/compile
U xsrc/external/mit/xsm/dist/misc.c
U xsrc/external/mit/xsm/dist/system.xsm
U xsrc/external/mit/xsm/dist/config.guess
U xsrc/external/mit/xsm/dist/install-sh
U xsrc/external/mit/xsm/dist/list.c
U xsrc/external/mit/xsm/dist/info.h
U xsrc/external/mit/xsm/dist/xsm.h
U xsrc/external/mit/xsm/dist/save.c
U xsrc/external/mit/xsm/dist/Makefile.in
U xsrc/external/mit/xsm/dist/choose.h
U xsrc/external/mit/xsm/dist/lock.c
U xsrc/external/mit/xsm/dist/aclocal.m4
U xsrc/external/mit/xsm/dist/mainwin.c
U xsrc/external/mit/xsm/dist/log.c
U xsrc/external/mit/xsm/dist/restart.h
U xsrc/external/mit/xsm/dist/README
U xsrc/external/mit/xsm/dist/xtwatch.h
U xsrc/external/mit/xsm/dist/COPYING
U xsrc/external/mit/xsm/dist/signals.c
U xsrc/external/mit/xsm/dist/configure
U xsrc/external/mit/xsm/dist/prop.h
U xsrc/external/mit/xsm/dist/auth.h
U xsrc/external/mit/xsm/dist/ChangeLog
U xsrc/external/mit/xsm/dist/saveutil.h
U xsrc/external/mit/xsm/dist/popup.c
U xsrc/external/mit/xsm/dist/configure.ac
U xsrc/external/mit/xsm/dist/xtwatch.c
U xsrc/external/mit/xsm/dist/INSTALL
U xsrc/external/mit/xsm/dist/mainwin.h
U xsrc/external/mit/xsm/dist/log.h
U xsrc/external/mit/xsm/dist/restart.c
U xsrc/external/mit/xsm/dist/printhex.c
U xsrc/external/mit/xsm/dist/info.c
U xsrc/external/mit/xsm/dist/xsm.c
U xsrc/external/mit/xsm/dist/save.h
C xsrc/external/mit/xsm/dist/choose.c
U xsrc/external/mit/xsm/dist/lock.h
U xsrc/external/mit/xsm/dist/config.h.in
U xsrc/external/mit/xsm/dist/config.sub
U xsrc/external/mit/xsm/dist/list.h
U xsrc/external/mit/xsm/dist/man/Makefile.in
U xsrc/external/mit/xsm/dist/man/Makefile.am
U xsrc/external/mit/xsm/dist/man/xsm.man
U xsrc/external/mit/xsm/dist/app-defaults/XSm

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

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

CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Mon Jul 11 18:56:00 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_request.c

Log Message:
i915: Defer destroying waitqueue until after callback is removed.

Candidate fix for PR kern/56561.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c

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

CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Mon Jul 11 18:56:00 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_request.c

Log Message:
i915: Defer destroying waitqueue until after callback is removed.

Candidate fix for PR kern/56561.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_request.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/external/bsd/drm2/dist/drm/i915/i915_request.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.16 src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c:1.16	Mon Dec 27 13:29:15 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_request.c	Mon Jul 11 18:56:00 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_request.c,v 1.16 2021/12/27 13:29:15 riastradh Exp $	*/
+/*	$NetBSD: i915_request.c,v 1.17 2022/07/11 18:56:00 riastradh Exp $	*/
 
 /*
  * Copyright © 2008-2015 Intel Corporation
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.16 2021/12/27 13:29:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_request.c,v 1.17 2022/07/11 18:56:00 riastradh Exp $");
 
 #include 
 #include 
@@ -1630,7 +1630,6 @@ long i915_request_wait(struct i915_reque
 		timeout = -ETIME;
 	}
 	spin_unlock(rq->fence.lock);
-	DRM_DESTROY_WAITQUEUE();
 #else
 	for (;;) {
 		set_current_state(state);
@@ -1657,6 +1656,9 @@ long i915_request_wait(struct i915_reque
 #endif
 
 	dma_fence_remove_callback(>fence, );
+#ifdef __NetBSD__
+	DRM_DESTROY_WAITQUEUE();
+#endif
 
 out:
 	mutex_release(>engine->gt->reset.mutex.dep_map, _THIS_IP_);

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:27:31 UTC 2022

Modified Files:
xsrc/external/mit/xterm/include: xtermcfg.h

Log Message:
update for xterm 372.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xterm/include/xtermcfg.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/xterm/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:27:31 UTC 2022

Modified Files:
xsrc/external/mit/xterm/include: xtermcfg.h

Log Message:
update for xterm 372.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xterm/include/xtermcfg.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/xterm/include/xtermcfg.h
diff -u xsrc/external/mit/xterm/include/xtermcfg.h:1.19 xsrc/external/mit/xterm/include/xtermcfg.h:1.20
--- xsrc/external/mit/xterm/include/xtermcfg.h:1.19	Sun Jan  9 09:17:31 2022
+++ xsrc/external/mit/xterm/include/xtermcfg.h	Mon Jul 11 19:27:31 2022
@@ -2,7 +2,7 @@
 /* $XTermId: xtermcfg.hin,v 1.223 2021/08/22 20:00:07 tom Exp $ */
 
 /*
- * Copyright 1997-2019,2020 by Thomas E. Dickey
+ * Copyright 1997-2021,2022 by Thomas E. Dickey
  *
  * All Rights Reserved
  *
@@ -164,7 +164,7 @@
 /* #undef OPT_DABBREV */		/* CF_ARG_ENABLE(dabbrev) */
 /* #undef OPT_DEC_CHRSET */		/* CF_ARG_DISABLE(doublechars) */
 /* #undef OPT_DEC_LOCATOR */		/* CF_ARG_ENABLE(dec-locator) */
-#define OPT_DEC_RECTOPS 1		/* CF_ARG_ENABLE(rectangles) */
+#define OPT_DEC_RECTOPS 1		/* CF_ARG_DISABLE(rectangles) */
 #define OPT_DIRECT_COLOR 1		/* CF_ARG_ENABLE(direct-color) */
 /* #undef OPT_DOUBLE_BUFFER */	/* CF_ARG_ENABLE(double-buffer) */
 /* #undef OPT_EXEC_XTERM */		/* CF_ARG_ENABLE(exec-xterm) */
@@ -193,6 +193,7 @@
 #define OPT_SELECT_REGEX 1		/* CF_ARG_DISABLE(regex) */
 /* #undef OPT_SESSION_MGT */		/* CF_ARG_DISABLE(session-mgt) */
 #define OPT_SIXEL_GRAPHICS 1	/* CF_ARG_ENABLE(sixel-graphics) */
+#define OPT_STATUS_LINE 1	/* CF_ARG_ENABLE(status-line) */
 /* #undef OPT_SUN_FUNC_KEYS */	/* CF_ARG_ENABLE(sun-fkeys) */
 #define OPT_TCAP_FKEYS 1		/* CF_ARG_ENABLE(tcap-fkeys) */
 #define OPT_TCAP_QUERY 1		/* CF_ARG_ENABLE(tcap-query) */

CVS commit: [netbsd-9] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 14:13:46 UTC 2022

Modified Files:
src/doc [netbsd-9]: CHANGES-9.3

Log Message:
Ticket #1477


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-9.3

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

CVS commit: [netbsd-9] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 14:13:46 UTC 2022

Modified Files:
src/doc [netbsd-9]: CHANGES-9.3

Log Message:
Ticket #1477


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-9.3

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

Modified files:

Index: src/doc/CHANGES-9.3
diff -u src/doc/CHANGES-9.3:1.1.2.108 src/doc/CHANGES-9.3:1.1.2.109
--- src/doc/CHANGES-9.3:1.1.2.108	Fri Jun 17 15:26:31 2022
+++ src/doc/CHANGES-9.3	Mon Jul 11 14:13:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.3,v 1.1.2.108 2022/06/17 15:26:31 martin Exp $
+# $NetBSD: CHANGES-9.3,v 1.1.2.109 2022/07/11 14:13:46 martin Exp $
 
 A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3
 release:
@@ -1843,3 +1843,24 @@ sys/miscfs/procfs/procfs_vnops.c		1.229
 	procfs: add missing permission check.
 	[shm, ticket #1475]
 
+sys/dev/pci/if_wmreg.h1.122-1.125
+sys/dev/pci/if_wmvar.h1.48
+sys/dev/pci/if_wm.c1.719-1.720,1.722-1.725,
+		1.727-1.740 via patch
+
+	- wm_tick: Add missing splx(s) when not WM_MPSAFE.
+	- Print DMA range info if the system is booting in the verbose mode.
+	- Micro optimization:
+	  - Call m_freem(m) only if m0 == NULL.
+	  - Call wm_xxeof() only when limit > 0.
+	  - Don't set the more flag when there is no packet to process.
+	- No functional changes:
+	  - Call txeof first, then rxeof for the consistency.
+	  - Remove duplicated break.
+	  - Remove stray semicolons from struct declaration.
+	  - Fix value return from void function.
+	  - Use macros.
+	  - Modify comment.
+	  - KNF.
+	[msaitoh, ticket #1477]
+

CVS commit: src/lib/libp2k

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Mon Jul 11 19:24:56 UTC 2022

Modified Files:
src/lib/libp2k: p2k.3

Log Message:
p2k(3): drop reference to rump_smbfs(8).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libp2k/p2k.3

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

Modified files:

Index: src/lib/libp2k/p2k.3
diff -u src/lib/libp2k/p2k.3:1.11 src/lib/libp2k/p2k.3:1.12
--- src/lib/libp2k/p2k.3:1.11	Thu Sep 16 22:19:10 2021
+++ src/lib/libp2k/p2k.3	Mon Jul 11 19:24:56 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: p2k.3,v 1.11 2021/09/16 22:19:10 andvar Exp $
+.\" $NetBSD: p2k.3,v 1.12 2022/07/11 19:24:56 andvar Exp $
 .\"
 .\" Copyright (c) 2008 Antti Kantee.  All rights reserved.
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 7, 2011
+.Dd July 11, 2022
 .Dt P2K 3
 .Os
 .Sh NAME
@@ -134,7 +134,6 @@ root image as a non-root user.
 .Xr rump_msdos 8 ,
 .Xr rump_nfs 8 ,
 .Xr rump_ntfs 8 ,
-.Xr rump_smbfs 8 ,
 .Xr rump_syspuffs 8 ,
 .Xr rump_sysvbfs 8 ,
 .Xr rump_tmpfs 8 ,

CVS commit: src/lib/libp2k

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Mon Jul 11 19:24:56 UTC 2022

Modified Files:
src/lib/libp2k: p2k.3

Log Message:
p2k(3): drop reference to rump_smbfs(8).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libp2k/p2k.3

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

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 14:17:49 UTC 2022

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ticket #1751


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.137 -r1.1.2.138 src/doc/CHANGES-8.3

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

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 14:17:49 UTC 2022

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ticket #1751


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.137 -r1.1.2.138 src/doc/CHANGES-8.3

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

Modified files:

Index: src/doc/CHANGES-8.3
diff -u src/doc/CHANGES-8.3:1.1.2.137 src/doc/CHANGES-8.3:1.1.2.138
--- src/doc/CHANGES-8.3:1.1.2.137	Fri Jun 17 15:33:02 2022
+++ src/doc/CHANGES-8.3	Mon Jul 11 14:17:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.3,v 1.1.2.137 2022/06/17 15:33:02 martin Exp $
+ $NetBSD: CHANGES-8.3,v 1.1.2.138 2022/07/11 14:17:49 martin Exp $
 
 A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
 release:
@@ -2684,3 +2684,24 @@ sys/miscfs/procfs/procfs_vnops.c		1.229
 	procfs: add missing permission check.
 	[shm, ticket #1748]
 
+sys/dev/pci/if_wmreg.h1.122-1.125 via patch
+sys/dev/pci/if_wmvar.h1.48
+sys/dev/pci/if_wm.c1.719-1.720,1.722-1.725,
+		1.727-1.740 via patch
+
+	- wm_tick: Add missing splx(s) when not WM_MPSAFE.
+	- Print DMA range info if the system is booting in the verbose mode.
+	- Micro optimization:
+	  - Call m_freem(m) only if m0 == NULL.
+	  - Call wm_xxeof() only when limit > 0.
+	  - Don't set the more flag when there is no packet to process.
+	- No functional changes:
+	  - Call txeof first, then rxeof for the consistency.
+	  - Remove duplicated break.
+	  - Remove stray semicolons from struct declaration.
+	  - Fix value return from void function.
+	  - Use macros.
+	  - Modify comment.
+	  - KNF.
+	[msaitoh, ticket #1751]
+

CVS commit: [netbsd-9] src/sys/dev/pci

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 14:10:18 UTC 2022

Modified Files:
src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h if_wmvar.h

Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1477:

sys/dev/pci/if_wmreg.h  1.122-1.125
sys/dev/pci/if_wmvar.h  1.48
sys/dev/pci/if_wm.c 1.719-1.720,
1.722-1.725,
1.727-1.740 via patch

- wm_tick: Add missing splx(s) when not WM_MPSAFE.
- Print DMA range info if the system is booting in the verbose mode.
- Micro optimization:
  - Call m_freem(m) only if m0 == NULL.
  - Call wm_xxeof() only when limit > 0.
  - Don't set the more flag when there is no packet to process.
- No functional changes:
  - Call txeof first, then rxeof for the consistency.
  - Remove duplicated break.
  - Remove stray semicolons from struct declaration.
  - Fix value return from void function.
  - Use macros.
  - Modify comment.
  - KNF.


To generate a diff of this commit:
cvs rdiff -u -r1.645.2.12 -r1.645.2.13 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.115.2.4 -r1.115.2.5 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.44.4.3 -r1.44.4.4 src/sys/dev/pci/if_wmvar.h

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

CVS commit: [netbsd-9] src/sys/dev/pci

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 14:10:18 UTC 2022

Modified Files:
src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h if_wmvar.h

Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1477:

sys/dev/pci/if_wmreg.h  1.122-1.125
sys/dev/pci/if_wmvar.h  1.48
sys/dev/pci/if_wm.c 1.719-1.720,
1.722-1.725,
1.727-1.740 via patch

- wm_tick: Add missing splx(s) when not WM_MPSAFE.
- Print DMA range info if the system is booting in the verbose mode.
- Micro optimization:
  - Call m_freem(m) only if m0 == NULL.
  - Call wm_xxeof() only when limit > 0.
  - Don't set the more flag when there is no packet to process.
- No functional changes:
  - Call txeof first, then rxeof for the consistency.
  - Remove duplicated break.
  - Remove stray semicolons from struct declaration.
  - Fix value return from void function.
  - Use macros.
  - Modify comment.
  - KNF.


To generate a diff of this commit:
cvs rdiff -u -r1.645.2.12 -r1.645.2.13 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.115.2.4 -r1.115.2.5 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.44.4.3 -r1.44.4.4 src/sys/dev/pci/if_wmvar.h

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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.645.2.12 src/sys/dev/pci/if_wm.c:1.645.2.13
--- src/sys/dev/pci/if_wm.c:1.645.2.12	Sat Nov 20 14:59:04 2021
+++ src/sys/dev/pci/if_wm.c	Mon Jul 11 14:10:18 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.645.2.12 2021/11/20 14:59:04 martin Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.645.2.13 2022/07/11 14:10:18 martin Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -39,21 +39,21 @@
 
   Copyright (c) 2001-2005, Intel Corporation
   All rights reserved.
- 
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
- 
+
1. Redistributions of source code must retain the above copyright notice,
   this list of conditions and the following disclaimer.
- 
+
2. Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in the
   documentation and/or other materials provided with the distribution.
- 
+
3. Neither the name of the Intel Corporation nor the names of its
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.
- 
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -82,7 +82,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.12 2021/11/20 14:59:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.13 2022/07/11 14:10:18 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -321,9 +321,9 @@ struct wm_softc;
 #endif
 
 #ifdef WM_EVENT_COUNTERS
-#define WM_Q_EVCNT_DEFINE(qname, evname)\
+#define WM_Q_EVCNT_DEFINE(qname, evname) \
 	char qname##_##evname##_evcnt_name[sizeof("qname##XX##evname")]; \
-	struct evcnt qname##_ev_##evname;
+	struct evcnt qname##_ev_##evname
 
 #define WM_Q_EVCNT_ATTACH(qname, evname, q, qnum, xname, evtype)	\
 	do {\
@@ -342,7 +342,7 @@ struct wm_softc;
 	WM_Q_EVCNT_ATTACH(qname, evname, q, qnum, xname, EVCNT_TYPE_INTR)
 
 #define WM_Q_EVCNT_DETACH(qname, evname, q, qnum)	\
-	evcnt_detach(&(q)->qname##_ev_##evname);
+	evcnt_detach(&(q)->qname##_ev_##evname)
 #endif /* WM_EVENT_COUNTERS */
 
 struct wm_txqueue {
@@ -409,27 +409,27 @@ struct wm_txqueue {
 	uint32_t txq_bytes;		/* for AIM */
 #ifdef WM_EVENT_COUNTERS
 	/* TX event counters */
-	WM_Q_EVCNT_DEFINE(txq, txsstall)/* Stalled due to no txs */
-	WM_Q_EVCNT_DEFINE(txq, txdstall)/* Stalled due to no txd */
-	WM_Q_EVCNT_DEFINE(txq, fifo_stall)  /* FIFO stalls (82547) */
-	WM_Q_EVCNT_DEFINE(txq, txdw)	/* Tx descriptor interrupts */
-	WM_Q_EVCNT_DEFINE(txq, txqe)	/* Tx queue empty interrupts */
+	WM_Q_EVCNT_DEFINE(txq, txsstall);   /* Stalled due to no txs */
+	WM_Q_EVCNT_DEFINE(txq, txdstall);   /* Stalled due to no txd */
+	WM_Q_EVCNT_DEFINE(txq, fifo_stall); /* FIFO stalls (82547) */
+	WM_Q_EVCNT_DEFINE(txq, txdw);	/* Tx descriptor interrupts */
+	WM_Q_EVCNT_DEFINE(txq, txqe);	/* Tx queue empty interrupts */
 	/* XXX not used? */
 
-	WM_Q_EVCNT_DEFINE(txq, ipsum)	/* IP checksums comp. */
-	WM_Q_EVCNT_DEFINE(txq, tusum)	/* TCP/UDP cksums comp. */
-	WM_Q_EVCNT_DEFINE(txq, tusum6)	/* TCP/UDP v6 cksums comp. */
-	

CVS commit: [netbsd-8] src/sys/dev/pci

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 14:15:58 UTC 2022

Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c if_wmreg.h if_wmvar.h

Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1751:

sys/dev/pci/if_wmreg.h  1.122-1.125 via patch
sys/dev/pci/if_wmvar.h  1.48
sys/dev/pci/if_wm.c 1.719-1.720,1.722-1.725,
1.727-1.740 via patch

- wm_tick: Add missing splx(s) when not WM_MPSAFE.
- Print DMA range info if the system is booting in the verbose mode.
- Micro optimization:
  - Call m_freem(m) only if m0 == NULL.
  - Call wm_xxeof() only when limit > 0.
  - Don't set the more flag when there is no packet to process.
- No functional changes:
  - Call txeof first, then rxeof for the consistency.
  - Remove duplicated break.
  - Remove stray semicolons from struct declaration.
  - Fix value return from void function.
  - Use macros.
  - Modify comment.
  - KNF.


To generate a diff of this commit:
cvs rdiff -u -r1.508.4.44 -r1.508.4.45 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.98.6.13 -r1.98.6.14 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.33.6.8 -r1.33.6.9 src/sys/dev/pci/if_wmvar.h

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