Skip site navigation (1)Skip section navigation (2)
Date:      10 Apr 2004 22:58:49 -0000
From:      Mark Daniel Reidel <ports@mark.reidel.info>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/65417: [MAINTAINER] audio/musicpd: update to 0.10.3
Message-ID:  <20040410225849.68686.qmail@karm.dyndns.org>
Resent-Message-ID: <200404102300.i3AN0WpX001005@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         65417
>Category:       ports
>Synopsis:       [MAINTAINER] audio/musicpd: update to 0.10.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 10 16:00:32 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Mark Daniel Reidel
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD alu.reidel.info 5.2-CURRENT FreeBSD 5.2-CURRENT #10: Fri Mar  5 17:22:58 CET
>Description:
- Update to 0.10.3
- iconv didn't work in 0.10.2, fixed in this release
- Some people reported startup-scripts under 5-CURRENT were not working because they lack the .sh suffix. Since I don't remember what made me ommit the .sh suffix, all versions do now have one.
- traymp is not the only client available. pkg-message now mentions mpc, kmp and traymp
>How-To-Repeat:
>Fix:

--- musicpd-0.10.3.patch begins here ---
diff -ruN --exclude=CVS /tmp/portbk/audio/musicpd/Makefile /usr/ports/audio/musicpd/Makefile
--- /tmp/portbk/audio/musicpd/Makefile	Sun Apr 11 00:53:19 2004
+++ /usr/ports/audio/musicpd/Makefile	Sun Apr 11 00:53:38 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	musicpd
-PORTVERSION=	0.10.2
+PORTVERSION=	0.10.3
 CATEGORIES=	audio ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -32,10 +32,8 @@
 
 .if ${OSVERSION} >= 500038
 RC_SUBR?=	${DESTDIR}/etc/rc.subr
-RC_SUFX=
 .else
 USE_RC_SUBR=	yes
-RC_SUFX=	.sh
 .endif
 
 #.if ${OSVERSION} < 500000
@@ -89,9 +87,7 @@
 
 SED_SCRIPT+=	-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-		-e 's,%%RC_SUFX%%,${RC_SUFX},g'
-PLIST_SUB+=	RC_SUFX=${RC_SUFX}
+		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
 
 post-build:
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/musicpd.sh >${WRKDIR}/musicpd.sh
@@ -101,7 +97,7 @@
 	${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/musicpd${RC_SUFX}
+	${INSTALL_SCRIPT} ${WRKDIR}/musicpd.sh ${PREFIX}/etc/rc.d/
 	${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 ${MAN1PREFIX}/man/man1/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -114,9 +110,9 @@
 	@${ECHO_CMD} -- IMPORTANT NOTICE ----------------------------------
 	@${ECHO_CMD} If you upgraded from a pre-0.10.0 release, you have to
 	@${ECHO_CMD} rebuild your index now by running
-	@${ECHO_CMD} ${PREFIX}/etc/rc.d/musicpd${RC_SUFX} stop
+	@${ECHO_CMD} ${PREFIX}/etc/rc.d/musicpd.sh stop
 	@${ECHO_CMD} ${PREFIX}/bin/mpd --create-db ${PREFIX}/etc/mpd.conf
-	@${ECHO_CMD} ${PREFIX}/etc/rc.d/musicpd${RC_SUFX} start
+	@${ECHO_CMD} ${PREFIX}/etc/rc.d/musicpd.sh start
 	@${ECHO_CMD} ------------------------------------------------------
 	@${ECHO_CMD}
 
diff -ruN --exclude=CVS /tmp/portbk/audio/musicpd/distinfo /usr/ports/audio/musicpd/distinfo
--- /tmp/portbk/audio/musicpd/distinfo	Sun Apr 11 00:53:18 2004
+++ /usr/ports/audio/musicpd/distinfo	Sun Apr 11 00:53:38 2004
@@ -1,2 +1,2 @@
-MD5 (mpd-0.10.2.tar.gz) = a8d7f7299fb367e4110c3b6c8c8f6887
-SIZE (mpd-0.10.2.tar.gz) = 815198
+MD5 (mpd-0.10.3.tar.gz) = cd16e7cba47ca743106ab10bbcf1f41d
+SIZE (mpd-0.10.3.tar.gz) = 815429
diff -ruN --exclude=CVS /tmp/portbk/audio/musicpd/pkg-message /usr/ports/audio/musicpd/pkg-message
--- /tmp/portbk/audio/musicpd/pkg-message	Sun Apr 11 00:53:18 2004
+++ /usr/ports/audio/musicpd/pkg-message	Sun Apr 11 00:53:38 2004
@@ -9,12 +9,12 @@
   musicpd_enable="YES"
 
 Then start the server with
-  %%PREFIX%%/etc/rc.d/musicpd%%RC_SUFX%% start
+  %%PREFIX%%/etc/rc.d/musicpd.sh start
 or reboot.
 
 NOTE: The musicpd server is pretty useless without a
-      client. You might want to install the traymp-port,
-      too.
+      client. You might want to install one of the following
+      ports, too: traymp, mpc or kmp.
 
 ************************************************************
 
diff -ruN --exclude=CVS /tmp/portbk/audio/musicpd/pkg-plist /usr/ports/audio/musicpd/pkg-plist
--- /tmp/portbk/audio/musicpd/pkg-plist	Sun Apr 11 00:53:18 2004
+++ /usr/ports/audio/musicpd/pkg-plist	Sun Apr 11 00:53:37 2004
@@ -1,9 +1,9 @@
 bin/mpd
-@unexec etc/rc.d/musicpd%%RC_SUFX%% stop 2>/dev/null || true
+@unexec etc/rc.d/musicpd.sh stop 2>/dev/null || true
 %%PORTDOCS%%%%DOCSDIR%%/COMMANDS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/mpd.conf
 @dirrm %%EXAMPLESDIR%%
-etc/rc.d/musicpd%%RC_SUFX%%
+etc/rc.d/musicpd.sh
--- musicpd-0.10.3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040410225849.68686.qmail>