add patch comments

83 files changed, 332 insertions, 165 deletions

diff --git a/x11/xmx/distinfo b/x11/xmx/distinfo
index 00566df0cf7..903eb6bb914 100644
--- a/x11/xmx/distinfo
+++ b/x11/xmx/distinfo
@@ -1,88 +1,88 @@
-$NetBSD: distinfo,v 1.5 2010/07/11 23:51:15 dholland Exp $
+$NetBSD: distinfo,v 1.6 2011/07/03 20:15:58 dholland Exp $
 
 SHA1 (xmx-2.1alpha.pl7.tar.gz) = b517b20a7bfa352b12ffb7dd260d50ea6c1ec21b
 RMD160 (xmx-2.1alpha.pl7.tar.gz) = 18560824a35ffc55ce90fa63d1894362afa45405
 Size (xmx-2.1alpha.pl7.tar.gz) = 498352 bytes
-SHA1 (patch-aa) = b2a0495a9c85ea5fb8c5754356584fbd6b8e00d3
-SHA1 (patch-ab) = d5a8ada381f1f11dcfdfde4dee30006b03cb325a
-SHA1 (patch-ac) = e28de95a5390f55f227e4dd48cbeb5570e8875d7
-SHA1 (patch-ad) = 86b0633335735207e958a2e207b1eee4127b6d77
-SHA1 (patch-ae) = 7820c5bd24cc0a92201f05e91ae72f7681686499
-SHA1 (patch-af) = 6b4fe7e13e16270b92b1e377a01bc54d4fd1df58
-SHA1 (patch-ag) = 6d1b47ada8b9cf12e7ea7ce31154c4acdaeba9a4
-SHA1 (patch-ah) = 203cbcf742b6d7b128c7b1cdaade066532ef6bac
-SHA1 (patch-ai) = cb24f5e3d8c31a36c28683bb14f9f81f289604c8
-SHA1 (patch-aj) = e63d86b90b3949b4c27d3abee7b1e3198b2eb812
-SHA1 (patch-ak) = 871705f3c7cc87817cf96c1b771d2423e9aadcd4
-SHA1 (patch-al) = 06f54d4ee2d951264c133c18dbeaa4ae775afea2
-SHA1 (patch-am) = 6fc13f5b0dc8747263f2b69351124106da0f5065
-SHA1 (patch-ba) = 54c5546f4c3ba0d52e6784e2fbb36a2a0a2bc4c2
-SHA1 (patch-bb) = 2388da09fdf95f978c34a762d0c1cd156e5d3a39
-SHA1 (patch-bc) = 923ad684950abaa4204d32ee0763c01383a50361
-SHA1 (patch-bd) = 7dcd52874072db7801f7b885a33f4d735b8453d4
-SHA1 (patch-be) = 34b12990b8e5881344f1ede8e16232c7302b6e57
-SHA1 (patch-bf) = 8f873285b751bc867ef5b4ef114d8d2abdea0dfd
-SHA1 (patch-bg) = 471c35cde452b800bde25e552c293785c1b1840e
-SHA1 (patch-bh) = 5a88c2bf48167ac8b180a1d3736ada0ae4e40bcb
-SHA1 (patch-bi) = 335d276302ab0bff6b892b8da88a271b1cdea7f6
-SHA1 (patch-bj) = 308a1ef46c27c0df2714567608f290e5c58333da
-SHA1 (patch-bk) = f543e35d59b56755bde230b165f633e7ef61c72a
-SHA1 (patch-bl) = 10461e98674a7c2482ebe8f929bfbe2ad94de34a
-SHA1 (patch-bm) = 7caabf326ec0760a40278e2e327e5a9f5c0943b1
-SHA1 (patch-bn) = 0c14f1b5e3bad6c2b30111d8d4038741e0da0b1c
-SHA1 (patch-bo) = 2e36d03020ad81f9f4855d2b0b60b20eb98d6bd2
-SHA1 (patch-bp) = 5f0349d09b32b09beed8fc51f2e90a9c5ac7c39a
-SHA1 (patch-bq) = f2accbf98b12e2e5ffd0887d35a3f069f310bc3c
-SHA1 (patch-br) = d6f052b36f7b75b244d46cc264de5439c20c93af
-SHA1 (patch-bs) = cb5990bab1042a0a43cf942c18d38e9a7e1d388b
-SHA1 (patch-bt) = 85ebc7f12ed5493552fcaa07fd46c5761c076f91
-SHA1 (patch-bu) = 3ab48959ae5e68b1e91cb65213b4e7de875e162a
-SHA1 (patch-bv) = a81350981178d6cc5aaade8a4eeca4e77e50c75a
-SHA1 (patch-bw) = ed3afbfadebb3aa412cce24a7826518a8864aa57
-SHA1 (patch-bx) = 5d86a9f6a6050168b87b70ddfdb2fda428a2b1b9
-SHA1 (patch-by) = c8eeaa8ad48f8b94809d0403f0e551ae10f15304
-SHA1 (patch-bz) = 2b587d8c370bb9072a50cf84ba6e0560378bee18
-SHA1 (patch-ca) = 260906a9c0d4bbfce3b283048fba16b7a27fdc6d
-SHA1 (patch-cb) = e5cc6ebcbff118595dfca0b928762cb5ac913640
-SHA1 (patch-cc) = 9c1030833bb512e1d86665b96207e9e56033c23e
-SHA1 (patch-cd) = 4f9156fc8294581c22599bbf2902462bbe4d3074
-SHA1 (patch-ce) = 3258f0bdf525f2e215ebd16a64a667cab9526c65
-SHA1 (patch-cf) = ec1dcdcbba14bc1af531a74c085aef31b556ff99
-SHA1 (patch-cg) = 59bdf629f072034c77f8e74792d0dc1f72225781
-SHA1 (patch-ch) = 2470887a7d040ab8d291c47a2d1f3874b5d2b9b1
-SHA1 (patch-ci) = 8db248283633edf8bee35e8d22f2f42db4528e0d
-SHA1 (patch-cj) = 964ce187be6bb93438c4a87f03ac891c071fd3d7
-SHA1 (patch-ck) = cfab49f9f6ff948f2b8c1341f38a01b822003e5f
-SHA1 (patch-cl) = d5235ddb32c93d1288bd49332bc9aebaa13edef2
-SHA1 (patch-cm) = 2c96c8277d563e848a1948ccf9baa540c9151edc
-SHA1 (patch-cn) = f764b087b430ae128659df1fad9ef86bff026b81
-SHA1 (patch-co) = 2881849b99f6e28b758d22a50470c5dfaa2d6b5f
-SHA1 (patch-cp) = 1066d92eb2048144de9d9e158fe63d2662fd4dbb
-SHA1 (patch-cq) = da7c7861a517aada41b2e1a290a35b3e8cf540b9
-SHA1 (patch-cr) = faa9ebb6a3ae46959f9d4094283a036b9222c773
-SHA1 (patch-cs) = ff22fa56a014de0038650cd5a98e05f629f7e7d3
-SHA1 (patch-ct) = 393d43febcc3f9e8302150257bba638f73228d13
-SHA1 (patch-cu) = ae9d40bfbdc40aae05702eb897aaa7ceb9b448d6
-SHA1 (patch-cv) = 2a8f97af8726f103b2d3be8bdbd16082ae2119ac
-SHA1 (patch-cw) = 8a72417cc169b2bc58d5b77657f83b1fe7d6e392
-SHA1 (patch-cx) = dfed862cf5d48dd1f6fbfcf6b1780f45c238d0bf
-SHA1 (patch-cy) = 234c8e486f3e900d8799bd22441249df23fe831f
-SHA1 (patch-cz) = 96a21d569dfc52609219c3465de4c403bf56a206
-SHA1 (patch-da) = 3fba1ba00e8cc7accd15ea4f5bfd615700ed420e
-SHA1 (patch-db) = 049fffbce44cf4a1ea169ee8153a3bf45307be1e
-SHA1 (patch-dc) = d70975d7071b391cc3e83bd1e5e4acf8e333a00a
-SHA1 (patch-dd) = e5d2fea2ad7a8da3529a41452968e718c86dc6d1
-SHA1 (patch-de) = bdcc522ff0b97a8207965b6aee1f5a45e64425c8
-SHA1 (patch-df) = 6fb17641fa4bebf48cee656104ebb0065f663d35
-SHA1 (patch-dg) = 2f0ebab6a145546a22b495f12fffe0e60791accb
-SHA1 (patch-dh) = a6fef2ec6e7cc9abc1f2fd2e12cc6fc11cee0353
-SHA1 (patch-di) = bb54061779ff5b19c04099d552f747daa5b18be9
-SHA1 (patch-dj) = 89ee37086ac43df3e9e901fde7827f3d05369963
-SHA1 (patch-dk) = 5b9d03cf77434c369ab6aca12f36432968a9aea8
-SHA1 (patch-ea) = 44019700e7ad06bf7319926ebc804722e4d6f521
-SHA1 (patch-eb) = a867f1c4dcc653d19206b64fa396732f1ae1c88b
-SHA1 (patch-ec) = 18de9cdf60967af54721d105072dc30867a99904
-SHA1 (patch-ed) = 11c1d90ecad5bec0c92bbb4bd7b80c4056e4bcde
-SHA1 (patch-ee) = 077943c76a512a0e51e7097409ec645d43b1ba18
-SHA1 (patch-ef) = 58e1b211139aaba6f4303cec5b6a6cac98ab5b66
+SHA1 (patch-aa) = 029b20a8630ccf99cfb95381414671d5963cd49b
+SHA1 (patch-ab) = cca7e590b5432e5fed68658ff10dd21981c0aed7
+SHA1 (patch-ac) = 2b5ecb1f621d86ff00637a7e8070b6419354a8f4
+SHA1 (patch-ad) = 0a61fcd53dcc23cac02588a750dec829ac554376
+SHA1 (patch-ae) = 50bb4842042e9297484c6bb8986212e82d84dbd4
+SHA1 (patch-af) = f495e95579f2d4c0f6f97b5933f1f420992a3968
+SHA1 (patch-ag) = ec6d1d0a6e0a96c7b40f86763b04e32e74a8f6ef
+SHA1 (patch-ah) = 913a8b122e570c1f105761ee83889e09d2e3e8dd
+SHA1 (patch-ai) = 19ca5fa6a18639df41dbd6d6bce275a64293e3b5
+SHA1 (patch-aj) = da1ce04aa5b4c0701686bd1295880c9774634f63
+SHA1 (patch-ak) = 52080a7d9ffc0c614e998a76733cace6c29234e7
+SHA1 (patch-al) = 905f48024c4101a6678a036566684c4c8ecd858e
+SHA1 (patch-am) = 4f6b01d9d3c843af850ff79acd21be3aa0b6f5e5
+SHA1 (patch-ba) = ef2aae029305f9b5fa975805622466db418f197d
+SHA1 (patch-bb) = 595b93c221294fa5c61753c944acdf0f06d28748
+SHA1 (patch-bc) = 95653bf85c440158fe332cf114b3af22ffef5980
+SHA1 (patch-bd) = 37db161da309dd0178756d17be1c5b87c91a8f4b
+SHA1 (patch-be) = 7a4e8fe2e5a0a47a0cef4cfe7f0227be985fdd33
+SHA1 (patch-bf) = 5320d394fbd71fb1b03032c49b0f19cf3e330be7
+SHA1 (patch-bg) = b7807809e2860274158d908482e702078fed3f85
+SHA1 (patch-bh) = d2ad6793cf458957029bc17a457ab7b21a7d4957
+SHA1 (patch-bi) = e9ee7b76c15cf0b1a8579426988d3878b115db57
+SHA1 (patch-bj) = f907b9c16e4c447dbc59723238eb0e05d511be05
+SHA1 (patch-bk) = 6995b1743b59ce4d6e62827832d66916e5c74632
+SHA1 (patch-bl) = c6ff8f66385c8982c4831e5abef3f26980302d42
+SHA1 (patch-bm) = 2e13b0695ac77ef9c305b79682b25a8b0c51d49a
+SHA1 (patch-bn) = 7afce6231f8bf26da03bccec1a2a870528a99460
+SHA1 (patch-bo) = fe12b965c8025fa155ab8c3c4d24620955da7b61
+SHA1 (patch-bp) = f9754e120fd23a39181b1b810290709cfece9572
+SHA1 (patch-bq) = 69a161f6d7240bb189d2cbe0b66783e38e0c3b38
+SHA1 (patch-br) = 168b2c47f625010efe29fd5f8625f3410eb92f00
+SHA1 (patch-bs) = 6122833d06349aea3667dacfe36d7c0a38cf48e1
+SHA1 (patch-bt) = acb34fc5d80bf4a93b27f3677a1cbdd77a97e7b0
+SHA1 (patch-bu) = c8d6d484ed42e72ba1e58c04671a246ed5d0e102
+SHA1 (patch-bv) = da34be5e7264d144dab637df7270dac1e5e4360c
+SHA1 (patch-bw) = 802fe46b2f6e3b932dde00e9ce76de4ac3549eb2
+SHA1 (patch-bx) = dff748ab1a2b2464c58849e1ac75dd1b8ffa3fa3
+SHA1 (patch-by) = c0904919af9e9bc109ca9daa2dce7bc5a99b1247
+SHA1 (patch-bz) = d7c87dbb5d3afcdea5d9f82638dd2b2fefa34e02
+SHA1 (patch-ca) = d329ce84c6b4b8af9547e9db377548ddd4c478f6
+SHA1 (patch-cb) = 3593182fe5dba24e555f0f59dd3108ff02b578cf
+SHA1 (patch-cc) = 1574c51570effae5885a900fdf04236c3150c838
+SHA1 (patch-cd) = 3d99717b181783e36f5dfa9ea3423fdc38f1fe55
+SHA1 (patch-ce) = 058131ca6aab30b81d934ad919a67903a1122443
+SHA1 (patch-cf) = c2715835d772ff2c150acb5ba7cdb14a0020e5e2
+SHA1 (patch-cg) = 60c1ed780015084f469ab164c582bbc4904237b8
+SHA1 (patch-ch) = 61fbdfa17561b6d37af79420ee3520c4682df2f3
+SHA1 (patch-ci) = bda8f72ce18aeece6a1f90aa5c619bf12978c9e7
+SHA1 (patch-cj) = ea580f94fdac6fe1484cb9d41602e7f2fd1c5da6
+SHA1 (patch-ck) = e2763e81bffb2c0eecfcb36499e09ca8594aa221
+SHA1 (patch-cl) = ef9f49275e45f29f91ed39b63a920b9e5f342077
+SHA1 (patch-cm) = ab55af4b71eb6ce31c903987fc4bf19314163517
+SHA1 (patch-cn) = 7d85f3286a85f3acf8e8e788d18921f9175f3ff8
+SHA1 (patch-co) = 89343a52b261b877a02a0ce77573e6566e886f87
+SHA1 (patch-cp) = b1a6bd02cec6bd1ba39a2fa8abbe5c2ef7065c6f
+SHA1 (patch-cq) = c9faefc1e6fa5562367655980d29bd15188a6232
+SHA1 (patch-cr) = 444b9f35dbb95792c8f88d913a671629a1d22d3c
+SHA1 (patch-cs) = 78452e11ee2c9bc3f6b4eb386e7688d4bbfc9bba
+SHA1 (patch-ct) = 092e3fdf9b48ec3b29c235acb067186b6ef6a31b
+SHA1 (patch-cu) = 79f8b3c63e161e2ab2ee5cbb7615d13690318193
+SHA1 (patch-cv) = a983f8da4e170a9adb0c5ccff3e2dfe8db1a27bf
+SHA1 (patch-cw) = c45c0228f42f1b50479fefc5ada9bbeab5c459d0
+SHA1 (patch-cx) = 81680d08b3a9e7f39c222b0e8a32aba01b298174
+SHA1 (patch-cy) = 4c3d386f57ca2043a33b7a2075f317f49708d6c2
+SHA1 (patch-cz) = a3f5846ffd355b295c1ea1b2024c5291f3f9bc2c
+SHA1 (patch-da) = ffc505a7ce98a42a30e18d421204849c2cd380f3
+SHA1 (patch-db) = 5011c2224e1d9048672bd51f68ef197e593ef5d3
+SHA1 (patch-dc) = dc69f4c20d6a98abaedf76fd0bff1548ac4f0ba5
+SHA1 (patch-dd) = a90a26457089ac0b34558977bfd63d47c52f2632
+SHA1 (patch-de) = d42d1dc6aac51f30009c5311f9a7976627062053
+SHA1 (patch-df) = a443d061ab3858353b09be89362f4179e35f9635
+SHA1 (patch-dg) = 9c02cf84a4a9ab14288437795dd0196c432ee2a8
+SHA1 (patch-dh) = a86ccf3c41e16661c5bfc84ceff48ac89702e615
+SHA1 (patch-di) = c86c82837ca1b6c30696f2e95ad69b78ef8dcd98
+SHA1 (patch-dj) = 1fa9a07981c7d40df912702707052a163da28f53
+SHA1 (patch-dk) = 6934d373b18fa2558156fc91c160d4e54fda6f07
+SHA1 (patch-ea) = 4fc96cc0846af3c465205f7c428a453185f15b0d
+SHA1 (patch-eb) = 66c4b8b6b3fed8c431cfb60ce6d52a9d0805ca5f
+SHA1 (patch-ec) = 9ce390570b6144471dc02fffdb0bd5ff714bddf0
+SHA1 (patch-ed) = e200f4b965fbfdb16fa4554028772cbf2693b2d0
+SHA1 (patch-ee) = 9a22f1d7312e21c07c12dbbe308b492606ff1343
+SHA1 (patch-ef) = 2b0bf5a3bb2fc25ed545d082cdf724cb0e627f8a
 SHA1 (patch-eg) = fffaaddaf67708b90c44b76ac4b9a301ffef6530
