22 files changed, 89 insertions, 43 deletions
diff --git a/lang/mpd/distinfo b/lang/mpd/distinfo
index f13740123f4..24ab0f98f2e 100644
--- a/lang/mpd/distinfo
+++ b/lang/mpd/distinfo
@@ -1,30 +1,30 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 22:50:39 agc Exp $
+$NetBSD: distinfo,v 1.9 2015/12/29 23:34:52 dholland Exp $
 
 SHA1 (mpd-language/mpd.1.0.1.tgz) = 797b505935ccc741fdca6010bc0bd53601a6f262
 RMD160 (mpd-language/mpd.1.0.1.tgz) = 2862ae9220ec0a546ed4193aeee4dc8dc94610a2
 SHA512 (mpd-language/mpd.1.0.1.tgz) = bbd3d99161b6e041042c5fbef42fd14ca46e7ebec00f945ae1d0e4f752b02d03f89cddc9615367105331af496a9f0908e375fe7f7bda15eeb3287752c6e4b61b
 Size (mpd-language/mpd.1.0.1.tgz) = 581498 bytes
-SHA1 (patch-aa) = f3c3911afa2596e72d8e3056f93e5277cd41dabc
+SHA1 (patch-aa) = 357e7984045c995d3b1f4d26f571d2a7dd49072c
 SHA1 (patch-ab) = 2a086280fefb4acddd19cb3cbafd58f8de5b309e
-SHA1 (patch-ar) = 7b9c76e47a5f5900a2bfd6b9bb4b585dc10da562
-SHA1 (patch-as) = 510df56b50ee7c0ab1c64a24e6c9f97317541d3c
-SHA1 (patch-at) = 6f7be8ba344a1606663f7dfeefa73edd62380721
-SHA1 (patch-au) = f694bd75154de25247e9609dc954c9319ab32089
-SHA1 (patch-av) = b10aa333ecf77e29933256117a9c4d27792993bd
-SHA1 (patch-aw) = d0efc58da58fb601257d4c108f4acc50ae05cbf9
-SHA1 (patch-ax) = daa27e66622a693cf860e3fbf7569a9363a81354
-SHA1 (patch-ay) = 1621ca66dfbece6bc82fc709fd2c507abb64abae
-SHA1 (patch-az) = 1560c8ea0b760e2fb97385e565d87a49a879c6a2
-SHA1 (patch-ba) = 21de20ed7f9e064a988cf091253ae7a5ad962487
-SHA1 (patch-bb) = 6214584bde5a05386d0f31690b30a9c0a8c299af
-SHA1 (patch-bc) = be4f8c47486c5b6933494f4e92fd8c340425a167
-SHA1 (patch-bd) = 62556e84f29c32310d27cb105cc6de5b4fd5e817
-SHA1 (patch-be) = 85689a95f9311e3e70c0b4a532d57dae6b931b35
-SHA1 (patch-bf) = 20e66a54a51702ce229ef53e250c467d01e2d3b2
+SHA1 (patch-ar) = 2cb9c743870aa91edb77f83b4ce4c36424a6bb5b
+SHA1 (patch-as) = e3ec11eace9d11349077adcf4e5bb16ac6e3e1a4
+SHA1 (patch-at) = e96ef9ceee5edc32e33b6aa80b949e7ebd188b9a
+SHA1 (patch-au) = 7d2ebdef6c007a286b0dc0ab007039d4dbca67ed
+SHA1 (patch-av) = 49727b74c938e15d87447b4a7dcdc09840593351
+SHA1 (patch-aw) = b7849bfaa2bbdf218d09147ef0461e4fcbd7e7f6
+SHA1 (patch-ax) = 1ed20dc2f4f0fb086a267d60de85ef6c9f1629ee
+SHA1 (patch-ay) = 95899f31f799315051eb55386103b7139d0ccbdf
+SHA1 (patch-az) = 8745f03f02fcbb25d5091d26db9e79cf597473ad
+SHA1 (patch-ba) = ec9e792309db630620df1d421776bb585891f63e
+SHA1 (patch-bb) = 4c31e7a63568ef8cfa4340afaa0d924c7025e788
+SHA1 (patch-bc) = 8965dea6b574eb722797918e5610d2ce5eb46376
+SHA1 (patch-bd) = 71b4b1d2e03f0f061c2251783efcb67bca00e14e
+SHA1 (patch-be) = 678fc63f6111cd791b007dd775abf5fba097db7d
+SHA1 (patch-bf) = 3756ace67877c86dba14487124304b172e3f92a3
 SHA1 (patch-bg) = 231723cbc6b6baef132aefd450524942fb0108f2
