CVS commit: [pgoyette-compat] src/doc

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Mar 12 02:03:20 UTC 2018

Modified Files:
src/doc [pgoyette-compat]: COMPAT-branch-notes

Log Message:
Remove "alias" entry from the To-Do list - it's already in the Done pile.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/COMPAT-branch-notes

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

Modified files:

Index: src/doc/COMPAT-branch-notes
diff -u src/doc/COMPAT-branch-notes:1.1.2.3 src/doc/COMPAT-branch-notes:1.1.2.4
--- src/doc/COMPAT-branch-notes:1.1.2.3	Mon Mar 12 01:59:31 2018
+++ src/doc/COMPAT-branch-notes	Mon Mar 12 02:03:20 2018
@@ -36,15 +36,6 @@ TODO
 
(There are several instances of this in the net routing table code.)
 
-2. Implement a mechanism for modules to include "aliases".  This would
-   allow a single module file to contain multiple module table entries
-   (for example, a single file for the compat module could include
-   compat_80, compat_70, compat_60, ...).  Then, other modules could
-   depend on individual names.  For example, module compat_xyz could
-   depend on compat_70, and the dependency would be met by either the
-   "everything" compat module (with all of its aliases) or by a 7.0-
-   specific module.
-
 2. Using the alias mechanism, split compat (and perhaps compat_sysv)
into multiple version-specific modules.  Note that in addition to
updating the module code, this would also require changes to

CVS commit: [pgoyette-compat] src

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Mon Mar 12 01:59:32 UTC 2018

Modified Files:
src/doc [pgoyette-compat]: COMPAT-branch-notes
src/sys/compat/aoutm68k [pgoyette-compat]: files.aoutm68k
src/sys/compat/common [pgoyette-compat]: files.common
src/sys/compat/freebsd [pgoyette-compat]: files.freebsd
src/sys/compat/ibcs2 [pgoyette-compat]: files.ibcs2
src/sys/compat/linux [pgoyette-compat]: files.linux
src/sys/compat/linux32 [pgoyette-compat]: files.linux32
src/sys/compat/sunos [pgoyette-compat]: files.sunos
src/sys/compat/sunos32 [pgoyette-compat]: files.sunos32
src/sys/compat/svr4 [pgoyette-compat]: files.svr4
src/sys/compat/svr4_32 [pgoyette-compat]: files.svr4_32
src/sys/compat/ultrix [pgoyette-compat]: files.ultrix

