ports/103706: audio/musicpd and audio/mpc up to 0.12.0
redchrom at gmail.com
redchrom at gmail.com
Wed Sep 27 05:50:18 UTC 2006
>Number: 103706
>Category: ports
>Synopsis: audio/musicpd and audio/mpc up to 0.12.0
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 27 05:50:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stepan Zastupov (RedChrom)
>Release: FreeBSD 6.1-STABLE i386
>Organization:
ISPSystem
>Environment:
System: FreeBSD death.ispvds.com 6.1-STABLE FreeBSD 6.1-STABLE #0: Fri Aug 25 05:29:26 CEST 2006 root at dione.ispsystem.net:/root/src/sys/i386/compile/ISPSYSTEM i386
>Description:
After two years new musicpd is released. libao no longer need, mpd support native audio output so the depedency removed.
Additional note about changed MAINTAINER:
Couple of months ago, ports at mark.reidel.info give me the maintainership of gmpc so I think he will not be against if I take the maintainership of this two ports.
>How-To-Repeat:
Apply two attached patches for musicpd and mpc
>Fix:
--- mpc.diff begins here ---
diff -urN mpc.orig/Makefile mpc/Makefile
--- mpc.orig/Makefile Wed Sep 27 14:28:35 2006
+++ mpc/Makefile Wed Sep 27 04:05:32 2006
@@ -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 at mark.reidel.info
+MAINTAINER= redchrom at gmail.com
COMMENT= Command line client for the musicpd
+USE_BZIP2= yes
GNU_CONFIGURE= yes
OPTIONS= ICONV "Support for international characters" on \
diff -urN mpc.orig/distinfo mpc/distinfo
--- mpc.orig/distinfo Wed Sep 27 14:28:35 2006
+++ mpc/distinfo Wed Sep 27 04:06:26 2006
@@ -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 -urN mpc.orig/files/patch-Makefile.in mpc/files/patch-Makefile.in
--- mpc.orig/files/patch-Makefile.in Wed Sep 27 14:28:35 2006
+++ mpc/files/patch-Makefile.in Thu Jan 1 08:00:00 1970
@@ -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 -urN mpc.orig/files/patch-doc::Makefile.in mpc/files/patch-doc::Makefile.in
--- mpc.orig/files/patch-doc::Makefile.in Wed Sep 27 14:28:35 2006
+++ mpc/files/patch-doc::Makefile.in Thu Jan 1 08:00:00 1970
@@ -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 -urN mpc.orig/files/patch-src-command.c--gcc295 mpc/files/patch-src-command.c--gcc295
--- mpc.orig/files/patch-src-command.c--gcc295 Wed Sep 27 14:28:35 2006
+++ mpc/files/patch-src-command.c--gcc295 Thu Jan 1 08:00:00 1970
@@ -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 ) {
-
--- mpc.diff ends here ---
--- musicpd.diff begins here ---
diff -urN musicpd.orig/Makefile musicpd/Makefile
--- musicpd.orig/Makefile Wed Sep 27 14:28:26 2006
+++ musicpd/Makefile Wed Sep 27 14:27:29 2006
@@ -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 at mark.reidel.info
+MAINTAINER= redchrom at 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 @@
.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 @@
CFLAGS+= -I${PREFIX}/include
MAN1= mpd.1
+MAN5= mpd.conf.5
-DOCS= README \
- UPGRADING \
- doc/COMMANDS
-
-SED_SCRIPT+= -e 's,%%PREFIX%%,${PREFIX},g' \
- -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
- -e 's,%%RC_SUBR%%,${RC_SUBR},g'
+DOCSDIR= ${PREFIX}/share/doc/mpd
+DOCS= COMMANDS \
+ mpdconf.example \
+ README \
+ UPGRADING
+
+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 -urN musicpd.orig/distinfo musicpd/distinfo
--- musicpd.orig/distinfo Wed Sep 27 14:28:26 2006
+++ musicpd/distinfo Wed Sep 27 04:06:49 2006
@@ -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 -urN musicpd.orig/files/mpd.conf.sample musicpd/files/mpd.conf.sample
--- musicpd.orig/files/mpd.conf.sample Wed Sep 27 14:28:26 2006
+++ musicpd/files/mpd.conf.sample Thu Jan 1 08:00:00 1970
@@ -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 at read,add,control,admin"
-#default_permissions "read,add,control,admin"
-#filesystem_charset "UTF-8"
diff -urN musicpd.orig/files/musicpd.sh musicpd/files/musicpd.sh
--- musicpd.orig/files/musicpd.sh Wed Sep 27 14:28:26 2006
+++ musicpd/files/musicpd.sh Thu Jan 1 08:00:00 1970
@@ -1,29 +0,0 @@
-#!/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 -urN musicpd.orig/files/musicpd.sh.in musicpd/files/musicpd.sh.in
--- musicpd.orig/files/musicpd.sh.in Thu Jan 1 08:00:00 1970
+++ musicpd/files/musicpd.sh.in Sat Sep 16 12:53:12 2006
@@ -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 -urN musicpd.orig/pkg-message musicpd/pkg-message
--- musicpd.orig/pkg-message Wed Sep 27 14:28:26 2006
+++ musicpd/pkg-message Sat Sep 16 12:53:12 2006
@@ -4,7 +4,7 @@
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 -urN musicpd.orig/pkg-plist musicpd/pkg-plist
--- musicpd.orig/pkg-plist Wed Sep 27 14:28:26 2006
+++ musicpd/pkg-plist Sat Sep 16 12:53:12 2006
@@ -1,9 +1,7 @@
bin/mpd
- at 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
- at dirrm %%EXAMPLESDIR%%
-etc/rc.d/musicpd.sh
+%%PORTDOCS%%@unexec %D/%%DOCSDIR%% 2>/dev/null || true
--- musicpd.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list