Attachment 71161 Details for Bug 103706 – file.diff

[patch] file.diff

file.diff (text/plain), 5.97 KB, created by redchrom on 2006-09-27 06:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: redchrom

Created: 2006-09-27 06:50:16 UTC

Size: 5.97 KB

patch

obsolete

>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@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 @@
> 
> .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@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
>-@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
>--- musicpd.diff ends here ---

Actions: View | Diff

Attachments on bug 103706: 71160 | 71161