musescore: build fix for MacOS X (with pkgsrc's defaults)

3 files changed, 22 insertions, 9 deletions

diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index 0ac695e0e5f..77909531d3e 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2020/02/16 20:00:47 gutteridge Exp $
+# $NetBSD: Makefile,v 1.4 2020/02/19 03:00:20 gutteridge Exp $
 
 DISTNAME=	musescore-3.4.2
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=musescore/}
 GITHUB_PROJECT=	MuseScore
diff --git a/audio/musescore/distinfo b/audio/musescore/distinfo
index 8c441c8899f..a6822f46097 100644
--- a/audio/musescore/distinfo
+++ b/audio/musescore/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2020/02/16 20:00:47 gutteridge Exp $
+$NetBSD: distinfo,v 1.3 2020/02/19 03:00:20 gutteridge Exp $
 
 SHA1 (musescore-3.4.2.tar.gz) = 95d8d0d0bef7327e793b6374feb22d9522225b30
 RMD160 (musescore-3.4.2.tar.gz) = d476367b02d5efc1527426451379b1918b24b8a9
 SHA512 (musescore-3.4.2.tar.gz) = d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
 Size (musescore-3.4.2.tar.gz) = 62960426 bytes
-SHA1 (patch-CMakeLists.txt) = 220fa5d8b68fbead76d8bed41e03b9133f59f3cc
+SHA1 (patch-CMakeLists.txt) = 82b2b3591f0241bdd7be173b3534615bd15a1a9c
diff --git a/audio/musescore/patches/patch-CMakeLists.txt b/audio/musescore/patches/patch-CMakeLists.txt
index 988f9cbfd06..9338523f3d8 100644
--- a/audio/musescore/patches/patch-CMakeLists.txt
+++ b/audio/musescore/patches/patch-CMakeLists.txt
@@ -1,12 +1,24 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/10/16 23:22:08 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2020/02/19 03:00:21 gutteridge Exp $
 
 Never compress man pages.
 
 Use CMAKE_INSTALL_MANDIR.
 
---- CMakeLists.txt.orig	2019-07-06 09:44:00.000000000 +0000
+Use the correct macro for pkg-config invocation.
+https://github.com/musescore/MuseScore/pull/5732
+
+--- CMakeLists.txt.orig	2020-02-06 21:10:58.000000000 +0000
 +++ CMakeLists.txt
-@@ -663,7 +663,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
+@@ -385,7 +385,7 @@ endif(BUILD_FOR_WINSTORE)
+ 
+ if (USE_SYSTEM_FREETYPE)
+       if (APPLE)
+-            PKGCONFIG (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR FREETYPE_LIBRARIES FREETYPE_CPP)
++            PKGCONFIG1 (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR FREETYPE_LIBRARIES FREETYPE_CPP)
+             if (FREETYPE_INCLUDE_DIRS)
+                   STRING(REGEX REPLACE  "\"" "" FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
+                   STRING(REGEX REPLACE  "\"" "" FREETYPE_LIBDIR ${FREETYPE_LIBDIR})
+@@ -683,7 +683,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
      # Compress man pages if gzip is installed (don't on OpenBSD)
      # Note: Compressing man pages is normal on Linux but not OpenBSD
      find_program( GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional)." )
@@ -15,7 +27,7 @@ Use CMAKE_INSTALL_MANDIR.
          message(STATUS "Found 'gzip'. Man pages will be compressed.")
          set(MAN_TARGET ${MAN_BUILD})
          set(MAN_EXTENSION ${MAN_EXTENSION}.gz)
-@@ -680,7 +680,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
+@@ -700,7 +700,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
              COMMAND echo "Man pages have been compressed ready for installation."
              VERBATIM
              )
@@ -24,7 +36,7 @@ Use CMAKE_INSTALL_MANDIR.
          if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
              message(STATUS "System is OpenBSD: Man pages will not be compressed.")
          else (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-@@ -690,9 +690,9 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
+@@ -710,9 +710,9 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
              COMMAND echo "Man pages will be installed uncompressed."
              VERBATIM
              )
@@ -36,7 +48,7 @@ Use CMAKE_INSTALL_MANDIR.
      # Create symlink alias for man pages so `man musescore` = `man mscore`
      find_program( LN_EXECUTABLE ln DOC "A tool for creating symbolic link aliases (optional)." )
      if (LN_EXECUTABLE)
-@@ -703,7 +703,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
+@@ -723,7 +723,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
              COMMAND ${LN_EXECUTABLE} -sf "${MAN_FULL_NAME}" "${MAN_FULL_ALIAS}"
              COMMAND echo 'Symlink alias: ${MAN_FULL_ALIAS} -> ${MAN_FULL_NAME}'
              )