- update mpc to 0.19

from oga@ via tobias ulmer (MAINTAINER)

audio/mpc/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2009/04/02 05:18:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2010/05/26 13:59:37 jasper Exp $
 
 COMMENT=		command line client for mpd
 
-DISTNAME=		mpc-0.12.1
-PKGNAME=		${DISTNAME}p0
+DISTNAME=		mpc-0.19
 CATEGORIES=		audio
 
-HOMEPAGE=		http://www.musicpd.org/mpc.shtml
+HOMEPAGE=		http://mpd.wikia.com/wiki/Client:Mpc
 
 MAINTAINER=		Tobias Ulmer <tobiasu@tmux.org>
 
@@ -17,18 +16,24 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=		c
+LIB_DEPENDS=		mpdclient::audio/libmpdclient
 
-MASTER_SITES=		http://www.musicpd.org/uploads/files/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 MODULES=		converters/libiconv
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--with-iconv=${LOCALBASE}
+CONFIGURE_ARGS=		ac_cv_func_iconv=yes
+CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib -liconv"
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpc
-	${INSTALL_SCRIPT} ${WRKSRC}/doc/m3u-handler.sh \
-		${WRKSRC}/doc/pls-handler.sh ${PREFIX}/share/examples/mpc
-	${INSTALL_DATA} ${WRKSRC}/doc/mpc-bashrc ${PREFIX}/share/examples/mpc
+	${INSTALL_SCRIPT} \
+		${WRKSRC}/doc/mpd-m3u-handler.sh \
+		${WRKSRC}/doc/mpd-pls-handler.sh \
+		${WRKSRC}/doc/mppledit \
+		${PREFIX}/share/examples/mpc
+	${INSTALL_DATA} ${WRKSRC}/doc/mpc-completion.bash \
+		${PREFIX}/share/examples/mpc
 
 .include <bsd.port.mk>

audio/mpc/distinfo

@@ -1,5 +1,5 @@
-MD5 (mpc-0.12.1.tar.gz) = C+jMm6KC9GdjHuCxuKDElA==
-RMD160 (mpc-0.12.1.tar.gz) = NQs+X7oXjakP8XqJQ+TS0Aki1dg=
-SHA1 (mpc-0.12.1.tar.gz) = IJluzrvbMfZiUw5/XdhLvz7a40g=
-SHA256 (mpc-0.12.1.tar.gz) = kxfwQMcajQ1WXjP72EAOoPGVCqZqKXvvMyy6qYMM3gU=
-SIZE (mpc-0.12.1.tar.gz) = 113341
+MD5 (mpc-0.19.tar.gz) = CK9Fmhg4jDXdgd6PnxU0yQ==
+RMD160 (mpc-0.19.tar.gz) = rIkd9Hxr3j2pUrIERfWfY+wcIM4=
+SHA1 (mpc-0.19.tar.gz) = XYkvMpJsux/2FcIMiz+/iUOlmZc=
+SHA256 (mpc-0.19.tar.gz) = nVGvnNz31olFEgkWX5VWUztBDjT2iClyR7lNf6cO3kM=
+SIZE (mpc-0.19.tar.gz) = 117232

audio/mpc/patches/patch-Makefile_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2010/05/26 13:59:37 jasper Exp $
+--- Makefile.in.orig	Sat May 22 00:39:05 2010
++++ Makefile.in	Sat May 22 00:39:32 2010
+@@ -218,9 +218,7 @@ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2
+ man_MANS = doc/mpc.1
+-doc_DATA = AUTHORS COPYING NEWS README \
+-	doc/mpd-m3u-handler.sh doc/mpd-pls-handler.sh doc/mppledit \
+-	doc/mpc-completion.bash
++doc_DATA = AUTHORS COPYING NEWS README
+ 
+ EXTRA_DIST = $(man_MANS) $(doc_DATA)
+ src_mpc_headers = \

audio/mpc/patches/patch-doc_Makefile_in

@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Wed Mar 21 19:22:57 2007
-+++ doc/Makefile.in	Sat May 26 15:59:01 2007
-@@ -79,7 +79,7 @@ install_sh = @install_sh@
- man_MANS = mpc.1
- pkgdata_DATA = 
- docdir = $(prefix)/share/doc/$(PACKAGE)
--doc_DATA = mpc-bashrc m3u-handler.sh pls-handler.sh mppledit
-+#doc_DATA = mpc-bashrc m3u-handler.sh pls-handler.sh mppledit
- EXTRA_DIST = $(pkgdata_DATA) $(man_MANS) $(doc_DATA)
- subdir = doc
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

audio/mpc/patches/patch-src_command_c

@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_command_c,v 1.3 2009/04/02 05:18:15 jasper Exp $
-
-Fix compilation with GCC2.
-
---- src/command.c.orig	Tue Mar 31 15:19:10 2009
-+++ src/command.c	Tue Mar 31 15:21:48 2009
-@@ -362,6 +362,7 @@ int cmd_play ( int argc, char ** argv, mpd_Connection 
- {
- 	int song;
- 	int i;
-+	mpd_Status *status;
- 
- 	if(0==argc) song = MPD_PLAY_AT_BEGINNING;
- 	else {
-@@ -374,7 +375,7 @@ int cmd_play ( int argc, char ** argv, mpd_Connection 
- 		song--;
- 
- 		/* This is necessary, otherwise mpc will output the wrong playlist number */
--		mpd_Status * status = getStatus(conn);
-+		status = getStatus(conn);
- 		i = status->playlistLength;
- 		mpd_freeStatus(status);
- 		if(song >= i)

audio/mpc/pkg/PLIST

@@ -1,11 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/05/23 14:26:41 bernd Exp $
-bin/mpc
+@comment $OpenBSD: PLIST,v 1.2 2010/05/26 13:59:38 jasper Exp $
+@bin bin/mpc
 @man man/man1/mpc.1
 share/doc/mpc/
 share/doc/mpc/AUTHORS
+share/doc/mpc/COPYING
+share/doc/mpc/NEWS
 share/doc/mpc/README
 share/examples/mpc/
-share/examples/mpc/m3u-handler.sh
-share/examples/mpc/mpc-bashrc
-share/examples/mpc/pls-handler.sh
 @comment share/mpc/
+share/examples/mpc/mpc-completion.bash
+share/examples/mpc/mpd-m3u-handler.sh
+share/examples/mpc/mpd-pls-handler.sh
+share/examples/mpc/mppledit