CVS import: xsrc/external/mit/oclock/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:04 UTC 2013 Update of /cvsroot/xsrc/external/mit/oclock/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23196 Log Message: initial import of oclock-1.0.3 Status: Vendor Tag: xorg Release Tags: oclock-1-0-3 U xsrc/external/mit/oclock/dist/COPYING U xsrc/external/mit/oclock/dist/configure U xsrc/external/mit/oclock/dist/aclocal.m4 U xsrc/external/mit/oclock/dist/install-sh U xsrc/external/mit/oclock/dist/config.h.in U xsrc/external/mit/oclock/dist/oclmask.bit U xsrc/external/mit/oclock/dist/ChangeLog U xsrc/external/mit/oclock/dist/transform.c U xsrc/external/mit/oclock/dist/Clock.h U xsrc/external/mit/oclock/dist/oclock.bit U xsrc/external/mit/oclock/dist/config.guess U xsrc/external/mit/oclock/dist/oclock.c U xsrc/external/mit/oclock/dist/INSTALL U xsrc/external/mit/oclock/dist/transform.h U xsrc/external/mit/oclock/dist/configure.ac U xsrc/external/mit/oclock/dist/ClockP.h U xsrc/external/mit/oclock/dist/Makefile.in U xsrc/external/mit/oclock/dist/config.sub U xsrc/external/mit/oclock/dist/depcomp U xsrc/external/mit/oclock/dist/missing U xsrc/external/mit/oclock/dist/README U xsrc/external/mit/oclock/dist/Makefile.am U xsrc/external/mit/oclock/dist/Clock.c N xsrc/external/mit/oclock/dist/man/oclock.man N xsrc/external/mit/oclock/dist/man/Makefile.in N xsrc/external/mit/oclock/dist/man/Makefile.am U xsrc/external/mit/oclock/dist/app-defaults/Clock-color No conflicts created by this import
CVS import: xsrc/external/mit/setxkbmap/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:07 UTC 2013 Update of /cvsroot/xsrc/external/mit/setxkbmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23711 Log Message: initial import of setxkbmap-1.3.0 Status: Vendor Tag: xorg Release Tags: setxkbmap-1-3-0 U xsrc/external/mit/setxkbmap/dist/README U xsrc/external/mit/setxkbmap/dist/config.h.in U xsrc/external/mit/setxkbmap/dist/config.sub U xsrc/external/mit/setxkbmap/dist/configure.ac U xsrc/external/mit/setxkbmap/dist/missing U xsrc/external/mit/setxkbmap/dist/depcomp U xsrc/external/mit/setxkbmap/dist/COPYING U xsrc/external/mit/setxkbmap/dist/setxkbmap.c U xsrc/external/mit/setxkbmap/dist/aclocal.m4 U xsrc/external/mit/setxkbmap/dist/install-sh U xsrc/external/mit/setxkbmap/dist/Makefile.in U xsrc/external/mit/setxkbmap/dist/ChangeLog U xsrc/external/mit/setxkbmap/dist/config.guess U xsrc/external/mit/setxkbmap/dist/configure U xsrc/external/mit/setxkbmap/dist/Makefile.am U xsrc/external/mit/setxkbmap/dist/INSTALL N xsrc/external/mit/setxkbmap/dist/man/setxkbmap.man N xsrc/external/mit/setxkbmap/dist/man/Makefile.am N xsrc/external/mit/setxkbmap/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/rgb/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:05 UTC 2013 Update of /cvsroot/xsrc/external/mit/rgb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21732 Log Message: initial import of rgb-1.0.5 Status: Vendor Tag: xorg Release Tags: rgb-1-0-5 U xsrc/external/mit/rgb/dist/config.h.in U xsrc/external/mit/rgb/dist/README U xsrc/external/mit/rgb/dist/config.sub U xsrc/external/mit/rgb/dist/rgb.c U xsrc/external/mit/rgb/dist/rgb.txt U xsrc/external/mit/rgb/dist/configure.ac U xsrc/external/mit/rgb/dist/INSTALL U xsrc/external/mit/rgb/dist/aclocal.m4 U xsrc/external/mit/rgb/dist/install-sh U xsrc/external/mit/rgb/dist/configure U xsrc/external/mit/rgb/dist/depcomp U xsrc/external/mit/rgb/dist/missing U xsrc/external/mit/rgb/dist/ChangeLog U xsrc/external/mit/rgb/dist/Makefile.in U xsrc/external/mit/rgb/dist/config.guess U xsrc/external/mit/rgb/dist/showrgb.c U xsrc/external/mit/rgb/dist/COPYING U xsrc/external/mit/rgb/dist/AUTHORS U xsrc/external/mit/rgb/dist/Makefile.am U xsrc/external/mit/rgb/dist/others/old-rgb.txt U xsrc/external/mit/rgb/dist/others/README U xsrc/external/mit/rgb/dist/others/raveling.txt U xsrc/external/mit/rgb/dist/others/thomas.txt U xsrc/external/mit/rgb/dist/man/Makefile.am U xsrc/external/mit/rgb/dist/man/showrgb.man U xsrc/external/mit/rgb/dist/man/rgb.man U xsrc/external/mit/rgb/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/viewres/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:09 UTC 2013 Update of /cvsroot/xsrc/external/mit/viewres/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4692 Log Message: initial import of viewres-1.0.4 Status: Vendor Tag: xorg Release Tags: viewres-1-0-4 U xsrc/external/mit/viewres/dist/INSTALL U xsrc/external/mit/viewres/dist/config.sub U xsrc/external/mit/viewres/dist/ChangeLog U xsrc/external/mit/viewres/dist/config.guess U xsrc/external/mit/viewres/dist/config.h.in U xsrc/external/mit/viewres/dist/configure U xsrc/external/mit/viewres/dist/aclocal.m4 U xsrc/external/mit/viewres/dist/Makefile.in U xsrc/external/mit/viewres/dist/missing U xsrc/external/mit/viewres/dist/viewres.c U xsrc/external/mit/viewres/dist/depcomp U xsrc/external/mit/viewres/dist/install-sh U xsrc/external/mit/viewres/dist/README U xsrc/external/mit/viewres/dist/COPYING U xsrc/external/mit/viewres/dist/configure.ac U xsrc/external/mit/viewres/dist/Makefile.am N xsrc/external/mit/viewres/dist/man/viewres.man N xsrc/external/mit/viewres/dist/man/Makefile.am N xsrc/external/mit/viewres/dist/man/Makefile.in U xsrc/external/mit/viewres/dist/app-defaults/Viewres-color U xsrc/external/mit/viewres/dist/app-defaults/Viewres No conflicts created by this import
CVS import: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:10 UTC 2013 Update of /cvsroot/xsrc/external/mit/xauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18146 Log Message: initial import of xauth-1.0.7 Status: Vendor Tag: xorg Release Tags: xauth-1-0-7 U xsrc/external/mit/xauth/dist/aclocal.m4 U xsrc/external/mit/xauth/dist/xauth.c U xsrc/external/mit/xauth/dist/install-sh U xsrc/external/mit/xauth/dist/INSTALL U xsrc/external/mit/xauth/dist/configure U xsrc/external/mit/xauth/dist/ChangeLog U xsrc/external/mit/xauth/dist/config.h.in U xsrc/external/mit/xauth/dist/config.guess U xsrc/external/mit/xauth/dist/Makefile.in U xsrc/external/mit/xauth/dist/README U xsrc/external/mit/xauth/dist/configure.ac U xsrc/external/mit/xauth/dist/COPYING U xsrc/external/mit/xauth/dist/gethost.c U xsrc/external/mit/xauth/dist/config.sub U xsrc/external/mit/xauth/dist/xauth.h U xsrc/external/mit/xauth/dist/process.c U xsrc/external/mit/xauth/dist/depcomp U xsrc/external/mit/xauth/dist/Makefile.am U xsrc/external/mit/xauth/dist/missing U xsrc/external/mit/xauth/dist/parsedpy.c U xsrc/external/mit/xauth/dist/man/Makefile.in U xsrc/external/mit/xauth/dist/man/Makefile.am U xsrc/external/mit/xauth/dist/man/xauth.man No conflicts created by this import
CVS import: xsrc/external/mit/xclock/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:14 UTC 2013 Update of /cvsroot/xsrc/external/mit/xclock/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29337 Log Message: initial import of xclock-1.0.6 Status: Vendor Tag: xorg Release Tags: xclock-1-0-6 U xsrc/external/mit/xclock/dist/Clock.c U xsrc/external/mit/xclock/dist/configure U xsrc/external/mit/xclock/dist/config.h.in U xsrc/external/mit/xclock/dist/clock.bit U xsrc/external/mit/xclock/dist/missing U xsrc/external/mit/xclock/dist/depcomp U xsrc/external/mit/xclock/dist/ChangeLog U xsrc/external/mit/xclock/dist/install-sh U xsrc/external/mit/xclock/dist/configure.ac U xsrc/external/mit/xclock/dist/COPYING U xsrc/external/mit/xclock/dist/aclocal.m4 U xsrc/external/mit/xclock/dist/clmask.bit U xsrc/external/mit/xclock/dist/ClockP.h U xsrc/external/mit/xclock/dist/xclock.c U xsrc/external/mit/xclock/dist/Makefile.in U xsrc/external/mit/xclock/dist/README U xsrc/external/mit/xclock/dist/config.guess N xsrc/external/mit/xclock/dist/config.rpath U xsrc/external/mit/xclock/dist/Clock.h U xsrc/external/mit/xclock/dist/Makefile.am U xsrc/external/mit/xclock/dist/INSTALL U xsrc/external/mit/xclock/dist/config.sub U xsrc/external/mit/xclock/dist/app-defaults/XClock-color U xsrc/external/mit/xclock/dist/app-defaults/XClock N xsrc/external/mit/xclock/dist/man/Makefile.in N xsrc/external/mit/xclock/dist/man/xclock.man N xsrc/external/mit/xclock/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xcmsdb/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:15 UTC 2013 Update of /cvsroot/xsrc/external/mit/xcmsdb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24075 Log Message: initial import of xcmsdb-1.0.4 Status: Vendor Tag: xorg Release Tags: xcmsdb-1-0-4 U xsrc/external/mit/xcmsdb/dist/Makefile.in U xsrc/external/mit/xcmsdb/dist/install-sh U xsrc/external/mit/xcmsdb/dist/config.guess U xsrc/external/mit/xcmsdb/dist/loadData.c U xsrc/external/mit/xcmsdb/dist/aclocal.m4 U xsrc/external/mit/xcmsdb/dist/INSTALL U xsrc/external/mit/xcmsdb/dist/Makefile.am U xsrc/external/mit/xcmsdb/dist/README U xsrc/external/mit/xcmsdb/dist/ChangeLog U xsrc/external/mit/xcmsdb/dist/COPYING U xsrc/external/mit/xcmsdb/dist/configure U xsrc/external/mit/xcmsdb/dist/config.sub U xsrc/external/mit/xcmsdb/dist/config.h.in U xsrc/external/mit/xcmsdb/dist/SCCDFile.h U xsrc/external/mit/xcmsdb/dist/xcmsdb.c U xsrc/external/mit/xcmsdb/dist/depcomp U xsrc/external/mit/xcmsdb/dist/missing U xsrc/external/mit/xcmsdb/dist/configure.ac U xsrc/external/mit/xcmsdb/dist/datafiles/sample1.dcc U xsrc/external/mit/xcmsdb/dist/datafiles/sample2.dcc N xsrc/external/mit/xcmsdb/dist/man/Makefile.am N xsrc/external/mit/xcmsdb/dist/man/xcmsdb.man N xsrc/external/mit/xcmsdb/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xclipboard/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:12 UTC 2013 Update of /cvsroot/xsrc/external/mit/xclipboard/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3358 Log Message: initial import of xclipboard-1.1.2 Status: Vendor Tag: xorg Release Tags: xclipboard-1-1-2 U xsrc/external/mit/xclipboard/dist/config.h.in U xsrc/external/mit/xclipboard/dist/README U xsrc/external/mit/xclipboard/dist/COPYING U xsrc/external/mit/xclipboard/dist/configure.ac U xsrc/external/mit/xclipboard/dist/missing U xsrc/external/mit/xclipboard/dist/depcomp U xsrc/external/mit/xclipboard/dist/xcutsel.c U xsrc/external/mit/xclipboard/dist/install-sh U xsrc/external/mit/xclipboard/dist/aclocal.m4 U xsrc/external/mit/xclipboard/dist/config.guess U xsrc/external/mit/xclipboard/dist/INSTALL U xsrc/external/mit/xclipboard/dist/xclipboard.c U xsrc/external/mit/xclipboard/dist/Makefile.in U xsrc/external/mit/xclipboard/dist/ChangeLog U xsrc/external/mit/xclipboard/dist/config.sub U xsrc/external/mit/xclipboard/dist/Makefile.am U xsrc/external/mit/xclipboard/dist/configure U xsrc/external/mit/xclipboard/dist/app-defaults/XClipboard N xsrc/external/mit/xclipboard/dist/man/xclipboard.man N xsrc/external/mit/xclipboard/dist/man/xcutsel.man N xsrc/external/mit/xclipboard/dist/man/Makefile.am N xsrc/external/mit/xclipboard/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xditview/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:17 UTC 2013 Update of /cvsroot/xsrc/external/mit/xditview/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8531 Log Message: initial import of xditview-1.0.3 Status: Vendor Tag: xorg Release Tags: xditview-1-0-3 U xsrc/external/mit/xditview/dist/lex.c U xsrc/external/mit/xditview/dist/install-sh U xsrc/external/mit/xditview/dist/xdit_mask.bm U xsrc/external/mit/xditview/dist/aclocal.m4 U xsrc/external/mit/xditview/dist/page.c U xsrc/external/mit/xditview/dist/ldblarrow U xsrc/external/mit/xditview/dist/Dvi.h U xsrc/external/mit/xditview/dist/missing U xsrc/external/mit/xditview/dist/XFontName.h U xsrc/external/mit/xditview/dist/depcomp U xsrc/external/mit/xditview/dist/COPYING U xsrc/external/mit/xditview/dist/xditview.c U xsrc/external/mit/xditview/dist/DviChar.h U xsrc/external/mit/xditview/dist/xdit.bm U xsrc/external/mit/xditview/dist/config.guess U xsrc/external/mit/xditview/dist/DviP.h U xsrc/external/mit/xditview/dist/config.h.in U xsrc/external/mit/xditview/dist/XFontName.c U xsrc/external/mit/xditview/dist/font.c U xsrc/external/mit/xditview/dist/Makefile.am U xsrc/external/mit/xditview/dist/Dvi.c U xsrc/external/mit/xditview/dist/parse.c U xsrc/external/mit/xditview/dist/configure.ac U xsrc/external/mit/xditview/dist/config.sub U xsrc/external/mit/xditview/dist/Menu.h U xsrc/external/mit/xditview/dist/Makefile.in U xsrc/external/mit/xditview/dist/README U xsrc/external/mit/xditview/dist/configure U xsrc/external/mit/xditview/dist/rdblarrow U xsrc/external/mit/xditview/dist/DviChar.c U xsrc/external/mit/xditview/dist/ChangeLog U xsrc/external/mit/xditview/dist/draw.c U xsrc/external/mit/xditview/dist/INSTALL N xsrc/external/mit/xditview/dist/man/xditview.man N xsrc/external/mit/xditview/dist/man/Makefile.in N xsrc/external/mit/xditview/dist/man/Makefile.am N xsrc/external/mit/xditview/dist/app-defaults/Xditview-chrtr N xsrc/external/mit/xditview/dist/app-defaults/Xditview No conflicts created by this import
CVS import: xsrc/external/mit/xdpyinfo/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:19 UTC 2013 Update of /cvsroot/xsrc/external/mit/xdpyinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23970 Log Message: initial import of xdpyinfo-1.3.1 Status: Vendor Tag: xorg Release Tags: xdpyinfo-1-3-1 U xsrc/external/mit/xdpyinfo/dist/config.sub U xsrc/external/mit/xdpyinfo/dist/Makefile.in U xsrc/external/mit/xdpyinfo/dist/INSTALL U xsrc/external/mit/xdpyinfo/dist/Makefile.am U xsrc/external/mit/xdpyinfo/dist/config.guess U xsrc/external/mit/xdpyinfo/dist/xdpyinfo.c U xsrc/external/mit/xdpyinfo/dist/README U xsrc/external/mit/xdpyinfo/dist/config.h.in U xsrc/external/mit/xdpyinfo/dist/configure.ac U xsrc/external/mit/xdpyinfo/dist/depcomp U xsrc/external/mit/xdpyinfo/dist/missing U xsrc/external/mit/xdpyinfo/dist/install-sh U xsrc/external/mit/xdpyinfo/dist/aclocal.m4 U xsrc/external/mit/xdpyinfo/dist/COPYING U xsrc/external/mit/xdpyinfo/dist/ChangeLog U xsrc/external/mit/xdpyinfo/dist/configure N xsrc/external/mit/xdpyinfo/dist/man/Makefile.am N xsrc/external/mit/xdpyinfo/dist/man/Makefile.in N xsrc/external/mit/xdpyinfo/dist/man/xdpyinfo.man No conflicts created by this import
CVS import: xsrc/external/mit/xev/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:24 UTC 2013 Update of /cvsroot/xsrc/external/mit/xev/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5573 Log Message: initial import of xev-1.2.1 Status: Vendor Tag: xorg Release Tags: xev-1-2-1 U xsrc/external/mit/xev/dist/Makefile.am U xsrc/external/mit/xev/dist/xev.c U xsrc/external/mit/xev/dist/INSTALL U xsrc/external/mit/xev/dist/depcomp U xsrc/external/mit/xev/dist/ChangeLog U xsrc/external/mit/xev/dist/COPYING U xsrc/external/mit/xev/dist/README U xsrc/external/mit/xev/dist/configure U xsrc/external/mit/xev/dist/Makefile.in U xsrc/external/mit/xev/dist/configure.ac U xsrc/external/mit/xev/dist/aclocal.m4 U xsrc/external/mit/xev/dist/config.sub U xsrc/external/mit/xev/dist/config.h.in U xsrc/external/mit/xev/dist/install-sh U xsrc/external/mit/xev/dist/config.guess U xsrc/external/mit/xev/dist/missing N xsrc/external/mit/xev/dist/man/Makefile.am N xsrc/external/mit/xev/dist/man/Makefile.in N xsrc/external/mit/xev/dist/man/xev.man No conflicts created by this import
CVS import: xsrc/external/mit/xedit/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:13:23 UTC 2013 Update of /cvsroot/xsrc/external/mit/xedit/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4091 Log Message: initial import of xedit-1.2.1 Status: Vendor Tag: xorg Release Tags: xedit-1-2-1 U xsrc/external/mit/xedit/dist/realpath.c U xsrc/external/mit/xedit/dist/COPYING U xsrc/external/mit/xedit/dist/README U xsrc/external/mit/xedit/dist/hash.c U xsrc/external/mit/xedit/dist/compile U xsrc/external/mit/xedit/dist/configure.ac U xsrc/external/mit/xedit/dist/AUTHORS U xsrc/external/mit/xedit/dist/config.h.in U xsrc/external/mit/xedit/dist/ChangeLog U xsrc/external/mit/xedit/dist/util.c U xsrc/external/mit/xedit/dist/config.sub U xsrc/external/mit/xedit/dist/configure U xsrc/external/mit/xedit/dist/missing U xsrc/external/mit/xedit/dist/depcomp U xsrc/external/mit/xedit/dist/xedit.h U xsrc/external/mit/xedit/dist/Makefile.am U xsrc/external/mit/xedit/dist/tags.c U xsrc/external/mit/xedit/dist/aclocal.m4 U xsrc/external/mit/xedit/dist/xedit.c U xsrc/external/mit/xedit/dist/INSTALL U xsrc/external/mit/xedit/dist/hook.c U xsrc/external/mit/xedit/dist/commands.c U xsrc/external/mit/xedit/dist/config.guess U xsrc/external/mit/xedit/dist/lisp.c U xsrc/external/mit/xedit/dist/install-sh U xsrc/external/mit/xedit/dist/util.h U xsrc/external/mit/xedit/dist/ispell.c U xsrc/external/mit/xedit/dist/strcasecmp.c U xsrc/external/mit/xedit/dist/Makefile.in U xsrc/external/mit/xedit/dist/options.c U xsrc/external/mit/xedit/dist/lisp/package.h U xsrc/external/mit/xedit/dist/lisp/README U xsrc/external/mit/xedit/dist/lisp/core.c U xsrc/external/mit/xedit/dist/lisp/require.c U xsrc/external/mit/xedit/dist/lisp/math.c N xsrc/external/mit/xedit/dist/lisp/setenv.c U xsrc/external/mit/xedit/dist/lisp/read.h U xsrc/external/mit/xedit/dist/lisp/lsp.c U xsrc/external/mit/xedit/dist/lisp/write.c U xsrc/external/mit/xedit/dist/lisp/TODO U xsrc/external/mit/xedit/dist/lisp/pathname.h U xsrc/external/mit/xedit/dist/lisp/hash.c U xsrc/external/mit/xedit/dist/lisp/bytecode.h U xsrc/external/mit/xedit/dist/lisp/struct.c U xsrc/external/mit/xedit/dist/lisp/time.c U xsrc/external/mit/xedit/dist/lisp/string.c U xsrc/external/mit/xedit/dist/lisp/debugger.h U xsrc/external/mit/xedit/dist/lisp/stream.c U xsrc/external/mit/xedit/dist/lisp/regex.c U xsrc/external/mit/xedit/dist/lisp/helper.h U xsrc/external/mit/xedit/dist/lisp/io.c U xsrc/external/mit/xedit/dist/lisp/internal.h U xsrc/external/mit/xedit/dist/lisp/format.h U xsrc/external/mit/xedit/dist/lisp/lisp.h U xsrc/external/mit/xedit/dist/lisp/xedit.c U xsrc/external/mit/xedit/dist/lisp/read.c U xsrc/external/mit/xedit/dist/lisp/mathimp.c U xsrc/external/mit/xedit/dist/lisp/write.h U xsrc/external/mit/xedit/dist/lisp/hash.h U xsrc/external/mit/xedit/dist/lisp/pathname.c N xsrc/external/mit/xedit/dist/lisp/getenv.c U xsrc/external/mit/xedit/dist/lisp/require.h U xsrc/external/mit/xedit/dist/lisp/package.c U xsrc/external/mit/xedit/dist/lisp/math.h U xsrc/external/mit/xedit/dist/lisp/core.h U xsrc/external/mit/xedit/dist/lisp/format.c U xsrc/external/mit/xedit/dist/lisp/lisp.c U xsrc/external/mit/xedit/dist/lisp/xedit.h U xsrc/external/mit/xedit/dist/lisp/debugger.c U xsrc/external/mit/xedit/dist/lisp/stream.h U xsrc/external/mit/xedit/dist/lisp/regex.h U xsrc/external/mit/xedit/dist/lisp/private.h U xsrc/external/mit/xedit/dist/lisp/helper.c U xsrc/external/mit/xedit/dist/lisp/compile.c U xsrc/external/mit/xedit/dist/lisp/io.h U xsrc/external/mit/xedit/dist/lisp/bytecode.c U xsrc/external/mit/xedit/dist/lisp/struct.h U xsrc/external/mit/xedit/dist/lisp/time.h U xsrc/external/mit/xedit/dist/lisp/string.h U xsrc/external/mit/xedit/dist/lisp/mp/mpi.c U xsrc/external/mit/xedit/dist/lisp/mp/mp.c U xsrc/external/mit/xedit/dist/lisp/mp/mpr.c U xsrc/external/mit/xedit/dist/lisp/mp/mp.h U xsrc/external/mit/xedit/dist/lisp/re/tests.txt U xsrc/external/mit/xedit/dist/lisp/re/rec.c U xsrc/external/mit/xedit/dist/lisp/re/rep.h C xsrc/external/mit/xedit/dist/lisp/re/re.c U xsrc/external/mit/xedit/dist/lisp/re/reo.c U xsrc/external/mit/xedit/dist/lisp/re/README U xsrc/external/mit/xedit/dist/lisp/re/tests.c U xsrc/external/mit/xedit/dist/lisp/re/re.h U xsrc/external/mit/xedit/dist/lisp/modules/syntax.lsp U xsrc/external/mit/xedit/dist/lisp/modules/indent.lsp U xsrc/external/mit/xedit/dist/lisp/modules/xt.c U xsrc/external/mit/xedit/dist/lisp/modules/xedit.lsp U xsrc/external/mit/xedit/dist/lisp/modules/psql.c U xsrc/external/mit/xedit/dist/lisp/modules/lisp.lsp U xsrc/external/mit/xedit/dist/lisp/modules/xaw.c U xsrc/external/mit/xedit/dist/lisp/modules/x11.c U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/python.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/lisp.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/perl.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/c.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/imake.lsp U
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:18:16 UTC 2013 Removed Files: xsrc/external/mit/oclock/dist: oclock.man xsrc/external/mit/setxkbmap/dist: setxkbmap.man xsrc/external/mit/viewres/dist: viewres.man xsrc/external/mit/xclipboard/dist: xclipboard.man xcutsel.man xsrc/external/mit/xclock/dist: xclock.man xsrc/external/mit/xcmsdb/dist: AUTHORS NEWS xcmsdb.man xsrc/external/mit/xditview/dist: AUTHORS NEWS Xditview-chrtr.ad Xditview.ad compile mkinstalldirs xditview.man xsrc/external/mit/xdpyinfo/dist: xdpyinfo.man xsrc/external/mit/xedit/dist: xedit.man xsrc/external/mit/xedit/dist/lisp: env.c xsrc/external/mit/xev/dist: xev.man Log Message: merge oclock 1.0.3, setxkbmap 1.3/0. viewres 1.0.4, xclipboard 1.1.2, xcmsdb 1.0.4, xditview 1.0.3, xdpyinfo 1.3.1, xedit 1.2.1, and xev 1.2.1. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/oclock/dist/oclock.man cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/setxkbmap/dist/setxkbmap.man cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/viewres/dist/viewres.man cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xclipboard/dist/xclipboard.man \ xsrc/external/mit/xclipboard/dist/xcutsel.man cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xclock/dist/xclock.man cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xcmsdb/dist/AUTHORS \ xsrc/external/mit/xcmsdb/dist/NEWS \ xsrc/external/mit/xcmsdb/dist/xcmsdb.man cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xditview/dist/AUTHORS \ xsrc/external/mit/xditview/dist/NEWS \ xsrc/external/mit/xditview/dist/Xditview-chrtr.ad \ xsrc/external/mit/xditview/dist/Xditview.ad \ xsrc/external/mit/xditview/dist/compile \ xsrc/external/mit/xditview/dist/mkinstalldirs \ xsrc/external/mit/xditview/dist/xditview.man cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xdpyinfo/dist/xdpyinfo.man cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xedit/dist/xedit.man cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xedit/dist/lisp/env.c cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xev/dist/xev.man 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
Module Name:src
Committed By: mrg
Date: Fri May 31 06:24:05 UTC 2013
Modified Files:
src/external/mit/xorg/bin/oclock: Makefile
src/external/mit/xorg/bin/setxkbmap: Makefile
src/external/mit/xorg/bin/viewres: Makefile
src/external/mit/xorg/bin/xclipboard: Makefile
src/external/mit/xorg/bin/xclock: Makefile
src/external/mit/xorg/bin/xcmsdb: Makefile
src/external/mit/xorg/bin/xditview: Makefile
src/external/mit/xorg/bin/xdpyinfo: Makefile
src/external/mit/xorg/bin/xedit/xedit: Makefile
src/external/mit/xorg/bin/xev: Makefile
Log Message:
find manuals moved into man/ subdirs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/oclock/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/setxkbmap/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/viewres/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xclipboard/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xclock/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xcmsdb/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xditview/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xdpyinfo/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xedit/xedit/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xev/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/oclock/Makefile
diff -u src/external/mit/xorg/bin/oclock/Makefile:1.2 src/external/mit/xorg/bin/oclock/Makefile:1.3
--- src/external/mit/xorg/bin/oclock/Makefile:1.2 Sun Nov 21 02:33:40 2010
+++ src/external/mit/xorg/bin/oclock/Makefile Fri May 31 06:24:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 02:33:40 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@ LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/setxkbmap/Makefile
diff -u src/external/mit/xorg/bin/setxkbmap/Makefile:1.2 src/external/mit/xorg/bin/setxkbmap/Makefile:1.3
--- src/external/mit/xorg/bin/setxkbmap/Makefile:1.2 Tue Oct 14 23:37:19 2008
+++ src/external/mit/xorg/bin/setxkbmap/Makefile Fri May 31 06:24:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@ LDADD+= -lxkbfile -lXext -lX11
DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
X11EXTRAMANDEFS+= -e 's,__xkbconfigroot__,${X11LIBDIR}/xkb,g'
Index: src/external/mit/xorg/bin/viewres/Makefile
diff -u src/external/mit/xorg/bin/viewres/Makefile:1.2 src/external/mit/xorg/bin/viewres/Makefile:1.3
--- src/external/mit/xorg/bin/viewres/Makefile:1.2 Fri May 21 06:04:36 2010
+++ src/external/mit/xorg/bin/viewres/Makefile Fri May 31 06:24:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:36 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xclipboard/Makefile
diff -u src/external/mit/xorg/bin/xclipboard/Makefile:1.2 src/external/mit/xorg/bin/xclipboard/Makefile:1.3
--- src/external/mit/xorg/bin/xclipboard/Makefile:1.2 Mon Nov 9 00:43:39 2009
+++ src/external/mit/xorg/bin/xclipboard/Makefile Fri May 31 06:24:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/11/09 00:43:39 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xclock/Makefile
diff -u src/external/mit/xorg/bin/xclock/Makefile:1.2 src/external/mit/xorg/bin/xclock/Makefile:1.3
--- src/external/mit/xorg/bin/xclock/Makefile:1.2 Mon Nov 9 00:10:47 2009
+++ src/external/mit/xorg/bin/xclock/Makefile Fri May 31 06:24:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/11/09 00:10:47 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
.include bsd.own.mk
@@ -17,6 +17,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH:
CVS commit: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:46:39 UTC 2013 Modified Files: xsrc/external/mit/xauth/dist: process.c Log Message: apply __UNCONST() if it exists. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xauth/dist/process.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/xauth/dist/process.c diff -u xsrc/external/mit/xauth/dist/process.c:1.1.1.5 xsrc/external/mit/xauth/dist/process.c:1.2 --- xsrc/external/mit/xauth/dist/process.c:1.1.1.5 Fri May 31 06:13:10 2013 +++ xsrc/external/mit/xauth/dist/process.c Fri May 31 06:46:39 2013 @@ -1894,7 +1894,10 @@ do_generate(const char *inputfilename, i auth_in-name = DEFAULT_PROTOCOL; } else - auth_in-name = protoname; +#ifndef __UNCONST +# define __UNCONST(x) x +#endif + auth_in-name = __UNCONST(protoname); auth_in-name_length = strlen(auth_in-name); auth_in-data = authdata; auth_in-data_length = authdatalen;
CVS commit: src/external/mit/xorg/bin/xcutsel
Module Name:src
Committed By: mrg
Date: Fri May 31 06:46:55 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xcutsel: Makefile
Log Message:
find the new manual location.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xcutsel/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/xcutsel/Makefile
diff -u src/external/mit/xorg/bin/xcutsel/Makefile:1.1.1.1 src/external/mit/xorg/bin/xcutsel/Makefile:1.2
--- src/external/mit/xorg/bin/xcutsel/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xcutsel/Makefile Fri May 31 06:46:55 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 06:46:55 mrg Exp $
.include bsd.own.mk
@@ -9,6 +9,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.xclipboard}
+.PATH: ${X11SRCDIR.xclipboard}/man
.include bsd.x11.mk
.include bsd.prog.mk
CVS commit: src/external/mit/xorg/bin/xev
Module Name:src
Committed By: mrg
Date: Fri May 31 06:47:07 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xev: Makefile
Log Message:
this needs xrandr now.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xev/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/xev/Makefile
diff -u src/external/mit/xorg/bin/xev/Makefile:1.2 src/external/mit/xorg/bin/xev/Makefile:1.3
--- src/external/mit/xorg/bin/xev/Makefile:1.2 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xev/Makefile Fri May 31 06:47:07 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:47:07 mrg Exp $
.include bsd.own.mk
PROG= xev
-LDADD+= -lX11
-DPADD+= ${LIBX11}
+LDADD+= -lX11 -lXrandr
+DPADD+= ${LIBX11} ${LIBXRANDR}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/xdpyinfo
Module Name:src
Committed By: mrg
Date: Fri May 31 06:47:31 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdpyinfo: Makefile
Log Message:
convert to generated config.h. add libX11-xcb.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xdpyinfo/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/xdpyinfo/Makefile
diff -u src/external/mit/xorg/bin/xdpyinfo/Makefile:1.4 src/external/mit/xorg/bin/xdpyinfo/Makefile:1.5
--- src/external/mit/xorg/bin/xdpyinfo/Makefile:1.4 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xdpyinfo/Makefile Fri May 31 06:47:31 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2013/05/31 06:47:31 mrg Exp $
.include bsd.own.mk
@@ -6,13 +6,14 @@
PROG= xdpyinfo
-CPPFLAGS+=-DMITSHM -DXKB -DXINPUT -DXRENDER
-CPPFLAGS+=-DPANORAMIX -DXF86VIDMODE -DXFreeXDGA -DXF86MISC
+CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
-LDADD+= -lXtst -lXi -lXrender -lXinerama \
- -lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11
-DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} \
- ${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXEXT} ${LIBX11}
+LDADD+= -lXtst -lXi -lXrender -lXinerama -lXcomposite \
+ -lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11 \
+ -lX11-xcb
+DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} ${LIBXCOMPOSITE} \
+ ${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXXF86MISC} ${LIBXEXT} ${LIBX11} \
+ ${LIBX11XCB}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: xsrc/external/mit/xdpyinfo/include
Module Name:xsrc Committed By: mrg Date: Fri May 31 06:47:44 UTC 2013 Added Files: xsrc/external/mit/xdpyinfo/include: config.h Log Message: add generated config.h for xdpyinfo To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xdpyinfo/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/xdpyinfo/include/config.h diff -u /dev/null xsrc/external/mit/xdpyinfo/include/config.h:1.1 --- /dev/null Fri May 31 06:47:44 2013 +++ xsrc/external/mit/xdpyinfo/include/config.h Fri May 31 06:47:44 2013 @@ -0,0 +1,122 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the inttypes.h header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the memory.h header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the stdint.h header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the stdlib.h header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the strings.h header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the string.h header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the sys/stat.h header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the sys/types.h header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the unistd.h header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the X11/extensions/dmxext.h header file. */ +/* #undef HAVE_X11_EXTENSIONS_DMXEXT_H */ + +/* Define to 1 if you have the X11/extensions/multibuf.h header file. */ +#define HAVE_X11_EXTENSIONS_MULTIBUF_H 1 + +/* Define to 1 if you have the X11/extensions/record.h header file. */ +#define HAVE_X11_EXTENSIONS_RECORD_H 1 + +/* Define to 1 if you have the X11/extensions/Xcomposite.h header file. */ +#define HAVE_X11_EXTENSIONS_XCOMPOSITE_H 1 + +/* Define to 1 if you have the X11/extensions/xf86dgaproto.h header file. */ +#define HAVE_X11_EXTENSIONS_XF86DGAPROTO_H 1 + +/* Define to 1 if you have the X11/extensions/xf86dgastr.h header file. */ +#define HAVE_X11_EXTENSIONS_XF86DGASTR_H 1 + +/* Define to 1 if you have the X11/extensions/xf86dga.h header file. */ +#define HAVE_X11_EXTENSIONS_XF86DGA_H 1 + +/* Define to 1 if you have the X11/extensions/xf86misc.h header file. */ +#define HAVE_X11_EXTENSIONS_XF86MISC_H 1 + +/* Define to 1 if you have the X11/extensions/xf86mscstr.h header file. */ +#define HAVE_X11_EXTENSIONS_XF86MSCSTR_H 1 + +/* Define to 1 if you have the X11/extensions/xf86vmode.h header file. */ +#define HAVE_X11_EXTENSIONS_XF86VMODE_H 1 + +/* Define to 1 if you have the X11/extensions/xf86vmproto.h header file. */ +#define HAVE_X11_EXTENSIONS_XF86VMPROTO_H 1 + +/* Define to 1 if you have the X11/extensions/xf86vmstr.h header file. */ +#define HAVE_X11_EXTENSIONS_XF86VMSTR_H 1 + +/* Define to 1 if you have the X11/extensions/Xinerama.h header file. */ +#define HAVE_X11_EXTENSIONS_XINERAMA_H 1 + +/* Define to 1 if you have the X11/extensions/XInput.h header file. */ +#define HAVE_X11_EXTENSIONS_XINPUT_H 1 + +/* Define to 1 if you have the X11/extensions/XKB.h header file. */ +#define HAVE_X11_EXTENSIONS_XKB_H 1 + +/* Define to 1 if you have the X11/extensions/Xrender.h header file. */ +#define HAVE_X11_EXTENSIONS_XRENDER_H 1 + +/* Define to 1 if you have the X11/extensions/XShm.h header file. */ +#define HAVE_X11_EXTENSIONS_XSHM_H 1 + +/* Define to 1 if you have the X11/extensions/Xxf86dga.h header file. */ +#define HAVE_X11_EXTENSIONS_XXF86DGA_H 1 + +/* Define to 1 if you have the X11/XKBlib.h header file. */ +#define HAVE_X11_XKBLIB_H 1 + +/* Name of package */ +#define PACKAGE xdpyinfo + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=xorg; + +/* Define to the full name of this package. */ +#define PACKAGE_NAME xdpyinfo + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING xdpyinfo 1.3.1 + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME xdpyinfo + +/* Define to the home page for this package. */ +#define PACKAGE_URL + +/* Define to the version of this package. */ +#define PACKAGE_VERSION 1.3.1 + +/* Major version of this package */ +#define PACKAGE_VERSION_MAJOR 1 + +/* Minor version of this package */ +#define PACKAGE_VERSION_MINOR 3 + +/* Patch version of this package */ +#define PACKAGE_VERSION_PATCHLEVEL 1 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION 1.3.1
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Fri May 31 06:48:43 UTC 2013
Modified Files:
src/share/mk: bsd.README bsd.prog.mk
Log Message:
add LIBX11_XCB; unfortunately since the library is named with a -
in it, we have to use an ugly hard coded assignment for now.
(could be cleaned up with more make variable magic i'm sure.)
To generate a diff of this commit:
cvs rdiff -u -r1.316 -r1.317 src/share/mk/bsd.README
cvs rdiff -u -r1.283 -r1.284 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.316 src/share/mk/bsd.README:1.317
--- src/share/mk/bsd.README:1.316 Sun Apr 28 04:44:21 2013
+++ src/share/mk/bsd.README Fri May 31 06:48:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.316 2013/04/28 04:44:21 joerg Exp $
+# $NetBSD: bsd.README,v 1.317 2013/05/31 06:48:43 mrg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -1584,6 +1584,7 @@ DPADD Additional dependencies for the p
LIBICE?= ${DESTDIR}/usr/X11R7/lib/libICE.a
LIBSM?= ${DESTDIR}/usr/X11R7/lib/libSM.a
LIBX11?= ${DESTDIR}/usr/X11R7/lib/libX11.a
+ LIBX11_XCB?= ${DESTDIR}/usr/X11R7/lib/libX11-xcb.a
LIBXTRAP?= ${DESTDIR}/usr/X11R7/lib/libXTrap.a
LIBXAU?= ${DESTDIR}/usr/X11R7/lib/libXau.a
LIBXAW?= ${DESTDIR}/usr/X11R7/lib/libXaw.a
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.283 src/share/mk/bsd.prog.mk:1.284
--- src/share/mk/bsd.prog.mk:1.283 Thu Apr 4 21:14:36 2013
+++ src/share/mk/bsd.prog.mk Fri May 31 06:48:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.283 2013/04/04 21:14:36 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.284 2013/05/31 06:48:43 mrg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -269,6 +269,9 @@ LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}
.endif
.endfor
+# Ugly one-offs
+LIBX11_XCB= ${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
+
.if defined(RESCUEDIR)
CPPFLAGS+= -DRESCUEDIR=\${RESCUEDIR}\
.endif
CVS commit: src/external/mit/xorg/bin/xditview
Module Name:src
Committed By: mrg
Date: Fri May 31 06:50:45 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xditview: Makefile
Log Message:
find newly named and relocated app defaults.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xditview/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/xditview/Makefile
diff -u src/external/mit/xorg/bin/xditview/Makefile:1.2 src/external/mit/xorg/bin/xditview/Makefile:1.3
--- src/external/mit/xorg/bin/xditview/Makefile:1.2 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xditview/Makefile Fri May 31 06:50:45 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:50:45 mrg Exp $
.include bsd.own.mk
@@ -9,7 +9,7 @@ SRCS= xditview.c Dvi.c draw.c font.c lex
CPPFLAGS+= -DHAS_MKSTEMP
CPPFLAGS+= -DUSE_XFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
-APPDEFS=Xditview.ad Xditview-chrtr.ad
+APPDEFS=Xditview Xditview-chrtr
LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
@@ -21,6 +21,7 @@ FILES= ldblarrow rdblarrow
FILESDIR=${X11INCDIR}/X11/bitmaps
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
CVS import: xsrc/external/mit/util-macros/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:18:14 UTC 2013 Update of /cvsroot/xsrc/external/mit/util-macros/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15121 Log Message: initial import of util-macros-1.17 Status: Vendor Tag: xorg Release Tags: util-macros-1-17 U xsrc/external/mit/util-macros/dist/xorg-macros.pc.in U xsrc/external/mit/util-macros/dist/install-sh U xsrc/external/mit/util-macros/dist/README U xsrc/external/mit/util-macros/dist/aclocal.m4 U xsrc/external/mit/util-macros/dist/missing U xsrc/external/mit/util-macros/dist/configure U xsrc/external/mit/util-macros/dist/Makefile.in U xsrc/external/mit/util-macros/dist/INSTALL U xsrc/external/mit/util-macros/dist/xorgversion.m4 U xsrc/external/mit/util-macros/dist/Makefile.am U xsrc/external/mit/util-macros/dist/COPYING U xsrc/external/mit/util-macros/dist/configure.ac U xsrc/external/mit/util-macros/dist/xorg-macros.m4.in U xsrc/external/mit/util-macros/dist/ChangeLog No conflicts created by this import
CVS import: xsrc/external/mit/xcalc/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:18:16 UTC 2013 Update of /cvsroot/xsrc/external/mit/xcalc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25091 Log Message: initial import of xcalc-1.0.5 Status: Vendor Tag: xorg Release Tags: xcalc-1-0-5 U xsrc/external/mit/xcalc/dist/configure.ac U xsrc/external/mit/xcalc/dist/INSTALL U xsrc/external/mit/xcalc/dist/xcalc.c U xsrc/external/mit/xcalc/dist/config.h.in U xsrc/external/mit/xcalc/dist/aclocal.m4 U xsrc/external/mit/xcalc/dist/install-sh U xsrc/external/mit/xcalc/dist/actions.c U xsrc/external/mit/xcalc/dist/configure U xsrc/external/mit/xcalc/dist/Makefile.am U xsrc/external/mit/xcalc/dist/xcalc.h U xsrc/external/mit/xcalc/dist/COPYING U xsrc/external/mit/xcalc/dist/ChangeLog U xsrc/external/mit/xcalc/dist/depcomp U xsrc/external/mit/xcalc/dist/config.sub U xsrc/external/mit/xcalc/dist/missing U xsrc/external/mit/xcalc/dist/config.guess U xsrc/external/mit/xcalc/dist/Makefile.in U xsrc/external/mit/xcalc/dist/README U xsrc/external/mit/xcalc/dist/math.c N xsrc/external/mit/xcalc/dist/man/xcalc.man N xsrc/external/mit/xcalc/dist/man/Makefile.am N xsrc/external/mit/xcalc/dist/man/Makefile.in U xsrc/external/mit/xcalc/dist/app-defaults/XCalc-color U xsrc/external/mit/xcalc/dist/app-defaults/XCalc No conflicts created by this import
CVS import: xsrc/external/mit/xfd/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:18:17 UTC 2013 Update of /cvsroot/xsrc/external/mit/xfd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15088 Log Message: initial import of xfd-1.1.1 Status: Vendor Tag: xorg Release Tags: xfd-1-1-1 U xsrc/external/mit/xfd/dist/config.guess U xsrc/external/mit/xfd/dist/README U xsrc/external/mit/xfd/dist/COPYING U xsrc/external/mit/xfd/dist/config.h.in U xsrc/external/mit/xfd/dist/config.sub U xsrc/external/mit/xfd/dist/grid.h U xsrc/external/mit/xfd/dist/depcomp U xsrc/external/mit/xfd/dist/missing U xsrc/external/mit/xfd/dist/install-sh U xsrc/external/mit/xfd/dist/grid.c U xsrc/external/mit/xfd/dist/Makefile.in U xsrc/external/mit/xfd/dist/xfd.c U xsrc/external/mit/xfd/dist/aclocal.m4 U xsrc/external/mit/xfd/dist/INSTALL U xsrc/external/mit/xfd/dist/configure.ac U xsrc/external/mit/xfd/dist/configure U xsrc/external/mit/xfd/dist/gridP.h U xsrc/external/mit/xfd/dist/Makefile.am U xsrc/external/mit/xfd/dist/ChangeLog U xsrc/external/mit/xfd/dist/app-defaults/Xfd N xsrc/external/mit/xfd/dist/man/Makefile.in N xsrc/external/mit/xfd/dist/man/Makefile.am N xsrc/external/mit/xfd/dist/man/xfd.man No conflicts created by this import
CVS import: xsrc/external/mit/xfontsel/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:18:19 UTC 2013 Update of /cvsroot/xsrc/external/mit/xfontsel/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9644 Log Message: initial import of xfontsel-1.0.5 Status: Vendor Tag: xorg Release Tags: xfontsel-1-0-5 U xsrc/external/mit/xfontsel/dist/configure U xsrc/external/mit/xfontsel/dist/Makefile.in U xsrc/external/mit/xfontsel/dist/README U xsrc/external/mit/xfontsel/dist/aclocal.m4 U xsrc/external/mit/xfontsel/dist/INSTALL U xsrc/external/mit/xfontsel/dist/COPYING U xsrc/external/mit/xfontsel/dist/ChangeLog U xsrc/external/mit/xfontsel/dist/install-sh U xsrc/external/mit/xfontsel/dist/configure.ac U xsrc/external/mit/xfontsel/dist/ULabelP.h U xsrc/external/mit/xfontsel/dist/Makefile.am U xsrc/external/mit/xfontsel/dist/ULabel.c U xsrc/external/mit/xfontsel/dist/config.sub U xsrc/external/mit/xfontsel/dist/config.guess U xsrc/external/mit/xfontsel/dist/config.h.in U xsrc/external/mit/xfontsel/dist/ULabel.h U xsrc/external/mit/xfontsel/dist/missing U xsrc/external/mit/xfontsel/dist/xfontsel.c U xsrc/external/mit/xfontsel/dist/depcomp U xsrc/external/mit/xfontsel/dist/app-defaults/XFontSel N xsrc/external/mit/xfontsel/dist/man/Makefile.am N xsrc/external/mit/xfontsel/dist/man/Makefile.in N xsrc/external/mit/xfontsel/dist/man/xfontsel.man No conflicts created by this import
CVS import: xsrc/external/mit/xfsinfo/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:18:20 UTC 2013 Update of /cvsroot/xsrc/external/mit/xfsinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26364 Log Message: initial import of xfsinfo-1.0.4 Status: Vendor Tag: xorg Release Tags: xfsinfo-1-0-4 U xsrc/external/mit/xfsinfo/dist/configure.ac U xsrc/external/mit/xfsinfo/dist/README U xsrc/external/mit/xfsinfo/dist/depcomp U xsrc/external/mit/xfsinfo/dist/config.sub U xsrc/external/mit/xfsinfo/dist/Makefile.am U xsrc/external/mit/xfsinfo/dist/INSTALL U xsrc/external/mit/xfsinfo/dist/Makefile.in U xsrc/external/mit/xfsinfo/dist/xfsinfo.c U xsrc/external/mit/xfsinfo/dist/aclocal.m4 U xsrc/external/mit/xfsinfo/dist/configure U xsrc/external/mit/xfsinfo/dist/install-sh U xsrc/external/mit/xfsinfo/dist/ChangeLog U xsrc/external/mit/xfsinfo/dist/missing U xsrc/external/mit/xfsinfo/dist/COPYING U xsrc/external/mit/xfsinfo/dist/config.guess U xsrc/external/mit/xfsinfo/dist/config.h.in N xsrc/external/mit/xfsinfo/dist/man/Makefile.am N xsrc/external/mit/xfsinfo/dist/man/xfsinfo.man N xsrc/external/mit/xfsinfo/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xgamma/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:18:21 UTC 2013 Update of /cvsroot/xsrc/external/mit/xgamma/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19633 Log Message: initial import of xgamma-1.0.5 Status: Vendor Tag: xorg Release Tags: xgamma-1-0-5 U xsrc/external/mit/xgamma/dist/install-sh U xsrc/external/mit/xgamma/dist/xgamma.c U xsrc/external/mit/xgamma/dist/depcomp U xsrc/external/mit/xgamma/dist/Makefile.in U xsrc/external/mit/xgamma/dist/README U xsrc/external/mit/xgamma/dist/aclocal.m4 U xsrc/external/mit/xgamma/dist/INSTALL U xsrc/external/mit/xgamma/dist/configure.ac U xsrc/external/mit/xgamma/dist/Makefile.am U xsrc/external/mit/xgamma/dist/configure U xsrc/external/mit/xgamma/dist/config.h.in U xsrc/external/mit/xgamma/dist/config.sub U xsrc/external/mit/xgamma/dist/config.guess U xsrc/external/mit/xgamma/dist/missing U xsrc/external/mit/xgamma/dist/ChangeLog U xsrc/external/mit/xgamma/dist/COPYING N xsrc/external/mit/xgamma/dist/man/xgamma.man N xsrc/external/mit/xgamma/dist/man/Makefile.in N xsrc/external/mit/xgamma/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xgc/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:18:25 UTC 2013 Update of /cvsroot/xsrc/external/mit/xgc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25444 Log Message: initial import of xgc-1.0.4 Status: Vendor Tag: xorg Release Tags: xgc-1-0-4 U xsrc/external/mit/xgc/dist/config.sub U xsrc/external/mit/xgc/dist/gram.h U xsrc/external/mit/xgc/dist/planemask.c U xsrc/external/mit/xgc/dist/lex.l U xsrc/external/mit/xgc/dist/dashlist.c U xsrc/external/mit/xgc/dist/depcomp U xsrc/external/mit/xgc/dist/missing U xsrc/external/mit/xgc/dist/ylwrap U xsrc/external/mit/xgc/dist/config.guess U xsrc/external/mit/xgc/dist/COPYING U xsrc/external/mit/xgc/dist/tests.c U xsrc/external/mit/xgc/dist/Bugs U xsrc/external/mit/xgc/dist/config.h.in U xsrc/external/mit/xgc/dist/interpret.c U xsrc/external/mit/xgc/dist/testfrac.c U xsrc/external/mit/xgc/dist/tile U xsrc/external/mit/xgc/dist/Makefile.am U xsrc/external/mit/xgc/dist/ChangeLog U xsrc/external/mit/xgc/dist/configure.ac U xsrc/external/mit/xgc/dist/configure U xsrc/external/mit/xgc/dist/getfile.c U xsrc/external/mit/xgc/dist/gram.c U xsrc/external/mit/xgc/dist/record.c U xsrc/external/mit/xgc/dist/main.c U xsrc/external/mit/xgc/dist/lex.c U xsrc/external/mit/xgc/dist/install-sh U xsrc/external/mit/xgc/dist/aclocal.m4 U xsrc/external/mit/xgc/dist/text.c U xsrc/external/mit/xgc/dist/Makefile.in U xsrc/external/mit/xgc/dist/xgc.h U xsrc/external/mit/xgc/dist/gram.y U xsrc/external/mit/xgc/dist/constants.h U xsrc/external/mit/xgc/dist/INSTALL U xsrc/external/mit/xgc/dist/choice.c U xsrc/external/mit/xgc/dist/README N xsrc/external/mit/xgc/dist/man/Makefile.am N xsrc/external/mit/xgc/dist/man/xgc.man N xsrc/external/mit/xgc/dist/man/Makefile.in U xsrc/external/mit/xgc/dist/Written/Interface U xsrc/external/mit/xgc/dist/Written/Notes2 U xsrc/external/mit/xgc/dist/Written/FilledRects U xsrc/external/mit/xgc/dist/Written/Jim U xsrc/external/mit/xgc/dist/Written/Notes U xsrc/external/mit/xgc/dist/Written/Outline U xsrc/external/mit/xgc/dist/Written/Widget U xsrc/external/mit/xgc/dist/app-defaults/Xgc-color U xsrc/external/mit/xgc/dist/app-defaults/Xgc No conflicts created by this import
CVS import: xsrc/external/mit/xinit/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:18:28 UTC 2013 Update of /cvsroot/xsrc/external/mit/xinit/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26054 Log Message: initial import of xinit-1.3.2 Status: Vendor Tag: xorg Release Tags: xinit-1-3-2 U xsrc/external/mit/xinit/dist/aclocal.m4 U xsrc/external/mit/xinit/dist/autogen.sh U xsrc/external/mit/xinit/dist/ChangeLog U xsrc/external/mit/xinit/dist/config.guess U xsrc/external/mit/xinit/dist/config.h.in U xsrc/external/mit/xinit/dist/config.sub U xsrc/external/mit/xinit/dist/configure U xsrc/external/mit/xinit/dist/configure.ac U xsrc/external/mit/xinit/dist/COPYING U xsrc/external/mit/xinit/dist/cpprules.in U xsrc/external/mit/xinit/dist/depcomp U xsrc/external/mit/xinit/dist/INSTALL U xsrc/external/mit/xinit/dist/install-sh U xsrc/external/mit/xinit/dist/Makefile.am U xsrc/external/mit/xinit/dist/Makefile.in U xsrc/external/mit/xinit/dist/missing U xsrc/external/mit/xinit/dist/README C xsrc/external/mit/xinit/dist/startx.cpp C xsrc/external/mit/xinit/dist/xinit.c U xsrc/external/mit/xinit/dist/xinitrc.cpp U xsrc/external/mit/xinit/dist/launchd/console_redirect.c U xsrc/external/mit/xinit/dist/launchd/console_redirect.h U xsrc/external/mit/xinit/dist/launchd/Makefile.am U xsrc/external/mit/xinit/dist/launchd/Makefile.in U xsrc/external/mit/xinit/dist/launchd/privileged_startx/20-font_cache.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/10-tmpdirs.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.am U xsrc/external/mit/xinit/dist/launchd/privileged_startx/client.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.in U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.plist.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.defs U xsrc/external/mit/xinit/dist/launchd/privileged_startx/server.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx_types.h U xsrc/external/mit/xinit/dist/launchd/user_startx/launchd_startx.c U xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.am U xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.in U xsrc/external/mit/xinit/dist/launchd/user_startx/startx.plist.cpp U xsrc/external/mit/xinit/dist/man/Makefile.am U xsrc/external/mit/xinit/dist/man/Makefile.in U xsrc/external/mit/xinit/dist/man/startx.man U xsrc/external/mit/xinit/dist/man/xinit.man 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xinit/dist
CVS import: xsrc/external/mit/xhost/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:18:26 UTC 2013 Update of /cvsroot/xsrc/external/mit/xhost/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17255 Log Message: initial import of xhost-1.0.5 Status: Vendor Tag: xorg Release Tags: xhost-1-0-5 U xsrc/external/mit/xhost/dist/config.h.in U xsrc/external/mit/xhost/dist/AUTHORS U xsrc/external/mit/xhost/dist/COPYING U xsrc/external/mit/xhost/dist/config.sub U xsrc/external/mit/xhost/dist/missing U xsrc/external/mit/xhost/dist/depcomp U xsrc/external/mit/xhost/dist/configure U xsrc/external/mit/xhost/dist/ChangeLog U xsrc/external/mit/xhost/dist/config.guess U xsrc/external/mit/xhost/dist/configure.ac U xsrc/external/mit/xhost/dist/xhost.c U xsrc/external/mit/xhost/dist/INSTALL U xsrc/external/mit/xhost/dist/Makefile.in U xsrc/external/mit/xhost/dist/README U xsrc/external/mit/xhost/dist/aclocal.m4 U xsrc/external/mit/xhost/dist/install-sh U xsrc/external/mit/xhost/dist/Makefile.am N xsrc/external/mit/xhost/dist/man/xhost.man N xsrc/external/mit/xhost/dist/man/Makefile.in N xsrc/external/mit/xhost/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xinput/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:18:29 UTC 2013 Update of /cvsroot/xsrc/external/mit/xinput/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14463 Log Message: initial import of xinput-1.6.0 Status: Vendor Tag: xorg Release Tags: xinput-1-6-0 U xsrc/external/mit/xinput/dist/Makefile.in U xsrc/external/mit/xinput/dist/COPYING U xsrc/external/mit/xinput/dist/missing U xsrc/external/mit/xinput/dist/ChangeLog U xsrc/external/mit/xinput/dist/README U xsrc/external/mit/xinput/dist/install-sh U xsrc/external/mit/xinput/dist/AUTHORS U xsrc/external/mit/xinput/dist/config.h.in U xsrc/external/mit/xinput/dist/Makefile.am U xsrc/external/mit/xinput/dist/config.sub U xsrc/external/mit/xinput/dist/configure U xsrc/external/mit/xinput/dist/config.guess U xsrc/external/mit/xinput/dist/NEWS U xsrc/external/mit/xinput/dist/aclocal.m4 U xsrc/external/mit/xinput/dist/configure.ac U xsrc/external/mit/xinput/dist/depcomp U xsrc/external/mit/xinput/dist/INSTALL U xsrc/external/mit/xinput/dist/man/Makefile.in U xsrc/external/mit/xinput/dist/man/Makefile.am U xsrc/external/mit/xinput/dist/man/xinput.man U xsrc/external/mit/xinput/dist/src/buttonmap.c C xsrc/external/mit/xinput/dist/src/xinput.c U xsrc/external/mit/xinput/dist/src/state.c U xsrc/external/mit/xinput/dist/src/Makefile.in U xsrc/external/mit/xinput/dist/src/setcp.c U xsrc/external/mit/xinput/dist/src/test_xi2.c U xsrc/external/mit/xinput/dist/src/setint.c U xsrc/external/mit/xinput/dist/src/setmode.c U xsrc/external/mit/xinput/dist/src/property.c U xsrc/external/mit/xinput/dist/src/list.c U xsrc/external/mit/xinput/dist/src/test.c U xsrc/external/mit/xinput/dist/src/Makefile.am N xsrc/external/mit/xinput/dist/src/transform.c U xsrc/external/mit/xinput/dist/src/hierarchy.c U xsrc/external/mit/xinput/dist/src/xinput.h U xsrc/external/mit/xinput/dist/src/feedback.c U xsrc/external/mit/xinput/dist/src/setptr.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xinput/dist
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Fri May 31 07:21:57 UTC 2013
Modified Files:
xsrc/external/mit/xinit/dist: startx.cpp
xsrc/external/mit/xinput/dist/src: xinput.c
Removed Files:
xsrc/external/mit/xcalc/dist: autogen.sh xcalc.man
xsrc/external/mit/xfd/dist: xfd.man
xsrc/external/mit/xfd/dist/m4: ax_define_dir.m4
xsrc/external/mit/xfontsel/dist: xfontsel.man
xsrc/external/mit/xfsinfo/dist: xfsinfo.man
xsrc/external/mit/xgamma/dist: xgamma.man
xsrc/external/mit/xgc/dist: xgc.man
xsrc/external/mit/xhost/dist: xhost.man
Log Message:
merge xcalc 1.0.5, xfd 1.1.1, xfontsel 1.0.5, xfsinfo 1.0.4, xgamma 1.0.5,
xgc 1.0.4, and xhost 1.0.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xcalc/dist/autogen.sh
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xcalc/dist/xcalc.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfd/dist/xfd.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfd/dist/m4/ax_define_dir.m4
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfontsel/dist/xfontsel.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfsinfo/dist/xfsinfo.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xgamma/dist/xgamma.man
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xgc/dist/xgc.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xhost/dist/xhost.man
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xinit/dist/startx.cpp
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xinput/dist/src/xinput.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xinit/dist/startx.cpp
diff -u xsrc/external/mit/xinit/dist/startx.cpp:1.2 xsrc/external/mit/xinit/dist/startx.cpp:1.3
--- xsrc/external/mit/xinit/dist/startx.cpp:1.2 Sat Feb 18 08:54:21 2012
+++ xsrc/external/mit/xinit/dist/startx.cpp Fri May 31 07:21:57 2013
@@ -130,6 +130,11 @@ if defaults read $X11_PREFS_DOMAIN dpi
defaultserverargs=$defaultserverargs -dpi `defaults read $X11_PREFS_DOMAIN dpi`
fi
+#else
+enable_xauth=1
+#endif
+
+XCOMM Automatically determine an unused $DISPLAY
d=0
while true ; do
[ -e /tmp/.X$d-lock ] || break
@@ -138,10 +143,6 @@ done
defaultdisplay=:$d
unset d
-#else
-enable_xauth=1
-#endif
-
#if defined(__SCO__) || defined(__UNIXWARE__)
XCOMM SCO -t option: do not start an X server
@@ -200,7 +201,7 @@ XCOMM process client arguments
if [ x$client = x ]; then
client=$defaultclient
-XCOMM if no client arguments either, use rc file instead
+XCOMM For compatibility reasons, only use startxrc if there were no client command line arguments
if [ x$clientargs = x ]; then
if [ -f $userclientrc ]; then
client=$userclientrc
@@ -213,29 +214,38 @@ if [ x$client = x ]; then
client=$scosysclientrc
#endif
fi
-
-clientargs=$defaultclientargs
fi
fi
+XCOMM if no client arguments, use defaults
+if [ x$clientargs = x ]; then
+clientargs=$defaultclientargs
+fi
+
XCOMM process server arguments
if [ x$server = x ]; then
server=$defaultserver
-XCOMM if no server arguments or display either, use defaults
+XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
if [ x$serverargs = x -a x$display = x ]; then
- XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
if [ -f $userserverrc ]; then
server=$userserverrc
elif [ -f $sysserverrc ]; then
server=$sysserverrc
fi
-
- serverargs=$defaultserverargs
- display=$defaultdisplay
fi
fi
+XCOMM if no server arguments, use defaults
+if [ x$serverargs = x ]; then
+serverargs=$defaultserverargs
+fi
+
+XCOMM if no display, use default
+if [ x$display = x ]; then
+display=$defaultdisplay
+fi
+
if [ x$enable_xauth = x1 ] ; then
if [ x$XAUTHORITY = x ]; then
XAUTHORITY=$HOME/.Xauthority
Index: xsrc/external/mit/xinput/dist/src/xinput.c
diff -u xsrc/external/mit/xinput/dist/src/xinput.c:1.2 xsrc/external/mit/xinput/dist/src/xinput.c:1.3
--- xsrc/external/mit/xinput/dist/src/xinput.c:1.2 Thu Aug 11 22:35:10 2011
+++ xsrc/external/mit/xinput/dist/src/xinput.c Fri May 31 07:21:57 2013
@@ -68,7 +68,7 @@ static entry drivers[] =
set_mode
},
{list,
- [--short || --long] [device name...],
+ [--short || --long || --name-only || --id-only] [device name...],
list
},
{query-state,
@@ -104,6 +104,10 @@ static entry drivers[] =
device,
test_xi2,
},
+{ map-to-output,
+ device output name,
+ map_to_output,
+},
#endif
{ list-props,
device [device ...],
@@ -133,13 +137,23 @@ static entry drivers[] =
device [--type=atom|float|int] [--format=8|16|32] property val [val ...],
set_prop
},
+{
+ disable,
+ device,
+ disable,
+},
+{
+ enable,
+
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Fri May 31 07:22:22 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xcalc: Makefile
src/external/mit/xorg/bin/xfd: Makefile
src/external/mit/xorg/bin/xfontsel: Makefile
src/external/mit/xorg/bin/xfsinfo: Makefile
src/external/mit/xorg/bin/xgamma: Makefile
src/external/mit/xorg/bin/xgc: Makefile
src/external/mit/xorg/bin/xhost: Makefile
Log Message:
find manuals in new locations
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xcalc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xfd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xfontsel/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xfsinfo/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xgamma/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xgc/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xhost/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/xcalc/Makefile
diff -u src/external/mit/xorg/bin/xcalc/Makefile:1.2 src/external/mit/xorg/bin/xcalc/Makefile:1.3
--- src/external/mit/xorg/bin/xcalc/Makefile:1.2 Fri May 21 06:04:36 2010
+++ src/external/mit/xorg/bin/xcalc/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:36 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
.include bsd.own.mk
@@ -12,6 +12,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xfd/Makefile
diff -u src/external/mit/xorg/bin/xfd/Makefile:1.2 src/external/mit/xorg/bin/xfd/Makefile:1.3
--- src/external/mit/xorg/bin/xfd/Makefile:1.2 Sun Nov 21 01:25:33 2010
+++ src/external/mit/xorg/bin/xfd/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 01:25:33 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
.include bsd.own.mk
@@ -16,6 +16,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xfontsel/Makefile
diff -u src/external/mit/xorg/bin/xfontsel/Makefile:1.2 src/external/mit/xorg/bin/xfontsel/Makefile:1.3
--- src/external/mit/xorg/bin/xfontsel/Makefile:1.2 Sun Nov 21 01:25:33 2010
+++ src/external/mit/xorg/bin/xfontsel/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 01:25:33 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
.include bsd.own.mk
@@ -12,6 +12,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xfsinfo/Makefile
diff -u src/external/mit/xorg/bin/xfsinfo/Makefile:1.1.1.1 src/external/mit/xorg/bin/xfsinfo/Makefile:1.2
--- src/external/mit/xorg/bin/xfsinfo/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xfsinfo/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
.include bsd.own.mk
@@ -8,6 +8,7 @@ LDADD+= -lFS
DPADD+= ${LIBFS}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xgamma/Makefile
diff -u src/external/mit/xorg/bin/xgamma/Makefile:1.1.1.1 src/external/mit/xorg/bin/xgamma/Makefile:1.2
--- src/external/mit/xorg/bin/xgamma/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xgamma/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
.include bsd.own.mk
@@ -9,6 +9,7 @@ DPADD+= ${LIBXXF86VM} ${LIBXAW} ${LIBXMU
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xgc/Makefile
diff -u src/external/mit/xorg/bin/xgc/Makefile:1.3 src/external/mit/xorg/bin/xgc/Makefile:1.4
--- src/external/mit/xorg/bin/xgc/Makefile:1.3 Sun Nov 21 02:33:41 2010
+++ src/external/mit/xorg/bin/xgc/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/11/21 02:33:41 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 07:22:21 mrg Exp $
.include bsd.own.mk
@@ -16,6 +16,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXEXT}
CVS import: xsrc/external/mit/xload/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:18 UTC 2013 Update of /cvsroot/xsrc/external/mit/xload/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14854 Log Message: initial import of xload-1.1.1 Status: Vendor Tag: xorg Release Tags: xload-1-1-1 U xsrc/external/mit/xload/dist/Makefile.in U xsrc/external/mit/xload/dist/depcomp U xsrc/external/mit/xload/dist/missing U xsrc/external/mit/xload/dist/INSTALL U xsrc/external/mit/xload/dist/aclocal.m4 U xsrc/external/mit/xload/dist/xload.c U xsrc/external/mit/xload/dist/COPYING U xsrc/external/mit/xload/dist/install-sh 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/config.h.in U xsrc/external/mit/xload/dist/config.guess U xsrc/external/mit/xload/dist/ChangeLog U xsrc/external/mit/xload/dist/get_load.c U xsrc/external/mit/xload/dist/xload.h U xsrc/external/mit/xload/dist/xload.bit U xsrc/external/mit/xload/dist/config.sub U xsrc/external/mit/xload/dist/README U xsrc/external/mit/xload/dist/configure U xsrc/external/mit/xload/dist/m4/ax_define_dir.m4 U xsrc/external/mit/xload/dist/app-defaults/XLoad N xsrc/external/mit/xload/dist/man/xload.man N xsrc/external/mit/xload/dist/man/Makefile.am N xsrc/external/mit/xload/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xlogo/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:20 UTC 2013 Update of /cvsroot/xsrc/external/mit/xlogo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14547 Log Message: initial import of xlogo-1.0.4 Status: Vendor Tag: xorg Release Tags: xlogo-1-0-4 U xsrc/external/mit/xlogo/dist/config.h.in U xsrc/external/mit/xlogo/dist/missing U xsrc/external/mit/xlogo/dist/depcomp U xsrc/external/mit/xlogo/dist/README U xsrc/external/mit/xlogo/dist/Logo.c U xsrc/external/mit/xlogo/dist/xlogo.c U xsrc/external/mit/xlogo/dist/install-sh U xsrc/external/mit/xlogo/dist/LogoP.h U xsrc/external/mit/xlogo/dist/Logo.h U xsrc/external/mit/xlogo/dist/aclocal.m4 U xsrc/external/mit/xlogo/dist/RenderLogo.c U xsrc/external/mit/xlogo/dist/configure.ac U xsrc/external/mit/xlogo/dist/COPYING U xsrc/external/mit/xlogo/dist/config.guess U xsrc/external/mit/xlogo/dist/Makefile.in U xsrc/external/mit/xlogo/dist/RenderLogo.h U xsrc/external/mit/xlogo/dist/xlogo.h U xsrc/external/mit/xlogo/dist/config.sub U xsrc/external/mit/xlogo/dist/INSTALL U xsrc/external/mit/xlogo/dist/configure U xsrc/external/mit/xlogo/dist/Makefile.am U xsrc/external/mit/xlogo/dist/ChangeLog U xsrc/external/mit/xlogo/dist/app-defaults/XLogo-color U xsrc/external/mit/xlogo/dist/app-defaults/XLogo N xsrc/external/mit/xlogo/dist/man/Makefile.am N xsrc/external/mit/xlogo/dist/man/xlogo.man N xsrc/external/mit/xlogo/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xlsatoms/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:21 UTC 2013 Update of /cvsroot/xsrc/external/mit/xlsatoms/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13112 Log Message: initial import of xlsatoms-1.1.1 Status: Vendor Tag: xorg Release Tags: xlsatoms-1-1-1 U xsrc/external/mit/xlsatoms/dist/INSTALL U xsrc/external/mit/xlsatoms/dist/Makefile.in U xsrc/external/mit/xlsatoms/dist/config.sub U xsrc/external/mit/xlsatoms/dist/configure.ac U xsrc/external/mit/xlsatoms/dist/xlsatoms.c U xsrc/external/mit/xlsatoms/dist/Makefile.am U xsrc/external/mit/xlsatoms/dist/COPYING U xsrc/external/mit/xlsatoms/dist/config.guess U xsrc/external/mit/xlsatoms/dist/install-sh U xsrc/external/mit/xlsatoms/dist/config.h.in U xsrc/external/mit/xlsatoms/dist/README U xsrc/external/mit/xlsatoms/dist/aclocal.m4 U xsrc/external/mit/xlsatoms/dist/ChangeLog U xsrc/external/mit/xlsatoms/dist/missing U xsrc/external/mit/xlsatoms/dist/configure U xsrc/external/mit/xlsatoms/dist/depcomp N xsrc/external/mit/xlsatoms/dist/man/Makefile.am N xsrc/external/mit/xlsatoms/dist/man/xlsatoms.man N xsrc/external/mit/xlsatoms/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xmessage/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:24 UTC 2013 Update of /cvsroot/xsrc/external/mit/xmessage/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29215 Log Message: initial import of xmessage-1.0.3 Status: Vendor Tag: xorg Release Tags: xmessage-1-0-3 U xsrc/external/mit/xmessage/dist/Makefile.am U xsrc/external/mit/xmessage/dist/depcomp U xsrc/external/mit/xmessage/dist/missing U xsrc/external/mit/xmessage/dist/config.guess U xsrc/external/mit/xmessage/dist/Makefile.in U xsrc/external/mit/xmessage/dist/xmessage.man U xsrc/external/mit/xmessage/dist/readfile.h U xsrc/external/mit/xmessage/dist/install-sh U xsrc/external/mit/xmessage/dist/xmessage.h U xsrc/external/mit/xmessage/dist/aclocal.m4 U xsrc/external/mit/xmessage/dist/COPYING U xsrc/external/mit/xmessage/dist/configure.ac U xsrc/external/mit/xmessage/dist/makeform.c U xsrc/external/mit/xmessage/dist/INSTALL U xsrc/external/mit/xmessage/dist/README U xsrc/external/mit/xmessage/dist/config.sub U xsrc/external/mit/xmessage/dist/readfile.c U xsrc/external/mit/xmessage/dist/config.h.in U xsrc/external/mit/xmessage/dist/configure U xsrc/external/mit/xmessage/dist/xmessage.c U xsrc/external/mit/xmessage/dist/ChangeLog N xsrc/external/mit/xmessage/dist/app-defaults/Xmessage-color N xsrc/external/mit/xmessage/dist/app-defaults/Xmessage No conflicts created by this import
CVS import: xsrc/external/mit/xrandr/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:26 UTC 2013 Update of /cvsroot/xsrc/external/mit/xrandr/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11018 Log Message: initial import of xrandr-1.4.0 Status: Vendor Tag: xorg Release Tags: xrandr-1-4-0 U xsrc/external/mit/xrandr/dist/Makefile.am C xsrc/external/mit/xrandr/dist/xrandr.c U xsrc/external/mit/xrandr/dist/INSTALL U xsrc/external/mit/xrandr/dist/depcomp U xsrc/external/mit/xrandr/dist/ChangeLog U xsrc/external/mit/xrandr/dist/COPYING U xsrc/external/mit/xrandr/dist/README U xsrc/external/mit/xrandr/dist/configure U xsrc/external/mit/xrandr/dist/xrandr_test.pl U xsrc/external/mit/xrandr/dist/Makefile.in U xsrc/external/mit/xrandr/dist/configure.ac U xsrc/external/mit/xrandr/dist/aclocal.m4 U xsrc/external/mit/xrandr/dist/keystone.5c U xsrc/external/mit/xrandr/dist/config.sub U xsrc/external/mit/xrandr/dist/config.h.in U xsrc/external/mit/xrandr/dist/install-sh U xsrc/external/mit/xrandr/dist/config.guess U xsrc/external/mit/xrandr/dist/missing U xsrc/external/mit/xrandr/dist/man/xrandr.man U xsrc/external/mit/xrandr/dist/man/Makefile.am U xsrc/external/mit/xrandr/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrandr/dist
CVS import: xsrc/external/mit/xrefresh/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:28 UTC 2013 Update of /cvsroot/xsrc/external/mit/xrefresh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25585 Log Message: initial import of xrefresh-1.0.5 Status: Vendor Tag: xorg Release Tags: xrefresh-1-0-5 U xsrc/external/mit/xrefresh/dist/INSTALL U xsrc/external/mit/xrefresh/dist/config.sub U xsrc/external/mit/xrefresh/dist/COPYING U xsrc/external/mit/xrefresh/dist/depcomp U xsrc/external/mit/xrefresh/dist/missing U xsrc/external/mit/xrefresh/dist/config.h.in U xsrc/external/mit/xrefresh/dist/config.guess U xsrc/external/mit/xrefresh/dist/aclocal.m4 U xsrc/external/mit/xrefresh/dist/configure.ac U xsrc/external/mit/xrefresh/dist/install-sh U xsrc/external/mit/xrefresh/dist/configure U xsrc/external/mit/xrefresh/dist/Makefile.am U xsrc/external/mit/xrefresh/dist/xrefresh.c U xsrc/external/mit/xrefresh/dist/ChangeLog U xsrc/external/mit/xrefresh/dist/README U xsrc/external/mit/xrefresh/dist/Makefile.in N xsrc/external/mit/xrefresh/dist/man/Makefile.in N xsrc/external/mit/xrefresh/dist/man/Makefile.am N xsrc/external/mit/xrefresh/dist/man/xrefresh.man No conflicts created by this import
CVS import: xsrc/external/mit/xmag/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:23 UTC 2013 Update of /cvsroot/xsrc/external/mit/xmag/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12633 Log Message: initial import of xmag-1.0.5 Status: Vendor Tag: xorg Release Tags: xmag-1-0-5 U xsrc/external/mit/xmag/dist/RootWin.h U xsrc/external/mit/xmag/dist/configure.ac U xsrc/external/mit/xmag/dist/aclocal.m4 U xsrc/external/mit/xmag/dist/Scale.h U xsrc/external/mit/xmag/dist/install-sh U xsrc/external/mit/xmag/dist/ScaleP.h U xsrc/external/mit/xmag/dist/CutPaste.h U xsrc/external/mit/xmag/dist/INSTALL U xsrc/external/mit/xmag/dist/Scale.txt N xsrc/external/mit/xmag/dist/config.log U xsrc/external/mit/xmag/dist/config.h.in U xsrc/external/mit/xmag/dist/depcomp U xsrc/external/mit/xmag/dist/Makefile.am U xsrc/external/mit/xmag/dist/config.sub U xsrc/external/mit/xmag/dist/ChangeLog U xsrc/external/mit/xmag/dist/missing U xsrc/external/mit/xmag/dist/xmag.c U xsrc/external/mit/xmag/dist/Scale.c U xsrc/external/mit/xmag/dist/RootWinP.h U xsrc/external/mit/xmag/dist/RootWin.c U xsrc/external/mit/xmag/dist/configure U xsrc/external/mit/xmag/dist/Makefile.in U xsrc/external/mit/xmag/dist/config.guess U xsrc/external/mit/xmag/dist/xmag.icon U xsrc/external/mit/xmag/dist/CutPaste.c U xsrc/external/mit/xmag/dist/COPYING U xsrc/external/mit/xmag/dist/README N xsrc/external/mit/xmag/dist/config.status N xsrc/external/mit/xmag/dist/Makefile N xsrc/external/mit/xmag/dist/config.h N xsrc/external/mit/xmag/dist/stamp-h1 U xsrc/external/mit/xmag/dist/app-defaults/Xmag N xsrc/external/mit/xmag/dist/man/Makefile.am N xsrc/external/mit/xmag/dist/man/xmag.man N xsrc/external/mit/xmag/dist/man/Makefile N xsrc/external/mit/xmag/dist/man/Makefile.in N xsrc/external/mit/xmag/dist/.deps/CutPaste.Po N xsrc/external/mit/xmag/dist/.deps/RootWin.Po N xsrc/external/mit/xmag/dist/.deps/Scale.Po N xsrc/external/mit/xmag/dist/.deps/xmag.Po No conflicts created by this import
CVS import: xsrc/external/mit/xsetroot/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:29 UTC 2013 Update of /cvsroot/xsrc/external/mit/xsetroot/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11635 Log Message: initial import of xsetroot-1.1.1 Status: Vendor Tag: xorg Release Tags: xsetroot-1-1-1 U xsrc/external/mit/xsetroot/dist/INSTALL U xsrc/external/mit/xsetroot/dist/install-sh U xsrc/external/mit/xsetroot/dist/ChangeLog U xsrc/external/mit/xsetroot/dist/README U xsrc/external/mit/xsetroot/dist/aclocal.m4 U xsrc/external/mit/xsetroot/dist/configure U xsrc/external/mit/xsetroot/dist/depcomp U xsrc/external/mit/xsetroot/dist/missing U xsrc/external/mit/xsetroot/dist/COPYING U xsrc/external/mit/xsetroot/dist/config.guess U xsrc/external/mit/xsetroot/dist/config.h.in U xsrc/external/mit/xsetroot/dist/Makefile.am U xsrc/external/mit/xsetroot/dist/configure.ac U xsrc/external/mit/xsetroot/dist/config.sub U xsrc/external/mit/xsetroot/dist/Makefile.in U xsrc/external/mit/xsetroot/dist/xsetroot.c N xsrc/external/mit/xsetroot/dist/man/Makefile.am N xsrc/external/mit/xsetroot/dist/man/xsetroot.man N xsrc/external/mit/xsetroot/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xstdcmap/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:32 UTC 2013 Update of /cvsroot/xsrc/external/mit/xstdcmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19223 Log Message: initial import of xstdcmap-1.0.3 Status: Vendor Tag: xorg Release Tags: xstdcmap-1-0-3 U xsrc/external/mit/xstdcmap/dist/config.sub U xsrc/external/mit/xstdcmap/dist/configure.ac U xsrc/external/mit/xstdcmap/dist/INSTALL U xsrc/external/mit/xstdcmap/dist/config.h.in U xsrc/external/mit/xstdcmap/dist/xstdcmap.c U xsrc/external/mit/xstdcmap/dist/ChangeLog U xsrc/external/mit/xstdcmap/dist/depcomp U xsrc/external/mit/xstdcmap/dist/README U xsrc/external/mit/xstdcmap/dist/missing U xsrc/external/mit/xstdcmap/dist/aclocal.m4 U xsrc/external/mit/xstdcmap/dist/configure U xsrc/external/mit/xstdcmap/dist/install-sh U xsrc/external/mit/xstdcmap/dist/Makefile.am U xsrc/external/mit/xstdcmap/dist/config.guess U xsrc/external/mit/xstdcmap/dist/Makefile.in U xsrc/external/mit/xstdcmap/dist/COPYING N xsrc/external/mit/xstdcmap/dist/man/Makefile.am N xsrc/external/mit/xstdcmap/dist/man/xstdcmap.man N xsrc/external/mit/xstdcmap/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xtrans/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:34 UTC 2013 Update of /cvsroot/xsrc/external/mit/xtrans/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3434 Log Message: initial import of xtrans-1.2.7 Status: Vendor Tag: xorg Release Tags: xtrans-1-2-7 U xsrc/external/mit/xtrans/dist/Makefile.am U xsrc/external/mit/xtrans/dist/AUTHORS U xsrc/external/mit/xtrans/dist/aclocal.m4 U xsrc/external/mit/xtrans/dist/configure.ac U xsrc/external/mit/xtrans/dist/install-sh U xsrc/external/mit/xtrans/dist/Xtranssock.c U xsrc/external/mit/xtrans/dist/COPYING U xsrc/external/mit/xtrans/dist/missing U xsrc/external/mit/xtrans/dist/Makefile.in N xsrc/external/mit/xtrans/dist/docbook.am U xsrc/external/mit/xtrans/dist/Xtrans.h U xsrc/external/mit/xtrans/dist/xtrans.pc.in U xsrc/external/mit/xtrans/dist/Xtranstli.c U xsrc/external/mit/xtrans/dist/config.sub U xsrc/external/mit/xtrans/dist/INSTALL U xsrc/external/mit/xtrans/dist/Xtransutil.c U xsrc/external/mit/xtrans/dist/xtrans.m4 U xsrc/external/mit/xtrans/dist/config.guess U xsrc/external/mit/xtrans/dist/Xtransint.h U xsrc/external/mit/xtrans/dist/README U xsrc/external/mit/xtrans/dist/ChangeLog U xsrc/external/mit/xtrans/dist/transport.c U xsrc/external/mit/xtrans/dist/configure U xsrc/external/mit/xtrans/dist/Xtrans.c U xsrc/external/mit/xtrans/dist/Xtranslcl.c U xsrc/external/mit/xtrans/dist/doc/Makefile.am U xsrc/external/mit/xtrans/dist/doc/xtrans.xml U xsrc/external/mit/xtrans/dist/doc/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xsm/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:31 UTC 2013 Update of /cvsroot/xsrc/external/mit/xsm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3326 Log Message: initial import of xsm-1.0.3 Status: Vendor Tag: xorg Release Tags: xsm-1-0-3 U xsrc/external/mit/xsm/dist/README U xsrc/external/mit/xsm/dist/restart.c U xsrc/external/mit/xsm/dist/system.xsm U xsrc/external/mit/xsm/dist/install-sh U xsrc/external/mit/xsm/dist/mainwin.h U xsrc/external/mit/xsm/dist/depcomp U xsrc/external/mit/xsm/dist/aclocal.m4 U xsrc/external/mit/xsm/dist/prop.c U xsrc/external/mit/xsm/dist/xtwatch.c U xsrc/external/mit/xsm/dist/auth.c U xsrc/external/mit/xsm/dist/missing U xsrc/external/mit/xsm/dist/popup.h U xsrc/external/mit/xsm/dist/choose.h U xsrc/external/mit/xsm/dist/remote.c U xsrc/external/mit/xsm/dist/misc.c U xsrc/external/mit/xsm/dist/configure U xsrc/external/mit/xsm/dist/log.h U xsrc/external/mit/xsm/dist/list.c U xsrc/external/mit/xsm/dist/signals.c U xsrc/external/mit/xsm/dist/config.h.in U xsrc/external/mit/xsm/dist/saveutil.c U xsrc/external/mit/xsm/dist/save.c U xsrc/external/mit/xsm/dist/info.h U xsrc/external/mit/xsm/dist/lock.c U xsrc/external/mit/xsm/dist/config.guess U xsrc/external/mit/xsm/dist/COPYING U xsrc/external/mit/xsm/dist/ChangeLog U xsrc/external/mit/xsm/dist/xsm.c U xsrc/external/mit/xsm/dist/choose.c U xsrc/external/mit/xsm/dist/prop.h U xsrc/external/mit/xsm/dist/xtwatch.h U xsrc/external/mit/xsm/dist/auth.h U xsrc/external/mit/xsm/dist/configure.ac U xsrc/external/mit/xsm/dist/popup.c U xsrc/external/mit/xsm/dist/printhex.c U xsrc/external/mit/xsm/dist/config.sub U xsrc/external/mit/xsm/dist/restart.h U xsrc/external/mit/xsm/dist/mainwin.c U xsrc/external/mit/xsm/dist/Makefile.am U xsrc/external/mit/xsm/dist/xsm.h U xsrc/external/mit/xsm/dist/INSTALL U xsrc/external/mit/xsm/dist/saveutil.h U xsrc/external/mit/xsm/dist/save.h U xsrc/external/mit/xsm/dist/info.c U xsrc/external/mit/xsm/dist/Makefile.in U xsrc/external/mit/xsm/dist/lock.h U xsrc/external/mit/xsm/dist/log.c U xsrc/external/mit/xsm/dist/list.h N xsrc/external/mit/xsm/dist/man/Makefile.am N xsrc/external/mit/xsm/dist/man/xsm.man N xsrc/external/mit/xsm/dist/man/Makefile.in U xsrc/external/mit/xsm/dist/app-defaults/XSm No conflicts created by this import
CVS import: xsrc/external/mit/xvidtune/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:36 UTC 2013 Update of /cvsroot/xsrc/external/mit/xvidtune/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24290 Log Message: initial import of xvidtune-1.0.3 Status: Vendor Tag: xorg Release Tags: xvidtune-1-0-3 U xsrc/external/mit/xvidtune/dist/INSTALL U xsrc/external/mit/xvidtune/dist/config.h.in U xsrc/external/mit/xvidtune/dist/config.guess U xsrc/external/mit/xvidtune/dist/xvidtune.c U xsrc/external/mit/xvidtune/dist/config.sub U xsrc/external/mit/xvidtune/dist/depcomp U xsrc/external/mit/xvidtune/dist/README U xsrc/external/mit/xvidtune/dist/missing U xsrc/external/mit/xvidtune/dist/ChangeLog U xsrc/external/mit/xvidtune/dist/configure.ac U xsrc/external/mit/xvidtune/dist/configure U xsrc/external/mit/xvidtune/dist/Makefile.in U xsrc/external/mit/xvidtune/dist/install-sh U xsrc/external/mit/xvidtune/dist/aclocal.m4 U xsrc/external/mit/xvidtune/dist/Makefile.am U xsrc/external/mit/xvidtune/dist/COPYING N xsrc/external/mit/xvidtune/dist/man/Makefile.am N xsrc/external/mit/xvidtune/dist/man/Makefile.in N xsrc/external/mit/xvidtune/dist/man/xvidtune.man U xsrc/external/mit/xvidtune/dist/app-defaults/Xvidtune No conflicts created by this import
CVS import: xsrc/external/mit/xwd/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:38 UTC 2013 Update of /cvsroot/xsrc/external/mit/xwd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14801 Log Message: initial import of xwd-1.0.5 Status: Vendor Tag: xorg Release Tags: xwd-1-0-5 U xsrc/external/mit/xwd/dist/COPYING U xsrc/external/mit/xwd/dist/multiVis.c U xsrc/external/mit/xwd/dist/config.guess U xsrc/external/mit/xwd/dist/clientwin.c U xsrc/external/mit/xwd/dist/Makefile.am U xsrc/external/mit/xwd/dist/dsimple.c U xsrc/external/mit/xwd/dist/INSTALL U xsrc/external/mit/xwd/dist/Makefile.in U xsrc/external/mit/xwd/dist/wsutils.h U xsrc/external/mit/xwd/dist/README U xsrc/external/mit/xwd/dist/config.sub U xsrc/external/mit/xwd/dist/list.c U xsrc/external/mit/xwd/dist/dsimple.h U xsrc/external/mit/xwd/dist/multiVis.h U xsrc/external/mit/xwd/dist/clientwin.h U xsrc/external/mit/xwd/dist/xwd.c U xsrc/external/mit/xwd/dist/configure U xsrc/external/mit/xwd/dist/list.h U xsrc/external/mit/xwd/dist/ChangeLog U xsrc/external/mit/xwd/dist/install-sh U xsrc/external/mit/xwd/dist/configure.ac U xsrc/external/mit/xwd/dist/missing U xsrc/external/mit/xwd/dist/aclocal.m4 U xsrc/external/mit/xwd/dist/config.h.in U xsrc/external/mit/xwd/dist/depcomp N xsrc/external/mit/xwd/dist/man/Makefile.in N xsrc/external/mit/xwd/dist/man/xwd.man N xsrc/external/mit/xwd/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xwininfo/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 07:51:39 UTC 2013 Update of /cvsroot/xsrc/external/mit/xwininfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5093 Log Message: initial import of xwininfo-1.1.3 Status: Vendor Tag: xorg Release Tags: xwininfo-1-1-3 U xsrc/external/mit/xwininfo/dist/INSTALL U xsrc/external/mit/xwininfo/dist/strnlen.h U xsrc/external/mit/xwininfo/dist/dsimple.h U xsrc/external/mit/xwininfo/dist/Makefile.in U xsrc/external/mit/xwininfo/dist/config.guess U xsrc/external/mit/xwininfo/dist/config.sub U xsrc/external/mit/xwininfo/dist/Makefile.am U xsrc/external/mit/xwininfo/dist/configure U xsrc/external/mit/xwininfo/dist/clientwin.c N xsrc/external/mit/xwininfo/dist/config.rpath U xsrc/external/mit/xwininfo/dist/ChangeLog C xsrc/external/mit/xwininfo/dist/xwininfo.c U xsrc/external/mit/xwininfo/dist/install-sh U xsrc/external/mit/xwininfo/dist/README U xsrc/external/mit/xwininfo/dist/aclocal.m4 U xsrc/external/mit/xwininfo/dist/missing U xsrc/external/mit/xwininfo/dist/config.h.in U xsrc/external/mit/xwininfo/dist/depcomp U xsrc/external/mit/xwininfo/dist/strnlen.c U xsrc/external/mit/xwininfo/dist/dsimple.c U xsrc/external/mit/xwininfo/dist/COPYING U xsrc/external/mit/xwininfo/dist/configure.ac U xsrc/external/mit/xwininfo/dist/clientwin.h U xsrc/external/mit/xwininfo/dist/man/Makefile.am U xsrc/external/mit/xwininfo/dist/man/Makefile.in U xsrc/external/mit/xwininfo/dist/man/xwininfo.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xwininfo/dist
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Fri May 31 08:02:00 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xload: Makefile
src/external/mit/xorg/bin/xlogo: Makefile
src/external/mit/xorg/bin/xlsatoms: Makefile
src/external/mit/xorg/bin/xmag: Makefile
src/external/mit/xorg/bin/xmessage: Makefile
src/external/mit/xorg/bin/xrefresh: Makefile
src/external/mit/xorg/bin/xsetroot: Makefile
src/external/mit/xorg/bin/xsm: Makefile
src/external/mit/xorg/bin/xstdcmap: Makefile
src/external/mit/xorg/bin/xvidtune: Makefile
src/external/mit/xorg/bin/xwd: Makefile
Log Message:
find moved manual and app-defaults files.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xload/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xlogo/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xlsatoms/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xmag/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xmessage/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xrefresh/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xsetroot/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xsm/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xstdcmap/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xvidtune/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xwd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xload/Makefile
diff -u src/external/mit/xorg/bin/xload/Makefile:1.3 src/external/mit/xorg/bin/xload/Makefile:1.4
--- src/external/mit/xorg/bin/xload/Makefile:1.3 Sat Nov 20 23:47:30 2010
+++ src/external/mit/xorg/bin/xload/Makefile Fri May 31 08:01:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/11/20 23:47:30 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 08:01:59 mrg Exp $
.include bsd.own.mk
@@ -14,6 +14,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xlogo/Makefile
diff -u src/external/mit/xorg/bin/xlogo/Makefile:1.2 src/external/mit/xorg/bin/xlogo/Makefile:1.3
--- src/external/mit/xorg/bin/xlogo/Makefile:1.2 Fri May 21 06:04:37 2010
+++ src/external/mit/xorg/bin/xlogo/Makefile Fri May 31 08:01:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:37 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
.include bsd.own.mk
@@ -16,6 +16,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xlsatoms/Makefile
diff -u src/external/mit/xorg/bin/xlsatoms/Makefile:1.2 src/external/mit/xorg/bin/xlsatoms/Makefile:1.3
--- src/external/mit/xorg/bin/xlsatoms/Makefile:1.2 Sun Jul 18 10:42:24 2010
+++ src/external/mit/xorg/bin/xlsatoms/Makefile Fri May 31 08:01:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/07/18 10:42:24 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
.include bsd.own.mk
@@ -8,6 +8,7 @@ LDADD+= -lxcb
DPADD+= ${LIBXCB}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xmag/Makefile
diff -u src/external/mit/xorg/bin/xmag/Makefile:1.2 src/external/mit/xorg/bin/xmag/Makefile:1.3
--- src/external/mit/xorg/bin/xmag/Makefile:1.2 Sat Aug 22 01:25:45 2009
+++ src/external/mit/xorg/bin/xmag/Makefile Fri May 31 08:01:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/08/22 01:25:45 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
.include bsd.own.mk
@@ -14,6 +14,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xmessage/Makefile
diff -u src/external/mit/xorg/bin/xmessage/Makefile:1.2 src/external/mit/xorg/bin/xmessage/Makefile:1.3
--- src/external/mit/xorg/bin/xmessage/Makefile:1.2 Sun Nov 21 02:33:42 2010
+++ src/external/mit/xorg/bin/xmessage/Makefile Fri May 31 08:01:59 2013
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 02:33:42 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
.include bsd.own.mk
PROG= xmessage
SRCS= xmessage.c makeform.c readfile.c
-APPDEFS=Xmessage.ad Xmessage-color.ad
+APPDEFS=Xmessage Xmessage-color
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT}
CVS commit: xsrc/external/mit/xmag/include
Module Name:xsrc Committed By: mrg Date: Fri May 31 08:18:27 UTC 2013 Modified Files: xsrc/external/mit/xmag/include: config.h Log Message: update this for xmag 1.0.5 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xmag/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/xmag/include/config.h diff -u xsrc/external/mit/xmag/include/config.h:1.3 xsrc/external/mit/xmag/include/config.h:1.4 --- xsrc/external/mit/xmag/include/config.h:1.3 Sat Nov 20 23:24:24 2010 +++ xsrc/external/mit/xmag/include/config.h Fri May 31 08:18:27 2013 @@ -4,6 +4,9 @@ /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1 +/* Define to 1 if you have the `lrint' function. */ +#define HAVE_LRINT 1 + /* Define to 1 if you have the memory.h header file. */ #define HAVE_MEMORY_H 1 @@ -47,7 +50,7 @@ #define PACKAGE_NAME xmag /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xmag 1.0.4 +#define PACKAGE_STRING xmag 1.0.5 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xmag @@ -56,7 +59,7 @@ #define PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.0.4 +#define PACKAGE_VERSION 1.0.5 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 @@ -65,10 +68,10 @@ #define PACKAGE_VERSION_MINOR 0 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 4 +#define PACKAGE_VERSION_PATCHLEVEL 5 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 1.0.4 +#define VERSION 1.0.5
CVS commit: src/external/mit/xorg/lib/libICE
Module Name:src
Committed By: mrg
Date: Fri May 31 08:18:42 UTC 2013
Modified Files:
src/external/mit/xorg/lib/libICE: Makefile
Log Message:
icetrans.c has a const/char * issue as well; avoid it for now.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libICE/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libICE/Makefile
diff -u src/external/mit/xorg/lib/libICE/Makefile:1.4 src/external/mit/xorg/lib/libICE/Makefile:1.5
--- src/external/mit/xorg/lib/libICE/Makefile:1.4 Fri May 31 00:54:58 2013
+++ src/external/mit/xorg/lib/libICE/Makefile Fri May 31 08:18:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/05/31 00:54:58 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2013/05/31 08:18:41 mrg Exp $
.include bsd.own.mk
@@ -24,5 +24,7 @@ PKGDIST= ${LIB}
CWARNFLAGS.clang+= -Wno-string-plus-int
+COPTS.icetrans.c+= -Wno-error
+
.include bsd.x11.mk
.include bsd.lib.mk
CVS import: xsrc/external/mit/libXrandr/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 08:35:37 UTC 2013 Update of /cvsroot/xsrc/external/mit/libXrandr/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8355 Log Message: initial import of libXrandr-1.4.0 Status: Vendor Tag: xorg Release Tags: libXrandr-1-4-0 U xsrc/external/mit/libXrandr/dist/aclocal.m4 U xsrc/external/mit/libXrandr/dist/AUTHORS U xsrc/external/mit/libXrandr/dist/config.sub U xsrc/external/mit/libXrandr/dist/ChangeLog U xsrc/external/mit/libXrandr/dist/COPYING U xsrc/external/mit/libXrandr/dist/config.h.in U xsrc/external/mit/libXrandr/dist/install-sh U xsrc/external/mit/libXrandr/dist/xrandr.pc.in U xsrc/external/mit/libXrandr/dist/Makefile.am U xsrc/external/mit/libXrandr/dist/INSTALL U xsrc/external/mit/libXrandr/dist/ltmain.sh U xsrc/external/mit/libXrandr/dist/depcomp U xsrc/external/mit/libXrandr/dist/missing U xsrc/external/mit/libXrandr/dist/configure.ac U xsrc/external/mit/libXrandr/dist/README U xsrc/external/mit/libXrandr/dist/config.guess U xsrc/external/mit/libXrandr/dist/configure U xsrc/external/mit/libXrandr/dist/Makefile.in U xsrc/external/mit/libXrandr/dist/include/X11/extensions/Xrandr.h U xsrc/external/mit/libXrandr/dist/man/XRRQueryExtension.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigSizes.man U xsrc/external/mit/libXrandr/dist/man/XRRRootToScreen.man U xsrc/external/mit/libXrandr/dist/man/Makefile.am U xsrc/external/mit/libXrandr/dist/man/XRRConfigCurrentConfiguration.man U xsrc/external/mit/libXrandr/dist/man/XRRSetScreenConfigAndRate.man U xsrc/external/mit/libXrandr/dist/man/XRRSetScreenConfig.man U xsrc/external/mit/libXrandr/dist/man/XRRSelectInput.man U xsrc/external/mit/libXrandr/dist/man/XRRQueryVersion.man U xsrc/external/mit/libXrandr/dist/man/Xrandr.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigCurrentRate.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigRates.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigTimes.man U xsrc/external/mit/libXrandr/dist/man/XRRGetScreenInfo.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigRotations.man U xsrc/external/mit/libXrandr/dist/man/Makefile.in U xsrc/external/mit/libXrandr/dist/man/XRRFreeScreenConfigInfo.man N xsrc/external/mit/libXrandr/dist/src/XrrProvider.c U xsrc/external/mit/libXrandr/dist/src/XrrScreen.c U xsrc/external/mit/libXrandr/dist/src/Xrandr.c U xsrc/external/mit/libXrandr/dist/src/XrrConfig.c U xsrc/external/mit/libXrandr/dist/src/XrrProperty.c U xsrc/external/mit/libXrandr/dist/src/Makefile.am U xsrc/external/mit/libXrandr/dist/src/XrrOutput.c N xsrc/external/mit/libXrandr/dist/src/XrrProviderProperty.c U xsrc/external/mit/libXrandr/dist/src/XrrMode.c U xsrc/external/mit/libXrandr/dist/src/XrrCrtc.c U xsrc/external/mit/libXrandr/dist/src/Xrandrint.h U xsrc/external/mit/libXrandr/dist/src/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/libxcb/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 08:50:45 UTC 2013 Update of /cvsroot/xsrc/external/mit/libxcb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1482 Log Message: initial import of libxcb-1.9 Status: Vendor Tag: xorg Release Tags: libxcb-1-9 U xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in U xsrc/external/mit/libxcb/dist/xcb.pc.in U xsrc/external/mit/libxcb/dist/Makefile.am U xsrc/external/mit/libxcb/dist/missing U xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in U xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in U xsrc/external/mit/libxcb/dist/xcb-render.pc.in U xsrc/external/mit/libxcb/dist/xcb-res.pc.in U xsrc/external/mit/libxcb/dist/xcb-damage.pc.in U xsrc/external/mit/libxcb/dist/xcb-record.pc.in U xsrc/external/mit/libxcb/dist/xcb-randr.pc.in U xsrc/external/mit/libxcb/dist/config.sub U xsrc/external/mit/libxcb/dist/NEWS U xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in U xsrc/external/mit/libxcb/dist/configure U xsrc/external/mit/libxcb/dist/Makefile.in U xsrc/external/mit/libxcb/dist/xcb-shm.pc.in U xsrc/external/mit/libxcb/dist/acinclude.m4 U xsrc/external/mit/libxcb/dist/INSTALL U xsrc/external/mit/libxcb/dist/xcb-xv.pc.in U xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in N xsrc/external/mit/libxcb/dist/xcb-xkb.pc.in U xsrc/external/mit/libxcb/dist/install-sh U xsrc/external/mit/libxcb/dist/xcb-sync.pc.in U xsrc/external/mit/libxcb/dist/config.guess U xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in U xsrc/external/mit/libxcb/dist/autogen.sh U xsrc/external/mit/libxcb/dist/xcb-glx.pc.in U xsrc/external/mit/libxcb/dist/depcomp U xsrc/external/mit/libxcb/dist/COPYING U xsrc/external/mit/libxcb/dist/README U xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in U xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in U xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in U xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in U xsrc/external/mit/libxcb/dist/xcb-composite.pc.in U xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in U xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in U xsrc/external/mit/libxcb/dist/ltmain.sh U xsrc/external/mit/libxcb/dist/xcb-shape.pc.in U xsrc/external/mit/libxcb/dist/configure.ac U xsrc/external/mit/libxcb/dist/aclocal.m4 N xsrc/external/mit/libxcb/dist/src/xcb_windefs.h U xsrc/external/mit/libxcb/dist/src/xcb_xid.c U xsrc/external/mit/libxcb/dist/src/xcb_out.c U xsrc/external/mit/libxcb/dist/src/Makefile.am U xsrc/external/mit/libxcb/dist/src/xcb_list.c U xsrc/external/mit/libxcb/dist/src/c_client.py U xsrc/external/mit/libxcb/dist/src/xcbint.h U xsrc/external/mit/libxcb/dist/src/Makefile.in U xsrc/external/mit/libxcb/dist/src/xcb_in.c U xsrc/external/mit/libxcb/dist/src/xcbext.h U xsrc/external/mit/libxcb/dist/src/xcb_ext.c U xsrc/external/mit/libxcb/dist/src/xcb.h U xsrc/external/mit/libxcb/dist/src/xcb_auth.c U xsrc/external/mit/libxcb/dist/src/xcb_conn.c U xsrc/external/mit/libxcb/dist/src/xcb_util.c U xsrc/external/mit/libxcb/dist/src/config.h.in N xsrc/external/mit/libxcb/dist/src/man/xcb-examples.3 N xsrc/external/mit/libxcb/dist/src/man/xcb-requests.3 U xsrc/external/mit/libxcb/dist/tools/constants U xsrc/external/mit/libxcb/dist/tools/api_conv.pl U xsrc/external/mit/libxcb/dist/tools/README U xsrc/external/mit/libxcb/dist/tests/check_public.c U xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl U xsrc/external/mit/libxcb/dist/tests/Makefile.am U xsrc/external/mit/libxcb/dist/tests/check_suites.h U xsrc/external/mit/libxcb/dist/tests/check_all.c U xsrc/external/mit/libxcb/dist/tests/Makefile.in U xsrc/external/mit/libxcb/dist/doc/Makefile.am U xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in U xsrc/external/mit/libxcb/dist/doc/Makefile.in N xsrc/external/mit/libxcb/dist/doc/xkb_issues N xsrc/external/mit/libxcb/dist/doc/xkb_internals U xsrc/external/mit/libxcb/dist/doc/tutorial/index.html U xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css No conflicts created by this import
CVS import: xsrc/external/mit/xcb-proto/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 08:52:43 UTC 2013 Update of /cvsroot/xsrc/external/mit/xcb-proto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18693 Log Message: initial import of xcb-proto-1.8 Status: Vendor Tag: xorg Release Tags: xcb-proto-1-8 U xsrc/external/mit/xcb-proto/dist/Makefile.am U xsrc/external/mit/xcb-proto/dist/missing U xsrc/external/mit/xcb-proto/dist/xcb-proto.pc.in U xsrc/external/mit/xcb-proto/dist/configure U xsrc/external/mit/xcb-proto/dist/Makefile.in U xsrc/external/mit/xcb-proto/dist/NEWS U xsrc/external/mit/xcb-proto/dist/install-sh U xsrc/external/mit/xcb-proto/dist/TODO N xsrc/external/mit/xcb-proto/dist/autogen.sh U xsrc/external/mit/xcb-proto/dist/INSTALL U xsrc/external/mit/xcb-proto/dist/COPYING U xsrc/external/mit/xcb-proto/dist/README U xsrc/external/mit/xcb-proto/dist/py-compile U xsrc/external/mit/xcb-proto/dist/configure.ac U xsrc/external/mit/xcb-proto/dist/aclocal.m4 U xsrc/external/mit/xcb-proto/dist/src/screensaver.xml U xsrc/external/mit/xcb-proto/dist/src/xfixes.xml U xsrc/external/mit/xcb-proto/dist/src/xvmc.xml U xsrc/external/mit/xcb-proto/dist/src/Makefile.am U xsrc/external/mit/xcb-proto/dist/src/glx.xml U xsrc/external/mit/xcb-proto/dist/src/xc_misc.xml U xsrc/external/mit/xcb-proto/dist/src/xinput.xml U xsrc/external/mit/xcb-proto/dist/src/xinerama.xml U xsrc/external/mit/xcb-proto/dist/src/dpms.xml U xsrc/external/mit/xcb-proto/dist/src/shm.xml U xsrc/external/mit/xcb-proto/dist/src/xv.xml U xsrc/external/mit/xcb-proto/dist/src/composite.xml U xsrc/external/mit/xcb-proto/dist/src/xprint.xml U xsrc/external/mit/xcb-proto/dist/src/res.xml U xsrc/external/mit/xcb-proto/dist/src/xevie.xml U xsrc/external/mit/xcb-proto/dist/src/xcb.xsd U xsrc/external/mit/xcb-proto/dist/src/dri2.xml U xsrc/external/mit/xcb-proto/dist/src/sync.xml N xsrc/external/mit/xcb-proto/dist/src/xf86vidmode.xml U xsrc/external/mit/xcb-proto/dist/src/xselinux.xml U xsrc/external/mit/xcb-proto/dist/src/Makefile.in U xsrc/external/mit/xcb-proto/dist/src/render.xml U xsrc/external/mit/xcb-proto/dist/src/shape.xml U xsrc/external/mit/xcb-proto/dist/src/damage.xml U xsrc/external/mit/xcb-proto/dist/src/xproto.xml U xsrc/external/mit/xcb-proto/dist/src/bigreq.xml U xsrc/external/mit/xcb-proto/dist/src/randr.xml N xsrc/external/mit/xcb-proto/dist/src/ge.xml N xsrc/external/mit/xcb-proto/dist/src/xkb.xml U xsrc/external/mit/xcb-proto/dist/src/xtest.xml U xsrc/external/mit/xcb-proto/dist/src/record.xml U xsrc/external/mit/xcb-proto/dist/src/xf86dri.xml U xsrc/external/mit/xcb-proto/dist/xcbgen/matcher.py U xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.am U xsrc/external/mit/xcb-proto/dist/xcbgen/xtypes.py U xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.in U xsrc/external/mit/xcb-proto/dist/xcbgen/error.py U xsrc/external/mit/xcb-proto/dist/xcbgen/state.py U xsrc/external/mit/xcb-proto/dist/xcbgen/__init__.py U xsrc/external/mit/xcb-proto/dist/xcbgen/expr.py U xsrc/external/mit/xcb-proto/dist/doc/xml-xcb.txt No conflicts created by this import
CVS commit: xsrc/external/mit/xrandr/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 08:59:45 UTC 2013 Modified Files: xsrc/external/mit/xrandr/dist: xrandr.c Log Message: use some more __UNCONST(). sigh. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xrandr/dist/xrandr.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/xrandr/dist/xrandr.c diff -u xsrc/external/mit/xrandr/dist/xrandr.c:1.7 xsrc/external/mit/xrandr/dist/xrandr.c:1.8 --- xsrc/external/mit/xrandr/dist/xrandr.c:1.7 Fri May 31 08:01:14 2013 +++ xsrc/external/mit/xrandr/dist/xrandr.c Fri May 31 08:59:45 2013 @@ -1524,7 +1524,7 @@ crtc_set_transform (crtc_t *crtc, transf if (major 1 || (major == 1 minor = 3)) XRRSetCrtcTransform (dpy, crtc-crtc.xid, transform-transform, - transform-filter, + __UNCONST(transform-filter), transform-params, transform-nparams); }
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Fri May 31 09:10:50 UTC 2013 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xcomp: mi src/distrib/sets/lists/xdebug: shl.mi Log Message: update for libxcb and libXrandr updates To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.135 -r1.136 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xdebug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.45 src/distrib/sets/lists/xbase/shl.mi:1.46 --- src/distrib/sets/lists/xbase/shl.mi:1.45 Wed Feb 29 20:07:55 2012 +++ src/distrib/sets/lists/xbase/shl.mi Fri May 31 09:10:49 2013 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.45 2012/02/29 20:07:55 tron Exp $ +# $NetBSD: shl.mi,v 1.46 2013/05/31 09:10:49 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -266,7 +266,7 @@ ./usr/X11R7/lib/libXprintUtil.so.2.0 -obsolete- obsolete ./usr/X11R7/lib/libXrandr.so -unknown- xorg ./usr/X11R7/lib/libXrandr.so.3 -unknown- xorg -./usr/X11R7/lib/libXrandr.so.3.0 -unknown- xorg +./usr/X11R7/lib/libXrandr.so.3.1 -unknown- xorg ./usr/X11R7/lib/libXrender.so -unknown- xorg ./usr/X11R7/lib/libXrender.so.2 -unknown- xorg ./usr/X11R7/lib/libXrender.so.2.0 -unknown- xorg @@ -338,22 +338,22 @@ ./usr/X11R7/lib/libxcb-aux.so.0.0 -unknown- xorg ./usr/X11R7/lib/libxcb-composite.so -unknown- xorg ./usr/X11R7/lib/libxcb-composite.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-composite.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-composite.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-damage.so -unknown- xorg ./usr/X11R7/lib/libxcb-damage.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-damage.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-damage.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-dpms.so -unknown- xorg ./usr/X11R7/lib/libxcb-dpms.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-dpms.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-dpms.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-dri2.so -unknown- xorg ./usr/X11R7/lib/libxcb-dri2.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-dri2.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-dri2.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-event.so -unknown- xorg ./usr/X11R7/lib/libxcb-event.so.1 -unknown- xorg ./usr/X11R7/lib/libxcb-event.so.1.0 -unknown- xorg ./usr/X11R7/lib/libxcb-glx.so -unknown- xorg ./usr/X11R7/lib/libxcb-glx.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-glx.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-glx.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-icccm.so -unknown- xorg ./usr/X11R7/lib/libxcb-icccm.so.1 -unknown- xorg ./usr/X11R7/lib/libxcb-icccm.so.1.0 -unknown- xorg @@ -368,55 +368,55 @@ ./usr/X11R7/lib/libxcb-property.so.1.0 -unknown- xorg ./usr/X11R7/lib/libxcb-randr.so -unknown- xorg ./usr/X11R7/lib/libxcb-randr.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-randr.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-randr.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-record.so -unknown- xorg ./usr/X11R7/lib/libxcb-record.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-record.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-record.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-render-util.so -unknown- xorg ./usr/X11R7/lib/libxcb-render-util.so.0 -unknown- xorg ./usr/X11R7/lib/libxcb-render-util.so.0.0 -unknown- xorg ./usr/X11R7/lib/libxcb-render.so -unknown- xorg ./usr/X11R7/lib/libxcb-render.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-render.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-render.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-reply.so -unknown- xorg ./usr/X11R7/lib/libxcb-reply.so.1 -unknown- xorg ./usr/X11R7/lib/libxcb-reply.so.1.0 -unknown- xorg ./usr/X11R7/lib/libxcb-res.so -unknown- xorg ./usr/X11R7/lib/libxcb-res.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-res.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-res.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-screensaver.so -unknown- xorg ./usr/X11R7/lib/libxcb-screensaver.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-screensaver.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-screensaver.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-shape.so -unknown- xorg ./usr/X11R7/lib/libxcb-shape.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-shape.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-shape.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-shm.so -unknown- xorg ./usr/X11R7/lib/libxcb-shm.so.0 -unknown- xorg -./usr/X11R7/lib/libxcb-shm.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-shm.so.0.1 -unknown- xorg ./usr/X11R7/lib/libxcb-sync.so -unknown- xorg ./usr/X11R7/lib/libxcb-sync.so.0 -unknown- xorg
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Fri May 31 09:14:19 UTC 2013
Modified Files:
src/external/mit/xorg/bin/bitmap: Makefile
src/external/mit/xorg/bin/xrandr: Makefile
src/external/mit/xorg/bin/xsetroot: Makefile
src/external/mit/xorg/bin/xstdcmap: Makefile
src/external/mit/xorg/bin/xwininfo: Makefile
src/external/mit/xorg/include/xcb-proto: Makefile
src/external/mit/xorg/lib/libXrandr: Makefile shlib_version
src/external/mit/xorg/lib/libxcb: xcb.mk
Log Message:
define HAVE_MKSTEMP and HAVE_LRINT for bitmap.
define PACKAGE_STRING/VERSION correctly for xrandr, xsetroot and xstdcmap.
define ICONV_CONST for xwininfo.
install new xcb-proto files.
build new Xrandr sources.
bump version on libxcb and libXrandr.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/bitmap/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xrandr/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xsetroot/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xstdcmap/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xwininfo/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/include/xcb-proto/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXrandr/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXrandr/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxcb/xcb.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/bitmap/Makefile
diff -u src/external/mit/xorg/bin/bitmap/Makefile:1.3 src/external/mit/xorg/bin/bitmap/Makefile:1.4
--- src/external/mit/xorg/bin/bitmap/Makefile:1.3 Thu Aug 11 23:15:35 2011
+++ src/external/mit/xorg/bin/bitmap/Makefile Fri May 31 09:14:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:35 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 09:14:18 mrg Exp $
.include bsd.own.mk
@@ -12,6 +12,8 @@ FILES= Dashes Down Excl FlipHoriz FlipVe
RotateRight Stipple Term Up
FILESDIR=${X11INCDIR}/X11/bitmaps
+CPPFLAGS+= -DHAVE_MKSTEMP -DHAVE_LRINT
+
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
Index: src/external/mit/xorg/bin/xrandr/Makefile
diff -u src/external/mit/xorg/bin/xrandr/Makefile:1.5 src/external/mit/xorg/bin/xrandr/Makefile:1.6
--- src/external/mit/xorg/bin/xrandr/Makefile:1.5 Thu Aug 11 23:15:36 2011
+++ src/external/mit/xorg/bin/xrandr/Makefile Fri May 31 09:14:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:36 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2013/05/31 09:14:18 mrg Exp $
.include bsd.own.mk
@@ -7,7 +7,7 @@ PROG= xrandr
LDADD+= -lXrandr -lXrender -lXext -lX11 -lm
DPADD+= ${LIBXRANDR} ${LIBXRENDER} ${LIBXEXT} ${LIBX11} ${LIBM}
-CPPFLAGS+= -DVERSION=\1.3.1\
+CPPFLAGS+= -DVERSION=\1.4.0\
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xsetroot/Makefile
diff -u src/external/mit/xorg/bin/xsetroot/Makefile:1.3 src/external/mit/xorg/bin/xsetroot/Makefile:1.4
--- src/external/mit/xorg/bin/xsetroot/Makefile:1.3 Fri May 31 08:02:00 2013
+++ src/external/mit/xorg/bin/xsetroot/Makefile Fri May 31 09:14:18 2013
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:02:00 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 09:14:18 mrg Exp $
.include bsd.own.mk
PROG= xsetroot
+CPPFLAGS+= -DPACKAGE_STRING=\xsetroot 1.1.1\
+
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11 -lXcursor
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXCURSOR}
Index: src/external/mit/xorg/bin/xstdcmap/Makefile
diff -u src/external/mit/xorg/bin/xstdcmap/Makefile:1.2 src/external/mit/xorg/bin/xstdcmap/Makefile:1.3
--- src/external/mit/xorg/bin/xstdcmap/Makefile:1.2 Fri May 31 08:02:00 2013
+++ src/external/mit/xorg/bin/xstdcmap/Makefile Fri May 31 09:14:18 2013
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 08:02:00 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 09:14:18 mrg Exp $
.include bsd.own.mk
PROG= xstdcmap
+CPPFLAGS+= -DPACKAGE_STRING=\xstdcmap 1.0.3\
+
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Index: src/external/mit/xorg/bin/xwininfo/Makefile
diff -u src/external/mit/xorg/bin/xwininfo/Makefile:1.5 src/external/mit/xorg/bin/xwininfo/Makefile:1.6
--- src/external/mit/xorg/bin/xwininfo/Makefile:1.5 Thu Aug 11 23:15:36 2011
+++ src/external/mit/xorg/bin/xwininfo/Makefile Fri May 31 09:14:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:36 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2013/05/31 09:14:18 mrg Exp $
.include bsd.own.mk
@@ -6,7 +6,7 @@ PROG= xwininfo
SRCS= xwininfo.c clientwin.c dsimple.c
XWININFODIR= ${X11SRCDIR.${PROG}}
-CPPFLAGS+=-I${XWININFODIR}
CVS import: xsrc/external/mit/libXinerama/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 09:19:48 UTC 2013 Update of /cvsroot/xsrc/external/mit/libXinerama/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2563 Log Message: initial import of libXinerama-1.1.2 Status: Vendor Tag: xorg Release Tags: libXinerama-1-1-2 U xsrc/external/mit/libXinerama/dist/depcomp U xsrc/external/mit/libXinerama/dist/xinerama.pc.in U xsrc/external/mit/libXinerama/dist/Makefile.in U xsrc/external/mit/libXinerama/dist/ltmain.sh U xsrc/external/mit/libXinerama/dist/config.guess U xsrc/external/mit/libXinerama/dist/COPYING U xsrc/external/mit/libXinerama/dist/INSTALL U xsrc/external/mit/libXinerama/dist/Makefile.am U xsrc/external/mit/libXinerama/dist/README U xsrc/external/mit/libXinerama/dist/missing U xsrc/external/mit/libXinerama/dist/config.sub U xsrc/external/mit/libXinerama/dist/ChangeLog U xsrc/external/mit/libXinerama/dist/config.h.in U xsrc/external/mit/libXinerama/dist/configure U xsrc/external/mit/libXinerama/dist/aclocal.m4 U xsrc/external/mit/libXinerama/dist/configure.ac U xsrc/external/mit/libXinerama/dist/install-sh U xsrc/external/mit/libXinerama/dist/include/X11/extensions/panoramiXext.h U xsrc/external/mit/libXinerama/dist/include/X11/extensions/Xinerama.h U xsrc/external/mit/libXinerama/dist/man/Xinerama.man U xsrc/external/mit/libXinerama/dist/man/XineramaQueryScreens.man U xsrc/external/mit/libXinerama/dist/man/XineramaIsActive.man U xsrc/external/mit/libXinerama/dist/man/Makefile.am U xsrc/external/mit/libXinerama/dist/man/Makefile.in U xsrc/external/mit/libXinerama/dist/man/XineramaQueryExtension.man U xsrc/external/mit/libXinerama/dist/man/XineramaQueryVersion.man U xsrc/external/mit/libXinerama/dist/src/Xinerama.c U xsrc/external/mit/libXinerama/dist/src/Makefile.in U xsrc/external/mit/libXinerama/dist/src/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/libXres/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 09:19:51 UTC 2013 Update of /cvsroot/xsrc/external/mit/libXres/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20879 Log Message: initial import of libXres-1.0.7 Status: Vendor Tag: xorg Release Tags: libXres-1-0-7 U xsrc/external/mit/libXres/dist/Makefile.am U xsrc/external/mit/libXres/dist/INSTALL U xsrc/external/mit/libXres/dist/README U xsrc/external/mit/libXres/dist/AUTHORS U xsrc/external/mit/libXres/dist/ChangeLog U xsrc/external/mit/libXres/dist/config.sub U xsrc/external/mit/libXres/dist/config.guess U xsrc/external/mit/libXres/dist/xres.pc.in U xsrc/external/mit/libXres/dist/configure U xsrc/external/mit/libXres/dist/Makefile.in U xsrc/external/mit/libXres/dist/configure.ac U xsrc/external/mit/libXres/dist/config.h.in U xsrc/external/mit/libXres/dist/COPYING 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/aclocal.m4 U xsrc/external/mit/libXres/dist/install-sh U xsrc/external/mit/libXres/dist/src/Makefile.in U xsrc/external/mit/libXres/dist/src/XRes.c U xsrc/external/mit/libXres/dist/src/Makefile.am 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/Makefile.in U xsrc/external/mit/libXres/dist/man/XRes.man U xsrc/external/mit/libXres/dist/man/Makefile.am U xsrc/external/mit/libXres/dist/man/XResQueryClientPixmapBytes.man U xsrc/external/mit/libXres/dist/man/XResQueryClientResources.man U xsrc/external/mit/libXres/dist/man/XResQueryClients.man U xsrc/external/mit/libXres/dist/include/X11/extensions/XRes.h No conflicts created by this import
CVS import: xsrc/external/mit/libXtst/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 09:19:58 UTC 2013 Update of /cvsroot/xsrc/external/mit/libXtst/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1850 Log Message: initial import of libXtst-1.2.2 Status: Vendor Tag: xorg Release Tags: libXtst-1-2-2 U xsrc/external/mit/libXtst/dist/install-sh U xsrc/external/mit/libXtst/dist/depcomp U xsrc/external/mit/libXtst/dist/Makefile.in U xsrc/external/mit/libXtst/dist/missing U xsrc/external/mit/libXtst/dist/aclocal.m4 U xsrc/external/mit/libXtst/dist/Makefile.am U xsrc/external/mit/libXtst/dist/ltmain.sh U xsrc/external/mit/libXtst/dist/COPYING U xsrc/external/mit/libXtst/dist/configure.ac U xsrc/external/mit/libXtst/dist/xtst.pc.in U xsrc/external/mit/libXtst/dist/docbook.am U xsrc/external/mit/libXtst/dist/config.guess U xsrc/external/mit/libXtst/dist/config.h.in U xsrc/external/mit/libXtst/dist/config.sub U xsrc/external/mit/libXtst/dist/INSTALL U xsrc/external/mit/libXtst/dist/ChangeLog U xsrc/external/mit/libXtst/dist/README U xsrc/external/mit/libXtst/dist/configure U xsrc/external/mit/libXtst/dist/man/XTestSetVisualIDOfVisual.man U xsrc/external/mit/libXtst/dist/man/XTestSetGContextOfGC.man U xsrc/external/mit/libXtst/dist/man/XTestFakeButtonEvent.man U xsrc/external/mit/libXtst/dist/man/XTestFakeKeyEvent.man U xsrc/external/mit/libXtst/dist/man/Makefile.in U xsrc/external/mit/libXtst/dist/man/XTestCompareCurrentCursorWithWindow.man U xsrc/external/mit/libXtst/dist/man/XTestFakeRelativeMotionEvent.man U xsrc/external/mit/libXtst/dist/man/XTestDiscard.man C xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man U xsrc/external/mit/libXtst/dist/man/Makefile.am U xsrc/external/mit/libXtst/dist/man/XTestFakeMotionEvent.man U xsrc/external/mit/libXtst/dist/man/XTestGrabControl.man U xsrc/external/mit/libXtst/dist/man/XTest.xml U xsrc/external/mit/libXtst/dist/man/x.stamp U xsrc/external/mit/libXtst/dist/man/XTestCompareCursorWithWindow.man U xsrc/external/mit/libXtst/dist/include/X11/extensions/XTest.h U xsrc/external/mit/libXtst/dist/include/X11/extensions/record.h U xsrc/external/mit/libXtst/dist/specs/recordlib.xml U xsrc/external/mit/libXtst/dist/specs/xtestlib.xml U xsrc/external/mit/libXtst/dist/specs/Makefile.in U xsrc/external/mit/libXtst/dist/specs/Makefile.am C xsrc/external/mit/libXtst/dist/src/XRecord.c U xsrc/external/mit/libXtst/dist/src/Makefile.am U xsrc/external/mit/libXtst/dist/src/XTest.c U xsrc/external/mit/libXtst/dist/src/Makefile.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXtst/dist
CVS import: xsrc/external/mit/libXt/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 09:19:55 UTC 2013 Update of /cvsroot/xsrc/external/mit/libXt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19411 Log Message: initial import of libXt-1.1.4 Status: Vendor Tag: xorg Release Tags: libXt-1-1-4 U xsrc/external/mit/libXt/dist/ChangeLog U xsrc/external/mit/libXt/dist/Makefile.am U xsrc/external/mit/libXt/dist/config.sub U xsrc/external/mit/libXt/dist/depcomp U xsrc/external/mit/libXt/dist/missing N xsrc/external/mit/libXt/dist/test-driver U xsrc/external/mit/libXt/dist/configure U xsrc/external/mit/libXt/dist/COPYING U xsrc/external/mit/libXt/dist/Makefile.in U xsrc/external/mit/libXt/dist/config.h.in U xsrc/external/mit/libXt/dist/xt.pc.in U xsrc/external/mit/libXt/dist/configure.ac U xsrc/external/mit/libXt/dist/INSTALL U xsrc/external/mit/libXt/dist/config.guess U xsrc/external/mit/libXt/dist/ltmain.sh U xsrc/external/mit/libXt/dist/install-sh U xsrc/external/mit/libXt/dist/aclocal.m4 U xsrc/external/mit/libXt/dist/README N xsrc/external/mit/libXt/dist/docbook.am U xsrc/external/mit/libXt/dist/m4/ax_define_dir.m4 U xsrc/external/mit/libXt/dist/src/sharedlib.c U xsrc/external/mit/libXt/dist/src/TMprint.c U xsrc/external/mit/libXt/dist/src/Converters.c U xsrc/external/mit/libXt/dist/src/TMkey.c U xsrc/external/mit/libXt/dist/src/Manage.c U xsrc/external/mit/libXt/dist/src/GetValues.c U xsrc/external/mit/libXt/dist/src/Makefile.in U xsrc/external/mit/libXt/dist/src/Callback.c U xsrc/external/mit/libXt/dist/src/ActionHook.c U xsrc/external/mit/libXt/dist/src/Varargs.c U xsrc/external/mit/libXt/dist/src/HookObj.c U xsrc/external/mit/libXt/dist/src/Object.c U xsrc/external/mit/libXt/dist/src/Destroy.c U xsrc/external/mit/libXt/dist/src/GCManager.c U xsrc/external/mit/libXt/dist/src/Initialize.c U xsrc/external/mit/libXt/dist/src/EventUtil.c U xsrc/external/mit/libXt/dist/src/Resources.c U xsrc/external/mit/libXt/dist/src/Intrinsic.c U xsrc/external/mit/libXt/dist/src/ClickTime.c U xsrc/external/mit/libXt/dist/src/VarCreate.c U xsrc/external/mit/libXt/dist/src/Vendor.c U xsrc/external/mit/libXt/dist/src/Geometry.c U xsrc/external/mit/libXt/dist/src/ResConfig.c U xsrc/external/mit/libXt/dist/src/GetActKey.c U xsrc/external/mit/libXt/dist/src/Makefile.am U xsrc/external/mit/libXt/dist/src/PassivGrab.c U xsrc/external/mit/libXt/dist/src/RectObj.c U xsrc/external/mit/libXt/dist/src/Selection.c U xsrc/external/mit/libXt/dist/src/Display.c U xsrc/external/mit/libXt/dist/src/Functions.c U xsrc/external/mit/libXt/dist/src/PopupCB.c U xsrc/external/mit/libXt/dist/src/TMstate.c U xsrc/external/mit/libXt/dist/src/ArgList.c U xsrc/external/mit/libXt/dist/src/SetValues.c U xsrc/external/mit/libXt/dist/src/Error.c U xsrc/external/mit/libXt/dist/src/TMaction.c U xsrc/external/mit/libXt/dist/src/TMgrab.c U xsrc/external/mit/libXt/dist/src/Keyboard.c U xsrc/external/mit/libXt/dist/src/Pointer.c U xsrc/external/mit/libXt/dist/src/Hooks.c U xsrc/external/mit/libXt/dist/src/Event.c U xsrc/external/mit/libXt/dist/src/SetSens.c U xsrc/external/mit/libXt/dist/src/Threads.c C xsrc/external/mit/libXt/dist/src/NextEvent.c U xsrc/external/mit/libXt/dist/src/Shell.c C xsrc/external/mit/libXt/dist/src/TMparse.c U xsrc/external/mit/libXt/dist/src/Composite.c U xsrc/external/mit/libXt/dist/src/Constraint.c U xsrc/external/mit/libXt/dist/src/Convert.c U xsrc/external/mit/libXt/dist/src/GetResList.c U xsrc/external/mit/libXt/dist/src/SetWMCW.c U xsrc/external/mit/libXt/dist/src/VarGet.c U xsrc/external/mit/libXt/dist/src/Alloc.c U xsrc/external/mit/libXt/dist/src/Core.c U xsrc/external/mit/libXt/dist/src/Popup.c U xsrc/external/mit/libXt/dist/src/Create.c U xsrc/external/mit/libXt/dist/specs/Makefile.am N xsrc/external/mit/libXt/dist/specs/CH10.xml N xsrc/external/mit/libXt/dist/specs/CH01.xml N xsrc/external/mit/libXt/dist/specs/CH06.xml N xsrc/external/mit/libXt/dist/specs/appE.xml N xsrc/external/mit/libXt/dist/specs/CH08.xml N xsrc/external/mit/libXt/dist/specs/appB.xml U xsrc/external/mit/libXt/dist/specs/Makefile.in N xsrc/external/mit/libXt/dist/specs/CH11.xml N xsrc/external/mit/libXt/dist/specs/intrinsics.xml N xsrc/external/mit/libXt/dist/specs/appC.xml N xsrc/external/mit/libXt/dist/specs/appD.xml N xsrc/external/mit/libXt/dist/specs/CH09.xml N xsrc/external/mit/libXt/dist/specs/CH07.xml N xsrc/external/mit/libXt/dist/specs/preface.xml N xsrc/external/mit/libXt/dist/specs/CH03.xml N xsrc/external/mit/libXt/dist/specs/CH04.xml N xsrc/external/mit/libXt/dist/specs/CH12.xml N xsrc/external/mit/libXt/dist/specs/CH05.xml N xsrc/external/mit/libXt/dist/specs/CH02.xml N xsrc/external/mit/libXt/dist/specs/appA.xml N xsrc/external/mit/libXt/dist/specs/appF.xml N xsrc/external/mit/libXt/dist/specs/CH13.xml N xsrc/external/mit/libXt/dist/specs/acknowledgement.xml U xsrc/external/mit/libXt/dist/include/Makefile.in U xsrc/external/mit/libXt/dist/include/Makefile.am U xsrc/external/mit/libXt/dist/include/X11/IntrinsicP.h U
CVS import: xsrc/external/mit/libXxf86vm/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 09:20:02 UTC 2013 Update of /cvsroot/xsrc/external/mit/libXxf86vm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5625 Log Message: initial import of libXxf86vm-1.1.3 Status: Vendor Tag: xorg Release Tags: libXxf86vm-1-1-3 U xsrc/external/mit/libXxf86vm/dist/Makefile.am U xsrc/external/mit/libXxf86vm/dist/depcomp U xsrc/external/mit/libXxf86vm/dist/config.sub U xsrc/external/mit/libXxf86vm/dist/missing U xsrc/external/mit/libXxf86vm/dist/Makefile.in U xsrc/external/mit/libXxf86vm/dist/configure U xsrc/external/mit/libXxf86vm/dist/configure.ac U xsrc/external/mit/libXxf86vm/dist/COPYING U xsrc/external/mit/libXxf86vm/dist/ChangeLog U xsrc/external/mit/libXxf86vm/dist/xxf86vm.pc.in U xsrc/external/mit/libXxf86vm/dist/aclocal.m4 U xsrc/external/mit/libXxf86vm/dist/config.guess U xsrc/external/mit/libXxf86vm/dist/install-sh U xsrc/external/mit/libXxf86vm/dist/README U xsrc/external/mit/libXxf86vm/dist/INSTALL U xsrc/external/mit/libXxf86vm/dist/ltmain.sh U xsrc/external/mit/libXxf86vm/dist/src/Makefile.in U xsrc/external/mit/libXxf86vm/dist/src/Makefile.am U xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c U xsrc/external/mit/libXxf86vm/dist/src/config.h.in U xsrc/external/mit/libXxf86vm/dist/include/X11/extensions/xf86vmode.h U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetPermissions.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetMonitor.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetGammaRamp.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeQueryVersion.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetViewPort.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGamma.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetClientVersion.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetDotClocks.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VM.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetModeLine.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetGamma.man U xsrc/external/mit/libXxf86vm/dist/man/Makefile.in U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetAllModeLines.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetViewPort.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeValidateModeLine.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGammaRamp.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeQueryExtension.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSwitchMode.man U xsrc/external/mit/libXxf86vm/dist/man/Makefile.am U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeLockModeSwitch.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeDeleteModeLine.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGammaRampSize.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeModModeLine.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSwitchToMode.man No conflicts created by this import
CVS import: xsrc/external/mit/libXxf86dga/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 09:20:00 UTC 2013 Update of /cvsroot/xsrc/external/mit/libXxf86dga/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19820 Log Message: initial import of libXxf86dga-1.1.4 Status: Vendor Tag: xorg Release Tags: libXxf86dga-1-1-4 U xsrc/external/mit/libXxf86dga/dist/Makefile.in U xsrc/external/mit/libXxf86dga/dist/COPYING U xsrc/external/mit/libXxf86dga/dist/missing U xsrc/external/mit/libXxf86dga/dist/ChangeLog U xsrc/external/mit/libXxf86dga/dist/configure.ac U xsrc/external/mit/libXxf86dga/dist/configure U xsrc/external/mit/libXxf86dga/dist/Makefile.am U xsrc/external/mit/libXxf86dga/dist/aclocal.m4 U xsrc/external/mit/libXxf86dga/dist/depcomp U xsrc/external/mit/libXxf86dga/dist/xxf86dga.pc.in U xsrc/external/mit/libXxf86dga/dist/install-sh U xsrc/external/mit/libXxf86dga/dist/ltmain.sh U xsrc/external/mit/libXxf86dga/dist/INSTALL U xsrc/external/mit/libXxf86dga/dist/README U xsrc/external/mit/libXxf86dga/dist/config.sub U xsrc/external/mit/libXxf86dga/dist/config.guess U xsrc/external/mit/libXxf86dga/dist/include/X11/extensions/Xxf86dga.h U xsrc/external/mit/libXxf86dga/dist/include/X11/extensions/xf86dga1.h U xsrc/external/mit/libXxf86dga/dist/man/XDGACopyTransparentArea.man U xsrc/external/mit/libXxf86dga/dist/man/XDGAFillRectangle.man U xsrc/external/mit/libXxf86dga/dist/man/XDGASetMode.man U xsrc/external/mit/libXxf86dga/dist/man/XDGA.man U xsrc/external/mit/libXxf86dga/dist/man/XDGAKeyEventToXKeyEvent.man U xsrc/external/mit/libXxf86dga/dist/man/XDGAQueryModes.man U xsrc/external/mit/libXxf86dga/dist/man/XDGASync.man U xsrc/external/mit/libXxf86dga/dist/man/XDGASelectInput.man U xsrc/external/mit/libXxf86dga/dist/man/XDGACreateColormap.man U xsrc/external/mit/libXxf86dga/dist/man/XDGAQueryVersion.man U xsrc/external/mit/libXxf86dga/dist/man/XDGAGetViewportStatus.man U xsrc/external/mit/libXxf86dga/dist/man/XDGAQueryExtension.man U xsrc/external/mit/libXxf86dga/dist/man/XDGASetClientVersion.man U xsrc/external/mit/libXxf86dga/dist/man/Makefile.am U xsrc/external/mit/libXxf86dga/dist/man/XDGAInstallColormap.man U xsrc/external/mit/libXxf86dga/dist/man/XDGAChangePixmapMode.man U xsrc/external/mit/libXxf86dga/dist/man/XDGASetViewport.man U xsrc/external/mit/libXxf86dga/dist/man/XFree86-DGA.man U xsrc/external/mit/libXxf86dga/dist/man/XDGACopyArea.man U xsrc/external/mit/libXxf86dga/dist/man/Makefile.in U xsrc/external/mit/libXxf86dga/dist/man/XF86DGA.man U xsrc/external/mit/libXxf86dga/dist/man/XDGACloseFramebuffer.man U xsrc/external/mit/libXxf86dga/dist/man/XDGAOpenFramebuffer.man U xsrc/external/mit/libXxf86dga/dist/src/Makefile.in U xsrc/external/mit/libXxf86dga/dist/src/XF86DGA2.c U xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c U xsrc/external/mit/libXxf86dga/dist/src/Makefile.am U xsrc/external/mit/libXxf86dga/dist/src/config.h.in No conflicts created by this import
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Fri May 31 09:21:06 UTC 2013 Modified Files: xsrc/external/mit/libXt/dist/man: XtAppCreateShell.man xsrc/external/mit/libXt/dist/src: NextEvent.c TMparse.c xsrc/external/mit/libXtst/dist/man: XTestQueryExtension.man xsrc/external/mit/libXtst/dist/src: XRecord.c Removed Files: xsrc/external/mit/libXt/dist: compile xsrc/external/mit/libXt/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/libXt/dist/specs: CH01 CH02 CH03 CH04 CH05 CH06 CH07 CH08 CH09 CH10 CH11 CH12 CH13 Xtk.intr.front appA appB appC appD appE appF intr.idxmac.t postproc strings.mit Log Message: merge libXt 1.1.4 and libXtst 1.2.2. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libXt/dist/compile cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXt/dist/m4/libtool.m4 \ xsrc/external/mit/libXt/dist/m4/ltoptions.m4 \ xsrc/external/mit/libXt/dist/m4/ltsugar.m4 \ xsrc/external/mit/libXt/dist/m4/ltversion.m4 \ xsrc/external/mit/libXt/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/libXt/dist/man/XtAppCreateShell.man cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXt/dist/specs/CH01 \ xsrc/external/mit/libXt/dist/specs/CH02 \ xsrc/external/mit/libXt/dist/specs/CH03 \ xsrc/external/mit/libXt/dist/specs/CH04 \ xsrc/external/mit/libXt/dist/specs/CH05 \ xsrc/external/mit/libXt/dist/specs/CH06 \ xsrc/external/mit/libXt/dist/specs/CH07 \ xsrc/external/mit/libXt/dist/specs/CH08 \ xsrc/external/mit/libXt/dist/specs/CH09 \ xsrc/external/mit/libXt/dist/specs/CH10 \ xsrc/external/mit/libXt/dist/specs/CH11 \ xsrc/external/mit/libXt/dist/specs/CH12 \ xsrc/external/mit/libXt/dist/specs/CH13 \ xsrc/external/mit/libXt/dist/specs/Xtk.intr.front \ xsrc/external/mit/libXt/dist/specs/appA \ xsrc/external/mit/libXt/dist/specs/appB \ xsrc/external/mit/libXt/dist/specs/appC \ xsrc/external/mit/libXt/dist/specs/appD \ xsrc/external/mit/libXt/dist/specs/appE \ xsrc/external/mit/libXt/dist/specs/appF \ xsrc/external/mit/libXt/dist/specs/intr.idxmac.t \ xsrc/external/mit/libXt/dist/specs/postproc \ xsrc/external/mit/libXt/dist/specs/strings.mit cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXt/dist/src/NextEvent.c cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXt/dist/src/TMparse.c cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXtst/dist/src/XRecord.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/libXt/dist/man/XtAppCreateShell.man diff -u xsrc/external/mit/libXt/dist/man/XtAppCreateShell.man:1.4 xsrc/external/mit/libXt/dist/man/XtAppCreateShell.man:1.5 --- xsrc/external/mit/libXt/dist/man/XtAppCreateShell.man:1.4 Wed Jul 18 14:34:03 2012 +++ xsrc/external/mit/libXt/dist/man/XtAppCreateShell.man Fri May 31 09:21:05 2013 @@ -1,26 +1,26 @@ .\ Copyright (c) 1993, 1994 X Consortium -.\ +.\ .\ Permission is hereby granted, free of charge, to any person obtaining a -.\ copy of this software and associated documentation files (the Software), -.\ to deal in the Software without restriction, including without limitation -.\ the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\ and/or sell copies of the Software, and to permit persons to whom the +.\ copy of this software and associated documentation files (the Software), +.\ to deal in the Software without restriction, including without limitation +.\ the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\ and/or sell copies of the Software, and to permit persons to whom the .\ Software furnished to do so, subject to the following conditions: -.\ +.\ .\ The above copyright notice and this permission notice shall be included in .\ all copies or substantial portions of the Software. -.\ +.\ .\ THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR .\ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\ THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -.\ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -.\ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +.\ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\ THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +.\ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +.\ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE .\ SOFTWARE. -.\ -.\ Except as contained in this notice, the name of the X Consortium shall not -.\
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Fri May 31 09:33:18 UTC 2013
Modified Files:
src/external/mit/xorg/lib/libXres: Makefile
src/external/mit/xorg/lib/libXtst: Makefile
src/external/mit/xorg/lib/libXxf86dga: Makefile
src/external/mit/xorg/lib/libXxf86vm: Makefile
Log Message:
define HAVE__XEATDATAWORDS.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXres/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXtst/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXxf86dga/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXxf86vm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXres/Makefile
diff -u src/external/mit/xorg/lib/libXres/Makefile:1.7 src/external/mit/xorg/lib/libXres/Makefile:1.8
--- src/external/mit/xorg/lib/libXres/Makefile:1.7 Thu Nov 6 22:28:26 2008
+++ src/external/mit/xorg/lib/libXres/Makefile Fri May 31 09:33:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/11/06 22:28:26 veego Exp $
+# $NetBSD: Makefile,v 1.8 2013/05/31 09:33:17 mrg Exp $
.include bsd.own.mk
@@ -10,6 +10,8 @@ XRESDIR= ${X11SRCDIR.Xres}
.PATH: ${XRESDIR}/include/X11/extensions
SRCS= XRes.c
+CPPFLAGS+= -DHAVE__XEATDATAWORDS
+
INCS= XRes.h
INCSDIR=${X11INCDIR}/X11/extensions
Index: src/external/mit/xorg/lib/libXtst/Makefile
diff -u src/external/mit/xorg/lib/libXtst/Makefile:1.4 src/external/mit/xorg/lib/libXtst/Makefile:1.5
--- src/external/mit/xorg/lib/libXtst/Makefile:1.4 Sat May 22 02:41:33 2010
+++ src/external/mit/xorg/lib/libXtst/Makefile Fri May 31 09:33:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/22 02:41:33 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2013/05/31 09:33:17 mrg Exp $
.include bsd.own.mk
@@ -9,6 +9,8 @@ LIB= Xtst
SRCS= XTest.c XRecord.c
+CPPFLAGS+= -DHAVE__XEATDATAWORDS
+
CPPFLAGS+= ${X11FLAGS.THREADLIB}
LIBDPLIBS=\
Index: src/external/mit/xorg/lib/libXxf86dga/Makefile
diff -u src/external/mit/xorg/lib/libXxf86dga/Makefile:1.4 src/external/mit/xorg/lib/libXxf86dga/Makefile:1.5
--- src/external/mit/xorg/lib/libXxf86dga/Makefile:1.4 Sat May 22 02:27:08 2010
+++ src/external/mit/xorg/lib/libXxf86dga/Makefile Fri May 31 09:33:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/22 02:27:08 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2013/05/31 09:33:17 mrg Exp $
.include bsd.own.mk
@@ -31,6 +31,7 @@ MLINKS= XDGA.3 XF86DGA.3 \
XDGA.3 XDGASetViewport.3 \
XDGA.3 XDGASync.3
+CPPFLAGS+= -DHAVE__XEATDATAWORDS
CPPFLAGS+= ${X11FLAGS.THREADLIB}
# XXX
Index: src/external/mit/xorg/lib/libXxf86vm/Makefile
diff -u src/external/mit/xorg/lib/libXxf86vm/Makefile:1.5 src/external/mit/xorg/lib/libXxf86vm/Makefile:1.6
--- src/external/mit/xorg/lib/libXxf86vm/Makefile:1.5 Sat May 22 02:27:08 2010
+++ src/external/mit/xorg/lib/libXxf86vm/Makefile Fri May 31 09:33:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/05/22 02:27:08 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2013/05/31 09:33:18 mrg Exp $
.include bsd.own.mk
@@ -8,6 +8,9 @@ LIB= Xxf86vm
.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions
SRCS= XF86VMode.c
+
+CPPFLAGS+= -DHAVE__XEATDATAWORDS
+
MAN= XF86VM.3
MLINKS= XF86VM.3 XF86VidModeQueryExtension.3 \
XF86VM.3 XF86VidModeQueryVersion.3 \
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Fri May 31 09:33:32 UTC 2013 Modified Files: xsrc/external/mit/libXinerama/dist/src: Xinerama.c xsrc/external/mit/libXres/dist/src: XRes.c xsrc/external/mit/libXxf86vm/dist/src: XF86VMode.c Log Message: remove const where it causes build failure To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/libXinerama/dist/src/Xinerama.c cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/libXres/dist/src/XRes.c cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXinerama/dist/src/Xinerama.c diff -u xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.1.1.4 xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.2 --- xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.1.1.4 Fri May 31 09:19:48 2013 +++ xsrc/external/mit/libXinerama/dist/src/Xinerama.c Fri May 31 09:33:32 2013 @@ -34,7 +34,7 @@ Equipment Corporation. static XExtensionInfo _panoramiX_ext_info_data; static XExtensionInfo *panoramiX_ext_info = _panoramiX_ext_info_data; -static const char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME; +static char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME; #define PanoramiXCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, panoramiX_extension_name, val) Index: xsrc/external/mit/libXres/dist/src/XRes.c diff -u xsrc/external/mit/libXres/dist/src/XRes.c:1.1.1.4 xsrc/external/mit/libXres/dist/src/XRes.c:1.2 --- xsrc/external/mit/libXres/dist/src/XRes.c:1.1.1.4 Fri May 31 09:19:50 2013 +++ xsrc/external/mit/libXres/dist/src/XRes.c Fri May 31 09:33:32 2013 @@ -27,7 +27,7 @@ static inline void _XEatDataWords(Displa static XExtensionInfo _xres_ext_info_data; static XExtensionInfo *xres_ext_info = _xres_ext_info_data; -static const char *xres_extension_name = XRES_NAME; +static char *xres_extension_name = XRES_NAME; #define XResCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, xres_extension_name, val) Index: xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c diff -u xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c:1.1.1.4 xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c:1.2 --- xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c:1.1.1.4 Fri May 31 09:20:02 2013 +++ xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c Fri May 31 09:33:32 2013 @@ -62,7 +62,7 @@ static inline void _XEatDataWords(Displa static XExtensionInfo _xf86vidmode_info_data; static XExtensionInfo *xf86vidmode_info = _xf86vidmode_info_data; -static const char *xf86vidmode_extension_name = XF86VIDMODENAME; +static char *xf86vidmode_extension_name = XF86VIDMODENAME; #define XF86VidModeCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, xf86vidmode_extension_name, val)
CVS commit: xsrc/external/mit/libXrandr/dist/src
Module Name:xsrc Committed By: mrg Date: Fri May 31 09:58:36 UTC 2013 Modified Files: xsrc/external/mit/libXrandr/dist/src: XrrProvider.c Log Message: add some casts to appease GCC; this code is kind of ugly but it seems to be mostly not broken. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/libXrandr/dist/src/XrrProvider.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/libXrandr/dist/src/XrrProvider.c diff -u xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.1.1.1 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.2 --- xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.1.1.1 Fri May 31 08:35:37 2013 +++ xsrc/external/mit/libXrandr/dist/src/XrrProvider.c Fri May 31 09:58:36 2013 @@ -77,7 +77,7 @@ XRRGetProviderResources(Display *dpy, Wi xrpr-nproviders = rep.nProviders; xrpr-providers = (RRProvider *)(xrpr + 1); -_XRead32(dpy, xrpr-providers, rep.nProviders 2); +_XRead32(dpy, (RRProvider *)xrpr-providers, rep.nProviders 2); if (nbytes nbytesRead) _XEatData (dpy, (unsigned long) (nbytes - nbytesRead)); @@ -156,7 +156,7 @@ XRRGetProviderInfo(Display *dpy, XRRScre _XRead32(dpy, xpi-outputs, rep.nOutputs 2); _XRead32(dpy, xpi-associated_providers, rep.nAssociatedProviders 2); -_XRead32(dpy, xpi-associated_capability, rep.nAssociatedProviders 2); +_XRead32(dpy, (RRProvider *)xpi-associated_capability, rep.nAssociatedProviders 2); _XReadPad(dpy, xpi-name, rep.nameLength); xpi-name[rep.nameLength] = '\0';
CVS commit: src
Module Name:src
Committed By: mrg
Date: Fri May 31 10:39:02 UTC 2013
Modified Files:
src: UPDATING
Log Message:
add a note about xsrc updates.
To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 src/UPDATING
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/UPDATING
diff -u src/UPDATING:1.243 src/UPDATING:1.244
--- src/UPDATING:1.243 Sat Mar 2 08:51:42 2013
+++ src/UPDATING Fri May 31 10:39:02 2013
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.243 2013/03/02 08:51:42 christos Exp $
+$NetBSD: UPDATING,v 1.244 2013/05/31 10:39:02 mrg Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -16,6 +16,10 @@ See also: BUILDING, build.sh, Makefile.
Recent changes:
^^^
+20130530:
+ Updates of many xsrc packages will leave old .pc files around.
+ Best to clean out the xsrc objdir entirely before rebuilds.
+
20130301:
The removal of netiso requires manual removal of /usr/include/netiso
prior to the build and make cleandir in /usr/src/usr.bin/{ktruss,kdump}
CVS commit: xsrc/external/mit/libxcb/include
Module Name:xsrc Committed By: mrg Date: Fri May 31 10:55:03 UTC 2013 Modified Files: xsrc/external/mit/libxcb/include: config.h Log Message: update for libxcb 1.9 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libxcb/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/libxcb/include/config.h diff -u xsrc/external/mit/libxcb/include/config.h:1.2 xsrc/external/mit/libxcb/include/config.h:1.3 --- xsrc/external/mit/libxcb/include/config.h:1.2 Sat Aug 14 11:38:31 2010 +++ xsrc/external/mit/libxcb/include/config.h Fri May 31 10:55:03 2013 @@ -13,9 +13,15 @@ /* Define to 1 if you have the dlfcn.h header file. */ #define HAVE_DLFCN_H 1 +/* getaddrinfo() function is available */ +#define HAVE_GETADDRINFO 1 + /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1 +/* Define to 1 if you have the `is_system_labeled' function. */ +/* #undef HAVE_IS_SYSTEM_LABELED */ + /* launchd support available */ /* #undef HAVE_LAUNCHD */ @@ -43,9 +49,15 @@ /* Define to 1 if you have the sys/types.h header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the tsol/label.h header file. */ +/* #undef HAVE_TSOL_LABEL_H */ + /* Define to 1 if you have the unistd.h header file. */ #define HAVE_UNISTD_H 1 +/* Define if not provided by limits.h */ +/* #undef IOV_MAX */ + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #define LT_OBJDIR .libs/ @@ -60,7 +72,7 @@ #define PACKAGE_NAME libxcb /* Define to the full name and version of this package. */ -#define PACKAGE_STRING libxcb 1.7 +#define PACKAGE_STRING libxcb 1.9 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME libxcb @@ -69,7 +81,7 @@ #define PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.7 +#define PACKAGE_VERSION 1.9 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -77,8 +89,40 @@ /* poll() function is available */ #define USE_POLL 1 +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + /* Version number of package */ -#define VERSION 1.7 +#define VERSION 1.9 /* XCB buffer queue size */ #define XCB_QUEUE_BUFFER_SIZE 16384 + +/* Define to 1 if on MINIX. */ +/* #undef _MINIX */ + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +/* #undef _POSIX_SOURCE */
CVS commit: src/external/mit/xorg/lib/libxcb/files
Module Name:src Committed By: mrg Date: Fri May 31 10:56:17 UTC 2013 Modified Files: src/external/mit/xorg/lib/libxcb/files: Makefile.xmlsrcs bigreq.c bigreq.h composite.c composite.h config.h damage.c damage.h dpms.c dpms.h dri2.c dri2.h glx.c glx.h randr.c randr.h record.c record.h render.c render.h res.c res.h screensaver.c screensaver.h shape.c shape.h shm.c shm.h sync.c sync.h xc_misc.c xc_misc.h xevie.c xevie.h xf86dri.c xf86dri.h xfixes.c xfixes.h xinerama.c xinerama.h xinput.c xinput.h xproto.c xproto.h xselinux.c xselinux.h xtest.c xtest.h xv.c xv.h xvmc.c xvmc.h Added Files: src/external/mit/xorg/lib/libxcb/files: xcb.h xcb_auth.c xcb_conn.c xcb_ext.c xcb_in.c xcb_list.c xcb_out.c xcb_util.c xcb_windefs.h xcb_xid.c xcbext.h xcbint.h xkb.c xkb.h xprint.c xprint.h Log Message: update the libxcb generated files from libxcb 1.9 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs \ src/external/mit/xorg/lib/libxcb/files/bigreq.c \ src/external/mit/xorg/lib/libxcb/files/bigreq.h \ src/external/mit/xorg/lib/libxcb/files/composite.c \ src/external/mit/xorg/lib/libxcb/files/composite.h \ src/external/mit/xorg/lib/libxcb/files/config.h \ src/external/mit/xorg/lib/libxcb/files/damage.c \ src/external/mit/xorg/lib/libxcb/files/damage.h \ src/external/mit/xorg/lib/libxcb/files/dpms.c \ src/external/mit/xorg/lib/libxcb/files/dpms.h \ src/external/mit/xorg/lib/libxcb/files/dri2.c \ src/external/mit/xorg/lib/libxcb/files/dri2.h \ src/external/mit/xorg/lib/libxcb/files/glx.c \ src/external/mit/xorg/lib/libxcb/files/glx.h \ src/external/mit/xorg/lib/libxcb/files/randr.c \ src/external/mit/xorg/lib/libxcb/files/randr.h \ src/external/mit/xorg/lib/libxcb/files/record.c \ src/external/mit/xorg/lib/libxcb/files/record.h \ src/external/mit/xorg/lib/libxcb/files/render.c \ src/external/mit/xorg/lib/libxcb/files/render.h \ src/external/mit/xorg/lib/libxcb/files/res.c \ src/external/mit/xorg/lib/libxcb/files/res.h \ src/external/mit/xorg/lib/libxcb/files/screensaver.c \ src/external/mit/xorg/lib/libxcb/files/screensaver.h \ src/external/mit/xorg/lib/libxcb/files/shape.c \ src/external/mit/xorg/lib/libxcb/files/shape.h \ src/external/mit/xorg/lib/libxcb/files/shm.c \ src/external/mit/xorg/lib/libxcb/files/shm.h \ src/external/mit/xorg/lib/libxcb/files/sync.c \ src/external/mit/xorg/lib/libxcb/files/sync.h \ src/external/mit/xorg/lib/libxcb/files/xc_misc.c \ src/external/mit/xorg/lib/libxcb/files/xc_misc.h \ src/external/mit/xorg/lib/libxcb/files/xevie.c \ src/external/mit/xorg/lib/libxcb/files/xevie.h \ src/external/mit/xorg/lib/libxcb/files/xf86dri.c \ src/external/mit/xorg/lib/libxcb/files/xf86dri.h \ src/external/mit/xorg/lib/libxcb/files/xfixes.c \ src/external/mit/xorg/lib/libxcb/files/xfixes.h \ src/external/mit/xorg/lib/libxcb/files/xinerama.c \ src/external/mit/xorg/lib/libxcb/files/xinerama.h \ src/external/mit/xorg/lib/libxcb/files/xinput.c \ src/external/mit/xorg/lib/libxcb/files/xinput.h \ src/external/mit/xorg/lib/libxcb/files/xproto.c \ src/external/mit/xorg/lib/libxcb/files/xproto.h \ src/external/mit/xorg/lib/libxcb/files/xselinux.c \ src/external/mit/xorg/lib/libxcb/files/xselinux.h \ src/external/mit/xorg/lib/libxcb/files/xtest.c \ src/external/mit/xorg/lib/libxcb/files/xtest.h \ src/external/mit/xorg/lib/libxcb/files/xv.c \ src/external/mit/xorg/lib/libxcb/files/xv.h \ src/external/mit/xorg/lib/libxcb/files/xvmc.c \ src/external/mit/xorg/lib/libxcb/files/xvmc.h cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxcb/files/xcb.h \ src/external/mit/xorg/lib/libxcb/files/xcb_auth.c \ src/external/mit/xorg/lib/libxcb/files/xcb_conn.c \ src/external/mit/xorg/lib/libxcb/files/xcb_ext.c \ src/external/mit/xorg/lib/libxcb/files/xcb_in.c \ src/external/mit/xorg/lib/libxcb/files/xcb_list.c \ src/external/mit/xorg/lib/libxcb/files/xcb_out.c \ src/external/mit/xorg/lib/libxcb/files/xcb_util.c \ src/external/mit/xorg/lib/libxcb/files/xcb_windefs.h \ src/external/mit/xorg/lib/libxcb/files/xcb_xid.c \ src/external/mit/xorg/lib/libxcb/files/xcbext.h \ src/external/mit/xorg/lib/libxcb/files/xcbint.h \ src/external/mit/xorg/lib/libxcb/files/xkb.c \ src/external/mit/xorg/lib/libxcb/files/xkb.h \ src/external/mit/xorg/lib/libxcb/files/xprint.c \ src/external/mit/xorg/lib/libxcb/files/xprint.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/tests/kernel
Module Name:src
Committed By: gson
Date: Fri May 31 14:40:48 UTC 2013
Modified Files:
src/tests/kernel: t_umountstress.sh
Log Message:
Don't rely on kill -0 to check whether a background shell command
has exited; it does not work reliably because the process may still
exist as a zombie. OK mlelstv.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/kernel/t_umountstress.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/t_umountstress.sh
diff -u src/tests/kernel/t_umountstress.sh:1.4 src/tests/kernel/t_umountstress.sh:1.5
--- src/tests/kernel/t_umountstress.sh:1.4 Sun Apr 28 15:49:58 2013
+++ src/tests/kernel/t_umountstress.sh Fri May 31 14:40:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_umountstress.sh,v 1.4 2013/04/28 15:49:58 mlelstv Exp $
+# $NetBSD: t_umountstress.sh,v 1.5 2013/05/31 14:40:48 gson Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -69,16 +69,16 @@ EOF
for k in 0 1 2 3 4 5 6 7 8 9; do
if ! dd msgfmt=quiet if=/dev/zero \
count=1 of=${TMPMP}/test$i$j$k; then
-echo 1
+echo 1 result
exit
fi
done
done
- echo 0
- ) result
+ echo 0 result
+ )
busypid=$!
- while kill 2/dev/null -0 $busypid; do
+ while ! test -f result; do
if err=$(umount ${TMPMP} 21); then
kill $busypid
exec 9-
@@ -150,16 +150,16 @@ EOF
for j in 0 1 2 3 4 5 6 7 8 9; do
for k in 0 1 2 3 4 5 6 7 8 9; do
if ! out=$(mount); then
-echo 1
+echo 1 result
exit
fi
done
done
- echo 0
- ) result
+ echo 0 result
+ )
busypid=$!
- while kill 2/dev/null -0 $busypid; do
+ while ! test -f result; do
if err=$(umount ${TMPMP} 21); then
if ! mount -o async ${BVND}${MPART} ${TMPMP}; then
kill $busypid
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src Committed By: tsutsui Date: Fri May 31 15:11:07 UTC 2013 Modified Files: src/sys/arch/i386/stand/lib: vbe.c Log Message: The 'vesa' command can take 'list' flag so mention it in an error message. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/stand/lib/vbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/stand/lib/vbe.c diff -u src/sys/arch/i386/stand/lib/vbe.c:1.7 src/sys/arch/i386/stand/lib/vbe.c:1.8 --- src/sys/arch/i386/stand/lib/vbe.c:1.7 Wed Feb 9 04:37:54 2011 +++ src/sys/arch/i386/stand/lib/vbe.c Fri May 31 15:11:07 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: vbe.c,v 1.7 2011/02/09 04:37:54 jmcneill Exp $ */ +/* $NetBSD: vbe.c,v 1.8 2013/05/31 15:11:07 tsutsui Exp $ */ /*- * Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca @@ -414,6 +414,6 @@ command_vesa(char *cmd) return; } - printf(invalid flag, must be 'on', 'off', + printf(invalid flag, must be 'on', 'off', 'list', a display mode, or a VBE mode number\n); }
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Fri May 31 16:16:40 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
run shutdownhooks
To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 src/sys/rump/librump/rumpkern/rump.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/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.269 src/sys/rump/librump/rumpkern/rump.c:1.270
--- src/sys/rump/librump/rumpkern/rump.c:1.269 Wed May 15 14:07:26 2013
+++ src/sys/rump/librump/rumpkern/rump.c Fri May 31 16:16:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.269 2013/05/15 14:07:26 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.270 2013/05/31 16:16:40 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.269 2013/05/15 14:07:26 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.270 2013/05/31 16:16:40 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -568,6 +568,8 @@ cpu_reboot(int howto, char *bootstr)
rump_vfs_fini();
}
+ doshutdownhooks();
+
/* your wish is my command */
if (howto RB_HALT) {
printf(rump kernel halted\n);
CVS commit: src/lib/librump
Module Name:src Committed By: pooka Date: Fri May 31 16:25:24 UTC 2013 Modified Files: src/lib/librump: rump_lwproc.3 Log Message: minor terminology and generality fixes no functional change To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/librump/rump_lwproc.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librump/rump_lwproc.3 diff -u src/lib/librump/rump_lwproc.3:1.4 src/lib/librump/rump_lwproc.3:1.5 --- src/lib/librump/rump_lwproc.3:1.4 Sun Jan 2 13:03:29 2011 +++ src/lib/librump/rump_lwproc.3 Fri May 31 16:25:24 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump_lwproc.3,v 1.4 2011/01/02 13:03:29 pooka Exp $ +.\ $NetBSD: rump_lwproc.3,v 1.5 2013/05/31 16:25:24 pooka Exp $ .\ .\ Copyright (c) 2010 Antti Kantee. All rights reserved. .\ @@ -28,7 +28,7 @@ .Os .Sh NAME .Nm rump_lwproc -.Nd rump process/lwp management +.Nd rump kernel process/lwp management .Sh LIBRARY rump kernel (librump, \-lrump) .Sh SYNOPSIS @@ -52,10 +52,11 @@ The current lwp (curlwp) indicates the c which resources, such as UID/GID, current working directory, and file descriptor table, are currently used. These basic principles apply to rump kernels as well, but since -rump uses the host's thread and process context directly, the rules +a rump kernel uses the host's thread and process context directly, the rules for how thread context is determined are different. .Pp -In the rump model, each host thread (pthread) is either bound to +In the rump kernel model, each host thread (implemented for example +with pthreads) is either bound to a rump kernel lwp or accesses the rump kernel with an implicit thread context associated with pid 1. An implicit thread context is created every time the rump kernel @@ -69,7 +70,7 @@ The association between host threads and left to the caller. It is possible to create a dedicated host thread for every rump kernel lwp or multiplex them on top of a single host thread. -After rump lwps have been created, switching curlwp is very cheap +After rump kernel lwps have been created, switching curlwp is very cheap -- faster than a thread context switch on the host. In case multiple lwps/processes are created, it is the caller's responsibility to keep track of them and release them when they
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri May 31 17:15:19 UTC 2013 Modified Files: src/sys/dev/pci: if_bgereg.h Log Message: Remove unused macros. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/if_bgereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_bgereg.h diff -u src/sys/dev/pci/if_bgereg.h:1.80 src/sys/dev/pci/if_bgereg.h:1.81 --- src/sys/dev/pci/if_bgereg.h:1.80 Thu May 30 05:50:06 2013 +++ src/sys/dev/pci/if_bgereg.h Fri May 31 17:15:19 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bgereg.h,v 1.80 2013/05/30 05:50:06 msaitoh Exp $ */ +/* $NetBSD: if_bgereg.h,v 1.81 2013/05/31 17:15:19 msaitoh Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -248,14 +248,6 @@ #define BGE_PCI_GEN15_PRODID_ASICREV 0xFC #define BGE_PCI_UNKNOWN0 0xC4 -/* XXX: - * Used in PCI-Express code for 575x chips. - * Should be replaced with checking for a PCI config-space - * capability for PCI-Express, and PCI-Express standard - * offsets into that capability block. - */ -#define BGE_PCI_CONF_DEV_CTRL 0xD8 -#define BGE_PCI_CONF_DEV_STUS 0xDA /* PCI Misc. Host control register */ #define BGE_PCIMISCCTL_CLEAR_INTA 0x0001
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Fri May 31 17:48:12 UTC 2013
Modified Files:
src/sys/dev/pci: if_bge.c if_bgevar.h
Log Message:
- Revert rev. 1.250. I really misunderstood. Add some comments.
- Set DMA watermark depend on the PCI max payload size.
To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/if_bgevar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.252 src/sys/dev/pci/if_bge.c:1.253
--- src/sys/dev/pci/if_bge.c:1.252 Thu May 30 05:50:06 2013
+++ src/sys/dev/pci/if_bge.c Fri May 31 17:48:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.252 2013/05/30 05:50:06 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.253 2013/05/31 17:48:12 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.252 2013/05/30 05:50:06 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.253 2013/05/31 17:48:12 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2331,7 +2331,10 @@ bge_chipinit(struct bge_softc *sc)
/* Read watermark not used, 128 bytes for write. */
DPRINTFN(4, ((%s: PCI-Express DMA setting)\n,
device_xname(sc-bge_dev)));
- dma_rw_ctl |= BGE_PCIDMARWCTL_WR_WAT_SHIFT(3);
+ if (sc-bge_mps = 256)
+ dma_rw_ctl |= BGE_PCIDMARWCTL_WR_WAT_SHIFT(7);
+ else
+ dma_rw_ctl |= BGE_PCIDMARWCTL_WR_WAT_SHIFT(3);
} else if (sc-bge_flags BGE_PCIX) {
DPRINTFN(4, ((:%s: PCI-X DMA setting)\n,
device_xname(sc-bge_dev)));
@@ -3348,6 +3351,10 @@ bge_attach(device_t parent, device_t sel
|| (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5785)) {
/* PCIe */
sc-bge_flags |= BGE_PCIE;
+ /* Extract supported maximum payload size. */
+ reg = pci_conf_read(sc-sc_pc, sc-sc_pcitag,
+ sc-bge_pciecap + PCIE_DCAP);
+ sc-bge_mps = 128 (reg PCIE_DCAP_MAX_PAYLOAD);
if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5719 ||
BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5720)
sc-bge_expmrq = 2048;
@@ -3966,11 +3973,13 @@ bge_reset(struct bge_softc *sc)
int i, val;
void (*write_op)(struct bge_softc *, int, int);
+ /* Make mask for BGE_MAC_MODE register. */
mac_mode_mask = BGE_MACMODE_HALF_DUPLEX | BGE_MACMODE_PORTMODE;
if ((sc-bge_mfw_flags BGE_MFW_ON_APE) != 0)
mac_mode_mask |= BGE_MACMODE_APE_RX_EN | BGE_MACMODE_APE_TX_EN;
- mac_mode = CSR_READ_4(sc, BGE_MAC_MODE) ~mac_mode_mask;
-
+ /* Keep mac_mode_mask's bits of BGE_MAC_MODE register into mac_mode */
+ mac_mode = CSR_READ_4(sc, BGE_MAC_MODE) mac_mode_mask;
+
if (BGE_IS_575X_PLUS(sc) !BGE_IS_5714_FAMILY(sc)
(BGE_ASICREV(sc-bge_chipid) != BGE_ASICREV_BCM5906)) {
if (sc-bge_flags BGE_PCIE)
@@ -4149,7 +4158,7 @@ bge_reset(struct bge_softc *sc)
BGE_SETBIT(sc, BGE_TLP_CONTROL_REG, BGE_TLP_DATA_FIFO_PROTECT);
}
- /* 57XX step 17 */
+ /* 5718 reset step 13, 57XX step 17 */
/* Poll until the firmware initialization is complete */
bge_poll_fw(sc);
@@ -4169,10 +4178,9 @@ bge_reset(struct bge_softc *sc)
}
/* 57XX step 18 */
- /* Write mac mode.
- * XXX Write 0x0c for 5703S and 5704S
- */
+ /* Write mac mode. */
val = CSR_READ_4(sc, BGE_MAC_MODE);
+ /* Restore mac_mode_mask's bits using mac_mode */
val = (val ~mac_mode_mask) | mac_mode;
CSR_WRITE_4_FLUSH(sc, BGE_MAC_MODE, val);
DELAY(40);
Index: src/sys/dev/pci/if_bgevar.h
diff -u src/sys/dev/pci/if_bgevar.h:1.15 src/sys/dev/pci/if_bgevar.h:1.16
--- src/sys/dev/pci/if_bgevar.h:1.15 Fri May 24 02:29:36 2013
+++ src/sys/dev/pci/if_bgevar.h Fri May 31 17:48:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bgevar.h,v 1.15 2013/05/24 02:29:36 msaitoh Exp $ */
+/* $NetBSD: if_bgevar.h,v 1.16 2013/05/31 17:48:12 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -276,6 +276,7 @@ struct bge_softc {
bus_dma_tag_t bge_dmatag;
uint32_t bge_pcixcap;
uint32_t bge_pciecap;
+ uint16_t bge_mps;
int bge_expmrq;
u_int32_t bge_mfw_flags; /* Management F/W flags */
#define BGE_MFW_ON_RXCPU 0x0001
CVS import: xsrc/external/mit/bitmap/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 20:25:30 UTC 2013 Update of /cvsroot/xsrc/external/mit/bitmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7177 Log Message: initial import of bitmap-1.0.7 Status: Vendor Tag: xorg Release Tags: bitmap-1-0-7 U xsrc/external/mit/bitmap/dist/Makefile.am U xsrc/external/mit/bitmap/dist/autogen.sh U xsrc/external/mit/bitmap/dist/configure.ac U xsrc/external/mit/bitmap/dist/RotateRight U xsrc/external/mit/bitmap/dist/CutPaste.c U xsrc/external/mit/bitmap/dist/Dashes U xsrc/external/mit/bitmap/dist/FlipVert U xsrc/external/mit/bitmap/dist/Down U xsrc/external/mit/bitmap/dist/FlipHoriz U xsrc/external/mit/bitmap/dist/Bitmap.c U xsrc/external/mit/bitmap/dist/Requests.h U xsrc/external/mit/bitmap/dist/Up U xsrc/external/mit/bitmap/dist/BitmapP.h U xsrc/external/mit/bitmap/dist/Dialog.h U xsrc/external/mit/bitmap/dist/Excl U xsrc/external/mit/bitmap/dist/config.sub U xsrc/external/mit/bitmap/dist/Right U xsrc/external/mit/bitmap/dist/atobm.c U xsrc/external/mit/bitmap/dist/ChangeLog U xsrc/external/mit/bitmap/dist/Makefile.in U xsrc/external/mit/bitmap/dist/INSTALL U xsrc/external/mit/bitmap/dist/configure U xsrc/external/mit/bitmap/dist/Stipple U xsrc/external/mit/bitmap/dist/Graphics.c U xsrc/external/mit/bitmap/dist/Bitmap.h U xsrc/external/mit/bitmap/dist/bmtoa.c U xsrc/external/mit/bitmap/dist/README U xsrc/external/mit/bitmap/dist/depcomp U xsrc/external/mit/bitmap/dist/missing U xsrc/external/mit/bitmap/dist/BitEdit.c U xsrc/external/mit/bitmap/dist/Term U xsrc/external/mit/bitmap/dist/Fold U xsrc/external/mit/bitmap/dist/Left U xsrc/external/mit/bitmap/dist/RotateLeft U xsrc/external/mit/bitmap/dist/COPYING U xsrc/external/mit/bitmap/dist/ReqMach.c U xsrc/external/mit/bitmap/dist/config.h.in U xsrc/external/mit/bitmap/dist/Dialog.c U xsrc/external/mit/bitmap/dist/config.guess U xsrc/external/mit/bitmap/dist/AUTHORS U xsrc/external/mit/bitmap/dist/Handlers.c U xsrc/external/mit/bitmap/dist/install-sh U xsrc/external/mit/bitmap/dist/compile U xsrc/external/mit/bitmap/dist/aclocal.m4 U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap-nocase U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap-color U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap U xsrc/external/mit/bitmap/dist/man/atobm.man U xsrc/external/mit/bitmap/dist/man/Makefile.am U xsrc/external/mit/bitmap/dist/man/bitmap.man U xsrc/external/mit/bitmap/dist/man/Makefile.in U xsrc/external/mit/bitmap/dist/man/bmtoa.man No conflicts created by this import
CVS import: xsrc/external/mit/dri2proto/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 20:25:32 UTC 2013 Update of /cvsroot/xsrc/external/mit/dri2proto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8730 Log Message: initial import of dri2proto-2.8 Status: Vendor Tag: xorg Release Tags: dri2proto-2-8 U xsrc/external/mit/dri2proto/dist/dri2proto.txt U xsrc/external/mit/dri2proto/dist/install-sh U xsrc/external/mit/dri2proto/dist/dri2tokens.h U xsrc/external/mit/dri2proto/dist/configure U xsrc/external/mit/dri2proto/dist/INSTALL U xsrc/external/mit/dri2proto/dist/README U xsrc/external/mit/dri2proto/dist/dri2proto.h U xsrc/external/mit/dri2proto/dist/COPYING U xsrc/external/mit/dri2proto/dist/Makefile.in U xsrc/external/mit/dri2proto/dist/Makefile.am U xsrc/external/mit/dri2proto/dist/config.sub U xsrc/external/mit/dri2proto/dist/ChangeLog U xsrc/external/mit/dri2proto/dist/missing U xsrc/external/mit/dri2proto/dist/configure.ac U xsrc/external/mit/dri2proto/dist/dri2proto.pc.in U xsrc/external/mit/dri2proto/dist/config.guess U xsrc/external/mit/dri2proto/dist/aclocal.m4 No conflicts created by this import
CVS import: xsrc/external/mit/libXft/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 21:03:35 UTC 2013 Update of /cvsroot/xsrc/external/mit/libXft/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28045 Log Message: initial import of libXft-2.3.1 Status: Vendor Tag: xorg Release Tags: libXft-2-3-1 U xsrc/external/mit/libXft/dist/INSTALL U xsrc/external/mit/libXft/dist/configure U xsrc/external/mit/libXft/dist/NEWS U xsrc/external/mit/libXft/dist/README U xsrc/external/mit/libXft/dist/Makefile.in U xsrc/external/mit/libXft/dist/ChangeLog U xsrc/external/mit/libXft/dist/depcomp U xsrc/external/mit/libXft/dist/install-sh U xsrc/external/mit/libXft/dist/xft.pc.in U xsrc/external/mit/libXft/dist/aclocal.m4 U xsrc/external/mit/libXft/dist/Makefile.am U xsrc/external/mit/libXft/dist/configure.ac U xsrc/external/mit/libXft/dist/config.guess U xsrc/external/mit/libXft/dist/config.h.in U xsrc/external/mit/libXft/dist/ltmain.sh U xsrc/external/mit/libXft/dist/missing U xsrc/external/mit/libXft/dist/COPYING U xsrc/external/mit/libXft/dist/config.sub U xsrc/external/mit/libXft/dist/AUTHORS U xsrc/external/mit/libXft/dist/man/Makefile.am U xsrc/external/mit/libXft/dist/man/Makefile.in U xsrc/external/mit/libXft/dist/man/Xft.man U xsrc/external/mit/libXft/dist/src/xftfreetype.c U xsrc/external/mit/libXft/dist/src/xftglyphs.c U xsrc/external/mit/libXft/dist/src/xftdbg.c U xsrc/external/mit/libXft/dist/src/xftinit.c U xsrc/external/mit/libXft/dist/src/xftswap.c U xsrc/external/mit/libXft/dist/src/Makefile.in C xsrc/external/mit/libXft/dist/src/xftdpy.c U xsrc/external/mit/libXft/dist/src/xftint.h U xsrc/external/mit/libXft/dist/src/Makefile.am U xsrc/external/mit/libXft/dist/src/xftname.c U xsrc/external/mit/libXft/dist/src/xftcolor.c U xsrc/external/mit/libXft/dist/src/xftextent.c U xsrc/external/mit/libXft/dist/src/xftrender.c U xsrc/external/mit/libXft/dist/src/xftfont.c U xsrc/external/mit/libXft/dist/src/xftstr.c U xsrc/external/mit/libXft/dist/src/xftcore.c U xsrc/external/mit/libXft/dist/src/xftxlfd.c U xsrc/external/mit/libXft/dist/src/xftlist.c U xsrc/external/mit/libXft/dist/src/xftdraw.c U xsrc/external/mit/libXft/dist/include/X11/Xft/XftCompat.h U xsrc/external/mit/libXft/dist/include/X11/Xft/Xft.h.in U xsrc/external/mit/libXft/dist/include/X11/Xft/Xft.h 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXft/dist
CVS commit: xsrc/external/mit/libXft/dist/src
Module Name:xsrc
Committed By: mrg
Date: Fri May 31 21:04:06 UTC 2013
Modified Files:
xsrc/external/mit/libXft/dist/src: xftdpy.c
Log Message:
merge libXft 2.3.1.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXft/dist/src/xftdpy.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/libXft/dist/src/xftdpy.c
diff -u xsrc/external/mit/libXft/dist/src/xftdpy.c:1.2 xsrc/external/mit/libXft/dist/src/xftdpy.c:1.3
--- xsrc/external/mit/libXft/dist/src/xftdpy.c:1.2 Sun Nov 8 10:17:36 2009
+++ xsrc/external/mit/libXft/dist/src/xftdpy.c Fri May 31 21:04:06 2013
@@ -32,19 +32,19 @@ _XftCloseDisplay (Display *dpy, XExtCode
info = _XftDisplayInfoGet (dpy, FcFalse);
if (!info)
return 0;
-
+
/*
* Get rid of any dangling unreferenced fonts
*/
info-max_unref_fonts = 0;
XftFontManageMemory (dpy);
-
+
/*
* Clean up the default values
*/
if (info-defaults)
FcPatternDestroy (info-defaults);
-
+
/*
* Unhook from the global list
*/
@@ -52,7 +52,7 @@ _XftCloseDisplay (Display *dpy, XExtCode
if (info-display == dpy)
break;
*prev = info-next;
-
+
free (info);
return 0;
}
@@ -126,8 +126,8 @@ _XftDisplayInfoGet (Display *dpy, FcBool
{
Visual *visual = DefaultVisual (dpy, DefaultScreen (dpy));
XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
-
- printf (XftDisplayInfoGet Default visual 0x%x ,
+
+ printf (XftDisplayInfoGet Default visual 0x%x ,
(int) visual-visualid);
if (format)
{
@@ -146,7 +146,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool
}
else
printf (No Render format for default visual\n);
-
+
printf (XftDisplayInfoGet initialized, hasRender set to \%s\\n,
info-hasRender ? True : False);
}
@@ -156,7 +156,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool
info-colors[i].pict = 0;
}
info-fonts = NULL;
-
+
info-next = _XftDisplayInfo;
_XftDisplayInfo = info;
@@ -167,7 +167,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool
if (XftDebug () XFT_DBG_CACHE)
printf (global max cache memory %ld\n, info-max_glyph_memory);
-
+
info-num_unref_fonts = 0;
info-max_unref_fonts = XftDefaultGetInteger (dpy,
XFT_MAX_UNREF_FONTS, 0,
@@ -177,7 +177,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool
memset (info-fontHash, '\0', sizeof (XftFont *) * XFT_NUM_FONT_HASH);
return info;
-
+
bail1:
free (info);
bail0:
@@ -282,7 +282,7 @@ XftDefaultSet (Display *dpy, FcPattern *
}
_X_HIDDEN int
-XftDefaultParseBool (char *v)
+XftDefaultParseBool (const char *v)
{
charc0, c1;
@@ -307,7 +307,7 @@ XftDefaultParseBool (char *v)
}
static Bool
-_XftDefaultInitBool (Display *dpy, FcPattern *pat, char *option)
+_XftDefaultInitBool (Display *dpy, FcPattern *pat, const char *option)
{
char*v;
int i;
@@ -319,7 +319,7 @@ _XftDefaultInitBool (Display *dpy, FcPat
}
static Bool
-_XftDefaultInitDouble (Display *dpy, FcPattern *pat, char *option)
+_XftDefaultInitDouble (Display *dpy, FcPattern *pat, const char *option)
{
char*v, *e;
double d;
@@ -335,7 +335,7 @@ _XftDefaultInitDouble (Display *dpy, FcP
}
static Bool
-_XftDefaultInitInteger (Display *dpy, FcPattern *pat, char *option)
+_XftDefaultInitInteger (Display *dpy, FcPattern *pat, const char *option)
{
char*v, *e;
int i;
@@ -369,27 +369,25 @@ _XftDefaultInit (Display *dpy)
goto bail1;
if (!_XftDefaultInitInteger (dpy, pat, FC_RGBA))
goto bail1;
+if (!_XftDefaultInitInteger (dpy, pat, FC_LCD_FILTER))
+ goto bail1;
if (!_XftDefaultInitBool (dpy, pat, FC_ANTIALIAS))
goto bail1;
-#ifdef FC_EMBOLDEN
if (!_XftDefaultInitBool (dpy, pat, FC_EMBOLDEN))
goto bail1;
-#endif
if (!_XftDefaultInitBool (dpy, pat, FC_AUTOHINT))
goto bail1;
-#ifdef FC_HINT_STYLE
if (!_XftDefaultInitInteger (dpy, pat, FC_HINT_STYLE))
goto bail1;
-#endif
if (!_XftDefaultInitBool (dpy, pat, FC_HINTING))
goto bail1;
if (!_XftDefaultInitBool (dpy, pat, FC_MINSPACE))
goto bail1;
if (!_XftDefaultInitInteger (dpy, pat, XFT_MAX_GLYPH_MEMORY))
goto bail1;
-
+
return pat;
-
+
bail1:
FcPatternDestroy (pat);
bail0:
@@ -404,7 +402,7 @@ _XftDefaultGet (Display *dpy, const char
if (!info)
return FcResultNoMatch;
-
+
if (!info-defaults)
{
info-defaults = _XftDefaultInit (dpy);
@@ -462,7 +460,7 @@ XftDefaultSubstitute (Display *dpy, int
if (FcPatternGet (pattern, XFT_RENDER, 0, v) == FcResultNoMatch)
{
FcPatternAddBool (pattern, XFT_RENDER,
- XftDefaultGetBool (dpy, XFT_RENDER, screen,
+ XftDefaultGetBool (dpy, XFT_RENDER, screen,
XftDefaultHasRender (dpy)));
}
if (FcPatternGet (pattern, FC_ANTIALIAS, 0, v) == FcResultNoMatch)
CVS import: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 21:22:49 UTC 2013 Update of /cvsroot/xsrc/external/mit/xterm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10042 Log Message: initial import of xterm-293 Status: Vendor Tag: xorg Release Tags: xterm-293 U xsrc/external/mit/xterm/dist/df-install.in U xsrc/external/mit/xterm/dist/config.guess N xsrc/external/mit/xterm/dist/version.c U xsrc/external/mit/xterm/dist/terminfo U xsrc/external/mit/xterm/dist/88colres.h U xsrc/external/mit/xterm/dist/tabs.c U xsrc/external/mit/xterm/dist/XTerm.ad U xsrc/external/mit/xterm/dist/charproc.c U xsrc/external/mit/xterm/dist/README U xsrc/external/mit/xterm/dist/menu.h U xsrc/external/mit/xterm/dist/termcap U xsrc/external/mit/xterm/dist/uxterm.desktop U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl C xsrc/external/mit/xterm/dist/xterm.man U xsrc/external/mit/xterm/dist/fontutils.h U xsrc/external/mit/xterm/dist/xtermcfg.hin U xsrc/external/mit/xterm/dist/Imakefile U xsrc/external/mit/xterm/dist/UXTerm.ad U xsrc/external/mit/xterm/dist/trace.h U xsrc/external/mit/xterm/dist/xterm_io.h U xsrc/external/mit/xterm/dist/keysym2ucs.c U xsrc/external/mit/xterm/dist/data.c U xsrc/external/mit/xterm/dist/uxterm.man U xsrc/external/mit/xterm/dist/Makefile.in U xsrc/external/mit/xterm/dist/fontutils.c U xsrc/external/mit/xterm/dist/XTerm-col.ad U xsrc/external/mit/xterm/dist/charclass.c U xsrc/external/mit/xterm/dist/xterm.desktop U xsrc/external/mit/xterm/dist/README.i18n U xsrc/external/mit/xterm/dist/aclocal.m4 U xsrc/external/mit/xterm/dist/trace.c U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad U xsrc/external/mit/xterm/dist/install-sh U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt U xsrc/external/mit/xterm/dist/wcwidth.h U xsrc/external/mit/xterm/dist/Tekparse.h U xsrc/external/mit/xterm/dist/TekPrsTbl.c U xsrc/external/mit/xterm/dist/vms.c U xsrc/external/mit/xterm/dist/xstrings.c U xsrc/external/mit/xterm/dist/xterm.log.html U xsrc/external/mit/xterm/dist/run-tic.sh N xsrc/external/mit/xterm/dist/minstall.in U xsrc/external/mit/xterm/dist/MANIFEST U xsrc/external/mit/xterm/dist/Tekparse.def U xsrc/external/mit/xterm/dist/make.com U xsrc/external/mit/xterm/dist/precompose.h U xsrc/external/mit/xterm/dist/README.os390 U xsrc/external/mit/xterm/dist/xtermcap.c U xsrc/external/mit/xterm/dist/cachedGCs.c U xsrc/external/mit/xterm/dist/menu.c U xsrc/external/mit/xterm/dist/doublechr.c C xsrc/external/mit/xterm/dist/linedata.c U xsrc/external/mit/xterm/dist/xtermcap.h U xsrc/external/mit/xterm/dist/data.h U xsrc/external/mit/xterm/dist/version.h U xsrc/external/mit/xterm/dist/THANKS U xsrc/external/mit/xterm/dist/charclass.h U xsrc/external/mit/xterm/dist/xutf8.h U xsrc/external/mit/xterm/dist/ctlseqs.ms U xsrc/external/mit/xterm/dist/config.sub U xsrc/external/mit/xterm/dist/xcharmouse.h U xsrc/external/mit/xterm/dist/sinstall.sh U xsrc/external/mit/xterm/dist/configure U xsrc/external/mit/xterm/dist/koi8rxterm U xsrc/external/mit/xterm/dist/Tests U xsrc/external/mit/xterm/dist/print.c U xsrc/external/mit/xterm/dist/resize.c U xsrc/external/mit/xterm/dist/plink.sh U xsrc/external/mit/xterm/dist/configure.in U xsrc/external/mit/xterm/dist/uxterm U xsrc/external/mit/xterm/dist/charsets.c U xsrc/external/mit/xterm/dist/256colres.h U xsrc/external/mit/xterm/dist/ctlseqs.txt U xsrc/external/mit/xterm/dist/button.c U xsrc/external/mit/xterm/dist/Tekproc.c U xsrc/external/mit/xterm/dist/xterm.h U xsrc/external/mit/xterm/dist/link_axp.com U xsrc/external/mit/xterm/dist/xutf8.c C xsrc/external/mit/xterm/dist/misc.c U xsrc/external/mit/xterm/dist/main.c U xsrc/external/mit/xterm/dist/ptydata.c U xsrc/external/mit/xterm/dist/scrollbar.c C xsrc/external/mit/xterm/dist/scrollback.c U xsrc/external/mit/xterm/dist/VTparse.def U xsrc/external/mit/xterm/dist/VTparse.h U xsrc/external/mit/xterm/dist/koi8rxterm.man U xsrc/external/mit/xterm/dist/xstrings.h U xsrc/external/mit/xterm/dist/VTPrsTbl.c U xsrc/external/mit/xterm/dist/256colres.pl U xsrc/external/mit/xterm/dist/precompose.c U xsrc/external/mit/xterm/dist/util.c U xsrc/external/mit/xterm/dist/error.h U xsrc/external/mit/xterm/dist/input.c U xsrc/external/mit/xterm/dist/xterm_axp.opt U xsrc/external/mit/xterm/dist/wcwidth.c U xsrc/external/mit/xterm/dist/vms.h U xsrc/external/mit/xterm/dist/resize.man U xsrc/external/mit/xterm/dist/INSTALL C xsrc/external/mit/xterm/dist/ptyx.h U xsrc/external/mit/xterm/dist/testxmc.c U xsrc/external/mit/xterm/dist/xterm.dat U xsrc/external/mit/xterm/dist/cursor.c U xsrc/external/mit/xterm/dist/keysym2ucs.h U xsrc/external/mit/xterm/dist/main.h U xsrc/external/mit/xterm/dist/88colres.pl U xsrc/external/mit/xterm/dist/screen.c N xsrc/external/mit/xterm/dist/vttests/query-color.pl U xsrc/external/mit/xterm/dist/vttests/dynamic.sh U xsrc/external/mit/xterm/dist/vttests/256colors.pl U xsrc/external/mit/xterm/dist/vttests/tcapquery.pl U xsrc/external/mit/xterm/dist/vttests/fonts.sh U
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Fri May 31 21:40:29 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
src/external/mit/xorg/bin/xterm/resize: Makefile
Log Message:
add new version.c for xterm 293.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xterm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xterm/resize/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/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.10 src/external/mit/xorg/bin/xterm/Makefile:1.11
--- src/external/mit/xorg/bin/xterm/Makefile:1.10 Thu May 30 23:42:19 2013
+++ src/external/mit/xorg/bin/xterm/Makefile Fri May 31 21:40:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/05/30 23:42:19 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2013/05/31 21:40:29 mrg Exp $
.include bsd.own.mk
@@ -7,7 +7,7 @@ SRCS= button.c charproc.c charsets.c cur
fontutils.c input.c linedata.c menu.c misc.c print.c ptydata.c \
screen.c scrollback.c scrollbar.c tabs.c util.c xstrings.c \
TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \
- wcwidth.c xutf8.c cachedGCs.c xtermcap.c
+ wcwidth.c xutf8.c cachedGCs.c xtermcap.c version.c
CPPFLAGS+= -I${X11SRCDIR.${PROG}} \
-I${X11SRCDIR.${PROG}}/../include \
Index: src/external/mit/xorg/bin/xterm/resize/Makefile
diff -u src/external/mit/xorg/bin/xterm/resize/Makefile:1.3 src/external/mit/xorg/bin/xterm/resize/Makefile:1.4
--- src/external/mit/xorg/bin/xterm/resize/Makefile:1.3 Sun May 15 21:35:58 2011
+++ src/external/mit/xorg/bin/xterm/resize/Makefile Fri May 31 21:40:29 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/05/15 21:35:58 christos Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 21:40:29 mrg Exp $
.include bsd.own.mk
PROG= resize
-SRCS= resize.c xstrings.c
+SRCS= resize.c xstrings.c version.c
CPPFLAGS+=-I${X11SRCDIR.xterm}
CPPFLAGS+=-DHAVE_TERMCAP_H
CVS commit: xsrc/external/mit/xterm
Module Name:xsrc
Committed By: mrg
Date: Fri May 31 21:48:11 UTC 2013
Modified Files:
xsrc/external/mit/xterm/dist: fontutils.c
xsrc/external/mit/xterm/include: xtermcfg.h
Log Message:
merge xterm 293 xtermcfg.h, and patch fontutils.c to actually work
with our selected set of options (issue between OPT_RENDERFONT and
OPT_SHIFT_FONTS.)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xterm/include/xtermcfg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xterm/dist/fontutils.c
diff -u xsrc/external/mit/xterm/dist/fontutils.c:1.1.1.7 xsrc/external/mit/xterm/dist/fontutils.c:1.2
--- xsrc/external/mit/xterm/dist/fontutils.c:1.1.1.7 Fri May 31 21:22:47 2013
+++ xsrc/external/mit/xterm/dist/fontutils.c Fri May 31 21:48:11 2013
@@ -2718,7 +2718,7 @@ dec2ucs(unsigned ch)
#endif /* OPT_WIDE_CHARS */
-#if OPT_SHIFT_FONTS
+#if OPT_RENDERFONT || OPT_SHIFT_FONTS
static int
lookupOneFontSize(XtermWidget xw, int fontnum)
{
@@ -2760,6 +2760,7 @@ lookupFontSizes(XtermWidget xw)
(void) lookupOneFontSize(xw, n);
}
}
+#endif /* OPT_RENDERFONT || OPT_SHIFT_FONTS */
#if OPT_RENDERFONT
static void
@@ -2885,6 +2886,7 @@ useFaceSizes(XtermWidget xw)
}
#endif /* OPT_RENDERFONT */
+#if OPT_SHIFT_FONTS
/*
* Find the index of a larger/smaller font (according to the sign of 'relative'
* and its magnitude), starting from the 'old' index.
@@ -3008,7 +3010,7 @@ HandleSmallerFont(Widget w GCC_UNUSED,
}
}
}
-#endif
+#endif /* OPT_SHIFT_FONTS */
int
xtermGetFont(const char *param)
Index: xsrc/external/mit/xterm/include/xtermcfg.h
diff -u xsrc/external/mit/xterm/include/xtermcfg.h:1.4 xsrc/external/mit/xterm/include/xtermcfg.h:1.5
--- xsrc/external/mit/xterm/include/xtermcfg.h:1.4 Fri Nov 26 06:15:18 2010
+++ xsrc/external/mit/xterm/include/xtermcfg.h Fri May 31 21:48:11 2013
@@ -1,30 +1,35 @@
/* xtermcfg.h. Generated automatically by configure. */
-/* $XTermId: xtermcfg.hin,v 1.180 2010/04/21 00:19:23 tom Exp $ */
+/* $XTermId: xtermcfg.hin,v 1.199 2013/05/27 21:05:23 tom Exp $ */
-/
-
-Copyright 1997-2009,2010 by Thomas E. Dickey
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-/
+/*
+ * Copyright 1997-2012,2013 by Thomas E. Dickey
+ *
+ * All Rights Reserved
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * Software), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the
+ * sale, use or other dealings in this Software without prior written
+ * authorization.
+ */
#ifndef included_xtermcfg_h
#define included_xtermcfg_h 1
@@
CVS import: xsrc/external/mit/sessreg/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 22:19:35 UTC 2013 Update of /cvsroot/xsrc/external/mit/sessreg/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19041 Log Message: initial import of sessreg-1.0.8 Status: Vendor Tag: xorg Release Tags: sessreg-1-0-8 U xsrc/external/mit/sessreg/dist/Makefile.am U xsrc/external/mit/sessreg/dist/depcomp U xsrc/external/mit/sessreg/dist/missing U xsrc/external/mit/sessreg/dist/INSTALL U xsrc/external/mit/sessreg/dist/configure.ac U xsrc/external/mit/sessreg/dist/aclocal.m4 U xsrc/external/mit/sessreg/dist/install-sh C xsrc/external/mit/sessreg/dist/sessreg.h U xsrc/external/mit/sessreg/dist/AUTHORS U xsrc/external/mit/sessreg/dist/Makefile.in U xsrc/external/mit/sessreg/dist/COPYING U xsrc/external/mit/sessreg/dist/README U xsrc/external/mit/sessreg/dist/config.sub U xsrc/external/mit/sessreg/dist/sessreg.c U xsrc/external/mit/sessreg/dist/configure U xsrc/external/mit/sessreg/dist/config.guess U xsrc/external/mit/sessreg/dist/ChangeLog U xsrc/external/mit/sessreg/dist/config.h.in N xsrc/external/mit/sessreg/dist/man/filenames.sed.c N xsrc/external/mit/sessreg/dist/man/Makefile.in N xsrc/external/mit/sessreg/dist/man/Makefile.am N xsrc/external/mit/sessreg/dist/man/sessreg.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/sessreg/dist
CVS import: xsrc/external/mit/xdm/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 22:19:38 UTC 2013 Update of /cvsroot/xsrc/external/mit/xdm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9443 Log Message: initial import of xdm-1.1.11 Status: Vendor Tag: xorg Release Tags: xdm-1-1-11 U xsrc/external/mit/xdm/dist/aclocal.m4 U xsrc/external/mit/xdm/dist/ChangeLog U xsrc/external/mit/xdm/dist/AUTHORS U xsrc/external/mit/xdm/dist/config.guess U xsrc/external/mit/xdm/dist/config.h.in U xsrc/external/mit/xdm/dist/config.sub U xsrc/external/mit/xdm/dist/configure U xsrc/external/mit/xdm/dist/configure.ac U xsrc/external/mit/xdm/dist/COPYING U xsrc/external/mit/xdm/dist/cpprules.in U xsrc/external/mit/xdm/dist/depcomp U xsrc/external/mit/xdm/dist/install-sh U xsrc/external/mit/xdm/dist/INSTALL U xsrc/external/mit/xdm/dist/missing U xsrc/external/mit/xdm/dist/ltmain.sh U xsrc/external/mit/xdm/dist/Makefile.am U xsrc/external/mit/xdm/dist/Makefile.in U xsrc/external/mit/xdm/dist/README N xsrc/external/mit/xdm/dist/xdm.service.in N xsrc/external/mit/xdm/dist/app-defaults/Makefile.am N xsrc/external/mit/xdm/dist/app-defaults/Chooser N xsrc/external/mit/xdm/dist/app-defaults/Makefile.in N xsrc/external/mit/xdm/dist/chooser/chooser.c N xsrc/external/mit/xdm/dist/chooser/Makefile.am N xsrc/external/mit/xdm/dist/chooser/Makefile.in U xsrc/external/mit/xdm/dist/config/xdm-config.cpp U xsrc/external/mit/xdm/dist/config/GiveConsole U xsrc/external/mit/xdm/dist/config/Makefile.am U xsrc/external/mit/xdm/dist/config/Makefile.in U xsrc/external/mit/xdm/dist/config/README U xsrc/external/mit/xdm/dist/config/TakeConsole U xsrc/external/mit/xdm/dist/config/Xaccess C xsrc/external/mit/xdm/dist/config/Xresources.cpp U xsrc/external/mit/xdm/dist/config/xorg-bw.xpm U xsrc/external/mit/xdm/dist/config/xorg.xpm U xsrc/external/mit/xdm/dist/config/Xreset.cpp U xsrc/external/mit/xdm/dist/config/Xservers.ws.cpp U xsrc/external/mit/xdm/dist/config/Xservers.fs U xsrc/external/mit/xdm/dist/config/Xsession.cpp U xsrc/external/mit/xdm/dist/config/Xsetup_0 U xsrc/external/mit/xdm/dist/config/Xstartup.cpp U xsrc/external/mit/xdm/dist/config/Xwilling U xsrc/external/mit/xdm/dist/greeter/Makefile.am C xsrc/external/mit/xdm/dist/greeter/greet.c U xsrc/external/mit/xdm/dist/greeter/Login.c U xsrc/external/mit/xdm/dist/greeter/Login.h U xsrc/external/mit/xdm/dist/greeter/LoginP.h U xsrc/external/mit/xdm/dist/greeter/Makefile.in U xsrc/external/mit/xdm/dist/greeter/verify.c N xsrc/external/mit/xdm/dist/m4/ax_define_dir.m4 N xsrc/external/mit/xdm/dist/include/dm_auth.h N xsrc/external/mit/xdm/dist/include/dm.h N xsrc/external/mit/xdm/dist/include/dm_error.h N xsrc/external/mit/xdm/dist/include/dm_socket.h N xsrc/external/mit/xdm/dist/include/greet.h N xsrc/external/mit/xdm/dist/include/Makefile.am N xsrc/external/mit/xdm/dist/include/Makefile.in N xsrc/external/mit/xdm/dist/man/Makefile.am N xsrc/external/mit/xdm/dist/man/Makefile.in N xsrc/external/mit/xdm/dist/man/xdm.man N xsrc/external/mit/xdm/dist/man/xdmshell.man N xsrc/external/mit/xdm/dist/xdm/dpylist.c N xsrc/external/mit/xdm/dist/xdm/access.c N xsrc/external/mit/xdm/dist/xdm/auth.c N xsrc/external/mit/xdm/dist/xdm/choose.c N xsrc/external/mit/xdm/dist/xdm/daemon.c N xsrc/external/mit/xdm/dist/xdm/dm.c N xsrc/external/mit/xdm/dist/xdm/genauth.c N xsrc/external/mit/xdm/dist/xdm/error.c N xsrc/external/mit/xdm/dist/xdm/file.c N xsrc/external/mit/xdm/dist/xdm/krb5auth.c N xsrc/external/mit/xdm/dist/xdm/Makefile.am N xsrc/external/mit/xdm/dist/xdm/Makefile.in N xsrc/external/mit/xdm/dist/xdm/mitauth.c N xsrc/external/mit/xdm/dist/xdm/netaddr.c N xsrc/external/mit/xdm/dist/xdm/policy.c N xsrc/external/mit/xdm/dist/xdm/prngc.c N xsrc/external/mit/xdm/dist/xdm/protodpy.c N xsrc/external/mit/xdm/dist/xdm/reset.c N xsrc/external/mit/xdm/dist/xdm/resource.c N xsrc/external/mit/xdm/dist/xdm/rpcauth.c N xsrc/external/mit/xdm/dist/xdm/server.c N xsrc/external/mit/xdm/dist/xdm/session.c N xsrc/external/mit/xdm/dist/xdm/socket.c N xsrc/external/mit/xdm/dist/xdm/streams.c N xsrc/external/mit/xdm/dist/xdm/util.c N xsrc/external/mit/xdm/dist/xdm/xdmauth.c N xsrc/external/mit/xdm/dist/xdm/xdmcp.c N xsrc/external/mit/xdm/dist/xdmshell/Makefile.am N xsrc/external/mit/xdm/dist/xdmshell/Makefile.in N xsrc/external/mit/xdm/dist/xdmshell/xdmshell.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xdm/dist
CVS commit: xsrc/external/mit/sessreg/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 22:24:30 UTC 2013 Modified Files: xsrc/external/mit/sessreg/dist: sessreg.h Removed Files: xsrc/external/mit/sessreg/dist: filenames.sed.c sessreg.man Log Message: merge sessreg 1.0.8 To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/sessreg/dist/filenames.sed.c \ xsrc/external/mit/sessreg/dist/sessreg.man cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/sessreg/dist/sessreg.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/sessreg/dist/sessreg.h diff -u xsrc/external/mit/sessreg/dist/sessreg.h:1.2 xsrc/external/mit/sessreg/dist/sessreg.h:1.3 --- xsrc/external/mit/sessreg/dist/sessreg.h:1.2 Thu Jun 17 04:32:46 2010 +++ xsrc/external/mit/sessreg/dist/sessreg.h Fri May 31 22:24:30 2013 @@ -6,10 +6,10 @@ * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting * documentation. - * + * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -17,7 +17,7 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. - * + * * Except as contained in this notice, the name of The Open Group shall * not be used in advertising or otherwise to promote the sale, use or * other dealings in this Software without prior written authorization @@ -25,7 +25,8 @@ * */ -/* Copyright 2005 Sun Microsystems, Inc. All rights reserved. +/* + * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the Software), @@ -66,26 +67,12 @@ # include sys/param.h #endif -#ifndef HAVE_LASTLOG_H -# define NO_LASTLOG -#endif - -#ifndef NO_LASTLOG -# ifdef CSRG_BASED -# if (BSD 199103) -# include lastlog.h -# endif -# else -# include lastlog.h +#if defined(HAVE_STRUCT_LASTLOG) defined(HAVE_PWD_H) +# ifdef HAVE_LASTLOG_H +# include lastlog.h # endif -# include pwd.h -#endif - -#ifdef CSRG_BASED -#if !defined(__FreeBSD__) !defined(__OpenBSD__) -/* *BSD doesn't like a ':0' type entry in utmp */ -#define NO_UTMP -#endif +# include pwd.h +# define USE_LASTLOG #endif #ifndef WTMP_FILE @@ -95,15 +82,6 @@ # define WTMP_FILE /usr/adm/wtmp # endif #endif - -#ifndef WTMPX_FILE -# ifdef _PATH_WTMPX -# define WTMPX_FILE _PATH_WTMPX -# else -# define WTMPX_FILE /usr/adm/wtmpx -# endif -#endif - #ifndef UTMP_FILE # ifdef _PATH_UTMP # define UTMP_FILE _PATH_UTMP @@ -111,27 +89,20 @@ # define UTMP_FILE /etc/utmp # endif #endif - -#ifndef UTMPX_FILE -# ifdef _PATH_UTMPX -# define UTMPX_FILE _PATH_UTMPX +#ifndef LLOG_FILE +# ifdef _PATH_LASTLOG +# define LLOG_FILE _PATH_LASTLOG # else -# define UTMPX_FILE /etc/utmpx +# define LLOG_FILE /usr/adm/lastlog # endif #endif +#ifndef TTYS_FILE +# define TTYS_FILE /etc/ttys +#endif -#ifndef NO_LASTLOG -# ifndef LLOG_FILE -# ifdef _PATH_LASTLOG -# define LLOG_FILE _PATH_LASTLOG -# else -# define LLOG_FILE /usr/adm/lastlog -# endif -# endif +#ifndef WTMPX_FILE +# define WTMPX_FILE _PATH_WTMPX #endif -#ifndef SYSV -# ifndef TTYS_FILE -# define TTYS_FILE /etc/ttys -# endif +#ifndef UTMPX_FILE +# define UTMPX_FILE _PATH_UTMPX #endif -
CVS commit: xsrc/external/mit/xdm/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 22:24:39 UTC 2013 Modified Files: xsrc/external/mit/xdm/dist/config: Xresources.cpp xsrc/external/mit/xdm/dist/greeter: greet.c Removed Files: xsrc/external/mit/xdm/dist: access.c auth.c choose.c chooser.c compile daemon.c dm.c dm.h dm_auth.h dm_error.h dm_socket.h dpylist.c error.c file.c genauth.c greet.h krb5auth.c mitauth.c netaddr.c policy.c prngc.c protodpy.c reset.c resource.c rpcauth.c server.c session.c socket.c streams.c util.c xdm.man.cpp xdmauth.c xdmcp.c xdmshell.c xsrc/external/mit/xdm/dist/app-defaults: Chooser.ad xsrc/external/mit/xdm/dist/m4: ac_define_dir.m4 libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 Log Message: merge xdm 1.1.11 To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xdm/dist/access.c \ xsrc/external/mit/xdm/dist/auth.c xsrc/external/mit/xdm/dist/compile \ xsrc/external/mit/xdm/dist/dm.c xsrc/external/mit/xdm/dist/session.c \ xsrc/external/mit/xdm/dist/socket.c \ xsrc/external/mit/xdm/dist/xdm.man.cpp xsrc/external/mit/xdm/dist/xdmcp.c cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xdm/dist/choose.c \ xsrc/external/mit/xdm/dist/chooser.c xsrc/external/mit/xdm/dist/daemon.c \ xsrc/external/mit/xdm/dist/dm.h xsrc/external/mit/xdm/dist/dm_auth.h \ xsrc/external/mit/xdm/dist/dm_error.h \ xsrc/external/mit/xdm/dist/dm_socket.h \ xsrc/external/mit/xdm/dist/dpylist.c xsrc/external/mit/xdm/dist/error.c \ xsrc/external/mit/xdm/dist/file.c xsrc/external/mit/xdm/dist/genauth.c \ xsrc/external/mit/xdm/dist/greet.h xsrc/external/mit/xdm/dist/krb5auth.c \ xsrc/external/mit/xdm/dist/mitauth.c xsrc/external/mit/xdm/dist/netaddr.c \ xsrc/external/mit/xdm/dist/policy.c xsrc/external/mit/xdm/dist/prngc.c \ xsrc/external/mit/xdm/dist/protodpy.c xsrc/external/mit/xdm/dist/reset.c \ xsrc/external/mit/xdm/dist/resource.c \ xsrc/external/mit/xdm/dist/rpcauth.c xsrc/external/mit/xdm/dist/server.c \ xsrc/external/mit/xdm/dist/streams.c xsrc/external/mit/xdm/dist/util.c \ xsrc/external/mit/xdm/dist/xdmauth.c \ xsrc/external/mit/xdm/dist/xdmshell.c cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xdm/dist/app-defaults/Chooser.ad cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xdm/dist/config/Xresources.cpp cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdm/dist/greeter/greet.c cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xdm/dist/m4/ac_define_dir.m4 \ xsrc/external/mit/xdm/dist/m4/libtool.m4 \ xsrc/external/mit/xdm/dist/m4/ltoptions.m4 \ xsrc/external/mit/xdm/dist/m4/ltsugar.m4 \ xsrc/external/mit/xdm/dist/m4/ltversion.m4 \ xsrc/external/mit/xdm/dist/m4/lt~obsolete.m4 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/xdm/dist/config/Xresources.cpp diff -u xsrc/external/mit/xdm/dist/config/Xresources.cpp:1.5 xsrc/external/mit/xdm/dist/config/Xresources.cpp:1.6 --- xsrc/external/mit/xdm/dist/config/Xresources.cpp:1.5 Mon Nov 9 07:12:59 2009 +++ xsrc/external/mit/xdm/dist/config/Xresources.cpp Fri May 31 22:24:39 2013 @@ -1,9 +1,3 @@ -! -! -! -! -! - Xcursor.theme: whiteglass #define BS \ /* cpp can be trickier than m4 */ @@ -23,7 +17,7 @@ xlogin*login.translations: #override BS xlogin*greeting: Welcome to CLIENTHOST xlogin*namePrompt: \040\040\040\040\040\040\040Login: -xlogin*fail: Login incorrect +xlogin*fail: Login incorrect or forbidden by policy XHASHif WIDTH 800 xlogin*greetFont: -adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1 Index: xsrc/external/mit/xdm/dist/greeter/greet.c diff -u xsrc/external/mit/xdm/dist/greeter/greet.c:1.4 xsrc/external/mit/xdm/dist/greeter/greet.c:1.5 --- xsrc/external/mit/xdm/dist/greeter/greet.c:1.4 Fri May 21 04:59:52 2010 +++ xsrc/external/mit/xdm/dist/greeter/greet.c Fri May 31 22:24:39 2013 @@ -26,7 +26,7 @@ from The Open Group. */ /* - * Copyright © 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the Software), @@ -93,7 +93,6 @@ from The Open Group. extern int getdomainname(char *name, size_t len); #endif -#ifdef GREET_LIB /* * Function pointers filled in by the initial call ito the library */ @@ -120,7 +119,7 @@ void(*__xdm_LogOutOfMem)(const char void(*__xdm_setgrent)(void) = NULL; struct group*(*__xdm_getgrent)(void) = NULL; void(*__xdm_endgrent)(void) = NULL; -# ifdef USESHADOW +# ifdef HAVE_GETSPNAM struct spwd *(*__xdm_getspnam)(GETSPNAM_ARGS) = NULL; # ifndef QNX4 void (*__xdm_endspent)(void) = NULL; @@ -135,8 +134,6 @@ char *(*__xdm_crypt)(CRYPT_ARGS) = N
CVS commit: xsrc/external/mit/xdm/dist/xdm
Module Name:xsrc
Committed By: mrg
Date: Fri May 31 22:48:13 UTC 2013
Modified Files:
xsrc/external/mit/xdm/dist/xdm: prngc.c
Log Message:
add a cast to avoid a compiler error (code is bogus, but fixing it
would be more pain than is worth.)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xdm/dist/xdm/prngc.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/xdm/dist/xdm/prngc.c
diff -u xsrc/external/mit/xdm/dist/xdm/prngc.c:1.1.1.1 xsrc/external/mit/xdm/dist/xdm/prngc.c:1.2
--- xsrc/external/mit/xdm/dist/xdm/prngc.c:1.1.1.1 Fri May 31 22:19:37 2013
+++ xsrc/external/mit/xdm/dist/xdm/prngc.c Fri May 31 22:48:13 2013
@@ -130,7 +130,7 @@ reopen:
msg[0] = 0x02;
msg[1] = len;
- if (atomicio(write, fd, msg, sizeof(msg)) != sizeof(msg)) {
+ if (atomicio((ssize_t (*)(int, void *, size_t))write, fd, msg, sizeof(msg)) != sizeof(msg)) {
if (errno == EPIPE errors 10) {
close(fd);
errors++;
CVS commit: src/external/mit/xorg/bin/xdm
Module Name:src
Committed By: mrg
Date: Fri May 31 22:49:15 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile Makefile.xdm
Log Message:
udpate for xdm 1.1.11:
- moved manuals
- moved sources
- renamed defines
- new sources
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/Makefile.xdm
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/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.8 src/external/mit/xorg/bin/xdm/Makefile:1.9
--- src/external/mit/xorg/bin/xdm/Makefile:1.8 Tue Oct 25 16:56:23 2011
+++ src/external/mit/xorg/bin/xdm/Makefile Fri May 31 22:49:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/10/25 16:56:23 christos Exp $
+# $NetBSD: Makefile,v 1.9 2013/05/31 22:49:15 mrg Exp $
.include bsd.own.mk
@@ -7,7 +7,7 @@ SRCS= access.c auth.c choose.c daemon.c
error.c file.c genauth.c mitauth.c netaddr.c policy.c \
protodpy.c reset.c resource.c server.c session.c socket.c \
streams.c util.c xdmauth.c xdmcp.c \
- Login.c greet.c verify.c
+ Login.c greet.c verify.c prngc.c
CPPFLAGS+= -DRETSIGTYPE=void
CPPFLAGS.auth.c= -DBSD44SOCKETS
@@ -41,11 +41,6 @@ DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
SUBDIR= chooser config
TARGETS+= configinstall
-.PATH: ${X11SRCDIR.${PROG}}
-.PATH: ${X11SRCDIR.${PROG}}/greeter
-
-BUILDSYMLINKS+= xdm.man.cpp xdm.man
-
.include Makefile.xdm
CPPFLAGS.resource.c+= -DDEF_CHOOSER=\${XDMCHOOSERPATH}\
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.5 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.6
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.5 Tue Oct 25 16:56:23 2011
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Fri May 31 22:49:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.5 2011/10/25 16:56:23 christos Exp $
+# $NetBSD: Makefile.xdm,v 1.6 2013/05/31 22:49:15 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -13,16 +13,17 @@ CPPFLAGS+= -DBINDIR=\${X11BINDIR}\ -DX
-DFRAGILE_DEV_MEM -DARC4_RANDOM \
-DXPM -DUSE_XFT -DUSE_XINERAMA \
-UIPv6 \
- -DHAS_CRYPT \
- -DHAS_DAEMON \
- -DHAS_GETIFADDRS \
- -DHAS_IFREQ \
- -DHAS_MKSTEMP \
- -DHAS_SETPROCTITLE \
- -DHAS_SETSID \
- -DHAS_SETUSERCONTEXT \
- -DHAS_VFORK \
+ -DHAVE_SYS_PARAM_H \
+ -DHAVE_DAEMON \
+ -DHAVE_GETIFADDRS \
+ -DHAVE_MKSTEMP \
+ -DHAVE_SETPROCTITLE \
+ -DHAVE_SETUSERCONTEXT \
+ -DHAVE_ARC4RANDOM \
+ -DHAVE_SIGACTION \
+ -DHAVE_ASPRINTF \
-I${X11SRCDIR.xdm} \
+ -I${X11SRCDIR.xdm}/include \
${X11FLAGS.VERSION}
.if (${USE_PAM} != no)
@@ -30,3 +31,8 @@ CPPFLAGS+= -DUSE_PAM
.endif
.PATH: ${X11SRCDIR.xdm}
+.PATH: ${X11SRCDIR.xdm}/xdm
+.PATH: ${X11SRCDIR.xdm}/man
+.PATH: ${X11SRCDIR.xdm}/chooser
+.PATH: ${X11SRCDIR.xdm}/greeter
+.PATH: ${X11SRCDIR.xdm}/app-defaults
CVS import: xsrc/external/mit/xkbcomp/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 23:20:00 UTC 2013 Update of /cvsroot/xsrc/external/mit/xkbcomp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8877 Log Message: initial import of xkbcomp-1.2.4 Status: Vendor Tag: xorg Release Tags: xkbcomp-1-2-4 U xsrc/external/mit/xkbcomp/dist/xkbparse.y U xsrc/external/mit/xkbcomp/dist/keymap.c U xsrc/external/mit/xkbcomp/dist/parseutils.c U xsrc/external/mit/xkbcomp/dist/misc.h C xsrc/external/mit/xkbcomp/dist/utils.h U xsrc/external/mit/xkbcomp/dist/compat.h U xsrc/external/mit/xkbcomp/dist/Makefile.am U xsrc/external/mit/xkbcomp/dist/expr.h N xsrc/external/mit/xkbcomp/dist/xkbcomp.pc.in U xsrc/external/mit/xkbcomp/dist/xkbcomp.h U xsrc/external/mit/xkbcomp/dist/aclocal.m4 U xsrc/external/mit/xkbcomp/dist/config.guess U xsrc/external/mit/xkbcomp/dist/depcomp U xsrc/external/mit/xkbcomp/dist/install-sh U xsrc/external/mit/xkbcomp/dist/vmod.h U xsrc/external/mit/xkbcomp/dist/missing U xsrc/external/mit/xkbcomp/dist/indicators.h U xsrc/external/mit/xkbcomp/dist/COPYING U xsrc/external/mit/xkbcomp/dist/vmod.c U xsrc/external/mit/xkbcomp/dist/geometry.c U xsrc/external/mit/xkbcomp/dist/alias.c U xsrc/external/mit/xkbcomp/dist/ylwrap U xsrc/external/mit/xkbcomp/dist/Makefile.in U xsrc/external/mit/xkbcomp/dist/xkbpath.c U xsrc/external/mit/xkbcomp/dist/action.c U xsrc/external/mit/xkbcomp/dist/xkbparse.c U xsrc/external/mit/xkbcomp/dist/keycodes.c U xsrc/external/mit/xkbcomp/dist/config.sub U xsrc/external/mit/xkbcomp/dist/README U xsrc/external/mit/xkbcomp/dist/configure U xsrc/external/mit/xkbcomp/dist/utils.c U xsrc/external/mit/xkbcomp/dist/compat.c U xsrc/external/mit/xkbcomp/dist/parseutils.h U xsrc/external/mit/xkbcomp/dist/expr.c U xsrc/external/mit/xkbcomp/dist/xkbcomp.c U xsrc/external/mit/xkbcomp/dist/ChangeLog U xsrc/external/mit/xkbcomp/dist/misc.c U xsrc/external/mit/xkbcomp/dist/keytypes.c U xsrc/external/mit/xkbcomp/dist/configure.ac U xsrc/external/mit/xkbcomp/dist/keycodes.h U xsrc/external/mit/xkbcomp/dist/tokens.h U xsrc/external/mit/xkbcomp/dist/listing.c U xsrc/external/mit/xkbcomp/dist/symbols.c U xsrc/external/mit/xkbcomp/dist/xkbpath.h U xsrc/external/mit/xkbcomp/dist/action.h U xsrc/external/mit/xkbcomp/dist/xkbscan.c U xsrc/external/mit/xkbcomp/dist/INSTALL U xsrc/external/mit/xkbcomp/dist/config.h.in U xsrc/external/mit/xkbcomp/dist/indicators.c U xsrc/external/mit/xkbcomp/dist/alias.h U xsrc/external/mit/xkbcomp/dist/man/Makefile.in U xsrc/external/mit/xkbcomp/dist/man/Makefile.am U xsrc/external/mit/xkbcomp/dist/man/xkbcomp.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xkbcomp/dist
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Fri May 31 23:20:05 UTC 2013 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14295 Log Message: initial import of xkeyboard-config-2.9 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-9 U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/AUTHORS U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/TODO C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/Makefile.in C xsrc/external/mit/xkeyboard-config/dist/config.guess C xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/CREDITS U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/autogen.sh N xsrc/external/mit/xkeyboard-config/dist/configure.ac U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in U xsrc/external/mit/xkeyboard-config/dist/NEWS N xsrc/external/mit/xkeyboard-config/dist/man/Makefile.am N xsrc/external/mit/xkeyboard-config/dist/man/Makefile.in N xsrc/external/mit/xkeyboard-config/dist/man/man.xsl U xsrc/external/mit/xkeyboard-config/dist/rules/base.o_t.part U xsrc/external/mit/xkeyboard-config/dist/rules/xml2lst.pl U xsrc/external/mit/xkeyboard-config/dist/rules/xfree98 U xsrc/external/mit/xkeyboard-config/dist/rules/base.m_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_c.part U xsrc/external/mit/xkeyboard-config/dist/rules/evdev.m_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/rules/base.extras.xml.in U xsrc/external/mit/xkeyboard-config/dist/rules/base.m_g.part U xsrc/external/mit/xkeyboard-config/dist/rules/README U xsrc/external/mit/xkeyboard-config/dist/rules/evdev.xml.in U xsrc/external/mit/xkeyboard-config/dist/rules/merge.sh U xsrc/external/mit/xkeyboard-config/dist/rules/base.xml.in U xsrc/external/mit/xkeyboard-config/dist/rules/base.o_c.part U xsrc/external/mit/xkeyboard-config/dist/rules/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/rules/evdev.extras.xml.in U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml1_c.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l1_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/xkb.dtd U xsrc/external/mit/xkeyboard-config/dist/rules/HDR U xsrc/external/mit/xkeyboard-config/dist/rules/base.l4o_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml3_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.m_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l3o_s.part C xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.o_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.mlv_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml1_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.lists.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/evdev.m_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.m_t.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l2o_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.hdr.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml2_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml4_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l1o_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_g.part U xsrc/external/mit/xkeyboard-config/dist/rules/bin/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml_s.sh U xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml1v1_s.sh U xsrc/external/mit/xkeyboard-config/dist/rules/bin/mln_s.sh U xsrc/external/mit/xkeyboard-config/dist/rules/bin/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml1_s.sh U xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml1v_s.sh U xsrc/external/mit/xkeyboard-config/dist/rules/bin/mlnvn_s.sh U xsrc/external/mit/xkeyboard-config/dist/rules/bin/mlv_s.sh U xsrc/external/mit/xkeyboard-config/dist/rules/compat/variantsMapping.lst U xsrc/external/mit/xkeyboard-config/dist/rules/compat/base.l3v3_c.part U xsrc/external/mit/xkeyboard-config/dist/rules/compat/Makefile.am U
CVS commit: xsrc/external/mit/xkbcomp/include
Module Name:xsrc Committed By: mrg Date: Fri May 31 23:26:25 UTC 2013 Modified Files: xsrc/external/mit/xkbcomp/include: config.h Log Message: update for xkbcomp 1.2.4 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xkbcomp/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/xkbcomp/include/config.h diff -u xsrc/external/mit/xkbcomp/include/config.h:1.3 xsrc/external/mit/xkbcomp/include/config.h:1.4 --- xsrc/external/mit/xkbcomp/include/config.h:1.3 Sun Nov 21 06:40:44 2010 +++ xsrc/external/mit/xkbcomp/include/config.h Fri May 31 23:26:25 2013 @@ -44,7 +44,7 @@ #define PACKAGE_NAME xkbcomp /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xkbcomp 1.2.0 +#define PACKAGE_STRING xkbcomp 1.2.4 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xkbcomp @@ -53,7 +53,7 @@ #define PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.2.0 +#define PACKAGE_VERSION 1.2.4 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 @@ -62,10 +62,10 @@ #define PACKAGE_VERSION_MINOR 2 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 0 +#define PACKAGE_VERSION_PATCHLEVEL 4 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 1.2.0 +#define VERSION 1.2.4
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Fri May 31 23:28:26 UTC 2013 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile src/external/mit/xorg/lib/xkeyboard-config/compat: Makefile src/external/mit/xorg/lib/xkeyboard-config/keycodes: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr: Makefile Removed Files: src/external/mit/xorg/lib/xkeyboard-config/keymap: Makefile src/external/mit/xorg/lib/xkeyboard-config/keymap/digital_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/keymap/sgi_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/keymap/sun_vndr: Makefile src/external/mit/xorg/lib/xkeyboard-config/semantics: Makefile Log Message: catch up with xkeyboard-config 2.9: - remove keymap/ and semantics/ entirely. - remove default keypad and norepeat from compat/ - add keycodes/olpc - remove symbols/ad, add symbols/md - remove symbols/sun_vndr/tuv To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/xkeyboard-config/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/Makefile cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/digital_vndr/Makefile cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/sgi_vndr/Makefile cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/lib/xkeyboard-config/keymap/sun_vndr/Makefile cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/lib/xkeyboard-config/semantics/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.7 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.8 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.7 Mon Jul 25 15:41:58 2011 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Fri May 31 23:28:25 2013 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2011/07/25 15:41:58 njoly Exp $ +# $NetBSD: Makefile,v 1.8 2013/05/31 23:28:25 mrg Exp $ .include bsd.own.mk -SUBDIR= compat geometry keycodes keymap rules semantics symbols types +SUBDIR= compat geometry keycodes rules semantics types NOOBJ= # defined Index: src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.2 src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.3 --- src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.2 Fri May 28 12:38:34 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile Fri May 31 23:28:25 2013 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $ +# $NetBSD: Makefile,v 1.3 2013/05/31 23:28:25 mrg Exp $ .include bsd.own.mk XKBNAME= compat -FILES= README accessx basic caps complete default iso9995 japan \ - keypad ledcaps lednum ledscroll level5 misc mousekeys \ - norepeat olpc pc pc98 xfree86 xtest +FILES= README accessx basic caps complete iso9995 japan \ + ledcaps lednum ledscroll level5 misc mousekeys \ + olpc pc pc98 xfree86 xtest XKBDIR= 1 Index: src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.2 src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.3 --- src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.2 Fri May 28 12:38:34 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile Fri May 31 23:28:25 2013 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $ +# $NetBSD: Makefile,v 1.3 2013/05/31 23:28:25 mrg Exp $ .include bsd.own.mk XKBNAME= keycodes FILES= README aliases amiga ataritt empty evdev fujitsu hp ibm \ - macintosh sony sun xfree86 xfree98 + macintosh olpc sony sun xfree86 xfree98 SUBDIR= digital_vndr sgi_vndr Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.8 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.9 --- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.8 Sat Jul 23 12:02:02 2011 +++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Fri May 31 23:28:26 2013 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2011/07/23 12:02:02 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2013/05/31 23:28:26 mrg Exp $ .include bsd.own.mk
CVS commit: src/distrib/sets/lists/xbase
Module Name:src Committed By: mrg Date: Fri May 31 23:34:31 UTC 2013 Modified Files: src/distrib/sets/lists/xbase: mi Log Message: updates for xkeyboard-config 2.9 To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/distrib/sets/lists/xbase/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.115 src/distrib/sets/lists/xbase/mi:1.116 --- src/distrib/sets/lists/xbase/mi:1.115 Thu May 30 23:42:19 2013 +++ src/distrib/sets/lists/xbase/mi Fri May 31 23:34:31 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.115 2013/05/30 23:42:19 mrg Exp $ +# $NetBSD: mi,v 1.116 2013/05/31 23:34:31 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1858,17 +1858,17 @@ ./usr/X11R7/lib/X11/xkb/compat/basic -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/caps -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/complete -unknown- xorg -./usr/X11R7/lib/X11/xkb/compat/default -unknown- xorg +./usr/X11R7/lib/X11/xkb/compat/default -unknown- obsolete ./usr/X11R7/lib/X11/xkb/compat/iso9995 -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/japan -unknown- xorg -./usr/X11R7/lib/X11/xkb/compat/keypad -unknown- xorg +./usr/X11R7/lib/X11/xkb/compat/keypad -unknown- obsolete ./usr/X11R7/lib/X11/xkb/compat/ledcaps -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/lednum -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/ledscroll -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/level5 -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/misc -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/mousekeys -unknown- xorg -./usr/X11R7/lib/X11/xkb/compat/norepeat -unknown- xorg +./usr/X11R7/lib/X11/xkb/compat/norepeat -unknown- obsolete ./usr/X11R7/lib/X11/xkb/compat/olpc -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/pc -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/pc98 -unknown- xorg @@ -1936,6 +1936,7 @@ ./usr/X11R7/lib/X11/xkb/keycodes/hp -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/ibm -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/macintosh -unknown- xorg +./usr/X11R7/lib/X11/xkb/keycodes/olpc -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/powerpcps2 -unknown- obsolete ./usr/X11R7/lib/X11/xkb/keycodes/sgi -obsolete- obsolete ./usr/X11R7/lib/X11/xkb/keycodes/sgi/indigo -unknown- obsolete @@ -1949,16 +1950,16 @@ ./usr/X11R7/lib/X11/xkb/keycodes/sun -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/xfree86 -unknown- xorg ./usr/X11R7/lib/X11/xkb/keycodes/xfree98 -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymapbase-x11-root xorg -./usr/X11R7/lib/X11/xkb/keymap.dir -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/README -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/amiga -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/ataritt -unknown- xorg +./usr/X11R7/lib/X11/xkb/keymapbase-x11-root obsolete +./usr/X11R7/lib/X11/xkb/keymap.dir -unknown- obsolete +./usr/X11R7/lib/X11/xkb/keymap/README -unknown- obsolete +./usr/X11R7/lib/X11/xkb/keymap/amiga -unknown- obsolete +./usr/X11R7/lib/X11/xkb/keymap/ataritt -unknown- obsolete ./usr/X11R7/lib/X11/xkb/keymap/digital -obsolete- obsolete ./usr/X11R7/lib/X11/xkb/keymap/digital/us -unknown- obsolete -./usr/X11R7/lib/X11/xkb/keymap/digital_vndr base-x11-root xorg -./usr/X11R7/lib/X11/xkb/keymap/digital_vndr/us -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/macintosh -unknown- xorg +./usr/X11R7/lib/X11/xkb/keymap/digital_vndr base-x11-root obsolete +./usr/X11R7/lib/X11/xkb/keymap/digital_vndr/us -unknown- obsolete +./usr/X11R7/lib/X11/xkb/keymap/macintosh -unknown- obsolete ./usr/X11R7/lib/X11/xkb/keymap/sgi -obsolete- obsolete ./usr/X11R7/lib/X11/xkb/keymap/sgi/be -unknown- obsolete ./usr/X11R7/lib/X11/xkb/keymap/sgi/bg -unknown- obsolete @@ -1988,31 +1989,31 @@ ./usr/X11R7/lib/X11/xkb/keymap/sgi/sk_qwerty -unknown- obsolete ./usr/X11R7/lib/X11/xkb/keymap/sgi/th -unknown- obsolete ./usr/X11R7/lib/X11/xkb/keymap/sgi/us -unknown- obsolete -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr base-x11-root xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/be -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/bg -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/ca -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/ch -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/cz -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/de -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/dk -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/dvorak -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/es -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/fi -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/fr -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/gb -unknown- xorg -./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/hu -unknown- xorg
CVS commit: src/external/mit/xorg/bin/sessreg
Module Name:src
Committed By: mrg
Date: Fri May 31 23:42:48 UTC 2013
Modified Files:
src/external/mit/xorg/bin/sessreg: Makefile
Log Message:
find the moved manual
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/sessreg/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/sessreg/Makefile
diff -u src/external/mit/xorg/bin/sessreg/Makefile:1.4 src/external/mit/xorg/bin/sessreg/Makefile:1.5
--- src/external/mit/xorg/bin/sessreg/Makefile:1.4 Mon Apr 11 22:47:50 2011
+++ src/external/mit/xorg/bin/sessreg/Makefile Fri May 31 23:42:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/04/11 22:47:50 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2013/05/31 23:42:48 mrg Exp $
.include bsd.own.mk
@@ -16,3 +16,4 @@ X11EXTRAMANDEFS+= -e 's,__ttys_file__,/e
.include bsd.prog.mk
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/tools/xkbcomp
Module Name:src
Committed By: mrg
Date: Fri May 31 23:43:05 UTC 2013
Modified Files:
src/external/mit/xorg/tools/xkbcomp: Makefile
Log Message:
define PACKAGE_STRING and PACKAGE_VERSION.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/xkbcomp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/tools/xkbcomp/Makefile
diff -u src/external/mit/xorg/tools/xkbcomp/Makefile:1.3 src/external/mit/xorg/tools/xkbcomp/Makefile:1.4
--- src/external/mit/xorg/tools/xkbcomp/Makefile:1.3 Sat Aug 22 01:03:31 2009
+++ src/external/mit/xorg/tools/xkbcomp/Makefile Fri May 31 23:43:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/22 01:03:31 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 23:43:05 mrg Exp $
NOMAN= 1
@@ -34,7 +34,9 @@ HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
-I${X11SRCDIR.xkbfile}/include/X11/extensions \
-I${X11SRCDIR.${HOSTPROG}} \
-DDFLT_XKB_CONFIG_ROOT=\${X11LIBDIR}/xkb\ -DXKB \
- -DHAVE_STRCASECMP -DHAVE_STRDUP
+ -DHAVE_STRCASECMP -DHAVE_STRDUP \
+ -DPACKAGE_STRING=\NetBSD tool xkbcomp 1.2.4\ \
+ -DPACKAGE_VERSION=\1.2.4\
.include ${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys
CVS commit: src/external/mit/xorg/bin/xdm/chooser
Module Name:src
Committed By: mrg
Date: Fri May 31 23:50:35 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdm/chooser: Makefile
Log Message:
find the renamed app-defaults file
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xdm/chooser/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/xdm/chooser/Makefile
diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.2 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.3
--- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.2 Mon Nov 9 07:21:18 2009
+++ src/external/mit/xorg/bin/xdm/chooser/Makefile Fri May 31 23:50:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/11/09 07:21:18 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 23:50:35 mrg Exp $
NOMAN= 1
@@ -8,7 +8,7 @@ PROG= chooser
CPPFLAGS.chooser.c= -DBSD44SOCKETS -DRETSIGTYPE=void
-APPDEFS=Chooser.ad
+APPDEFS=Chooser
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lXdmcp -lXinerama
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Fri May 31 23:50:51 UTC 2013 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile Log Message: oops, semantics, not symbols, subdir was removed. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/xkeyboard-config/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.8 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.9 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.8 Fri May 31 23:28:25 2013 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Fri May 31 23:50:51 2013 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2013/05/31 23:28:25 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2013/05/31 23:50:51 mrg Exp $ .include bsd.own.mk -SUBDIR= compat geometry keycodes rules semantics types +SUBDIR= compat geometry keycodes rules symbols types NOOBJ= # defined
