date:20190311

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

2019-03-11 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Mar 12 03:37:23 UTC 2019

Modified Files:
src/distrib/sets/lists/xcomp: md.amd64 md.evbarm md.i386 mi

Log Message:
move the mesa 18 khrplatform.h header into xcomp/mi.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xcomp/md.evbarm
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.206 -r1.207 src/distrib/sets/lists/xcomp/mi

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

Modified files:

Index: src/distrib/sets/lists/xcomp/md.amd64
diff -u src/distrib/sets/lists/xcomp/md.amd64:1.53 src/distrib/sets/lists/xcomp/md.amd64:1.54
--- src/distrib/sets/lists/xcomp/md.amd64:1.53	Mon Mar 11 08:05:18 2019
+++ src/distrib/sets/lists/xcomp/md.amd64	Tue Mar 12 03:37:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.53 2019/03/11 08:05:18 mrg Exp $
+# $NetBSD: md.amd64,v 1.54 2019/03/12 03:37:23 mrg Exp $
 ./usr/X11R7/include/intel_bufmgr.h			-unknown-	obsolete
 ./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h	-unknown-	xorg
@@ -7,7 +7,6 @@
 ./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h		-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h	-unknown-	xorg
-./usr/X11R7/include/KHR/khrplatform.h			-unknown-	xorg,mesa_ver=18
 ./usr/X11R7/include/vdpau/vdpau.h			-unknown-	xorg
 ./usr/X11R7/include/vdpau/vdpau_x11.h			-unknown-	xorg
 ./usr/X11R7/lib/libI810XvMC.a-unknown-	xorg,compatx11file

Index: src/distrib/sets/lists/xcomp/md.evbarm
diff -u src/distrib/sets/lists/xcomp/md.evbarm:1.11 src/distrib/sets/lists/xcomp/md.evbarm:1.12
--- src/distrib/sets/lists/xcomp/md.evbarm:1.11	Mon Mar 11 08:05:18 2019
+++ src/distrib/sets/lists/xcomp/md.evbarm	Tue Mar 12 03:37:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.11 2019/03/11 08:05:18 mrg Exp $
+# $NetBSD: md.evbarm,v 1.12 2019/03/12 03:37:23 mrg Exp $
 ./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/class.h		-unknown-	xorg
@@ -6,7 +6,6 @@
 ./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h		-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h	-unknown-	xorg
-./usr/X11R7/include/KHR/khrplatform.h			-unknown-	xorg,mesa_ver=18
 ./usr/X11R7/include/vdpau/vdpau.h			-unknown-	xorg
 ./usr/X11R7/include/vdpau/vdpau_x11.h			-unknown-	xorg
 ./usr/X11R7/lib/libdrm_nouveau.a			-unknown-	xorg

Index: src/distrib/sets/lists/xcomp/md.i386
diff -u src/distrib/sets/lists/xcomp/md.i386:1.58 src/distrib/sets/lists/xcomp/md.i386:1.59
--- src/distrib/sets/lists/xcomp/md.i386:1.58	Mon Mar 11 08:05:18 2019
+++ src/distrib/sets/lists/xcomp/md.i386	Tue Mar 12 03:37:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.58 2019/03/11 08:05:18 mrg Exp $
+# $NetBSD: md.i386,v 1.59 2019/03/12 03:37:23 mrg Exp $
 #./usr/libdata/lint/llib-lIntelXvMC.ln			-unknown-	lint,xorg
 ./usr/X11R7/include/intel_bufmgr.h			-unknown-	obsolete
 ./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h	-unknown-	xorg
@@ -8,7 +8,6 @@
 ./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h		-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h	-unknown-	xorg
-./usr/X11R7/include/KHR/khrplatform.h			-unknown-	xorg,mesa_ver=18
 ./usr/X11R7/include/vdpau/vdpau.h			-unknown-	xorg
 ./usr/X11R7/include/vdpau/vdpau_x11.h			-unknown-	xorg
 ./usr/X11R7/lib/libI810XvMC.a-unknown-	xorg

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.206 src/distrib/sets/lists/xcomp/mi:1.207
--- src/distrib/sets/lists/xcomp/mi:1.206	Sun Mar 10 11:18:02 2019
+++ src/distrib/sets/lists/xcomp/mi	Tue Mar 12 03:37:23 2019
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.206 2019/03/10 11:18:02 mrg Exp $
+#	 $NetBSD: mi,v 1.207 2019/03/12 03:37:23 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -34,6 +34,7 @@
 ./usr/X11R7/include/GL/xmesa.h-unknown-	obsolete
 ./usr/X11R7/include/GL/xmesa_x.h			-unknown-	obsolete
 ./usr/X11R7/include/GL/xmesa_xf86.h			-unknown-	obsolete
+./usr/X11R7/include/KHR/khrplatform.h			-unknown-	xorg,mesa_ver=18
 ./usr/X11R7/include/X11/CallbackI.h			-unknown-	xorg
 ./usr/X11R7/include/X11/Composite.h			-unknown-	xorg
 ./usr/X11R7/include/X11/CompositeP.h			-unknown-	xorg

CVS commit: src/sys/dev/usb

2019-03-11 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Tue Mar 12 03:08:34 UTC 2019

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

Log Message:
 Use pmf(9).


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/dev/usb/if_aue.c

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

Modified files:

Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.147 src/sys/dev/usb/if_aue.c:1.148
--- src/sys/dev/usb/if_aue.c:1.147	Tue Jan 22 06:38:53 2019
+++ src/sys/dev/usb/if_aue.c	Tue Mar 12 03:08:34 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_aue.c,v 1.147 2019/01/22 06:38:53 skrll Exp $	*/
+/*	$NetBSD: if_aue.c,v 1.148 2019/03/12 03:08:34 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -77,7 +77,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.147 2019/01/22 06:38:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.148 2019/03/12 03:08:34 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -873,6 +873,9 @@ aue_attach(device_t parent, device_t sel
 
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->aue_udev, sc->aue_dev);
 
+	if (!pmf_device_register(self, NULL, NULL))
+		aprint_error_dev(self, "couldn't establish power handler\n");
+
 	return;
 }
 
@@ -890,6 +893,8 @@ aue_detach(device_t self, int flags)
 		return 0;
 	}
 
+	pmf_device_deregister(self);
+
 	/*
 	 * XXX Halting callout guarantees no more tick tasks.  What
 	 * guarantees no more stop tasks?  What guarantees no more

CVS commit: src/external/bsd/llvm/lib/libLLVMAMDGPUUtils

2019-03-11 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Tue Mar 12 02:07:14 UTC 2019

Modified Files:
src/external/bsd/llvm/lib/libLLVMAMDGPUUtils: Makefile

Log Message:
Correct copy-paste error. From joerg, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/llvm/lib/libLLVMAMDGPUUtils/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/bsd/llvm/lib/libLLVMAMDGPUUtils/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMAMDGPUUtils/Makefile:1.1 src/external/bsd/llvm/lib/libLLVMAMDGPUUtils/Makefile:1.2
--- src/external/bsd/llvm/lib/libLLVMAMDGPUUtils/Makefile:1.1	Sun Mar 10 12:14:06 2019
+++ src/external/bsd/llvm/lib/libLLVMAMDGPUUtils/Makefile	Tue Mar 12 02:07:14 2019
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2019/03/10 12:14:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2019/03/12 02:07:14 maya Exp $
 
 LIB=	LLVMAMDGPUUtils
 
 .include 
 
-X86_OBJDIR!=	cd ${.CURDIR}/../libLLVMAMDGPUCodeGen && ${PRINTOBJDIR}
-CPPFLAGS+=	-I${X86_OBJDIR} -I${LLVM_SRCDIR}/lib/Target/AMDGPU
+AMDGPU_OBJDIR!=	cd ${.CURDIR}/../libLLVMAMDGPUCodeGen && ${PRINTOBJDIR}
+CPPFLAGS+=	-I${AMDGPU_OBJDIR} -I${LLVM_SRCDIR}/lib/Target/AMDGPU
 
 CPPFLAGS+=	-I${LLVM_SRCDIR}/lib/Target/AMDGPU

CVS commit: src/sys/kern

2019-03-11 Thread Robert Elz

Module Name:src
Committed By:   kre
Date:   Tue Mar 12 00:25:44 UTC 2019

Modified Files:
src/sys/kern: subr_humanize.c

Log Message:
This had a similar problem to that reported in PR lib/54053
for the userland (libc) version of humanize_number(),
except in a much more limited, and less harmful, way ...

If the value to be printed was > ~0/10 (eg ~0 itself) and
the buffer given was big enough to hold it, "umax" would overflow,
and the expected result was not produced (here at least the effect was
simply to scale the result for huge values by one unnecessary step,
rather than maximally scale all values usually generating 0E, but
incorrect nonetheless.)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/subr_humanize.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/kern/subr_humanize.c
diff -u src/sys/kern/subr_humanize.c:1.1 src/sys/kern/subr_humanize.c:1.2
--- src/sys/kern/subr_humanize.c:1.1	Fri Oct  2 15:48:41 2009
+++ src/sys/kern/subr_humanize.c	Tue Mar 12 00:25:44 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_humanize.c,v 1.1 2009/10/02 15:48:41 pooka Exp $	*/
+/*	$NetBSD: subr_humanize.c,v 1.2 2019/03/12 00:25:44 kre Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_humanize.c,v 1.1 2009/10/02 15:48:41 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_humanize.c,v 1.2 2019/03/12 00:25:44 kre Exp $");
 
 #include 
 #include 
@@ -55,7 +55,7 @@ humanize_number(char *buf, size_t len, u
	/* prefixes are: (none), kilo, Mega, Giga, Tera, Peta, Exa */
 	const char *prefixes;
 	int		r;
