CVS commit: pkgsrc/audio/cantata

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jul  5 18:20:19 UTC 2019

Modified Files:
        pkgsrc/audio/cantata: Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/cantata/patches: patch-CMakeLists.txt

Log Message:
cantata: fix build on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/cantata/Makefile \
    pkgsrc/audio/cantata/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/cantata/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/cantata/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/cantata/Makefile
diff -u pkgsrc/audio/cantata/Makefile:1.1 pkgsrc/audio/cantata/Makefile:1.2
--- pkgsrc/audio/cantata/Makefile:1.1   Sun Jun  9 15:46:09 2019
+++ pkgsrc/audio/cantata/Makefile       Fri Jul  5 18:20:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/06/09 15:46:09 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/07/05 18:20:19 adam Exp $
 
 DISTNAME=      cantata-2.3.3
 CATEGORIES=    audio
@@ -18,6 +18,15 @@ USE_TOOLS+=  bash:run perl:run
 REPLACE_PERL+= playlists/cantata-dynamic
 REPLACE_BASH+= cantata-remote.cmake
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=   unix
+.if ${OPSYS} == "Darwin"
+.include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.else
+PLIST.unix=    yes
+.endif
+
 .include "../../audio/libebur128/buildlink3.mk"
 .include "../../audio/mpg123/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
Index: pkgsrc/audio/cantata/PLIST
diff -u pkgsrc/audio/cantata/PLIST:1.1 pkgsrc/audio/cantata/PLIST:1.2
--- pkgsrc/audio/cantata/PLIST:1.1      Sun Jun  9 15:46:09 2019
+++ pkgsrc/audio/cantata/PLIST  Fri Jul  5 18:20:19 2019
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1 2019/06/09 15:46:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/07/05 18:20:19 adam Exp $
 bin/cantata
-lib/cantata/cantata-replaygain
-lib/cantata/cantata-tags
-share/applications/cantata.desktop
-share/cantata/icons/podcasts.png
-share/cantata/icons/soundcloud.png
-share/cantata/icons/stream.png
+${PLIST.unix}lib/cantata/cantata-replaygain
+${PLIST.unix}lib/cantata/cantata-tags
+${PLIST.unix}share/applications/cantata.desktop
+${PLIST.unix}share/cantata/icons/podcasts.png
+${PLIST.unix}share/cantata/icons/soundcloud.png
+${PLIST.unix}share/cantata/icons/stream.png
 share/cantata/scripts/cantata-dynamic
-share/cantata/scripts/cantata-remote
-share/icons/hicolor/128x128/apps/cantata.png
-share/icons/hicolor/16x16/apps/cantata.png
-share/icons/hicolor/22x22/apps/cantata.png
-share/icons/hicolor/24x24/apps/cantata.png
-share/icons/hicolor/256x256/apps/cantata.png
-share/icons/hicolor/32x32/apps/cantata.png
-share/icons/hicolor/48x48/apps/cantata.png
-share/icons/hicolor/512x512/apps/cantata.png
-share/icons/hicolor/64x64/apps/cantata.png
-share/icons/hicolor/scalable/apps/cantata.svg
-share/icons/hicolor/symbolic/apps/cantata-symbolic.svg
+${PLIST.unix}share/cantata/scripts/cantata-remote
+${PLIST.unix}share/icons/hicolor/128x128/apps/cantata.png
+${PLIST.unix}share/icons/hicolor/16x16/apps/cantata.png
+${PLIST.unix}share/icons/hicolor/22x22/apps/cantata.png
+${PLIST.unix}share/icons/hicolor/24x24/apps/cantata.png
+${PLIST.unix}share/icons/hicolor/256x256/apps/cantata.png
+${PLIST.unix}share/icons/hicolor/32x32/apps/cantata.png
+${PLIST.unix}share/icons/hicolor/48x48/apps/cantata.png
+${PLIST.unix}share/icons/hicolor/512x512/apps/cantata.png
+${PLIST.unix}share/icons/hicolor/64x64/apps/cantata.png
+${PLIST.unix}share/icons/hicolor/scalable/apps/cantata.svg
+${PLIST.unix}share/icons/hicolor/symbolic/apps/cantata-symbolic.svg