diff --git a/x11/xmx/patches/patch-aa b/x11/xmx/patches/patch-aa
index 8e87762167d..56f531dae95 100644
--- a/x11/xmx/patches/patch-aa
+++ b/x11/xmx/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-aa,v 1.2 2011/07/03 20:15:58 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/auth.c~	1998-04-01 18:50:26.000000000 -0500
 +++ lib/Xmc/auth.c	2008-08-31 00:15:32.000000000 -0400
diff --git a/x11/xmx/patches/patch-ab b/x11/xmx/patches/patch-ab
index 420e098ef01..056da2c2468 100644
--- a/x11/xmx/patches/patch-ab
+++ b/x11/xmx/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ab,v 1.2 2011/07/03 20:15:58 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/common.c~	1998-04-01 18:51:21.000000000 -0500
 +++ lib/Xmc/common.c	2008-08-31 00:16:29.000000000 -0400
diff --git a/x11/xmx/patches/patch-ac b/x11/xmx/patches/patch-ac
index 8e628584613..0fd4e582568 100644
--- a/x11/xmx/patches/patch-ac
+++ b/x11/xmx/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ac,v 1.2 2011/07/03 20:15:58 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/AddDis.c~	1998-02-01 14:02:27.000000000 -0500
 +++ lib/Xmc/AddDis.c	2008-08-31 00:17:18.000000000 -0400