-SHA1 (patch-bh) = c880064e871297a411e2292f78d82222bb46dac4
-SHA1 (patch-bi) = 31fc9eb664dd3e73c7fe12ae6e95fd85b67286fc
+SHA1 (patch-bh) = fda8b62fdc59953a358c37c723deb71c6c8f2221
+SHA1 (patch-bi) = 969a8e5f268e471bf479374e6441b6df76d4f9da
 SHA1 (patch-bj) = c5123801140fbfdcbfdabbcd39fe70d2e71355fc
-SHA1 (patch-bk) = ffbcc49346ea57a3fd0eed51d7bb00f80e25f3a5
-SHA1 (patch-bl) = 4739bac6eafea8946394b403081ab3e6612ab39d
-SHA1 (patch-bm) = 7e089cf0c69d758f3bcc12b93217554bd26da08c
+SHA1 (patch-bk) = b51a6e1ead24feee415dd875fb049b8071f7c229
+SHA1 (patch-bl) = 80f35b366bb6ccf9eaf07ae772a6406cac8b24b9
+SHA1 (patch-bm) = 3f5f3143451b8509b94188e5ce1c375f9bd2619f
diff --git a/lang/mpd/patches/patch-aa b/lang/mpd/patches/patch-aa
index ad20baff8ea..9b6a94d4f6c 100644
--- a/lang/mpd/patches/patch-aa
+++ b/lang/mpd/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
+$NetBSD: patch-aa,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Configure for pkgsrc.
 
 --- Configuration.orig	2004-01-20 23:13:18.000000000 +0100
 +++ Configuration
diff --git a/lang/mpd/patches/patch-ar b/lang/mpd/patches/patch-ar
index 1c4159a599f..907960f680f 100644
--- a/lang/mpd/patches/patch-ar
+++ b/lang/mpd/patches/patch-ar
@@ -1,4 +1,6 @@
-$NetBSD: patch-ar,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
+$NetBSD: patch-ar,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Remove trailing whitespace. (Really?)
 
 --- vsuite/quick/easy/Make.std.orig	1999-07-28 22:43:18.000000000 +0200
 +++ vsuite/quick/easy/Make.std
diff --git a/lang/mpd/patches/patch-as b/lang/mpd/patches/patch-as
index ba97f43987b..7aa6b55568f 100644
--- a/lang/mpd/patches/patch-as
+++ b/lang/mpd/patches/patch-as
@@ -1,4 +1,7 @@
-$NetBSD: patch-as,v 1.2 2010/03/03 13:31:53 is Exp $
+$NetBSD: patch-as,v 1.3 2015/12/29 23:34:52 dholland Exp $
+
+Build with optimization.
+DESTDIR support.
 
 --- Makefile.orig	2001-02-06 19:30:37.000000000 +0100
 +++ Makefile
diff --git a/lang/mpd/patches/patch-at b/lang/mpd/patches/patch-at
index 65f0ecf93ed..e8716cb8375 100644
--- a/lang/mpd/patches/patch-at
+++ b/lang/mpd/patches/patch-at
@@ -1,4 +1,9 @@
-$NetBSD: patch-at,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
+$NetBSD: patch-at,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Build with optimization.
+Hardwire asm.o to be built from the netbsd context switch code.
+Link in a static copy of libpthread.
+XXX: The logic here should probably be revisited.
 
 --- csw/Makefile.orig	1999-07-30 05:01:50.000000000 +0000
 +++ csw/Makefile
diff --git a/lang/mpd/patches/patch-au b/lang/mpd/patches/patch-au
index 9062b03b6cf..61ff4126ebf 100644
--- a/lang/mpd/patches/patch-au
+++ b/lang/mpd/patches/patch-au
@@ -1,4 +1,6 @@
-$NetBSD: patch-au,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
+$NetBSD: patch-au,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Context switch code for NetBSD.
 
 --- csw/netbsd.c.orig	2005-03-02 13:00:06.000000000 +0000
 +++ csw/netbsd.c
diff --git a/lang/mpd/patches/patch-av b/lang/mpd/patches/patch-av
index 6e1bda782dc..75ad13704fd 100644
--- a/lang/mpd/patches/patch-av
+++ b/lang/mpd/patches/patch-av
@@ -1,4 +1,6 @@
-$NetBSD: patch-av,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
+$NetBSD: patch-av,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Use standard headers.
 
 --- rts/net.c.orig	2005-03-01 16:25:59.000000000 +0000
 +++ rts/net.c
