=> Bootstrap dependency digest>=20010302: found digest-20121220
WARNING: [license.mk] Every package should define a LICENSE.
=> Checksum SHA1 OK for xmx-2.1alpha.pl7.tar.gz
=> Checksum RMD160 OK for xmx-2.1alpha.pl7.tar.gz
=> Checksum SHA1 OK for xmx-jumbo-patch-20120416.gz
=> Checksum RMD160 OK for xmx-jumbo-patch-20120416.gz
===> Installing dependencies for xmx-2.1a7nb6
=> Tool dependency imake-[0-9]*: found imake-1.0.5
=> Tool dependency imake-[0-9]*: found imake-1.0.5
=> Tool dependency checkperms>=1.1: found checkperms-1.11
=> Build dependency x11-links>=0.78: found x11-links-0.79
===> Overriding tools for xmx-2.1a7nb6
===> Extracting for xmx-2.1a7nb6
===> Patching for xmx-2.1a7nb6
=> Applying distribution patches for xmx-2.1a7nb6
=> Applying distribution patch xmx-jumbo-patch-20120416.gz
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1316427990 14400
|# Node ID 9494b08571f90273d55b4be30a1e606853d0f87e
|# Parent  d976074130efb959343cdb6921b2e4280b5dff60
|Add one or more necessary standard C include files to a variety of
|source files.
|
|diff -r d976074130ef -r 9494b08571f9 clients/xmtg/ig.c
|--- a/clients/xmtg/ig.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/clients/xmtg/ig.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file clients/xmtg/ig.c using Plan A...
Hunk #1 succeeded at 40.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 clients/xmtg/layout.c
|--- a/clients/xmtg/layout.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/clients/xmtg/layout.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file clients/xmtg/layout.c using Plan A...
Hunk #1 succeeded at 31.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 clients/xmtg/node.c
|--- a/clients/xmtg/node.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/clients/xmtg/node.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file clients/xmtg/node.c using Plan A...
Hunk #1 succeeded at 33.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 clients/xmtg/ui.c
|--- a/clients/xmtg/ui.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/clients/xmtg/ui.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file clients/xmtg/ui.c using Plan A...
Hunk #1 succeeded at 22.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 clients/xmtg/xmtg.c
|--- a/clients/xmtg/xmtg.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/clients/xmtg/xmtg.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file clients/xmtg/xmtg.c using Plan A...
Hunk #1 succeeded at 30.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/AddDis.c
|--- a/lib/Xmc/AddDis.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/AddDis.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/AddDis.c using Plan A...
Hunk #1 succeeded at 20.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/DispInfo.c
|--- a/lib/Xmc/DispInfo.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/DispInfo.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/DispInfo.c using Plan A...
Hunk #1 succeeded at 20.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/ErrHndlr.c
|--- a/lib/Xmc/ErrHndlr.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/ErrHndlr.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/ErrHndlr.c using Plan A...
Hunk #1 succeeded at 21.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/GetConf.c
|--- a/lib/Xmc/GetConf.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/GetConf.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/GetConf.c using Plan A...
Hunk #1 succeeded at 20.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/ListDis.c
|--- a/lib/Xmc/ListDis.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/ListDis.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/ListDis.c using Plan A...
Hunk #1 succeeded at 20.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/Open.c
|--- a/lib/Xmc/Open.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/Open.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/Open.c using Plan A...
Hunk #1 succeeded at 32.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/QueryDis.c
|--- a/lib/Xmc/QueryDis.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/QueryDis.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/QueryDis.c using Plan A...
Hunk #1 succeeded at 20.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/Register.c
|--- a/lib/Xmc/Register.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/Register.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/Register.c using Plan A...
Hunk #1 succeeded at 20.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/SetAuth.c
|--- a/lib/Xmc/SetAuth.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/SetAuth.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/SetAuth.c using Plan A...
Hunk #1 succeeded at 20.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/SetConf.c
|--- a/lib/Xmc/SetConf.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/SetConf.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/SetConf.c using Plan A...
Hunk #1 succeeded at 20.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/SetDispTag.c
|--- a/lib/Xmc/SetDispTag.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/SetDispTag.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/SetDispTag.c using Plan A...
Hunk #1 succeeded at 20.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/auth.c
|--- a/lib/Xmc/auth.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/auth.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/auth.c using Plan A...
Hunk #1 succeeded at 23.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 lib/Xmc/common.c
|--- a/lib/Xmc/common.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/lib/Xmc/common.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file lib/Xmc/common.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/am.c
|--- a/server/am.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/am.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/am.c using Plan A...
Hunk #1 succeeded at 33.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/atom.c
|--- a/server/atom.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/atom.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/atom.c using Plan A...
Hunk #1 succeeded at 28.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/auth.c
|--- a/server/auth.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/auth.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/auth.c using Plan A...
Hunk #1 succeeded at 30.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/buf.c
|--- a/server/buf.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/buf.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/buf.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/cblock.c
|--- a/server/cblock.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/cblock.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/cblock.c using Plan A...
Hunk #1 succeeded at 29.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/client.c
|--- a/server/client.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/client.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/client.c using Plan A...
Hunk #1 succeeded at 32.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/cliz.c
|--- a/server/cliz.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/cliz.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/cliz.c using Plan A...
Hunk #1 succeeded at 37.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/cmapwin.c
|--- a/server/cmapwin.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/cmapwin.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/cmapwin.c using Plan A...
Hunk #1 succeeded at 28.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/color.c
|--- a/server/color.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/color.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/color.c using Plan A...
Hunk #1 succeeded at 31.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/connect.c
|--- a/server/connect.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/connect.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/connect.c using Plan A...
Hunk #1 succeeded at 33.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/cookie.c
|--- a/server/cookie.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/cookie.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/cookie.c using Plan A...
Hunk #1 succeeded at 25.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/cursor.c
|--- a/server/cursor.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/cursor.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/cursor.c using Plan A...
Hunk #1 succeeded at 25.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/cx.c
|--- a/server/cx.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/cx.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/cx.c using Plan A...
Hunk #1 succeeded at 30.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/debug.c
|--- a/server/debug.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/debug.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/debug.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/df.c
|--- a/server/df.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/df.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/df.c using Plan A...
Hunk #1 succeeded at 32.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/dprx.c
|--- a/server/dprx.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/dprx.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/dprx.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/ebuf.c
|--- a/server/ebuf.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/ebuf.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/ebuf.c using Plan A...
Hunk #1 succeeded at 28.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/error.c
|--- a/server/error.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/error.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/error.c using Plan A...
Hunk #1 succeeded at 26.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/expos.c
|--- a/server/expos.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/expos.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/expos.c using Plan A...
Hunk #1 succeeded at 29.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/font.c
|--- a/server/font.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/font.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/font.c using Plan A...
Hunk #1 succeeded at 26.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/gc.c
|--- a/server/gc.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/gc.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/gc.c using Plan A...
Hunk #1 succeeded at 25.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/hash.c
|--- a/server/hash.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/hash.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/hash.c using Plan A...
Hunk #1 succeeded at 36.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/host.c
|--- a/server/host.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/host.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/host.c using Plan A...
Hunk #1 succeeded at 30.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/image.c
|--- a/server/image.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/image.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/image.c using Plan A...
Hunk #1 succeeded at 52.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/imask.c
|--- a/server/imask.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/imask.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/imask.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/inp.c
|--- a/server/inp.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/inp.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/inp.c using Plan A...
Hunk #1 succeeded at 45.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/iswap.c
|--- a/server/iswap.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/iswap.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/iswap.c using Plan A...
Hunk #1 succeeded at 31.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/kpm.c
|--- a/server/kpm.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/kpm.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/kpm.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/list.c
|--- a/server/list.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/list.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/list.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/main.c
|--- a/server/main.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/main.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/main.c using Plan A...
Hunk #1 succeeded at 28.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/mitauth.c
|--- a/server/mitauth.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/mitauth.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/mitauth.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/pixmap.c
|--- a/server/pixmap.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/pixmap.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/pixmap.c using Plan A...
Hunk #1 succeeded at 25.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/plist.c
|--- a/server/plist.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/plist.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/plist.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/pmap.c
|--- a/server/pmap.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/pmap.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/pmap.c using Plan A...
Hunk #1 succeeded at 25.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/pp.c
|--- a/server/pp.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/pp.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/pp.c using Plan A...
Hunk #1 succeeded at 29.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/prop.c
|--- a/server/prop.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/prop.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/prop.c using Plan A...
Hunk #1 succeeded at 25.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/proto.c
|--- a/server/proto.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/proto.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/proto.c using Plan A...
Hunk #1 succeeded at 38.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/ptc.c
|--- a/server/ptc.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/ptc.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/ptc.c using Plan A...
Hunk #1 succeeded at 28.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/queue.c
|--- a/server/queue.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/queue.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/queue.c using Plan A...
Hunk #1 succeeded at 36.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/request.c
|--- a/server/request.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/request.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/request.c using Plan A...
Hunk #1 succeeded at 31.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/rgb.c
|--- a/server/rgb.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/rgb.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/rgb.c using Plan A...
Hunk #1 succeeded at 31.
Hunk #2 succeeded at 46.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/rs.c
|--- a/server/rs.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/rs.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/rs.c using Plan A...
Hunk #1 succeeded at 28.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/rx.c
|--- a/server/rx.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/rx.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/rx.c using Plan A...
Hunk #1 succeeded at 38.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/sel.c
|--- a/server/sel.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/sel.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/sel.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/server.c
|--- a/server/server.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/server.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/server.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/sm.c
|--- a/server/sm.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/sm.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/sm.c using Plan A...
Hunk #1 succeeded at 40.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/socket.c
|--- a/server/socket.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/socket.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/socket.c using Plan A...
Hunk #1 succeeded at 37.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/sres.c
|--- a/server/sres.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/sres.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/sres.c using Plan A...
Hunk #1 succeeded at 27.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/sv.c
|--- a/server/sv.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/sv.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/sv.c using Plan A...
Hunk #1 succeeded at 35.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/time.c
|--- a/server/time.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/time.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/time.c using Plan A...
Hunk #1 succeeded at 30.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/tptr.c
|--- a/server/tptr.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/tptr.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/tptr.c using Plan A...
Hunk #1 succeeded at 31.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/util.c
|--- a/server/util.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/util.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/util.c using Plan A...
Hunk #1 succeeded at 35.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/vconf.c
|--- a/server/vconf.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/vconf.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/vconf.c using Plan A...
Hunk #1 succeeded at 43.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/window.c
|--- a/server/window.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/window.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/window.c using Plan A...
Hunk #1 succeeded at 25.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/xmc.c
|--- a/server/xmc.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/xmc.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/xmc.c using Plan A...
Hunk #1 succeeded at 32.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r d976074130ef -r 9494b08571f9 server/xmcp.c
|--- a/server/xmcp.c	Mon Sep 19 06:26:27 2011 -0400
|+++ b/server/xmcp.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/xmcp.c using Plan A...
Hunk #1 succeeded at 25.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1316427990 14400
|# Node ID d8e868ed11ada6000da00e5783cec8bebc89d7b7
|# Parent  9494b08571f90273d55b4be30a1e606853d0f87e
|Get sized types from <stdint.h> instead of assuming.
|
|This is also an LP64 bug fix because the definition of slong_t was
|wrong and the [us]32_t types were 64 bits wide in that environment.
|
|diff -r 9494b08571f9 -r d8e868ed11ad server/xmx.h
|--- a/server/xmx.h	Mon Sep 19 06:26:30 2011 -0400
|+++ b/server/xmx.h	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file server/xmx.h using Plan A...
Hunk #1 succeeded at 25.
Hunk #2 succeeded at 668.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1316427990 14400
|# Node ID 1d8b90ac241012d1643d4f9a6631612032ad8c85
|# Parent  d8e868ed11ada6000da00e5783cec8bebc89d7b7
|Remove references to union wait.
|
|diff -r d8e868ed11ad -r 1d8b90ac2410 clients/xmxinit/xmxinit.c
|--- a/clients/xmxinit/xmxinit.c	Mon Sep 19 06:26:30 2011 -0400
|+++ b/clients/xmxinit/xmxinit.c	Mon Sep 19 06:26:30 2011 -0400
--------------------------
Patching file clients/xmxinit/xmxinit.c using Plan A...
Hunk #1 succeeded at 86.
Hunk #2 succeeded at 350.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1334549786 14400
|# Node ID 795c2280472adf00a70ca463c6931202ca8effe2
|# Parent  1d8b90ac241012d1643d4f9a6631612032ad8c85
|Use strerror() instead of sys_errlist[] and sys_nerr.
|Don't declare errno; let errno.h do that.
|
|diff -r 1d8b90ac2410 -r 795c2280472a clients/xmxinit/xmxinit.c
|--- a/clients/xmxinit/xmxinit.c	Mon Sep 19 06:26:30 2011 -0400
|+++ b/clients/xmxinit/xmxinit.c	Mon Apr 16 00:16:26 2012 -0400
--------------------------
Patching file clients/xmxinit/xmxinit.c using Plan A...
Hunk #1 succeeded at 30.
Hunk #2 succeeded at 94.
Hunk #3 succeeded at 586.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 1d8b90ac2410 -r 795c2280472a server/error.c
|--- a/server/error.c	Mon Sep 19 06:26:30 2011 -0400
|+++ b/server/error.c	Mon Apr 16 00:16:26 2012 -0400
--------------------------
Patching file server/error.c using Plan A...
Hunk #1 succeeded at 39.
Hunk #2 succeeded at 75.
Hunk #3 succeeded at 132.
Hunk #4 succeeded at 158.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1334549888 14400
|# Node ID 936fc9ca46f1e18cbb5e33be711d5a52d15aacf5
|# Parent  795c2280472adf00a70ca463c6931202ca8effe2
|Use snprintf(), not sprintf().
|
|Not yet comprehensive.
|
|diff -r 795c2280472a -r 936fc9ca46f1 server/debug.c
|--- a/server/debug.c	Mon Apr 16 00:16:26 2012 -0400
|+++ b/server/debug.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/debug.c using Plan A...
Hunk #1 succeeded at 318.
Hunk #2 succeeded at 341.
Hunk #3 succeeded at 370.
Hunk #4 succeeded at 392.
Hunk #5 succeeded at 416.
Hunk #6 succeeded at 443.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 795c2280472a -r 936fc9ca46f1 server/dprx.c
|--- a/server/dprx.c	Mon Apr 16 00:16:26 2012 -0400
|+++ b/server/dprx.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/dprx.c using Plan A...
Hunk #1 succeeded at 62.
Hunk #2 succeeded at 85.
Hunk #3 succeeded at 267.
Hunk #4 succeeded at 295.
Hunk #5 succeeded at 320.
Hunk #6 succeeded at 560.
Hunk #7 succeeded at 2215.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 795c2280472a -r 936fc9ca46f1 server/hash.c
|--- a/server/hash.c	Mon Apr 16 00:16:26 2012 -0400
|+++ b/server/hash.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/hash.c using Plan A...
Hunk #1 succeeded at 568.
Hunk #2 succeeded at 582.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 795c2280472a -r 936fc9ca46f1 server/socket.c
|--- a/server/socket.c	Mon Apr 16 00:16:26 2012 -0400
|+++ b/server/socket.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/socket.c using Plan A...
Hunk #1 succeeded at 87.
Hunk #2 succeeded at 114.
Hunk #3 succeeded at 396.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 795c2280472a -r 936fc9ca46f1 server/time.c
|--- a/server/time.c	Mon Apr 16 00:16:26 2012 -0400
|+++ b/server/time.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/time.c using Plan A...
Hunk #1 succeeded at 234.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1334549888 14400
|# Node ID b3fe7c1981d939c1499bb41a98d87e54ed27f44e
|# Parent  936fc9ca46f1e18cbb5e33be711d5a52d15aacf5
|Use isdigit() and other <ctype.h> functions correctly.
|
|(not by any means comprehensive so far)
|
|diff -r 936fc9ca46f1 -r b3fe7c1981d9 lib/Xmc/common.c
|--- a/lib/Xmc/common.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/lib/Xmc/common.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file lib/Xmc/common.c using Plan A...
Hunk #1 succeeded at 648.
Hunk #2 succeeded at 664.
Hunk #3 succeeded at 719.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1334549888 14400
|# Node ID b09b7a8e27a0171aa268e23bd1808242f2fa2eab
|# Parent  b3fe7c1981d939c1499bb41a98d87e54ed27f44e
|Apply const when pointing at string constants.
|
|Nothing like comprehensive yet.
|
|diff -r b3fe7c1981d9 -r b09b7a8e27a0 server/args.c
|--- a/server/args.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/args.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/args.c using Plan A...
Hunk #1 succeeded at 45.
Hunk #2 succeeded at 97.
Hunk #3 succeeded at 540.
Hunk #4 succeeded at 573.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1334549888 14400
|# Node ID 4691391f9dfd27621c64fe3e7d3c9ff46bc90052
|# Parent  b09b7a8e27a0171aa268e23bd1808242f2fa2eab
|Silence compiler warnings about assignments found within if conditions.
|
|Not comprehensive yet.
|
|diff -r b09b7a8e27a0 -r 4691391f9dfd clients/xmtg/pathfind.c
|--- a/clients/xmtg/pathfind.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/clients/xmtg/pathfind.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file clients/xmtg/pathfind.c using Plan A...
Hunk #1 succeeded at 72.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r b09b7a8e27a0 -r 4691391f9dfd clients/xmxinit/xmxinit.c
|--- a/clients/xmxinit/xmxinit.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/clients/xmxinit/xmxinit.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file clients/xmxinit/xmxinit.c using Plan A...
Hunk #1 succeeded at 195.
Hunk #2 succeeded at 316.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r b09b7a8e27a0 -r 4691391f9dfd lib/Xmc/ListDis.c
|--- a/lib/Xmc/ListDis.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/lib/Xmc/ListDis.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file lib/Xmc/ListDis.c using Plan A...
Hunk #1 succeeded at 52.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r b09b7a8e27a0 -r 4691391f9dfd lib/Xmc/Open.c
|--- a/lib/Xmc/Open.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/lib/Xmc/Open.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file lib/Xmc/Open.c using Plan A...
Hunk #1 succeeded at 122.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r b09b7a8e27a0 -r 4691391f9dfd lib/Xmc/common.c
|--- a/lib/Xmc/common.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/lib/Xmc/common.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file lib/Xmc/common.c using Plan A...
Hunk #1 succeeded at 109.
Hunk #2 succeeded at 672.
Hunk #3 succeeded at 730.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r b09b7a8e27a0 -r 4691391f9dfd server/args.c
|--- a/server/args.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/args.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/args.c using Plan A...
Hunk #1 succeeded at 420.
Hunk #2 succeeded at 518.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1334549888 14400
|# Node ID 9ed44d41fa1b813aabbe6d76236b6ad2bf045b2b
|# Parent  4691391f9dfd27621c64fe3e7d3c9ff46bc90052
|Silence compiler warnings that appear on LP64 platforms.
|
|- don't cast ints to pointers; go through intptr_t if necessary, or
|where possible avoid entirely.
|
|- in the case of server/es.h, the uses of es_set and es_get have been
|checked to make sure nothing's going to get truncated. They're used
|only to send an int through a pointer field in some X structure.
|
|diff -r 4691391f9dfd -r 9ed44d41fa1b clients/xmtg/ui.c
|--- a/clients/xmtg/ui.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/clients/xmtg/ui.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file clients/xmtg/ui.c using Plan A...
Hunk #1 succeeded at 444.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 4691391f9dfd -r 9ed44d41fa1b server/args.c
|--- a/server/args.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/args.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/args.c using Plan A...
Hunk #1 succeeded at 686.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 4691391f9dfd -r 9ed44d41fa1b server/buf.c
|--- a/server/buf.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/buf.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/buf.c using Plan A...
Hunk #1 succeeded at 67.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 4691391f9dfd -r 9ed44d41fa1b server/cx.c
|--- a/server/cx.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/cx.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/cx.c using Plan A...
Hunk #1 succeeded at 114.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 4691391f9dfd -r 9ed44d41fa1b server/es.h
|--- a/server/es.h	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/es.h	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/es.h using Plan A...
Hunk #1 succeeded at 25.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 4691391f9dfd -r 9ed44d41fa1b server/pp.c
|--- a/server/pp.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/pp.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/pp.c using Plan A...
Hunk #1 succeeded at 64.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1334549888 14400
|# Node ID 7a6a74fb2163d1cd0c3ce4cf82141ad560654359
|# Parent  9ed44d41fa1b813aabbe6d76236b6ad2bf045b2b
|Silence assorted compiler warnings.
|
|- declare functions that don't return accordingly, to prevent spurious
|warnings when they're called.
|
|- use printf("%s", str) instead of printf(str).
|
|- don't use implicit int.
|
|- declare functions that don't return anything as void; otherwise,
|clang gets upset.
|
|- avoid using the symbol "index" as it conflicts with a legacy
|string.h function. (FUTURE: this change is currently a cpp hack; do it
|right.)
|
|- in server/df.h, add cpp-level protection against multiple inclusion.
|
|diff -r 9ed44d41fa1b -r 7a6a74fb2163 clients/xmtg/ui.c
|--- a/clients/xmtg/ui.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/clients/xmtg/ui.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file clients/xmtg/ui.c using Plan A...
Hunk #1 succeeded at 206.
Hunk #2 succeeded at 266.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 9ed44d41fa1b -r 7a6a74fb2163 clients/xmxinit/xmxinit.c
|--- a/clients/xmxinit/xmxinit.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/clients/xmxinit/xmxinit.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file clients/xmxinit/xmxinit.c using Plan A...
Hunk #1 succeeded at 58.
Hunk #2 succeeded at 101.
Hunk #3 succeeded at 148.
Hunk #4 succeeded at 315.
Hunk #5 succeeded at 340.
Hunk #6 succeeded at 380.
Hunk #7 succeeded at 463.
Hunk #8 succeeded at 497.
Hunk #9 succeeded at 551.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 9ed44d41fa1b -r 7a6a74fb2163 server/args.c
|--- a/server/args.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/args.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/args.c using Plan A...
Hunk #1 succeeded at 432.
Hunk #2 succeeded at 626.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 9ed44d41fa1b -r 7a6a74fb2163 server/cmapwin.c
|--- a/server/cmapwin.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/cmapwin.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/cmapwin.c using Plan A...
Hunk #1 succeeded at 35.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 9ed44d41fa1b -r 7a6a74fb2163 server/df.h
|--- a/server/df.h	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/df.h	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/df.h using Plan A...
Hunk #1 succeeded at 26.
Hunk #2 succeeded at 55.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1334549888 14400
|# Node ID 3dce1f61aa03fe6bd4f7b876022fcd11ae7addba
|# Parent  7a6a74fb2163d1cd0c3ce4cf82141ad560654359
|Fix bugs that appear on LP64 machines.
|
|In server/es.c:
|   - don't cast a pointer through int while adjusting it; use intptr_t
|     instead to avoid truncating it. (This should probably just use
|     a (char *) though.)
|
|In server/zb.h:
|   - it does not work to cast the return value of a function to a
|     pointer in place of declaring it properly with a pointer return
|     type. This causes the returned pointer to be truncated to the
|     size of an int, or maybe be total garbage. Copy the declaration
|     of the function involved here to make things work. FUTURE: should
|     rearrange the header files so the right things are in the right
|     places.
|
|In server/ptc.h:
|   - likewise it does not work to cast the return value of a function
|     to a pointer. Include ptc.pvt.h so the necessary declarations are
|     available. Also needs df.h and X11/Xproto.h. FUTURE: fix this to
|     not expose the private header.
|
|In clients/xmtg/ui.c:
|   - The terminating zero argument of a call to XtVaSetValues or
|     XtVaGetValues must be a pointer, which means it must be
|     pointer-sized, so '0' does not cut it. Just NULL doesn't either,
|     because the C standard permits NULL to expand to just '0'. It
|     must be (void *)NULL.
|
|diff -r 7a6a74fb2163 -r 3dce1f61aa03 clients/xmtg/ui.c
|--- a/clients/xmtg/ui.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/clients/xmtg/ui.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file clients/xmtg/ui.c using Plan A...
Hunk #1 succeeded at 125.
Hunk #2 succeeded at 190.
Hunk #3 succeeded at 234.
Hunk #4 succeeded at 244.
Hunk #5 succeeded at 252.
Hunk #6 succeeded at 291.
Hunk #7 succeeded at 339.
Hunk #8 succeeded at 433.
Hunk #9 succeeded at 445.
Hunk #10 succeeded at 537.
Hunk #11 succeeded at 548.
Hunk #12 succeeded at 575.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 7a6a74fb2163 -r 3dce1f61aa03 server/es.c
|--- a/server/es.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/es.c	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/es.c using Plan A...
Hunk #1 succeeded at 38.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 7a6a74fb2163 -r 3dce1f61aa03 server/ptc.h
|--- a/server/ptc.h	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/ptc.h	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/ptc.h using Plan A...
Hunk #1 succeeded at 167.
Hunk #2 succeeded at 204.
Hunk #3 succeeded at 223.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 7a6a74fb2163 -r 3dce1f61aa03 server/zb.h
|--- a/server/zb.h	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/zb.h	Mon Apr 16 00:18:08 2012 -0400
--------------------------
Patching file server/zb.h using Plan A...
Hunk #1 succeeded at 65.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|# HG changeset patch
|# User dholland@NetBSD.org
|# Date 1334549897 14400
|# Node ID 2037a8eaceea304960f8ae6f4c3d9b0af0175c60
|# Parent  3dce1f61aa03fe6bd4f7b876022fcd11ae7addba
|Assorted bug fixes.
|
|In lib/Xmc/common.c:
|   - add missing parentheses, caught by clang.
|
|In lib/Xmc/ErrHndlr.c:
|   - make the error-handler-setting functions return something.
|     (I made them return the old handler, as that's the usual thing
|     for this case, but the proper behavior doesn't seem to be
|     documented.) Caught by clang.
|   - fix a wrong printf format. Caught by clang.
|
|In server/color.c:
|   - insert a missing &, where too much casting allowed it to be
|     silently wrong.
|
|In server/shape.c:
|   - fix build with recent xextproto, where the shape extension
|     prototypes have apparently been moved to their own header file.
|
|In clients/xmtg/pathfind.c:
|   - Use correct parenthesization for file mode tests. Caught by
|     clang. No idea what the implications of this code being wrong
|     might have been.
|
|In clients/xmxinit/xmxinit.c:
|   - use stdarg.h and vfprintf instead of ancient-style fake-varargs
|     for printf-type functions, as the latter doesn't work any more.
|   - declare these printf-type functions as such for format checking.
|
|diff -r 3dce1f61aa03 -r 2037a8eaceea clients/xmtg/pathfind.c
|--- a/clients/xmtg/pathfind.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/clients/xmtg/pathfind.c	Mon Apr 16 00:18:17 2012 -0400
--------------------------
Patching file clients/xmtg/pathfind.c using Plan A...
Hunk #1 succeeded at 86.
Hunk #2 succeeded at 125.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 3dce1f61aa03 -r 2037a8eaceea clients/xmxinit/xmxinit.c
|--- a/clients/xmxinit/xmxinit.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/clients/xmxinit/xmxinit.c	Mon Apr 16 00:18:17 2012 -0400
--------------------------
Patching file clients/xmxinit/xmxinit.c using Plan A...
Hunk #1 succeeded at 24.
Hunk #2 succeeded at 41.
Hunk #3 succeeded at 68.
Hunk #4 succeeded at 596.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 3dce1f61aa03 -r 2037a8eaceea lib/Xmc/ErrHndlr.c
|--- a/lib/Xmc/ErrHndlr.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/lib/Xmc/ErrHndlr.c	Mon Apr 16 00:18:17 2012 -0400
--------------------------
Patching file lib/Xmc/ErrHndlr.c using Plan A...
Hunk #1 succeeded at 45.
Hunk #2 succeeded at 61.
Hunk #3 succeeded at 130.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 3dce1f61aa03 -r 2037a8eaceea lib/Xmc/common.c
|--- a/lib/Xmc/common.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/lib/Xmc/common.c	Mon Apr 16 00:18:17 2012 -0400
--------------------------
Patching file lib/Xmc/common.c using Plan A...
Hunk #1 succeeded at 218.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 3dce1f61aa03 -r 2037a8eaceea server/color.c
|--- a/server/color.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/color.c	Mon Apr 16 00:18:17 2012 -0400
--------------------------
Patching file server/color.c using Plan A...
Hunk #1 succeeded at 808.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -r 3dce1f61aa03 -r 2037a8eaceea server/shape.c
|--- a/server/shape.c	Mon Apr 16 00:18:08 2012 -0400
|+++ b/server/shape.c	Mon Apr 16 00:18:17 2012 -0400
--------------------------
Patching file server/shape.c using Plan A...
Hunk #1 succeeded at 33.
done
=> Applying pkgsrc patches for xmx-2.1a7nb6
=> Verifying /usr/pkgsrc/x11/xmx/patches/patch-clients_xmtg_ui.c
=> Applying pkgsrc patch /usr/pkgsrc/x11/xmx/patches/patch-clients_xmtg_ui.c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-clients_xmtg_ui.c,v 1.1 2013/02/26 10:18:42 joerg Exp $
|
|--- clients/xmtg/ui.c.orig	2013-02-25 14:14:41.000000000 +0000
|+++ clients/xmtg/ui.c
--------------------------
Patching file clients/xmtg/ui.c using Plan A...
Hunk #1 succeeded at 51.
Hunk #2 succeeded at 213.
Hunk #3 succeeded at 269.
done
=> Verifying /usr/pkgsrc/x11/xmx/patches/patch-clients_xmxinit_xmxinit.c
=> Applying pkgsrc patch /usr/pkgsrc/x11/xmx/patches/patch-clients_xmxinit_xmxinit.c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-clients_xmxinit_xmxinit.c,v 1.1 2013/02/26 10:18:42 joerg Exp $
|
|--- clients/xmxinit/xmxinit.c.orig	2013-02-25 14:22:16.000000000 +0000
|+++ clients/xmxinit/xmxinit.c
--------------------------
Patching file clients/xmxinit/xmxinit.c using Plan A...
Hunk #1 succeeded at 146.
done
===> Creating toolchain wrappers for xmx-2.1a7nb6
===> Configuring for xmx-2.1a7nb6
=> Checking for portability problems in extracted files
mv -f Makefile Makefile.bak
imake -DUseInstalled -I/usr/pkg/lib/X11/config
make Makefiles
making Makefiles in include...
	mv -f Makefile Makefile.bak
