Update to version 0.11.1.

Changes include:
. Support for new update command
. Make add command more robust

6 files changed, 28 insertions, 30 deletions

diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
index 234c666ee54..74e9f7c21ee 100644
--- a/audio/mpc/Makefile
+++ b/audio/mpc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2004/05/05 09:29:11 simonb Exp $
+# $NetBSD: Makefile,v 1.3 2004/06/29 08:26:38 simonb Exp $
 
-DISTNAME=		mpc-0.10.3
+DISTNAME=		mpc-0.11.1
 CATEGORIES=		audio
 MASTER_SITES=		http://mercury.chem.pitt.edu/~shank/
 
diff --git a/audio/mpc/PLIST b/audio/mpc/PLIST
index 582f88c650c..83be0c5ad91 100644
--- a/audio/mpc/PLIST
+++ b/audio/mpc/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/30 10:49:25 grant Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/06/29 08:26:38 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/pls-handler.sh
 @dirrm share/mpc
 @dirrm share/doc/mpc
diff --git a/audio/mpc/distinfo b/audio/mpc/distinfo
index 81279a225d8..757ef799a72 100644
--- a/audio/mpc/distinfo
+++ b/audio/mpc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/05/02 07:24:51 mrg Exp $
+$NetBSD: distinfo,v 1.3 2004/06/29 08:26:38 simonb Exp $
 
-SHA1 (mpc-0.10.3.tar.gz) = 377ea125332c27b2ba18cb22889a6a8809b2efcd
-Size (mpc-0.10.3.tar.gz) = 209661 bytes
-SHA1 (patch-aa) = 2df86841103b59e3c9c48750c895cc73ad05ae14
-SHA1 (patch-ab) = 5a8c0d963f35d1963a13d5c5354dffe4c6214e8e
-SHA1 (patch-ac) = d2492ba406a7202df2d0157f3ee728ca1bc2cc95
+SHA1 (mpc-0.11.1.tar.gz) = 0a27bfb6f33ff3b7eb84d6f30adb8139d3afd8ab
+Size (mpc-0.11.1.tar.gz) = 163527 bytes
+SHA1 (patch-aa) = be4f429fb1bb9e5ffce82958355c0b91a01ba892
+SHA1 (patch-ab) = 529d0c7086e882f047bb6dd095763976f74538aa
+SHA1 (patch-ac) = 620b1626fe6c6ff46a4e3f9a8f6731294ee0be8b
diff --git a/audio/mpc/patches/patch-aa b/audio/mpc/patches/patch-aa
index 5e44ce84c78..63d6c66bd4f 100644
--- a/audio/mpc/patches/patch-aa
+++ b/audio/mpc/patches/patch-aa
@@ -1,23 +1,21 @@
-$NetBSD: patch-aa,v 1.1 2004/05/02 07:24:52 mrg Exp $
+$NetBSD: patch-aa,v 1.2 2004/06/29 08:26:38 simonb Exp $
 
-diff -ru src/command.c mpc-0.10.3.orig/src/command.c
---- src/command.c	2004-03-20 10:40:02.000000000 +1100
-+++ src/command.c	2004-05-02 16:49:23.000000000 +1000
-@@ -228,6 +228,17 @@
+--- 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 = mpd_getStatus(conn);
++	mpd_Status * status = getStatus(conn);
 +
-+	if(status->state==MPD_STATUS_STATE_PLAY ||
-+	   status->state==MPD_STATUS_STATE_PAUSE)
++	if(status->state==MPD_STATUS_STATE_PLAY)
 +		return cmd_pause(argc,argv,conn);
 +	else
 +		return cmd_play(argc,argv,conn);
 +}
 +
- enum SeekMode { RelForward, RelBackward, Absolute };
- 
- 	static int calculate_seek(int current_time, int change, int mode) {
+ /* TODO: absolute seek times (normalperson) */
+ int cmd_seek ( int argc, char ** argv, mpd_Connection * conn )
+ {
diff --git a/audio/mpc/patches/patch-ab b/audio/mpc/patches/patch-ab
index 5cdc7201685..71a9ac7deb7 100644
--- a/audio/mpc/patches/patch-ab
+++ b/audio/mpc/patches/patch-ab
@@ -1,9 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2004/05/02 07:24:52 mrg Exp $
+$NetBSD: patch-ab,v 1.2 2004/06/29 08:26:38 simonb Exp $
 
-diff -ru src/command.h mpc-0.10.3.orig/src/command.h
---- src/command.h	2004-03-20 10:40:02.000000000 +1100
-+++ src/command.h	2004-05-02 16:42:18.000000000 +1000
-@@ -26,6 +26,7 @@
+--- 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 );
diff --git a/audio/mpc/patches/patch-ac b/audio/mpc/patches/patch-ac
index 94548afe92d..3316a111198 100644
--- a/audio/mpc/patches/patch-ac
+++ b/audio/mpc/patches/patch-ac
@@ -1,9 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2004/05/02 07:24:52 mrg Exp $
+$NetBSD: patch-ac,v 1.2 2004/06/29 08:26:38 simonb Exp $
 
-diff -ru src/main.c mpc-0.10.3.orig/src/main.c
---- src/main.c	2004-03-20 10:44:14.000000000 +1100
-+++ src/main.c	2004-05-02 16:42:03.000000000 +1000
-@@ -51,6 +51,7 @@
+--- 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"},