6 files changed, 94 insertions, 7 deletions

diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
index 9ced32d841b0..f0f0155f409f 100644
--- a/audio/mpc/Makefile
+++ b/audio/mpc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mpc
-PORTVERSION=	0.9.1
+PORTVERSION=	0.10.0
 CATEGORIES=	audio ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	musicpd
@@ -15,6 +15,7 @@ MAINTAINER=	ports@mark.reidel.info
 COMMENT=	Command line client for the musicpd
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 
diff --git a/audio/mpc/distinfo b/audio/mpc/distinfo
index 29ba8ad59823..304881173d59 100644
--- a/audio/mpc/distinfo
+++ b/audio/mpc/distinfo
@@ -1 +1,2 @@
-MD5 (mpc-0.9.1.tar.gz) = 026ad0e69b06600825de9e5e8954c0a3
+MD5 (mpc-0.10.0.tar.gz) = 59e9d1af5644140857132e6b9ebad57e
+SIZE (mpc-0.10.0.tar.gz) = 212562
diff --git a/audio/mpc/files/patch-Makefile.in b/audio/mpc/files/patch-Makefile.in
new file mode 100644
index 000000000000..09814ebead1b
--- /dev/null
+++ b/audio/mpc/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed Mar  3 21:42:59 2004
++++ Makefile.in	Wed Mar  3 21:43:15 2004
+@@ -503,7 +503,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-docDATA install-pkgdataDATA
++install-data-am: install-docDATA
+ 
+ install-exec-am:
+ 
diff --git a/audio/mpc/files/patch-doc::Makefile.in b/audio/mpc/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..fa4d5da4d86f
--- /dev/null
+++ b/audio/mpc/files/patch-doc::Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Wed Mar  3 21:44:47 2004
++++ doc/Makefile.in	Wed Mar  3 21:45:03 2004
+@@ -318,7 +318,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-docDATA install-man install-pkgdataDATA
++install-data-am: install-docDATA install-man
+ 
+ install-exec-am:
+ 
diff --git a/audio/mpc/files/patch-src-command.c b/audio/mpc/files/patch-src-command.c
new file mode 100644
index 000000000000..ab747925c623
--- /dev/null
+++ b/audio/mpc/files/patch-src-command.c
@@ -0,0 +1,64 @@
+--- src/command.c	Wed Mar  3 19:05:02 2004
++++ src/command.c	Wed Mar  3 19:05:47 2004
+@@ -243,16 +243,23 @@
+ int cmd_seek ( int argc, char ** argv, mpd_Connection * conn )
+ {
+ 	mpd_Status * status = mpd_getStatus(conn);
++	char * arg = argv[0];
++	int seekmode;
++	char * test;
++	int seekchange;
++	char * last_char;
++	int sec;
++	float perc;
++	int seekto;
++
+ 	my_finishCommand(conn);
+ 	if(status->state==MPD_STATUS_STATE_STOP)
+ 		DIE("not currently playing\n");
+ 
+-	char * arg = argv[0];
+-
+ 	if(!strlen(arg))
+ 		DIE("\"%s\" is not a positive number\n", arg);
+ 
+-	int seekmode = Absolute;
++	seekmode = Absolute;
+ 
+ 	if(arg[0] == '+') {
+ 		seekmode = RelForward;
+@@ -262,15 +269,13 @@
+ 		arg++;
+ 	}
+ 
+-	char * test;
+-	int seekchange;
+ 
+-	char * last_char = &arg[strlen(arg)-1];
++	last_char = &arg[strlen(arg)-1];
+ 	if(*last_char == 's') {
+ 		/* absolute seek (in seconds) */
+ 
+ 		*last_char = '\0'; /* chop off the s */
+-		int sec = strtol(arg,&test,10); /* get the # of seconds */
++		sec = strtol(arg,&test,10); /* get the # of seconds */
+ 
+ 		if(*test!='\0' || sec<0)
+ 			DIE("\"%s\" is not a positive number\n", arg);
+@@ -280,14 +285,14 @@
+ 	} else {
+ 		/* percent seek */
+ 
+-		float perc = strtod(arg,&test);
++		perc = strtod(arg,&test);
+ 		if(*test!='\0' || perc<0 || perc>100)
+ 			DIE("\"%s\" is not an number between 0 and 100\n",arg);
+ 
+ 		seekchange = perc*status->totalTime/100+0.5;
+ 	}
+ 
+-	int seekto = calculate_seek(status->elapsedTime, seekchange, seekmode);
++	seekto = calculate_seek(status->elapsedTime, seekchange, seekmode);
+ 
+ 	if(seekto > status->totalTime)
+ 		DIE("seek amount would seek past the end of the song\n");
diff --git a/audio/mpc/pkg-plist b/audio/mpc/pkg-plist
index 1408a895130e..877011592206 100644
--- a/audio/mpc/pkg-plist
+++ b/audio/mpc/pkg-plist
@@ -1,6 +1,5 @@
 bin/mpc
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/mpc-bashrc
-@dirrm %%DOCSDIR%%
-@dirrm share/mpc
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/mpc-bashrc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%