Index: head/audio/musicpc/Makefile =================================================================== --- head/audio/musicpc/Makefile (revision 484601) +++ head/audio/musicpc/Makefile (revision 484602) @@ -1,38 +1,36 @@ # Created by: Mark Reidel # $FreeBSD$ PORTNAME= musicpc -DISTVERSION= 0.30 +DISTVERSION= 0.31 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 ICONV +OPTIONS_DEFAULT= DOCS ICONV -OPTIONS_DEFINE= DOCS EXAMPLES MANPAGES ICONV -OPTIONS_DEFAULT= MANPAGES ICONV +DOCS_USES= python:env +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_MESON_ON= -Ddocumentation=enabled +DOCS_MESON_OFF= -Ddocumentation=disabled -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 +ICONV_MESON_ON= -Diconv=enabled +ICONV_MESON_OFF= -Diconv=disabled PORTDOCS= AUTHORS README.rst NEWS -PORTEXAMPLES= * .include Index: head/audio/musicpc/distinfo =================================================================== --- head/audio/musicpc/distinfo (revision 484601) +++ head/audio/musicpc/distinfo (revision 484602) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529036000 -SHA256 (mpc-0.30.tar.xz) = 65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce -SIZE (mpc-0.30.tar.xz) = 41968 +TIMESTAMP = 1540994707 +SHA256 (mpc-0.31.tar.xz) = 62373e83a8a165b2ed43967975efecd3feee530f4557d6b861dd08aa89d52b2d +SIZE (mpc-0.31.tar.xz) = 43896 Index: head/audio/musicpc/files/patch-meson__options.txt =================================================================== --- head/audio/musicpc/files/patch-meson__options.txt (revision 484601) +++ head/audio/musicpc/files/patch-meson__options.txt (nonexistent) @@ -1,14 +0,0 @@ ---- meson_options.txt.orig 2018-02-27 07:50:47 UTC -+++ meson_options.txt -@@ -3,6 +3,11 @@ option('iconv', type: 'combo', - value: 'auto', - description: 'Enable iconv() support') - -+option('use_sphinx', type: 'combo', -+ choices: ['true', 'false', 'auto'], -+ value: 'auto', -+ description: 'Enable sphinx support for building documentation') -+ - option('test', type: 'boolean', - value: false, - description: 'Enable unit tests') Property changes on: head/audio/musicpc/files/patch-meson__options.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/musicpc/files/patch-doc_meson.build =================================================================== --- head/audio/musicpc/files/patch-doc_meson.build (revision 484601) +++ head/audio/musicpc/files/patch-doc_meson.build (revision 484602) @@ -1,42 +1,9 @@ ---- doc/meson.build.orig 2018-06-15 04:16:53 UTC +--- doc/meson.build.orig 2018-10-24 08:31:33 UTC +++ doc/meson.build -@@ -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', -@@ -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: get_option('datadir'), -+ install_dir: get_option('mandir'), - ) - endif +@@ -15,5 +15,5 @@ custom_target( + command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'], + build_by_default: true, + install: true, +- install_dir: get_option('datadir'), ++ install_dir: get_option('mandir'), + ) Index: head/audio/musicpc/files/patch-meson.build =================================================================== --- head/audio/musicpc/files/patch-meson.build (revision 484601) +++ head/audio/musicpc/files/patch-meson.build (revision 484602) @@ -1,24 +1,24 @@ ---- meson.build.orig 2018-05-03 10:27:29 UTC +--- meson.build.orig 2018-10-24 08:31:33 UTC +++ meson.build @@ -1,4 +1,4 @@ -project('mpc', 'c', +project('musicpc', 'c', - version: '0.30', + version: '0.31', + meson_version: '>= 0.47', default_options: [ - 'c_std=c99', -@@ -101,13 +101,13 @@ executable('mpc', +@@ -109,13 +109,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') Index: head/audio/musicpc/pkg-plist =================================================================== --- head/audio/musicpc/pkg-plist (nonexistent) +++ head/audio/musicpc/pkg-plist (revision 484602) @@ -0,0 +1,30 @@ +bin/mpc +%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo +%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif +%%PORTDOCS%%%%DOCSDIR%%/html/_static/alabaster.css +%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css +%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.1.0.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css +%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js +%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv +%%PORTDOCS%%%%DOCSDIR%%/html/search.html +%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js +%%PORTDOCS%%man/man1/mpc.1.gz Property changes on: head/audio/musicpc/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property