Attachment 221689 Details for Bug 249572 – patch to make ports ncurses optional

[patch] patch to make ports ncurses optional

musikcube-base-ncurses-rev0.diff (text/plain), 1.62 KB, created by Steve Wills on 2021-01-18 00:07:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2021-01-18 00:07:17 UTC

Size: 1.62 KB

patch

obsolete

>diff --git multimedia/musikcube/Makefile multimedia/musikcube/Makefile
>index c64e41272575..7d2fa255438e 100644
>--- multimedia/musikcube/Makefile
>+++ multimedia/musikcube/Makefile
>@@ -23,7 +23,8 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
> 		libtag.so:audio/taglib \
> 		libvorbis.so:audio/libvorbis
> 
>-USES=		cmake:noninja compiler:c++14-lang ncurses:port pkgconfig ssl
>+USES=		cmake:noninja compiler:c++14-lang pkgconfig ssl
>+
> USE_LDCONFIG=	yes
> 
> USE_GITHUB=	yes
>@@ -31,4 +32,13 @@ GH_ACCOUNT=	clangen
> 
> CMAKE_ARGS=	-DNCURSES_LIBRARIES="cursesw;tinfow;panelw"
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
>+USES+=          ncurses
>+.else
>+USES+=          ncurses:port
>+CFLAGS+=	-I${LOCALBASE}/include/ncurses
>+.endif
>+
> .include <bsd.port.mk>
>diff --git multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt
>new file mode 100644
>index 000000000000..2adc4d67f7b5
>--- /dev/null
>+++ multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- src/musikcube/CMakeLists.txt.orig	2021-01-17 23:53:19 UTC
>++++ src/musikcube/CMakeLists.txt
>+@@ -83,7 +83,7 @@ set_target_properties(musikcube PROPERTIES LINK_FLAGS 
>+ 
>+ if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
>+     find_package(PkgConfig)
>+-    pkg_check_modules(NCURSES REQUIRED ncursesw panelw)
>++    pkg_check_modules(NCURSES ncursesw panelw)
>+     target_link_libraries(musikcube ${musikcube_LINK_LIBS} ${NCURSES_LIBRARIES} musikcore)
>+ else()
>+     target_link_libraries(musikcube ${musikcube_LINK_LIBS} curses panel musikcore)

Flags:

swills: maintainer-approval? (yuri)

Actions: View | Diff

Attachments on bug 249572: 221689