CVS commit: pkgsrc/audio/mpc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Dec  4 11:37:16 UTC 2019

Modified Files:
        pkgsrc/audio/mpc: Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/mpc/patches: patch-doc_meson.build

Log Message:
mpc: Install man page.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/audio/mpc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/mpc/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/audio/mpc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/mpc/patches/patch-doc_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/mpc/Makefile
diff -u pkgsrc/audio/mpc/Makefile:1.32 pkgsrc/audio/mpc/Makefile:1.33
--- pkgsrc/audio/mpc/Makefile:1.32      Sun Nov 10 11:27:07 2019
+++ pkgsrc/audio/mpc/Makefile   Wed Dec  4 11:37:16 2019
@@ -1,25 +1,29 @@
-# $NetBSD: Makefile,v 1.32 2019/11/10 11:27:07 nia Exp $
+# $NetBSD: Makefile,v 1.33 2019/12/04 11:37:16 nia Exp $
 
 DISTNAME=              mpc-0.33
+PKGREVISION=           1
 CATEGORIES=            audio
-MASTER_SITES=          http://www.musicpd.org/download/mpc/0/
+MASTER_SITES=          https://www.musicpd.org/download/mpc/0/
 EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            simonb%NetBSD.org@localhost
-HOMEPAGE=              http://musicpd.org/
+HOMEPAGE=              https://musicpd.org/
 COMMENT=               Command-line client for musicpd
 LICENSE=               gnu-gpl-v2
 
-USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config
 
-REPLACE_SH=            doc/*.sh
-
 LDFLAGS+=              ${BUILDLINK_LDADD.iconv}
 
-# By default it generates and installs HTML documentation if py-sphinx
-# is installed, causing our PLIST check to fail.
-MESON_ARGS+=           -Ddocumentation=disabled
+SUBST_CLASSES+=                sphinx
+SUBST_STAGE.sphinx=    pre-configure
+SUBST_FILES.sphinx=    meson.build
+SUBST_MESSAGE.sphinx=  Fixing sphinx binary name.
+SUBST_SED.sphinx+=     -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},"
+
+PYTHON_FOR_BUILD_ONLY= tool
+
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
 
 .include "../../devel/meson/build.mk"
 BUILDLINK_API_DEPENDS.libmpdclient+=   libmpdclient>=2.9

Index: pkgsrc/audio/mpc/PLIST
diff -u pkgsrc/audio/mpc/PLIST:1.8 pkgsrc/audio/mpc/PLIST:1.9
--- pkgsrc/audio/mpc/PLIST:1.8  Sun Feb 25 20:30:21 2018
+++ pkgsrc/audio/mpc/PLIST      Wed Dec  4 11:37:16 2019
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2018/02/25 20:30:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/12/04 11:37:16 nia Exp $
 bin/mpc
+man/man1/mpc.1
 share/doc/mpc/AUTHORS
 share/doc/mpc/COPYING
 share/doc/mpc/NEWS
@@ -7,3 +8,25 @@ share/doc/mpc/README.rst
 share/doc/mpc/contrib/mpc-completion.bash
 share/doc/mpc/contrib/mpd-m3u-handler.sh
 share/doc/mpc/contrib/mpd-pls-handler.sh
+share/doc/mpc/html/.buildinfo
+share/doc/mpc/html/_sources/index.rst.txt
+share/doc/mpc/html/_static/alabaster.css
+share/doc/mpc/html/_static/basic.css
+share/doc/mpc/html/_static/custom.css
+share/doc/mpc/html/_static/doctools.js
+share/doc/mpc/html/_static/documentation_options.js
+share/doc/mpc/html/_static/file.png
+share/doc/mpc/html/_static/jquery-3.4.1.js
+share/doc/mpc/html/_static/jquery.js
+share/doc/mpc/html/_static/language_data.js
+share/doc/mpc/html/_static/minus.png
+share/doc/mpc/html/_static/plus.png
+share/doc/mpc/html/_static/pygments.css
+share/doc/mpc/html/_static/searchtools.js
+share/doc/mpc/html/_static/underscore-1.3.1.js
+share/doc/mpc/html/_static/underscore.js
+share/doc/mpc/html/genindex.html
+share/doc/mpc/html/index.html
+share/doc/mpc/html/objects.inv
+share/doc/mpc/html/search.html
+share/doc/mpc/html/searchindex.js

Index: pkgsrc/audio/mpc/distinfo
diff -u pkgsrc/audio/mpc/distinfo:1.23 pkgsrc/audio/mpc/distinfo:1.24
--- pkgsrc/audio/mpc/distinfo:1.23      Sat Nov  2 19:07:25 2019
+++ pkgsrc/audio/mpc/distinfo   Wed Dec  4 11:37:16 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.23 2019/11/02 19:07:25 nia Exp $
+$NetBSD: distinfo,v 1.24 2019/12/04 11:37:16 nia Exp $
 
 SHA1 (mpc-0.33.tar.xz) = e6d5d7d46bed3e41741221846ac438af9b7e987a
 RMD160 (mpc-0.33.tar.xz) = 5dc046e58b7f72d425df57d0082cc0bb9a607513
 SHA512 (mpc-0.33.tar.xz) = d3247dfb54ac3c95caf5666088968a952b33eb7e8f941bca4f3715603839cf5a1bc5300488c78fdce6e38f612b243f2252ea682b8d0fec9f230acd760bf3560c
 Size (mpc-0.33.tar.xz) = 45044 bytes
+SHA1 (patch-doc_meson.build) = 49744b643095d5181804d60fc3ba85ddfd74701f

Added files:

Index: pkgsrc/audio/mpc/patches/patch-doc_meson.build
diff -u /dev/null pkgsrc/audio/mpc/patches/patch-doc_meson.build:1.1
--- /dev/null   Wed Dec  4 11:37:16 2019
+++ pkgsrc/audio/mpc/patches/patch-doc_meson.build      Wed Dec  4 11:37:16 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-doc_meson.build,v 1.1 2019/12/04 11:37:16 nia Exp $
+
+Install man pages to the correct location.
+
+--- doc/meson.build.orig       2019-10-31 15:01:59.000000000 +0000
++++ doc/meson.build
+@@ -15,5 +15,5 @@ custom_target(
+   command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
+   build_by_default: true,
+   install: true,
+-  install_dir: get_option('datadir'),
++  install_dir: get_option('prefix'),
+ )