Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Apr 2021 07:11:34 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: ef6815792434 - 2021Q2 - multimedia/musikcube: Fix build on 13+ by properly linking to base OpenSSL
Message-ID:  <202104210711.13L7BY3Q062348@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ef68157924340c73d1f20a369ae8d89a3196dda6

commit ef68157924340c73d1f20a369ae8d89a3196dda6
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-04-21 06:20:27 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-04-21 07:11:33 +0000

    multimedia/musikcube: Fix build on 13+ by properly linking to base OpenSSL
    
    Reported by:    fallout
    
    (cherry picked from commit 089d935ab16b1ed209b2820c1652f38e023e1d6e)
---
 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 a2cba8a2b404..972802b10e6e 100644
--- a/multimedia/musikcube/Makefile
+++ b/multimedia/musikcube/Makefile
@@ -33,10 +33,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 <bsd.port.mk>
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104210711.13L7BY3Q062348>