From owner-svn-ports-all@freebsd.org Sun Feb 7 17:33:25 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3FF93532650; Sun, 7 Feb 2021 17:33:25 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DYbps1JwNz4sMJ; Sun, 7 Feb 2021 17:33:25 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2004E3C4; Sun, 7 Feb 2021 17:33:25 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 117HXOOZ003727; Sun, 7 Feb 2021 17:33:24 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 117HXOdT003725; Sun, 7 Feb 2021 17:33:24 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <202102071733.117HXOdT003725@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 7 Feb 2021 17:33:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r564632 - branches/2021Q1/audio/musicpd X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2021Q1/audio/musicpd X-SVN-Commit-Revision: 564632 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2021 17:33:25 -0000 Author: riggs Date: Sun Feb 7 17:33:24 2021 New Revision: 564632 URL: https://svnweb.freebsd.org/changeset/ports/564632 Log: MFH: r564631 Introduce MANPAGES option; cleanup port (typo, remove unused gnome bit). PR: 253095 Reported by: moonlapse81@gmail.com Modified: branches/2021Q1/audio/musicpd/Makefile branches/2021Q1/audio/musicpd/pkg-plist Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/audio/musicpd/Makefile ============================================================================== --- branches/2021Q1/audio/musicpd/Makefile Sun Feb 7 17:31:27 2021 (r564631) +++ branches/2021Q1/audio/musicpd/Makefile Sun Feb 7 17:33:24 2021 (r564632) @@ -2,6 +2,7 @@ PORTNAME= musicpd PORTVERSION= 0.22.4 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} @@ -12,19 +13,15 @@ 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++17-lang localbase:ldflags 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 \ @@ -36,7 +33,9 @@ PORTDOCS= AUTHORS README.md NEWS SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS ID3TAG IPV6 ISO9660 SQLITE3 \ +OPTIONS_SUB= yes + +OPTIONS_DEFINE= DOCS ID3TAG IPV6 ISO9660 MANPAGES SQLITE3 \ PROXYDB VORBISENC ZZIP OPTIONS_RADIO= RESAMPLER ZEROCONF @@ -78,9 +77,12 @@ WILDMIDI_DESC= WildMIDI support (MIDI files) YAJL_DESC= JSON support via libyajl ZZIP_DESC= Support for zzip archives -OPTIONS_DEFAULT=CURL FFMPEG FLAC ID3TAG LAME OPUS \ +OPTIONS_DEFAULT=CURL FFMPEG FLAC ID3TAG LAME MANPAGES OPUS \ PLAYLISTS PROXYDB SNDFILE VORBIS VORBISENC +MANPAGES_MESON_ENABLED= documentation +MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${PY_FLAVOR} + # Decoder plugins ADPLUG_MESON_ENABLED= adplug ADPLUG_LIB_DEPENDS= libadplug.so:audio/libadplug @@ -196,7 +198,7 @@ SOUNDCLOUD_IMPLIES= CURL YAJL TIDAL_MESON_ENABLED= tidal TIDAL_IMPLIES= CURL YAJL -# Misc library suppore +# Misc library support AVAHI_MESON_ON= -Dzeroconf=avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app MDNSRESPONDER_MESON_ON= -Dzeroconf=bonjour @@ -259,10 +261,12 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/_build/mpd \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +.if ${PORT_OPTIONS:MMANPAGES} ${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.1 \ ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.conf.5 \ ${STAGEDIR}${PREFIX}/man/man5 +.endif ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \ Modified: branches/2021Q1/audio/musicpd/pkg-plist ============================================================================== --- branches/2021Q1/audio/musicpd/pkg-plist Sun Feb 7 17:31:27 2021 (r564631) +++ branches/2021Q1/audio/musicpd/pkg-plist Sun Feb 7 17:33:24 2021 (r564632) @@ -1,4 +1,4 @@ bin/musicpd @sample etc/musicpd.conf.sample -man/man1/musicpd.1.gz -man/man5/musicpd.conf.5.gz +%%MANPAGES%%man/man1/musicpd.1.gz +%%MANPAGES%%man/man5/musicpd.conf.5.gz