View | Details | Raw Unified | Return to bug 231643 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-10 / +14 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	ncmpc
4
PORTNAME=	ncmpc
5
PORTVERSION=	0.30
5
PORTVERSION=	0.33
6
CATEGORIES=	audio
6
CATEGORIES=	audio
7
MASTER_SITES=	http://www.musicpd.org/download/ncmpc/0/
7
MASTER_SITES=	http://www.musicpd.org/download/ncmpc/0/
8
8
Lines 12-33 Link Here
12
LICENSE=	GPLv2+
12
LICENSE=	GPLv2+
13
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
14
14
15
LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
15
LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
16
		libpcre.so:devel/pcre \
17
		libboost_system.so:devel/boost-libs
16
18
17
USES=		compiler:c++14-lang gnome iconv localbase meson ncurses pkgconfig tar:xz
19
USES=		compiler:c++14-lang gettext iconv localbase meson ncurses pkgconfig tar:xz
18
USE_GNOME=	glib20
20
LDFLAGS+=	-L${LOCALBASE}/lib -lintl
19
21
20
OPTIONS_DEFINE=		DOCS LYRICS MANPAGES NLS
22
OPTIONS_DEFINE=		DOCS LYRICS MANPAGES NLS COLORS
21
OPTIONS_DEFAULT=	LYRICS MANPAGES
23
OPTIONS_DEFAULT=	LYRICS MANPAGES COLORS
22
OPTIONS_SUB=		yes
24
OPTIONS_SUB=		yes
23
25
26
COLORS_DESC=		Compile with color support
24
LYRICS_DESC=		Compile with lyrics screen
27
LYRICS_DESC=		Compile with lyrics screen
25
28
29
COLORS_MESON_TRUE=	colors
30
31
LYRICS_MESON_TRUE=	lyrics_screen
32
26
DOCS_IMPLIES=		MANPAGES
33
DOCS_IMPLIES=		MANPAGES
27
DOCS_MESON_TRUE=	html_manual
34
DOCS_MESON_TRUE=	html_manual
28
35
29
LYRICS_MESON_TRUE=	lyrics_screen
30
31
MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
36
MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
32
MANPAGES_MAKE_ENV=	PYTHON=${PYTHON_CMD} \
37
MANPAGES_MAKE_ENV=	PYTHON=${PYTHON_CMD} \
33
			SPHINX=sphinx-build-${PYTHON_VER}
38
			SPHINX=sphinx-build-${PYTHON_VER}
Lines 34-40 Link Here
34
MANPAGES_MESON_TRUE=	manual
39
MANPAGES_MESON_TRUE=	manual
35
MANPAGES_USES=		python:build
40
MANPAGES_USES=		python:build
36
41
37
NLS_MESON_TRUE=		nls
42
NLS_MESON_TRUE=		enable_nls
38
NLS_USES=		gettext
39
43
40
.include <bsd.port.mk>
44
.include <bsd.port.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1534510290
1
TIMESTAMP = 1540320545
2
SHA256 (ncmpc-0.30.tar.xz) = e3fe0cb58b8a77f63fb1645c2f974b334f1614efdc834ec698ee7d861f1b12a3
2
SHA256 (ncmpc-0.33.tar.xz) = 94e04a34854015aa013b43ec15b578f4541d077cf7ae5bf7c0944475673fd7a5
3
SIZE (ncmpc-0.30.tar.xz) = 245212
3
SIZE (ncmpc-0.33.tar.xz) = 226344
(-)files/patch-doc_meson.build (-48 / +12 lines)
Lines 1-50 Link Here
1
--- doc/meson.build.orig	2018-04-04 08:23:50 UTC
1
--- doc/meson.build.orig	2018-10-25 17:01:44 UTC
2
+++ doc/meson.build
2
+++ doc/meson.build
3
@@ -1,24 +1,28 @@
3
@@ -30,9 +30,9 @@ endif
4
 sphinx = find_program('sphinx-build', required:false)
4
 if get_option('manual')