diff --git a/lang/mpd/patches/patch-aw b/lang/mpd/patches/patch-aw
index 8bd24847402..3c0965a23be 100644
--- a/lang/mpd/patches/patch-aw
+++ b/lang/mpd/patches/patch-aw
@@ -1,4 +1,6 @@
-$NetBSD: patch-aw,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
+$NetBSD: patch-aw,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Use standard headers.
 
 --- rts/mpdx.c.orig	2005-03-01 16:26:10.000000000 +0000
 +++ rts/mpdx.c
diff --git a/lang/mpd/patches/patch-ax b/lang/mpd/patches/patch-ax
index b8309f55cb1..bda997f117e 100644
--- a/lang/mpd/patches/patch-ax
+++ b/lang/mpd/patches/patch-ax
@@ -1,4 +1,6 @@
-$NetBSD: patch-ax,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
+$NetBSD: patch-ax,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Use standard headers.
 
 --- mpdm/filter.c.orig	2005-03-01 16:26:14.000000000 +0000
 +++ mpdm/filter.c
diff --git a/lang/mpd/patches/patch-ay b/lang/mpd/patches/patch-ay
index 559d59a2aea..8a02372f7d3 100644
--- a/lang/mpd/patches/patch-ay
+++ b/lang/mpd/patches/patch-ay
@@ -1,4 +1,6 @@
-$NetBSD: patch-ay,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
+$NetBSD: patch-ay,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Use standard headers.
 
 --- util.c.orig	2000-10-31 23:53:40.000000000 +0100
 +++ util.c
diff --git a/lang/mpd/patches/patch-az b/lang/mpd/patches/patch-az
index 5203e64806e..f696f4c1676 100644
--- a/lang/mpd/patches/patch-az
+++ b/lang/mpd/patches/patch-az
@@ -1,4 +1,6 @@
-$NetBSD: patch-az,v 1.1 2005/10/17 19:45:18 is Exp $
+$NetBSD: patch-az,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Print pointers properly.
 
 --- csw/cstest.c.orig	1999-07-28 20:42:21.000000000 +0000
 +++ csw/cstest.c
diff --git a/lang/mpd/patches/patch-ba b/lang/mpd/patches/patch-ba
index 9c9dab53629..29b059c8b64 100644
--- a/lang/mpd/patches/patch-ba
+++ b/lang/mpd/patches/patch-ba
@@ -1,4 +1,6 @@
-$NetBSD: patch-ba,v 1.1 2005/10/17 19:45:18 is Exp $
+$NetBSD: patch-ba,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Use intptr_t instead of int for pointer-sized ints.
 
 --- rts/misc.c.orig	2005-03-02 13:56:52.000000000 +0000
 +++ rts/misc.c
diff --git a/lang/mpd/patches/patch-bb b/lang/mpd/patches/patch-bb
index 770665c1fe5..9e65bc346ac 100644
--- a/lang/mpd/patches/patch-bb
+++ b/lang/mpd/patches/patch-bb
@@ -1,4 +1,6 @@
-$NetBSD: patch-bb,v 1.1 2005/10/17 19:45:18 is Exp $
+$NetBSD: patch-bb,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Use socklen_t.
 
 --- rts/socket.c.orig	2005-03-02 14:17:00.000000000 +0000
 +++ rts/socket.c
diff --git a/lang/mpd/patches/patch-bc b/lang/mpd/patches/patch-bc
index 819cb6d4252..b65cffa20ca 100644
--- a/lang/mpd/patches/patch-bc
+++ b/lang/mpd/patches/patch-bc
@@ -1,4 +1,6 @@
-$NetBSD: patch-bc,v 1.1 2005/10/17 19:45:18 is Exp $
+$NetBSD: patch-bc,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Use ungetc() correctly.
 
 --- rts/scan.c.orig	2003-11-21 21:00:01.000000000 +0100
 +++ rts/scan.c
diff --git a/lang/mpd/patches/patch-bd b/lang/mpd/patches/patch-bd
index b39cbf50627..ecdff0fc23d 100644
--- a/lang/mpd/patches/patch-bd
+++ b/lang/mpd/patches/patch-bd
@@ -1,4 +1,6 @@
-$NetBSD: patch-bd,v 1.1 2005/10/17 20:18:34 is Exp $
+$NetBSD: patch-bd,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Test for patch-bg.
 
 --- vsuite/quick/ptrstr/No_input.std.orig	2005-03-11 09:46:24.000000000 +0100
 +++ vsuite/quick/ptrstr/No_input.std
