+ case "${usergroup_phase}" in + local run_cmd + run_cmd=run_su + shift + run_su /usr/pkg/bin/bmake configure BATCH=1 DEPENDS_TARGET=/nonexistent WRKLOG=/tmp/bulklog/xmx-2.1a7nb9/work.log + su pbulk -c '"$@"' make /usr/pkg/bin/bmake configure BATCH=1 DEPENDS_TARGET=/nonexistent WRKLOG=/tmp/bulklog/xmx-2.1a7nb9/work.log => Bootstrap dependency digest>=20211023: found digest-20220214 WARNING: [license.mk] Every package should define a LICENSE. => Checksum BLAKE2s OK for xmx-2.1alpha.pl7.tar.gz => Checksum SHA512 OK for xmx-2.1alpha.pl7.tar.gz => Checksum BLAKE2s OK for xmx-jumbo-patch-20140912.gz => Checksum SHA512 OK for xmx-jumbo-patch-20140912.gz ===> Installing dependencies for xmx-2.1a7nb9 => Tool dependency mktools-[0-9]*: found mktools-20220614 => Tool dependency imake-[0-9]*: found imake-1.0.10 => Tool dependency nbpatch-[0-9]*: found nbpatch-20151107 => Tool dependency cwrappers>=20150314: found cwrappers-20220403 => Tool dependency checkperms>=1.1: found checkperms-1.12 => Build dependency xorgproto>=2016.1: found xorgproto-2024.1 => Build dependency xcb-proto>=1.15.2nb3: found xcb-proto-1.17.0nb1 => Full dependency libX11>=1.1: found libX11-1.8.10 => Full dependency libXt>=1.0.0: found libXt-1.3.0nb1 => Full dependency libXaw>=1.0.5: found libXaw-1.0.16 ===> Overriding tools for xmx-2.1a7nb9 ===> Extracting for xmx-2.1a7nb9 ===> Patching for xmx-2.1a7nb9 => Applying distribution patches for xmx-2.1a7nb9 => Applying distribution patch xmx-jumbo-patch-20140912.gz Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |# HG changeset patch |# User dholland@NetBSD.org |# Date 1410495706 14400 |# Fri Sep 12 00:21:46 2014 -0400 |# Node ID a3e4ef249e72d7fa3a00e1bd32d347d1b61d81d6 |# Parent d976074130efb959343cdb6921b2e4280b5dff60 |Add one or more necessary standard C include files to a variety of |source files. | |Also, don't use nonstandard headers like <malloc.h>. | |diff -r d976074130ef -r a3e4ef249e72 clients/xmtg/ig.c |--- a/clients/xmtg/ig.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/clients/xmtg/ig.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 clients/xmtg/layout.c |--- a/clients/xmtg/layout.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/clients/xmtg/layout.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 clients/xmtg/node.c |--- a/clients/xmtg/node.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/clients/xmtg/node.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 clients/xmtg/ui.c |--- a/clients/xmtg/ui.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/clients/xmtg/ui.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 clients/xmtg/xmtg.c |--- a/clients/xmtg/xmtg.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/clients/xmtg/xmtg.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/AddDis.c |--- a/lib/Xmc/AddDis.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/AddDis.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/DispInfo.c |--- a/lib/Xmc/DispInfo.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/DispInfo.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/ErrHndlr.c |--- a/lib/Xmc/ErrHndlr.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/ErrHndlr.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/GetConf.c |--- a/lib/Xmc/GetConf.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/GetConf.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/ListDis.c |--- a/lib/Xmc/ListDis.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/ListDis.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/Open.c |--- a/lib/Xmc/Open.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/Open.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/QueryDis.c |--- a/lib/Xmc/QueryDis.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/QueryDis.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/Register.c |--- a/lib/Xmc/Register.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/Register.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/SetAuth.c |--- a/lib/Xmc/SetAuth.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/SetAuth.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/SetConf.c |--- a/lib/Xmc/SetConf.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/SetConf.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/SetDispTag.c |--- a/lib/Xmc/SetDispTag.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/SetDispTag.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/auth.c |--- a/lib/Xmc/auth.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/auth.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 lib/Xmc/common.c |--- a/lib/Xmc/common.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/lib/Xmc/common.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/access.c |--- a/server/access.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/access.c Fri Sep 12 00:21:46 2014 -0400 -------------------------- Patching file server/access.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 a3e4ef249e72 server/am.c |--- a/server/am.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/am.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/atom.c |--- a/server/atom.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/atom.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/auth.c |--- a/server/auth.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/auth.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/buf.c |--- a/server/buf.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/buf.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/cblock.c |--- a/server/cblock.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/cblock.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/client.c |--- a/server/client.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/client.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/cliz.c |--- a/server/cliz.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/cliz.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/cmapwin.c |--- a/server/cmapwin.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/cmapwin.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/color.c |--- a/server/color.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/color.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/connect.c |--- a/server/connect.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/connect.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/cookie.c |--- a/server/cookie.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/cookie.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/cursor.c |--- a/server/cursor.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/cursor.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/cx.c |--- a/server/cx.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/cx.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/debug.c |--- a/server/debug.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/debug.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/df.c |--- a/server/df.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/df.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/dprx.c |--- a/server/dprx.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/dprx.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/ebuf.c |--- a/server/ebuf.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/ebuf.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/error.c |--- a/server/error.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/error.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/expos.c |--- a/server/expos.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/expos.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/font.c |--- a/server/font.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/font.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/gc.c |--- a/server/gc.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/gc.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/hash.c |--- a/server/hash.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/hash.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/host.c |--- a/server/host.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/host.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/image.c |--- a/server/image.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/image.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/imask.c |--- a/server/imask.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/imask.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/inp.c |--- a/server/inp.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/inp.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/iswap.c |--- a/server/iswap.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/iswap.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/kpm.c |--- a/server/kpm.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/kpm.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/list.c |--- a/server/list.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/list.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/main.c |--- a/server/main.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/main.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/mitauth.c |--- a/server/mitauth.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/mitauth.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/pixmap.c |--- a/server/pixmap.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/pixmap.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/plist.c |--- a/server/plist.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/plist.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/pmap.c |--- a/server/pmap.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/pmap.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/pp.c |--- a/server/pp.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/pp.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/prop.c |--- a/server/prop.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/prop.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/proto.c |--- a/server/proto.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/proto.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/ptc.c |--- a/server/ptc.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/ptc.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/queue.c |--- a/server/queue.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/queue.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/request.c |--- a/server/request.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/request.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/rgb.c |--- a/server/rgb.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/rgb.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/rs.c |--- a/server/rs.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/rs.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/rx.c |--- a/server/rx.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/rx.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/sel.c |--- a/server/sel.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/sel.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/server.c |--- a/server/server.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/server.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/sm.c |--- a/server/sm.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/sm.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/socket.c |--- a/server/socket.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/socket.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/sres.c |--- a/server/sres.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/sres.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/sv.c |--- a/server/sv.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/sv.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/time.c |--- a/server/time.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/time.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/tptr.c |--- a/server/tptr.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/tptr.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/util.c |--- a/server/util.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/util.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/vconf.c |--- a/server/vconf.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/vconf.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/window.c |--- a/server/window.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/window.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/xmc.c |--- a/server/xmc.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/xmc.c Fri Sep 12 00:21:46 2014 -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 a3e4ef249e72 server/xmcp.c |--- a/server/xmcp.c Mon Sep 19 06:26:27 2011 -0400 |+++ b/server/xmcp.c Fri Sep 12 00:21:46 2014 -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 1410495909 14400 |# Fri Sep 12 00:25:09 2014 -0400 |# Node ID bdcddd29a76a7b2a1ec74bbcc7c63fb746452561 |# Parent a3e4ef249e72d7fa3a00e1bd32d347d1b61d81d6 |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 a3e4ef249e72 -r bdcddd29a76a server/xmx.h |--- a/server/xmx.h Fri Sep 12 00:21:46 2014 -0400 |+++ b/server/xmx.h Fri Sep 12 00:25:09 2014 -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 1410496173 14400 |# Fri Sep 12 00:29:33 2014 -0400 |# Node ID 9c9cbf66a0010eb24c72c771455a984ce936821a |# Parent bdcddd29a76a7b2a1ec74bbcc7c63fb746452561 |Remove references to union wait. | |diff -r bdcddd29a76a -r 9c9cbf66a001 clients/xmxinit/xmxinit.c |--- a/clients/xmxinit/xmxinit.c Fri Sep 12 00:25:09 2014 -0400 |+++ b/clients/xmxinit/xmxinit.c Fri Sep 12 00:29:33 2014 -0400 -------------------------- Patching file clients/xmxinit/xmxinit.c using Plan A... Hunk #1 succeeded at 86. Hunk #2 succeeded at 344. 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 1410496374 14400 |# Fri Sep 12 00:32:54 2014 -0400 |# Node ID e480fd8f5836ba8373bae4ad678aaa0c536f451f |# Parent 9c9cbf66a0010eb24c72c771455a984ce936821a |Use strerror() instead of sys_errlist[] and sys_nerr. |Don't declare errno; let errno.h do that. | |diff -r 9c9cbf66a001 -r e480fd8f5836 clients/xmxinit/xmxinit.c |--- a/clients/xmxinit/xmxinit.c Fri Sep 12 00:29:33 2014 -0400 |+++ b/clients/xmxinit/xmxinit.c Fri Sep 12 00:32:54 2014 -0400 -------------------------- Patching file clients/xmxinit/xmxinit.c using Plan A... Hunk #1 succeeded at 30. Hunk #2 succeeded at 88. Hunk #3 succeeded at 575. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r 9c9cbf66a001 -r e480fd8f5836 server/error.c |--- a/server/error.c Fri Sep 12 00:29:33 2014 -0400 |+++ b/server/error.c Fri Sep 12 00:32:54 2014 -0400 -------------------------- Patching file server/error.c using Plan A... Hunk #1 succeeded at 39. Hunk #2 succeeded at 70. Hunk #3 succeeded at 127. Hunk #4 succeeded at 153. 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 1410496406 14400 |# Fri Sep 12 00:33:26 2014 -0400 |# Node ID 36aad82fa9576a3f06d1e6c928292d11a64d035c |# Parent e480fd8f5836ba8373bae4ad678aaa0c536f451f |Use snprintf(), not sprintf(). | |Not yet comprehensive. | |diff -r e480fd8f5836 -r 36aad82fa957 server/debug.c |--- a/server/debug.c Fri Sep 12 00:32:54 2014 -0400 |+++ b/server/debug.c Fri Sep 12 00:33:26 2014 -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 e480fd8f5836 -r 36aad82fa957 server/dprx.c |--- a/server/dprx.c Fri Sep 12 00:32:54 2014 -0400 |+++ b/server/dprx.c Fri Sep 12 00:33:26 2014 -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 e480fd8f5836 -r 36aad82fa957 server/hash.c |--- a/server/hash.c Fri Sep 12 00:32:54 2014 -0400 |+++ b/server/hash.c Fri Sep 12 00:33:26 2014 -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 e480fd8f5836 -r 36aad82fa957 server/socket.c |--- a/server/socket.c Fri Sep 12 00:32:54 2014 -0400 |+++ b/server/socket.c Fri Sep 12 00:33:26 2014 -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 e480fd8f5836 -r 36aad82fa957 server/time.c |--- a/server/time.c Fri Sep 12 00:32:54 2014 -0400 |+++ b/server/time.c Fri Sep 12 00:33:26 2014 -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 1410496406 14400 |# Fri Sep 12 00:33:26 2014 -0400 |# Node ID 8814de336564f00257411a6b3f8f69530cd5316d |# Parent 36aad82fa9576a3f06d1e6c928292d11a64d035c |Use isdigit() and other <ctype.h> functions correctly. | |(not by any means comprehensive so far) | |diff -r 36aad82fa957 -r 8814de336564 lib/Xmc/common.c |--- a/lib/Xmc/common.c Fri Sep 12 00:33:26 2014 -0400 |+++ b/lib/Xmc/common.c Fri Sep 12 00:33:26 2014 -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 1410496406 14400 |# Fri Sep 12 00:33:26 2014 -0400 |# Node ID bda072a1ff80f160f2783e515f7c635f5e201466 |# Parent 8814de336564f00257411a6b3f8f69530cd5316d |Apply const when pointing at string constants. | |Nothing like comprehensive yet. | |diff -r 8814de336564 -r bda072a1ff80 server/args.c |--- a/server/args.c Fri Sep 12 00:33:26 2014 -0400 |+++ b/server/args.c Fri Sep 12 00:33:26 2014 -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 1410498218 14400 |# Fri Sep 12 01:03:38 2014 -0400 |# Node ID ea6f07526f2203951cb2c8ef4be6e74b187d9429 |# Parent bda072a1ff80f160f2783e515f7c635f5e201466 |Silence compiler warnings about assignments found within if conditions. | |Not comprehensive yet. | |diff -r bda072a1ff80 -r ea6f07526f22 clients/xmtg/pathfind.c |--- a/clients/xmtg/pathfind.c Fri Sep 12 00:33:26 2014 -0400 |+++ b/clients/xmtg/pathfind.c Fri Sep 12 01:03:38 2014 -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 bda072a1ff80 -r ea6f07526f22 clients/xmxinit/xmxinit.c |--- a/clients/xmxinit/xmxinit.c Fri Sep 12 00:33:26 2014 -0400 |+++ b/clients/xmxinit/xmxinit.c Fri Sep 12 01:03:38 2014 -0400 -------------------------- Patching file clients/xmxinit/xmxinit.c using Plan A... Hunk #1 succeeded at 189. Hunk #2 succeeded at 310. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r bda072a1ff80 -r ea6f07526f22 lib/Xmc/ListDis.c |--- a/lib/Xmc/ListDis.c Fri Sep 12 00:33:26 2014 -0400 |+++ b/lib/Xmc/ListDis.c Fri Sep 12 01:03:38 2014 -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 bda072a1ff80 -r ea6f07526f22 lib/Xmc/Open.c |--- a/lib/Xmc/Open.c Fri Sep 12 00:33:26 2014 -0400 |+++ b/lib/Xmc/Open.c Fri Sep 12 01:03:38 2014 -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 bda072a1ff80 -r ea6f07526f22 lib/Xmc/common.c |--- a/lib/Xmc/common.c Fri Sep 12 00:33:26 2014 -0400 |+++ b/lib/Xmc/common.c Fri Sep 12 01:03:38 2014 -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 bda072a1ff80 -r ea6f07526f22 server/access.c |--- a/server/access.c Fri Sep 12 00:33:26 2014 -0400 |+++ b/server/access.c Fri Sep 12 01:03:38 2014 -0400 -------------------------- Patching file server/access.c using Plan A... Hunk #1 succeeded at 76. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r bda072a1ff80 -r ea6f07526f22 server/args.c |--- a/server/args.c Fri Sep 12 00:33:26 2014 -0400 |+++ b/server/args.c Fri Sep 12 01:03:38 2014 -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 1410498230 14400 |# Fri Sep 12 01:03:50 2014 -0400 |# Node ID c8d095e0cf5900f38bfa697a0d89649a6c03449c |# Parent ea6f07526f2203951cb2c8ef4be6e74b187d9429 |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 ea6f07526f22 -r c8d095e0cf59 clients/xmtg/ui.c |--- a/clients/xmtg/ui.c Fri Sep 12 01:03:38 2014 -0400 |+++ b/clients/xmtg/ui.c Fri Sep 12 01:03:50 2014 -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 ea6f07526f22 -r c8d095e0cf59 server/args.c |--- a/server/args.c Fri Sep 12 01:03:38 2014 -0400 |+++ b/server/args.c Fri Sep 12 01:03:50 2014 -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 ea6f07526f22 -r c8d095e0cf59 server/buf.c |--- a/server/buf.c Fri Sep 12 01:03:38 2014 -0400 |+++ b/server/buf.c Fri Sep 12 01:03:50 2014 -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 ea6f07526f22 -r c8d095e0cf59 server/cx.c |--- a/server/cx.c Fri Sep 12 01:03:38 2014 -0400 |+++ b/server/cx.c Fri Sep 12 01:03:50 2014 -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 ea6f07526f22 -r c8d095e0cf59 server/es.h |--- a/server/es.h Fri Sep 12 01:03:38 2014 -0400 |+++ b/server/es.h Fri Sep 12 01:03:50 2014 -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 ea6f07526f22 -r c8d095e0cf59 server/pp.c |--- a/server/pp.c Fri Sep 12 01:03:38 2014 -0400 |+++ b/server/pp.c Fri Sep 12 01:03:50 2014 -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 1410498853 14400 |# Fri Sep 12 01:14:13 2014 -0400 |# Node ID 697d07442f0c21f54cbe42a813cd7ea0f3a0d1a9 |# Parent c8d095e0cf5900f38bfa697a0d89649a6c03449c |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. | |- add braces to avoid the ambiguous else case (at least once instance |was wrong...) | |diff -r c8d095e0cf59 -r 697d07442f0c clients/xmtg/ui.c |--- a/clients/xmtg/ui.c Fri Sep 12 01:03:50 2014 -0400 |+++ b/clients/xmtg/ui.c Fri Sep 12 01:14:13 2014 -0400 -------------------------- Patching file clients/xmtg/ui.c using Plan A... Hunk #1 succeeded at 61. Hunk #2 succeeded at 210. Hunk #3 succeeded at 270. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r c8d095e0cf59 -r 697d07442f0c clients/xmxinit/xmxinit.c |--- a/clients/xmxinit/xmxinit.c Fri Sep 12 01:03:50 2014 -0400 |+++ b/clients/xmxinit/xmxinit.c Fri Sep 12 01:14:13 2014 -0400 -------------------------- Patching file clients/xmxinit/xmxinit.c using Plan A... Hunk #1 succeeded at 58. Hunk #2 succeeded at 95. Hunk #3 succeeded at 130. Hunk #4 succeeded at 142. Hunk #5 succeeded at 309. Hunk #6 succeeded at 334. Hunk #7 succeeded at 369. Hunk #8 succeeded at 452. Hunk #9 succeeded at 486. Hunk #10 succeeded at 540. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r c8d095e0cf59 -r 697d07442f0c lib/Xmc/ErrHndlr.c |--- a/lib/Xmc/ErrHndlr.c Fri Sep 12 01:03:50 2014 -0400 |+++ b/lib/Xmc/ErrHndlr.c Fri Sep 12 01:14:13 2014 -0400 -------------------------- Patching file lib/Xmc/ErrHndlr.c using Plan A... Hunk #1 succeeded at 133. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r c8d095e0cf59 -r 697d07442f0c lib/Xmc/auth.c |--- a/lib/Xmc/auth.c Fri Sep 12 01:03:50 2014 -0400 |+++ b/lib/Xmc/auth.c Fri Sep 12 01:14:13 2014 -0400 -------------------------- Patching file lib/Xmc/auth.c using Plan A... Hunk #1 succeeded at 62. Hunk #2 succeeded at 70. Hunk #3 succeeded at 189. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r c8d095e0cf59 -r 697d07442f0c lib/Xmc/common.c |--- a/lib/Xmc/common.c Fri Sep 12 01:03:50 2014 -0400 |+++ b/lib/Xmc/common.c Fri Sep 12 01:14:13 2014 -0400 -------------------------- Patching file lib/Xmc/common.c using Plan A... Hunk #1 succeeded at 655. Hunk #2 succeeded at 671. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r c8d095e0cf59 -r 697d07442f0c server/args.c |--- a/server/args.c Fri Sep 12 01:03:50 2014 -0400 |+++ b/server/args.c Fri Sep 12 01:14:13 2014 -0400 -------------------------- Patching file server/args.c using Plan A... Hunk #1 succeeded at 432. Hunk #2 succeeded at 628. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r c8d095e0cf59 -r 697d07442f0c server/cmapwin.c |--- a/server/cmapwin.c Fri Sep 12 01:03:50 2014 -0400 |+++ b/server/cmapwin.c Fri Sep 12 01:14:13 2014 -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 c8d095e0cf59 -r 697d07442f0c server/df.h |--- a/server/df.h Fri Sep 12 01:03:50 2014 -0400 |+++ b/server/df.h Fri Sep 12 01:14:13 2014 -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 1410498854 14400 |# Fri Sep 12 01:14:14 2014 -0400 |# Node ID a3b01b616471b698bc091bd8e36d4ef96abcf284 |# Parent 697d07442f0c21f54cbe42a813cd7ea0f3a0d1a9 |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 697d07442f0c -r a3b01b616471 clients/xmtg/ui.c |--- a/clients/xmtg/ui.c Fri Sep 12 01:14:13 2014 -0400 |+++ b/clients/xmtg/ui.c Fri Sep 12 01:14:14 2014 -0400 -------------------------- Patching file clients/xmtg/ui.c using Plan A... Hunk #1 succeeded at 129. Hunk #2 succeeded at 194. Hunk #3 succeeded at 238. Hunk #4 succeeded at 248. Hunk #5 succeeded at 256. Hunk #6 succeeded at 295. Hunk #7 succeeded at 343. Hunk #8 succeeded at 437. Hunk #9 succeeded at 449. Hunk #10 succeeded at 541. Hunk #11 succeeded at 552. Hunk #12 succeeded at 579. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r 697d07442f0c -r a3b01b616471 server/es.c |--- a/server/es.c Fri Sep 12 01:14:13 2014 -0400 |+++ b/server/es.c Fri Sep 12 01:14:14 2014 -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 697d07442f0c -r a3b01b616471 server/ptc.h |--- a/server/ptc.h Fri Sep 12 01:14:13 2014 -0400 |+++ b/server/ptc.h Fri Sep 12 01:14:14 2014 -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 697d07442f0c -r a3b01b616471 server/zb.h |--- a/server/zb.h Fri Sep 12 01:14:13 2014 -0400 |+++ b/server/zb.h Fri Sep 12 01:14:14 2014 -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 1410498854 14400 |# Fri Sep 12 01:14:14 2014 -0400 |# Node ID b6ed964dd09057e5e67e87be077fe7987b7c37c2 |# Parent a3b01b616471b698bc091bd8e36d4ef96abcf284 |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 a3b01b616471 -r b6ed964dd090 clients/xmtg/pathfind.c |--- a/clients/xmtg/pathfind.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/clients/xmtg/pathfind.c Fri Sep 12 01:14:14 2014 -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 a3b01b616471 -r b6ed964dd090 clients/xmxinit/xmxinit.c |--- a/clients/xmxinit/xmxinit.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/clients/xmxinit/xmxinit.c Fri Sep 12 01:14:14 2014 -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 585. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r a3b01b616471 -r b6ed964dd090 lib/Xmc/ErrHndlr.c |--- a/lib/Xmc/ErrHndlr.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/lib/Xmc/ErrHndlr.c Fri Sep 12 01:14:14 2014 -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 a3b01b616471 -r b6ed964dd090 lib/Xmc/common.c |--- a/lib/Xmc/common.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/lib/Xmc/common.c Fri Sep 12 01:14:14 2014 -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 a3b01b616471 -r b6ed964dd090 server/color.c |--- a/server/color.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/server/color.c Fri Sep 12 01:14:14 2014 -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 a3b01b616471 -r b6ed964dd090 server/shape.c |--- a/server/shape.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/server/shape.c Fri Sep 12 01:14:14 2014 -0400 -------------------------- Patching file server/shape.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: -------------------------- |# HG changeset patch |# User dholland@NetBSD.org |# Date 1410498854 14400 |# Fri Sep 12 01:14:14 2014 -0400 |# Node ID 34bb1619c78546125bbd7c8d9c4729bd3776cec8 |# Parent b6ed964dd09057e5e67e87be077fe7987b7c37c2 |Remove unused objects. (Mostly found by compilers.) | |diff -r b6ed964dd090 -r 34bb1619c785 lib/Xmc/Open.c |--- a/lib/Xmc/Open.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/lib/Xmc/Open.c Fri Sep 12 01:14:14 2014 -0400 -------------------------- Patching file lib/Xmc/Open.c using Plan A... Hunk #1 succeeded at 292. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r b6ed964dd090 -r 34bb1619c785 lib/Xmc/common.c |--- a/lib/Xmc/common.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/lib/Xmc/common.c Fri Sep 12 01:14:14 2014 -0400 -------------------------- Patching file lib/Xmc/common.c using Plan A... Hunk #1 succeeded at 588. 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 1410498854 14400 |# Fri Sep 12 01:14:14 2014 -0400 |# Node ID 666fe28aea2c0b4b16da77e85c0fb50b9617d46f |# Parent 34bb1619c78546125bbd7c8d9c4729bd3776cec8 |Remove references to miscellaneous legacy functions: | index -> strchr | rindex -> strrchr |etc. | |Nothing like comprehensive yet. | |diff -r 34bb1619c785 -r 666fe28aea2c server/access.c |--- a/server/access.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/server/access.c Fri Sep 12 01:14:14 2014 -0400 -------------------------- Patching file server/access.c using Plan A... Hunk #1 succeeded at 83. 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 1410498945 14400 |# Fri Sep 12 01:15:45 2014 -0400 |# Node ID c30de50d2b97b1f9c52c302c8b5e38178891ac78 |# Parent 666fe28aea2c0b4b16da77e85c0fb50b9617d46f |Use C89 prototypes and function definitions. | |(Nothing like comprehensive yet.) | |diff -r 666fe28aea2c -r c30de50d2b97 clients/xmtg/ui.c |--- a/clients/xmtg/ui.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/clients/xmtg/ui.c Fri Sep 12 01:15:45 2014 -0400 -------------------------- Patching file clients/xmtg/ui.c using Plan A... Hunk #1 succeeded at 67. Hunk #2 succeeded at 208. Hunk #3 succeeded at 265. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -r 666fe28aea2c -r c30de50d2b97 clients/xmxinit/xmxinit.c |--- a/clients/xmxinit/xmxinit.c Fri Sep 12 01:14:14 2014 -0400 |+++ b/clients/xmxinit/xmxinit.c Fri Sep 12 01:15:45 2014 -0400 -------------------------- Patching file clients/xmxinit/xmxinit.c using Plan A... Hunk #1 succeeded at 111. Hunk #2 succeeded at 123. Hunk #3 succeeded at 132. Hunk #4 succeeded at 153. Hunk #5 succeeded at 343. Hunk #6 succeeded at 376. Hunk #7 succeeded at 458. Hunk #8 succeeded at 482. done ===> Creating toolchain wrappers for xmx-2.1a7nb9 ===> Configuring for xmx-2.1a7nb9 => Checking for portability problems in extracted files mv -f Makefile Makefile.bak imake -DUseInstalled -I/usr/pkg/lib/X11/config imake: executing: /usr/pkg/bin/tradcpp -I. -Uunix -D__amd64__ -D__amd64__ -traditional -Dlinux -debuglog .imake.cpplog -DUseInstalled -I/usr/pkg/lib/X11/config -DBuildHtmlManPages=NO .imake.start.c In file included from .imake.start.c:33:2: In file included from /usr/pkg/lib/X11/config/Imake.tmpl:109:2: /usr/pkg/lib/X11/config/linux.cf:204:10: Warning: non-identical redefinition of ProjectRoot In file included from .imake.start.c:33:2: In file included from /usr/pkg/lib/X11/config/Imake.tmpl:46:2: In file included from /usr/pkg/lib/X11/config/site.def:44:2: /usr/pkg/lib/X11/config/host.def:3:9: Previous definition was here In file included from .imake.start.c:33:2: In file included from /usr/pkg/lib/X11/config/Imake.tmpl:109:2: /usr/pkg/lib/X11/config/linux.cf:205:10: Warning: non-identical redefinition of ManPath In file included from .imake.start.c:33:2: In file included from /usr/pkg/lib/X11/config/Imake.tmpl:46:2: In file included from /usr/pkg/lib/X11/config/site.def:44:2: /usr/pkg/lib/X11/config/host.def:4:9: Previous definition was here make Makefiles making Makefiles in include... mv -f Makefile Makefile.bak imake: executing: /usr/pkg/bin/tradcpp -I. -Uunix -D__amd64__ -D__amd64__ -traditional -Dlinux -debuglog .imake.cpplog -DUseInstalled -Wundef -DTOPDIR=.. -DCURDIR=include -DBuildHtmlManPages=NO .imake.start.c .imake.start.c:33:2: Include file Imake.tmpl not found /usr/pkg/bin/imake: Exit code 1. Stop. *** Error code 1 Stop. bmake[1]: stopped making "include/Makefile" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7 bmake[1]: don't know how to make Makefiles. Stop bmake[1]: stopped making "Makefiles" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7/include making Makefiles in lib... mv -f Makefile Makefile.bak imake: executing: /usr/pkg/bin/tradcpp -I. -Uunix -D__amd64__ -D__amd64__ -traditional -Dlinux -debuglog .imake.cpplog -DUseInstalled -Wundef -DTOPDIR=.. -DCURDIR=lib -DBuildHtmlManPages=NO .imake.start.c .imake.start.c:33:2: Include file Imake.tmpl not found /usr/pkg/bin/imake: Exit code 1. Stop. *** Error code 1 Stop. bmake[1]: stopped making "lib/Makefile" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7 bmake[1]: don't know how to make Makefiles. Stop bmake[1]: stopped making "Makefiles" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7/lib making Makefiles in server... mv -f Makefile Makefile.bak imake: executing: /usr/pkg/bin/tradcpp -I. -Uunix -D__amd64__ -D__amd64__ -traditional -Dlinux -debuglog .imake.cpplog -DUseInstalled -Wundef -DTOPDIR=.. -DCURDIR=server -DBuildHtmlManPages=NO .imake.start.c .imake.start.c:33:2: Include file Imake.tmpl not found /usr/pkg/bin/imake: Exit code 1. Stop. *** Error code 1 Stop. bmake[1]: stopped making "server/Makefile" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7 bmake[1]: don't know how to make Makefiles. Stop bmake[1]: stopped making "Makefiles" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7/server making Makefiles in clients... mv -f Makefile Makefile.bak imake: executing: /usr/pkg/bin/tradcpp -I. -Uunix -D__amd64__ -D__amd64__ -traditional -Dlinux -debuglog .imake.cpplog -DUseInstalled -Wundef -DTOPDIR=.. -DCURDIR=clients -DBuildHtmlManPages=NO .imake.start.c .imake.start.c:33:2: Include file Imake.tmpl not found /usr/pkg/bin/imake: Exit code 1. Stop. *** Error code 1 Stop. bmake[1]: stopped making "clients/Makefile" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7 bmake[1]: don't know how to make Makefiles. Stop bmake[1]: stopped making "Makefiles" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7/clients making Makefiles in man... mv -f Makefile Makefile.bak imake: executing: /usr/pkg/bin/tradcpp -I. -Uunix -D__amd64__ -D__amd64__ -traditional -Dlinux -debuglog .imake.cpplog -DUseInstalled -Wundef -DTOPDIR=.. -DCURDIR=man -DBuildHtmlManPages=NO .imake.start.c .imake.start.c:33:2: Include file Imake.tmpl not found /usr/pkg/bin/imake: Exit code 1. Stop. *** Error code 1 Stop. bmake[1]: stopped making "man/Makefile" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7 bmake[1]: don't know how to make Makefiles. Stop bmake[1]: stopped making "Makefiles" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7/man make includes including in ./include... bmake[1]: don't know how to make includes. Stop bmake[1]: stopped making "includes" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7/include *** Error code 2 Stop. make: stopped making "includes" in /home/pbulk/build/x11/xmx/work/xmx-2.1alpha.pl7 *** Error code 1 Stop. bmake[1]: stopped making "configure" in /data/jenkins/workspace/pkgsrc-el7-trunk-x86_64/x11/xmx *** Error code 1 Stop. bmake: stopped making "configure" in /data/jenkins/workspace/pkgsrc-el7-trunk-x86_64/x11/xmx