Index: head/audio/musicpc/Makefile =================================================================== --- head/audio/musicpc/Makefile (revision 472633) +++ head/audio/musicpc/Makefile (revision 472634) @@ -1,39 +1,38 @@ # Created by: Mark Reidel # $FreeBSD$ PORTNAME= musicpc -DISTVERSION= 0.29 -PORTREVISION= 1 +DISTVERSION= 0.30 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpc/0/ DISTNAME= mpc-${PORTVERSION} MAINTAINER= uzsolt@uzsolt.hu COMMENT= Command line client for the musicpd LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libmpdclient.so:audio/libmpdclient USES= meson pkgconfig tar:xz MESON_ARGS= --mandir=${MANPREFIX} PLIST_FILES= bin/mpc OPTIONS_DEFINE= DOCS EXAMPLES MANPAGES ICONV OPTIONS_DEFAULT= MANPAGES ICONV MANPAGES_USES= python:env MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} MANPAGES_MESON_TRUE= use_sphinx MANPAGES_PLIST_FILES= man/man1/mpc.1.gz ICONV_USES= iconv ICONV_LDFLAGS= -L${ICONV_PREFIX}/lib ${ICONV_LIB} ICONV_MESON_TRUE= iconv PORTDOCS= AUTHORS README.rst NEWS PORTEXAMPLES= * .include Index: head/audio/musicpc/distinfo =================================================================== --- head/audio/musicpc/distinfo (revision 472633) +++ head/audio/musicpc/distinfo (revision 472634) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519656312 -SHA256 (mpc-0.29.tar.xz) = 02f1daec902cb48f8cdaa6fe21c7219f6231b091dddbe437a3a4fb12cb07b9d3 -SIZE (mpc-0.29.tar.xz) = 41872 +TIMESTAMP = 1529036000 +SHA256 (mpc-0.30.tar.xz) = 65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce +SIZE (mpc-0.30.tar.xz) = 41968 Index: head/audio/musicpc/files/patch-doc_meson.build =================================================================== --- head/audio/musicpc/files/patch-doc_meson.build (revision 472633) +++ head/audio/musicpc/files/patch-doc_meson.build (revision 472634) @@ -1,43 +1,42 @@ ---- doc/meson.build.orig 2018-02-11 12:01:23 UTC +--- doc/meson.build.orig 2018-06-15 04:16:53 UTC +++ doc/meson.build -@@ -1,23 +1,27 @@ +@@ -1,16 +1,19 @@ -sphinx = find_program('sphinx-build', required:false) - +- -if sphinx.found() - custom_target( - 'HTML documentation', - output: 'html', - input: ['index.rst', 'conf.py'], - command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'], - build_by_default: true, - install: true, - install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()), - ) +use_sphinx = get_option('use_sphinx') -+ + +if use_sphinx == 'false' + use_sphinx = false +elif use_sphinx == 'true' + sphinx = find_program('sphinx-build', required:false) + if not sphinx.found() + error('can\'t find sphinx') + endif + use_sphinx = true +else + sphinx = find_program('sphinx-build', required:false) + use_sphinx = sphinx.found() +endif - ++ +if use_sphinx custom_target( 'Manpage documentation', output: 'man', - input: ['index.rst', 'conf.py'], -- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'], -+ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'], +@@ -18,6 +21,6 @@ if sphinx.found() + command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'], build_by_default: true, install: true, -- install_dir: join_paths(get_option('datadir'), 'man', 'man1'), -+ install_dir: join_paths(get_option('mandir')), +- install_dir: get_option('datadir'), ++ install_dir: get_option('mandir'), ) endif Index: head/audio/musicpc/files/patch-meson.build =================================================================== --- head/audio/musicpc/files/patch-meson.build (revision 472633) +++ head/audio/musicpc/files/patch-meson.build (revision 472634) @@ -1,24 +1,24 @@ ---- meson.build.orig 2018-02-26 15:35:16 UTC +--- meson.build.orig 2018-05-03 10:27:29 UTC +++ meson.build @@ -1,4 +1,4 @@ -project('mpc', 'c', +project('musicpc', 'c', - version: '0.29', + version: '0.30', default_options: [ 'c_std=c99', -@@ -113,13 +113,13 @@ executable('mpc', +@@ -101,13 +101,13 @@ executable('mpc', install: true ) -install_data('AUTHORS', 'COPYING', 'NEWS', 'README.rst', +install_data('AUTHORS', 'NEWS', 'README.rst', install_dir : join_paths(get_option('datadir'), 'doc', meson.project_name())) install_data( 'contrib/mpd-m3u-handler.sh', 'contrib/mpd-pls-handler.sh', 'contrib/mpc-completion.bash', - install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name(), 'contrib')) + install_dir: join_paths(get_option('datadir'), 'examples', meson.project_name() )) if get_option('test') check_dep = dependency('check')