diff --git a/x11/xmx/patches/patch-ad b/x11/xmx/patches/patch-ad
index b6485ab701a..6c5a928fdd7 100644
--- a/x11/xmx/patches/patch-ad
+++ b/x11/xmx/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ad,v 1.2 2011/07/03 20:15:58 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/DispInfo.c~	1998-03-03 13:24:19.000000000 -0500
 +++ lib/Xmc/DispInfo.c	2008-08-31 00:17:51.000000000 -0400
diff --git a/x11/xmx/patches/patch-ae b/x11/xmx/patches/patch-ae
index 2825d6497d1..96eb243e12d 100644
--- a/x11/xmx/patches/patch-ae
+++ b/x11/xmx/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ae,v 1.2 2011/07/03 20:15:58 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/ErrHndlr.c~	1998-02-01 14:03:30.000000000 -0500
 +++ lib/Xmc/ErrHndlr.c	2008-08-31 00:18:23.000000000 -0400
diff --git a/x11/xmx/patches/patch-af b/x11/xmx/patches/patch-af
index 505b0e90a00..16049180b59 100644
--- a/x11/xmx/patches/patch-af
+++ b/x11/xmx/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-af,v 1.2 2011/07/03 20:15:58 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/GetConf.c~	1998-02-01 15:05:10.000000000 -0500
 +++ lib/Xmc/GetConf.c	2008-08-31 00:18:49.000000000 -0400
diff --git a/x11/xmx/patches/patch-ag b/x11/xmx/patches/patch-ag
index 06f1ab94196..3ce05af235a 100644
--- a/x11/xmx/patches/patch-ag
+++ b/x11/xmx/patches/patch-ag
@@ -1,4 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ag,v 1.2 2011/07/03 20:15:58 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/ListDis.c~	1998-02-01 15:07:47.000000000 -0500
 +++ lib/Xmc/ListDis.c	2008-08-31 00:19:09.000000000 -0400
diff --git a/x11/xmx/patches/patch-ah b/x11/xmx/patches/patch-ah
index b3deeee487b..6458cf602a2 100644
--- a/x11/xmx/patches/patch-ah
+++ b/x11/xmx/patches/patch-ah
@@ -1,4 +1,6 @@
-$NetBSD: patch-ah,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ah,v 1.2 2011/07/03 20:15:58 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/Open.c~	1998-02-12 09:13:22.000000000 -0500
 +++ lib/Xmc/Open.c	2008-08-31 00:19:40.000000000 -0400
