Attachment #198804 for bug #232854

View | Details | Raw Unified | Return to bug 232854
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	musicpc
DISTVERSION=	0.31
CATEGORIES=	audio ipv6
MASTER_SITES=	http://www.musicpd.org/download/mpc/0/
DISTNAME=	mpc-${PORTVERSION}

USES=		meson pkgconfig tar:xz
MESON_ARGS=	--mandir=${MANPREFIX}

OPTIONS_DEFINE=	DOCS ICONV
OPTIONS_DEFAULT=	DOCS 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_ON=	-Diconv=enabled
ICONV_MESON_OFF=	-Diconv=disabled

PORTDOCS=	AUTHORS README.rst NEWS
PORTEXAMPLES=	*

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1529036000	1	TIMESTAMP = 1540994707
2	SHA256 (mpc-0.30.tar.xz) = 65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce	2	SHA256 (mpc-0.31.tar.xz) = 62373e83a8a165b2ed43967975efecd3feee530f4557d6b861dd08aa89d52b2d
3	SIZE (mpc-0.30.tar.xz) = 41968	3	SIZE (mpc-0.31.tar.xz) = 43896




--- doc/meson.build.orig	2018-10-24 08:31:33 UTC
+++ doc/meson.build
@@ -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'),
 )
-    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




