Date: Tue, 6 Oct 2020 21:51:56 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551600 - in head/audio/musicpd: . files Message-ID: <202010062151.096LpuxQ020067@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Tue Oct 6 21:51:56 2020 New Revision: 551600 URL: https://svnweb.freebsd.org/changeset/ports/551600 Log: Update to upstream release 0.22 Details: - Major release, many new features and improvements, see https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22/NEWS Modified: head/audio/musicpd/Makefile head/audio/musicpd/distinfo head/audio/musicpd/files/patch-src_lib_nfs_Error.cxx Modified: head/audio/musicpd/Makefile ============================================================================== --- head/audio/musicpd/Makefile Tue Oct 6 21:34:38 2020 (r551599) +++ head/audio/musicpd/Makefile Tue Oct 6 21:51:56 2020 (r551600) @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.21.26 -PORTREVISION= 1 +PORTVERSION= 0.22 CATEGORIES= audio -MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/ +MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION}/ DISTNAME= mpd-${PORTVERSION} MAINTAINER= riggs@FreeBSD.org @@ -13,16 +12,18 @@ COMMENT= Remote-controllable music daemon LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libicudata.so:devel/icu -USES= compiler:c++14-lang gnome meson pkgconfig tar:xz +USES= compiler:c++17-lang gnome meson pkgconfig python:build tar:xz USE_GNOME= glib20 USE_RC_SUBR= ${PORTNAME} MESON_ARGS= -Dauto_features=disabled \ -Dbzip2=enabled \ + -Ddocumentation=enabled \ -Dhttpd=true \ -Dicu=enabled \ -Doss=enabled \ @@ -46,7 +47,7 @@ OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER OPTIONS_RADIO_RESAMPLER= SAMPLERATE SOXR -OPTIONS_MULTI= FILE_FORMAT +OPTIONS_MULTI= DOCUMENTATION FILE_FORMAT OPTIONS_MULTI_FILE_FORMAT= \ ADPLUG AUDIOFILE FAAD FFMPEG FLAC FLUIDSYNTH \ GME MAD MIKMOD MODPLUG MPG123 MUSEPACK \ @@ -147,6 +148,7 @@ AO_MESON_ENABLED= ao AO_LIB_DEPENDS= libao.so:audio/libao JACK_MESON_ENABLED= jack JACK_LIB_DEPENDS= libjack.so:audio/jack +JACK_CXXFLAGS= -Wno-register OPENAL_MESON_ENABLED= openal OPENAL_USES= openal PULSEAUDIO_MESON_ENABLED= pulse @@ -241,22 +243,30 @@ post-patch: ${REINPLACE_CMD} -e "$${start},$${finish}s,^#,," \ ${WRKSRC}/doc/mpdconf.example # Fix man pages for executable names - @${REINPLACE_CMD} -e 's/^\(\.B m\)pd/\1usicpd/' \ - -e 's#^\(\.BI \)/etc/mpd.conf#\1${PREFIX}/etc/${PORTNAME}.conf#' \ - -e 's#^mpd.conf#${PORTNAME}.conf#' \ - -e 's#^mpd(1)#musicpd(1)#' \ - ${WRKSRC}/doc/mpd.1 ${WRKSRC}/doc/mpd.conf.5 + @${REINPLACE_CMD} \ + -e 's#^``mpd#``${PORTNAME}#' \ + -e 's#:: mpd#:: ${PORTNAME}#' \ + -e 's#mpd(1)#${PORTNAME}(1)#' \ + -e 's#/etc/mpd.conf#${PREFIX}/etc/${PORTNAME}.conf#' \ + -e 's#mpd.conf#${PORTNAME}.conf#' \ + -e 's#mpd.conf(5)#${PORTNAME}.conf(5)#' \ + ${WRKSRC}/doc/mpd.1.rst ${WRKSRC}/doc/mpd.conf.5.rst + @${REINPLACE_CMD} \ + -e "s#'mpd'#'${PORTNAME}'#" \ + -e "s#'mpd.conf'#'${PORTNAME}.conf'#" \ + -e "s#'mpd.conf doc#'${PORTNAME}.conf doc#" \ + ${WRKSRC}/doc/conf.py do-install: ${INSTALL_PROGRAM} ${WRKSRC}/_build/mpd \ - ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} - ${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 \ - ${STAGEDIR}/${PREFIX}/man/man1/${PORTNAME}.1 - ${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 \ - ${STAGEDIR}/${PREFIX}/man/man5/${PORTNAME}.conf.5 + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.1 \ + ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.conf.5 \ + ${STAGEDIR}${PREFIX}/man/man5 ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \ - ${STAGEDIR}/${PREFIX}/etc/${PORTNAME}.conf.sample + ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample .include <bsd.port.post.mk> Modified: head/audio/musicpd/distinfo ============================================================================== --- head/audio/musicpd/distinfo Tue Oct 6 21:34:38 2020 (r551599) +++ head/audio/musicpd/distinfo Tue Oct 6 21:51:56 2020 (r551600) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600722391 -SHA256 (mpd-0.21.26.tar.xz) = f9e68221c7a6829ec02f281eb313b2f24182020f5eb65ab22b337e6169ea4eea -SIZE (mpd-0.21.26.tar.xz) = 685396 +TIMESTAMP = 1601732610 +SHA256 (mpd-0.22.tar.xz) = 7de742d925d01bf52685cc6cbb31fdeb671e4992a448720897ef706e57e39076 +SIZE (mpd-0.22.tar.xz) = 722940 Modified: head/audio/musicpd/files/patch-src_lib_nfs_Error.cxx ============================================================================== --- head/audio/musicpd/files/patch-src_lib_nfs_Error.cxx Tue Oct 6 21:34:38 2020 (r551599) +++ head/audio/musicpd/files/patch-src_lib_nfs_Error.cxx Tue Oct 6 21:51:56 2020 (r551600) @@ -1,10 +1,10 @@ ---- src/lib/nfs/Error.cxx.orig 2019-04-03 10:23:57 UTC +--- src/lib/nfs/Error.cxx.orig 2020-09-23 13:26:51 UTC +++ src/lib/nfs/Error.cxx -@@ -33,12 +33,13 @@ +@@ -33,13 +33,13 @@ #include "Error.hxx" #include "util/StringFormat.hxx" -+#include <assert.h> ++#include <cassert> +#include <string.h> +#include <sys/time.h> + @@ -12,7 +12,8 @@ #include <nfsc/libnfs.h> } - --#include <assert.h> +-#include <cassert> +- -#include <string.h> static StringBuffer<256>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010062151.096LpuxQ020067>