diff --git a/x11/xmx/patches/patch-ai b/x11/xmx/patches/patch-ai
index 1e77e978408..255c0f689ea 100644
--- a/x11/xmx/patches/patch-ai
+++ b/x11/xmx/patches/patch-ai
@@ -1,4 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ai,v 1.2 2011/07/03 20:15:58 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/QueryDis.c~	1998-02-01 15:14:55.000000000 -0500
 +++ lib/Xmc/QueryDis.c	2008-08-31 00:20:04.000000000 -0400
diff --git a/x11/xmx/patches/patch-aj b/x11/xmx/patches/patch-aj
index 4ed0997e35d..aa2a2de7156 100644
--- a/x11/xmx/patches/patch-aj
+++ b/x11/xmx/patches/patch-aj
@@ -1,4 +1,6 @@
-$NetBSD: patch-aj,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-aj,v 1.2 2011/07/03 20:15:58 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/Register.c~	1998-02-01 14:04:48.000000000 -0500
 +++ lib/Xmc/Register.c	2008-08-31 00:20:32.000000000 -0400
diff --git a/x11/xmx/patches/patch-ak b/x11/xmx/patches/patch-ak
index 436736f65f7..bee67d45b36 100644
--- a/x11/xmx/patches/patch-ak
+++ b/x11/xmx/patches/patch-ak
@@ -1,4 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ak,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/SetAuth.c~	1998-02-01 14:04:53.000000000 -0500
 +++ lib/Xmc/SetAuth.c	2008-08-31 00:20:55.000000000 -0400
diff --git a/x11/xmx/patches/patch-al b/x11/xmx/patches/patch-al
index 94aaf52532a..cbe19cb7e61 100644
--- a/x11/xmx/patches/patch-al
+++ b/x11/xmx/patches/patch-al
@@ -1,4 +1,6 @@
-$NetBSD: patch-al,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-al,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/SetConf.c~	1998-02-01 14:05:08.000000000 -0500
 +++ lib/Xmc/SetConf.c	2008-08-31 00:21:28.000000000 -0400
diff --git a/x11/xmx/patches/patch-am b/x11/xmx/patches/patch-am
index defabc7d27c..422934064e7 100644
--- a/x11/xmx/patches/patch-am
+++ b/x11/xmx/patches/patch-am
@@ -1,4 +1,6 @@
-$NetBSD: patch-am,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-am,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- lib/Xmc/SetDispTag.c~	1998-02-01 14:05:12.000000000 -0500
 +++ lib/Xmc/SetDispTag.c	2008-08-31 00:21:47.000000000 -0400
diff --git a/x11/xmx/patches/patch-ba b/x11/xmx/patches/patch-ba
index 135673478cc..f0f073d2ca2 100644
--- a/x11/xmx/patches/patch-ba
+++ b/x11/xmx/patches/patch-ba
@@ -1,4 +1,6 @@
-$NetBSD: patch-ba,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ba,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/args.c~	1998-03-27 10:11:58.000000000 -0500
 +++ server/args.c	2008-08-31 00:25:23.000000000 -0400
diff --git a/x11/xmx/patches/patch-bb b/x11/xmx/patches/patch-bb
index 4e3163f17c2..5f53042cd66 100644
--- a/x11/xmx/patches/patch-bb
+++ b/x11/xmx/patches/patch-bb
@@ -1,4 +1,6 @@
-$NetBSD: patch-bb,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bb,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/atom.c~	1997-11-07 09:55:37.000000000 -0500
 +++ server/atom.c	2008-08-31 00:25:58.000000000 -0400
diff --git a/x11/xmx/patches/patch-bc b/x11/xmx/patches/patch-bc
index 26a2c5894b6..760be6373e7 100644
--- a/x11/xmx/patches/patch-bc
+++ b/x11/xmx/patches/patch-bc
@@ -1,4 +1,6 @@
-$NetBSD: patch-bc,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bc,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/auth.c~	1997-10-27 16:25:10.000000000 -0500
 +++ server/auth.c	2008-08-31 00:26:26.000000000 -0400
diff --git a/x11/xmx/patches/patch-bd b/x11/xmx/patches/patch-bd
index 50ef8357cdb..81b1469e2dc 100644
--- a/x11/xmx/patches/patch-bd
+++ b/x11/xmx/patches/patch-bd
@@ -1,4 +1,6 @@
-$NetBSD: patch-bd,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bd,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/buf.c.orig	1998-04-09 17:44:21.000000000 -0400
 +++ server/buf.c	2008-08-31 01:18:26.000000000 -0400
diff --git a/x11/xmx/patches/patch-be b/x11/xmx/patches/patch-be
index faa25d8cd66..0f78c20e4e8 100644
--- a/x11/xmx/patches/patch-be
+++ b/x11/xmx/patches/patch-be
@@ -1,4 +1,6 @@
-$NetBSD: patch-be,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-be,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/cblock.c~	1998-03-18 14:37:05.000000000 -0500
 +++ server/cblock.c	2008-08-31 00:29:03.000000000 -0400
diff --git a/x11/xmx/patches/patch-bf b/x11/xmx/patches/patch-bf
index 2457c1ee794..85bc18fed35 100644
--- a/x11/xmx/patches/patch-bf
+++ b/x11/xmx/patches/patch-bf
@@ -1,4 +1,6 @@
-$NetBSD: patch-bf,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bf,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/client.c~	1997-10-21 15:53:24.000000000 -0400
 +++ server/client.c	2008-08-31 00:29:25.000000000 -0400
diff --git a/x11/xmx/patches/patch-bg b/x11/xmx/patches/patch-bg
index e5b8173ad22..99b03c23153 100644
--- a/x11/xmx/patches/patch-bg
+++ b/x11/xmx/patches/patch-bg
@@ -1,4 +1,6 @@
-$NetBSD: patch-bg,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bg,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/cliz.c~	1998-04-29 17:24:15.000000000 -0400
 +++ server/cliz.c	2008-08-31 00:29:55.000000000 -0400
diff --git a/x11/xmx/patches/patch-bh b/x11/xmx/patches/patch-bh
index c478bb1f6f2..0783b614acd 100644
--- a/x11/xmx/patches/patch-bh
+++ b/x11/xmx/patches/patch-bh
@@ -1,4 +1,7 @@
-$NetBSD: patch-bh,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bh,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
+- avoid identifier conflict on "index"
 
 --- server/cmapwin.c.orig	1998-04-30 10:33:41.000000000 -0400
 +++ server/cmapwin.c	2008-08-31 01:08:28.000000000 -0400
diff --git a/x11/xmx/patches/patch-bi b/x11/xmx/patches/patch-bi
index f8336dd0cd1..125ee295bf8 100644
--- a/x11/xmx/patches/patch-bi
+++ b/x11/xmx/patches/patch-bi
@@ -1,4 +1,6 @@
-$NetBSD: patch-bi,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bi,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/xmx.h~	1998-05-05 14:54:52.000000000 -0400
 +++ server/xmx.h	2008-08-31 00:38:36.000000000 -0400
diff --git a/x11/xmx/patches/patch-bj b/x11/xmx/patches/patch-bj
index 5347fb9e199..e52a7f763b1 100644
--- a/x11/xmx/patches/patch-bj
+++ b/x11/xmx/patches/patch-bj
@@ -1,4 +1,7 @@
-$NetBSD: patch-bj,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bj,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
+- fix bug masked by casting
 
 --- server/color.c.orig	1998-05-05 15:01:35.000000000 -0400
 +++ server/color.c	2008-08-31 01:25:45.000000000 -0400