-	uint64_t	umax;
+	uint64_t	umax, b10;
 	size_t		i, suffixlen;
 
 	if (buf == NULL || suffix == NULL)
@@ -77,14 +77,23 @@ humanize_number(char *buf, size_t len, u
 		prefixes = " kMGTPE"; /* SI for decimal multiplies */
 
 	umax = 1;
+	b10 = bytes/10;
 	for (i = 0; i < len - suffixlen - 3; i++) {
+		if (umax > b10) {
+			/*
+			 * there is space for the unscaled number
+			 * but bytes might be ~0 - there is no bigger
+			 * value available for umax, so we must skip
+			 * the "bytes >= umax" test below
+			 */
+			i = 0;
+			goto nodiv;
+		}
 		umax *= 10;
-		if (umax > bytes)
-			break;
 	}
 	for (i = 0; bytes >= umax && prefixes[i + 1]; i++)
 		bytes /= divisor;
-
+ nodiv:
 	r = snprintf(buf, len, "%qu%s%c%s", (unsigned long long)bytes,
 	i == 0 ? "" : " ", prefixes[i], suffix);

CVS commit: src/sys/kern

2019-03-11 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Mon Mar 11 20:38:28 UTC 2019

Modified Files:
src/sys/kern: subr_pool.c

Log Message:
Add sanity check: make sure we retrieve a valid item header, by checking
its page address against the one we computed. If there's a mismatch it
means the buffer does not belong to the pool, and we panic.


To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 src/sys/kern/subr_pool.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/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.234 src/sys/kern/subr_pool.c:1.235
--- src/sys/kern/subr_pool.c:1.234	Mon Mar 11 20:21:32 2019
+++ src/sys/kern/subr_pool.c	Mon Mar 11 20:38:27 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.234 2019/03/11 20:21:32 maxv Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.235 2019/03/11 20:38:27 maxv Exp $	*/
 
 /*
  * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.234 2019/03/11 20:21:32 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.235 2019/03/11 20:38:27 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -431,7 +431,12 @@ pr_find_pagehead(struct pool *pp, void *
 		(void *)((uintptr_t)v & pp->pr_alloc->pa_pagemask);
 
 		if ((pp->pr_roflags & PR_PHINPAGE) != 0) {
-			ph = (struct pool_item_header *)((char *)page + pp->pr_phoffset);
+			ph = (struct pool_item_header *)
+			((char *)page + pp->pr_phoffset);
+			if (__predict_false((void *)ph->ph_page != page)) {
+panic("%s: [%s] item not part of pool",
+__func__, pp->pr_wchan);
+			}
 		} else {
 			tmp.ph_page = page;
 			ph = SPLAY_FIND(phtree, >pr_phtree, );

CVS commit: src/sys/kern

2019-03-11 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Mon Mar 11 20:21:33 UTC 2019

Modified Files:
src/sys/kern: subr_pool.c

Log Message:
Rename pr_item_notouch_* to pr_item_bitmap_*, and move some code into new
pr_item_linkedlist_* functions. This makes it easier to see that we have
two ways of handling freed items.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/kern/subr_pool.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/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.233 src/sys/kern/subr_pool.c:1.234
--- src/sys/kern/subr_pool.c:1.233	Mon Feb 11 11:12:58 2019
+++ src/sys/kern/subr_pool.c	Mon Mar 11 20:21:32 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.233 2019/02/11 11:12:58 maxv Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.234 2019/03/11 20:21:32 maxv Exp $	*/
 
 /*
  * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.233 2019/02/11 11:12:58 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.234 2019/03/11 20:21:32 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -258,8 +258,10 @@ static void pool_print1(struct pool *, c
 static int pool_chk_page(struct pool *, const char *,
 			 struct pool_item_header *);
 
+/* -- */
+
 static inline unsigned int
-pr_item_notouch_index(const struct pool *pp, const struct pool_item_header *ph,
+pr_item_bitmap_index(const struct pool *pp, const struct pool_item_header *ph,
 const void *v)
 {
 	const char *cp = v;
@@ -272,10 +274,10 @@ pr_item_notouch_index(const struct pool 
 }
 
 static inline void
-pr_item_notouch_put(const struct pool *pp, struct pool_item_header *ph,
+pr_item_bitmap_put(const struct pool *pp, struct pool_item_header *ph,
 void *obj)
 {
-	unsigned int idx = pr_item_notouch_index(pp, ph, obj);
+	unsigned int idx = pr_item_bitmap_index(pp, ph, obj);
 	pool_item_bitmap_t *bitmap = ph->ph_bitmap + (idx / BITMAP_SIZE);
 	pool_item_bitmap_t mask = 1U << (idx & BITMAP_MASK);
 
@@ -284,7 +286,7 @@ pr_item_notouch_put(const struct pool *p
 }
 
 static inline void *
-pr_item_notouch_get(const struct pool *pp, struct pool_item_header *ph)
+pr_item_bitmap_get(const struct pool *pp, struct pool_item_header *ph)
 {
 	pool_item_bitmap_t *bitmap = ph->ph_bitmap;
 	unsigned int idx;
@@ -311,7 +313,7 @@ pr_item_notouch_get(const struct pool *p
 }
 
 static inline void
-pr_item_notouch_init(const struct pool *pp, struct pool_item_header *ph)
+pr_item_bitmap_init(const struct pool *pp, struct pool_item_header *ph)
 {
 	pool_item_bitmap_t *bitmap = ph->ph_bitmap;
 	const int n = howmany(pp->pr_itemsperpage, BITMAP_SIZE);
@@ -322,6 +324,60 @@ pr_item_notouch_init(const struct pool *
 	}
 }
 
+/* -- */
+
+static inline void
+pr_item_linkedlist_put(const struct pool *pp, struct pool_item_header *ph,
+void *obj)
+{
+	struct pool_item *pi = obj;
+
+#ifdef POOL_CHECK_MAGIC
+	pi->pi_magic = PI_MAGIC;
+#endif
+
+	if (pp->pr_redzone) {
+		/*
+		 * Mark the pool_item as valid. The rest is already
+		 * invalid.
+		 */
+		kasan_mark(pi, sizeof(*pi), sizeof(*pi));
+	}
+
+	LIST_INSERT_HEAD(>ph_itemlist, pi, pi_list);
+}
+
+static inline void *
+pr_item_linkedlist_get(struct pool *pp, struct pool_item_header *ph)
+{
+	struct pool_item *pi;
+	void *v;
+
+	v = pi = LIST_FIRST(>ph_itemlist);
+	if (__predict_false(v == NULL)) {
+		mutex_exit(>pr_lock);
+		panic("%s: [%s] page empty", __func__, pp->pr_wchan);
+	}
+	KASSERTMSG((pp->pr_nitems > 0),
+	"%s: [%s] nitems %u inconsistent on itemlist",
+	__func__, pp->pr_wchan, pp->pr_nitems);
+#ifdef POOL_CHECK_MAGIC
+	KASSERTMSG((pi->pi_magic == PI_MAGIC),
+	"%s: [%s] free list modified: "
+	"magic=%x; page %p; item addr %p", __func__,
+	pp->pr_wchan, pi->pi_magic, ph->ph_page, pi);
+#endif
+
+	/*
+	 * Remove from item list.
+	 */
+	LIST_REMOVE(pi, pi_list);
+
+	return v;
+}
+
+/* -- */
+
 static inline int
 phtree_compare(struct pool_item_header *a, struct pool_item_header *b)
 {
@@ -777,7 +833,6 @@ pool_alloc_item_header(struct pool *pp, 
 void *
 pool_get(struct pool *pp, int flags)
 {
-	struct pool_item *pi;
 	struct pool_item_header *ph;
 	void *v;
 
@@ -892,27 +947,9 @@ pool_get(struct pool *pp, int flags)
 	if (pp->pr_roflags & PR_NOTOUCH) {
 		KASSERTMSG((ph->ph_nmissing < pp->pr_itemsperpage),
 		"%s: %s: page empty", __func__, pp->pr_wchan);
-		v = pr_item_notouch_get(pp, ph);
+		v = pr_item_bitmap_get(pp, ph);
 	} else {
-		v = pi = LIST_FIRST(>ph_itemlist);
-		if (__predict_false(v == NULL)) {
-			mutex_exit(>pr_lock);
-			panic("%s: [%s] page empty", __func__, pp->pr_wchan);
-		}
-

CVS commit: src/external/bsd/jemalloc/dist/src

2019-03-11 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Mar 11 18:06:28 UTC 2019

Modified Files:
src/external/bsd/jemalloc/dist/src: arena.c

Log Message:
Add an initializatin that is not needed when the optimizer works...


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/arena.c

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

Modified files:

Index: src/external/bsd/jemalloc/dist/src/arena.c
diff -u src/external/bsd/jemalloc/dist/src/arena.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/arena.c:1.2
--- src/external/bsd/jemalloc/dist/src/arena.c:1.1.1.1	Mon Mar  4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/arena.c	Mon Mar 11 14:06:28 2019
@@ -867,7 +867,8 @@ arena_decay_impl(tsdn_t *tsdn, arena_t *
 	if (epoch_advanced) {
 		/* Backlog is updated on epoch advance. */
 		npages_new = decay->backlog[SMOOTHSTEP_NSTEPS-1];
-	}
+	} else
+		npages_new = 0;	// XXX: gcc without -O
 	malloc_mutex_unlock(tsdn, >mtx);
 
 	if (have_background_thread && background_thread_enabled() &&

CVS commit: src/external/bsd/mdocml

2019-03-11 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Mar 11 17:59:28 UTC 2019

Modified Files:
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/dist: dba.c dbm.c main.c mandocdb.c mdoc.c
read.c

Log Message:
Reduce diffs with upstream and enable the built-in database code.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/mdocml/dist/dba.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/mdocml/dist/dbm.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/dist/main.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/mdocml/dist/mandocdb.c
cvs rdiff -u -r1.1.1.20 -r1.2 src/external/bsd/mdocml/dist/mdoc.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/mdocml/dist/read.c

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

Modified files:

Index: src/external/bsd/mdocml/bin/mandoc/Makefile
diff -u src/external/bsd/mdocml/bin/mandoc/Makefile:1.17 src/external/bsd/mdocml/bin/mandoc/Makefile:1.18
--- src/external/bsd/mdocml/bin/mandoc/Makefile:1.17	Thu Aug 16 02:24:40 2018
+++ src/external/bsd/mdocml/bin/mandoc/Makefile	Mon Mar 11 13:59:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/08/16 06:24:40 kre Exp $
+# $NetBSD: Makefile,v 1.18 2019/03/11 17:59:28 christos Exp $
 
 .include 
 
@@ -8,10 +8,18 @@ SRCS=	\
 eqn_html.c \
 eqn_term.c \
 html.c \
+dba.c \
+dba_array.c \
+dba_read.c \
+dba_write.c \
+dbm.c \
+dbm_map.c \
 main.c \
 man_html.c \
 man_term.c \
+mandocdb.c \
 manpath.c \
+mansearch.c \
 mdoc_html.c \
 mdoc_markdown.c \
 mdoc_term.c \

Index: src/external/bsd/mdocml/dist/dba.c
diff -u src/external/bsd/mdocml/dist/dba.c:1.1.1.1 src/external/bsd/mdocml/dist/dba.c:1.2
--- src/external/bsd/mdocml/dist/dba.c:1.1.1.1	Sat Mar 18 11:06:52 2017
+++ src/external/bsd/mdocml/dist/dba.c	Mon Mar 11 13:59:28 2019
@@ -167,7 +167,7 @@ dba_page_new(struct dba_array *pages, co
 	dba_array_add(page, entry);
 	if (arch != NULL && *arch != '\0') {
 		entry = dba_array_new(1, DBA_STR | DBA_GROW);
-		dba_array_add(entry, (void *)arch);
+		dba_array_add(entry, __UNCONST(arch));
 	} else
 		entry = NULL;
 	dba_array_add(page, entry);
@@ -208,7 +208,7 @@ dba_page_add(struct dba_array *page, int
 		if (strcmp(entry, str) == 0)
 			return;
 	}
-	dba_array_add(entries, (void *)str);
+	dba_array_add(entries, __UNCONST(str));
 }
 
 /*

Index: src/external/bsd/mdocml/dist/dbm.c
diff -u src/external/bsd/mdocml/dist/dbm.c:1.1.1.2 src/external/bsd/mdocml/dist/dbm.c:1.2
--- src/external/bsd/mdocml/dist/dbm.c:1.1.1.2	Sun Mar 10 18:28:59 2019
+++ src/external/bsd/mdocml/dist/dbm.c	Mon Mar 11 13:59:28 2019
@@ -114,7 +114,7 @@ dbm_open(const char *fname)
 			goto fail;
 		}
 		nvals[im] = be32toh(*ep);
-		macros[im] = (struct macro *)++ep;
+		macros[im] = (struct macro *)__UNCONST(++ep);
 	}
 	return 0;
 

Index: src/external/bsd/mdocml/dist/main.c
diff -u src/external/bsd/mdocml/dist/main.c:1.6 src/external/bsd/mdocml/dist/main.c:1.7
--- src/external/bsd/mdocml/dist/main.c:1.6	Sun Mar 10 20:15:38 2019
+++ src/external/bsd/mdocml/dist/main.c	Mon Mar 11 13:59:28 2019
@@ -87,9 +87,7 @@ struct	curparse {
 };
 
 
-#ifdef HAVE_SQLITE3
 int			  mandocdb(int, char *[]);
-#endif
 
 static	void		  check_xr(void);
 static	int		  fs_lookup(const struct manpaths *,
@@ -151,11 +149,9 @@ main(int argc, char *argv[])
 #endif
 
 	mandoc_msg_setoutfile(stderr);
-#ifdef HAVE_SQLITE3
 	if (strncmp(progname, "mandocdb", 8) == 0 ||
 	strcmp(progname, BINM_MAKEWHATIS) == 0)
 		return mandocdb(argc, argv);
-#endif
 
 #if HAVE_PLEDGE
 	if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1)
@@ -394,18 +390,9 @@ main(int argc, char *argv[])
 		/* Access the mandoc database. */
 
 		manconf_parse(, conf_file, defpaths, auxpaths);
-#if HAVE_SQLITE3
 		if ( ! mansearch(, ,
 		argc, argv, , ))
 			usage(search.argmode);
-#else
-		if (search.argmode != ARG_NAME) {
-			fputs("mandoc: database support not compiled in\n",
-			stderr);
-			return (int)MANDOCLEVEL_BADARG;
-		}
-		sz = 0;
-#endif
 
 		if (sz == 0 && search.argmode == ARG_NAME)
 			fs_search(, ,
@@ -616,9 +603,7 @@ main(int argc, char *argv[])
 out:
 	if (search.argmode != ARG_FILE) {
 		manconf_free();
-#ifdef HAVE_SQLITE3
 		mansearch_free(res, sz);
-#endif
 	}
 
 	free(curp.os_s);
@@ -932,10 +917,8 @@ check_xr(void)
 		search.outkey = NULL;
 		search.argmode = ARG_NAME;
 		search.firstmatch = 1;
-#ifdef HAVE_SQLITE3
 		if (mansearch(, , 1, >name, NULL, ))
 			continue;
-#endif
 		if (fs_search(, , 1, >name, NULL, ))
 			continue;
 		if (xr->count == 1)

Index: src/external/bsd/mdocml/dist/mandocdb.c
diff -u src/external/bsd/mdocml/dist/mandocdb.c:1.5 src/external/bsd/mdocml/dist/mandocdb.c:1.6
--- src/external/bsd/mdocml/dist/mandocdb.c:1.5	Sun Mar 10 20:15:38 2019
+++ src/external/bsd/mdocml/dist/mandocdb.c	Mon Mar 11 13:59:28 2019
@@ -584,8 +584,8 @@ treescan(void)

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

2019-03-11 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Mon Mar 11 17:50:19 UTC 2019

Modified Files:
src/distrib/sets/lists/xdebug: md.amd64

Log Message:
Register ./usr/X11R7/lib/libvdpau_g.a in md.amd64 sets

This unbreaks the build.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xdebug/md.amd64

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/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.44 src/distrib/sets/lists/xdebug/md.amd64:1.45
--- src/distrib/sets/lists/xdebug/md.amd64:1.44	Sun Mar 10 11:18:02 2019
+++ src/distrib/sets/lists/xdebug/md.amd64	Mon Mar 11 17:50:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.44 2019/03/10 11:18:02 mrg Exp $
+# $NetBSD: md.amd64,v 1.45 2019/03/11 17:50:19 kamil Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libIntelXvMC_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			-unknown-	debuglib,xorg,compatx11file
@@ -6,6 +6,7 @@
 ./usr/X11R7/lib/libdrm_amdgpu_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libdrm_intel_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau_g.a			-unknown-	debuglib,xorg,compatx11file
+./usr/X11R7/lib/libvdpau_g.a-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	xorg,debuglib,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	xorg,debuglib,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	xorg,debuglib,obsolete

CVS commit: src/tests/lib/libc/gen

2019-03-11 Thread Robert Elz

Module Name:src
Committed By:   kre
Date:   Mon Mar 11 17:45:12 UTC 2019

Modified Files:
src/tests/lib/libc/gen: t_humanize_number.c

Log Message:
Explicitly test for PR lib/54053

A suitable test was actually there already - but the results
were not verified.   So just add a test that the result string
is what is expected.  (Previously for len==128 and bytes==1
it would  have returned "0E" now it returns 1 as it should.)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libc/gen/t_humanize_number.c

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

Modified files:

Index: src/tests/lib/libc/gen/t_humanize_number.c
diff -u src/tests/lib/libc/gen/t_humanize_number.c:1.9 src/tests/lib/libc/gen/t_humanize_number.c:1.10
--- src/tests/lib/libc/gen/t_humanize_number.c:1.9	Tue Jan 10 15:20:44 2017
+++ src/tests/lib/libc/gen/t_humanize_number.c	Mon Mar 11 17:45:12 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_humanize_number.c,v 1.9 2017/01/10 15:20:44 christos Exp $	*/
+/*	$NetBSD: t_humanize_number.c,v 1.10 2019/03/11 17:45:12 kre Exp $	*/
 
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -287,6 +287,11 @@ ATF_TC_BODY(humanize_number_big, tc)
 
 	ATF_REQUIRE(rv != -1);
 	ATF_REQUIRE(strcmp(buf, "0%d%s%d%s%s%s") != 0);
+	/*
+	 * PR lib/54053: before version 1.18 the output was nonsense
+	 * with HN_AUTOSCALE and a buffer big enough to not need scaling
+	 */
+	ATF_REQUIRE(strcmp(buf, "1") == 0);
 
 	/*
 	 * Tight buffer.

CVS commit: src/lib/libc/gen

2019-03-11 Thread Robert Elz

Module Name:src
Committed By:   kre
Date:   Mon Mar 11 15:10:51 UTC 2019

Modified Files:
src/lib/libc/gen: humanize_number.3 humanize_number.c

Log Message:
PR lib/54053

When auto scaling, and the buffer is bigger than big enough
for the biggest possible number, don't try and calculate
the max value that will fit in the buffer - that calc
will overflow (guaranteed) and is useless, the value
we're formatting cannot possibly be bigger.  So simply
use the unscaled value (the raw number).

While here, also avoid returning values that are larger
than the buffer len ... while it would be nice to be able
to find out how big the buffer should be so the data will
fit, the interface doesn't really allow that (the buffer
length passed in controls the scaling - at least when
auto scaling) and the code already does "return -1" when
it detects the buffer length is too small, even before
it works out how much would have been needed.  So, rather
than returning a value > len (while truncating the result
to fit in len ... all courtesy of snprintf()) return -1
in this case as well.

Also, allow suffix==NULL (meaning "") - there's no reason
not to, and requiring users to pass in an explicit "" is
not useful.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/gen/humanize_number.3
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/gen/humanize_number.c

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

Modified files:

Index: src/lib/libc/gen/humanize_number.3
diff -u src/lib/libc/gen/humanize_number.3:1.11 src/lib/libc/gen/humanize_number.3:1.12
--- src/lib/libc/gen/humanize_number.3:1.11	Sat Aug 20 21:35:32 2011
+++ src/lib/libc/gen/humanize_number.3	Mon Mar 11 15:10:51 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: humanize_number.3,v 1.11 2011/08/20 21:35:32 wiz Exp $
+.\"	$NetBSD: humanize_number.3,v 1.12 2019/03/11 15:10:51 kre Exp $
 .\"
 .\" Copyright (c) 1999, 2002, 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 14, 2011
+.Dd March 11, 2019
 .Dt HUMANIZE_NUMBER 3
 .Os
 .Sh NAME
@@ -47,21 +47,21 @@ function formats the signed 64 bit quant
 .Fa number
 into
 .Fa buffer .
-A space and then
+A space and then the
 .Fa suffix
+.Pq "if not null"
 is appended to the end.
-.Fa buffer
-must be at least
 .Fa len
-bytes long.
+gives the size of the
+.Fa buffer .
 .Pp
 If the formatted number (including
 .Fa suffix )
 would be too long to fit into
 .Fa buffer ,
-then divide
+then repeatedly divide
 .Fa number
-by 1024 until it will.
+by 1024 until it will fit.
 In this case, prefix
 .Fa suffix
 with the appropriate SI designator.
@@ -85,11 +85,11 @@ in order to ensure a useful result is ge
 To use a specific prefix, specify this as
 .Fa scale
 (Multiplier = 1024 ^ scale).
-This can not be combined with any of the
+The
 .Fa scale
-flags below.
+must be at least 0 and no more than 6.
 .Pp
-The following flags may be passed in
+Alternatively, one of fhe following special values may be given as
 .Pa scale :
 .Bl -tag -width Dv -offset indent
 .It Dv HN_AUTOSCALE
@@ -98,13 +98,20 @@ Format the buffer using the lowest multi
 Return the prefix index number (the number of times
 .Fa number
 must be divided to fit) instead of formatting it to the buffer.
+That is, the
+.Fa scale
+that would have been used if
+.Dv HN_AUTOSCALE
+had been used.
 .El
 .Pp
 The following flags may be passed in
 .Pa flags :
 .Bl -tag -width Dv -offset indent
 .It Dv HN_DECIMAL
-If the final result is less than 10, display it using one digit.
+If the final numeric result is less than 10,
+and is not the same as the original value (that is, it has been scaled)
+display it using a decimal radix character, and one following digit.
 .It Dv HN_NOSPACE
 Do not put a space between
 .Fa number
@@ -115,8 +122,22 @@ Use 'B' (bytes) as prefix if the origina
 Divide
 .Fa number
 with 1000 instead of 1024.
+That is, use decimal scaling instead of binary.
 .El
 .Pp
+To generate the shortest meaningful value,
+a buffer length
+.Pq Fa len
+that is 6 greater the length of the
+.Fa suffix
+along with
+.Dv HN_AUTOSCALE
+will ensure the highest meaningful scale is used.
+Allow one extra byte for the sign if the number is negative,
+and one less if the
+.Dv HN_NOSPACE
+flag is used.
+.Pp
 The
 .Fn dehumanize_number
 function parses the string representing an integral value given in

Index: src/lib/libc/gen/humanize_number.c
diff -u src/lib/libc/gen/humanize_number.c:1.17 src/lib/libc/gen/humanize_number.c:1.18
--- src/lib/libc/gen/humanize_number.c:1.17	Thu Apr 13 17:45:56 2017
+++ src/lib/libc/gen/humanize_number.c	Mon Mar 11 15:10:51 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: humanize_number.c,v 1.17 2017/04/13 17:45:56 christos Exp $	*/
+/*	$NetBSD: humanize_number.c,v 1.18 2019/03/11 15:10:51 kre Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998,

CVS commit: src/sys/dev/pci

2019-03-11 Thread Frank Kardel

Module Name:src
Committed By:   kardel
Date:   Mon Mar 11 14:35:22 UTC 2019

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

Log Message:
PR/54045

fix mpii to adhere to physio diagnostic invariant that
fully processed data must not post an error:
1) verify expected scspi state via KASSERT() instead of just
   setting the variables.
2) set xs->resid only in known good conditions
3) insure setting errors in all error paths and refrain
   from clearing xs->resid in error paths.

While there do some cosmectic clean up:
1) extend and relocate some debug output
2) mpii HBAs can also manage non-disk devices like tapes etc,
   so log that physical "devices" instead of physical "disks" are
   attached or detached.

Tested with NEOSeries FlexStor II and luckily a broken tape drive 8-(

mpii0 at pci1 dev 0 function 0: vendor 1000 product 00ab (rev. 0x01)
mpii0: interrupting at irq 11
mpii0: HBA 9400-8i8e, firmware 3.0.4.0, MPI 2.6
mpii0: physical device inserted in slot 9
mpii0: physical device inserted in slot 13
mpii0: physical device inserted in slot 16
st0 at scsibus0 target 9 lun 0:  tape removable
st0: density code 92, variable blocks, write-enabled
ch0 at scsibus0 target 9 lun 1:  changer removable
ch0: 23 slots, 2 drives, 1 picker, 1 portal
st0: tagged queueing
ch0: tagged queueing
st1 at scsibus0 target 13 lun 0:  tape removable
st1: density code 92, variable blocks, write-enabled
st1: tagged queueing
ses0 at scsibus0 target 16 lun 0:  enclosure services fixed

Note: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/mpii.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/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.21 src/sys/dev/pci/mpii.c:1.22
--- src/sys/dev/pci/mpii.c:1.21	Sun Feb  3 03:19:27 2019
+++ src/sys/dev/pci/mpii.c	Mon Mar 11 14:35:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.21 2019/02/03 03:19:27 mrg Exp $ */
+/* $NetBSD: mpii.c,v 1.22 2019/03/11 14:35:22 kardel Exp $ */
 /*	$OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $	*/
 /*
  * Copyright (c) 2010, 2012 Mike Belopuhov
@@ -20,7 +20,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.21 2019/02/03 03:19:27 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.22 2019/03/11 14:35:22 kardel Exp $");
 
 #include "bio.h"
 
@@ -1921,7 +1921,7 @@ mpii_event_sas(struct mpii_softc *sc, st
 free(dev, M_DEVBUF);
 break;
 			}
-			printf("%s: physical disk inserted in slot %d\n",
+			printf("%s: physical device inserted in slot %d\n",
 			DEVNAME(sc), dev->slot);
 			mutex_exit(>sc_devs_mtx);
 			break;
@@ -1995,7 +1995,7 @@ mpii_event_sas_work(struct work *wq, voi
 }
 
 printf(
-"%s: physical disk removed from slot %d\n",
+"%s: physical device removed from slot %d\n",
 DEVNAME(sc), dev->slot);
 mpii_remove_dev(sc, dev);
 mutex_exit(>sc_devs_mtx);
@@ -3022,8 +3022,8 @@ mpii_scsipi_request(struct scsipi_channe
 		scsipi_done(xs);
 		return;
 	}
-	DNPRINTF(MPII_D_CMD, "%s: ccb_smid: %d xs->xs_control: 0x%x\n",
-	DEVNAME(sc), ccb->ccb_smid, xs->xs_control);
+	DNPRINTF(MPII_D_CMD, "%s: ccb_smid: %d xs->cmd->opcode: 0x%02x xs->xs_control: 0x%x\n",
+	DEVNAME(sc), ccb->ccb_smid, xs->cmd->opcode, xs->xs_control);
 
 	ccb->ccb_cookie = xs;
 	ccb->ccb_done = mpii_scsi_cmd_done;
@@ -3221,13 +3221,14 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
 
 		bus_dmamap_unload(sc->sc_dmat, dmap);
 	}
-
-	xs->error = XS_NOERROR;
-	xs->resid = 0;
-
+	
+	KASSERT(xs->error == XS_NOERROR);
+	KASSERT(xs->resid == xs->datalen);
+	KASSERT(xs->status == SCSI_OK);
+	
 	if (ccb->ccb_rcb == NULL) {
 		/* no scsi error, we're ok so drop out early */
-		xs->status = SCSI_OK;
+		xs->resid = 0;
 		goto done;
 	}
 
@@ -3278,9 +3279,11 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
 	case MPII_IOCSTATUS_SCSI_RECOVERED_ERROR:
 		switch (sie->scsi_status) {
 		case MPII_SCSIIO_STATUS_GOOD:
+			xs->resid = 0;
 			break;
 
 		case MPII_SCSIIO_STATUS_CHECK_COND:
+			xs->resid = 0;
 			xs->error = XS_SENSE;
 			break;
 
@@ -3319,12 +3322,14 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
 	if (sie->scsi_state & MPII_SCSIIO_STATE_AUTOSENSE_VALID)
 		memcpy(>sense, sense, sizeof(xs->sense));
 
-	DNPRINTF(MPII_D_CMD, "%s:  xs err: %d status: %#x\n", DEVNAME(sc),
-	xs->error, xs->status);
-
 	mpii_push_reply(sc, ccb->ccb_rcb);
-done:
+
+ done:
 	mpii_put_ccb(sc, ccb);
+
+	DNPRINTF(MPII_D_CMD, "%s: xs err: %d status: %#x len: %d resid: %d\n",
+		 DEVNAME(sc), xs->error, xs->status, xs->datalen, xs->resid);
+
 	scsipi_done(xs);
 }

CVS commit: src

2019-03-11 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Mon Mar 11 09:20:14 UTC 2019

Modified Files:
src/distrib/sets/lists/xbase: mi
src/distrib/sets/lists/xdebug: mi
src/external/mit/xorg/bin: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/external/mit/xorg/bin/transset: Makefile

Log Message:
install transset.


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/transset/Makefile
cvs rdiff -u -r1. -r1.1112 src/share/mk/bsd.own.mk

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/mi
diff -u src/distrib/sets/lists/xbase/mi:1.149 src/distrib/sets/lists/xbase/mi:1.150
--- src/distrib/sets/lists/xbase/mi:1.149	Sun Mar 10 11:18:02 2019
+++ src/distrib/sets/lists/xbase/mi	Mon Mar 11 09:20:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.149 2019/03/10 11:18:02 mrg Exp $
+# $NetBSD: mi,v 1.150 2019/03/11 09:20:13 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -62,6 +62,7 @@
 ./usr/X11R7/bin/ssh-askpass-unknown-	xorg
 ./usr/X11R7/bin/startx	-unknown-	xorg
 ./usr/X11R7/bin/sxpm	-unknown-	xorg
+./usr/X11R7/bin/transset-unknown-	xorg
 ./usr/X11R7/bin/twm	-unknown-	xorg
 ./usr/X11R7/bin/ucs2any	-unknown-	xorg
 ./usr/X11R7/bin/uxterm	-unknown-	xorg
@@ -148,7 +149,6 @@
 ./usr/X11R7/include/GL	base-x11-root	xorg
 ./usr/X11R7/include/GL/internalbase-x11-root	xorg
 ./usr/X11R7/include/KHR	base-x11-root	xorg
-./usr/X11R7/include/vdpaubase-x11-root	xorg
 ./usr/X11R7/include/X11	base-x11-root	xorg
 ./usr/X11R7/include/X11/ICEbase-x11-root	xorg
 ./usr/X11R7/include/X11/PMbase-x11-root	xorg
@@ -274,6 +274,7 @@
 ./usr/X11R7/include/libdrm/nouveau/nvif			base-x11-root	xorg
 ./usr/X11R7/include/libkmsbase-x11-root	xorg
 ./usr/X11R7/include/pixman-1base-x11-root	xorg
+./usr/X11R7/include/vdpaubase-x11-root	xorg
 ./usr/X11R7/include/xcb	base-x11-root	xorg
 ./usr/X11R7/include/xorgbase-x11-root	xorg
 ./usr/X11R7/lib		base-x11-root	xorg,compatx11dir
@@ -1310,6 +1311,7 @@
 ./usr/X11R7/man/cat1/ssh-askpass.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/startx.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/sxpm.0-unknown-	.cat,xorg
+./usr/X11R7/man/cat1/transset.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/twm.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/ucs2any.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/viewres.0-unknown-	.cat,xorg
@@ -1455,6 +1457,7 @@
 ./usr/X11R7/man/html1/ssh-askpass.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/startx.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/sxpm.html-unknown-	html,xorg
+./usr/X11R7/man/html1/transset.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/twm.html-unknown-	html,xorg
 ./usr/X11R7/man/html1/ucs2any.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/viewres.html			-unknown-	html,xorg
@@ -1601,6 +1604,7 @@
 ./usr/X11R7/man/man1/ssh-askpass.1			-unknown-	.man,xorg
 ./usr/X11R7/man/man1/startx.1-unknown-	.man,xorg
 ./usr/X11R7/man/man1/sxpm.1-unknown-	.man,xorg
+./usr/X11R7/man/man1/transset.1-unknown-	.man,xorg
 ./usr/X11R7/man/man1/twm.1-unknown-	.man,xorg
 ./usr/X11R7/man/man1/ucs2any.1-unknown-	.man,xorg
 ./usr/X11R7/man/man1/viewres.1-unknown-	.man,xorg

Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.29 src/distrib/sets/lists/xdebug/mi:1.30
--- src/distrib/sets/lists/xdebug/mi:1.29	Fri Mar  8 09:58:23 2019
+++ src/distrib/sets/lists/xdebug/mi	Mon Mar 11 09:20:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.29 2019/03/08 09:58:23 mrg Exp $
+# $NetBSD: mi,v 1.30 2019/03/11 09:20:13 mrg Exp $
 ./etc/mtree/set.xdebug	comp-sys-root
 ./usr/X11R7/lib		-unknown-	debuglib,xorg,compatx11dir
 ./usr/X11R7/lib/libFS_g.a-unknown-	debuglib,xorg,compatx11file
@@ -152,6 +152,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/smproxy.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/ssh-askpass.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/sxpm.debug		-unknown-	debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/transset.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/twm.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/ucs2any.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/viewres.debug		-unknown-	debug,xorg

Index: src/external/mit/xorg/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.14 src/external/mit/xorg/bin/Makefile:1.15
--- src/external/mit/xorg/bin/Makefile:1.14	Fri Mar  8 12:25:38 2019
+++ src/external/mit/xorg/bin/Makefile	Mon Mar 11 09:20:13 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2019/03/08 12:25:38 mrg Exp $
+#	$NetBSD:

CVS commit: xsrc/external/mit/MesaLib

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 09:17:12 UTC 2019

Removed Files:
xsrc/external/mit/MesaLib/dist/src/mesa/main: git_sha1.h
xsrc/external/mit/MesaLib/src/mesa/main: remap_helper.h

Log Message:
remove files not wanted for mesa 18.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/git_sha1.h
cvs rdiff -u -r1.1 -r0 xsrc/external/mit/MesaLib/src/mesa/main/remap_helper.h

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

2019-03-11 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Mon Mar 11 08:05:18 UTC 2019

Modified Files:
src/distrib/sets/lists/xcomp: md.amd64 md.evbarm md.i386

Log Message:
fix path to khrplatform.h


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xcomp/md.evbarm
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xcomp/md.i386

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

Modified files:

Index: src/distrib/sets/lists/xcomp/md.amd64
diff -u src/distrib/sets/lists/xcomp/md.amd64:1.52 src/distrib/sets/lists/xcomp/md.amd64:1.53
--- src/distrib/sets/lists/xcomp/md.amd64:1.52	Sun Mar 10 12:44:58 2019
+++ src/distrib/sets/lists/xcomp/md.amd64	Mon Mar 11 08:05:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.52 2019/03/10 12:44:58 mrg Exp $
+# $NetBSD: md.amd64,v 1.53 2019/03/11 08:05:18 mrg Exp $
 ./usr/X11R7/include/intel_bufmgr.h			-unknown-	obsolete
 ./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h	-unknown-	xorg
@@ -7,7 +7,7 @@
 ./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h		-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h	-unknown-	xorg
-./usr/X11R7/include/khrplatform.h			-unknown-	xorg,mesa_ver=18
+./usr/X11R7/include/KHR/khrplatform.h			-unknown-	xorg,mesa_ver=18
 ./usr/X11R7/include/vdpau/vdpau.h			-unknown-	xorg
 ./usr/X11R7/include/vdpau/vdpau_x11.h			-unknown-	xorg
 ./usr/X11R7/lib/libI810XvMC.a-unknown-	xorg,compatx11file

Index: src/distrib/sets/lists/xcomp/md.evbarm
diff -u src/distrib/sets/lists/xcomp/md.evbarm:1.10 src/distrib/sets/lists/xcomp/md.evbarm:1.11
--- src/distrib/sets/lists/xcomp/md.evbarm:1.10	Sun Mar 10 12:44:58 2019
+++ src/distrib/sets/lists/xcomp/md.evbarm	Mon Mar 11 08:05:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.10 2019/03/10 12:44:58 mrg Exp $
+# $NetBSD: md.evbarm,v 1.11 2019/03/11 08:05:18 mrg Exp $
 ./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/class.h		-unknown-	xorg
@@ -6,7 +6,7 @@
 ./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h		-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h	-unknown-	xorg
-./usr/X11R7/include/khrplatform.h			-unknown-	xorg,mesa_ver=18
+./usr/X11R7/include/KHR/khrplatform.h			-unknown-	xorg,mesa_ver=18
 ./usr/X11R7/include/vdpau/vdpau.h			-unknown-	xorg
 ./usr/X11R7/include/vdpau/vdpau_x11.h			-unknown-	xorg
 ./usr/X11R7/lib/libdrm_nouveau.a			-unknown-	xorg

Index: src/distrib/sets/lists/xcomp/md.i386
diff -u src/distrib/sets/lists/xcomp/md.i386:1.57 src/distrib/sets/lists/xcomp/md.i386:1.58
--- src/distrib/sets/lists/xcomp/md.i386:1.57	Sun Mar 10 12:44:58 2019
+++ src/distrib/sets/lists/xcomp/md.i386	Mon Mar 11 08:05:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.57 2019/03/10 12:44:58 mrg Exp $
+# $NetBSD: md.i386,v 1.58 2019/03/11 08:05:18 mrg Exp $
 #./usr/libdata/lint/llib-lIntelXvMC.ln			-unknown-	lint,xorg
 ./usr/X11R7/include/intel_bufmgr.h			-unknown-	obsolete
 ./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h	-unknown-	xorg
@@ -8,7 +8,7 @@
 ./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h	-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h		-unknown-	xorg
 ./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h	-unknown-	xorg
-./usr/X11R7/include/khrplatform.h			-unknown-	xorg,mesa_ver=18
+./usr/X11R7/include/KHR/khrplatform.h			-unknown-	xorg,mesa_ver=18
 ./usr/X11R7/include/vdpau/vdpau.h			-unknown-	xorg
 ./usr/X11R7/include/vdpau/vdpau_x11.h			-unknown-	xorg
 ./usr/X11R7/lib/libI810XvMC.a-unknown-	xorg

CVS commit: xsrc/external/mit/mesa-demos/dist/src

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 07:00:44 UTC 2019

Removed Files:
xsrc/external/mit/mesa-demos/dist/src/egl/eglut: eglut_screen.c
xsrc/external/mit/mesa-demos/dist/src/egl/opengl: demo1.c demo2.c
demo3.c
xsrc/external/mit/mesa-demos/dist/src/xdemos: corender.c ipc.c ipc.h

Log Message:
merge mesa-demos 8.4.0.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/mesa-demos/dist/src/egl/eglut/eglut_screen.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/mesa-demos/dist/src/egl/opengl/demo1.c \
xsrc/external/mit/mesa-demos/dist/src/egl/opengl/demo2.c \
xsrc/external/mit/mesa-demos/dist/src/egl/opengl/demo3.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/mesa-demos/dist/src/xdemos/corender.c \
xsrc/external/mit/mesa-demos/dist/src/xdemos/ipc.c \
xsrc/external/mit/mesa-demos/dist/src/xdemos/ipc.h

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

CVS import: xsrc/external/mit/mesa-demos/dist

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 06:59:43 UTC 2019

Update of /cvsroot/xsrc/external/mit/mesa-demos/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv29946

Log Message:
initial import of mesa-demos-8.4.0

Status:

Vendor Tag: xorg
Release Tags:   mesa-demos-8-4-0

U xsrc/external/mit/mesa-demos/dist/Makefile.in
U xsrc/external/mit/mesa-demos/dist/compile
U xsrc/external/mit/mesa-demos/dist/ltmain.sh
U xsrc/external/mit/mesa-demos/dist/aclocal.m4
U xsrc/external/mit/mesa-demos/dist/install-sh
U xsrc/external/mit/mesa-demos/dist/config.guess
U xsrc/external/mit/mesa-demos/dist/depcomp
U xsrc/external/mit/mesa-demos/dist/config.sub
U xsrc/external/mit/mesa-demos/dist/configure.ac
U xsrc/external/mit/mesa-demos/dist/Makefile.am
U xsrc/external/mit/mesa-demos/dist/missing
U xsrc/external/mit/mesa-demos/dist/configure
U xsrc/external/mit/mesa-demos/dist/m4/ltsugar.m4
U xsrc/external/mit/mesa-demos/dist/m4/libtool.m4
U xsrc/external/mit/mesa-demos/dist/m4/ltoptions.m4
U xsrc/external/mit/mesa-demos/dist/m4/ltversion.m4
U xsrc/external/mit/mesa-demos/dist/m4/ac_define_dir.m4
U xsrc/external/mit/mesa-demos/dist/m4/lt~obsolete.m4
U xsrc/external/mit/mesa-demos/dist/src/Makefile.in
U xsrc/external/mit/mesa-demos/dist/src/Makefile.am
U xsrc/external/mit/mesa-demos/dist/src/data/Makefile.in
U xsrc/external/mit/mesa-demos/dist/src/data/tile.rgb
U xsrc/external/mit/mesa-demos/dist/src/data/wrs_logo.rgb
U xsrc/external/mit/mesa-demos/dist/src/data/tree2.rgba
U xsrc/external/mit/mesa-demos/dist/src/data/tree3.rgb
U xsrc/external/mit/mesa-demos/dist/src/data/arch.rgb
U xsrc/external/mit/mesa-demos/dist/src/data/bw.rgb
U xsrc/external/mit/mesa-demos/dist/src/data/s128.rgb
U xsrc/external/mit/mesa-demos/dist/src/data/terrain.dat
U xsrc/external/mit/mesa-demos/dist/src/data/isosurf.dat
U xsrc/external/mit/mesa-demos/dist/src/data/girl2.rgb
U xsrc/external/mit/mesa-demos/dist/src/data/Makefile.am
U xsrc/external/mit/mesa-demos/dist/src/data/geartrain.dat
U xsrc/external/mit/mesa-demos/dist/src/data/girl.rgb
U xsrc/external/mit/mesa-demos/dist/src/data/reflect.rgb
U xsrc/external/mit/mesa-demos/dist/src/egl/Makefile.in
U xsrc/external/mit/mesa-demos/dist/src/egl/Makefile.am
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles2/Makefile.in
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles2/es2gears.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles2/es2_info.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles2/es2tri.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles2/Makefile.am
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/Makefile.in
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/es1_info.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/pbuffer.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/msaa.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/gears.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/bindtex.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/clear.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/tri.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/render_tex.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/Makefile.am
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/drawtex.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/torus.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/two_win.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/eglfbdev.c
U xsrc/external/mit/mesa-demos/dist/src/egl/opengles1/texture_from_pixmap.c
U xsrc/external/mit/mesa-demos/dist/src/egl/eglut/Makefile.in
U xsrc/external/mit/mesa-demos/dist/src/egl/eglut/eglut_wayland.c
U xsrc/external/mit/mesa-demos/dist/src/egl/eglut/eglut.c
U xsrc/external/mit/mesa-demos/dist/src/egl/eglut/eglut_x11.c
U xsrc/external/mit/mesa-demos/dist/src/egl/eglut/Makefile.am
U xsrc/external/mit/mesa-demos/dist/src/egl/eglut/eglutint.h
U xsrc/external/mit/mesa-demos/dist/src/egl/eglut/eglut.h
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/Makefile.in
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/text.c
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/lion-render.h
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/lion.c
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/lion-render.c
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/sp.c
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/Makefile.am
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/trivial/Makefile.in
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/trivial/lingrad.c
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/trivial/eglcommon.h
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/trivial/stroke2.c
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/trivial/mask4.c
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/trivial/layer.c
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/trivial/roundedrect.c
U xsrc/external/mit/mesa-demos/dist/src/egl/openvg/trivial/paint.c
U

CVS commit: xsrc/external/mit

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 06:45:03 UTC 2019

Modified Files:
xsrc/external/mit/xfd/dist: compile
Removed Files:
xsrc/external/mit/xfd/dist: README
xsrc/external/mit/xprop/dist: README

Log Message:
merge xfd 1.1.3 and xprop 1.2.4.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfd/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfd/dist/compile
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xprop/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/xfd/dist/compile
diff -u xsrc/external/mit/xfd/dist/compile:1.3 xsrc/external/mit/xfd/dist/compile:1.4
--- xsrc/external/mit/xfd/dist/compile:1.3	Mon Mar 17 09:20:46 2014
+++ xsrc/external/mit/xfd/dist/compile	Mon Mar 11 06:45:03 2019
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 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/transset/dist

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 06:43:59 UTC 2019

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

Log Message:
initial import of transset-1.0.2

Status:

Vendor Tag: xorg
Release Tags:   transset-1-0-2

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

No conflicts created by this import

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

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 06:44:00 UTC 2019

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

Log Message:
initial import of xfd-1.1.3

Status:

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

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

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

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

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

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 06:44:01 UTC 2019

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

Log Message:
initial import of xprop-1.2.4

Status:

Vendor Tag: xorg
Release Tags:   xprop-1-2-4

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

No conflicts created by this import

CVS commit: xsrc/external/mit

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 06:37:19 UTC 2019

Modified Files:
xsrc/external/mit/libFS/include: config.h
xsrc/external/mit/libXcomposite/dist/man: Xcomposite.man
xsrc/external/mit/libXcursor/include: config.h
Removed Files:
xsrc/external/mit/libFS/dist: README
xsrc/external/mit/libXcomposite/dist: README
xsrc/external/mit/libXcursor/dist: README

Log Message:
merge libFS 1.0.8, libXcomposite 0.4.5, and libXcursor 1.2.0.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libFS/dist/README
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libFS/include/config.h
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXcomposite/dist/README
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libXcomposite/dist/man/Xcomposite.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXcursor/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXcursor/include/config.h

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

Modified files:

Index: xsrc/external/mit/libFS/include/config.h
diff -u xsrc/external/mit/libFS/include/config.h:1.6 xsrc/external/mit/libFS/include/config.h:1.7
--- xsrc/external/mit/libFS/include/config.h:1.6	Sun Jul 19 05:52:53 2015
+++ xsrc/external/mit/libFS/include/config.h	Mon Mar 11 06:37:18 2019
@@ -25,6 +25,9 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDLIB_H 1
 
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_STRINGS_H 1
 
@@ -34,6 +37,9 @@
 /* Define to 1 if you have the `strlcpy' function. */
 #define HAVE_STRLCPY 1
 
+/* Define to 1 if you have the `strnlen' function. */
+#define HAVE_STRNLEN 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -49,8 +55,7 @@
 /* Support os-specific local connections */
 /* #undef LOCALCONN */
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
 /* Name of package */

Index: xsrc/external/mit/libXcomposite/dist/man/Xcomposite.man
diff -u xsrc/external/mit/libXcomposite/dist/man/Xcomposite.man:1.3 xsrc/external/mit/libXcomposite/dist/man/Xcomposite.man:1.4
--- xsrc/external/mit/libXcomposite/dist/man/Xcomposite.man:1.3	Fri May 31 01:18:29 2013
+++ xsrc/external/mit/libXcomposite/dist/man/Xcomposite.man	Mon Mar 11 06:37:19 2019
@@ -1,7 +1,7 @@
 '\" t
 .\" Title: Xcomposite
 .\"Author: Keith Packard 
-.\" Generator: DocBook XSL Stylesheets vsnapshot_9276 
+.\" Generator: DocBook XSL Stylesheets v1.75.2 
 .\"  Date: 23 April 2007
 .\"Manual: X Composite Extension Library
 .\"Source: __vendorversion__
@@ -9,15 +9,6 @@
 .\"
 .TH "XCOMPOSITE" "__libmansuffix__" "23 April 2007" "__vendorversion__" "X Composite Extension Library"
 .\" -
-.\" * Define some portability stuff
-.\" -
-.\" ~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~
-.ie \n(.g .ds Aq \(aq
-.el   .ds Aq '
-.\" -
 .\" * set default formatting
 .\" -
 .\" disable hyphenation
@@ -252,7 +243,7 @@ The X server must support at least versi
 \fBXCompositeReleaseOverlayWindow\fR
 .RS 4
 This request specifies that the client is no longer using the Composite Overlay Window on the screen specified by the argument
-\fIwindow\fR\&. A screen\*(Aqs Composite Overlay Window is unmapped when there are no longer any clients using it\&.
+\fIwindow\fR\&. A screen\'s Composite Overlay Window is unmapped when there are no longer any clients using it\&.
 .sp
 The X server must support at least version 0\&.3 of the Composite Extension for
 \fBXCompositeReleaseOverlayWindow\fR\&.

Index: xsrc/external/mit/libXcursor/include/config.h
diff -u xsrc/external/mit/libXcursor/include/config.h:1.4 xsrc/external/mit/libXcursor/include/config.h:1.5
--- xsrc/external/mit/libXcursor/include/config.h:1.4	Wed Nov 29 01:56:58 2017
+++ xsrc/external/mit/libXcursor/include/config.h	Mon Mar 11 06:37:19 2019
@@ -48,7 +48,7 @@
 #define PACKAGE_NAME "libXcursor"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libXcursor 1.1.15"
+#define PACKAGE_STRING "libXcursor 1.2.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libXcursor"
@@ -57,19 +57,19 @@
 #define PACKAGE_URL ""
 
 /* Define to the

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

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 06:33:54 UTC 2019

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

Log Message:
initial import of libXcomposite-0.4.5

Status:

Vendor Tag: xorg
Release Tags:   libXcomposite-0-4-5

U xsrc/external/mit/libXcomposite/dist/Makefile.am
U xsrc/external/mit/libXcomposite/dist/ChangeLog
U xsrc/external/mit/libXcomposite/dist/configure.ac
N xsrc/external/mit/libXcomposite/dist/README.md
U xsrc/external/mit/libXcomposite/dist/configure
U xsrc/external/mit/libXcomposite/dist/INSTALL
U xsrc/external/mit/libXcomposite/dist/Makefile.in
U xsrc/external/mit/libXcomposite/dist/config.sub
U xsrc/external/mit/libXcomposite/dist/xcomposite.pc.in
U xsrc/external/mit/libXcomposite/dist/COPYING
U xsrc/external/mit/libXcomposite/dist/ltmain.sh
N xsrc/external/mit/libXcomposite/dist/compile
U xsrc/external/mit/libXcomposite/dist/AUTHORS
U xsrc/external/mit/libXcomposite/dist/install-sh
U xsrc/external/mit/libXcomposite/dist/aclocal.m4
U xsrc/external/mit/libXcomposite/dist/config.guess
U xsrc/external/mit/libXcomposite/dist/config.h.in
U xsrc/external/mit/libXcomposite/dist/missing
U xsrc/external/mit/libXcomposite/dist/depcomp
U xsrc/external/mit/libXcomposite/dist/src/xcompositeint.h
U xsrc/external/mit/libXcomposite/dist/src/Xcomposite.c
U xsrc/external/mit/libXcomposite/dist/src/Makefile.in
U xsrc/external/mit/libXcomposite/dist/src/Makefile.am
U xsrc/external/mit/libXcomposite/dist/include/X11/extensions/Xcomposite.h
U xsrc/external/mit/libXcomposite/dist/man/XCompositeUnredirectWindow.man
U xsrc/external/mit/libXcomposite/dist/man/XCompositeNameWindowPixmap.man
U xsrc/external/mit/libXcomposite/dist/man/XCompositeVersion.man
U 
xsrc/external/mit/libXcomposite/dist/man/XCompositeCreateRegionFromBorderClip.man
C xsrc/external/mit/libXcomposite/dist/man/Xcomposite.man
U xsrc/external/mit/libXcomposite/dist/man/Xcomposite.xml
U xsrc/external/mit/libXcomposite/dist/man/XCompositeGetOverlayWindow.man
U xsrc/external/mit/libXcomposite/dist/man/XCompositeRedirectWindow.man
U xsrc/external/mit/libXcomposite/dist/man/XCompositeQueryVersion.man
U xsrc/external/mit/libXcomposite/dist/man/Makefile.am
U xsrc/external/mit/libXcomposite/dist/man/XCompositeReleaseOverlayWindow.man
U xsrc/external/mit/libXcomposite/dist/man/XCompositeRedirectSubwindows.man
U xsrc/external/mit/libXcomposite/dist/man/XCompositeQueryExtension.man
U xsrc/external/mit/libXcomposite/dist/man/XCompositeUnredirectSubwindows.man
U xsrc/external/mit/libXcomposite/dist/man/Makefile.in

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

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

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

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 06:33:58 UTC 2019

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

Log Message:
initial import of libXcursor-1.2.0

Status:

Vendor Tag: xorg
Release Tags:   libXcursor-1-2-0

U xsrc/external/mit/libXcursor/dist/configure
U xsrc/external/mit/libXcursor/dist/INSTALL
N xsrc/external/mit/libXcursor/dist/README.md
U xsrc/external/mit/libXcursor/dist/config.guess
U xsrc/external/mit/libXcursor/dist/ChangeLog
U xsrc/external/mit/libXcursor/dist/config.sub
U xsrc/external/mit/libXcursor/dist/xcursor.pc.in
U xsrc/external/mit/libXcursor/dist/config.h.in
U xsrc/external/mit/libXcursor/dist/compile
U xsrc/external/mit/libXcursor/dist/AUTHORS
U xsrc/external/mit/libXcursor/dist/install-sh
U xsrc/external/mit/libXcursor/dist/Makefile.am
U xsrc/external/mit/libXcursor/dist/aclocal.m4
U xsrc/external/mit/libXcursor/dist/ltmain.sh
U xsrc/external/mit/libXcursor/dist/COPYING
U xsrc/external/mit/libXcursor/dist/depcomp
U xsrc/external/mit/libXcursor/dist/Makefile.in
U xsrc/external/mit/libXcursor/dist/missing
U xsrc/external/mit/libXcursor/dist/configure.ac
U xsrc/external/mit/libXcursor/dist/src/xlib.c
U xsrc/external/mit/libXcursor/dist/src/cursor.c
U xsrc/external/mit/libXcursor/dist/src/Makefile.am
U xsrc/external/mit/libXcursor/dist/src/display.c
U xsrc/external/mit/libXcursor/dist/src/Makefile.in
U xsrc/external/mit/libXcursor/dist/src/library.c
U xsrc/external/mit/libXcursor/dist/src/xcursorint.h
U xsrc/external/mit/libXcursor/dist/src/file.c
U xsrc/external/mit/libXcursor/dist/include/X11/Xcursor/Xcursor.h
U xsrc/external/mit/libXcursor/dist/include/X11/Xcursor/Xcursor.h.in
U xsrc/external/mit/libXcursor/dist/man/XcursorShapeLoadCursor.man
U xsrc/external/mit/libXcursor/dist/man/Xcursor.man
U xsrc/external/mit/libXcursor/dist/man/XcursorXcFileLoadImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorXcFileSave.man
U xsrc/external/mit/libXcursor/dist/man/XcursorLibraryLoadCursor.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameSave.man
U xsrc/external/mit/libXcursor/dist/man/XcursorCursorsCreate.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameLoadImage.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameLoad.man
U xsrc/external/mit/libXcursor/dist/man/XcursorXcFileLoad.man
U xsrc/external/mit/libXcursor/dist/man/XcursorImagesDestroy.man
U xsrc/external/mit/libXcursor/dist/man/XcursorLibraryLoadImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameSaveImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorImagesCreate.man
U xsrc/external/mit/libXcursor/dist/man/XcursorSetDefaultSize.man
U xsrc/external/mit/libXcursor/dist/man/XcursorShapeLoadImages.man
U xsrc/external/mit/libXcursor/dist/man/Makefile.am
U xsrc/external/mit/libXcursor/dist/man/XcursorSupportsARGB.man
U xsrc/external/mit/libXcursor/dist/man/XcursorGetTheme.man
U xsrc/external/mit/libXcursor/dist/man/XcursorImageDestroy.man
U xsrc/external/mit/libXcursor/dist/man/XcursorCursorsDestroy.man
U xsrc/external/mit/libXcursor/dist/man/XcursorImageCreate.man
U xsrc/external/mit/libXcursor/dist/man/XcursorXcFileLoadImage.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameLoadCursor.man
U xsrc/external/mit/libXcursor/dist/man/XcursorLibraryLoadCursors.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameLoadImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorShapeLoadCursors.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameLoadAllImages.man
U xsrc/external/mit/libXcursor/dist/man/Makefile.in
U xsrc/external/mit/libXcursor/dist/man/XcursorLibraryLoadImage.man
U xsrc/external/mit/libXcursor/dist/man/XcursorSetTheme.man
U xsrc/external/mit/libXcursor/dist/man/XcursorXcFileLoadAllImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorGetDefaultSize.man
U xsrc/external/mit/libXcursor/dist/man/XcursorShapeLoadImage.man

No conflicts created by this import

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

2019-03-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 11 06:33:51 UTC 2019

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

Log Message:
initial import of libFS-1.0.8

Status:

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

U xsrc/external/mit/libFS/dist/install-sh
U xsrc/external/mit/libFS/dist/aclocal.m4
U xsrc/external/mit/libFS/dist/config.h.in
U xsrc/external/mit/libFS/dist/ltmain.sh
U xsrc/external/mit/libFS/dist/configure.ac
U xsrc/external/mit/libFS/dist/INSTALL
U xsrc/external/mit/libFS/dist/configure
N xsrc/external/mit/libFS/dist/README.md
U xsrc/external/mit/libFS/dist/Makefile.in
U xsrc/external/mit/libFS/dist/libfs.pc.in
U xsrc/external/mit/libFS/dist/config.sub
U xsrc/external/mit/libFS/dist/config.guess
U xsrc/external/mit/libFS/dist/depcomp
U xsrc/external/mit/libFS/dist/missing
U xsrc/external/mit/libFS/dist/ChangeLog
U xsrc/external/mit/libFS/dist/COPYING
U xsrc/external/mit/libFS/dist/Makefile.am
U xsrc/external/mit/libFS/dist/compile
U xsrc/external/mit/libFS/dist/test/Makefile.am
U xsrc/external/mit/libFS/dist/test/FSGetErrorText.c
U xsrc/external/mit/libFS/dist/test/Makefile.in
U xsrc/external/mit/libFS/dist/doc/FSlib.txt
U xsrc/external/mit/libFS/dist/src/FSOpenFont.c
U xsrc/external/mit/libFS/dist/src/FSQXInfo.c
U xsrc/external/mit/libFS/dist/src/FSFontInfo.c
U xsrc/external/mit/libFS/dist/src/FSQGlyphs.c
U xsrc/external/mit/libFS/dist/src/FSSetCats.c
U xsrc/external/mit/libFS/dist/src/FSServName.c
U xsrc/external/mit/libFS/dist/src/FSErrDis.c
U xsrc/external/mit/libFS/dist/src/FSGetCats.c
U xsrc/external/mit/libFS/dist/src/FSConnServ.c
U xsrc/external/mit/libFS/dist/src/FSCloseFt.c
U xsrc/external/mit/libFS/dist/src/FSListCats.c
U xsrc/external/mit/libFS/dist/src/FSFtNames.c
U xsrc/external/mit/libFS/dist/src/FSQuExt.c
U xsrc/external/mit/libFS/dist/src/FSNextEv.c
U xsrc/external/mit/libFS/dist/src/FSSync.c
U xsrc/external/mit/libFS/dist/src/FSOpenServ.c
U xsrc/external/mit/libFS/dist/src/Makefile.in
U xsrc/external/mit/libFS/dist/src/FSClServ.c
U xsrc/external/mit/libFS/dist/src/FSlibInt.c
U xsrc/external/mit/libFS/dist/src/FSErrHndlr.c
U xsrc/external/mit/libFS/dist/src/FSMisc.c
U xsrc/external/mit/libFS/dist/src/FSQXExt.c
U xsrc/external/mit/libFS/dist/src/FSSynchro.c
U xsrc/external/mit/libFS/dist/src/fs_transport.c
U xsrc/external/mit/libFS/dist/src/Makefile.am
U xsrc/external/mit/libFS/dist/src/FSFlush.c
U xsrc/external/mit/libFS/dist/src/FSListExt.c
U xsrc/external/mit/libFS/dist/src/FSlibint.h
U xsrc/external/mit/libFS/dist/src/FSlibos.h
U xsrc/external/mit/libFS/dist/include/X11/fonts/FSlib.h

No conflicts created by this import

CVS commit: src

2019-03-11 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Mon Mar 11 06:25:55 UTC 2019

Modified Files:
src/external/mit/xorg/bin/proxymngr: Makefile
src/external/mit/xorg/bin/sessreg: Makefile
src/external/mit/xorg/bin/xinit: Makefile
src/external/mit/xorg/lib/libXaw: Makefile
src/external/mit/xorg/lib/xkeyboard-config: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc: Makefile
src/share/mk: bsd.x11.mk

Log Message:
fix a bunch of man page transforms.

XXX X11MANCPP=yes has only one use left, maybe it can go away!


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/proxymngr/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/sessreg/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xinit/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/lib/xkeyboard-config/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile
cvs rdiff -u -r1.129 -r1.130 src/share/mk/bsd.x11.mk

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/proxymngr/Makefile
diff -u src/external/mit/xorg/bin/proxymngr/Makefile:1.3 src/external/mit/xorg/bin/proxymngr/Makefile:1.4
--- src/external/mit/xorg/bin/proxymngr/Makefile:1.3	Thu Jan  3 23:39:47 2019
+++ src/external/mit/xorg/bin/proxymngr/Makefile	Mon Mar 11 06:25:55 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/01/03 23:39:47 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2019/03/11 06:25:55 mrg Exp $
 
 .include 
 
@@ -27,6 +27,9 @@ DPADD+=	${LIBXT} ${LIBSM} ${LIBICE} ${LI
 CPPFLAGS+=  -DIPv6
 .endif
 
+X11EXTRAMANTRANSFORMS+= \
+	__configdir__		${X11ETCDIR}/proxymngr
+
 .PATH:	${X11SRCDIR.${PROG}}
 
 .include 

Index: src/external/mit/xorg/bin/sessreg/Makefile
diff -u src/external/mit/xorg/bin/sessreg/Makefile:1.6 src/external/mit/xorg/bin/sessreg/Makefile:1.7
--- src/external/mit/xorg/bin/sessreg/Makefile:1.6	Sun Aug 24 18:27:16 2014
+++ src/external/mit/xorg/bin/sessreg/Makefile	Mon Mar 11 06:25:55 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/08/24 18:27:16 apb Exp $
+#	$NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
 
 .include 
 
@@ -12,6 +12,11 @@ X11EXTRAMANDEFS+=	-e 's,__ttys_file__,/e
 			-e 's,__utmp_file__,${XDMPIDDIR}/utmp,g' \
 			-e 's,__wtmp_file__,${XDMLOGDIR}/wtmp,g'
 
+X11EXTRAMANTRANSFORMS+= \
+	__utmp_manpage__	utmpx \
+	__wtmp_manpage__	wtmpx \
+	__lastlog_file__	lastlogx
+
 .include 
 .include 
 

Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.6 src/external/mit/xorg/bin/xinit/Makefile:1.7
--- src/external/mit/xorg/bin/xinit/Makefile:1.6	Wed Aug  3 02:56:29 2011
+++ src/external/mit/xorg/bin/xinit/Makefile	Mon Mar 11 06:25:55 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2011/08/03 02:56:29 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
 
 .include 
 
@@ -27,8 +27,9 @@ FILESDIR=	${XINITDIR}
 LDADD+=	-lXmuu -lXt -lSM -lICE -lXext -lX11
 DPADD+=	${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
-X11EXTRAMANDEFS=-D__xinitdir__=${XINITDIR}
-X11MANCPP=	yes
+X11EXTRAMANTRANSFORMS+= \
+	__xinitdir__		${XINITDIR} \
+	__configdir__		${X11LIBDIR}/xinit
 
 .PATH:	${X11SRCDIR.${PROG}}
 .PATH:	${X11SRCDIR.${PROG}}/man

Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.11 src/external/mit/xorg/lib/libXaw/Makefile:1.12
--- src/external/mit/xorg/lib/libXaw/Makefile:1.11	Sun Jul 19 07:55:07 2015
+++ src/external/mit/xorg/lib/libXaw/Makefile	Mon Mar 11 06:25:55 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2015/07/19 07:55:07 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2019/03/11 06:25:55 mrg Exp $
 
 .include 
 
@@ -69,6 +69,9 @@ LIBDPLIBS=\
 PKGCONFIG=	xaw7
 PKGDIST=	${LIBOLD}
 
+X11EXTRAMANTRANSFORMS+= \
+	__docdir__		${X11LIBDIR}/doc
+
 .include 
 .include 
 

Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.12 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.13
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.12	Thu Dec 15 09:17:26 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile	Mon Mar 11 06:25:55 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2016/12/15 09:17:26 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2019/03/11 06:25:55 mrg Exp $
 
 .include 
 
@@ -11,6 +11,9 @@ NOOBJ=		# defined
 
 PKGCONFIG=	xkeyboard-config
 
+X11EXTRAMANTRANSFORMS+= \
+	__xkb_base__		${X11LIBDIR}/xkb
+
 .include 
 .include 
 .include 

Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile:1.2
---

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

CVS commit: src/sys/dev/usb

CVS commit: src/external/bsd/llvm/lib/libLLVMAMDGPUUtils

CVS commit: src/sys/kern

CVS commit: src/sys/kern

CVS commit: src/sys/kern

CVS commit: src/external/bsd/jemalloc/dist/src

CVS commit: src/external/bsd/mdocml

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

CVS commit: src/tests/lib/libc/gen

CVS commit: src/lib/libc/gen

CVS commit: src/sys/dev/pci

CVS commit: src

CVS commit: xsrc/external/mit/MesaLib

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

CVS commit: xsrc/external/mit/mesa-demos/dist/src

CVS import: xsrc/external/mit/mesa-demos/dist

CVS commit: xsrc/external/mit

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

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

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

CVS commit: xsrc/external/mit

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

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

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

CVS commit: src

26 matches

Site Navigation

Mail list logo

Footer information