Log Message:
Update dependencies for modules when they are built-in.  Now we don't
(or at least, shouldn't) need reminders in the GENERIC config files
about which module options require other options.

Update branch status doc accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/COMPAT-branch-notes
cvs rdiff -u -r1.7 -r1.7.18.1 src/sys/compat/aoutm68k/files.aoutm68k
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/compat/common/files.common
cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/compat/freebsd/files.freebsd
cvs rdiff -u -r1.10 -r1.10.18.1 src/sys/compat/ibcs2/files.ibcs2
cvs rdiff -u -r1.21 -r1.21.18.1 src/sys/compat/linux/files.linux
cvs rdiff -u -r1.6 -r1.6.18.1 src/sys/compat/linux32/files.linux32
cvs rdiff -u -r1.9 -r1.9.18.1 src/sys/compat/sunos/files.sunos
cvs rdiff -u -r1.3 -r1.3.18.1 src/sys/compat/sunos32/files.sunos32
cvs rdiff -u -r1.18 -r1.18.18.1 src/sys/compat/svr4/files.svr4
cvs rdiff -u -r1.6 -r1.6.18.1 src/sys/compat/svr4_32/files.svr4_32
cvs rdiff -u -r1.6 -r1.6.18.1 src/sys/compat/ultrix/files.ultrix

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

Modified files:

Index: src/doc/COMPAT-branch-notes
diff -u src/doc/COMPAT-branch-notes:1.1.2.2 src/doc/COMPAT-branch-notes:1.1.2.3
--- src/doc/COMPAT-branch-notes:1.1.2.2	Sun Mar 11 09:34:59 2018
+++ src/doc/COMPAT-branch-notes	Mon Mar 12 01:59:31 2018
@@ -17,6 +17,16 @@ DONE
 5. Extracted some net/if.c compat routines into the compat module, and
replaced the originals with indirect (vectored) function calls.
 
+6. Implemented a mechanism for modules to include "aliases", allowing
+   a single module file to declare multiple names.  For example, a
+   single "compat" module could declare compat_80, compat_70, etc, and
+   other modules could depend on specific compat levels rather than on
+   the entirety of compat.
+
+7. Reconfirmed all compat-module dependencies, and update the files *
+   def lines as needed, to insure that built-in dependencies get
+   resolved.
+
 
 TODO
 
@@ -35,15 +45,9 @@ TODO
"everything" compat module (with all of its aliases) or by a 7.0-
specific module.
 
-   Note that in addition to updating the module code, this would also
-   require changes to syscalls.master files to change the names of the
-   modules associated with module-provided syscalls.
-
-3. In addition to the single, all-encompassing compat module, provide a
-   per-version compat_xx module, each with dependencies on all higher
-   versions.  (Perhaps we would also do this for the sysv ipc module,
-   although the gains are a lot smaller.)
+2. Using the alias mechanism, split compat (and perhaps compat_sysv)
+   into multiple version-specific modules.  Note that in addition to
+   updating the module code, this would also require changes to
+   syscalls.master files to change the names of the modules associated
+   with module-provided syscalls.
 
-4. Reconfirm all compat-module dependencies, and update the files *
-   def lines as needed, to insure that built-in dependencies get
-   resolved.

Index: src/sys/compat/aoutm68k/files.aoutm68k
diff -u src/sys/compat/aoutm68k/files.aoutm68k:1.7 src/sys/compat/aoutm68k/files.aoutm68k:1.7.18.1
--- src/sys/compat/aoutm68k/files.aoutm68k:1.7	Mon Nov 17 01:01:57 2014
+++ src/sys/compat/aoutm68k/files.aoutm68k	Mon Mar 12 01:59:31 2018
@@ -1,11 +1,11 @@
-#	$NetBSD: files.aoutm68k,v 1.7 2014/11/17 01:01:57 uebayasi Exp $
+#	$NetBSD: files.aoutm68k,v 1.7.18.1 2018/03/12 01:59:31 pgoyette Exp $
 #
 # Config file description for m68k a.out compat code.
 
 # ports should define any machine-specific files they need in their
 # own file lists.
 
-define	compat_aout_m68k
+define	compat_aout_m68k : exec_aout
 file	compat/aoutm68k/aoutm68k_exec.c		compat_aout_m68k
 file	compat/aoutm68k/aoutm68k_stat.c		compat_aout_m68k
 file	compat/aoutm68k/aoutm68k_sysent.c	compat_aout_m68k

Index: src/sys/compat/common/files.common
diff -u src/sys/compat/common/files.common:1.1.2.5 src/sys/compat/common/files.common:1.1.2.6
--- src/sys/compat/common/files.common:1.1.2.5	Fri Mar  9 02:02:59 2018

CVS commit: src/usr.sbin/vnconfig

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 12 01:15:00 UTC 2018

Modified Files:
src/usr.sbin/vnconfig: vnconfig.c

Log Message:
improve previous, use getprogname() to get the invocation name.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/vnconfig/vnconfig.c

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

Modified files:

Index: src/usr.sbin/vnconfig/vnconfig.c
diff -u src/usr.sbin/vnconfig/vnconfig.c:1.45 src/usr.sbin/vnconfig/vnconfig.c:1.46
--- src/usr.sbin/vnconfig/vnconfig.c:1.45	Sun Mar 11 21:10:25 2018
+++ src/usr.sbin/vnconfig/vnconfig.c	Sun Mar 11 21:15:00 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnconfig.c,v 1.45 2018/03/12 01:10:25 khorben Exp $	*/
+/*	$NetBSD: vnconfig.c,v 1.46 2018/03/12 01:15:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -423,11 +423,11 @@ getgeom(struct vndgeom *vng, char *cp)
 static void
 usage(void)
 {
-
-	(void)fprintf(stderr, "%s%s",
-	"usage: vndconfig [-crvz] [-f dsktab] [-t type] vnode_disk"
-		" reg-file [geomspec]\n",
-	"   vndconfig -u [-Fv] vnode_disk\n"
-	"   vndconfig -l [-m num | vnode_disk...]\n");
+	const char *p = getprogname();
+	(void)fprintf(stderr, 
+	"Usage: %s [-crvz] [-f dsktab] [-t type] vnode_disk"
+		" reg-file [geomspec]\n"
+	"   %s -u [-Fv] vnode_disk\n"
+	"   %s -l [-m num | vnode_disk...]\n", p, p, p);
 	exit(1);
 }

CVS commit: src/usr.sbin/vnconfig

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Mon Mar 12 01:10:25 UTC 2018

Modified Files:
src/usr.sbin/vnconfig: vnconfig.c

Log Message:
Reflect the new name of vndconfig(8) in the usage screen

vnconfig(8) was renamed to vndconfig(8) in NetBSD 7. While the manual page
now defaults to vndconfig, the usage screen still referred to the old name.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/vnconfig/vnconfig.c

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

Modified files:

Index: src/usr.sbin/vnconfig/vnconfig.c
diff -u src/usr.sbin/vnconfig/vnconfig.c:1.44 src/usr.sbin/vnconfig/vnconfig.c:1.45
--- src/usr.sbin/vnconfig/vnconfig.c:1.44	Sun Apr 10 09:04:09 2016
+++ src/usr.sbin/vnconfig/vnconfig.c	Mon Mar 12 01:10:25 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnconfig.c,v 1.44 2016/04/10 09:04:09 martin Exp $	*/
+/*	$NetBSD: vnconfig.c,v 1.45 2018/03/12 01:10:25 khorben Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -425,9 +425,9 @@ usage(void)
 {
 
 	(void)fprintf(stderr, "%s%s",
-	"usage: vnconfig [-crvz] [-f dsktab] [-t type] vnode_disk"
+	"usage: vndconfig [-crvz] [-f dsktab] [-t type] vnode_disk"
 		" reg-file [geomspec]\n",
-	"   vnconfig -u [-Fv] vnode_disk\n"
-	"   vnconfig -l [-m num | vnode_disk...]\n");
+	"   vndconfig -u [-Fv] vnode_disk\n"
+	"   vndconfig -l [-m num | vnode_disk...]\n");
 	exit(1);
 }

CVS commit: src/usr.bin/printf

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Mar 12 00:42:06 UTC 2018

Modified Files:
src/usr.bin/printf: printf.1

Log Message:
Explicitly mention use of -- for format strings beginning with -,
per PR 21970.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/printf/printf.1

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

Modified files:

Index: src/usr.bin/printf/printf.1
diff -u src/usr.bin/printf/printf.1:1.25 src/usr.bin/printf/printf.1:1.26
--- src/usr.bin/printf/printf.1:1.25	Sun Apr 13 01:45:34 2014
+++ src/usr.bin/printf/printf.1	Mon Mar 12 00:42:05 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: printf.1,v 1.25 2014/04/13 01:45:34 snj Exp $
+.\"	$NetBSD: printf.1,v 1.26 2018/03/12 00:42:05 dholland Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	from: @(#)printf.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd May 6, 2008
+.Dd March 11, 2018
 .Dt PRINTF 1
 .Os
 .Sh NAME
@@ -358,6 +358,13 @@ Print a `%'; no argument is used.
 In no case does a non-existent or small field width cause truncation of
 a field; padding takes place only if the specified field width exceeds
 the actual width.
+.Pp
+If the first character of
+.Ar format
+is a dash,
+.Ar format
+must be preceded by a word consisting of two dashes (--) to prevent it
+from being interpreted as an option string.
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO

CVS commit: [pgoyette-compat] src/sys/compat

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 11 23:50:19 UTC 2018

Modified Files:
src/sys/compat/linux32/common [pgoyette-compat]: linux32_mod.c
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c

Log Message:
Update module dependencies


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/compat/linux32/common/linux32_mod.c
cvs rdiff -u -r1.13 -r1.13.16.1 src/sys/compat/netbsd32/netbsd32_mod.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/compat/linux32/common/linux32_mod.c
diff -u src/sys/compat/linux32/common/linux32_mod.c:1.11 src/sys/compat/linux32/common/linux32_mod.c:1.11.2.1
--- src/sys/compat/linux32/common/linux32_mod.c:1.11	Sun Dec 10 00:43:05 2017
+++ src/sys/compat/linux32/common/linux32_mod.c	Sun Mar 11 23:50:18 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux32_mod.c,v 1.11 2017/12/10 00:43:05 kre Exp $	*/
+/*	$NetBSD: linux32_mod.c,v 1.11.2.1 2018/03/11 23:50:18 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11 2017/12/10 00:43:05 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.1 2018/03/11 23:50:18 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mod.
 # define	MD1	""
 #endif
 
-MODULE(MODULE_CLASS_EXEC, compat_linux32, "compat_linux" MD1);
+MODULE(MODULE_CLASS_EXEC, compat_linux32, "compat_linux,compat_sysv" MD1);
 
 static struct execsw linux32_execsw[] = {
 #if defined(EXEC_ELF32)

Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.1
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.13	Thu Dec  3 02:51:01 2015
+++ src/sys/compat/netbsd32/netbsd32_mod.c	Sun Mar 11 23:50:18 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_mod.c,v 1.13 2015/12/03 02:51:01 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_mod.c,v 1.13.16.1 2018/03/11 23:50:18 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13 2015/12/03 02:51:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.1 2018/03/11 23:50:18 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
 #include 
 #include 
 
-# define	DEPS1	"compat,sysv_ipc,ksem"
+# define	DEPS1	"compat,ksem"
 
 #if defined(EXEC_ELF32)
 # define	DEPS2	",exec_elf32"

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 11 23:49:39 UTC 2018

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

Log Message:
sort, add missing lint file


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

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

Modified files:

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.195 src/distrib/sets/lists/xcomp/mi:1.196
--- src/distrib/sets/lists/xcomp/mi:1.195	Sun Mar 11 07:34:33 2018
+++ src/distrib/sets/lists/xcomp/mi	Sun Mar 11 19:49:39 2018
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.195 2018/03/11 11:34:33 mrg Exp $
+#	 $NetBSD: mi,v 1.196 2018/03/11 23:49:39 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -715,6 +715,7 @@
 ./usr/X11R7/include/libdrm/via_drm.h			-unknown-	xorg
 ./usr/X11R7/include/libdrm/virtgpu_drm.h		-unknown-	xorg
 ./usr/X11R7/include/libkms/libkms.h			-unknown-	xorg
+./usr/X11R7/include/libsync.h-unknown-	xorg
 ./usr/X11R7/include/pciaccess.h-unknown-	xorg
 ./usr/X11R7/include/pixman-1/pixman-version.h		-unknown-	xorg
 ./usr/X11R7/include/pixman-1/pixman.h			-unknown-	xorg
@@ -759,7 +760,6 @@
 ./usr/X11R7/include/xcb/xvmc.h-unknown-	xorg
 ./usr/X11R7/include/xf86drm.h-unknown-	xorg
 ./usr/X11R7/include/xf86drmMode.h			-unknown-	xorg
-./usr/X11R7/include/libsync.h-unknown-	xorg
 ./usr/X11R7/include/xorg/BT.h-unknown-	xorg
 ./usr/X11R7/include/xorg/IBM.h-unknown-	xorg
 ./usr/X11R7/include/xorg/TI.h-unknown-	xorg
@@ -1137,9 +1137,9 @@
 ./usr/X11R7/lib/libXext_p.a-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXfixes.a-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXfixes_p.a-unknown-	profile,xorg,compatx11file
+./usr/X11R7/lib/libXfont.a-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXfont2.a-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXfont2_p.a-unknown-	profile,xorg,compatx11file
-./usr/X11R7/lib/libXfont.a-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXfont_p.a-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXfontcache.a-unknown-	obsolete
 ./usr/X11R7/lib/libXfontcache_p.a			-unknown-	obsolete
@@ -1392,8 +1392,8 @@
 ./usr/X11R7/lib/pkgconfig/xf86miscproto.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xf86vidmodeproto.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xfixes.pc			-unknown-	xorg
-./usr/X11R7/lib/pkgconfig/xfont2.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xfont.pc			-unknown-	xorg
+./usr/X11R7/lib/pkgconfig/xfont2.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xfontcache.pc			-unknown-	obsolete
 ./usr/X11R7/lib/pkgconfig/xft.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xi.pc-unknown-	xorg
@@ -4213,6 +4213,7 @@
 ./usr/libdata/lint/llib-lXext.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXfixes.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXfont.ln			-unknown-	lint,xorg
+./usr/libdata/lint/llib-lXfont2.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXfontcache.ln			-unknown-	obsolete
 ./usr/libdata/lint/llib-lXft.ln-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXi.ln-unknown-	lint,xorg

CVS commit: [pgoyette-compat] src/sys/arch/amd64/conf

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 11 23:49:33 UTC 2018

Modified Files:
src/sys/arch/amd64/conf [pgoyette-compat]: NOCOMPAT

Log Message:
Remove another COMPAT option


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/amd64/conf/NOCOMPAT

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/amd64/conf/NOCOMPAT
diff -u src/sys/arch/amd64/conf/NOCOMPAT:1.1.2.2 src/sys/arch/amd64/conf/NOCOMPAT:1.1.2.3
--- src/sys/arch/amd64/conf/NOCOMPAT:1.1.2.2	Fri Mar  9 01:27:50 2018
+++ src/sys/arch/amd64/conf/NOCOMPAT	Sun Mar 11 23:49:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: NOCOMPAT,v 1.1.2.2 2018/03/09 01:27:50 pgoyette Exp $
+# $NetBSD: NOCOMPAT,v 1.1.2.3 2018/03/11 23:49:32 pgoyette Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1.2.2 $"
+#ident		"GENERIC-$Revision: 1.1.2.3 $"
 
 maxusers	64		# estimated number of users
 
@@ -128,7 +128,7 @@ options 	KDTRACE_HOOKS	# kernel DTrace h
 
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
-options 	COMPAT_OSSAUDIO
+#options 	COMPAT_OSSAUDIO
 #options 	COMPAT_NETBSD32
 #options 	COMPAT_LINUX
 #options 	COMPAT_LINUX32	# requires COMPAT_LINUX and COMPAT_NETBSD32

CVS commit: [pgoyette-compat] src/sys/modules/compat_ibcs2

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 11 22:04:35 UTC 2018

Modified Files:
src/sys/modules/compat_ibcs2 [pgoyette-compat]: Makefile

Log Message:
If compat_ibcs2 is being built for i386, make sure we include support
for 32-bit executables


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/modules/compat_ibcs2/Makefile

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

Modified files:

Index: src/sys/modules/compat_ibcs2/Makefile
diff -u src/sys/modules/compat_ibcs2/Makefile:1.4 src/sys/modules/compat_ibcs2/Makefile:1.4.2.1
--- src/sys/modules/compat_ibcs2/Makefile:1.4	Wed Aug  9 18:45:30 2017
+++ src/sys/modules/compat_ibcs2/Makefile	Sun Mar 11 22:04:35 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2017/08/09 18:45:30 maxv Exp $
+#	$NetBSD: Makefile,v 1.4.2.1 2018/03/11 22:04:35 pgoyette Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.assym"
@@ -8,6 +8,10 @@ KMOD=	compat_ibcs2
 CPPFLAGS+=	-DSYSVSHM -DSYSVSEM -DSYSVMSG
 CPPFLAGS+=	-DCOMPAT_IBCS2
 
+.if ${MACHINE_ARCH} == "i386"
+CPPFLAGS+=  -DEXEC_ELF32
+.endif
+
 .PATH:	${S}/compat/ibcs2
 
 SRCS+=	ibcs2_errno.c ibcs2_exec.c ibcs2_exec_coff.c ibcs2_exec_elf32.c

CVS commit: src/tests/lib/csu

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun Mar 11 21:20:22 UTC 2018

Modified Files:
src/tests/lib/csu: h_ifunc_static.c

Log Message:
Stub out on platforms without ifunc support in the linker.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/csu/h_ifunc_static.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/csu/h_ifunc_static.c
diff -u src/tests/lib/csu/h_ifunc_static.c:1.1 src/tests/lib/csu/h_ifunc_static.c:1.2
--- src/tests/lib/csu/h_ifunc_static.c:1.1	Fri Mar  9 20:20:47 2018
+++ src/tests/lib/csu/h_ifunc_static.c	Sun Mar 11 21:20:22 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: h_ifunc_static.c,v 1.1 2018/03/09 20:20:47 joerg Exp $	*/
+/*	$NetBSD: h_ifunc_static.c,v 1.2 2018/03/11 21:20:22 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -29,6 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(__arm__) || defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__sparc__)
 #include 
 #include 
 
@@ -62,3 +63,10 @@ main(int argc, char **argv)
 		return 1;
 	return atoll(argv[1]) != ifunc();
 }
+#else
+int
+main(int argc, char **argv)
+{
+	return 127;
+}
+#endif

CVS commit: src/external/mit/xorg/lib/xkeyboard-config

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 20:17:19 UTC 2018

Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man
src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev
evdev.lst

Log Message:
regen these files for xkeyboard-config 2.23.1.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/lib/xkeyboard-config/rules/base \
src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst

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/xkeyboard-config/xkeyboard-config.man
diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.3 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.4
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.3	Mon Sep  4 16:51:11 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man	Sun Mar 11 20:17:19 2018
@@ -1,5 +1,5 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.21" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.23.1" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -18,7 +18,7 @@ pc102	Generic 101-key PC (intl.)
 pc104	Generic 104-key PC
 pc105	Generic 105-key PC (intl.)
 dell101	Dell 101-key PC
-latitude	Dell Latutude laptop
+latitude	Dell Latitude laptop
 dellm65	Dell Precision M65 laptop
 everex	Everex STEPnote
 flexpro	Keytronic FlexPro
@@ -225,7 +225,7 @@ us(dvorak-classic)	English (classic Dvor
 us(dvp)	English (programmer Dvorak)
 us(rus)	Russian (US, phonetic)
 us(mac)	English (Macintosh)
-us(altgr-intl)	English (intl., with dead keys)
+us(altgr-intl)	English (intl., with AltGr dead keys)
 us(olpc2)	English (the divide/multiply keys toggle the layout)
 us(hbs)	Serbo-Croatian (US)
 us(workman)	English (Workman)
@@ -247,6 +247,7 @@ ara(digits)	Arabic (digits)
 ara(qwerty)	Arabic (QWERTY)
 ara(qwerty_digits)	Arabic (qwerty/digits)
 ara(buckwalter)	Arabic (Buckwalter)
+ara(olpc)	Arabic (OLPC)
 ara(mac)	Arabic (Macintosh)
 
 _
@@ -290,15 +291,49 @@ be(sundeadkeys)	Belgian (with Sun dead k
 be(wang)	Belgian (Wang 724 AZERTY)
 
 _
+bd	Bangla
+bd(probhat)	Bangla (Probhat)
+
+_
 in	Indian
+in(ben)	Bangla (India)
+in(ben_probhat)	Bangla (India, Probhat)
+in(ben_baishakhi)	Bangla (India, Baishakhi)
+in(ben_bornona)	Bangla (India, Bornona)
+in(ben_gitanjali)	Bangla (India, Uni Gitanjali)
+in(ben_inscript)	Bangla (India, Baishakhi Inscript)
+in(eeyek)	Manipuri (Eeyek)
+in(guj)	Gujarati
+in(guru)	Punjabi (Gurmukhi)
+in(jhelum)	Punjabi (Gurmukhi Jhelum)
+in(kan)	Kannada
+in(kan-kagapa)	Kannada (KaGaPa phonetic)
+in(mal)	Malayalam
+in(mal_lalitha)	Malayalam (Lalitha)
+in(mal_enhanced)	Malayalam (enhanced Inscript, with rupee)
+in(ori)	Oriya
+in(olck)	Ol Chiki
+in(tam_unicode)	Tamil (Unicode)
+in(tam_keyboard_with_numerals)	Tamil (keyboard with numerals)
+in(tam_TAB)	Tamil (TAB typewriter)
+in(tam_TSCII)	Tamil (TSCII typewriter)
+in(tam)	Tamil
+in(tel)	Telugu
+in(tel-kagapa)	Telugu (KaGaPa phonetic)
+in(tel-sarala)	Telugu (Sarala)
 in(urd-phonetic)	Urdu (phonetic)
 in(urd-phonetic3)	Urdu (alt. phonetic)
 in(urd-winkeys)	Urdu (Win keys)
+in(bolnagri)	Hindi (Bolnagri)
+in(hin-wx)	Hindi (Wx)
+in(hin-kagapa)	Hindi (KaGaPa phonetic)
+in(san-kagapa)	Sanskrit (KaGaPa phonetic)
+in(mar-kagapa)	Marathi (KaGaPa phonetic)
 in(eng)	English (India, with rupee)
 
 _
 ba	Bosnian
-ba(alternatequotes)	Bosnian (with guillements)
+ba(alternatequotes)	Bosnian (with guillemets)
 ba(unicode)	Bosnian (with Bosnian digraphs)
 ba(unicodeus)	Bosnian (US, with Bosnian digraphs)
 ba(us)	Bosnian (US, with Bosnian letters)
@@ -364,7 +399,7 @@ cn(ug)	Uyghur
 
 _
 hr	Croatian
-hr(alternatequotes)	Croatian (with guillements)
+hr(alternatequotes)	Croatian (with guillemets)
 hr(unicode)	Croatian (with Croatian digraphs)
 hr(unicodeus)	Croatian (US, with Croatian digraphs)
 hr(us)	Croatian (US, with Croatian letters)
@@ -540,6 +575,8 @@ it(mac)	Italian (Macintosh)
 it(us)	Italian (US, with Italian letters)
 it(geo)	Georgian (Italy)
 it(ibm)	Italian (IBM 142)
+it(intl)	Italian (intl., with dead keys)
+it(scn)	Sicilian
 
 _
 jp	Japanese
@@ -678,7 +715,7 @@ ru(bak)	Bashkirian
 ru(chm)	Mari
 ru(phonetic_azerty)	Russian (phonetic, AZERTY)
 ru(phonetic_dvorak)	Russian (phonetic, Dvorak)
-ru(phonetic_fr)	Russian Russian (phonetic, French)
+ru(phonetic_fr)	Russian (phonetic, French)
 
 _
 rs	Serbian
@@ -693,7 +730,7 @@ rs(rue)	Pannonian Rusyn
 
 _
 si	Slovenian
-si(alternatequotes)	Slovenian (with guillements)
+si(alternatequotes)	Slovenian (with 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 20:16:26 UTC 2018

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: config.guess config.sub
configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in in
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in

Log Message:
merge xkeyboard-config 2.23.1.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xkeyboard-config/dist/config.guess \
xsrc/external/mit/xkeyboard-config/dist/config.sub
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in

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/xkeyboard-config/dist/config.guess
diff -u xsrc/external/mit/xkeyboard-config/dist/config.guess:1.6 xsrc/external/mit/xkeyboard-config/dist/config.guess:1.7
--- xsrc/external/mit/xkeyboard-config/dist/config.guess:1.6	Tue Nov 22 19:45:29 2016
+++ xsrc/external/mit/xkeyboard-config/dist/config.guess	Sun Mar 11 20:16:25 2018
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2015-01-01'
+timestamp='2017-08-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ timestamp='2015-01-01'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to .
 
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	/usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	/sbin/$sysctl 2>/dev/null || \
+	/usr/sbin/$sysctl 2>/dev/null || \
+	echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	armeb) machine=armeb-unknown ;;
 	arm*) machine=arm-unknown ;;
 	sh3el) machine=shl-unknown ;;
 	sh3eb) machine=sh-unknown ;;
 	sh5el) machine=sh5le-unknown ;;
+	earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
+	earm*)
+		os=netbsdelf
+		;;
 	arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 		release='-gnu'
 		;;
 	*)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
 *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+

CVS import: xsrc/external/mit/xkeyboard-config/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 20:14:57 UTC 2018

Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv9049

Log Message:
initial import of xkeyboard-config-2.23.1

Status:

Vendor Tag: xorg
Release Tags:   xkeyboard-config-2-23-1

U xsrc/external/mit/xkeyboard-config/dist/install-sh
U xsrc/external/mit/xkeyboard-config/dist/README
U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4
U xsrc/external/mit/xkeyboard-config/dist/compile
U xsrc/external/mit/xkeyboard-config/dist/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/config.rpath
U xsrc/external/mit/xkeyboard-config/dist/AUTHORS
U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in
C xsrc/external/mit/xkeyboard-config/dist/configure
U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS
U xsrc/external/mit/xkeyboard-config/dist/TODO
U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in
U xsrc/external/mit/xkeyboard-config/dist/NEWS
U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in
U xsrc/external/mit/xkeyboard-config/dist/Makefile.in
C xsrc/external/mit/xkeyboard-config/dist/config.sub
U xsrc/external/mit/xkeyboard-config/dist/COPYING
U xsrc/external/mit/xkeyboard-config/dist/missing
C xsrc/external/mit/xkeyboard-config/dist/config.guess
U xsrc/external/mit/xkeyboard-config/dist/configure.ac
U xsrc/external/mit/xkeyboard-config/dist/ChangeLog
U xsrc/external/mit/xkeyboard-config/dist/autogen.sh
U xsrc/external/mit/xkeyboard-config/dist/symbols/gb
U xsrc/external/mit/xkeyboard-config/dist/symbols/eu
U xsrc/external/mit/xkeyboard-config/dist/symbols/tw
U xsrc/external/mit/xkeyboard-config/dist/symbols/uz
U xsrc/external/mit/xkeyboard-config/dist/symbols/tg
U xsrc/external/mit/xkeyboard-config/dist/symbols/ara
U xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/symbols/capslock
U xsrc/external/mit/xkeyboard-config/dist/symbols/inet
U xsrc/external/mit/xkeyboard-config/dist/symbols/se
U xsrc/external/mit/xkeyboard-config/dist/symbols/fr
U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign
U xsrc/external/mit/xkeyboard-config/dist/symbols/iq
U xsrc/external/mit/xkeyboard-config/dist/symbols/typo
U xsrc/external/mit/xkeyboard-config/dist/symbols/by
U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl
U xsrc/external/mit/xkeyboard-config/dist/symbols/az
U xsrc/external/mit/xkeyboard-config/dist/symbols/br
U xsrc/external/mit/xkeyboard-config/dist/symbols/cm
U xsrc/external/mit/xkeyboard-config/dist/symbols/de
U xsrc/external/mit/xkeyboard-config/dist/symbols/kz
U xsrc/external/mit/xkeyboard-config/dist/symbols/tj
U xsrc/external/mit/xkeyboard-config/dist/symbols/empty
U xsrc/external/mit/xkeyboard-config/dist/symbols/level3
U xsrc/external/mit/xkeyboard-config/dist/symbols/us
U xsrc/external/mit/xkeyboard-config/dist/symbols/es
U xsrc/external/mit/xkeyboard-config/dist/symbols/latam
U xsrc/external/mit/xkeyboard-config/dist/symbols/apl
U xsrc/external/mit/xkeyboard-config/dist/symbols/ph
U xsrc/external/mit/xkeyboard-config/dist/symbols/it
U xsrc/external/mit/xkeyboard-config/dist/symbols/bd
U xsrc/external/mit/xkeyboard-config/dist/symbols/tr
U xsrc/external/mit/xkeyboard-config/dist/symbols/cn
U xsrc/external/mit/xkeyboard-config/dist/symbols/gh
U xsrc/external/mit/xkeyboard-config/dist/symbols/ua
U xsrc/external/mit/xkeyboard-config/dist/symbols/et
U xsrc/external/mit/xkeyboard-config/dist/symbols/bt
U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/kg
U xsrc/external/mit/xkeyboard-config/dist/symbols/is
U xsrc/external/mit/xkeyboard-config/dist/symbols/ee
U xsrc/external/mit/xkeyboard-config/dist/symbols/tz
U xsrc/external/mit/xkeyboard-config/dist/symbols/am
U xsrc/external/mit/xkeyboard-config/dist/symbols/ma
U xsrc/external/mit/xkeyboard-config/dist/symbols/si
U xsrc/external/mit/xkeyboard-config/dist/symbols/ge
U xsrc/external/mit/xkeyboard-config/dist/symbols/id
U xsrc/external/mit/xkeyboard-config/dist/symbols/cz
U xsrc/external/mit/xkeyboard-config/dist/symbols/za
U xsrc/external/mit/xkeyboard-config/dist/symbols/au
U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad
U xsrc/external/mit/xkeyboard-config/dist/symbols/ca
U xsrc/external/mit/xkeyboard-config/dist/symbols/shift
U xsrc/external/mit/xkeyboard-config/dist/symbols/mt
U xsrc/external/mit/xkeyboard-config/dist/symbols/gr
U xsrc/external/mit/xkeyboard-config/dist/symbols/ru
U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc
U xsrc/external/mit/xkeyboard-config/dist/symbols/compose
U xsrc/external/mit/xkeyboard-config/dist/symbols/mm
U xsrc/external/mit/xkeyboard-config/dist/symbols/fi
U xsrc/external/mit/xkeyboard-config/dist/symbols/af
U xsrc/external/mit/xkeyboard-config/dist/symbols/hr
U xsrc/external/mit/xkeyboard-config/dist/symbols/at
U 

CVS commit: xsrc/external/mit/xf86-video-ati-kms

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 19:44:00 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_kms.c
xsrc/external/mit/xf86-video-ati-kms/include: config.h
Removed Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_list.h

Log Message:
merge xf86-video-ati 18.0.0.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_list.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-ati-kms/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/xf86-video-ati-kms/dist/src/radeon_kms.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.5 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.6
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.5	Tue Aug 29 04:43:42 2017
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c	Sun Mar 11 19:43:59 2018
@@ -32,11 +32,13 @@
 #include 
 /* Driver data structures */
 #include "radeon.h"
+#include "radeon_bo_helper.h"
 #include "radeon_drm_queue.h"
 #include "radeon_glamor.h"
 #include "radeon_reg.h"
 #include "radeon_probe.h"
 #include "micmap.h"
+#include "mipointrst.h"
 
 #include "radeon_version.h"
 #include "shadow.h"
@@ -44,6 +46,10 @@
 
 #include "atipciids.h"
 
+#if HAVE_PRESENT_H
+#include 
+#endif
+
 /* DPMS */
 #ifdef HAVE_XEXTPROTO_71
 #include 
@@ -61,6 +67,7 @@
 #include "radeon_vbo.h"
 
 static DevScreenPrivateKeyRec radeon_client_private_key;
+DevScreenPrivateKeyRec radeon_device_private_key;
 
 extern SymTabRec RADEONChipsets[];
 static Bool radeon_setup_kernel_mem(ScreenPtr pScreen);
@@ -187,16 +194,34 @@ static Bool RADEONGetRec(ScrnInfoPtr pSc
 /* Free our private RADEONInfoRec */
 static void RADEONFreeRec(ScrnInfoPtr pScrn)
 {
+DevUnion *pPriv;
+RADEONEntPtr pRADEONEnt;
 RADEONInfoPtr  info;
+EntityInfoPtr pEnt;
 
-if (!pScrn || !pScrn->driverPrivate) return;
+if (!pScrn)
+	return;
 
 info = RADEONPTR(pScrn);
+if (info) {
+	if (info->fbcon_pixmap)
+	pScrn->pScreen->DestroyPixmap(info->fbcon_pixmap);
+
+	if (info->accel_state) {
+	free(info->accel_state);
+	info->accel_state = NULL;
+	}
 
-if (info->fbcon_pixmap)
-	pScrn->pScreen->DestroyPixmap(info->fbcon_pixmap);
+	pEnt = info->pEnt;
+	free(pScrn->driverPrivate);
+	pScrn->driverPrivate = NULL;
+} else {
+	pEnt = xf86GetEntityInfo(pScrn->entityList[pScrn->numEntities - 1]);
+}
 
-if (info->dri2.drm_fd > 0) {
+pPriv = xf86GetEntityPrivate(pEnt->index, gRADEONEntityIndex);
+pRADEONEnt = pPriv->ptr;
+if (pRADEONEnt->fd > 0) {
 DevUnion *pPriv;
 RADEONEntPtr pRADEONEnt;
 pPriv = xf86GetEntityPrivate(pScrn->entityList[0],
@@ -210,17 +235,12 @@ static void RADEONFreeRec(ScrnInfoPtr pS
 pRADEONEnt->platform_dev->flags & XF86_PDEV_SERVER_FD))
 #endif
 drmClose(pRADEONEnt->fd);
-pRADEONEnt->fd = 0;
+free(pPriv->ptr);
+pPriv->ptr = NULL;
 }
 }
 
-if (info->accel_state) {
-	free(info->accel_state);
-	info->accel_state = NULL;
-}
-
-free(pScrn->driverPrivate);
-pScrn->driverPrivate = NULL;
+free(pEnt);
 }
 
 static void *
@@ -317,9 +337,7 @@ static Bool RADEONCreateScreenResources_
 if (dixPrivateKeyRegistered(rrPrivKey)) {
 	rrScrPrivPtr rrScrPriv = rrGetScrPriv(pScreen);
 
-	if (!radeon_is_gpu_screen(pScreen) &&
-	!rrScrPriv->primaryOutput)
-	{
+	if (!pScreen->isGPU && !rrScrPriv->primaryOutput) {
 	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
 
 	rrScrPriv->primaryOutput = xf86_config->output[0]->randr_output;
@@ -328,8 +346,7 @@ static Bool RADEONCreateScreenResources_
 	}
 }
 
-if (!drmmode_set_desired_modes(pScrn, >drmmode,
-   radeon_is_gpu_screen(pScreen)))
+if (!drmmode_set_desired_modes(pScrn, >drmmode, pScreen->isGPU))
 	return FALSE;
 
 drmmode_uevent_init(pScrn, >drmmode);
@@ -358,8 +375,7 @@ static Bool RADEONCreateScreenResources_
 	radeon_glamor_create_screen_resources(pScreen);
 
 info->callback_event_type = -1;
-if (!radeon_is_gpu_screen(pScreen) &&
-	(damage_ext = CheckExtension("DAMAGE"))) {
+if (!pScreen->isGPU && (damage_ext = CheckExtension("DAMAGE"))) {
 	info->callback_event_type = damage_ext->eventBase + XDamageNotify;
 
 	if (!AddCallback(, radeon_flush_callback, pScrn))
@@ -384,15 +400,12 @@ static Bool RADEONCreateScreenResources_
 static Bool
 radeon_scanout_extents_intersect(xf86CrtcPtr xf86_crtc, BoxPtr extents)
 {
-#ifdef RADEON_PIXMAP_SHARING
 if (xf86_crtc->scrn->is_gpu) {
 	extents->x1 -= xf86_crtc->x;
 	extents->y1 -= xf86_crtc->y;
 	extents->x2 -= xf86_crtc->x;
 	extents->y2 -= xf86_crtc->y;
-   

CVS import: xsrc/external/mit/xf86-video-ati-kms/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 19:42:45 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-ati-kms/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv22968

Log Message:
initial import of xf86-video-ati-18.0.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-ati-18-0-0

U xsrc/external/mit/xf86-video-ati-kms/dist/ChangeLog
U xsrc/external/mit/xf86-video-ati-kms/dist/missing
U xsrc/external/mit/xf86-video-ati-kms/dist/ltmain.sh
U xsrc/external/mit/xf86-video-ati-kms/dist/COPYING
U xsrc/external/mit/xf86-video-ati-kms/dist/README
U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.in
U xsrc/external/mit/xf86-video-ati-kms/dist/install-sh
U xsrc/external/mit/xf86-video-ati-kms/dist/configure.ac
U xsrc/external/mit/xf86-video-ati-kms/dist/config.h.in
U xsrc/external/mit/xf86-video-ati-kms/dist/config.sub
U xsrc/external/mit/xf86-video-ati-kms/dist/compile
U xsrc/external/mit/xf86-video-ati-kms/dist/depcomp
U xsrc/external/mit/xf86-video-ati-kms/dist/configure
U xsrc/external/mit/xf86-video-ati-kms/dist/config.guess
U xsrc/external/mit/xf86-video-ati-kms/dist/aclocal.m4
U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.am
U xsrc/external/mit/xf86-video-ati-kms/dist/INSTALL
U xsrc/external/mit/xf86-video-ati-kms/dist/conf/10-radeon.conf
U xsrc/external/mit/xf86-video-ati-kms/dist/conf/Makefile.in
U xsrc/external/mit/xf86-video-ati-kms/dist/conf/Makefile.am
N xsrc/external/mit/xf86-video-ati-kms/dist/m4/lt~obsolete.m4
N xsrc/external/mit/xf86-video-ati-kms/dist/m4/libtool.m4
N xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltversion.m4
N xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltsugar.m4
N xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltoptions.m4
U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-ati-kms/dist/man/ati.man
U xsrc/external/mit/xf86-video-ati-kms/dist/man/radeon.man
U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_chipset_gen.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri2.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_exa.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor_wrappers.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_shader.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_accel.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_render.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_reg.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_state.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r6xx.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_accel.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_shared.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_sync.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r7xx.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipciids.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_drm_queue.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_exa.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_misc.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_textured_videofuncs.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati_pciids_gen.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_shader.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_textured_videofuncs.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_accel.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipset_gen.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipinfo_gen.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_device_match_gen.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/simple_list.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_reg_auto.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.py
U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri3.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg.h
U xsrc/external/mit/xf86-video-ati-kms/dist/src/r6xx_accel.c
U xsrc/external/mit/xf86-video-ati-kms/dist/src/atimodule.c
U 

CVS commit: xsrc/external/mit/xf86-video-amdgpu

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 19:20:56 UTC 2018

Modified Files:
xsrc/external/mit/xf86-video-amdgpu/include: config.h
Removed Files:
xsrc/external/mit/xf86-video-amdgpu/dist/src: amdgpu_list.h

Log Message:
merge xf86-video-amdgpu 18.0.0.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_list.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-amdgpu/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/xf86-video-amdgpu/include/config.h
diff -u xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.4 xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.5
--- xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.4	Tue Aug 29 04:58:03 2017
+++ xsrc/external/mit/xf86-video-amdgpu/include/config.h	Sun Mar 11 19:20:56 2018
@@ -75,9 +75,6 @@
 /* Have xf86CursorResetCursor API */
 #define HAVE_XF86_CURSOR_RESET_CURSOR 1
 
-/* Have xorg_list API */
-#define HAVE_XORG_LIST 1
-
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
@@ -91,7 +88,7 @@
 #define PACKAGE_NAME "xf86-video-amdgpu"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-amdgpu 1.3.0"
+#define PACKAGE_STRING "xf86-video-amdgpu 18.0.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xf86-video-amdgpu"
@@ -100,13 +97,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.0"
+#define PACKAGE_VERSION "18.0.0"
 
 /* Major version of this package */
-#define PACKAGE_VERSION_MAJOR 1
+#define PACKAGE_VERSION_MAJOR 18
 
 /* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 3
+#define PACKAGE_VERSION_MINOR 0
 
 /* Patch version of this package */
 #define PACKAGE_VERSION_PATCHLEVEL 0
@@ -121,7 +118,7 @@
 #define USE_SYS_ENDIAN_H 1
 
 /* Version number of package */
-#define VERSION "1.3.0"
+#define VERSION "18.0.0"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE

CVS import: xsrc/external/mit/xf86-video-amdgpu/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 19:19:26 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-amdgpu/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv2248

Log Message:
initial import of xf86-video-amdgpu-18.0.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-amdgpu-18-0-0

U xsrc/external/mit/xf86-video-amdgpu/dist/ChangeLog
U xsrc/external/mit/xf86-video-amdgpu/dist/missing
U xsrc/external/mit/xf86-video-amdgpu/dist/ltmain.sh
U xsrc/external/mit/xf86-video-amdgpu/dist/COPYING
U xsrc/external/mit/xf86-video-amdgpu/dist/README
U xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/install-sh
U xsrc/external/mit/xf86-video-amdgpu/dist/configure.ac
U xsrc/external/mit/xf86-video-amdgpu/dist/config.h.in
U xsrc/external/mit/xf86-video-amdgpu/dist/config.sub
U xsrc/external/mit/xf86-video-amdgpu/dist/compile
U xsrc/external/mit/xf86-video-amdgpu/dist/depcomp
U xsrc/external/mit/xf86-video-amdgpu/dist/configure
U xsrc/external/mit/xf86-video-amdgpu/dist/config.guess
U xsrc/external/mit/xf86-video-amdgpu/dist/aclocal.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/INSTALL
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/10-amdgpu.conf
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.am
N xsrc/external/mit/xf86-video-amdgpu/dist/m4/lt~obsolete.m4
N xsrc/external/mit/xf86-video-amdgpu/dist/m4/libtool.m4
N xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltversion.m4
N xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltsugar.m4
N xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltoptions.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/man/amdgpu.man
U xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_version.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_kms.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri3.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor_wrappers.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_misc.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_present.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/simple_list.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drv.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_sync.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.c

No conflicts created by this import

CVS import: xsrc/external/mit/xf86-video-vesa/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 19:08:01 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-vesa/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv6361

Log Message:
initial import of xf86-video-vesa-2.4.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-vesa-2-4-0

C xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4
C xsrc/external/mit/xf86-video-vesa/dist/depcomp
C xsrc/external/mit/xf86-video-vesa/dist/config.h.in
U xsrc/external/mit/xf86-video-vesa/dist/README
C xsrc/external/mit/xf86-video-vesa/dist/configure
U xsrc/external/mit/xf86-video-vesa/dist/Makefile.am
C xsrc/external/mit/xf86-video-vesa/dist/missing
C xsrc/external/mit/xf86-video-vesa/dist/configure.ac
U xsrc/external/mit/xf86-video-vesa/dist/INSTALL
C xsrc/external/mit/xf86-video-vesa/dist/install-sh
U xsrc/external/mit/xf86-video-vesa/dist/ChangeLog
U xsrc/external/mit/xf86-video-vesa/dist/compile
C xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh
U xsrc/external/mit/xf86-video-vesa/dist/COPYING
C xsrc/external/mit/xf86-video-vesa/dist/Makefile.in
C xsrc/external/mit/xf86-video-vesa/dist/config.guess
C xsrc/external/mit/xf86-video-vesa/dist/config.sub
U xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.am
C xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-vesa/dist/man/vesa.man
U xsrc/external/mit/xf86-video-vesa/dist/src/compat-api.h
C xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c
U xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-vesa/dist/src/vesa.h
C xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in

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

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-vesa/dist

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 11 18:32:10 UTC 2018

Modified Files:
src/external/bsd/flex/dist/src: libmain.c libyywrap.c

Log Message:
don't need sys/cdefs.h if tool.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/libmain.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/src/libyywrap.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/flex/dist/src/libmain.c
diff -u src/external/bsd/flex/dist/src/libmain.c:1.3 src/external/bsd/flex/dist/src/libmain.c:1.4
--- src/external/bsd/flex/dist/src/libmain.c:1.3	Mon Jan  2 12:45:27 2017
+++ src/external/bsd/flex/dist/src/libmain.c	Sun Mar 11 14:32:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: libmain.c,v 1.3 2017/01/02 17:45:27 christos Exp $	*/
+/*	$NetBSD: libmain.c,v 1.4 2018/03/11 18:32:10 christos Exp $	*/
 
 /* libmain - flex run-time support library "main" function */
 
@@ -22,9 +22,11 @@
 /*  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
 /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
 /*  PURPOSE. */
+#ifndef HAVE_NBTOOL_CONFIG_H
 #include 
 #ifdef __RCSID
-__RCSID("$NetBSD: libmain.c,v 1.3 2017/01/02 17:45:27 christos Exp $");
+__RCSID("$NetBSD: libmain.c,v 1.4 2018/03/11 18:32:10 christos Exp $");
+#endif
 #endif
 
 #include 

Index: src/external/bsd/flex/dist/src/libyywrap.c
diff -u src/external/bsd/flex/dist/src/libyywrap.c:1.2 src/external/bsd/flex/dist/src/libyywrap.c:1.3
--- src/external/bsd/flex/dist/src/libyywrap.c:1.2	Sat Jan  9 12:38:57 2016
+++ src/external/bsd/flex/dist/src/libyywrap.c	Sun Mar 11 14:32:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: libyywrap.c,v 1.2 2016/01/09 17:38:57 christos Exp $	*/
+/*	$NetBSD: libyywrap.c,v 1.3 2018/03/11 18:32:10 christos Exp $	*/
 
 /* libyywrap - flex run-time support library "yywrap" function */
 
@@ -22,9 +22,11 @@
 /*  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
 /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
 /*  PURPOSE. */
+#ifndef HAVE_NBTOOL_CONFIG_H
 #include 
 #ifdef __RCSID
-__RCSID("$NetBSD: libyywrap.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+__RCSID("$NetBSD: libyywrap.c,v 1.3 2018/03/11 18:32:10 christos Exp $");
+#endif
 #endif
 
 int yywrap (void);

CVS commit: src/tools/compat

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 11 18:32:44 UTC 2018

Modified Files:
src/tools/compat: regex.h

Log Message:
undo previous; breaks the build. handle inside flex.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tools/compat/regex.h

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

Modified files:

Index: src/tools/compat/regex.h
diff -u src/tools/compat/regex.h:1.4 src/tools/compat/regex.h:1.5
--- src/tools/compat/regex.h:1.4	Sun Mar 11 06:14:04 2018
+++ src/tools/compat/regex.h	Sun Mar 11 14:32:43 2018
@@ -1,4 +1,3 @@
-/*	$NetBSD: regex.h,v 1.4 2018/03/11 10:14:04 hans Exp $ */
+/*	$NetBSD: regex.h,v 1.5 2018/03/11 18:32:43 christos Exp $ */
 
-#include "nbtool_config.h"
 #include "../../include/regex.h"

CVS commit: src/sys/kern

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Sun Mar 11 15:13:05 UTC 2018

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

Log Message:
Make a comment meaningful.   ie: s/Ditto/what it was copying/  (more or less)

That is, there was a comment "Ditto" - which once upon a time, was used
to indicate the the previous comment applied here as well.   Time passed,
and software mutated, and the previous comment was unfortunately sacrificed.

Poor little Ditto was left all alone.

Noticed while doing some software archaeology.


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/sys/kern/kern_proc.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/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.209 src/sys/kern/kern_proc.c:1.210
--- src/sys/kern/kern_proc.c:1.209	Thu Nov 30 18:44:16 2017
+++ src/sys/kern/kern_proc.c	Sun Mar 11 15:13:05 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_proc.c,v 1.209 2017/11/30 18:44:16 maxv Exp $	*/
+/*	$NetBSD: kern_proc.c,v 1.210 2018/03/11 15:13:05 kre Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209 2017/11/30 18:44:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.210 2018/03/11 15:13:05 kre Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -1655,7 +1655,7 @@ sysctl_doeproc(SYSCTLFN_ARGS)
 			arg = name[1];
 			break;
 		}
-		elem_count = 0;	/* Ditto */
+		elem_count = 0;	/* Hush little compiler, don't you cry */
 		kelem_size = elem_size = sizeof(kbuf->kproc);
 	} else {
 		if (namelen != 4)

CVS commit: src/usr.bin/cvslatest

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 11 14:59:41 UTC 2018

Modified Files:
src/usr.bin/cvslatest: cvslatest.c

Log Message:
deal with cvs meta-data directories not called CVS.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/cvslatest/cvslatest.c

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

Modified files:

Index: src/usr.bin/cvslatest/cvslatest.c
diff -u src/usr.bin/cvslatest/cvslatest.c:1.6 src/usr.bin/cvslatest/cvslatest.c:1.7
--- src/usr.bin/cvslatest/cvslatest.c:1.6	Sun Sep 24 05:43:27 2017
+++ src/usr.bin/cvslatest/cvslatest.c	Sun Mar 11 10:59:41 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cvslatest.c,v 1.6 2017/09/24 09:43:27 joerg Exp $	*/
+/*	$NetBSD: cvslatest.c,v 1.7 2018/03/11 14:59:41 christos Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: cvslatest.c,v 1.6 2017/09/24 09:43:27 joerg Exp $");
+__RCSID("$NetBSD: cvslatest.c,v 1.7 2018/03/11 14:59:41 christos Exp $");
 
 /*
  * Find the latest timestamp in a set of CVS trees, by examining the
@@ -52,6 +52,7 @@ __RCSID("$NetBSD: cvslatest.c,v 1.6 2017
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -174,11 +175,55 @@ usage(void)
 	exit(EXIT_FAILURE);
 }
 
+static int
+checkDir(char *path, size_t pathlen, const char *name)
+{
+	static const char *files[] = {
+		"Entries", "Root", "Repository",
+	};
+	size_t i;
+
+	for (i = 0; i < __arraycount(files); i++) {
+		snprintf(path, pathlen, "%s/%s", name, files[i]);
+		if (access(path, F_OK) == -1)
+			return 0;
+	}
+
+	return 1;
+}
+
+static const char *
+findCVSDir(char *path, size_t pathlen, const char *name)
+{
+	DIR *dirp;
+	struct dirent *dp;
+	const char *n;
+
+	if ((dirp = opendir(name)) == NULL)
+		err(EXIT_FAILURE, "Can't open `%s'", name);
+
+	while ((dp = readdir(dirp)) != NULL) {
+		n = dp->d_name;
+		if (n[0] == '.' && (n[1] == '\0' ||
+		(n[1] == '.' && n[2] == '\0')))
+			continue;
+		if (checkDir(path, pathlen, n))
+			goto out;
+	}
+	n = "CVS";
+out:
+	closedir(dirp);
+	strlcpy(path, n, pathlen);
+	return path;
+}
+
+
 int
 main(int argc, char *argv[])
 {
 	struct latest lat;
-	const char *name = "CVS";
+	const char *name = NULL;
+	char path[MAXPATHLEN];
 	int c;
 
 	while ((c = getopt(argc, argv, "din:")) != -1)
@@ -202,6 +247,9 @@ main(int argc, char *argv[])
 	// So that mktime behaves consistently
 	setenv("TZ", "UTC", 1);
 
+	if (name == NULL)
+		name = findCVSDir(path, sizeof(path), argv[optind]);
+
 	cvsscan(argv + optind, name, );
 	if (debug)
 		printlat();

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sun Mar 11 13:38:02 UTC 2018

Modified Files:
src/sys/arch/x86/x86: cpu.c

Log Message:
Explain the TSC drift thing.


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/arch/x86/x86/cpu.c

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

Modified files:

Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.149 src/sys/arch/x86/x86/cpu.c:1.150
--- src/sys/arch/x86/x86/cpu.c:1.149	Thu Feb 22 13:27:18 2018
+++ src/sys/arch/x86/x86/cpu.c	Sun Mar 11 13:38:02 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.149 2018/02/22 13:27:18 maxv Exp $	*/
+/*	$NetBSD: cpu.c,v 1.150 2018/03/11 13:38:02 maxv Exp $	*/
 
 /*
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.149 2018/02/22 13:27:18 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.150 2018/03/11 13:38:02 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
@@ -674,7 +674,7 @@ cpu_init(struct cpu_info *ci)
 #endif /* MTRR */
 
 	if (ci != _info_primary) {
-		/* Synchronize TSC again, and check for drift. */
+		/* Synchronize TSC */
 		wbinvd();
 		atomic_or_32(>ci_flags, CPUF_RUNNING);
 		tsc_sync_ap(ci);
@@ -786,8 +786,9 @@ cpu_start_secondary(struct cpu_info *ci)
 	} else {
 		/*
 		 * Synchronize time stamp counters. Invalidate cache and do
-		 * twice to try and minimize possible cache effects. Disable
-		 * interrupts to try and rule out any external interference.
+		 * twice (in tsc_sync_bp) to minimize possible cache effects.
+		 * Disable interrupts to try and rule out any external
+		 * interference.
 		 */
 		psl = x86_read_psl();
 		x86_disable_intr();
@@ -854,19 +855,25 @@ cpu_hatch(void *v)
 	KDASSERT((ci->ci_flags & CPUF_PRESENT) == 0);
 
 	/*
-	 * Synchronize time stamp counters.  Invalidate cache and do twice
-	 * to try and minimize possible cache effects.  Note that interrupts
-	 * are off at this point.
+	 * Synchronize the TSC for the first time. Note that interrupts are
+	 * off at this point.
 	 */
 	wbinvd();
 	atomic_or_32(>ci_flags, CPUF_PRESENT);
 	tsc_sync_ap(ci);
 
 	/*
-	 * Wait to be brought online.  Use 'monitor/mwait' if available,
-	 * in order to make the TSC drift as much as possible. so that
-	 * we can detect it later.  If not available, try 'pause'.
-	 * We'd like to use 'hlt', but we have interrupts off.
+	 * Wait to be brought online.
+	 *
+	 * Use MONITOR/MWAIT if available. These instructions put the CPU in
+	 * a low consumption mode (C-state), and if the TSC is not invariant,
+	 * this causes the TSC to drift. We want this to happen, so that we
+	 * can later detect (in tsc_tc_init) any abnormal drift with invariant
+	 * TSCs. That's just for safety; by definition such drifts should
+	 * never occur with invariant TSCs.
+	 *
+	 * If not available, try PAUSE. We'd like to use HLT, but we have
+	 * interrupts off.
 	 */
 	while ((ci->ci_flags & CPUF_GO) == 0) {
 		if ((cpu_feature[1] & CPUID2_MONITOR) != 0) {
@@ -922,6 +929,11 @@ cpu_hatch(void *v)
 	lldt(GSYSSEL(GLDT_SEL, SEL_KPL));
 	ltr(ci->ci_tss_sel);
 
+	/*
+	 * cpu_init will re-synchronize the TSC, and will detect any abnormal
+	 * drift that would have been caused by the use of MONITOR/MWAIT
+	 * above.
+	 */
 	cpu_init(ci);
 	cpu_get_tsc_freq(ci);
 

CVS commit: src/distrib/notes/common

[Tom Ivar Helbekkmo]

Module Name:src
Committed By:   tih
Date:   Sun Mar 11 11:48:39 UTC 2018

Modified Files:
src/distrib/notes/common: main

Log Message:
Add myself.


To generate a diff of this commit:
cvs rdiff -u -r1.543 -r1.544 src/distrib/notes/common/main

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

Modified files:

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.543 src/distrib/notes/common/main:1.544
--- src/distrib/notes/common/main:1.543	Mon Mar  5 00:06:24 2018
+++ src/distrib/notes/common/main	Sun Mar 11 11:48:39 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.543 2018/03/05 00:06:24 eadler Exp $
+.\"	$NetBSD: main,v 1.544 2018/03/11 11:48:39 tih Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -1186,6 +1186,7 @@ If you're one of them, and would like to
 .It Ta Emile Heitor Ta Mt i...@netbsd.org
 .It Ta John Heasley Ta Mt h...@netbsd.org
 .It Ta Lars Heidieker Ta Mt p...@netbsd.org
+.It Ta Tom Ivar Helbekkmo Ta Mt t...@netbsd.org
 .It Ta Geert Hendrickx Ta Mt g...@netbsd.org
 .It Ta Wen Heping Ta Mt w...@netbsd.org
 .It Ta Ren\('e Hexel Ta Mt r...@netbsd.org

CVS commit: [pgoyette-compat] src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 11 11:47:45 UTC 2018

Modified Files:
src/sys/kern [pgoyette-compat]: kern_module.c

Log Message:
Clean up the EXIST paths (module and/or alias already exists) and make
sure we always return a pointer to the duplicate.


To generate a diff of this commit:
cvs rdiff -u -r1.130.2.3 -r1.130.2.4 src/sys/kern/kern_module.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/kern_module.c
diff -u src/sys/kern/kern_module.c:1.130.2.3 src/sys/kern/kern_module.c:1.130.2.4
--- src/sys/kern/kern_module.c:1.130.2.3	Sun Mar 11 08:32:21 2018
+++ src/sys/kern/kern_module.c	Sun Mar 11 11:47:45 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.130.2.3 2018/03/11 08:32:21 pgoyette Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.130.2.4 2018/03/11 11:47:45 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.3 2018/03/11 08:32:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.4 2018/03/11 11:47:45 pgoyette Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -671,9 +671,10 @@ module_alias_lookup(const char *name, mo
 	aliasp = *mod->mod_info->mi_aliases;
 	if (aliasp == NULL)
 		return 0;
-	while (*aliasp)
+	while (*aliasp) {
 		if (strcmp(*aliasp++, name) == 0)
 			return 1;
+	}
 	return 0;
 }
 
@@ -690,11 +691,10 @@ module_lookup(const char *name)
 	KASSERT(kernconfig_is_held());
 
 	TAILQ_FOREACH(mod, _list, mod_chain) {
-		if (strcmp(mod->mod_info->mi_name, name) == 0) {
+		if (strcmp(mod->mod_info->mi_name, name) == 0)
 			break;
 		if (module_alias_lookup(name, mod))
 			break;
-		}
 	}
 
 	return mod;
@@ -855,13 +855,17 @@ module_do_builtin(const module_t *pmod, 
 	}
 
 	/*
-	 * Retrieve that none of the module's aliases already exist
+	 * Confirm that none of the module's aliases already exist
 	 */
 
 	if ((aliasp = *mod->mod_info->mi_aliases) != NULL) {
-		while (*aliasp)
-			if (module_lookup(*aliasp++) != NULL)
+		while (*aliasp) {
+			if ((mod2 = module_lookup(*aliasp++)) != NULL) {
+if (modp != NULL)
+	*modp = mod2;
 return EEXIST;
+			}
+		}
 	}
 	/*
 	 * Try to initialize the module.
@@ -1084,6 +1088,8 @@ module_do_load(const char *name, bool is
 			module_error("module with name `%s' already loaded",
 			mod2->mod_info->mi_name);
 			error = EEXIST;
+			if (modp != NULL)
+*modp = mod2;
 			goto fail;
 		}
 	}
@@ -1171,13 +1177,19 @@ module_do_load(const char *name, bool is
 	/*
 	 * One last check for duplicate module name/alias
 	 */
-	if ((aliasp = *mod->mod_info->mi_aliases) != NULL)
-		while (*aliasp != NULL)
-			if (module_lookup(*aliasp) != NULL) {
+	if ((aliasp = *mod->mod_info->mi_aliases) != NULL) {
+		while (*aliasp != NULL) {
+			if ((mod2 = module_lookup(*aliasp)) != NULL) {
 module_error("Module `%s' alias `%s' already "
 "exists", mod->mod_info->mi_name, *aliasp);
+error = EEXIST;
+if (modp != NULL)
+	*modp = mod2;
 goto fail;
 			}
+			aliasp++;
+		}
+	}
 
 	prev_active = module_active;
 	module_active = mod;

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 11:34:34 UTC 2018

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

Log Message:
mark fontcache files as obsolete.


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

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

Modified files:

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.194 src/distrib/sets/lists/xcomp/mi:1.195
--- src/distrib/sets/lists/xcomp/mi:1.194	Sun Mar 11 09:43:39 2018
+++ src/distrib/sets/lists/xcomp/mi	Sun Mar 11 11:34:33 2018
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.194 2018/03/11 09:43:39 mrg Exp $
+#	 $NetBSD: mi,v 1.195 2018/03/11 11:34:33 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1394,7 +1394,7 @@
 ./usr/X11R7/lib/pkgconfig/xfixes.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xfont2.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xfont.pc			-unknown-	xorg
-./usr/X11R7/lib/pkgconfig/xfontcache.pc			-unknown-	xorg
+./usr/X11R7/lib/pkgconfig/xfontcache.pc			-unknown-	obsolete
 ./usr/X11R7/lib/pkgconfig/xft.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xi.pc-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xinerama.pc			-unknown-	xorg
@@ -1621,11 +1621,11 @@
 ./usr/X11R7/man/cat3/FcValueEqual.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/FcValuePrint.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/FcValueSave.0			-unknown-	.cat,xorg
-./usr/X11R7/man/cat3/FontCacheChangeCacheSettings.0	-unknown-	.cat,xorg
-./usr/X11R7/man/cat3/FontCacheGetCacheSettings.0	-unknown-	.cat,xorg
-./usr/X11R7/man/cat3/FontCacheGetCacheStatistics.0	-unknown-	.cat,xorg
-./usr/X11R7/man/cat3/FontCacheQueryExtension.0		-unknown-	.cat,xorg
-./usr/X11R7/man/cat3/FontCacheQueryVersion.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/FontCacheChangeCacheSettings.0	-unknown-	obsolete
+./usr/X11R7/man/cat3/FontCacheGetCacheSettings.0	-unknown-	obsolete
+./usr/X11R7/man/cat3/FontCacheGetCacheStatistics.0	-unknown-	obsolete
+./usr/X11R7/man/cat3/FontCacheQueryExtension.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/FontCacheQueryVersion.0		-unknown-	obsolete
 ./usr/X11R7/man/cat3/ImageByteOrder.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/IsCursorKey.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/MenuPopdown.0			-unknown-	.cat,xorg
@@ -2532,11 +2532,11 @@
 ./usr/X11R7/man/html3/FcValueEqual.html			-unknown-	html,xorg
 ./usr/X11R7/man/html3/FcValuePrint.html			-unknown-	html,xorg
 ./usr/X11R7/man/html3/FcValueSave.html			-unknown-	html,xorg
-./usr/X11R7/man/html3/FontCacheChangeCacheSettings.html	-unknown-	html,xorg
-./usr/X11R7/man/html3/FontCacheGetCacheSettings.html	-unknown-	html,xorg
-./usr/X11R7/man/html3/FontCacheGetCacheStatistics.html	-unknown-	html,xorg
-./usr/X11R7/man/html3/FontCacheQueryExtension.html	-unknown-	html,xorg
-./usr/X11R7/man/html3/FontCacheQueryVersion.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/FontCacheChangeCacheSettings.html	-unknown-	obsolete
+./usr/X11R7/man/html3/FontCacheGetCacheSettings.html	-unknown-	obsolete
+./usr/X11R7/man/html3/FontCacheGetCacheStatistics.html	-unknown-	obsolete
+./usr/X11R7/man/html3/FontCacheQueryExtension.html	-unknown-	obsolete
+./usr/X11R7/man/html3/FontCacheQueryVersion.html	-unknown-	obsolete
 ./usr/X11R7/man/html3/ImageByteOrder.html		-unknown-	html,xorg
 ./usr/X11R7/man/html3/IsCursorKey.html			-unknown-	html,xorg
 ./usr/X11R7/man/html3/MenuPopdown.html			-unknown-	html,xorg
@@ -3442,11 +3442,11 @@
 ./usr/X11R7/man/man3/FcValueEqual.3			-unknown-	.man,xorg
 ./usr/X11R7/man/man3/FcValuePrint.3			-unknown-	.man,xorg
 ./usr/X11R7/man/man3/FcValueSave.3			-unknown-	.man,xorg
-./usr/X11R7/man/man3/FontCacheChangeCacheSettings.3	-unknown-	.man,xorg
-./usr/X11R7/man/man3/FontCacheGetCacheSettings.3	-unknown-	.man,xorg
-./usr/X11R7/man/man3/FontCacheGetCacheStatistics.3	-unknown-	.man,xorg
-./usr/X11R7/man/man3/FontCacheQueryExtension.3		-unknown-	.man,xorg
-./usr/X11R7/man/man3/FontCacheQueryVersion.3		-unknown-	.man,xorg
+./usr/X11R7/man/man3/FontCacheChangeCacheSettings.3	-unknown-	obsolete
+./usr/X11R7/man/man3/FontCacheGetCacheSettings.3	-unknown-	obsolete
+./usr/X11R7/man/man3/FontCacheGetCacheStatistics.3	-unknown-	obsolete
+./usr/X11R7/man/man3/FontCacheQueryExtension.3		-unknown-	obsolete
+./usr/X11R7/man/man3/FontCacheQueryVersion.3		-unknown-	obsolete
 ./usr/X11R7/man/man3/ImageByteOrder.3			-unknown-	.man,xorg
 ./usr/X11R7/man/man3/IsCursorKey.3			-unknown-	.man,xorg
 ./usr/X11R7/man/man3/MenuPopdown.3			-unknown-	.man,xorg

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 11:18:06 UTC 2018

Modified Files:
src: UPDATING

Log Message:
20180311:
bdftopcf was updated and may need cleaning in the
src/external/mit/xorg/tools/bdftopcf subdirectory if there are
link errors.


To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 src/UPDATING

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

Modified files:

Index: src/UPDATING
diff -u src/UPDATING:1.291 src/UPDATING:1.292
--- src/UPDATING:1.291	Tue Feb 13 04:36:00 2018
+++ src/UPDATING	Sun Mar 11 11:18:06 2018
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.291 2018/02/13 04:36:00 mrg Exp $
+$NetBSD: UPDATING,v 1.292 2018/03/11 11:18:06 mrg Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,11 @@ See also: BUILDING, build.sh, Makefile.
 Recent changes:
 ^^^
 
+20180311:
+	bdftopcf was updated and may need cleaning in the
+	src/external/mit/xorg/tools/bdftopcf subdirectory if there are
+	link errors.
+
 20180212:
 	between OpenSSL and GCC updates, many things may fail to build.
 	any failure that looks like GCC or openssl is best handled by

CVS commit: src/external/mit/xorg/tools/bdftopcf

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 11:01:08 UTC 2018

Modified Files:
src/external/mit/xorg/tools/bdftopcf: Makefile

Log Message:
move the src list from libXfont stuff to local stuff.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/tools/bdftopcf/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/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.6 src/external/mit/xorg/tools/bdftopcf/Makefile:1.7
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.6	Fri May 31 05:24:50 2013
+++ src/external/mit/xorg/tools/bdftopcf/Makefile	Sun Mar 11 11:01:07 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2013/05/31 05:24:50 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2018/03/11 11:01:07 mrg Exp $
 
 NOMAN=		1
 
@@ -9,26 +9,28 @@ HOSTPROG=	bdftopcf
 
 FREETYPE=   ${X11SRCDIR.freetype}
 
-SRCS=		bdftopcf.c
+SRCS=		atom.c \
+		bdfread.c \
+		bdfutils.c \
+		bitmap.c \
+		bitmaputil.c \
+		bufio.c \
+		defaults.c \
+		fileio.c \
+		filewr.c \
+		fontaccel.c \
+		fontink.c \
+		pcfwrite.c \
+		private.c \
+		utilbitmap.c \
+		bdftopcf.c
 
 HOST_CPPFLAGS+=	-I${DESTDIR}${X11INCDIR} \
 		-I${DESTDIR}${X11INCDIR} \
-		-I${DESTDIR}${X11INCDIR}/X11/fonts \
 		-I${DESTDIR}${X11INCDIR}/freetype2 \
-		-I${X11SRCDIR.Xfont}/src/stubs \
 		-DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION \
 		-DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" \
-		-DPACKAGE_STRING="\"NetBSD tool bdftopcf 1.0.4\""
-
-.PATH:		${X11SRCDIR.Xfont}/src/bitmap
-SRCS+=		bdfread.c bdfutils.c bitmap.c bitmaputil.c fontink.c \
-		pcfread.c pcfwrite.c
-
-.PATH:		${X11SRCDIR.Xfont}/src/fontfile
-SRCS+=		bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c
-
-.PATH:		${X11SRCDIR.Xfont}/src/util
-SRCS+=		atom.c fontaccel.c private.c utilbitmap.c
+		-DPACKAGE_STRING="\"NetBSD tool bdftopcf 1.1\""
 
 LDADD+=		-lz
 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 10:48:39 UTC 2018

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

Log Message:
update for bdftopcf 1.4.0.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/bdftopcf/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/bdftopcf/Makefile
diff -u src/external/mit/xorg/bin/bdftopcf/Makefile:1.4 src/external/mit/xorg/bin/bdftopcf/Makefile:1.5
--- src/external/mit/xorg/bin/bdftopcf/Makefile:1.4	Mon Jul 20 23:50:22 2015
+++ src/external/mit/xorg/bin/bdftopcf/Makefile	Sun Mar 11 10:48:38 2018
@@ -1,11 +1,26 @@
-#	$NetBSD: Makefile,v 1.4 2015/07/20 23:50:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2018/03/11 10:48:38 mrg Exp $
 
 .include 
 
 PROG=	bdftopcf
+SRCS=	atom.c \
+	bdfread.c \
+	bdfutils.c \
+	bitmap.c \
+	bitmaputil.c \
+	bufio.c \
+	defaults.c \
+	fileio.c \
+	filewr.c \
+	fontaccel.c \
+	fontink.c \
+	pcfwrite.c \
+	private.c \
+	utilbitmap.c \
+	bdftopcf.c
 
-LDADD+=	-lXfont -lfontenc -lfreetype -lm -lz -lbz2
-DPADD+=	${LIBXFONT} ${LIBFONTENC} ${LIBFREETYPE} ${LIBM} ${LIBZ} ${LIBBZ2}
+LDADD+=	-lm -lz -lbz2
+DPADD+=	${LIBM} ${LIBZ} ${LIBBZ2}
 
 .PATH:	${X11SRCDIR.${PROG}}
 .PATH:	${X11SRCDIR.${PROG}}/man

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 10:46:02 UTC 2018

Modified Files:
xsrc/external/mit/xinit/dist: compile startx.cpp xinit.c

Log Message:
merge xinit 1.4.0.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xinit/dist/compile
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xinit/dist/startx.cpp
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xinit/dist/xinit.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/xinit/dist/compile
diff -u xsrc/external/mit/xinit/dist/compile:1.3 xsrc/external/mit/xinit/dist/compile:1.4
--- xsrc/external/mit/xinit/dist/compile:1.3	Mon Mar 17 09:43:11 2014
+++ xsrc/external/mit/xinit/dist/compile	Sun Mar 11 10:46:02 2018
@@ -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

Index: xsrc/external/mit/xinit/dist/startx.cpp
diff -u xsrc/external/mit/xinit/dist/startx.cpp:1.7 xsrc/external/mit/xinit/dist/startx.cpp:1.8
--- xsrc/external/mit/xinit/dist/startx.cpp:1.7	Tue Jul 28 15:45:46 2015
+++ xsrc/external/mit/xinit/dist/startx.cpp	Sun Mar 11 10:46:02 2018
@@ -56,7 +56,7 @@ defaultclient=XTERM
 defaultserver=XSERVER
 defaultclientargs=""
 defaultserverargs="-noretro"
-defaultdisplay=":0"
+defaultdisplay=""
 clientargs=""
 serverargs=""
 vtarg=""
@@ -80,6 +80,10 @@ if ! defaults read $X11_PREFS_DOMAIN nol
 defaults write $X11_PREFS_DOMAIN nolisten_tcp -bool true
 fi
 
+if ! defaults read $X11_PREFS_DOMAIN enable_iglx > /dev/null 2>&1 ; then
+defaults write $X11_PREFS_DOMAIN enable_iglx -bool false
+fi
+
 XCOMM First, start caching fonts
 if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then
 if [ -x $bindir/font_cache ] ; then
@@ -91,10 +95,10 @@ if [ x`defaults read $X11_PREFS_DOMAIN c
 fi
 fi
 
-if [ -x XINITDIR/privileged_startx ] ; then
+if [ -x __libexecdir__/privileged_startx ] ; then
 	# Don't push this into the background becasue it can cause
 	# a race to create /tmp/.X11-unix
-	XINITDIR/privileged_startx
+	__libexecdir__/privileged_startx
 fi
 
 if [ x`defaults read $X11_PREFS_DOMAIN no_auth` = x0 ] ; then
@@ -105,6 +109,14 @@ fi
 
 if [ x`defaults read $X11_PREFS_DOMAIN nolisten_tcp` = x1 ] ; then
 defaultserverargs="$defaultserverargs -nolisten tcp"
+else
+defaultserverargs="$defaultserverargs -listen tcp"
+fi
+
+if [ x`defaults read $X11_PREFS_DOMAIN enable_iglx` = x1 ] ; then
+defaultserverargs="$defaultserverargs +iglx"
+else
+defaultserverargs="$defaultserverargs -iglx"
 fi
 
 XCOMM The second check is the real one.  The first is to hopefully avoid
@@ -120,7 +132,7 @@ enable_xauth=1
 XCOMM Automatically determine an unused $DISPLAY
 d=0
 while true ; do
-[ -e /tmp/.X$d-lock ] || break
+[ -e "/tmp/.X$d-lock" -o -S "/tmp/.X11-unix/X$d" ] || break
 d=$(($d + 1))
 done
 defaultdisplay=":$d"
@@ -193,9 +205,9 @@ if [ x"$server" = x ]; then
 XCOMM the startx session being seen as inactive:
 XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491;
 tty=$(tty)
-if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
+if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then
 tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
-vtarg="vt$tty_num"
+vtarg="vt$tty_num -keeptty"
 fi
 #endif
 
@@ -283,7 +295,7 @@ EOF
 
 XCOMM now add the same credentials to the client authority file
 XCOMM if '$displayname' already exists do not overwrite it as another
-XCOMM server man need it. Add them to the '$xserverauthfile' instead.
+XCOMM server may need it. Add them to the '$xserverauthfile' instead.
 for displayname in $authdisplay $hostname$authdisplay; do
 authcookie=`XAUTH list "$displayname" @@
 | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
@@ -326,11 +338,6 @@ if command -v deallocvt > /dev/null 2>&1
 fi
 #endif
 
-#ifdef macII
-Xrepair
-screenrestore
-#endif
-
 #if defined(sun)
 kbd_mode -a
 #endif

Index: xsrc/external/mit/xinit/dist/xinit.c
diff -u xsrc/external/mit/xinit/dist/xinit.c:1.6 xsrc/external/mit/xinit/dist/xinit.c:1.7
--- xsrc/external/mit/xinit/dist/xinit.c:1.6	Wed Jul 22 08:36:10 2015
+++ xsrc/external/mit/xinit/dist/xinit.c	Sun Mar 11 10:46:02 2018
@@ -638,7 +638,7 @@ shutdown(void)
 Fatal("Unable to run program \"%s\"", "kbd_mode");
 break;
 
-case 1:
+case -1:
 Error("fork failed");
 break;
 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 10:45:04 UTC 2018

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

Log Message:
initial import of bdftopcf-1.1

Status:

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

U xsrc/external/mit/bdftopcf/dist/Makefile.am
U xsrc/external/mit/bdftopcf/dist/configure
U xsrc/external/mit/bdftopcf/dist/configure.ac
U xsrc/external/mit/bdftopcf/dist/aclocal.m4
U xsrc/external/mit/bdftopcf/dist/Makefile.in
U xsrc/external/mit/bdftopcf/dist/config.h.in
U xsrc/external/mit/bdftopcf/dist/AUTHORS
U xsrc/external/mit/bdftopcf/dist/COPYING
U xsrc/external/mit/bdftopcf/dist/ChangeLog
U xsrc/external/mit/bdftopcf/dist/INSTALL
U xsrc/external/mit/bdftopcf/dist/README
U xsrc/external/mit/bdftopcf/dist/compile
U xsrc/external/mit/bdftopcf/dist/config.guess
U xsrc/external/mit/bdftopcf/dist/config.sub
U xsrc/external/mit/bdftopcf/dist/depcomp
U xsrc/external/mit/bdftopcf/dist/install-sh
U xsrc/external/mit/bdftopcf/dist/missing
N xsrc/external/mit/bdftopcf/dist/atom.c
N xsrc/external/mit/bdftopcf/dist/bdfint.h
N xsrc/external/mit/bdftopcf/dist/bdfread.c
N xsrc/external/mit/bdftopcf/dist/bdfutils.c
N xsrc/external/mit/bdftopcf/dist/bitmap.c
N xsrc/external/mit/bdftopcf/dist/bitmap.h
N xsrc/external/mit/bdftopcf/dist/bitmaputil.c
N xsrc/external/mit/bdftopcf/dist/bufio.c
N xsrc/external/mit/bdftopcf/dist/bufio.h
N xsrc/external/mit/bdftopcf/dist/config.h
N xsrc/external/mit/bdftopcf/dist/defaults.c
N xsrc/external/mit/bdftopcf/dist/fileio.c
N xsrc/external/mit/bdftopcf/dist/filewr.c
N xsrc/external/mit/bdftopcf/dist/fntfil.h
N xsrc/external/mit/bdftopcf/dist/fntfilio.h
N xsrc/external/mit/bdftopcf/dist/fntfilst.h
N xsrc/external/mit/bdftopcf/dist/font.h
N xsrc/external/mit/bdftopcf/dist/fontaccel.c
N xsrc/external/mit/bdftopcf/dist/fontink.c
N xsrc/external/mit/bdftopcf/dist/fontmisc.h
N xsrc/external/mit/bdftopcf/dist/fontutil.h
N xsrc/external/mit/bdftopcf/dist/fontxlfd.h
N xsrc/external/mit/bdftopcf/dist/pcf.h
N xsrc/external/mit/bdftopcf/dist/pcfwrite.c
N xsrc/external/mit/bdftopcf/dist/private.c
N xsrc/external/mit/bdftopcf/dist/stubs.h
N xsrc/external/mit/bdftopcf/dist/utilbitmap.c
U xsrc/external/mit/bdftopcf/dist/bdftopcf.c
U xsrc/external/mit/bdftopcf/dist/man/Makefile.am
U xsrc/external/mit/bdftopcf/dist/man/Makefile.in
U xsrc/external/mit/bdftopcf/dist/man/bdftopcf.man

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 10:45:05 UTC 2018

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

Log Message:
initial import of xinit-1.4.0

Status:

Vendor Tag: xorg
Release Tags:   xinit-1-4-0

U xsrc/external/mit/xinit/dist/configure.ac
U xsrc/external/mit/xinit/dist/config.h.in
U xsrc/external/mit/xinit/dist/missing
U xsrc/external/mit/xinit/dist/install-sh
U xsrc/external/mit/xinit/dist/depcomp
U xsrc/external/mit/xinit/dist/aclocal.m4
U xsrc/external/mit/xinit/dist/cpprules.in
C xsrc/external/mit/xinit/dist/xinit.c
U xsrc/external/mit/xinit/dist/COPYING
C xsrc/external/mit/xinit/dist/compile
C xsrc/external/mit/xinit/dist/startx.cpp
U xsrc/external/mit/xinit/dist/config.sub
U xsrc/external/mit/xinit/dist/Makefile.in
U xsrc/external/mit/xinit/dist/xinitrc.cpp
U xsrc/external/mit/xinit/dist/ChangeLog
U xsrc/external/mit/xinit/dist/autogen.sh
U xsrc/external/mit/xinit/dist/config.guess
U xsrc/external/mit/xinit/dist/INSTALL
U xsrc/external/mit/xinit/dist/README
U xsrc/external/mit/xinit/dist/configure
U xsrc/external/mit/xinit/dist/Makefile.am
U xsrc/external/mit/xinit/dist/launchd/console_redirect.c
U xsrc/external/mit/xinit/dist/launchd/Makefile.in
U xsrc/external/mit/xinit/dist/launchd/Makefile.am
U xsrc/external/mit/xinit/dist/launchd/console_redirect.h
U 
xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.plist.cpp
U xsrc/external/mit/xinit/dist/launchd/privileged_startx/20-font_cache.cpp
U xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.in
U xsrc/external/mit/xinit/dist/launchd/privileged_startx/client.c
U 
xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx_types.h
U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.defs
U xsrc/external/mit/xinit/dist/launchd/privileged_startx/10-tmpdirs.cpp
U xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.am
U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.c
U xsrc/external/mit/xinit/dist/launchd/privileged_startx/server.c
U xsrc/external/mit/xinit/dist/launchd/user_startx/startx.plist.cpp
U xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.in
U xsrc/external/mit/xinit/dist/launchd/user_startx/launchd_startx.c
U xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.am
U xsrc/external/mit/xinit/dist/man/Makefile.in
U xsrc/external/mit/xinit/dist/man/Makefile.am
U xsrc/external/mit/xinit/dist/man/startx.man
U xsrc/external/mit/xinit/dist/man/xinit.man

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 10:37:32 UTC 2018

Modified Files:
xsrc/external/mit/libpciaccess/dist/m4: libtool.m4
xsrc/external/mit/libpciaccess/dist/src: netbsd_pci.c

Log Message:
merge libpciaccess 0.14.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

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

Modified files:

Index: xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
diff -u xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.5 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.6
--- xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.5	Tue Aug 29 05:52:34 2017
+++ xsrc/external/mit/libpciaccess/dist/m4/libtool.m4	Sun Mar 11 10:37:32 2018
@@ -2867,6 +2867,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Ideally, we could use ldconfig to report *all* directores which are
   # searched for libraries, however this is still not possible.  Aside from not
   # being certain /sbin/ldconfig is available, command
@@ -2875,7 +2878,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
   # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on

Index: xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.16 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.17
--- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.16	Sat Sep 24 23:14:21 2016
+++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c	Sun Mar 11 10:37:32 2018
@@ -973,6 +973,10 @@ pci_system_netbsd_create(void)
 	continue;
 
 device->base.domain = domain;
+if (domain > 0x)
+device->base.domain_16 = 0x;
+else
+device->base.domain_16 = domain & 0x;
 device->base.bus = bus;
 device->base.dev = dev;
 device->base.func = func;

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 10:36:38 UTC 2018

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

Log Message:
initial import of libxshmfence-1.3

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 10:36:35 UTC 2018

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

Log Message:
initial import of libpciaccess-0.14

Status:

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

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

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

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

CVS commit: src/external/mit/xorg

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 10:17:10 UTC 2018

Modified Files:
src/external/mit/xorg/bin/xfs: Makefile
src/external/mit/xorg/lib/libXfont2: Makefile

Log Message:
fix libXfont2 sources list.  update for xfs 1.2.0.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/bin/xfs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXfont2/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/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.13 src/external/mit/xorg/bin/xfs/Makefile:1.14
--- src/external/mit/xorg/bin/xfs/Makefile:1.13	Sat Mar  3 03:34:17 2018
+++ src/external/mit/xorg/bin/xfs/Makefile	Sun Mar 11 10:17:10 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2018/03/03 03:34:17 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2018/03/11 10:17:10 mrg Exp $
 
 .include 
 
@@ -19,8 +19,6 @@ SRCS+=	access.c config.c connection.c da
 
 CPPFLAGS+=		-I${XFSDIR}/include \
 			-I${DESTDIR}${X11INCDIR}/X11/FS \
-			-I${X11SRCDIR.libXfont}/include \
-			-I${X11SRCDIR.libXfont}/bitmap \
 			-I${XFSDIR}/../include \
 			-DHAVE_DAEMON
 
@@ -59,7 +57,7 @@ FILESNAME=	config
 FILESDIR=	${XFSCONFIGDIR}
 
 
-LDADD+=	-lXfont -lfontenc -lXext -lX11 -lfreetype -lm -lz
+LDADD+=	-lXfont2 -lfontenc -lXext -lX11 -lfreetype -lm -lz
 DPADD+=	${LIBXFONT} ${LIBFONTENC} ${LIBXEXT} ${LIBX11} \
 	${LIBFREETYPE} ${LIBM} ${LIBZ}
 

Index: src/external/mit/xorg/lib/libXfont2/Makefile
diff -u src/external/mit/xorg/lib/libXfont2/Makefile:1.1 src/external/mit/xorg/lib/libXfont2/Makefile:1.2
--- src/external/mit/xorg/lib/libXfont2/Makefile:1.1	Sun Mar 11 09:43:38 2018
+++ src/external/mit/xorg/lib/libXfont2/Makefile	Sun Mar 11 10:17:10 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2018/03/11 09:43:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2018/03/11 10:17:10 mrg Exp $
 
 .include 
 
@@ -55,15 +55,24 @@ SRCS.FreeType=	\
 .PATH:	${XFONT2DIR}/src/FreeType
 
 SRCS.bitmap=	\
-	ftenc.c \
-	ftfuncs.c \
-	fttools.c \
-	xttcap.c \
+	bitmap.c \
+	bitmapfunc.c \
+	bitmaputil.c \
+	bitscale.c \
+	fontink.c \
+	bitmap.c \
+	bitmapfunc.c \
+	bitmaputil.c \
+	bitscale.c \
+	fontink.c \
 	bdfread.c \
 	bdfutils.c \
-	pcfread.c \
+	pcfread.c
+.if 0
+SRCS.bitmap+=	\
 	pcfwrite.c \
 	snfread.c
+.endif
 .PATH:	${XFONT2DIR}/src/bitmap
 
 SRCS.builtins=	\

CVS commit: src/tools/compat

[Hans Rosenfeld]

Module Name:src
Committed By:   hans
Date:   Sun Mar 11 10:14:04 UTC 2018

Modified Files:
src/tools/compat: regex.h

Log Message:
Fix build of tools/lex on platforms lacking sys/cdefs.h by including
nbtool_config.h in tools/compat/regex.h. Tested on illumos.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tools/compat/regex.h

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

Modified files:

Index: src/tools/compat/regex.h
diff -u src/tools/compat/regex.h:1.3 src/tools/compat/regex.h:1.4
--- src/tools/compat/regex.h:1.3	Sun Mar  6 10:22:59 2016
+++ src/tools/compat/regex.h	Sun Mar 11 10:14:04 2018
@@ -1,3 +1,4 @@
-/*	$NetBSD: regex.h,v 1.3 2016/03/06 10:22:59 aymeric Exp $ */
+/*	$NetBSD: regex.h,v 1.4 2018/03/11 10:14:04 hans Exp $ */
 
+#include "nbtool_config.h"
 #include "../../include/regex.h"

CVS commit: xsrc/external/mit/xfs

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 10:08:03 UTC 2018

Modified Files:
xsrc/external/mit/xfs/dist/os: connection.c io.c xfstrans.c
xsrc/external/mit/xfs/include: config.h

Log Message:
merge xfs 1.2.0.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xfs/dist/os/connection.c \
xsrc/external/mit/xfs/dist/os/io.c \
xsrc/external/mit/xfs/dist/os/xfstrans.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfs/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/xfs/dist/os/connection.c
diff -u xsrc/external/mit/xfs/dist/os/connection.c:1.2 xsrc/external/mit/xfs/dist/os/connection.c:1.3
--- xsrc/external/mit/xfs/dist/os/connection.c:1.2	Fri Jul 17 17:38:55 2015
+++ xsrc/external/mit/xfs/dist/os/connection.c	Sun Mar 11 10:08:03 2018
@@ -69,6 +69,7 @@ in this Software without prior written a
 
 #include	"config.h"
 
+/* include Xpoll.h early for possible FD_SETSIZE re-definition */
 #include	"X11/Xpoll.h"
 #include	
 #include	
Index: xsrc/external/mit/xfs/dist/os/io.c
diff -u xsrc/external/mit/xfs/dist/os/io.c:1.2 xsrc/external/mit/xfs/dist/os/io.c:1.3
--- xsrc/external/mit/xfs/dist/os/io.c:1.2	Sat Jul 18 06:03:20 2015
+++ xsrc/external/mit/xfs/dist/os/io.c	Sun Mar 11 10:08:03 2018
@@ -50,6 +50,9 @@ in this Software without prior written a
 
 #include	"config.h"
 
+/* include Xpoll.h early for possible FD_SETSIZE re-definition */
+#include	"X11/Xpoll.h"
+
 #include	
 #include	
 #include	
Index: xsrc/external/mit/xfs/dist/os/xfstrans.c
diff -u xsrc/external/mit/xfs/dist/os/xfstrans.c:1.2 xsrc/external/mit/xfs/dist/os/xfstrans.c:1.3
--- xsrc/external/mit/xfs/dist/os/xfstrans.c:1.2	Wed Sep 21 22:11:16 2016
+++ xsrc/external/mit/xfs/dist/os/xfstrans.c	Sun Mar 11 10:08:03 2018
@@ -30,12 +30,18 @@
 
 #ifdef XFS_INETD
 /* xfs special handling for listen socket passed from inetd */
-#include "misc.h"
+
+/* XXX duplicated from misc.h */
+typedef struct {		/* when cloning, need old transport info */
+int trans_id;
+int fd;
+int portnum;
+} OldListenRec;
 
 OldListenRec *
 TRANS(GetInetdListenInfo) (int fd)
 {
-char *port = "0";
+const char *port = "0";
 XtransConnInfo inetdCI;
 OldListenRec *old_listen;
 int portnum;
@@ -79,10 +85,7 @@ TRANS(GetInetdListenInfo) (int fd)
 #endif
 
 if (listen (fd, BACKLOG) < 0)
-{
-	FatalError("listen() failed on inetd socket: %s\n",
-		   strerror(errno));
-}
+return NULL;
 
 /* Pass the inetd socket back through the connection setup code
  * the same way as a cloned listening port

Index: xsrc/external/mit/xfs/include/config.h
diff -u xsrc/external/mit/xfs/include/config.h:1.3 xsrc/external/mit/xfs/include/config.h:1.4
--- xsrc/external/mit/xfs/include/config.h:1.3	Thu Sep 22 15:50:17 2016
+++ xsrc/external/mit/xfs/include/config.h	Sun Mar 11 10:08:03 2018
@@ -61,7 +61,7 @@
 #define PACKAGE_NAME "xfs"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xfs 1.1.4"
+#define PACKAGE_STRING "xfs 1.2.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xfs"
@@ -70,16 +70,16 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.4"
+#define PACKAGE_VERSION "1.2.0"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
 
 /* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 1
+#define PACKAGE_VERSION_MINOR 2
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 4
+#define PACKAGE_VERSION_PATCHLEVEL 0
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -116,7 +116,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.1.4"
+#define VERSION "1.2.0"
 
 /* Build support for starting from inetd */
 #define XFS_INETD 1

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 10:06:01 UTC 2018

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

Log Message:
initial import of xlsfonts-1.0.6

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 10:06:00 UTC 2018

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

Log Message:
initial import of xfs-1.2.0

Status:

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

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 09:59:14 UTC 2018

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

Log Message:
merge xprop 1.2.3


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xprop/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/xprop/include/config.h
diff -u xsrc/external/mit/xprop/include/config.h:1.5 xsrc/external/mit/xprop/include/config.h:1.6
--- xsrc/external/mit/xprop/include/config.h:1.5	Mon Mar 17 10:03:19 2014
+++ xsrc/external/mit/xprop/include/config.h	Sun Mar 11 09:59:14 2018
@@ -47,7 +47,7 @@
 #define PACKAGE_NAME "xprop"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xprop 1.2.2"
+#define PACKAGE_STRING "xprop 1.2.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xprop"
@@ -56,7 +56,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.2"
+#define PACKAGE_VERSION "1.2.3"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -65,10 +65,10 @@
 #define PACKAGE_VERSION_MINOR 2
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 2
+#define PACKAGE_VERSION_PATCHLEVEL 3
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.2.2"
+#define VERSION "1.2.3"

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 09:58:37 UTC 2018

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

Log Message:
initial import of xprop-1.2.3

Status:

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

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

No conflicts created by this import

CVS commit: src/share/mk

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 09:56:44 UTC 2018

Modified Files:
src/share/mk: bsd.README bsd.prog.mk

Log Message:
define LIBXFONT2.


To generate a diff of this commit:
cvs rdiff -u -r1.368 -r1.369 src/share/mk/bsd.README
cvs rdiff -u -r1.311 -r1.312 src/share/mk/bsd.prog.mk

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

Modified files:

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.368 src/share/mk/bsd.README:1.369
--- src/share/mk/bsd.README:1.368	Sun Mar 11 07:18:49 2018
+++ src/share/mk/bsd.README	Sun Mar 11 09:56:44 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.368 2018/03/11 07:18:49 mrg Exp $
+#	$NetBSD: bsd.README,v 1.369 2018/03/11 09:56:44 mrg Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -1677,6 +1677,7 @@ DPADD		Additional dependencies for the p
 		LIBXDMCP?=	${DESTDIR}/usr/X11R7/lib/libXdmcp.a
 		LIBXEXT?=	${DESTDIR}/usr/X11R7/lib/libXext.a
 		LIBXFONT?=	${DESTDIR}/usr/X11R7/lib/libXfont.a
+		LIBXFONT2?=	${DESTDIR}/usr/X11R7/lib/libXfont2.a
 		LIBXFT?=	${DESTDIR}/usr/X11R7/lib/libXft.a
 		LIBXI?=		${DESTDIR}/usr/X11R7/lib/libXi.a
 		LIBXINERAMA?=	${DESTDIR}/usr/X11R7/lib/libXinerama.a

Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.311 src/share/mk/bsd.prog.mk:1.312
--- src/share/mk/bsd.prog.mk:1.311	Sun Feb 25 00:16:48 2018
+++ src/share/mk/bsd.prog.mk	Sun Mar 11 09:56:44 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.311 2018/02/25 00:16:48 mrg Exp $
+#	$NetBSD: bsd.prog.mk,v 1.312 2018/03/11 09:56:44 mrg Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -260,6 +260,7 @@ PAM_STATIC_DPADD=
 	Xaw \
 	Xdmcp \
 	Xext \
+	Xfont2 \
 	Xfont \
 	Xft \
 	Xi \

CVS commit: xsrc/external/mit/libXres/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 09:54:07 UTC 2018

Modified Files:
xsrc/external/mit/libXres/dist/src: XRes.c

Log Message:
merge libXres 1.2.0.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXres/dist/src/XRes.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/libXres/dist/src/XRes.c
diff -u xsrc/external/mit/libXres/dist/src/XRes.c:1.3 xsrc/external/mit/libXres/dist/src/XRes.c:1.4
--- xsrc/external/mit/libXres/dist/src/XRes.c:1.3	Mon Jun  3 04:37:59 2013
+++ xsrc/external/mit/libXres/dist/src/XRes.c	Sun Mar 11 09:54:07 2018
@@ -12,19 +12,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
-#ifndef HAVE__XEATDATAWORDS
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
-if (n >= (ULONG_MAX >> 2))
-_XIOError(dpy);
-# endif
-_XEatData (dpy, n << 2);
-}
-#endif
-
 static XExtensionInfo _xres_ext_info_data;
 static XExtensionInfo *xres_ext_info = &_xres_ext_info_data;
 static const char *xres_extension_name = XRES_NAME;
@@ -239,7 +229,7 @@ Status XResQueryClientPixmapBytes (
 }
 
 #ifdef LONG64
-*bytes = (rep.bytes_overflow * 4294967295) + rep.bytes;
+*bytes = (rep.bytes_overflow * 4294967296UL) + rep.bytes;
 #else
 *bytes = rep.bytes_overflow ? 0x : rep.bytes;
 #endif
@@ -249,3 +239,227 @@ Status XResQueryClientPixmapBytes (
 return 1;
 }
 
+static Bool ReadClientValues(
+   Display  *dpy,
+   long num_ids,
+   XResClientIdValue   *client_ids /* out */
+)
+{
+int c;
+for (c = 0; c < num_ids; ++c) {
+XResClientIdValue* client = client_ids + c;
+long int value;
+_XRead32 (dpy, , 4);
+client->spec.client = value;
+_XRead32 (dpy, , 4);
+client->spec.mask = value;
+_XRead32 (dpy, , 4);
+client->length = value;
+client->value = malloc(client->length);
+_XRead32 (dpy, client->value, client->length);
+}
+return True;
+}
+
+Status XResQueryClientIds (
+   Display*dpy,
+   longnum_specs,
+   XResClientIdSpec   *client_specs,   /* in */
+   long   *num_ids,/* out */
+   XResClientIdValue **client_ids  /* out */
+)
+{
+XExtDisplayInfo *info = find_display (dpy);
+xXResQueryClientIdsReq *req;
+xXResQueryClientIdsReply rep;
+int c;
+
+*num_ids = 0;
+
+XResCheckExtension (dpy, info, 0);
+LockDisplay (dpy);
+GetReq (XResQueryClientIds, req);
+req->reqType = info->codes->major_opcode;
+req->XResReqType = X_XResQueryClientIds;
+req->length += num_specs * 2; /* 2 longs per client id spec */
+req->numSpecs = num_specs;
+
+for (c = 0; c < num_specs; ++c) {
+Data32(dpy, _specs[c].client, 4);
+Data32(dpy, _specs[c].mask, 4);
+}
+
+if (!_XReply (dpy, (xReply *) , 0, xFalse)) {
+goto error;
+}
+
+*client_ids = calloc(rep.numIds, sizeof(**client_ids));
+*num_ids = rep.numIds;
+
+if (!ReadClientValues(dpy, *num_ids, *client_ids)) {
+goto error;
+}
+
+UnlockDisplay (dpy);
+SyncHandle ();
+return Success;
+
+ error:
+XResClientIdsDestroy (*num_ids, *client_ids);
+*client_ids = NULL;
+
+UnlockDisplay (dpy);
+SyncHandle ();
+return !Success;
+}
+
+void XResClientIdsDestroy (
+   longnum_ids,
+   XResClientIdValue  *client_ids
+)
+{
+int c;
+for (c = 0; c < num_ids; ++c) {
+free(client_ids[c].value);
+}
+free(client_ids);
+}
+
+XResClientIdType XResGetClientIdType(
+XResClientIdValue* value
+)
+{
+int bit;
+XResClientIdType idType = 0;
+Bool found = False;
+for (bit = 0; bit < XRES_CLIENT_ID_NR; ++bit) {
+if (value->spec.mask & (1 << bit)) {
+assert(!found);
+found = True;
+idType = bit;
+}
+}
+
+assert(found);
+
+return idType;
+}
+
+pid_t XResGetClientPid(
+XResClientIdValue* value
+)
+{
+if (value->spec.mask & XRES_CLIENT_ID_PID_MASK && value->length >= 4) {
+return (pid_t) * (CARD32*) value->value;
+} else {
+return (pid_t) -1;
+}
+}
+
+static Status ReadResourceSizeSpec(
+   Display   *dpy,
+   XResResourceSizeSpec  *size
+)
+{
+long int value;
+_XRead32(dpy, , 4);
+size->spec.resource = value;
+_XRead32(dpy, , 4);
+size->spec.type = value;
+_XRead32(dpy, , 4);
+size->bytes = value;
+_XRead32(dpy, , 4);
+size->ref_count = value;
+_XRead32(dpy, , 4);
+size->use_count = value;
+return 0;
+}
+
+static Status ReadResourceSizeValues(
+   Display*dpy,
+   longnum_sizes,
+   XResResourceSizeValue  *sizes)
+{
+int c;
+int d;
+for (c = 0; c < num_sizes; ++c) {
+long int num;
+

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 09:47:20 UTC 2018

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

Log Message:
initial import of libXres-1.2.0

Status:

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

U xsrc/external/mit/libXres/dist/Makefile.am
U xsrc/external/mit/libXres/dist/configure
U xsrc/external/mit/libXres/dist/configure.ac
U xsrc/external/mit/libXres/dist/aclocal.m4
U xsrc/external/mit/libXres/dist/Makefile.in
U xsrc/external/mit/libXres/dist/config.h.in
U xsrc/external/mit/libXres/dist/xres.pc.in
U xsrc/external/mit/libXres/dist/AUTHORS
U xsrc/external/mit/libXres/dist/COPYING
U xsrc/external/mit/libXres/dist/ChangeLog
U xsrc/external/mit/libXres/dist/INSTALL
U xsrc/external/mit/libXres/dist/README
N xsrc/external/mit/libXres/dist/compile
U xsrc/external/mit/libXres/dist/config.guess
U xsrc/external/mit/libXres/dist/config.sub
U xsrc/external/mit/libXres/dist/install-sh
U xsrc/external/mit/libXres/dist/ltmain.sh
U xsrc/external/mit/libXres/dist/missing
U xsrc/external/mit/libXres/dist/depcomp
U xsrc/external/mit/libXres/dist/src/Makefile.am
U xsrc/external/mit/libXres/dist/src/Makefile.in
C xsrc/external/mit/libXres/dist/src/XRes.c
U xsrc/external/mit/libXres/dist/include/X11/extensions/XRes.h
U xsrc/external/mit/libXres/dist/man/Makefile.am
U xsrc/external/mit/libXres/dist/man/Makefile.in
U xsrc/external/mit/libXres/dist/man/XRes.man
U xsrc/external/mit/libXres/dist/man/XResQueryClientResources.man
U xsrc/external/mit/libXres/dist/man/XResQueryExtension.man
U xsrc/external/mit/libXres/dist/man/XResQueryVersion.man
U xsrc/external/mit/libXres/dist/man/XResQueryClients.man
U xsrc/external/mit/libXres/dist/man/XResQueryClientPixmapBytes.man

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 09:47:17 UTC 2018

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

Log Message:
initial import of libXfont-1.5.4

Status:

Vendor Tag: xorg
Release Tags:   libXfont-1-5-4

U xsrc/external/mit/libXfont/dist/install-sh
U xsrc/external/mit/libXfont/dist/config.guess
U xsrc/external/mit/libXfont/dist/depcomp
U xsrc/external/mit/libXfont/dist/aclocal.m4
U xsrc/external/mit/libXfont/dist/missing
U xsrc/external/mit/libXfont/dist/COPYING
U xsrc/external/mit/libXfont/dist/INSTALL
U xsrc/external/mit/libXfont/dist/ChangeLog
U xsrc/external/mit/libXfont/dist/README
U xsrc/external/mit/libXfont/dist/xfont.pc.in
U xsrc/external/mit/libXfont/dist/config.h.in
U xsrc/external/mit/libXfont/dist/AUTHORS
U xsrc/external/mit/libXfont/dist/configure
U xsrc/external/mit/libXfont/dist/compile
U xsrc/external/mit/libXfont/dist/Makefile.am
U xsrc/external/mit/libXfont/dist/config.sub
U xsrc/external/mit/libXfont/dist/devbook.am
U xsrc/external/mit/libXfont/dist/Makefile.in
U xsrc/external/mit/libXfont/dist/configure.ac
U xsrc/external/mit/libXfont/dist/ltmain.sh
U xsrc/external/mit/libXfont/dist/doc/Makefile.am
U xsrc/external/mit/libXfont/dist/doc/fontlib.xml
U xsrc/external/mit/libXfont/dist/doc/Makefile.in
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontxlfd.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/pcf.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/bdfint.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/bitmap.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontconf.h.in
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontmisc.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontshow.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilio.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontutil.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/bufio.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontencc.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilst.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfil.h
U xsrc/external/mit/libXfont/dist/src/Makefile.am
U xsrc/external/mit/libXfont/dist/src/dummy.c
U xsrc/external/mit/libXfont/dist/src/Makefile.in
U xsrc/external/mit/libXfont/dist/src/fontfile/fontdir.c
U xsrc/external/mit/libXfont/dist/src/fontfile/gunzip.c
U xsrc/external/mit/libXfont/dist/src/fontfile/fontfile.c
U xsrc/external/mit/libXfont/dist/src/fontfile/fontscale.c
U xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c
U xsrc/external/mit/libXfont/dist/src/fontfile/register.c
U xsrc/external/mit/libXfont/dist/src/fontfile/defaults.c
U xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c
U xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c
U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in
U xsrc/external/mit/libXfont/dist/src/fontfile/catalogue.c
U xsrc/external/mit/libXfont/dist/src/fontfile/renderers.c
U xsrc/external/mit/libXfont/dist/src/fontfile/fontencc.c
U xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c
U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.am
U xsrc/external/mit/libXfont/dist/src/fontfile/bitsource.c
U xsrc/external/mit/libXfont/dist/src/fontfile/bufio.c
U xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c
U xsrc/external/mit/libXfont/dist/src/util/utilbitmap.c
U xsrc/external/mit/libXfont/dist/src/util/fontutil.c
U xsrc/external/mit/libXfont/dist/src/util/atom.c
U xsrc/external/mit/libXfont/dist/src/util/Makefile.am
U xsrc/external/mit/libXfont/dist/src/util/fontaccel.c
U xsrc/external/mit/libXfont/dist/src/util/patcache.c
U xsrc/external/mit/libXfont/dist/src/util/format.c
U xsrc/external/mit/libXfont/dist/src/util/Makefile.in
U xsrc/external/mit/libXfont/dist/src/util/private.c
U xsrc/external/mit/libXfont/dist/src/util/fontxlfd.c
U xsrc/external/mit/libXfont/dist/src/util/fontnames.c
U xsrc/external/mit/libXfont/dist/src/util/miscutil.c
U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.am
U xsrc/external/mit/libXfont/dist/src/builtins/file.c
U xsrc/external/mit/libXfont/dist/src/builtins/fonts.c
U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in
U xsrc/external/mit/libXfont/dist/src/builtins/render.c
U xsrc/external/mit/libXfont/dist/src/builtins/buildfont
U xsrc/external/mit/libXfont/dist/src/builtins/fpe.c
U xsrc/external/mit/libXfont/dist/src/builtins/builtin.h
U xsrc/external/mit/libXfont/dist/src/builtins/dir.c
U xsrc/external/mit/libXfont/dist/src/fc/fslibos.h
U xsrc/external/mit/libXfont/dist/src/fc/fserve.h
U xsrc/external/mit/libXfont/dist/src/fc/fsio.h
U xsrc/external/mit/libXfont/dist/src/fc/Makefile.in
U xsrc/external/mit/libXfont/dist/src/fc/Makefile.am
U xsrc/external/mit/libXfont/dist/src/fc/fstrans.c
U xsrc/external/mit/libXfont/dist/src/fc/fsio.c
U xsrc/external/mit/libXfont/dist/src/fc/fserve.c
U xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c
U xsrc/external/mit/libXfont/dist/src/fc/fservestr.h

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 09:47:13 UTC 2018

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

Log Message:
initial import of libXcursor-1.1.15

Status:

Vendor Tag: xorg
Release Tags:   libXcursor-1-1-15

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

No conflicts created by this import

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 09:43:39 UTC 2018

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/external/mit/xorg/lib: Makefile
Added Files:
src/external/mit/xorg/lib/libXfont2: Makefile

Log Message:
build and install libXfont2.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.193 -r1.194 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.41 -r1.42 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXfont2/Makefile

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

Modified files:

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.80 src/distrib/sets/lists/xbase/shl.mi:1.81
--- src/distrib/sets/lists/xbase/shl.mi:1.80	Sun Mar 11 07:18:49 2018
+++ src/distrib/sets/lists/xbase/shl.mi	Sun Mar 11 09:43:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.80 2018/03/11 07:18:49 mrg Exp $
+# $NetBSD: shl.mi,v 1.81 2018/03/11 09:43:39 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -89,6 +89,9 @@
 ./usr/X11R7/lib/libXfixes.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXfixes.so.4			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXfixes.so.4.0		-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libXfont2.so			-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libXfont2.so.2			-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libXfont2.so.2.0		-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXfont.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXfont.so.3			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXfont.so.3.0			-unknown-		xorg,compatx11file

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.193 src/distrib/sets/lists/xcomp/mi:1.194
--- src/distrib/sets/lists/xcomp/mi:1.193	Sun Mar 11 07:18:49 2018
+++ src/distrib/sets/lists/xcomp/mi	Sun Mar 11 09:43:39 2018
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.193 2018/03/11 07:18:49 mrg Exp $
+#	 $NetBSD: mi,v 1.194 2018/03/11 09:43:39 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -516,6 +516,7 @@
 ./usr/X11R7/include/X11/fonts/fsmasks.h			-unknown-	xorg
 ./usr/X11R7/include/X11/fonts/ft.h			-unknown-	xorg
 ./usr/X11R7/include/X11/fonts/ftfuncs.h			-unknown-	xorg
+./usr/X11R7/include/X11/fonts/libxfont2.h		-unknown-	xorg
 ./usr/X11R7/include/X11/fonts/pcf.h			-unknown-	xorg
 ./usr/X11R7/include/X11/keysym.h			-unknown-	xorg
 ./usr/X11R7/include/X11/keysymdef.h			-unknown-	xorg
@@ -1136,6 +1137,8 @@
 ./usr/X11R7/lib/libXext_p.a-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXfixes.a-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXfixes_p.a-unknown-	profile,xorg,compatx11file
+./usr/X11R7/lib/libXfont2.a-unknown-	xorg,compatx11file
+./usr/X11R7/lib/libXfont2_p.a-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXfont.a-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXfont_p.a-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXfontcache.a-unknown-	obsolete
@@ -1389,6 +1392,7 @@
 ./usr/X11R7/lib/pkgconfig/xf86miscproto.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xf86vidmodeproto.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xfixes.pc			-unknown-	xorg
+./usr/X11R7/lib/pkgconfig/xfont2.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xfont.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xfontcache.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xft.pc			-unknown-	xorg

Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.49 src/distrib/sets/lists/xcomp/shl.mi:1.50
--- src/distrib/sets/lists/xcomp/shl.mi:1.49	Sun Mar 11 07:18:49 2018
+++ src/distrib/sets/lists/xcomp/shl.mi	Sun Mar 11 09:43:39 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: shl.mi,v 1.49 2018/03/11 07:18:49 mrg Exp $
+#	$NetBSD: shl.mi,v 1.50 2018/03/11 09:43:39 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -24,6 +24,7 @@
 ./usr/X11R7/lib/libXevie_pic.a-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libXext_pic.a-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libXfixes_pic.a-unknown-	xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXfont2_pic.a-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libXfont_pic.a-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libXfontcache_pic.a			-unknown-	obsolete
 ./usr/X11R7/lib/libXft_pic.a-unknown-	xorg,picinstall,compatx11file

Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.27 

CVS commit: [pgoyette-compat] src/doc

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 11 09:34:59 UTC 2018

Modified Files:
src/doc [pgoyette-compat]: COMPAT-branch-notes

Log Message:
Don't forget about validating/correcting compat module dependencies


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/COMPAT-branch-notes

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

Modified files:

Index: src/doc/COMPAT-branch-notes
diff -u src/doc/COMPAT-branch-notes:1.1.2.1 src/doc/COMPAT-branch-notes:1.1.2.2
--- src/doc/COMPAT-branch-notes:1.1.2.1	Sat Mar 10 05:14:26 2018
+++ src/doc/COMPAT-branch-notes	Sun Mar 11 09:34:59 2018
@@ -43,3 +43,7 @@ TODO
per-version compat_xx module, each with dependencies on all higher
versions.  (Perhaps we would also do this for the sysv ipc module,
although the gains are a lot smaller.)
+
+4. Reconfirm all compat-module dependencies, and update the files *
+   def lines as needed, to insure that built-in dependencies get
+   resolved.

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 09:29:01 UTC 2018

Added Files:
xsrc/external/mit/libXfont2/include: config.h

Log Message:
config.h is needed for libXfont2.


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

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

Added files:

Index: xsrc/external/mit/libXfont2/include/config.h
diff -u /dev/null xsrc/external/mit/libXfont2/include/config.h:1.1
--- /dev/null	Sun Mar 11 09:29:01 2018
+++ xsrc/external/mit/libXfont2/include/config.h	Sun Mar 11 09:29:01 2018
@@ -0,0 +1,173 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */
+#define BSD44SOCKETS 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the  header file. */
+/* #undef HAVE_ENDIAN_H */
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
+/* #undef HAVE_LIBWS2_32 */
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_POLL_H 1
+
+/* Define to 1 if you have the `readlink' function. */
+#define HAVE_READLINK 1
+
+/* Define to 1 if the system has the type `socklen_t'. */
+#define HAVE_SOCKLEN_T 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_SYS_POLL_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_UNISTD_H 1
+
+/* Support IPv6 for TCP connections */
+#define IPv6 1
+
+/* Support os-specific local connections */
+/* #undef LOCALCONN */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libXfont2"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg;
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libXfont2"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libXfont2 2.0.3"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libXfont2"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "2.0.3"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR 2
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR 0
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL 3
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Support TCP socket connections */
+#define TCPCONN 1
+
+/* Support UNIX socket connections */
+#define UNIXCONN 1
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Version number of package */
+#define VERSION "2.0.3"
+
+/* Support bdf format bitmap font files */
+#define XFONT_BDFFORMAT 1
+
+/* Support bitmap font files */
+#define XFONT_BITMAP 1
+
+/* Support built-in fonts */
+#define XFONT_BUILTINS 1
+
+/* Support the X Font Services Protocol */
+#define XFONT_FC 1
+
+/* Support fonts in files */
+#define XFONT_FONTFILE 1
+
+/* Support FreeType rasterizer for nearly all font file formats */
+#define XFONT_FREETYPE 1
+
+/* Support pcf format bitmap font files */
+#define XFONT_PCFFORMAT 1
+
+/* Support snf format bitmap font files */
+/* #undef XFONT_SNFFORMAT */
+
+/* Support bzip2 for bitmap fonts */
+/* #undef X_BZIP2_FONT_COMPRESSION */
+
+/* Support gzip for bitmap fonts */
+#define X_GZIP_FONT_COMPRESSION 1
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 09:06:45 UTC 2018

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

Log Message:
initial import of libXfont2-2.0.3

Status:

Vendor Tag: xorg
Release Tags:   libXfont2-2-0-3

U xsrc/external/mit/libXfont2/dist/ltmain.sh
U xsrc/external/mit/libXfont2/dist/Makefile.in
U xsrc/external/mit/libXfont2/dist/missing
U xsrc/external/mit/libXfont2/dist/depcomp
U xsrc/external/mit/libXfont2/dist/COPYING
U xsrc/external/mit/libXfont2/dist/install-sh
U xsrc/external/mit/libXfont2/dist/aclocal.m4
U xsrc/external/mit/libXfont2/dist/Makefile.am
U xsrc/external/mit/libXfont2/dist/AUTHORS
U xsrc/external/mit/libXfont2/dist/compile
U xsrc/external/mit/libXfont2/dist/config.guess
U xsrc/external/mit/libXfont2/dist/configure.ac
U xsrc/external/mit/libXfont2/dist/ChangeLog
U xsrc/external/mit/libXfont2/dist/config.h.in
U xsrc/external/mit/libXfont2/dist/README
U xsrc/external/mit/libXfont2/dist/configure
U xsrc/external/mit/libXfont2/dist/config.sub
U xsrc/external/mit/libXfont2/dist/devbook.am
U xsrc/external/mit/libXfont2/dist/xfont2.pc.in
U xsrc/external/mit/libXfont2/dist/INSTALL
U xsrc/external/mit/libXfont2/dist/doc/Makefile.am
U xsrc/external/mit/libXfont2/dist/doc/fontlib.xml
U xsrc/external/mit/libXfont2/dist/doc/Makefile.in
U xsrc/external/mit/libXfont2/dist/include/libxfontint.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fntfilst.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fntfil.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fontencc.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fontutil.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fontshow.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fntfilio.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fontmisc.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fontxlfd.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/bufio.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/bdfint.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/bitmap.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/libxfont2.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/pcf.h
U xsrc/external/mit/libXfont2/dist/src/fontfile/register.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontscale.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/defaults.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bufio.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/dirfile.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/filewr.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontfile.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontdir.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/decompress.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bunzip2.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/catalogue.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/gunzip.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/renderers.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontencc.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fileio.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bitsource.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfread.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/snfstr.h
U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfread.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmap.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitscale.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/snfread.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfwrite.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmaputil.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfutils.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/fontink.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmapfunc.c
U xsrc/external/mit/libXfont2/dist/src/fc/fslibos.h
U xsrc/external/mit/libXfont2/dist/src/fc/fserve.c
U xsrc/external/mit/libXfont2/dist/src/fc/fsio.c
U xsrc/external/mit/libXfont2/dist/src/fc/fservestr.h
U xsrc/external/mit/libXfont2/dist/src/fc/fsconvert.c
U xsrc/external/mit/libXfont2/dist/src/fc/fstrans.c
U xsrc/external/mit/libXfont2/dist/src/fc/fserve.h
U xsrc/external/mit/libXfont2/dist/src/fc/fsio.h
U xsrc/external/mit/libXfont2/dist/src/builtins/builtin.h
U xsrc/external/mit/libXfont2/dist/src/builtins/render.c
U xsrc/external/mit/libXfont2/dist/src/builtins/fpe.c
U xsrc/external/mit/libXfont2/dist/src/builtins/file.c
U xsrc/external/mit/libXfont2/dist/src/builtins/dir.c
U xsrc/external/mit/libXfont2/dist/src/builtins/buildfont
U xsrc/external/mit/libXfont2/dist/src/builtins/fonts.c
U xsrc/external/mit/libXfont2/dist/src/stubs/libxfontstubs.c
U xsrc/external/mit/libXfont2/dist/src/stubs/atom.c
U xsrc/external/mit/libXfont2/dist/src/FreeType/xttcap.h
U xsrc/external/mit/libXfont2/dist/src/FreeType/ft.h
U xsrc/external/mit/libXfont2/dist/src/FreeType/ftfuncs.h
U xsrc/external/mit/libXfont2/dist/src/FreeType/fttools.c
U 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 09:03:04 UTC 2018

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

Log Message:
use xorg-pkg-ver.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xwd/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/xwd/Makefile
diff -u src/external/mit/xorg/bin/xwd/Makefile:1.4 src/external/mit/xorg/bin/xwd/Makefile:1.5
--- src/external/mit/xorg/bin/xwd/Makefile:1.4	Mon Mar 17 10:09:18 2014
+++ src/external/mit/xorg/bin/xwd/Makefile	Sun Mar 11 09:03:04 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2014/03/17 10:09:18 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2018/03/11 09:03:04 mrg Exp $
 
 .include 
 
@@ -14,5 +14,7 @@ DPADD+=	${LIBXMUU} ${LIBXT} ${LIBSM} ${L
 .PATH:	${X11SRCDIR.${PROG}}
 .PATH:	${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include 
 .include 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 08:59:52 UTC 2018

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

Log Message:
use xorg-pkg-ver.mk


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xwud/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/xwud/Makefile
diff -u src/external/mit/xorg/bin/xwud/Makefile:1.2 src/external/mit/xorg/bin/xwud/Makefile:1.3
--- src/external/mit/xorg/bin/xwud/Makefile:1.2	Wed Jul 22 08:46:51 2015
+++ src/external/mit/xorg/bin/xwud/Makefile	Sun Mar 11 08:59:52 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/07/22 08:46:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2018/03/11 08:59:52 mrg Exp $
 
 .include 
 
@@ -10,5 +10,7 @@ DPADD+=	${LIBX11}
 .PATH:	${X11SRCDIR.${PROG}}
 .PATH:	${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include 
 .include 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:55:27 UTC 2018

Modified Files:
xsrc/external/mit/xsetroot/dist/man: xsetroot.man
xsrc/external/mit/xwininfo/dist: xwininfo.c
Added Files:
xsrc/external/mit/xsm/dist: compile

Log Message:
merge xsetroot 1.1.2, xwininfo 1.1.4 and xsm 1.0.4.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xsetroot/dist/man/xsetroot.man
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xsm/dist/compile
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xwininfo/dist/xwininfo.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/xsetroot/dist/man/xsetroot.man
diff -u xsrc/external/mit/xsetroot/dist/man/xsetroot.man:1.2 xsrc/external/mit/xsetroot/dist/man/xsetroot.man:1.3
--- xsrc/external/mit/xsetroot/dist/man/xsetroot.man:1.2	Fri Nov 22 17:39:51 2013
+++ xsrc/external/mit/xsetroot/dist/man/xsetroot.man	Sun Mar 11 08:55:27 2018
@@ -27,13 +27,23 @@
 xsetroot \- root window parameter setting utility for X
 .SH SYNOPSIS
 .B xsetroot
-[-help] [-version] [-def] [-display \fIdisplay\fP]
+[-help]
+[-version]
+[-def]
+[-display \fIdisplay\fP]
 [-cursor \fIcursorfile maskfile\fP]
-[-cursor_name \fIcursorname\fP]
+[-cursor_name \fIcursorfontname\fP]
 [-xcf \fIcursorfile\fP \fIcursorsize\fP]
-[-bitmap \fIfilename\fP]
-[-mod \fIx y\fP] [-gray] [-grey] [-fg \fIcolor\fP] [-bg \fIcolor\fP] [-rv]
-[-solid \fIcolor\fP] [-name \fIstring\fP]
+[-bitmap \fIfilename\fP
+| -mod \fIx y\fP
+| -gray
+| -grey
+| -solid \fIcolor\fP]
+[-bg \fIcolor\fP]
+[-fg \fIcolor\fP]
+[-rv]
+[-name \fIstring\fP]
+[-d \fIdisplay\fP]
 .SH DESCRIPTION
 The
 .I xsetroot
@@ -56,11 +66,11 @@ Only one of the background color/tiling 
 .SH OPTIONS
 .PP
 The various options are as follows:
-.IP \fB-help\fP
+.IP "\fB-help\fP"
 Print a usage message and exit.
-.IP \fB-version\fP
+.IP "\fB-version\fP"
 Print a version message and exit.
-.IP \fB-def\fP
+.IP "\fB-def, -default\fP"
 Reset unspecified attributes to the default values.  (Restores the background
 to the familiar gray mesh and the cursor to the hollow x shape.)
 .IP "\fB-cursor\fP \fIcursorfile\fP \fImaskfile\fP"
@@ -70,7 +80,7 @@ Cursor and mask files are bitmaps (littl
 .I bitmap(__appmansuffix__)
 program.  You probably want the mask file to be all black until you
 get used to the way masks work.
-.IP "\fB-cursor_name\fP \fIcursorname\fP
+.IP "\fB-cursor_name\fP \fIcursorfontname\fP"
 This lets you change the pointer cursor to one of the standard
 cursors from the cursor font.  Refer to appendix B of the X protocol for
 the names (except that the XC_ prefix is elided for this option).
@@ -87,16 +97,14 @@ the bitmap.
 This is used if you want a plaid-like grid pattern on your screen.
 x and y are integers ranging from 1 to 16.  Try the different combinations.
 Zero and negative numbers are taken as 1.
-.IP \fB-gray\fP
-Make the entire background gray.  (Easier on the eyes.)
-.IP \fB-grey\fP
-Make the entire background grey.
-.IP "\fB-fg\fP \fIcolor\fP"
+.IP "\fB-gray, -grey\fP"
+Make the entire background gray (Easier on the eyes).
+.IP "\fB-bg, -background\fP \fIcolor\fP"
+Use ``color'' as the background color.
+.IP "\fB-fg, -foreground\fP \fIcolor\fP"
 Use ``color'' as the foreground color.  Foreground and background colors
 are meaningful only in combination with -cursor, -bitmap, or -mod.
-.IP "\fB-bg\fP \fIcolor\fP"
-Use ``color'' as the background color.
-.IP \fB-rv\fP
+.IP "\fB-rv, -reverse\fP"
 This exchanges the foreground and background colors.  Normally the foreground
 color is black and the background color is white.
 .IP "\fB-solid\fP \fIcolor\fP"
@@ -107,7 +115,7 @@ Set the name of the root window to ``str
 Usually a name is assigned to a window so that the
 window manager can use a text representation when the window is iconified.
 This option is unused since you can't iconify the background.
-.IP "\fB-display\fP \fIdisplay\fP"
+.IP "\fB-d, -display\fP \fIdisplay\fP"
 Specifies the server to connect to; see \fIX(__miscmansuffix__)\fP.
 .SH "SEE ALSO"
 X(__miscmansuffix__), xset(__appmansuffix__), xrdb(__appmansuffix__), Xcursor(__libmansuffix__)

Index: xsrc/external/mit/xwininfo/dist/xwininfo.c
diff -u xsrc/external/mit/xwininfo/dist/xwininfo.c:1.5 xsrc/external/mit/xwininfo/dist/xwininfo.c:1.6
--- xsrc/external/mit/xwininfo/dist/xwininfo.c:1.5	Sun Jun  2 19:41:34 2013
+++ xsrc/external/mit/xwininfo/dist/xwininfo.c	Sun Mar 11 08:55:27 2018
@@ -278,7 +278,7 @@ static size_t strlcat (char *dst, const 
 /*
  * Report the syntax for calling xwininfo:
  */
-_X_NORETURN
+_X_NORETURN _X_COLD
 static void
 usage (void)
 {
@@ -286,6 +286,7 @@ usage (void)
 	 "usage:  %s [-options ...]\n\n"
 	 "where options include:\n"
 	 "-helpprint this message\n"
+	 "-version print version message\n"
 	 "-display host:dpyX server to contact\n"
 	 " 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:53:21 UTC 2018

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

Log Message:
initial import of xwd-1.0.7

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:53:22 UTC 2018

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

Log Message:
initial import of xwininfo-1.1.4

Status:

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:53:24 UTC 2018

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

Log Message:
initial import of xwud-1.0.5

Status:

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:53:20 UTC 2018

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

Log Message:
initial import of xsm-1.0.4

Status:

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

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

7 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/xsetroot/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:53:19 UTC 2018

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

Log Message:
initial import of xsetroot-1.1.2

Status:

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:53:18 UTC 2018

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

Log Message:
initial import of xset-1.2.4

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 08:46:31 UTC 2018

Modified Files:
src/external/mit/xorg/bin/xrefresh: Makefile
src/external/mit/xorg/bin/xset: Makefile

Log Message:
use xorg-pkg-ver.mk and define HAVE_USLEEP.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xrefresh/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xset/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/xrefresh/Makefile
diff -u src/external/mit/xorg/bin/xrefresh/Makefile:1.2 src/external/mit/xorg/bin/xrefresh/Makefile:1.3
--- src/external/mit/xorg/bin/xrefresh/Makefile:1.2	Fri May 31 08:01:59 2013
+++ src/external/mit/xorg/bin/xrefresh/Makefile	Sun Mar 11 08:46:31 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2013/05/31 08:01:59 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2018/03/11 08:46:31 mrg Exp $
 
 .include 
 
@@ -10,5 +10,7 @@ DPADD+=	${LIBXEXT} ${LIBX11}
 .PATH:	${X11SRCDIR.${PROG}}
 .PATH:	${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include 
 .include 

Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.6 src/external/mit/xorg/bin/xset/Makefile:1.7
--- src/external/mit/xorg/bin/xset/Makefile:1.6	Sat Mar  3 03:34:17 2018
+++ src/external/mit/xorg/bin/xset/Makefile	Sun Mar 11 08:46:31 2018
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.6 2018/03/03 03:34:17 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2018/03/11 08:46:31 mrg Exp $
 
 .include 
 
 PROG=	xset
 
-CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
+CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB -DHAVE_USLEEP
 
 LDADD+=	-lXmuu -lXt -lSM -lICE -lXxf86misc -lXext -lX11
 DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC}

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:35:14 UTC 2018

Modified Files:
xsrc/external/mit/xload/dist: compile
xsrc/external/mit/xrdb/dist: xrdb.c
Added Files:
xsrc/external/mit/xmessage/dist: compile

Log Message:
merge xload 1.1.3, xrdb 1.1.1 and xmessage 1.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xload/dist/compile
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xmessage/dist/compile
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xrdb/dist/xrdb.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/xload/dist/compile
diff -u xsrc/external/mit/xload/dist/compile:1.3 xsrc/external/mit/xload/dist/compile:1.4
--- xsrc/external/mit/xload/dist/compile:1.3	Mon Mar 17 09:43:11 2014
+++ xsrc/external/mit/xload/dist/compile	Sun Mar 11 08:35:14 2018
@@ -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

Index: xsrc/external/mit/xrdb/dist/xrdb.c
diff -u xsrc/external/mit/xrdb/dist/xrdb.c:1.8 xsrc/external/mit/xrdb/dist/xrdb.c:1.9
--- xsrc/external/mit/xrdb/dist/xrdb.c:1.8	Sun Apr 24 18:22:49 2016
+++ xsrc/external/mit/xrdb/dist/xrdb.c	Sun Mar 11 08:35:14 2018
@@ -53,25 +53,21 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef NEED_SYS_PARAM_H
-# include 		/* defines MAXHOSTNAMELEN on BSD & Linux */
+# include  /* defines MAXHOSTNAMELEN on BSD & Linux */
 #endif
 
 #ifdef NEED_NETDB_H
-# include 		/* defines MAXHOSTNAMELEN on Solaris */
+# include  /* defines MAXHOSTNAMELEN on Solaris */
 #endif
 
 #define SCREEN_RESOURCES "SCREEN_RESOURCES"
 
 #ifndef CPP
-#ifdef __UNIXOS2__
-/* expected to be in path */
-#define CPP "cpp"
-#else
 #define CPP "/usr/lib/cpp"
-#endif /* __UNIXOS2__ */
-#endif /* CPP */
+#endif  /* CPP */
 
 #define INIT_BUFFER_SIZE 1
 #define INIT_ENTRY_SIZE 500
@@ -89,28 +85,29 @@
 #define OPMERGE 5
 #define OPOVERRIDE 6
 
-#define RESOURCE_PROPERTY_NAME "RESOURCE_MANAGER"
-#define BACKUP_SUFFIX ".bak"		/* for editting */
+#define BACKUP_SUFFIX ".bak"/* for editing */
 
 typedef struct _Entry {
 char *tag, *value;
 int lineno;
 Bool usable;
 } Entry;
+
 typedef struct _Buffer {
 char *buff;
-int  room, used;
+size_t room, used;
 } Buffer;
+
 typedef struct _Entries {
 Entry *entry;
-int   room, used;
+size_t room, used;
 } Entries;
 
 /* dynamically allocated strings */
 #define CHUNK_SIZE 4096
 typedef struct _String {
 char *val;
-int room, used;
+size_t room, used;
 } String;
 
 static char *ProgramName;
@@ -127,11 +124,11 @@ static char tmpname3[32];
 static int oper = OPLOAD;
 static char *editFile = NULL;
 static const char *cpp_program = NULL;
-static const char* const cpp_locations[] = { CPP };
+static const char * const cpp_locations[] = { CPP };
 static const char *backup_suffix = BACKUP_SUFFIX;
 static Bool dont_execute = False;
 static String defines;
-static int defines_base;
+static size_t defines_base;
 #define MAX_CMD_DEFINES 512
 static char *cmd_defines[MAX_CMD_DEFINES];
 static int num_cmd_defines = 0;
@@ -140,20 +137,21 @@ static Display *dpy;
 static Buffer buffer;
 static Entries newDB;
 
-static void fatal(const char *, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;
-static void addstring ( String *arg, const char *s );
-static void addescapedstring ( String *arg, const char *s );
-static void addtokstring ( String *arg, const char *s );
-static void FormatEntries ( Buffer *b, Entries *entries );
-static void StoreProperty ( Display *display, Window root, Atom res_prop );
-static void Process ( int scrno, Bool doScreen, Bool execute );
-static void ShuffleEntries ( Entries *db, Entries *dbs, int num );
-static void ReProcess ( int scrno, Bool doScreen );
+static void fatal(const char *, ...)
+_X_ATTRIBUTE_PRINTF(1, 2)_X_NORETURN _X_COLD;
+static void addstring(String *arg, const char *s);
+static void addescapedstring(String *arg, const char *s);
+static void addtokstring(String *arg, const char *s);
+static void FormatEntries(Buffer *b, Entries * entries);
+static void StoreProperty(Display *display, Window root, Atom res_prop);
+static void Process(int scrno, Bool doScreen, Bool execute);
+static void ShuffleEntries(Entries *db, Entries *dbs, unsigned int num);
+static void ReProcess(int scrno, Bool doScreen);
 
 #ifndef HAVE_ASPRINTF
 /* sprintf variant found in newer libc's which allocates string to print to */
-static int _X_ATTRIBUTE_PRINTF(2,3)
-asprintf(char ** ret, const char *format, ...)
+static int _X_ATTRIBUTE_PRINTF(2, 3)
+asprintf(char **ret, const char *format, ...)
 {
 char buf[256];
 int len;
@@ -164,40 +162,52 @@ 

CVS commit: [pgoyette-compat] src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 11 08:32:21 UTC 2018

Modified Files:
src/sys/kern [pgoyette-compat]: kern_module.c sys_module.c

Log Message:
Since we use pointer semantics when walking the alias lists, declare
the pointer variable accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.130.2.2 -r1.130.2.3 src/sys/kern/kern_module.c
cvs rdiff -u -r1.23.2.2 -r1.23.2.3 src/sys/kern/sys_module.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/kern_module.c
diff -u src/sys/kern/kern_module.c:1.130.2.2 src/sys/kern/kern_module.c:1.130.2.3
--- src/sys/kern/kern_module.c:1.130.2.2	Sun Mar 11 07:25:59 2018
+++ src/sys/kern/kern_module.c	Sun Mar 11 08:32:21 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.130.2.2 2018/03/11 07:25:59 pgoyette Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.130.2.3 2018/03/11 08:32:21 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.2 2018/03/11 07:25:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.3 2018/03/11 08:32:21 pgoyette Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -666,7 +666,7 @@ module_unload(const char *name)
 int
 module_alias_lookup(const char *name, module_t *mod)
 {
-	const char * const	aliasp[];
+	const char * const *aliasp;
 
 	aliasp = *mod->mod_info->mi_aliases;
 	if (aliasp == NULL)
@@ -784,7 +784,7 @@ module_do_builtin(const module_t *pmod, 
 prop_dictionary_t props)
 {
 	const char *p, *s;
-	const char * const	aliasp[];
+	const char * const *aliasp;
 	char buf[MAXMODNAME];
 	modinfo_t *mi = NULL;
 	module_t *mod, *mod2, *mod_loaded, *prev_active;
@@ -910,7 +910,7 @@ module_do_load(const char *name, bool is
 	prop_dictionary_t filedict;
 	char buf[MAXMODNAME];
 	const char *s, *p;
-	const char * const aliasp[];
+	const char * const *aliasp;
 	int error;
 	size_t len;
 

Index: src/sys/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.23.2.2 src/sys/kern/sys_module.c:1.23.2.3
--- src/sys/kern/sys_module.c:1.23.2.2	Sun Mar 11 07:25:59 2018
+++ src/sys/kern/sys_module.c	Sun Mar 11 08:32:21 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_module.c,v 1.23.2.2 2018/03/11 07:25:59 pgoyette Exp $	*/
+/*	$NetBSD: sys_module.c,v 1.23.2.3 2018/03/11 08:32:21 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.2 2018/03/11 07:25:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.3 2018/03/11 08:32:21 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -122,7 +122,7 @@ handle_modctl_stat(struct iovec *iov, vo
 	int error;
 	int mscnt;
 	bool stataddr;
-	const char * const aliasp[];
+	const char * const *aliasp;
 
 	/* If not privileged, don't expose kernel addresses. */
 	error = kauth_authorize_system(kauth_cred_get(), KAUTH_SYSTEM_MODULE,

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:30:48 UTC 2018

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

Log Message:
initial import of xrdb-1.1.1

Status:

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

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

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:30:45 UTC 2018

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

Log Message:
initial import of xload-1.1.3

Status:

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:30:49 UTC 2018

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

Log Message:
initial import of xrefresh-1.0.6

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:30:47 UTC 2018

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

Log Message:
initial import of xmessage-1.0.5

Status:

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

U xsrc/external/mit/xmessage/dist/configure
U xsrc/external/mit/xmessage/dist/depcomp
U xsrc/external/mit/xmessage/dist/aclocal.m4
U xsrc/external/mit/xmessage/dist/missing
U xsrc/external/mit/xmessage/dist/COPYING
U xsrc/external/mit/xmessage/dist/ChangeLog
U xsrc/external/mit/xmessage/dist/xmessage.h
U xsrc/external/mit/xmessage/dist/readfile.h
U xsrc/external/mit/xmessage/dist/install-sh
U xsrc/external/mit/xmessage/dist/README
C xsrc/external/mit/xmessage/dist/compile
U xsrc/external/mit/xmessage/dist/config.h.in
U xsrc/external/mit/xmessage/dist/config.guess
U xsrc/external/mit/xmessage/dist/xmessage.c
U xsrc/external/mit/xmessage/dist/Makefile.am
U xsrc/external/mit/xmessage/dist/configure.ac
U xsrc/external/mit/xmessage/dist/readfile.c
U xsrc/external/mit/xmessage/dist/config.sub
U xsrc/external/mit/xmessage/dist/makeform.c
U xsrc/external/mit/xmessage/dist/Makefile.in
U xsrc/external/mit/xmessage/dist/INSTALL
U xsrc/external/mit/xmessage/dist/man/xmessage.man
U xsrc/external/mit/xmessage/dist/man/Makefile.am
U xsrc/external/mit/xmessage/dist/man/Makefile.in
U xsrc/external/mit/xmessage/dist/app-defaults/Xmessage-color
U xsrc/external/mit/xmessage/dist/app-defaults/Xmessage

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:30:43 UTC 2018

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

Log Message:
initial import of xkbcomp-1.4.1

Status:

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

U xsrc/external/mit/xkbcomp/dist/alias.c
U xsrc/external/mit/xkbcomp/dist/aclocal.m4
U xsrc/external/mit/xkbcomp/dist/depcomp
U xsrc/external/mit/xkbcomp/dist/parseutils.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.pc.in
U xsrc/external/mit/xkbcomp/dist/symbols.c
U xsrc/external/mit/xkbcomp/dist/xkbparse.y
U xsrc/external/mit/xkbcomp/dist/vmod.h
U xsrc/external/mit/xkbcomp/dist/compat.c
U xsrc/external/mit/xkbcomp/dist/geometry.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.c
U xsrc/external/mit/xkbcomp/dist/xkbscan.c
U xsrc/external/mit/xkbcomp/dist/README
U xsrc/external/mit/xkbcomp/dist/config.h.in
U xsrc/external/mit/xkbcomp/dist/action.h
U xsrc/external/mit/xkbcomp/dist/alias.h
U xsrc/external/mit/xkbcomp/dist/vmod.c
U xsrc/external/mit/xkbcomp/dist/listing.c
U xsrc/external/mit/xkbcomp/dist/misc.c
U xsrc/external/mit/xkbcomp/dist/configure
U xsrc/external/mit/xkbcomp/dist/Makefile.am
U xsrc/external/mit/xkbcomp/dist/missing
U xsrc/external/mit/xkbcomp/dist/parseutils.h
U xsrc/external/mit/xkbcomp/dist/utils.c
U xsrc/external/mit/xkbcomp/dist/INSTALL
U xsrc/external/mit/xkbcomp/dist/configure.ac
U xsrc/external/mit/xkbcomp/dist/xkbcomp.h
U xsrc/external/mit/xkbcomp/dist/xkbpath.h
U xsrc/external/mit/xkbcomp/dist/tokens.h
U xsrc/external/mit/xkbcomp/dist/install-sh
U xsrc/external/mit/xkbcomp/dist/indicators.h
U xsrc/external/mit/xkbcomp/dist/keytypes.c
U xsrc/external/mit/xkbcomp/dist/keycodes.h
U xsrc/external/mit/xkbcomp/dist/xkbparse.c
U xsrc/external/mit/xkbcomp/dist/expr.c
U xsrc/external/mit/xkbcomp/dist/ChangeLog
U xsrc/external/mit/xkbcomp/dist/expr.h
U xsrc/external/mit/xkbcomp/dist/compile
U xsrc/external/mit/xkbcomp/dist/xkbpath.c
U xsrc/external/mit/xkbcomp/dist/utils.h
U xsrc/external/mit/xkbcomp/dist/COPYING
U xsrc/external/mit/xkbcomp/dist/keymap.c
U xsrc/external/mit/xkbcomp/dist/Makefile.in
U xsrc/external/mit/xkbcomp/dist/indicators.c
U xsrc/external/mit/xkbcomp/dist/action.c
U xsrc/external/mit/xkbcomp/dist/ylwrap
U xsrc/external/mit/xkbcomp/dist/config.guess
U xsrc/external/mit/xkbcomp/dist/config.sub
U xsrc/external/mit/xkbcomp/dist/keycodes.c
U xsrc/external/mit/xkbcomp/dist/misc.h
U xsrc/external/mit/xkbcomp/dist/compat.h
U xsrc/external/mit/xkbcomp/dist/man/xkbcomp.man
U xsrc/external/mit/xkbcomp/dist/man/Makefile.am
U xsrc/external/mit/xkbcomp/dist/man/Makefile.in

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:30:46 UTC 2018

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

Log Message:
initial import of xlsclients-1.1.4

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:30:44 UTC 2018

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

Log Message:
initial import of xkill-1.0.5

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 08:21:24 UTC 2018

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

Log Message:
look in man/ subdir for the manual


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xeyes/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/xeyes/Makefile
diff -u src/external/mit/xorg/bin/xeyes/Makefile:1.1.1.1 src/external/mit/xorg/bin/xeyes/Makefile:1.2
--- src/external/mit/xorg/bin/xeyes/Makefile:1.1.1.1	Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xeyes/Makefile	Sun Mar 11 08:21:24 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2018/03/11 08:21:24 mrg Exp $
 
 .include 
 
@@ -9,6 +9,7 @@ LDADD+=	-lXmu -lXt -lSM -lICE -lXext -lX
 DPADD+=	${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
 
 .PATH:	${X11SRCDIR.${PROG}}
+.PATH:	${X11SRCDIR.${PROG}}/man
 
 .include 
 .include 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:15:23 UTC 2018

Added Files:
xsrc/external/mit/xeyes/dist: compile
xsrc/external/mit/xfontsel/dist: compile
Removed Files:
xsrc/external/mit/xeyes/dist: xeyes.man

Log Message:
merge xeyes 1.1.2 and xfontsel 1.0.6.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xeyes/dist/compile
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xeyes/dist/xeyes.man
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xfontsel/dist/compile

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

Added files:

Index: xsrc/external/mit/xeyes/dist/compile
diff -u /dev/null xsrc/external/mit/xeyes/dist/compile:1.3
--- /dev/null	Sun Mar 11 08:15:23 2018
+++ xsrc/external/mit/xeyes/dist/compile	Sun Mar 11 08:15:22 2018
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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 .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+  if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	file_conv=mingw
+	;;
+	  CYGWIN*)
+	file_conv=cygwin
+	;;
+	  *)
+	file_conv=wine
+	;;
+	esac
+  fi
+  case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+  esac
+  ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+lib_path=$file
+  else
+lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+IFS=$save_IFS
+if $shared && test -f "$dir/$lib.dll.lib"; then
+  found=yes
+  lib=$dir/$lib.dll.lib
+  break
+fi
+if test -f "$dir/$lib.lib"; then
+  found=yes
+  lib=$dir/$lib.lib
+  break
+fi
+if test -f "$dir/lib$lib.a"; then
+  found=yes
+  lib=$dir/lib$lib.a
+  break
+fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+if test -n "$eat"; then
+  eat=
+else
+  case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	*.o | *.[oO][bB][jJ])
+	  func_file_conv "$2"
+	  set x "$@" -Fo"$file"
+	  shift
+	  ;;
+	*)
+	  func_file_conv "$2"
+	  set x "$@" -Fe"$file"
+	  shift
+	  ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:13:06 UTC 2018

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

Log Message:
initial import of xfontsel-1.0.6

Status:

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:13:04 UTC 2018

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

Log Message:
initial import of xdriinfo-1.0.6

Status:

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

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

No conflicts created by this import

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:13:05 UTC 2018

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

Log Message:
initial import of xeyes-1.1.2

Status:

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

U xsrc/external/mit/xeyes/dist/Eyes.h
U xsrc/external/mit/xeyes/dist/config.h.in
U xsrc/external/mit/xeyes/dist/config.guess
U xsrc/external/mit/xeyes/dist/EyesP.h
U xsrc/external/mit/xeyes/dist/install-sh
U xsrc/external/mit/xeyes/dist/COPYING
U xsrc/external/mit/xeyes/dist/aclocal.m4
U xsrc/external/mit/xeyes/dist/eyesmask.bit
U xsrc/external/mit/xeyes/dist/transform.c
C xsrc/external/mit/xeyes/dist/compile
U xsrc/external/mit/xeyes/dist/README
U xsrc/external/mit/xeyes/dist/missing
U xsrc/external/mit/xeyes/dist/depcomp
U xsrc/external/mit/xeyes/dist/eyes.bit
U xsrc/external/mit/xeyes/dist/Eyes.c
U xsrc/external/mit/xeyes/dist/transform.h
U xsrc/external/mit/xeyes/dist/xeyes.c
U xsrc/external/mit/xeyes/dist/Makefile.in
U xsrc/external/mit/xeyes/dist/config.sub
U xsrc/external/mit/xeyes/dist/INSTALL
U xsrc/external/mit/xeyes/dist/configure
U xsrc/external/mit/xeyes/dist/ChangeLog
U xsrc/external/mit/xeyes/dist/Makefile.am
U xsrc/external/mit/xeyes/dist/configure.ac
N xsrc/external/mit/xeyes/dist/man/Makefile.am
N xsrc/external/mit/xeyes/dist/man/Makefile.in
N xsrc/external/mit/xeyes/dist/man/xeyes.man

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

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:13:02 UTC 2018

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

Log Message:
initial import of xbitmaps-1.1.2

Status:

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

U xsrc/external/mit/xbitmaps/dist/cntr_ptrmsk
U xsrc/external/mit/xbitmaps/dist/mailfullmsk
U xsrc/external/mit/xbitmaps/dist/terminal
U xsrc/external/mit/xbitmaps/dist/COPYING
U xsrc/external/mit/xbitmaps/dist/sipb
U xsrc/external/mit/xbitmaps/dist/icon
U xsrc/external/mit/xbitmaps/dist/weird_size
U xsrc/external/mit/xbitmaps/dist/dimple3
U xsrc/external/mit/xbitmaps/dist/wingdogs
U xsrc/external/mit/xbitmaps/dist/vlines2
U xsrc/external/mit/xbitmaps/dist/stipple
U xsrc/external/mit/xbitmaps/dist/mailfull
U xsrc/external/mit/xbitmaps/dist/opendotMask
U xsrc/external/mit/xbitmaps/dist/wide_weave
U xsrc/external/mit/xbitmaps/dist/gray1
U xsrc/external/mit/xbitmaps/dist/config.guess
U xsrc/external/mit/xbitmaps/dist/grid4
U xsrc/external/mit/xbitmaps/dist/dropbar8
U xsrc/external/mit/xbitmaps/dist/grid16
U xsrc/external/mit/xbitmaps/dist/right_ptrmsk
U xsrc/external/mit/xbitmaps/dist/tie_fighter
U xsrc/external/mit/xbitmaps/dist/flagdown
U xsrc/external/mit/xbitmaps/dist/1x1
U xsrc/external/mit/xbitmaps/dist/woman
N xsrc/external/mit/xbitmaps/dist/compile
U xsrc/external/mit/xbitmaps/dist/2x2
U xsrc/external/mit/xbitmaps/dist/grid2
U xsrc/external/mit/xbitmaps/dist/config.sub
U xsrc/external/mit/xbitmaps/dist/menu10
U xsrc/external/mit/xbitmaps/dist/configure
U xsrc/external/mit/xbitmaps/dist/mailempty
U xsrc/external/mit/xbitmaps/dist/letters
U xsrc/external/mit/xbitmaps/dist/xlogo32
U xsrc/external/mit/xbitmaps/dist/config.h.in
U xsrc/external/mit/xbitmaps/dist/xlogo64
U xsrc/external/mit/xbitmaps/dist/star
U xsrc/external/mit/xbitmaps/dist/gray
U xsrc/external/mit/xbitmaps/dist/missing
U xsrc/external/mit/xbitmaps/dist/hlines3
U xsrc/external/mit/xbitmaps/dist/cross_weave
U xsrc/external/mit/xbitmaps/dist/ChangeLog
U xsrc/external/mit/xbitmaps/dist/Makefile.am
U xsrc/external/mit/xbitmaps/dist/xlogo11
U xsrc/external/mit/xbitmaps/dist/right_ptr
U xsrc/external/mit/xbitmaps/dist/light_gray
U xsrc/external/mit/xbitmaps/dist/mailemptymsk
U xsrc/external/mit/xbitmaps/dist/install-sh
U xsrc/external/mit/xbitmaps/dist/starMask
U xsrc/external/mit/xbitmaps/dist/mensetmanus
U xsrc/external/mit/xbitmaps/dist/menu8
U xsrc/external/mit/xbitmaps/dist/plaid
U xsrc/external/mit/xbitmaps/dist/aclocal.m4
U xsrc/external/mit/xbitmaps/dist/flipped_gray
U xsrc/external/mit/xbitmaps/dist/grid8
U xsrc/external/mit/xbitmaps/dist/dot
U xsrc/external/mit/xbitmaps/dist/box6
U xsrc/external/mit/xbitmaps/dist/black6
U xsrc/external/mit/xbitmaps/dist/vlines3
U xsrc/external/mit/xbitmaps/dist/menu12
U xsrc/external/mit/xbitmaps/dist/xbitmaps.pc.in
U xsrc/external/mit/xbitmaps/dist/INSTALL
U xsrc/external/mit/xbitmaps/dist/left_ptrmsk
U xsrc/external/mit/xbitmaps/dist/root_weave
U xsrc/external/mit/xbitmaps/dist/xlogo16
U xsrc/external/mit/xbitmaps/dist/boxes
U xsrc/external/mit/xbitmaps/dist/target
U xsrc/external/mit/xbitmaps/dist/xsnow
U xsrc/external/mit/xbitmaps/dist/cntr_ptr
U xsrc/external/mit/xbitmaps/dist/left_ptr
U xsrc/external/mit/xbitmaps/dist/noletters
U xsrc/external/mit/xbitmaps/dist/xfd_icon
U xsrc/external/mit/xbitmaps/dist/menu16
U xsrc/external/mit/xbitmaps/dist/scales
U xsrc/external/mit/xbitmaps/dist/hlines2
U xsrc/external/mit/xbitmaps/dist/Makefile.in
U xsrc/external/mit/xbitmaps/dist/configure.ac
U xsrc/external/mit/xbitmaps/dist/opendot
U xsrc/external/mit/xbitmaps/dist/gray3
U xsrc/external/mit/xbitmaps/dist/dimple1
U xsrc/external/mit/xbitmaps/dist/menu6
U xsrc/external/mit/xbitmaps/dist/calculator
U xsrc/external/mit/xbitmaps/dist/flagup
U xsrc/external/mit/xbitmaps/dist/black
U xsrc/external/mit/xbitmaps/dist/dropbar7
U xsrc/external/mit/xbitmaps/dist/escherknot
U xsrc/external/mit/xbitmaps/dist/keyboard16

No conflicts created by this import

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 08:03:20 UTC 2018

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

Log Message:
use xorg-pkg-ver.mk


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/ico/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/ico/Makefile
diff -u src/external/mit/xorg/bin/ico/Makefile:1.2 src/external/mit/xorg/bin/ico/Makefile:1.3
--- src/external/mit/xorg/bin/ico/Makefile:1.2	Wed Jul 22 07:58:00 2015
+++ src/external/mit/xorg/bin/ico/Makefile	Sun Mar 11 08:03:20 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/07/22 07:58:00 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2018/03/11 08:03:20 mrg Exp $
 
 .include 
 
@@ -12,5 +12,7 @@ DPADD+=	${LIBXEXT} ${LIBX11} ${LIBPTHREA
 .PATH:	${X11SRCDIR.${PROG}}
 .PATH:	${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include 
 .include 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 08:02:47 UTC 2018

Modified Files:
xsrc/external/mit/mkfontscale/dist: ident.c mkfontscale.c
xsrc/external/mit/twm/dist/src: util.c
Added Files:
xsrc/external/mit/oclock/dist: compile
xsrc/external/mit/viewres/dist: compile

Log Message:
merge mkfontscale 1.1.3, twm 1.0.10, oclock 1.0.4 and viewres 1.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/mkfontscale/dist/ident.c \
xsrc/external/mit/mkfontscale/dist/mkfontscale.c
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/oclock/dist/compile
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/twm/dist/src/util.c
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/viewres/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/mkfontscale/dist/ident.c
diff -u xsrc/external/mit/mkfontscale/dist/ident.c:1.5 xsrc/external/mit/mkfontscale/dist/ident.c:1.6
--- xsrc/external/mit/mkfontscale/dist/ident.c:1.5	Mon Mar 17 08:51:28 2014
+++ xsrc/external/mit/mkfontscale/dist/ident.c	Sun Mar 11 08:02:46 2018
@@ -83,7 +83,7 @@ static inline void *
 fontFileOpen(fontFile *ff, const char *filename) {
 int n = strlen(filename);
 
-if (strcmp(filename + n - 4, ".bz2") == 0) {
+if (n > 4 && strcmp(filename + n - 4, ".bz2") == 0) {
 	ff->type = bz2FontFile;
 	ff->f.bz2 = BZ2_bzopen(filename, "rb");
 	ff->pos = 0;
Index: xsrc/external/mit/mkfontscale/dist/mkfontscale.c
diff -u xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.5 xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.6
--- xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.5	Fri Jul 17 03:22:06 2015
+++ xsrc/external/mit/mkfontscale/dist/mkfontscale.c	Sun Mar 11 08:02:46 2018
@@ -579,11 +579,14 @@ makeXLFD(char *filename, FT_Face face, i
 }
 
 if(t1info) {
-if(!family)
+if(!family && t1info->family_name)
 family = strdup(t1info->family_name);
-if(!family)
+if(!family && t1info->full_name)
 family = strdup(t1info->full_name);
-if(!full_name)
+/* Hershey fonts miss /FamilyName */
+if(!family && face->family_name)
+family = strdup(face->family_name);
+if(!full_name && t1info->full_name)
 full_name = strdup(t1info->full_name);
 if(!foundry)
 foundry = notice_foundry(t1info->notice);

Index: xsrc/external/mit/twm/dist/src/util.c
diff -u xsrc/external/mit/twm/dist/src/util.c:1.3 xsrc/external/mit/twm/dist/src/util.c:1.4
--- xsrc/external/mit/twm/dist/src/util.c:1.3	Tue Sep 22 18:33:41 2015
+++ xsrc/external/mit/twm/dist/src/util.c	Sun Mar 11 08:02:46 2018
@@ -350,7 +350,7 @@ FindBitmap (const char *name, unsigned *
 pm = XmuLocateBitmapFile (ScreenOfDisplay(dpy, Scr->screen), bigname, NULL,
 			  0, (int *)widthp, (int *)heightp, , );
 if (pm == None && Scr->IconDirectory && bigname[0] != '/') {
-	if (bigname != name) free (bigname);
+	free (bigname);
 	/*
 	 * Attempt to find icon in old IconDirectory (now obsolete)
 	 */
@@ -367,7 +367,7 @@ FindBitmap (const char *name, unsigned *
 	pm = None;
 	}
 }
-if (bigname != name) free (bigname);
+free (bigname);
 if (pm == None) {
 	fprintf (stderr, "%s:  unable to find bitmap \"%s\"\n",
 		 ProgramName, name);

Added files:

Index: xsrc/external/mit/oclock/dist/compile
diff -u /dev/null xsrc/external/mit/oclock/dist/compile:1.3
--- /dev/null	Sun Mar 11 08:02:47 2018
+++ xsrc/external/mit/oclock/dist/compile	Sun Mar 11 08:02:46 2018
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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 .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is