Update to version 0.12.1. Notable changes are:

 - New output format for "mpc playlist"
 - Support for many more search types with "mpc search"
 - Add "mpc del 0" behaviour to remove the currently playing song
 - Add outputs, enable and disable commands
 - multiple bug fixes.

5 files changed, 20 insertions, 36 deletions

diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
index 62985b2adb1..04a12ffc27c 100644
--- a/audio/mpc/Makefile
+++ b/audio/mpc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 03:35:21 simonb Exp $
+# $NetBSD: Makefile,v 1.8 2007/08/09 04:03:57 simonb Exp $
 
-DISTNAME=		mpc-0.11.2
+DISTNAME=		mpc-0.12.1
 CATEGORIES=		audio
-MASTER_SITES=		http://mercury.chem.pitt.edu/~shank/
+MASTER_SITES=		http://www.musicpd.org/uploads/files/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		simonb@NetBSD.org
 HOMEPAGE=		http://musicpd.org/
diff --git a/audio/mpc/PLIST b/audio/mpc/PLIST
index 83be0c5ad91..df443944502 100644
--- a/audio/mpc/PLIST
+++ b/audio/mpc/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/29 08:26:38 simonb Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/08/09 04:03:57 simonb Exp $
 bin/mpc
 man/man1/mpc.1
 share/doc/mpc/AUTHORS
 share/doc/mpc/README
 share/doc/mpc/m3u-handler.sh
 share/doc/mpc/mpc-bashrc
+share/doc/mpc/mppledit
 share/doc/mpc/pls-handler.sh
 @dirrm share/mpc
 @dirrm share/doc/mpc
diff --git a/audio/mpc/distinfo b/audio/mpc/distinfo
index af621055721..0ef0a400b5b 100644
--- a/audio/mpc/distinfo
+++ b/audio/mpc/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/06/14 01:34:54 kristerw Exp $
+$NetBSD: distinfo,v 1.7 2007/08/09 04:03:57 simonb Exp $
 
-SHA1 (mpc-0.11.2.tar.gz) = b318ffdf4d27c14f761070b83dec3a3433612586
-RMD160 (mpc-0.11.2.tar.gz) = 823eca5e82fb4b2f4d219d70b176673575576a14
-Size (mpc-0.11.2.tar.gz) = 103483 bytes
-SHA1 (patch-aa) = c013d21aae786eb2aa2c562f29d9e5a84150995f
-SHA1 (patch-ab) = 9fd058c97c37fac4de1189efe3ba365a1a94ffba
+SHA1 (mpc-0.12.1.tar.bz2) = 08aa44b5e72331e3ffeba558be77c80a41cd046e
+RMD160 (mpc-0.12.1.tar.bz2) = a9973450abd4f7937f327f068c8dee70ba7a6b7a
+Size (mpc-0.12.1.tar.bz2) = 93293 bytes
+SHA1 (patch-aa) = 1b6d858d4124ce717fc412716c01667e2178da31
diff --git a/audio/mpc/patches/patch-aa b/audio/mpc/patches/patch-aa
index 49b30bf0656..a4997fbcda6 100644
--- a/audio/mpc/patches/patch-aa
+++ b/audio/mpc/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2005/06/01 03:35:21 simonb Exp $
+$NetBSD: patch-aa,v 1.4 2007/08/09 04:03:58 simonb Exp $
 
---- src/main.c.orig	2005-03-11 09:04:35.000000000 +0000
+--- src/main.c.orig	2007-03-22 05:22:41.000000000 +1100
 +++ src/main.c
 @@ -57,6 +57,7 @@ struct _mpc_table {
- 	{"prev", 0, 0, 0, cmd_prev,"","Play the previous song in the current playlist"},
- 	{"pause", 0, 0, 0, cmd_pause, "", "Pauses the currently playing song"},
- 	{"toggle", 0, 0, 0, cmd_toggle, "", "Toggles Play/Pause, plays if stopped"},
-+        {"playpause", 0, 0, 0, cmd_toggle, "", "Pauses if playing, play otherwise"},
- 	{"stop", 0, 0, 0, cmd_stop,"", "Stop the currently playing playlists"},
- 	{"seek", 1, 1, 0, cmd_seek,"[+-][HH:MM:SS] or <0-100>%","Seeks to the specified position"},
- 	{"clear", 0, 0, 0, cmd_clear,"", "Clear the current playlist"},
+ 	{"prev",        0,   0,   0,    cmd_prev,        "", "Play the previous song in the current playlist"},
+ 	{"pause",       0,   0,   0,    cmd_pause,       "", "Pauses the currently playing song"},
+ 	{"toggle",      0,   0,   0,    cmd_toggle,      "", "Toggles Play/Pause, plays if stopped"},
++	{"playpause",   0,   0,   0,    cmd_toggle,      "", "Pauses if playing, play otherwise"},
+ 	{"stop",        0,   0,   0,    cmd_stop,        "", "Stop the currently playing playlists"},
+ 	{"seek",        1,   1,   0,    cmd_seek,        "[+-][HH:MM:SS]|<0-100>%", "Seeks to the specified position"},
+ 	{"clear",       0,   0,   0,    cmd_clear,       "", "Clear the current playlist"},
diff --git a/audio/mpc/patches/patch-ab b/audio/mpc/patches/patch-ab
deleted file mode 100644
index abb385873b7..00000000000
--- a/audio/mpc/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/06/14 01:34:54 kristerw Exp $
-
---- src/command.c.orig	Tue Jun 14 03:30:30 2005
-+++ src/command.c	Tue Jun 14 03:32:26 2005
-@@ -183,10 +183,11 @@
- int cmd_crop( int argc, char ** argv, mpd_Connection * conn )
- {
- 
-+	int length;
- 	mpd_Status *status;
- 	status = getStatus( conn );
- 
--	int length = ( status->playlistLength - 1 );
-+	length = ( status->playlistLength - 1 );
- 
- 	if( status->playlistLength == 0 ) {
-