Date: 13 Oct 2003 21:40:16 -0000 From: Mark Daniel Reidel <ports@mark.reidel.info> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/57977: [MAINTAINER] audio/musicpd: update to 0.9.2 Message-ID: <20031013214016.50936.qmail@karm.dyndns.org> Resent-Message-ID: <200310132150.h9DLoJGP085161@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57977
>Category: ports
>Synopsis: [MAINTAINER] audio/musicpd: update to 0.9.2
>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: Mon Oct 13 14:50:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Mark Daniel Reidel
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD alu.reidel.info 5.1-CURRENT FreeBSD 5.1-CURRENT #3: Wed Oct 1 09:36:28 CEST
>Description:
- Update to 0.9.2
- Support for NOPORTDOCS
- Support for EXMAPLESDIR
- Cleanup of the Makefile
Generated with FreeBSD Port Tools 0.26
>How-To-Repeat:
>Fix:
--- musicpd-0.9.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/musicpd/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 8 Oct 2003 10:41:32 -0000 1.1
+++ Makefile 13 Oct 2003 21:34:42 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= musicpd
-PORTVERSION= 0.9.1
+PORTVERSION= 0.9.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,19 +18,17 @@
LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao \
mad.1:${PORTSDIR}/audio/mad
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500038
-RC_SUBR?= ${DESTDIR}/etc/rc.subr
-RC_DIR= ${DESTDIR}/etc/rc.d
+RC_SUBR?= ${DESTDIR}/etc/rc.subr
RC_SUFX=
.else
-USE_RC_SUBR= yes
-RC_DIR= ${PREFIX}/etc/rc.d
-RC_SUFX= .sh
+USE_RC_SUBR= yes
+RC_SUFX= .sh
.endif
.ifdef(WITHOUT_FLAC)
@@ -45,34 +43,44 @@
LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
.endif
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CFLAGS+= -I${PREFIX}/include
MAN1= mpd.1
+DOCS= README \
+ UPGRADING \
+ doc/COMMANDS
+
SED_SCRIPT+= -e 's,%%PREFIX%%,${PREFIX},g' \
- -e 's,%%RC_DIR%%,${RC_DIR},g' \
+ -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-e 's,%%RC_SUFX%%,${RC_SUFX},g'
-PLIST_SUB+= RC_DIR=${RC_DIR} \
- RC_SUFX=${RC_SUFX}
+PLIST_SUB+= RC_SUFX=${RC_SUFX}
pre-everything::
- @${ECHO} "You can build ${PKGNAME} with the following options:"
- @${ECHO}
- @${ECHO} "WITHOUT_OGG Disable OGG-Vorbis-support"
- @${ECHO} "WITHOUT_FLAC Disable FLAC-support"
- @${ECHO}
+ @${ECHO_CMD} "You can build ${PKGNAME} with the following options:"
+ @${ECHO_CMD}
+ @${ECHO_CMD} "WITHOUT_OGG Disable OGG-Vorbis-support"
+ @${ECHO_CMD} "WITHOUT_FLAC Disable FLAC-support"
+ @${ECHO_CMD}
post-build:
@${SED} ${SED_SCRIPT} ${FILESDIR}/musicpd.sh >${WRKDIR}/musicpd.sh
@${SED} ${SED_SCRIPT} ${MASTERDIR}/pkg-message >${PKGMESSAGE}
-post-install:
- @${INSTALL_SCRIPT} ${FILESDIR}/mpd.conf.sample ${PREFIX}/etc
- @${INSTALL_SCRIPT} ${WRKDIR}/musicpd.sh ${RC_DIR}/musicpd${RC_SUFX}
+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/musicpd${RC_SUFX}
+ ${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 ${MAN1PREFIX}/man/man1/
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
+ @cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
+.endif
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/musicpd/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo 8 Oct 2003 10:41:32 -0000 1.1
+++ distinfo 13 Oct 2003 21:34:42 -0000
@@ -1 +1 @@
-MD5 (mpd-0.9.1.tar.gz) = 1a61ef1c3b6c482b7615ad6e92c7551d
+MD5 (mpd-0.9.2.tar.gz) = 32bedb3d393aed27f3c6b51f1042c459
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/audio/musicpd/pkg-message,v
retrieving revision 1.1
diff -u -r1.1 pkg-message
--- pkg-message 8 Oct 2003 10:41:32 -0000 1.1
+++ pkg-message 13 Oct 2003 21:34:42 -0000
@@ -4,16 +4,16 @@
In order to run the MPD server, you need to create
%%PREFIX%%/etc/mpd.conf out of
- %%PREFIX%%/etc/mpd.conf.sample
+ %%EXAMPLESDIR%%/mpd.conf
and add the following line to /etc/rc.conf:
musicpd_enable="YES"
Then start the server with
- %%RC_DIR%%/musicpd%%RC_SUFX%% start
+ %%PREFIX%%/etc/rc.d/musicpd%%RC_SUFX%% start
or reboot.
NOTE: The musicpd server is pretty useless without a
- client. You might want to install the mpc-port,
+ client. You might want to install the traymp-port,
too.
************************************************************
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/musicpd/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 8 Oct 2003 10:41:32 -0000 1.1
+++ pkg-plist 13 Oct 2003 21:34:42 -0000
@@ -1,9 +1,9 @@
bin/mpd
-@unexec %%RC_DIR%%/musicpd%%RC_SUFX%% stop 2>/dev/null || true
-share/doc/mpd/COMMANDS
-share/doc/mpd/README
-share/doc/mpd/UPGRADING
-etc/mpd.conf.sample
-@dirrm share/doc/mpd
-@cwd %%RC_DIR%%
-musicpd%%RC_SUFX%%
+@unexec etc/rc.d/musicpd%%RC_SUFX%% 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%%
--- musicpd-0.9.2.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?20031013214016.50936.qmail>