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

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 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: 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.

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 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: 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 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.

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

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.

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 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.

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

[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

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: 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.

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/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/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 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/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/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/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/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/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: 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: 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.

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: 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.

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.

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: 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.

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 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.

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