diff --git a/x11/xmx/patches/patch-bk b/x11/xmx/patches/patch-bk
index edd38b7a913..f5e53342a15 100644
--- a/x11/xmx/patches/patch-bk
+++ b/x11/xmx/patches/patch-bk
@@ -1,4 +1,6 @@
-$NetBSD: patch-bk,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bk,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/connect.c~	1998-04-01 18:41:25.000000000 -0500
 +++ server/connect.c	2008-08-31 00:39:48.000000000 -0400
diff --git a/x11/xmx/patches/patch-bl b/x11/xmx/patches/patch-bl
index 057faa8847c..e50eac0c659 100644
--- a/x11/xmx/patches/patch-bl
+++ b/x11/xmx/patches/patch-bl
@@ -1,4 +1,6 @@
-$NetBSD: patch-bl,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bl,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/cookie.c~	1997-09-01 10:43:11.000000000 -0400
 +++ server/cookie.c	2008-08-31 00:40:13.000000000 -0400
diff --git a/x11/xmx/patches/patch-bm b/x11/xmx/patches/patch-bm
index 18946cd958d..5e3d4d9519c 100644
--- a/x11/xmx/patches/patch-bm
+++ b/x11/xmx/patches/patch-bm
@@ -1,4 +1,6 @@
-$NetBSD: patch-bm,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bm,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/cursor.c~	1998-02-26 18:31:52.000000000 -0500
 +++ server/cursor.c	2008-08-31 00:40:42.000000000 -0400
diff --git a/x11/xmx/patches/patch-bn b/x11/xmx/patches/patch-bn
index a325c04a535..59136b917cd 100644
--- a/x11/xmx/patches/patch-bn
+++ b/x11/xmx/patches/patch-bn
@@ -1,4 +1,6 @@
-$NetBSD: patch-bn,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bn,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/cx.c.orig	1997-10-03 16:45:33.000000000 -0400
 +++ server/cx.c	2008-08-31 01:27:59.000000000 -0400
diff --git a/x11/xmx/patches/patch-bo b/x11/xmx/patches/patch-bo
index a186cb3b06b..63e6f9bddf9 100644
--- a/x11/xmx/patches/patch-bo
+++ b/x11/xmx/patches/patch-bo
@@ -1,4 +1,6 @@
-$NetBSD: patch-bo,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bo,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/debug.c~	1998-01-20 10:56:51.000000000 -0500
 +++ server/debug.c	2008-08-31 00:42:03.000000000 -0400
diff --git a/x11/xmx/patches/patch-bp b/x11/xmx/patches/patch-bp
index 91454d8e689..b09d9ef3a9e 100644
--- a/x11/xmx/patches/patch-bp
+++ b/x11/xmx/patches/patch-bp
@@ -1,4 +1,6 @@
-$NetBSD: patch-bp,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bp,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/df.c~	1997-10-03 16:48:11.000000000 -0400
 +++ server/df.c	2008-08-31 00:42:29.000000000 -0400
diff --git a/x11/xmx/patches/patch-bq b/x11/xmx/patches/patch-bq
index 44f95f3aa5a..511497fe394 100644
--- a/x11/xmx/patches/patch-bq
+++ b/x11/xmx/patches/patch-bq
@@ -1,4 +1,6 @@
-$NetBSD: patch-bq,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bq,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/dprx.c~	1998-04-03 17:45:53.000000000 -0500
 +++ server/dprx.c	2008-08-31 00:43:57.000000000 -0400
diff --git a/x11/xmx/patches/patch-br b/x11/xmx/patches/patch-br
index 23664d74a78..c259b95dd52 100644
--- a/x11/xmx/patches/patch-br
+++ b/x11/xmx/patches/patch-br
@@ -1,4 +1,6 @@
-$NetBSD: patch-br,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-br,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/ebuf.c~	1998-05-07 13:52:14.000000000 -0400
 +++ server/ebuf.c	2008-08-31 00:44:38.000000000 -0400
diff --git a/x11/xmx/patches/patch-bs b/x11/xmx/patches/patch-bs
index 4b56883718c..9cfaf24f77e 100644
--- a/x11/xmx/patches/patch-bs
+++ b/x11/xmx/patches/patch-bs
@@ -1,4 +1,6 @@
-$NetBSD: patch-bs,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bs,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/error.c.orig	1997-08-22 14:37:47.000000000 -0400
 +++ server/error.c	2008-08-31 01:28:34.000000000 -0400
diff --git a/x11/xmx/patches/patch-bt b/x11/xmx/patches/patch-bt
index 7991fc5b575..f03195969fb 100644
--- a/x11/xmx/patches/patch-bt
+++ b/x11/xmx/patches/patch-bt
@@ -1,4 +1,6 @@
-$NetBSD: patch-bt,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bt,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/am.c~	1998-04-28 17:35:06.000000000 -0400
 +++ server/am.c	2008-08-31 01:07:31.000000000 -0400
diff --git a/x11/xmx/patches/patch-bu b/x11/xmx/patches/patch-bu
index 13ae02297b6..83de1ff5f00 100644
--- a/x11/xmx/patches/patch-bu
+++ b/x11/xmx/patches/patch-bu
@@ -1,4 +1,6 @@
-$NetBSD: patch-bu,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bu,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- fix LP64 issues
 
 --- server/es.c~	1997-08-26 17:21:49.000000000 -0400
 +++ server/es.c	2008-08-31 01:29:20.000000000 -0400
diff --git a/x11/xmx/patches/patch-bv b/x11/xmx/patches/patch-bv
index 232479d7d8c..89e4cdb9576 100644
--- a/x11/xmx/patches/patch-bv
+++ b/x11/xmx/patches/patch-bv
@@ -1,4 +1,6 @@
-$NetBSD: patch-bv,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bv,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/expos.c~	1998-03-17 11:45:01.000000000 -0500
 +++ server/expos.c	2008-08-31 01:30:01.000000000 -0400
diff --git a/x11/xmx/patches/patch-bw b/x11/xmx/patches/patch-bw
index 13207712442..817296c0b72 100644
--- a/x11/xmx/patches/patch-bw
+++ b/x11/xmx/patches/patch-bw
@@ -1,4 +1,6 @@
-$NetBSD: patch-bw,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bw,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/font.c~	1998-02-25 16:59:05.000000000 -0500
 +++ server/font.c	2008-08-31 01:30:38.000000000 -0400
diff --git a/x11/xmx/patches/patch-bx b/x11/xmx/patches/patch-bx
index 2542cc20b09..231b5b93138 100644
--- a/x11/xmx/patches/patch-bx
+++ b/x11/xmx/patches/patch-bx
@@ -1,4 +1,6 @@
-$NetBSD: patch-bx,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bx,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- declare own functions properly, fixes LP64 problems
 
 --- server/zb.h~	1997-09-29 15:54:22.000000000 -0400
 +++ server/zb.h	2008-08-31 01:32:42.000000000 -0400
diff --git a/x11/xmx/patches/patch-by b/x11/xmx/patches/patch-by
index df001d3bc82..4824c8da30e 100644
--- a/x11/xmx/patches/patch-by
+++ b/x11/xmx/patches/patch-by
@@ -1,4 +1,6 @@
-$NetBSD: patch-by,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-by,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/hash.c~	1997-12-15 12:12:11.000000000 -0500
 +++ server/hash.c	2008-08-31 01:33:36.000000000 -0400
