From owner-dev-commits-ports-main@freebsd.org Wed Apr 21 06:21:17 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 B2E775F8D8A; Wed, 21 Apr 2021 06:21:17 +0000 (UTC) (envelope-from git@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 4FQ9Rd4ZDGz4h35; Wed, 21 Apr 2021 06:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8EAAF21037; Wed, 21 Apr 2021 06:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13L6LHbG094985; Wed, 21 Apr 2021 06:21:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13L6LHOD094984; Wed, 21 Apr 2021 06:21:17 GMT (envelope-from git) Date: Wed, 21 Apr 2021 06:21:17 GMT Message-Id: <202104210621.13L6LHOD094984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 089d935ab16b - main - multimedia/musikcube: Fix build on 13+ by properly linking to base OpenSSL MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 089d935ab16b1ed209b2820c1652f38e023e1d6e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 06:21:17 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=089d935ab16b1ed209b2820c1652f38e023e1d6e commit 089d935ab16b1ed209b2820c1652f38e023e1d6e Author: Yuri Victorovich AuthorDate: 2021-04-21 06:20:27 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-21 06:21:14 +0000 multimedia/musikcube: Fix build on 13+ by properly linking to base OpenSSL Reported by: fallout --- multimedia/musikcube/Makefile | 2 ++ .../files/patch-src_musikcube_CMakeLists.txt | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/multimedia/musikcube/Makefile b/multimedia/musikcube/Makefile index cf501924f87b..bbbb2b3d035b 100644 --- a/multimedia/musikcube/Makefile +++ b/multimedia/musikcube/Makefile @@ -34,10 +34,12 @@ GH_ACCOUNT= clangen .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079 USES+= ncurses CMAKE_ARGS= -DNCURSES_DISABLE_LIB_SUFFIXES=false +CMAKE_ON= FREEBSD_USE_BASE_NCURSES .else USES+= ncurses:port CFLAGS+= -I${LOCALBASE}/include/ncurses CMAKE_ARGS= -DNCURSES_DISABLE_LIB_SUFFIXES=true +CMAKE_OFF= FREEBSD_USE_BASE_NCURSES .endif .include diff --git a/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt b/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt new file mode 100644 index 000000000000..db22da097189 --- /dev/null +++ b/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt @@ -0,0 +1,23 @@ +--- src/musikcube/CMakeLists.txt.orig 2021-04-21 04:51:30 UTC ++++ src/musikcube/CMakeLists.txt +@@ -103,10 +103,18 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + else() + find_package(PkgConfig) + if (${NCURSES_DISABLE_LIB_SUFFIXES} MATCHES "true") +- pkg_check_modules(NCURSES REQUIRED ncurses panel) ++ if (FREEBSD_USE_BASE_NCURSES) ++ set(NCURSES_LIBRARIES ncurses panel) ++ else() ++ pkg_check_modules(NCURSES REQUIRED ncurses panel) ++ endif() + message(STATUS "[ncurses] using library names without 'w' prefix") + else() +- pkg_check_modules(NCURSES REQUIRED ncursesw panelw) ++ if (FREEBSD_USE_BASE_NCURSES) ++ set(NCURSES_LIBRARIES ncursesw panelw) ++ else() ++ pkg_check_modules(NCURSES REQUIRED ncursesw panelw) ++ endif() + message(STATUS "[ncurses] using library names with 'w' prefix") + endif() + target_link_libraries(musikcube ${musikcube_LINK_LIBS} ${NCURSES_LIBRARIES} musikcore)