diff --git a/lang/mpd/patches/patch-be b/lang/mpd/patches/patch-be
index f2bd04518be..863d5f6cdbf 100644
--- a/lang/mpd/patches/patch-be
+++ b/lang/mpd/patches/patch-be
@@ -1,4 +1,6 @@
-$NetBSD: patch-be,v 1.1 2005/10/17 20:18:34 is Exp $
+$NetBSD: patch-be,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Test for patch-bg.
 
 --- vsuite/quick/ptrstr/pointer.mpd.orig	2005-10-17 22:06:31.000000000 +0200
 +++ vsuite/quick/ptrstr/pointer.mpd
diff --git a/lang/mpd/patches/patch-bf b/lang/mpd/patches/patch-bf
index c33b4c70514..af500034a7b 100644
--- a/lang/mpd/patches/patch-bf
+++ b/lang/mpd/patches/patch-bf
@@ -1,4 +1,6 @@
-$NetBSD: patch-bf,v 1.1 2005/10/17 20:18:34 is Exp $
+$NetBSD: patch-bf,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Test for patch-bg.
 
 --- vsuite/quick/ptrstr/Script.orig	2005-03-11 09:46:25.000000000 +0100
 +++ vsuite/quick/ptrstr/Script
diff --git a/lang/mpd/patches/patch-bh b/lang/mpd/patches/patch-bh
index 593e5d3feb9..5ac2a0ec462 100644
--- a/lang/mpd/patches/patch-bh
+++ b/lang/mpd/patches/patch-bh
@@ -1,4 +1,6 @@
-$NetBSD: patch-bh,v 1.1 2005/10/17 20:18:34 is Exp $
+$NetBSD: patch-bh,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Add error declaration to support patch-bg.
 
 --- runerr.h.orig	2005-03-11 09:28:59.000000000 +0100
 +++ runerr.h
diff --git a/lang/mpd/patches/patch-bi b/lang/mpd/patches/patch-bi
index 4ef5f131eff..e5e3e9afaec 100644
--- a/lang/mpd/patches/patch-bi
+++ b/lang/mpd/patches/patch-bi
@@ -1,4 +1,6 @@
-$NetBSD: patch-bi,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
+$NetBSD: patch-bi,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Build with optimization.
 
 --- library/Makefile.orig	2000-10-31 23:53:41.000000000 +0100
 +++ library/Makefile
diff --git a/lang/mpd/patches/patch-bk b/lang/mpd/patches/patch-bk
index 0f8675727a5..b2c1d5376b5 100644
--- a/lang/mpd/patches/patch-bk
+++ b/lang/mpd/patches/patch-bk
@@ -1,4 +1,6 @@
-$NetBSD: patch-bk,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
+$NetBSD: patch-bk,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Avoid implicit int.
 
 --- util.h.orig	2000-10-31 23:53:40.000000000 +0100
 +++ util.h
diff --git a/lang/mpd/patches/patch-bl b/lang/mpd/patches/patch-bl
index c65e6eeb36a..e628617276c 100644
--- a/lang/mpd/patches/patch-bl
+++ b/lang/mpd/patches/patch-bl
@@ -1,4 +1,6 @@
-$NetBSD: patch-bl,v 1.1 2006/05/18 12:57:15 is Exp $
+$NetBSD: patch-bl,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+Fix the output formatting (for faster machines, I take it)
 
 --- vsuite/timings/report.sh.orig	2000-10-31 23:54:09.000000000 +0100
 +++ vsuite/timings/report.sh
diff --git a/lang/mpd/patches/patch-bm b/lang/mpd/patches/patch-bm
index c7b57ba1b7d..2b6c46ab2a2 100644
--- a/lang/mpd/patches/patch-bm
+++ b/lang/mpd/patches/patch-bm
@@ -1,4 +1,6 @@
-$NetBSD: patch-bm,v 1.1 2010/03/03 13:31:54 is Exp $
+$NetBSD: patch-bm,v 1.2 2015/12/29 23:34:52 dholland Exp $
+
+DESTDIR support.
 
 --- install.sh.orig	2000-10-31 23:53:40.000000000 +0100
 +++ install.sh