diff --git a/x11/xmx/patches/patch-bz b/x11/xmx/patches/patch-bz
index bdd69bfd659..708ccbd71aa 100644
--- a/x11/xmx/patches/patch-bz
+++ b/x11/xmx/patches/patch-bz
@@ -1,4 +1,6 @@
-$NetBSD: patch-bz,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-bz,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/host.c~	1996-04-07 22:00:25.000000000 -0400
 +++ server/host.c	2008-08-31 01:34:06.000000000 -0400
diff --git a/x11/xmx/patches/patch-ca b/x11/xmx/patches/patch-ca
index 531f29c9d65..3fb0d4a4554 100644
--- a/x11/xmx/patches/patch-ca
+++ b/x11/xmx/patches/patch-ca
@@ -1,4 +1,6 @@
-$NetBSD: patch-ca,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ca,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/image.c~	1998-05-07 16:30:37.000000000 -0400
 +++ server/image.c	2008-08-31 01:34:39.000000000 -0400
diff --git a/x11/xmx/patches/patch-cb b/x11/xmx/patches/patch-cb
index 1f63e9a5aaa..47114973d98 100644
--- a/x11/xmx/patches/patch-cb
+++ b/x11/xmx/patches/patch-cb
@@ -1,4 +1,6 @@
-$NetBSD: patch-cb,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cb,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/imask.c~	1996-04-03 11:41:23.000000000 -0500
 +++ server/imask.c	2008-08-31 01:35:04.000000000 -0400
diff --git a/x11/xmx/patches/patch-cc b/x11/xmx/patches/patch-cc
index 3a576127550..9217e65f621 100644
--- a/x11/xmx/patches/patch-cc
+++ b/x11/xmx/patches/patch-cc
@@ -1,4 +1,6 @@
-$NetBSD: patch-cc,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cc,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/inp.c~	1998-05-04 15:09:44.000000000 -0400
 +++ server/inp.c	2008-08-31 01:35:30.000000000 -0400
diff --git a/x11/xmx/patches/patch-cd b/x11/xmx/patches/patch-cd
index f23aa23b2fd..5767b78fd5d 100644
--- a/x11/xmx/patches/patch-cd
+++ b/x11/xmx/patches/patch-cd
@@ -1,4 +1,6 @@
-$NetBSD: patch-cd,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cd,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/iswap.c~	1998-04-27 16:17:54.000000000 -0400
 +++ server/iswap.c	2008-08-31 01:35:53.000000000 -0400
diff --git a/x11/xmx/patches/patch-ce b/x11/xmx/patches/patch-ce
index 494e577169f..1f3847c6701 100644
--- a/x11/xmx/patches/patch-ce
+++ b/x11/xmx/patches/patch-ce
@@ -1,4 +1,6 @@
-$NetBSD: patch-ce,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ce,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/kpm.c~	1998-04-30 17:47:54.000000000 -0400
 +++ server/kpm.c	2008-08-31 01:36:13.000000000 -0400
diff --git a/x11/xmx/patches/patch-cf b/x11/xmx/patches/patch-cf
index 80c2f172fa9..0b8b672a50e 100644
--- a/x11/xmx/patches/patch-cf
+++ b/x11/xmx/patches/patch-cf
@@ -1,4 +1,6 @@
-$NetBSD: patch-cf,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cf,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/list.c~	1997-08-27 01:21:18.000000000 -0400
 +++ server/list.c	2008-08-31 01:36:41.000000000 -0400
diff --git a/x11/xmx/patches/patch-cg b/x11/xmx/patches/patch-cg
index 933916c2132..cbd69409c56 100644
--- a/x11/xmx/patches/patch-cg
+++ b/x11/xmx/patches/patch-cg
@@ -1,4 +1,6 @@
-$NetBSD: patch-cg,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cg,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/main.c~	1998-04-23 16:47:51.000000000 -0400
 +++ server/main.c	2008-08-31 01:37:16.000000000 -0400
diff --git a/x11/xmx/patches/patch-ch b/x11/xmx/patches/patch-ch
index 607e2055453..70ebdabd511 100644
--- a/x11/xmx/patches/patch-ch
+++ b/x11/xmx/patches/patch-ch
@@ -1,4 +1,6 @@
-$NetBSD: patch-ch,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ch,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/mitauth.c~	1996-04-03 11:41:24.000000000 -0500
 +++ server/mitauth.c	2008-08-31 01:37:39.000000000 -0400
diff --git a/x11/xmx/patches/patch-ci b/x11/xmx/patches/patch-ci
index 9d9e37505a6..c6e990dc65d 100644
--- a/x11/xmx/patches/patch-ci
+++ b/x11/xmx/patches/patch-ci
@@ -1,4 +1,6 @@
-$NetBSD: patch-ci,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ci,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/pixmap.c~	1998-04-27 11:32:07.000000000 -0400
 +++ server/pixmap.c	2008-08-31 01:38:08.000000000 -0400
diff --git a/x11/xmx/patches/patch-cj b/x11/xmx/patches/patch-cj
index c5d2814e74e..b73b09ceabc 100644
--- a/x11/xmx/patches/patch-cj
+++ b/x11/xmx/patches/patch-cj
@@ -1,4 +1,6 @@
-$NetBSD: patch-cj,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cj,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/plist.c~	1996-04-03 11:41:24.000000000 -0500
 +++ server/plist.c	2008-08-31 01:38:27.000000000 -0400
diff --git a/x11/xmx/patches/patch-ck b/x11/xmx/patches/patch-ck
index a8497d80d5a..a53f6fa9da8 100644
--- a/x11/xmx/patches/patch-ck
+++ b/x11/xmx/patches/patch-ck
@@ -1,4 +1,6 @@
-$NetBSD: patch-ck,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ck,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/pmap.c~	1998-04-08 12:24:43.000000000 -0400
 +++ server/pmap.c	2008-08-31 01:38:42.000000000 -0400
diff --git a/x11/xmx/patches/patch-cl b/x11/xmx/patches/patch-cl
index 490f034c921..0ee56fcd59f 100644
--- a/x11/xmx/patches/patch-cl
+++ b/x11/xmx/patches/patch-cl
@@ -1,4 +1,6 @@
-$NetBSD: patch-cl,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cl,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/pp.c~	1998-04-23 18:19:10.000000000 -0400
 +++ server/pp.c	2008-08-31 01:39:38.000000000 -0400
diff --git a/x11/xmx/patches/patch-cm b/x11/xmx/patches/patch-cm
index 88526677ac7..cebabc0bb61 100644
--- a/x11/xmx/patches/patch-cm
+++ b/x11/xmx/patches/patch-cm
@@ -1,4 +1,6 @@
-$NetBSD: patch-cm,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cm,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/prop.c~	1998-04-08 15:22:15.000000000 -0400
 +++ server/prop.c	2008-08-31 01:40:05.000000000 -0400
diff --git a/x11/xmx/patches/patch-cn b/x11/xmx/patches/patch-cn
index 8713249edcb..13957072d44 100644
--- a/x11/xmx/patches/patch-cn
+++ b/x11/xmx/patches/patch-cn
@@ -1,4 +1,6 @@
-$NetBSD: patch-cn,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cn,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/proto.c~	1998-04-22 18:54:02.000000000 -0400
 +++ server/proto.c	2008-08-31 01:41:05.000000000 -0400
