Attachment #191021 for bug #226219

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




# $FreeBSD$

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

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	sphinx-apidoc:textproc/py-sphinx@${PY_FLAVOR}
LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient

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

PLIST_FILES=	bin/mpc man/man1/mpc.1.gz

PORTDOCS=	AUTHORS README.rst NEWS
PORTEXAMPLES=	*

OPTIONS_DEFINE=	EXAMPLES ICONV
OPTIONS_DEFAULT=	ICONV

ICONV_USES=	iconv
ICONV_LDFLAGS=	-L${ICONV_PREFIX}/lib ${ICONV_LIB}
ICONV_MESON_TRUE=	iconv

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/mpc ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/doc/mpc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}

do-install-EXAMPLES-on:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/mpc-completion.bash \
		${STAGEDIR}${EXAMPLESDIR}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1471583230	1	TIMESTAMP = 1519656312
2	SHA256 (mpc-0.28.tar.xz) = a4337d06c85dc81a638821d30fce8a137a58d13d510be34a11c1cce95cabc547	2	SHA256 (mpc-0.29.tar.xz) = 02f1daec902cb48f8cdaa6fe21c7219f6231b091dddbe437a3a4fb12cb07b9d3
3	SIZE (mpc-0.28.tar.xz) = 109172	3	SIZE (mpc-0.29.tar.xz) = 41872




--- doc/meson.build.orig	2018-02-26 15:29:28 UTC
+++ doc/meson.build
@@ -2,22 +2,12 @@ sphinx = find_program('sphinx-build', re
 
 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()),
-  )
-
-  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'],
     build_by_default: true,
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'man', 'man1'),
+    install_dir: join_paths(get_option('mandir')),
   )
 endif




--- meson.build.orig	2018-02-26 15:35:16 UTC
+++ meson.build
@@ -1,4 +1,4 @@
-project('mpc', 'c',
+project('musicpc', 'c',
   version: '0.29',
   default_options: [
     'c_std=c99',
@@ -113,13 +113,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')

Return to bug 226219

Lines 2-9 Link Here

(-)Makefile (-21 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= musicpc	4	PORTNAME= musicpc
5	PORTVERSION= 0.28	5	PORTVERSION= 0.29
6	PORTREVISION= 1
7	CATEGORIES= audio ipv6	6	CATEGORIES= audio ipv6
8	MASTER_SITES= http://www.musicpd.org/download/mpc/0/	7	MASTER_SITES= http://www.musicpd.org/download/mpc/0/
9	DISTNAME= mpc-${PORTVERSION}	8	DISTNAME= mpc-${PORTVERSION}
Lines 14-47 Link Here
14	LICENSE= GPLv2+	13	LICENSE= GPLv2+
15	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
16		15
		16	BUILD_DEPENDS= sphinx-apidoc:textproc/py-sphinx@${PY_FLAVOR}
17	LIB_DEPENDS= libmpdclient.so:audio/libmpdclient	17	LIB_DEPENDS= libmpdclient.so:audio/libmpdclient
18		18
19	USES= pkgconfig tar:xz	19	USES= meson pkgconfig tar:xz
20	GNU_CONFIGURE= yes	20	MESON_ARGS+= --mandir=${MANPREFIX}
21		21
22	PLIST_FILES= bin/mpc man/man1/mpc.1.gz	22	PLIST_FILES= bin/mpc man/man1/mpc.1.gz
23		23
24	PORTDOCS= AUTHORS README NEWS	24	PORTDOCS= AUTHORS README.rst NEWS
25	PORTEXAMPLES= *	25	PORTEXAMPLES= *
26		26
27	OPTIONS_DEFINE= EXAMPLES DOCS ICONV	27	OPTIONS_DEFINE= EXAMPLES ICONV
28	OPTIONS_DEFAULT= ICONV	28	OPTIONS_DEFAULT= ICONV
29		29
30	ICONV_USES= iconv	30	ICONV_USES= iconv
31	ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB}	31	ICONV_LDFLAGS= -L${ICONV_PREFIX}/lib ${ICONV_LIB}
32	ICONV_CONFIGURE_ENABLE= iconv	32	ICONV_MESON_TRUE= iconv
33		33
34	do-install:
35	${INSTALL_PROGRAM} ${WRKSRC}/src/mpc ${STAGEDIR}${PREFIX}/bin
36	${INSTALL_MAN} ${WRKSRC}/doc/mpc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
37
38	do-install-DOCS-on:
39	@${MKDIR} ${STAGEDIR}${DOCSDIR}
40	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
41
42	do-install-EXAMPLES-on:
43	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
44	${INSTALL_DATA} ${WRKSRC}/doc/mpc-completion.bash \
45	${STAGEDIR}${EXAMPLESDIR}
46
47	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-doc_meson.build (+27 lines)
	1	--- doc/meson.build.orig 2018-02-26 15:29:28 UTC
	2	+++ doc/meson.build
	3	@@ -2,22 +2,12 @@ sphinx = find_program('sphinx-build', re
	4
	5	if sphinx.found()
	6	custom_target(
	7	- 'HTML documentation',
	8	- output: 'html',
	9	- input: ['index.rst', 'conf.py'],
	10	- command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
	11	- build_by_default: true,
	12	- install: true,
	13	- install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
	14	- )
	15	-
	16	- custom_target(
	17	'Manpage documentation',
	18	output: 'man',
	19	input: ['index.rst', 'conf.py'],
	20	- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
	21	+ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
	22	build_by_default: true,
	23	install: true,
	24	- install_dir: join_paths(get_option('datadir'), 'man', 'man1'),
	25	+ install_dir: join_paths(get_option('mandir')),
	26	)
	27	endif

Line 0 Link Here

(-)files/patch-meson.build (+24 lines)
	1	--- meson.build.orig 2018-02-26 15:35:16 UTC
	2	+++ meson.build
	3	@@ -1,4 +1,4 @@
	4	-project('mpc', 'c',
	5	+project('musicpc', 'c',
	6	version: '0.29',
	7	default_options: [
	8	'c_std=c99',
	9	@@ -113,13 +113,13 @@ executable('mpc',
	10	install: true
	11	)
	12
	13	-install_data('AUTHORS', 'COPYING', 'NEWS', 'README.rst',
	14	+install_data('AUTHORS', 'NEWS', 'README.rst',
	15	install_dir : join_paths(get_option('datadir'), 'doc', meson.project_name()))
	16
	17	install_data(
	18	'contrib/mpd-m3u-handler.sh', 'contrib/mpd-pls-handler.sh',
	19	'contrib/mpc-completion.bash',
	20	- install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name(), 'contrib'))
	21	+ install_dir: join_paths(get_option('datadir'), 'examples', meson.project_name() ))
	22
	23	if get_option('test')
	24	check_dep = dependency('check')