Attachment #253802 for bug #281696

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




PORTNAME=	ncmpc
DISTVERSION=	0.51
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	https://www.musicpd.org/download/ncmpc/0/


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

LIB_DEPENDS=	libfmt.so:devel/libfmt \
		libmpdclient.so:audio/libmpdclient \
		libpcre2-8.so:devel/pcre2

USES=		compiler:c++17-lang cpe iconv localbase:ldflags meson ncurses \
		pkgconfig python:env tar:xz shebangfix
CPE_VENDOR=	ncmpc_project
SHEBANG_GLOB=	*.py

EXTRACT_AFTER_ARGS=	--exclude ${DISTNAME}/subprojects/ \
			--no-same-owner --no-same-permissions

PORTDOCS=	*

MESON_ARGS=	-Depoll=false \
		-Deventfd=false \
		-Dsignalfd=false \
		-Dlirc=disabled

OPTIONS_DEFINE=		COLORS DOCS LYRICS MANPAGES NLS
OPTIONS_DEFAULT=	COLORS LYRICS MANPAGES

LYRICS_MESON_TRUE=	lyrics_screen

MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
MANPAGES_USES=		python:build
MANPAGES_MAKE_ENV=	PYTHON=${PYTHON_CMD} \
			SPHINX=sphinx-build-${PYTHON_VER}
MANPAGES_MESON_TRUE=	manual
MANPAGES_USES=		python:build

NLS_USES=		gettext
NLS_LDFLAGS=		-lintl
NLS_MESON_ENABLED=	nls
NLS_USES=		gettext

PORTDOCS=	*

.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == clang
CPPFLAGS+=	-Wno-error=enum-constexpr-conversion
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/audio/ncmpc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1689471482	1	TIMESTAMP = 1727207542
2	SHA256 (ncmpc-0.48.tar.xz) = b4b2d27e518096de2a145ef5ddf86cf46f8ba1f849bf45c6d81183a38869b90c	2	SHA256 (ncmpc-0.51.tar.xz) = e74be00e69bc3ed1268cafcc87274e78dfbde147f2480ab0aad8260881ec7271
3	SIZE (ncmpc-0.48.tar.xz) = 296320	3	SIZE (ncmpc-0.51.tar.xz) = 312732

Added Link Here

(-)b/audio/ncmpc/files/patch-src_LyricsPage.cxx (+11 lines)
1	--- src/LyricsPage.cxx.orig 2024-09-14 23:59:12 UTC
2	+++ src/LyricsPage.cxx
3	@@ -28,7 +28,7 @@ using std::string_view_literals::operator""sv;
4
5	using std::string_view_literals::operator""sv;
6
7	-#ifdef __APPLE__
8	+#ifdef __FreeBSD__
9	extern char **environ;
10	#endif
11




--- src/plugin.cxx.orig	2024-09-15 08:35:35 UTC
+++ src/plugin.cxx
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#ifdef __APPLE__
+#ifdef __FreeBSD__
 extern char **environ;
 #endif
 
 class PluginPipe {




bin/ncmpc
%%LYRICS%%lib/ncmpc/lyrics/20-azlyrics.py
%%LYRICS%%lib/ncmpc/lyrics/25-musixmatch.py
%%LYRICS%%lib/ncmpc/lyrics/51-supermusic.py
%%LYRICS%%lib/ncmpc/lyrics/60-google.py
%%LYRICS%%lib/ncmpc/lyrics/30-karaoke_texty.py
%%LYRICS%%lib/ncmpc/lyrics/40-tekstowo.py
%%LYRICS%%lib/ncmpc/lyrics/50-genius.py
%%LYRICS%%lib/ncmpc/lyrics/51-supermusic.py
%%LYRICS%%lib/ncmpc/lyrics/52-zeneszoveg.py
%%LYRICS%%lib/ncmpc/lyrics/60-google.py
%%MANPAGES%%share/man/man1/ncmpc.1.gz
%%NLS%%share/locale/cs/LC_MESSAGES/ncmpc.mo
%%NLS%%share/locale/da/LC_MESSAGES/ncmpc.mo

Return to bug 281696

Lines 1-6 Link Here

(-)b/audio/ncmpc/Makefile (-17 / +17 lines)
1	PORTNAME= ncmpc	1	PORTNAME= ncmpc
2	PORTVERSION= 0.48	2	DISTVERSION= 0.51
3	PORTREVISION= 1
4	CATEGORIES= audio	3	CATEGORIES= audio
5	MASTER_SITES= https://www.musicpd.org/download/ncmpc/0/	4	MASTER_SITES= https://www.musicpd.org/download/ncmpc/0/
6		5
Lines 11-25 WWW= https://www.musicpd.org/clients/ncmpc/ Link Here
11	LICENSE= GPLv2+	10	LICENSE= GPLv2+
12	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
13		12
14	LIB_DEPENDS= libmpdclient.so:audio/libmpdclient \	13	LIB_DEPENDS= libfmt.so:devel/libfmt \
		14	libmpdclient.so:audio/libmpdclient \
15	libpcre2-8.so:devel/pcre2	15	libpcre2-8.so:devel/pcre2
16		16
17	USES= compiler:c++17-lang cpe iconv localbase:ldflags meson ncurses \	17	USES= compiler:c++17-lang cpe iconv localbase:ldflags meson ncurses \
18	pkgconfig tar:xz shebangfix	18	pkgconfig python:env tar:xz shebangfix
19	MESON_ARGS= -Dlirc=disabled	19	CPE_VENDOR= ncmpc_project
20	SHEBANG_GLOB= *.py	20	SHEBANG_GLOB= *.py
21		21
22	CPE_VENDOR= ncmpc_project	22	EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/subprojects/ \
		23	--no-same-owner --no-same-permissions
		24
		25	PORTDOCS= *
		26
		27	MESON_ARGS= -Depoll=false \
		28	-Deventfd=false \
		29	-Dsignalfd=false \
		30	-Dlirc=disabled
23		31
24	OPTIONS_DEFINE= COLORS DOCS LYRICS MANPAGES NLS	32	OPTIONS_DEFINE= COLORS DOCS LYRICS MANPAGES NLS
25	OPTIONS_DEFAULT= COLORS LYRICS MANPAGES	33	OPTIONS_DEFAULT= COLORS LYRICS MANPAGES
Lines 36-56 DOCS_MESON_TRUE= html_manual Link Here
36	LYRICS_MESON_TRUE= lyrics_screen	44	LYRICS_MESON_TRUE= lyrics_screen
37		45
38	MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}	46	MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
		47	MANPAGES_USES= python:build
