Index: head/multimedia/musikcube/Makefile
===================================================================
--- head/multimedia/musikcube/Makefile	(revision 564073)
+++ head/multimedia/musikcube/Makefile	(revision 564074)
@@ -1,33 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	musikcube
 DISTVERSION=	0.96.5
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Terminal-based music player, audio engine, metadata indexer, server
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libfaad.so:audio/faad \
 		libFLAC.so:audio/flac \
 		libmicrohttpd.so:www/libmicrohttpd \
 		libmp3lame.so:audio/lame \
 		libogg.so:audio/libogg \
 		libsndio.so:audio/sndio \
 		libtag.so:audio/taglib \
 		libvorbis.so:audio/libvorbis
 
-USES=		cmake:noninja compiler:c++14-lang ncurses:port pkgconfig ssl # ncurses:port was changed to base by bug#249572, but this caused it to abort (bug#252817) and was reverted
+USES=		cmake:noninja compiler:c++14-lang pkgconfig ssl
 
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	clangen
+LDFLAGS+=	-lncursesw -lpanelw -ltinfow
+
+.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>
Index: head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt
===================================================================
--- head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt	(revision 564073)
+++ head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt	(revision 564074)
@@ -1,11 +1,11 @@
 --- src/musikcube/CMakeLists.txt.orig	2021-01-24 21:53:38 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 REQUIRED ncurses panel)
++    pkg_check_modules(NCURSES ncurses panel)
      target_link_libraries(musikcube ${musikcube_LINK_LIBS} ${NCURSES_LIBRARIES} musikcore)
  elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
      if (${LINK_STATICALLY} MATCHES "true")