diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile index d89eecc7f7a3..89c3a1e7bb95 100644 --- a/audio/ncmpc/Makefile +++ b/audio/ncmpc/Makefile @@ -1,56 +1,56 @@ PORTNAME= ncmpc -PORTVERSION= 0.48 -PORTREVISION= 1 +DISTVERSION= 0.51 CATEGORIES= audio MASTER_SITES= https://www.musicpd.org/download/ncmpc/0/ MAINTAINER= laurent@nilio.ca COMMENT= Ncurses client for the musicpd WWW= https://www.musicpd.org/clients/ncmpc/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libmpdclient.so:audio/libmpdclient \ +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 tar:xz shebangfix -MESON_ARGS= -Dlirc=disabled + pkgconfig python:env tar:xz shebangfix +CPE_VENDOR= ncmpc_project SHEBANG_GLOB= *.py -CPE_VENDOR= ncmpc_project +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 OPTIONS_SUB= yes COLORS_DESC= Compile with color support LYRICS_DESC= Compile with lyrics screen COLORS_MESON_TRUE= colors DOCS_IMPLIES= MANPAGES DOCS_MESON_TRUE= html_manual 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 - -.if ${COMPILER_TYPE} == clang -CPPFLAGS+= -Wno-error=enum-constexpr-conversion -.endif -.include +.include diff --git a/audio/ncmpc/distinfo b/audio/ncmpc/distinfo index dbf2953a80de..0dd0328e968d 100644 --- a/audio/ncmpc/distinfo +++ b/audio/ncmpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689471482 -SHA256 (ncmpc-0.48.tar.xz) = b4b2d27e518096de2a145ef5ddf86cf46f8ba1f849bf45c6d81183a38869b90c -SIZE (ncmpc-0.48.tar.xz) = 296320 +TIMESTAMP = 1727207542 +SHA256 (ncmpc-0.51.tar.xz) = e74be00e69bc3ed1268cafcc87274e78dfbde147f2480ab0aad8260881ec7271 +SIZE (ncmpc-0.51.tar.xz) = 312732 diff --git a/audio/ncmpc/files/patch-src_LyricsPage.cxx b/audio/ncmpc/files/patch-src_LyricsPage.cxx new file mode 100644 index 000000000000..766bbc88d850 --- /dev/null +++ b/audio/ncmpc/files/patch-src_LyricsPage.cxx @@ -0,0 +1,11 @@ +--- src/LyricsPage.cxx.orig 2024-09-14 23:59:12 UTC ++++ src/LyricsPage.cxx +@@ -28,7 +28,7 @@ using std::string_view_literals::operator""sv; + + using std::string_view_literals::operator""sv; + +-#ifdef __APPLE__ ++#ifdef __FreeBSD__ + extern char **environ; + #endif + diff --git a/audio/ncmpc/files/patch-src_plugin.cxx b/audio/ncmpc/files/patch-src_plugin.cxx index dcd45c579fcc..cad04cc92642 100644 --- a/audio/ncmpc/files/patch-src_plugin.cxx +++ b/audio/ncmpc/files/patch-src_plugin.cxx @@ -1,11 +1,11 @@ ---- src/plugin.cxx.orig 2023-07-16 02:01:20 UTC +--- src/plugin.cxx.orig 2024-09-15 08:35:35 UTC +++ src/plugin.cxx -@@ -21,6 +21,8 @@ +@@ -22,7 +22,7 @@ #include #include -+extern char **environ; -+ - struct PluginCycle; +-#ifdef __APPLE__ ++#ifdef __FreeBSD__ + extern char **environ; + #endif - class PluginPipe { diff --git a/audio/ncmpc/pkg-plist b/audio/ncmpc/pkg-plist index f7e55e02a440..c12935459a5e 100644 --- a/audio/ncmpc/pkg-plist +++ b/audio/ncmpc/pkg-plist @@ -1,36 +1,37 @@ bin/ncmpc %%LYRICS%%lib/ncmpc/lyrics/20-azlyrics.py -%%LYRICS%%lib/ncmpc/lyrics/40-tekstowo.py -%%LYRICS%%lib/ncmpc/lyrics/51-supermusic.py -%%LYRICS%%lib/ncmpc/lyrics/60-google.py +%%LYRICS%%lib/ncmpc/lyrics/25-musixmatch.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 %%NLS%%share/locale/de/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/en/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/eo/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/es/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/fa/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/fi/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/fr/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/gl/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/he/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/hu/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/ie/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/it/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/ja/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/ko/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/lt/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/nb/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/nl/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/pl/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/pt/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/ru/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/sk/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/sv/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/uk/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/ncmpc.mo