39	MANPAGES_MAKE_ENV= PYTHON=${PYTHON_CMD} \	48	MANPAGES_MAKE_ENV= PYTHON=${PYTHON_CMD} \
40	SPHINX=sphinx-build-${PYTHON_VER}	49	SPHINX=sphinx-build-${PYTHON_VER}
41	MANPAGES_MESON_TRUE= manual	50	MANPAGES_MESON_TRUE= manual
42	MANPAGES_USES= python:build
43		51
		52	NLS_USES= gettext
44	NLS_LDFLAGS= -lintl	53	NLS_LDFLAGS= -lintl
45	NLS_MESON_ENABLED= nls	54	NLS_MESON_ENABLED= nls
46	NLS_USES= gettext
47
48	PORTDOCS= *
49
50	.include <bsd.port.pre.mk>
51
52	.if ${COMPILER_TYPE} == clang
53	CPPFLAGS+= -Wno-error=enum-constexpr-conversion
54	.endif
55		55
56	.include <bsd.port.post.mk>	56	.include <bsd.port.mk>

Lines 1-11 Link Here

(-)b/audio/ncmpc/files/patch-src_plugin.cxx (-6 / +6 lines)
1	--- src/plugin.cxx.orig 2023-07-16 02:01:20 UTC	1	--- src/plugin.cxx.orig 2024-09-15 08:35:35 UTC
2	+++ src/plugin.cxx	2	+++ src/plugin.cxx
3	@@ -21,6 +21,8 @@	3	@@ -22,7 +22,7 @@
4	#include <sys/stat.h>	4	#include <sys/stat.h>
5	#include <sys/wait.h>	5	#include <sys/wait.h>
6		6
7	+extern char **environ;	7	-#ifdef __APPLE__
8	+	8	+#ifdef __FreeBSD__
9	struct PluginCycle;	9	extern char **environ;
		10	#endif
10		11
11	class PluginPipe {

Lines 1-11 Link Here

(-)b/audio/ncmpc/pkg-plist (-3 / +4 lines)
1	bin/ncmpc	1	bin/ncmpc
2	%%LYRICS%%lib/ncmpc/lyrics/20-azlyrics.py	2	%%LYRICS%%lib/ncmpc/lyrics/20-azlyrics.py
3	%%LYRICS%%lib/ncmpc/lyrics/40-tekstowo.py	3	%%LYRICS%%lib/ncmpc/lyrics/25-musixmatch.py
4	%%LYRICS%%lib/ncmpc/lyrics/51-supermusic.py
5	%%LYRICS%%lib/ncmpc/lyrics/60-google.py
6	%%LYRICS%%lib/ncmpc/lyrics/30-karaoke_texty.py	4	%%LYRICS%%lib/ncmpc/lyrics/30-karaoke_texty.py
		5	%%LYRICS%%lib/ncmpc/lyrics/40-tekstowo.py
7	%%LYRICS%%lib/ncmpc/lyrics/50-genius.py	6	%%LYRICS%%lib/ncmpc/lyrics/50-genius.py
		7	%%LYRICS%%lib/ncmpc/lyrics/51-supermusic.py
8	%%LYRICS%%lib/ncmpc/lyrics/52-zeneszoveg.py	8	%%LYRICS%%lib/ncmpc/lyrics/52-zeneszoveg.py
		9	%%LYRICS%%lib/ncmpc/lyrics/60-google.py
9	%%MANPAGES%%share/man/man1/ncmpc.1.gz	10	%%MANPAGES%%share/man/man1/ncmpc.1.gz
10	%%NLS%%share/locale/cs/LC_MESSAGES/ncmpc.mo	11	%%NLS%%share/locale/cs/LC_MESSAGES/ncmpc.mo
11	%%NLS%%share/locale/da/LC_MESSAGES/ncmpc.mo	12	%%NLS%%share/locale/da/LC_MESSAGES/ncmpc.mo