Index: pkgsrc/audio/cantata/distinfo
diff -u pkgsrc/audio/cantata/distinfo:1.2 pkgsrc/audio/cantata/distinfo:1.3
--- pkgsrc/audio/cantata/distinfo:1.2   Sun Jun  9 15:52:50 2019
+++ pkgsrc/audio/cantata/distinfo       Fri Jul  5 18:20:19 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2019/06/09 15:52:50 wiz Exp $
+$NetBSD: distinfo,v 1.3 2019/07/05 18:20:19 adam Exp $
 
 SHA1 (cantata-2.3.3.tar.bz2) = 19a235897c556f7fcc39be51842491ccb163d135
 RMD160 (cantata-2.3.3.tar.bz2) = f42da1ae832f27e32b622f47f69e9ba27ca5dde4
 SHA512 (cantata-2.3.3.tar.bz2) = 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
 Size (cantata-2.3.3.tar.bz2) = 2445139 bytes
 SHA1 (patch-3rdparty_solid-lite_CMakeLists.txt) = 73feadd49ea8c50f63d7c18e8a14e0796fac618c
+SHA1 (patch-CMakeLists.txt) = 90915916c7a640ab4da757d8f38eb7847a1519af

Added files:

Index: pkgsrc/audio/cantata/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/audio/cantata/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Fri Jul  5 18:20:19 2019
+++ pkgsrc/audio/cantata/patches/patch-CMakeLists.txt   Fri Jul  5 18:20:19 2019
@@ -0,0 +1,51 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/07/05 18:20:19 adam Exp $
+
+Don't make application bundle on Darwin.
+
+--- CMakeLists.txt.orig        2018-10-20 22:39:39.000000000 +0000
++++ CMakeLists.txt
+@@ -81,7 +81,7 @@ if (AVAHI_FOUND)
+     set(CANTATA_LIBS ${CANTATA_LIBS} ${AVAHI_LIBRARIES})
+ endif()
+ 
+-if (NOT APPLE AND NOT WIN32 AND NOT HAIKU)
++if (NOT WIN32 AND NOT HAIKU)
+     set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share"
+         CACHE PATH "Define install directory for read-only architecture-independent data")
+ else ()
+@@ -91,7 +91,7 @@ endif ()
+ 
+ if (WIN32)
+     set(CANTATA_ICON_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/icons/cantata)
+-elseif (APPLE)
++elseif (FALSE)
+     set(MACOSX_BUNDLE_BUNDLE_NAME Cantata)
+     set(MACOSX_BUNDLE_EXECUTABLE cantata)
+     set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${CANTATA_VERSION})
+@@ -124,7 +124,7 @@ if (NOT APPLE AND NOT WIN32)
+ endif ()
+ 
+ 
+-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT APPLE AND NOT WIN32 AND NOT HAIKU)
++if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT WIN32 AND NOT HAIKU)
+     set(CMAKE_INSTALL_PREFIX "/usr")
+     message("-- Set install prefix to ${CMAKE_INSTALL_PREFIX}")
+ endif ()
+@@ -361,8 +361,6 @@ set(CANTATA_LIBS ${CANTATA_LIBS} support
+ 
+ if (WIN32)
+     # Not installed for windows - script uses sym-links...
+-elseif (APPLE)
+-    install(PROGRAMS playlists/cantata-dynamic DESTINATION ${MACOSX_BUNDLE_RESOURCES}/scripts/)
+ else ()
+     install(PROGRAMS playlists/cantata-dynamic DESTINATION ${SHARE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}/scripts)
+ endif ()
+@@ -526,7 +524,7 @@ if (WIN32)
+     set(CMAKE_BUILD_TYPE "Release")
+     ADD_EXECUTABLE(cantata WIN32 ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
+     install(TARGETS cantata DESTINATION ${CMAKE_INSTALL_PREFIX})
+-elseif (APPLE)
++elseif (FALSE)
+     ADD_EXECUTABLE(cantata MACOSX_BUNDLE ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
+ 
+     set(BREW_OPENSSL_PATH /usr/local/opt/openssl/lib)