4 files changed, 16 insertions, 18 deletions

diff --git a/audio/musicpc/Makefile b/audio/musicpc/Makefile
index f9df10fa5898..e7a109bcb2f4 100644
--- a/audio/musicpc/Makefile
+++ b/audio/musicpc/Makefile
@@ -2,8 +2,7 @@
 # $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}
diff --git a/audio/musicpc/distinfo b/audio/musicpc/distinfo
index 1b74d7884c60..3f7a8f185037 100644
--- a/audio/musicpc/distinfo
+++ b/audio/musicpc/distinfo
@@ -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
diff --git a/audio/musicpc/files/patch-doc_meson.build b/audio/musicpc/files/patch-doc_meson.build
index 021d62f230c0..ad28aebd1404 100644
--- a/audio/musicpc/files/patch-doc_meson.build
+++ b/audio/musicpc/files/patch-doc_meson.build
@@ -1,8 +1,8 @@
---- 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',
@@ -14,7 +14,7 @@
 -    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'
@@ -27,17 +27,16 @@
 +  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
diff --git a/audio/musicpc/files/patch-meson.build b/audio/musicpc/files/patch-meson.build
index aa5908356968..8cc29e48402e 100644
--- a/audio/musicpc/files/patch-meson.build
+++ b/audio/musicpc/files/patch-meson.build
@@ -1,12 +1,12 @@
---- 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
  )