- Update to 0.12.0

PR:		ports/103706
Submitted by:	Stepan Zastupov (redchrom@gmail.com)
Approved by:	Maintainer in private mail

11 files changed, 55 insertions, 114 deletions

diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
index abda9cc3ac7f..9e9c9dfe1214 100644
--- a/audio/mpc/Makefile
+++ b/audio/mpc/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	mpc
-PORTVERSION=	0.11.2
+PORTVERSION=	0.12.0
 CATEGORIES=	audio ipv6
-MASTER_SITES=	http://mercury.chem.pitt.edu/~shank/
+MASTER_SITES=	http://musicpd.org/uploads/files/
 
 MAINTAINER=	ports@mark.reidel.info
 COMMENT=	Command line client for the musicpd
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 OPTIONS=	ICONV "Support for international characters" on \
 
diff --git a/audio/mpc/distinfo b/audio/mpc/distinfo
index bb00706d45b4..f6c1115de2bb 100644
--- a/audio/mpc/distinfo
+++ b/audio/mpc/distinfo
@@ -1,3 +1,3 @@
-MD5 (mpc-0.11.2.tar.gz) = c8411da7936662312cf9483f3490e285
-SHA256 (mpc-0.11.2.tar.gz) = 1c35520f74ec932e8635896eca747925624574550813bcf71d1d77826385b633
-SIZE (mpc-0.11.2.tar.gz) = 103483
+MD5 (mpc-0.12.0.tar.bz2) = 9ec03c5f3d136a9a58ef665dfb100e52
+SHA256 (mpc-0.12.0.tar.bz2) = 55bdff5fefa619682c4da7cf25c8e1281f21f405e98580b24d3cfb7ff781a87d
+SIZE (mpc-0.12.0.tar.bz2) = 87904
diff --git a/audio/mpc/files/patch-Makefile.in b/audio/mpc/files/patch-Makefile.in
deleted file mode 100644
index 09814ebead1b..000000000000
--- a/audio/mpc/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index fa4d5da4d86f..000000000000
--- a/audio/mpc/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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--gcc295 b/audio/mpc/files/patch-src-command.c--gcc295
deleted file mode 100644
index 4f1296b82cfc..000000000000
--- a/audio/mpc/files/patch-src-command.c--gcc295
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/command.c	Sat Mar 12 22:32:11 2005
-+++ src/command.c	Sat Mar 12 22:32:43 2005
-@@ -183,10 +183,12 @@
- 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 ) {
- 
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index f51407af9b2b..237e14d2ffeb 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	musicpd
-PORTVERSION=	0.11.5
-PORTREVISION=	2
+PORTVERSION=	0.12.0
 CATEGORIES=	audio ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://musicpd.org/uploads/files/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	mpd-${PORTVERSION}
 
-MAINTAINER=	ports@mark.reidel.info
+MAINTAINER=	redchrom@gmail.com
 COMMENT=	A remote-controllable music-daemon
 
-LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao \
-		mad.2:${PORTSDIR}/audio/mad
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_RC_SUBR=	musicpd.sh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 OPTIONS=	FLAC "Support for FLAC Audio" on \
@@ -33,12 +33,6 @@ OPTIONS=	FLAC "Support for FLAC Audio" on \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500038
-RC_SUBR?=	${DESTDIR}/etc/rc.subr
-.else
-USE_RC_SUBR=	yes
-.endif
-
 .ifdef(WITHOUT_FLAC)
 CONFIGURE_ARGS+=--disable-flac
 .else
@@ -89,29 +83,20 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CFLAGS+=	-I${PREFIX}/include
 
 MAN1=		mpd.1
+MAN5=		mpd.conf.5
 
-DOCS=		README \
-		UPGRADING \
-		doc/COMMANDS
+DOCSDIR=	${PREFIX}/share/doc/mpd
+DOCS=	COMMANDS \
+		mpdconf.example \
+		README \
+		UPGRADING
 
-SED_SCRIPT+=	-e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
+SED_SCRIPT+=	-e 's,%%PREFIX%%,${PREFIX},g'
 
 post-build:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/musicpd.sh >${WRKDIR}/musicpd.sh
 	@${SED} ${SED_SCRIPT} ${MASTERDIR}/pkg-message >${PKGMESSAGE}
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/mpd ${PREFIX}/bin/
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${FILESDIR}/mpd.conf.sample ${EXAMPLESDIR}/mpd.conf
-	${INSTALL_SCRIPT} ${WRKDIR}/musicpd.sh ${PREFIX}/etc/rc.d/
-	${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 ${MAN1PREFIX}/man/man1/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
-.endif
+post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index b48786666cae..dcc3665d23cc 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,3 +1,3 @@
-MD5 (mpd-0.11.5.tar.gz) = 1a9a1a9d31f00a43838b3752024f7ebe
-SHA256 (mpd-0.11.5.tar.gz) = 30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
-SIZE (mpd-0.11.5.tar.gz) = 1127523
+MD5 (mpd-0.12.0.tar.bz2) = 4995b18764b4f92fad7bed9506635ec3
+SHA256 (mpd-0.12.0.tar.bz2) = 89a89a13c8d65d8488887d57cb4b87c6b0cb0d4d31e31cb836c73b1d45dbc5b1
+SIZE (mpd-0.12.0.tar.bz2) = 397497
diff --git a/audio/musicpd/files/mpd.conf.sample b/audio/musicpd/files/mpd.conf.sample
deleted file mode 100644
index e4902b777889..000000000000
--- a/audio/musicpd/files/mpd.conf.sample
+++ /dev/null
@@ -1,34 +0,0 @@
-# required
-port                   "2100"
-music_directory        "/mp3"
-playlist_directory     "/mp3"
-log_file               "/var/log/mpd.log"
-error_file             "/var/log/mpd.error"
-
-# optional
-max_connections        "5"
-max_command_list_size  "2048"
-max_output_buffer_size "2048"
-connection_timeout     "60"
-db_file                "/mp3/.mpddb"
-state_file             "/mp3/.mpdstate"
-save_absolute_paths_in_playlists "no"
-
-max_playlist_length    "4096"
-buffer_before_play     "25%"
-bind_to_address	       "any"
-
-mixer_type             "oss"
-mixer_device           "/dev/mixer"
-
-ao_driver              "oss"
-ao_driver_options      "dsp=/dev/dsp"
-audio_write_size       "1024"
-
-#user                   "mp3"
-
-# log_level can be "default", "secure", "verbose"
-log_level              "default"
-#password               "password@read,add,control,admin"
-#default_permissions    "read,add,control,admin"
-#filesystem_charset     "UTF-8"
diff --git a/audio/musicpd/files/musicpd.sh.in b/audio/musicpd/files/musicpd.sh.in
new file mode 100644
index 000000000000..8b8a5f2d93d5
--- /dev/null
+++ b/audio/musicpd/files/musicpd.sh.in
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+
+# PROVIDE: musicpd
+# REQUIRE:
+# BEFORE:
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable mpd:
+#
+#musicpd_enable="YES"
+
+. %%RC_SUBR%%
+
+name=musicpd
+rcvar=`set_rcvar`
+
+config=%%PREFIX%%/etc/mpd.conf
+command=%%PREFIX%%/bin/mpd
+required_files=$config
+
+musicpd_flags="$musicpd_flags $config"
+
+[ -z "$musicpd_enable" ] && musicpd_enable="NO"
+[ -z "$musicpd_flags" ]  && musicpd_flags=
+
+load_rc_config $name
+
+run_rc_command "$1"
diff --git a/audio/musicpd/pkg-message b/audio/musicpd/pkg-message
index ecb40a4fecdf..180b55b43d7f 100644
--- a/audio/musicpd/pkg-message
+++ b/audio/musicpd/pkg-message
@@ -4,7 +4,7 @@ The musicpd package has been successfully installed.
 
 In order to run the MPD server, you need to create
   %%PREFIX%%/etc/mpd.conf out of
-  %%EXAMPLESDIR%%/mpd.conf
+  %%PREFIX%%/share/doc/mpd/mpdconf.example
 and add the following line to /etc/rc.conf:
   musicpd_enable="YES"
 
diff --git a/audio/musicpd/pkg-plist b/audio/musicpd/pkg-plist
index 600d12fd4f3d..360f781cac4f 100644
--- a/audio/musicpd/pkg-plist
+++ b/audio/musicpd/pkg-plist
@@ -1,9 +1,7 @@
 bin/mpd
-@unexec etc/rc.d/musicpd.sh stop 2>/dev/null || true
 %%PORTDOCS%%%%DOCSDIR%%/COMMANDS
+%%PORTDOCS%%%%DOCSDIR%%/mpdconf.example
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/mpd.conf
-@dirrm %%EXAMPLESDIR%%
-etc/rc.d/musicpd.sh
+%%PORTDOCS%%@unexec %D/%%DOCSDIR%% 2>/dev/null || true