making Makefiles in lib...
	mv -f Makefile Makefile.bak
making Makefiles in lib/Xmc...
	mv -f Makefile Makefile.bak
making Makefiles in server...
	mv -f Makefile Makefile.bak
In file included from /usr/pkg/lib/X11/config/Imake.tmpl:2170,
                 from Imakefile.c:16:
./Imakefile:23: warning: "UseRbgTxt" is not defined
making Makefiles in clients...
	mv -f Makefile Makefile.bak
making Makefiles in clients/xmtg...
	mv -f Makefile Makefile.bak
making Makefiles in clients/xmxinit...
	mv -f Makefile Makefile.bak
making Makefiles in man...
	mv -f Makefile Makefile.bak
make includes
including in ./include...
+ mkdir -p ../XMC
+ cd ../XMC
+ rm -f xmc.h
+ ln -s ./../include/xmc.h .
+ rm -f xmcp.h
+ ln -s ./../include/xmcp.h .
including in ./lib...
including in lib/Xmc...
including in ./server...
including in ./clients...
including in clients/xmtg...
including in clients/xmxinit...
including in ./man...
make depend
depending in ./lib...
depending in lib/Xmc...
rm -f .depend
makedepend -f-  -- -I../../include  -I/usr/pkg/include -I /usr/X11R7/include   -DCSRG_BASED  -DFUNCPROTO=15 -DNARROWPROTO   -DDEBUG  -DUSE_MAKEDEPEND -- auth.c	common.c	AddDis.c	AsgnTptr.c	ChMode.c	Close.c	CrGlTptr.c	CrTptr.c	DestTptr.c	DispInfo.c	DropDis.c	ErrHndlr.c	EvQueued.c	Flush.c	GetAuth.c	GetConf.c	GetEvent.c	GetMask.c	GetXMask.c	GrabKbd.c	GrabPtr.c	HideTptr.c	ListDis.c	Open.c	QueryDis.c	Register.c	SetAuth.c	SetCfgMode.c	SetConf.c	SetDispTag.c	SetMask.c	SetXMask.c	ShareSel.c	ShowTptr.c	Sync.c	UngrabKbd.c	UngrabPtr.c	Unreg.c	UnshareSel.c > .depend
depending in ./server...
rm -f .depend
makedepend -f-  -- -I../include  -I/usr/pkg/include -I /usr/X11R7/include   -DCSRG_BASED  -DFUNCPROTO=15 -DNARROWPROTO   -DDEBUG -DNDBM -DTCPCONN -DUNIXCONN  -DRGB_DB=\"/usr/pkg/share/X11/rgb\"  -DUSE_MAKEDEPEND -- access.c	am.c	args.c	atom.c	auth.c	buf.c	cblock.c	client.c	cliz.c	cmap.c	cmapwin.c	color.c	connect.c	cookie.c	cursor.c	cx.c	debug.c	df.c	dprx.c	dprxmc.c	ebuf.c	error.c	es.c	event.c	expos.c	ext.c	focus.c	font.c	gc.c	hash.c	host.c	image.c	imask.c	inp.c	iswap.c	kpm.c	list.c	main.c	mitauth.c	pixmap.c	plist.c	pmap.c	pp.c	prop.c	proto.c	ptc.c	queue.c	reply.c	request.c	rgb.c	root.c	rs.c	rx.c	sel.c	server.c	shape.c	sm.c	socket.c	sres.c	sv.c	swap.c	time.c	tptr.c	util.c	vconf.c	window.c	xmc.c	xmcp.c	zb.c > .depend
makedepend: warning:  shape.c, line 36: cannot find include file "X11/extensions/shapeproto.h"
	not in ../include/X11/extensions/shapeproto.h
	not in /usr/pkg/include/X11/extensions/shapeproto.h
	not in /usr/X11R7/include/X11/extensions/shapeproto.h
	not in /usr/include/X11/extensions/shapeproto.h
depending in ./clients...
depending in clients/xmtg...
rm -f .depend
makedepend -f-  --  -I../../include -I/usr/pkg/include -I /usr/X11R7/include   -DCSRG_BASED  -DFUNCPROTO=15 -DNARROWPROTO     -DUSE_MAKEDEPEND -- xmtg.c node.c ig.c ui.c layout.c pathfind.c > .depend
depending in clients/xmxinit...
rm -f .depend
makedepend -f-  --   -I/usr/pkg/include -I /usr/X11R7/include   -DCSRG_BASED  -DFUNCPROTO=15 -DNARROWPROTO   -DTCPCONN -DUNIXCONN   -DBINDIR=\"/usr/pkg/bin\"  -DUSE_MAKEDEPEND -- xmxinit.c           > .depend