Update to version 0.11.2:

  New commands: crop, stats, toggle.
  Add relative and exact-time seeking.
  Fix a few bugs.
The new "toggle" command is the same as our existing patch for the
"playpause" command - we keep the "playpause" command as an alias
for "toggle".

5 files changed, 18 insertions, 54 deletions

diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
index 8bffaf80e19..62985b2adb1 100644
--- a/audio/mpc/Makefile
+++ b/audio/mpc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 03:35:21 simonb Exp $
 
-DISTNAME=		mpc-0.11.1
-PKGREVISION=	1
+DISTNAME=		mpc-0.11.2
 CATEGORIES=		audio
 MASTER_SITES=		http://mercury.chem.pitt.edu/~shank/
 
diff --git a/audio/mpc/distinfo b/audio/mpc/distinfo
index 4eedf248f0d..e5147da8617 100644
--- a/audio/mpc/distinfo
+++ b/audio/mpc/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:49 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/06/01 03:35:21 simonb Exp $
 
-SHA1 (mpc-0.11.1.tar.gz) = 0a27bfb6f33ff3b7eb84d6f30adb8139d3afd8ab
-RMD160 (mpc-0.11.1.tar.gz) = 7e9f44f29768e44ffa5ea6b7b9970404ec603433
-Size (mpc-0.11.1.tar.gz) = 163527 bytes
-SHA1 (patch-aa) = be4f429fb1bb9e5ffce82958355c0b91a01ba892
-SHA1 (patch-ab) = 529d0c7086e882f047bb6dd095763976f74538aa
-SHA1 (patch-ac) = 620b1626fe6c6ff46a4e3f9a8f6731294ee0be8b
+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
diff --git a/audio/mpc/patches/patch-aa b/audio/mpc/patches/patch-aa
index 63d6c66bd4f..49b30bf0656 100644
--- a/audio/mpc/patches/patch-aa
+++ b/audio/mpc/patches/patch-aa
@@ -1,21 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2004/06/29 08:26:38 simonb Exp $
+$NetBSD: patch-aa,v 1.3 2005/06/01 03:35:21 simonb Exp $
 
---- src/command.c.orig	2004-06-04 00:03:17.000000000 +1000
-+++ src/command.c
-@@ -245,6 +245,16 @@ int cmd_play ( int argc, char ** argv, m
- 	return 1;
- }
- 
-+int cmd_playpause ( int argc, char ** argv, mpd_Connection * conn )
-+{
-+	mpd_Status * status = getStatus(conn);
-+
-+	if(status->state==MPD_STATUS_STATE_PLAY)
-+		return cmd_pause(argc,argv,conn);
-+	else
-+		return cmd_play(argc,argv,conn);
-+}
-+
- /* TODO: absolute seek times (normalperson) */
- int cmd_seek ( int argc, char ** argv, mpd_Connection * conn )
- {
+--- src/main.c.orig	2005-03-11 09:04:35.000000000 +0000
++++ 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"},
diff --git a/audio/mpc/patches/patch-ab b/audio/mpc/patches/patch-ab
deleted file mode 100644
index 71a9ac7deb7..00000000000
--- a/audio/mpc/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/06/29 08:26:38 simonb Exp $
-
---- src/command.h.orig	2004-05-31 23:52:41.000000000 +1000
-+++ src/command.h
-@@ -26,6 +26,7 @@ int cmd_play ( int argc, char ** argv, m
- int cmd_next ( int argc, char ** argv, mpd_Connection * conn );
- int cmd_prev ( int argc, char ** argv, mpd_Connection * conn );
- int cmd_pause ( int argc, char ** argv, mpd_Connection * conn );
-+int cmd_playpause ( int argc, char ** argv, mpd_Connection * conn );
- int cmd_stop ( int argc, char ** argv, mpd_Connection * conn );
- int cmd_seek ( int argc, char ** argv, mpd_Connection * conn );
- int cmd_clear ( int argc, char ** argv, mpd_Connection * conn ) ;
diff --git a/audio/mpc/patches/patch-ac b/audio/mpc/patches/patch-ac
deleted file mode 100644
index 3316a111198..00000000000
--- a/audio/mpc/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/06/29 08:26:38 simonb Exp $
-
---- src/main.c.orig	2004-05-31 23:52:41.000000000 +1000
-+++ src/main.c
-@@ -51,6 +51,7 @@ struct _mpc_table {
- 	{"next", 0, 0, 0, cmd_next, "","Play the next song in 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"},
-+	{"playpause", 0, 0, 0, cmd_playpause, "", "Pauses if playing, play otherwise"},
- 	{"stop", 0, 0, 0, cmd_stop,"", "Stop the currently playing playlists"},
- 	{"seek", 1, 1, 0, cmd_seek,"<0-100>","Seeks to the position specified in percent"},
- 	{"clear", 0, 0, 0, cmd_clear,"", "Clear the current playlist"},