From owner-svn-ports-all@freebsd.org Fri Feb 5 02:03:39 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8AB8553929E; Fri, 5 Feb 2021 02:03:39 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DWzGz3WJdz3q9v; Fri, 5 Feb 2021 02:03:39 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6B96816B94; Fri, 5 Feb 2021 02:03:39 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11523dFc026772; Fri, 5 Feb 2021 02:03:39 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11523dpI026770; Fri, 5 Feb 2021 02:03:39 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202102050203.11523dpI026770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 5 Feb 2021 02:03:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564074 - in head/multimedia/musikcube: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/multimedia/musikcube: . files X-SVN-Commit-Revision: 564074 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Feb 2021 02:03:39 -0000 Author: swills Date: Fri Feb 5 02:03:38 2021 New Revision: 564074 URL: https://svnweb.freebsd.org/changeset/ports/564074 Log: multimedia/musikcube: build with base ncurses Fixes issues seen previously with startup crashes with base ncurses PR: 252817 Approved by: yuri (maintainer) Modified: head/multimedia/musikcube/Makefile (contents, props changed) head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt (contents, props changed) Modified: head/multimedia/musikcube/Makefile ============================================================================== --- head/multimedia/musikcube/Makefile Fri Feb 5 01:45:38 2021 (r564073) +++ head/multimedia/musikcube/Makefile Fri Feb 5 02:03:38 2021 (r564074) @@ -2,6 +2,7 @@ PORTNAME= musikcube DISTVERSION= 0.96.5 +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= yuri@FreeBSD.org @@ -23,11 +24,21 @@ 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 # 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 + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079 +USES+= ncurses +.else +USES+= ncurses:port +CFLAGS+= -I${LOCALBASE}/include/ncurses +.endif .include Modified: head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt ============================================================================== --- head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt Fri Feb 5 01:45:38 2021 (r564073) +++ head/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt Fri Feb 5 02:03:38 2021 (r564074) @@ -5,7 +5,7 @@ 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")