diff options
| -rw-r--r-- | audio/musicpd/Makefile | 27 | ||||
| -rw-r--r-- | audio/musicpd/distinfo | 4 |
2 files changed, 10 insertions, 21 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 229bbf126882..0ae03d737490 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -6,8 +6,7 @@ # PORTNAME= musicpd -PORTVERSION= 0.16.5 -PORTREVISION= 1 +PORTVERSION= 0.16.6 CATEGORIES= audio ipv6 MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION} DISTNAME= mpd-${PORTVERSION} @@ -64,28 +63,18 @@ OPTIONS= ID3TAG "Support ID3 v1/v2 tags" on \ SAMPLERATE "Support sample rate conversion" off MPDDIR?= /var/mpd -MPDUSER= mpd -MPDGROUP= mpd +MPDUSER?= mpd +MPDGROUP?= mpd MPDCONF?= musicpd.conf USERS= ${MPDUSER} GROUPS= ${MPDGROUP} -MPDUID= 137 -MPDGID= 137 - -PLIST_SUB= MPDUSER=${MPDUSER} \ - MPDGROUP=${MPDGROUP} \ - MPDCONF=${MPDCONF} - -SUB_LIST+= MPDUSER=${MPDUSER} \ - MPDGROUP=${MPDGROUP} \ - MPDDIR=${MPDDIR} \ - MPDUID=${MPDUID} \ - MPDGID=${MPDGID} \ +PLIST_SUB= MPDCONF=${MPDCONF} +SUB_LIST+= MPDDIR=${MPDDIR} \ MPDCONF=${MPDCONF} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(WITHOUT_FLAC) CONFIGURE_ARGS+=--disable-flac \ @@ -251,7 +240,7 @@ post-patch: -e 's#^mpd(1)#musicpd(1)#' \ ${WRKSRC}/doc/mpd.1 ${WRKSRC}/doc/mpd.conf.5 .if (${OSVERSION} < 800000) - ${REINPLACE_CMD} -e 's/nan[f]\{0,1\}(\"\")/NAN/g' \ + ${REINPLACE_CMD} -e 's/nan[f]*(\"\")/NAN/g' \ ${WRKSRC}/src/crossfade.c \ ${WRKSRC}/src/player_thread.c \ ${WRKSRC}/src/player_control.c @@ -281,4 +270,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 345e8e3918d7..6c843b638080 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -1,2 +1,2 @@ -SHA256 (mpd-0.16.5.tar.bz2) = 1a03ba9fd38230d79be5ee7d2b75ffeae01d738613866cdf23e74a1e1e9b73db -SIZE (mpd-0.16.5.tar.bz2) = 498034 +SHA256 (mpd-0.16.6.tar.bz2) = 6ec5ad3fdeeb97608e40e041b6a458c61afd023a0fd1eeb464e208fcd36659df +SIZE (mpd-0.16.6.tar.bz2) = 486442 |