diff --git a/x11/xmx/patches/patch-co b/x11/xmx/patches/patch-co
index 16f737d255e..f9f46d05493 100644
--- a/x11/xmx/patches/patch-co
+++ b/x11/xmx/patches/patch-co
@@ -1,4 +1,6 @@
-$NetBSD: patch-co,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-co,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/ptc.c~	1998-04-27 11:31:58.000000000 -0400
 +++ server/ptc.c	2008-08-31 01:41:24.000000000 -0400
diff --git a/x11/xmx/patches/patch-cp b/x11/xmx/patches/patch-cp
index e837184b094..7d6d344a1d8 100644
--- a/x11/xmx/patches/patch-cp
+++ b/x11/xmx/patches/patch-cp
@@ -1,4 +1,6 @@
-$NetBSD: patch-cp,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cp,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- avoid LP64 warnings (I believe I checked uses of these)
 
 --- server/es.h~	1997-09-27 17:10:13.000000000 -0400
 +++ server/es.h	2008-08-31 01:42:57.000000000 -0400
diff --git a/x11/xmx/patches/patch-cq b/x11/xmx/patches/patch-cq
index 290f7047afd..d92b69f075c 100644
--- a/x11/xmx/patches/patch-cq
+++ b/x11/xmx/patches/patch-cq
@@ -1,4 +1,7 @@
-$NetBSD: patch-cq,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cq,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
+- include own headers where needed
 
 --- server/ptc.h.orig	1998-04-22 17:09:58.000000000 -0400
 +++ server/ptc.h	2008-08-31 02:08:04.000000000 -0400
diff --git a/x11/xmx/patches/patch-cr b/x11/xmx/patches/patch-cr
index 13719a8004e..3aae2dd5fb5 100644
--- a/x11/xmx/patches/patch-cr
+++ b/x11/xmx/patches/patch-cr
@@ -1,4 +1,6 @@
-$NetBSD: patch-cr,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cr,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/request.c~	1998-04-29 14:54:43.000000000 -0400
 +++ server/request.c	2008-08-31 01:48:49.000000000 -0400
diff --git a/x11/xmx/patches/patch-cs b/x11/xmx/patches/patch-cs
index 84c8d5fdbcb..456dad857ab 100644
--- a/x11/xmx/patches/patch-cs
+++ b/x11/xmx/patches/patch-cs
@@ -1,4 +1,6 @@
-$NetBSD: patch-cs,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cs,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/gc.c~	1998-05-01 22:46:46.000000000 -0400
 +++ server/gc.c	2008-08-31 01:58:25.000000000 -0400
diff --git a/x11/xmx/patches/patch-ct b/x11/xmx/patches/patch-ct
index 9752c859410..2f9465c8b7a 100644
--- a/x11/xmx/patches/patch-ct
+++ b/x11/xmx/patches/patch-ct
@@ -1,4 +1,6 @@
-$NetBSD: patch-ct,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ct,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/queue.c~	1998-04-27 11:32:19.000000000 -0400
 +++ server/queue.c	2008-08-31 01:59:07.000000000 -0400
diff --git a/x11/xmx/patches/patch-cu b/x11/xmx/patches/patch-cu
index 068d9561dad..d8ee3f10831 100644
--- a/x11/xmx/patches/patch-cu
+++ b/x11/xmx/patches/patch-cu
@@ -1,4 +1,6 @@
-$NetBSD: patch-cu,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cu,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- protect header file against multiple inclusion
 
 --- server/df.h~	1997-09-27 17:10:13.000000000 -0400
 +++ server/df.h	2008-08-31 02:08:49.000000000 -0400
diff --git a/x11/xmx/patches/patch-cv b/x11/xmx/patches/patch-cv
index d0c5954a1cd..1607cb761d0 100644
--- a/x11/xmx/patches/patch-cv
+++ b/x11/xmx/patches/patch-cv
@@ -1,4 +1,6 @@
-$NetBSD: patch-cv,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cv,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/rgb.c~	1997-10-10 09:17:56.000000000 -0400
 +++ server/rgb.c	2008-08-31 02:12:44.000000000 -0400
diff --git a/x11/xmx/patches/patch-cw b/x11/xmx/patches/patch-cw
index d31908c72a0..c367c1f1928 100644
--- a/x11/xmx/patches/patch-cw
+++ b/x11/xmx/patches/patch-cw
@@ -1,4 +1,6 @@
-$NetBSD: patch-cw,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cw,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/rs.c~	1997-08-19 12:24:33.000000000 -0400
 +++ server/rs.c	2008-08-31 02:12:52.000000000 -0400
diff --git a/x11/xmx/patches/patch-cx b/x11/xmx/patches/patch-cx
index 4e409cdb065..052cb779b13 100644
--- a/x11/xmx/patches/patch-cx
+++ b/x11/xmx/patches/patch-cx
@@ -1,4 +1,6 @@
-$NetBSD: patch-cx,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cx,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/rx.c~	1998-02-04 14:54:56.000000000 -0500
 +++ server/rx.c	2008-08-31 02:15:00.000000000 -0400
diff --git a/x11/xmx/patches/patch-cy b/x11/xmx/patches/patch-cy
index 9edb5073d3b..57a6067743a 100644
--- a/x11/xmx/patches/patch-cy
+++ b/x11/xmx/patches/patch-cy
@@ -1,4 +1,6 @@
-$NetBSD: patch-cy,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cy,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/sel.c~	1998-03-31 14:22:36.000000000 -0500
 +++ server/sel.c	2008-08-31 02:15:35.000000000 -0400
diff --git a/x11/xmx/patches/patch-cz b/x11/xmx/patches/patch-cz
index c9eb31e8c7a..5067fc8485f 100644
--- a/x11/xmx/patches/patch-cz
+++ b/x11/xmx/patches/patch-cz
@@ -1,4 +1,6 @@
-$NetBSD: patch-cz,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-cz,v 1.2 2011/07/03 20:15:59 dholland Exp $
+
+- use modern C
 
 --- server/server.c~	1998-04-27 11:38:10.000000000 -0400
 +++ server/server.c	2008-08-31 02:16:00.000000000 -0400
diff --git a/x11/xmx/patches/patch-da b/x11/xmx/patches/patch-da
index 7e7f004ff71..a63a0bbe0a7 100644
--- a/x11/xmx/patches/patch-da
+++ b/x11/xmx/patches/patch-da
@@ -1,4 +1,6 @@
-$NetBSD: patch-da,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-da,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/sm.c~	1998-04-09 11:19:36.000000000 -0400
 +++ server/sm.c	2008-08-31 02:20:32.000000000 -0400
diff --git a/x11/xmx/patches/patch-db b/x11/xmx/patches/patch-db
index 1eb91ea9a31..09559b2440d 100644
--- a/x11/xmx/patches/patch-db
+++ b/x11/xmx/patches/patch-db
@@ -1,4 +1,6 @@
-$NetBSD: patch-db,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-db,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/socket.c~	1998-01-08 14:59:17.000000000 -0500
 +++ server/socket.c	2008-08-31 02:22:10.000000000 -0400
diff --git a/x11/xmx/patches/patch-dc b/x11/xmx/patches/patch-dc
index 6a795c1f796..332c1484943 100644
--- a/x11/xmx/patches/patch-dc
+++ b/x11/xmx/patches/patch-dc
@@ -1,4 +1,6 @@
-$NetBSD: patch-dc,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-dc,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/sres.c~	1998-05-07 13:52:45.000000000 -0400
 +++ server/sres.c	2008-08-31 02:22:31.000000000 -0400