--- meson.build.orig	2018-10-24 08:31:33 UTC
+++ meson.build
@@ -1,4 +1,4 @@
-project('mpc', 'c',
+project('musicpc', 'c',
   version: '0.31',
   meson_version: '>= 0.47',
   default_options: [
@@ -109,13 +109,13 @@ executable('mpc',
@@ -101,13 +101,13 @@ executable('mpc',
   install: true
 )
 




--- 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')




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

Return to bug 232854

Lines 2-8 Link Here

(-)Makefile (-11 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= musicpc	4	PORTNAME= musicpc
5	DISTVERSION= 0.30	5	DISTVERSION= 0.31
6	CATEGORIES= audio ipv6	6	CATEGORIES= audio ipv6
7	MASTER_SITES= http://www.musicpd.org/download/mpc/0/	7	MASTER_SITES= http://www.musicpd.org/download/mpc/0/
8	DISTNAME= mpc-${PORTVERSION}	8	DISTNAME= mpc-${PORTVERSION}
Lines 18-38 Link Here
18	USES= meson pkgconfig tar:xz	18	USES= meson pkgconfig tar:xz
19	MESON_ARGS= --mandir=${MANPREFIX}	19	MESON_ARGS= --mandir=${MANPREFIX}
20		20
21	PLIST_FILES= bin/mpc	21	OPTIONS_DEFINE= DOCS ICONV
		22	OPTIONS_DEFAULT= DOCS ICONV
22		23
23	OPTIONS_DEFINE= DOCS EXAMPLES MANPAGES ICONV	24	DOCS_USES= python:env
24	OPTIONS_DEFAULT= MANPAGES ICONV	25	DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
		26	DOCS_MESON_ON= -Ddocumentation=enabled
		27	DOCS_MESON_OFF= -Ddocumentation=disabled
25		28
26	MANPAGES_USES= python:env
27	MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
28	MANPAGES_MESON_TRUE= use_sphinx
29	MANPAGES_PLIST_FILES= man/man1/mpc.1.gz
30
31	ICONV_USES= iconv	29	ICONV_USES= iconv
32	ICONV_LDFLAGS= -L${ICONV_PREFIX}/lib ${ICONV_LIB}	30	ICONV_LDFLAGS= -L${ICONV_PREFIX}/lib ${ICONV_LIB}
33	ICONV_MESON_TRUE= iconv	31	ICONV_MESON_ON= -Diconv=enabled
		32	ICONV_MESON_OFF= -Diconv=disabled
34		33
35	PORTDOCS= AUTHORS README.rst NEWS	34	PORTDOCS= AUTHORS README.rst NEWS
36	PORTEXAMPLES= *
37		35
38	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 1-42 Link Here

(-)files/patch-doc_meson.build (-41 / +8 lines)
1	--- doc/meson.build.orig 2018-06-15 04:16:53 UTC	1	--- doc/meson.build.orig 2018-10-24 08:31:33 UTC
2	+++ doc/meson.build	2	+++ doc/meson.build
3	@@ -1,16 +1,19 @@	3	@@ -15,5 +15,5 @@ custom_target(
4	-sphinx = find_program('sphinx-build', required:false)	4	command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
5	-	5	build_by_default: true,
6	-if sphinx.found()	6	install: true,
7	- custom_target(	7	- install_dir: get_option('datadir'),
8	- 'HTML documentation',	8	+ install_dir: get_option('mandir'),
9	- output: 'html',	9	)
10	- input: ['index.rst', 'conf.py'],
11	- command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
12	- build_by_default: true,
13	- install: true,
14	- install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
15	- )
16	+use_sphinx = get_option('use_sphinx')
17
18	+if use_sphinx == 'false'
19	+ use_sphinx = false
20	+elif use_sphinx == 'true'
21	+ sphinx = find_program('sphinx-build', required:false)
22	+ if not sphinx.found()
23	+ error('can\'t find sphinx')
24	+ endif
25	+ use_sphinx = true
26	+else
27	+ sphinx = find_program('sphinx-build', required:false)
28	+ use_sphinx = sphinx.found()
29	+endif
30	+
31	+if use_sphinx
32	custom_target(
33	'Manpage documentation',
34	output: 'man',
35	@@ -18,6 +21,6 @@ if sphinx.found()
36	command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
37	build_by_default: true,
38	install: true,
39	- install_dir: get_option('datadir'),
40	+ install_dir: get_option('mandir'),
41	)
42	endif

Lines 1-12 Link Here

(-)files/patch-meson.build (-4 / +4 lines)
1	--- meson.build.orig 2018-05-03 10:27:29 UTC	1	--- meson.build.orig 2018-10-24 08:31:33 UTC
2	+++ meson.build	2	+++ meson.build
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-project('mpc', 'c',	4	-project('mpc', 'c',
5	+project('musicpc', 'c',	5	+project('musicpc', 'c',
6	version: '0.30',	6	version: '0.31',
		7	meson_version: '>= 0.47',
7	default_options: [	8	default_options: [
8	'c_std=c99',	9	@@ -109,13 +109,13 @@ executable('mpc',
9	@@ -101,13 +101,13 @@ executable('mpc',
10	install: true	10	install: true
11	)	11	)
12		12

Lines 1-14 Link Here

(-)files/patch-meson__options.txt (-14 lines)
1	--- meson_options.txt.orig 2018-02-27 07:50:47 UTC
2	+++ meson_options.txt
3	@@ -3,6 +3,11 @@ option('iconv', type: 'combo',
4	value: 'auto',
5	description: 'Enable iconv() support')
6
7	+option('use_sphinx', type: 'combo',
8	+ choices: ['true', 'false', 'auto'],
9	+ value: 'auto',
10	+ description: 'Enable sphinx support for building documentation')
11	+
12	option('test', type: 'boolean',
13	value: false,
14	description: 'Enable unit tests')

Line 0 Link Here

(-)pkg-plist (+30 lines)
	1	bin/mpc
	2	%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo
	3	%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.rst.txt
	4	%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif
	5	%%PORTDOCS%%%%DOCSDIR%%/html/_static/alabaster.css
	6	%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css
	7	%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png
	8	%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png
	9	%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png
	10	%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js
	11	%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png
	12	%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png
	13	%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png
	14	%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.1.0.js
	15	%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js
	16	%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png
	17	%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png
	18	%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css
	19	%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js
	20	%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js
	21	%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js
	22	%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png
	23	%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png
	24	%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js
	25	%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
	26	%%PORTDOCS%%%%DOCSDIR%%/html/index.html
	27	%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
	28	%%PORTDOCS%%%%DOCSDIR%%/html/search.html
	29	%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
	30	%%PORTDOCS%%man/man1/mpc.1.gz