5
-if sphinx.found()
5
   custom_target(
6
-  custom_target(
6
     'Manpage documentation',
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
+if sphinx.found() and get_option('manual')
16
+  if get_option('html_manual')
17
+    custom_target(
18
+      'HTML documentation',
19
+      output: 'html',
20
+      input: ['index.rst', 'conf.py'],
21
+      command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/html_doctrees', meson.current_source_dir(), '@OUTPUT@'],
22
+      build_by_default: true,
23
+      install: true,
24
+      install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
25
+    )
26
+  endif
27
 
28
-  custom_target(
29
-    'Manpage documentation',
30
-    output: 'man',
7
-    output: 'man',
31
-    input: ['index.rst', 'conf.py'],
8
+    output: 'man1',
32
-    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
9
     input: ['index.rst', 'conf.py'],
33
-    build_by_default: true,
10
-    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
34
-    install: true,
11
+    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@'],
35
-    install_dir: get_option('datadir'),
12
     build_by_default: true,
36
-  )
13
     install: true,
37
+  if get_option('manual')
14
     install_dir: get_option('mandir'),
38
+    custom_target(
39
+      'Manpage documentation',
40
+      output: 'man1',
41
+      input: ['index.rst', 'conf.py'],
42
+      command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@'],
43
+      build_by_default: true,
44
+      install: true,
45
+      install_dir: get_option('mandir'),
46
+    )
47
+  endif
48
 endif
49
 
50
 if get_option('documentation')
(-)files/patch-meson__options.txt (-14 lines)
Lines 1-14 Link Here
1
--- meson_options.txt.orig	2018-04-04 08:23:50 UTC
2
+++ meson_options.txt
3
@@ -83,3 +83,11 @@ option('chat_screen', type: 'boolean',
4
 option('documentation', type: 'boolean',
5
   value: false,
6
   description: 'Build API documentation')
7
+
8
+option('manual', type: 'boolean',
9
+  value: true,
10
+  description: 'Build the manual')
11
+
12
+option('html_manual', type: 'boolean',
13
+  value: true,
14
+  description: 'Build the HTML manual')
(-)files/patch-src_screen.hxx (-21 lines)
Lines 1-21 Link Here
1
--- src/screen.hxx.orig	2018-04-04 08:23:50 UTC
2
+++ src/screen.hxx
3
@@ -82,8 +82,7 @@ class ScreenManager { (public)
4
 	StatusBar status_bar;
5
 
6
 private:
7
-	using PageMap = std::map<const struct screen_functions *,
8
-				 std::unique_ptr<Page>>;
9
+	using PageMap = std::map<const struct screen_functions *, Page *>;
10
 	PageMap pages;
11
 	PageMap::iterator current_page = pages.begin();
12
 
13
@@ -120,7 +119,7 @@ class ScreenManager { (public)
14
 
15
 	gcc_pure
16
 	bool IsVisible(const Page &page) const {
17
-		return &page == current_page->second.get();
18
+		return &page == current_page->second;
19
 	}
20
 
21
 	void Switch(const struct screen_functions &sf, struct mpdclient &c);
(-)pkg-plist (-37 / +37 lines)
Lines 1-60 Link Here
1
bin/ncmpc
1
bin/ncmpc
2
%%LYRICS%%lib/ncmpc/lyrics/10-hd.sh
3
%%LYRICS%%lib/ncmpc/lyrics/20-lyricwiki.rb
2
%%MANPAGES%%man/man1/ncmpc.1.gz
4
%%MANPAGES%%man/man1/ncmpc.1.gz
5
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
3
%%PORTDOCS%%%%DOCSDIR%%/COPYING
6
%%PORTDOCS%%%%DOCSDIR%%/COPYING
4
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
7
%%PORTDOCS%%%%DOCSDIR%%/NEWS
5
%%PORTDOCS%%%%DOCSDIR%%/README.rst
8
%%PORTDOCS%%%%DOCSDIR%%/README.rst
6
%%PORTDOCS%%%%DOCSDIR%%/keys.sample
7
%%PORTDOCS%%%%DOCSDIR%%/ncmpc.lirc
8
%%PORTDOCS%%%%DOCSDIR%%/NEWS
9
%%PORTDOCS%%%%DOCSDIR%%/config.sample
9
%%PORTDOCS%%%%DOCSDIR%%/config.sample
10
%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
10
%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo
11
%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
12
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.rst.txt
11
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.rst.txt
13
%%PORTDOCS%%%%DOCSDIR%%/html/search.html
14
%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png
15
%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png
16
%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif
12
%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif
17
%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js
13
%%PORTDOCS%%%%DOCSDIR%%/html/_static/alabaster.css
18
%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css
14
%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css
19
%%PORTDOCS%%%%DOCSDIR%%/html/_static/alabaster.css
15
%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png
20
%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js
16
%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png
21
%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js
17
%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png
22
%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js
18
%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js
19
%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png
20
%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png
21
%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png
23
%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.1.0.js
22
%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.1.0.js
24
%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png
23
%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js
25
%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js
24
%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png
26
%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png
27
%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png
25
%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png
28
%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css
26
%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css
29
%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png
27
%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js
30
%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png
28
%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js
31
%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png
29
%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js
32
%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png
30
%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png
33
%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png
31
%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png
34
%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js
32
%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js
35
%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo
36
%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
33
%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
37
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
34
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
38
%%LYRICS%%lib/ncmpc/lyrics/10-hd.sh
35
%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
39
%%LYRICS%%lib/ncmpc/lyrics/20-lyricwiki.rb
36
%%PORTDOCS%%%%DOCSDIR%%/html/search.html
40
%%NLS%%share/locale/he/LC_MESSAGES/ncmpc.mo
37
%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
38
%%PORTDOCS%%%%DOCSDIR%%/keys.sample
39
%%PORTDOCS%%%%DOCSDIR%%/ncmpc.lirc
41
%%NLS%%share/locale/cs/LC_MESSAGES/ncmpc.mo
40
%%NLS%%share/locale/cs/LC_MESSAGES/ncmpc.mo
42
%%NLS%%share/locale/nl/LC_MESSAGES/ncmpc.mo
41
%%NLS%%share/locale/da/LC_MESSAGES/ncmpc.mo
42
%%NLS%%share/locale/de/LC_MESSAGES/ncmpc.mo
43
%%NLS%%share/locale/eo/LC_MESSAGES/ncmpc.mo
44
%%NLS%%share/locale/es/LC_MESSAGES/ncmpc.mo
45
%%NLS%%share/locale/fi/LC_MESSAGES/ncmpc.mo
43
%%NLS%%share/locale/fr/LC_MESSAGES/ncmpc.mo
46
%%NLS%%share/locale/fr/LC_MESSAGES/ncmpc.mo
44
%%NLS%%share/locale/nb/LC_MESSAGES/ncmpc.mo
45
%%NLS%%share/locale/gl/LC_MESSAGES/ncmpc.mo
47
%%NLS%%share/locale/gl/LC_MESSAGES/ncmpc.mo
48
%%NLS%%share/locale/he/LC_MESSAGES/ncmpc.mo
46
%%NLS%%share/locale/hu/LC_MESSAGES/ncmpc.mo
49
%%NLS%%share/locale/hu/LC_MESSAGES/ncmpc.mo
47
%%NLS%%share/locale/zh_CN/LC_MESSAGES/ncmpc.mo
50
%%NLS%%share/locale/it/LC_MESSAGES/ncmpc.mo
51
%%NLS%%share/locale/ko/LC_MESSAGES/ncmpc.mo
52
%%NLS%%share/locale/nb/LC_MESSAGES/ncmpc.mo
53
%%NLS%%share/locale/nl/LC_MESSAGES/ncmpc.mo
48
%%NLS%%share/locale/pl/LC_MESSAGES/ncmpc.mo
54
%%NLS%%share/locale/pl/LC_MESSAGES/ncmpc.mo
49
%%NLS%%share/locale/es/LC_MESSAGES/ncmpc.mo
50
%%NLS%%share/locale/eo/LC_MESSAGES/ncmpc.mo
51
%%NLS%%share/locale/it/LC_MESSAGES/ncmpc.mo
52
%%NLS%%share/locale/da/LC_MESSAGES/ncmpc.mo
53
%%NLS%%share/locale/sk/LC_MESSAGES/ncmpc.mo
54
%%NLS%%share/locale/uk/LC_MESSAGES/ncmpc.mo
55
%%NLS%%share/locale/de/LC_MESSAGES/ncmpc.mo
56
%%NLS%%share/locale/pt_BR/LC_MESSAGES/ncmpc.mo
55
%%NLS%%share/locale/pt_BR/LC_MESSAGES/ncmpc.mo
57
%%NLS%%share/locale/ru/LC_MESSAGES/ncmpc.mo
56
%%NLS%%share/locale/ru/LC_MESSAGES/ncmpc.mo
58
%%NLS%%share/locale/ko/LC_MESSAGES/ncmpc.mo
57
%%NLS%%share/locale/sk/LC_MESSAGES/ncmpc.mo
59
%%NLS%%share/locale/fi/LC_MESSAGES/ncmpc.mo
60
%%NLS%%share/locale/sv/LC_MESSAGES/ncmpc.mo
58
%%NLS%%share/locale/sv/LC_MESSAGES/ncmpc.mo
59
%%NLS%%share/locale/uk/LC_MESSAGES/ncmpc.mo
60
%%NLS%%share/locale/zh_CN/LC_MESSAGES/ncmpc.mo

Return to bug 231643