diff --git a/x11/xmx/patches/patch-dd b/x11/xmx/patches/patch-dd
index a57c7452630..a1889b70c26 100644
--- a/x11/xmx/patches/patch-dd
+++ b/x11/xmx/patches/patch-dd
@@ -1,4 +1,6 @@
-$NetBSD: patch-dd,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-dd,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/sv.c~	1997-09-23 11:40:11.000000000 -0400
 +++ server/sv.c	2008-08-31 02:22:55.000000000 -0400
diff --git a/x11/xmx/patches/patch-de b/x11/xmx/patches/patch-de
index d9c1990d404..8d62d3acbe0 100644
--- a/x11/xmx/patches/patch-de
+++ b/x11/xmx/patches/patch-de
@@ -1,4 +1,6 @@
-$NetBSD: patch-de,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-de,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/time.c~	1998-03-31 14:12:31.000000000 -0500
 +++ server/time.c	2008-08-31 02:23:31.000000000 -0400
diff --git a/x11/xmx/patches/patch-df b/x11/xmx/patches/patch-df
index 7b849ebe042..ef7516f8d92 100644
--- a/x11/xmx/patches/patch-df
+++ b/x11/xmx/patches/patch-df
@@ -1,4 +1,6 @@
-$NetBSD: patch-df,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-df,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/tptr.c~	1998-05-04 16:54:58.000000000 -0400
 +++ server/tptr.c	2008-08-31 02:24:39.000000000 -0400
diff --git a/x11/xmx/patches/patch-dg b/x11/xmx/patches/patch-dg
index b8938b884e0..a0b24aa3380 100644
--- a/x11/xmx/patches/patch-dg
+++ b/x11/xmx/patches/patch-dg
@@ -1,4 +1,6 @@
-$NetBSD: patch-dg,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-dg,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/util.c~	1998-04-16 18:08:50.000000000 -0400
 +++ server/util.c	2008-08-31 02:25:16.000000000 -0400
diff --git a/x11/xmx/patches/patch-dh b/x11/xmx/patches/patch-dh
index f56ee1a7231..266c538af42 100644
--- a/x11/xmx/patches/patch-dh
+++ b/x11/xmx/patches/patch-dh
@@ -1,4 +1,6 @@
-$NetBSD: patch-dh,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-dh,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/vconf.c~	1998-05-05 15:00:20.000000000 -0400
 +++ server/vconf.c	2008-08-31 02:26:08.000000000 -0400
diff --git a/x11/xmx/patches/patch-di b/x11/xmx/patches/patch-di
index 8bf53840527..c5ead694d69 100644
--- a/x11/xmx/patches/patch-di
+++ b/x11/xmx/patches/patch-di
@@ -1,4 +1,6 @@
-$NetBSD: patch-di,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-di,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/window.c~	1998-05-04 17:30:15.000000000 -0400
 +++ server/window.c	2008-08-31 02:26:35.000000000 -0400
diff --git a/x11/xmx/patches/patch-dj b/x11/xmx/patches/patch-dj
index 77b3594f219..eb8742be66b 100644
--- a/x11/xmx/patches/patch-dj
+++ b/x11/xmx/patches/patch-dj
@@ -1,4 +1,6 @@
-$NetBSD: patch-dj,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-dj,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/xmc.c~	1998-04-01 18:45:05.000000000 -0500
 +++ server/xmc.c	2008-08-31 02:26:54.000000000 -0400
diff --git a/x11/xmx/patches/patch-dk b/x11/xmx/patches/patch-dk
index 5bfb8d8ee6c..21d6aa190b2 100644
--- a/x11/xmx/patches/patch-dk
+++ b/x11/xmx/patches/patch-dk
@@ -1,4 +1,6 @@
-$NetBSD: patch-dk,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-dk,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- server/xmcp.c~	1998-02-12 17:45:06.000000000 -0500
 +++ server/xmcp.c	2008-08-31 02:27:16.000000000 -0400
diff --git a/x11/xmx/patches/patch-ea b/x11/xmx/patches/patch-ea
index 875ee9eda88..6bfc35720de 100644
--- a/x11/xmx/patches/patch-ea
+++ b/x11/xmx/patches/patch-ea
@@ -1,4 +1,6 @@
-$NetBSD: patch-ea,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ea,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- clients/xmtg/xmtg.c~	1998-02-12 23:28:47.000000000 -0500
 +++ clients/xmtg/xmtg.c	2008-08-31 02:28:42.000000000 -0400
diff --git a/x11/xmx/patches/patch-eb b/x11/xmx/patches/patch-eb
index 1d8a4ca53ed..7af3dfab65c 100644
--- a/x11/xmx/patches/patch-eb
+++ b/x11/xmx/patches/patch-eb
@@ -1,4 +1,6 @@
-$NetBSD: patch-eb,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-eb,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- clients/xmtg/node.c~	1997-05-21 13:15:03.000000000 -0400
 +++ clients/xmtg/node.c	2008-08-31 02:30:34.000000000 -0400
diff --git a/x11/xmx/patches/patch-ec b/x11/xmx/patches/patch-ec
index c42ee5c52b1..6f272336acb 100644
--- a/x11/xmx/patches/patch-ec
+++ b/x11/xmx/patches/patch-ec
@@ -1,4 +1,6 @@
-$NetBSD: patch-ec,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ec,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- clients/xmtg/ig.c~	1998-04-01 19:19:37.000000000 -0500
 +++ clients/xmtg/ig.c	2008-08-31 02:31:03.000000000 -0400
diff --git a/x11/xmx/patches/patch-ed b/x11/xmx/patches/patch-ed
index 3eaa2f1c614..ab41ff01252 100644
--- a/x11/xmx/patches/patch-ed
+++ b/x11/xmx/patches/patch-ed
@@ -1,4 +1,6 @@
-$NetBSD: patch-ed,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ed,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- clients/xmtg/ui.c.orig	1998-04-01 18:55:00.000000000 -0500
 +++ clients/xmtg/ui.c	2008-08-31 02:40:34.000000000 -0400
diff --git a/x11/xmx/patches/patch-ee b/x11/xmx/patches/patch-ee
index 9b853a5b041..90160a98ba2 100644
--- a/x11/xmx/patches/patch-ee
+++ b/x11/xmx/patches/patch-ee
@@ -1,4 +1,6 @@
-$NetBSD: patch-ee,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ee,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- clients/xmtg/layout.c~	1998-04-01 18:56:29.000000000 -0500
 +++ clients/xmtg/layout.c	2008-08-31 02:34:22.000000000 -0400
diff --git a/x11/xmx/patches/patch-ef b/x11/xmx/patches/patch-ef
index 5dfdfc5c13f..fff8d95ace5 100644
--- a/x11/xmx/patches/patch-ef
+++ b/x11/xmx/patches/patch-ef
@@ -1,4 +1,6 @@
-$NetBSD: patch-ef,v 1.1 2008/08/31 06:52:29 dholland Exp $
+$NetBSD: patch-ef,v 1.2 2011/07/03 20:16:00 dholland Exp $
+
+- use modern C
 
 --- clients/xmxinit/xmxinit.c~	1995-04-19 23:05:04.000000000 -0400
 +++ clients/xmxinit/xmxinit.c	2008-08-31 02:38:46.000000000 -0400