Update to cantata 2.3.1.

Add a patch to disable udev check.

audio/cantata/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2018/06/29 22:16:08 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2018/07/02 08:22:25 landry Exp $
 
 COMMENT =	Qt-based MPD client
 
-V =			2.2.0
+V =			2.3.1
 DISTNAME =	cantata-${V}
-REVISION =	2
 HOMEPAGE =	https://github.com/CDrummond/cantata
 
 MASTER_SITES =	https://github.com/CDrummond/cantata/releases/download/v${V}/
@@ -18,7 +17,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
 WANTLIB += Qt5Multimedia Qt5Network Qt5Sql Qt5Svg Qt5Widgets Qt5Xml
 WANTLIB += avcodec avformat avutil c cddb cdio cdio_cdda cdio_paranoia
-WANTLIB += m mpg123 mtp musicbrainz5 tag z
+WANTLIB += m mpg123 mtp musicbrainz5 tag z avahi-client avahi-common
 
 MODULES =	devel/cmake \
 		x11/qt5
@@ -40,4 +39,8 @@ CONFIGURE_ARGS +=	-DCMAKE_INSTALL_PREFIX:Path=${PREFIX} \
 			-DLRELEASE_EXECUTABLE:String=${MODQT_LRELEASE} \
 			-DLCONVERT_EXECUTABLE:String=${LOCALBASE}/lib/qt5/bin/lconvert
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cantata/dbus-1/system.d/
+	mv ${WRKINST}/etc/dbus-1/system.d/*.conf ${PREFIX}/share/examples/cantata/dbus-1/system.d/
+
 .include <bsd.port.mk>

audio/cantata/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cantata-2.2.0.tar.bz2) = yEaR6xdxERjTxRLXDLQiJn96E3KQCCzdH/CocbSo5cA=
-SIZE (cantata-2.2.0.tar.bz2) = 2251649
+SHA256 (cantata-2.3.1.tar.bz2) = Wx5WPsEl1XKWSV0Pj5fu7PCyJgqlCzW658qyIdeRTrQ=
+SIZE (cantata-2.3.1.tar.bz2) = 2414702

audio/cantata/patches/patch-3rdparty_solid-lite_CMakeLists_txt

@@ -0,0 +1,16 @@
+$OpenBSD: patch-3rdparty_solid-lite_CMakeLists_txt,v 1.1 2018/07/02 08:22:25 landry Exp $
+
+fallout from https://github.com/CDrummond/cantata/issues/1175
+
+Index: 3rdparty/solid-lite/CMakeLists.txt
+--- 3rdparty/solid-lite/CMakeLists.txt.orig
++++ 3rdparty/solid-lite/CMakeLists.txt
+@@ -45,7 +45,7 @@ set(solidlite_LIB_SRCS
+    backends/shared/rootdevice.cpp
+ )
+ 
+-   if (NOT WIN32 AND NOT APPLE AND WITH_SOLID_UDISKS2)
++   if (NOT WIN32 AND NOT APPLE AND NOT OPENBSD AND WITH_SOLID_UDISKS2)
+      find_package( UDev REQUIRED)
+      macro_log_feature( UDEV_FOUND "UDev" "UDev support for Solid" "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" FALSE "" "Allows Solid to use UDev to provide information about devices on Linux" )
+    endif()

audio/cantata/pkg/PLIST

@@ -1,56 +1,22 @@
-@comment $OpenBSD: PLIST,v 1.5 2018/06/29 22:16:08 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2018/07/02 08:22:25 landry Exp $
 @bin bin/cantata
 lib/cantata/
+@bin lib/cantata/cantata-mounter
 @bin lib/cantata/cantata-replaygain
 @bin lib/cantata/cantata-tags
 share/applications/cantata.desktop
 share/cantata/
-share/cantata/config/
-share/cantata/config/lyrics_providers.xml
-share/cantata/config/podcast_directories.xml
-share/cantata/config/scrobblers.xml
-share/cantata/config/tag_fixes.xml
-share/cantata/config/weblinks.xml
-share/cantata/fonts/
-share/cantata/fonts/fontawesome-webfont.ttf
 share/cantata/icons/
-share/cantata/icons/bbc.svg
-share/cantata/icons/cantata/
-share/cantata/icons/cantata/AUTHORS
-share/cantata/icons/cantata/LICENSE
-share/cantata/icons/cantata/index.theme
-share/cantata/icons/cantata/svg/
-share/cantata/icons/cantata/svg/audio-x-generic.svg
-share/cantata/icons/cantata/svg/cantata.svg
-share/cantata/icons/cantata/svg/drive-removable-media-usb-pendrive.svg
-share/cantata/icons/cantata/svg/folder-downloads.svg
-share/cantata/icons/cantata/svg/folder-temp.svg
-share/cantata/icons/cantata/svg/fork.svg
-share/cantata/icons/cantata/svg/information.svg
-share/cantata/icons/cantata/svg/inode-directory.svg
-share/cantata/icons/cantata/svg/multimedia-player.svg
-share/cantata/icons/cantata/svg/network-server-database.svg
-share/cantata/icons/cantata/svg/preferences-desktop-keyboard.svg
-share/cantata/icons/cantata/svg/preferences-other.svg
-share/cantata/icons/cantata/svg/speaker.svg
-share/cantata/icons/cantata/svg64/
-share/cantata/icons/cantata/svg64/dialog-error.svg
-share/cantata/icons/cantata/svg64/dialog-information.svg
-share/cantata/icons/cantata/svg64/dialog-question.svg
-share/cantata/icons/cantata/svg64/dialog-warning.svg
-share/cantata/icons/cbc.svg
-share/cantata/icons/npr.svg
 share/cantata/icons/podcasts.png
 share/cantata/icons/soundcloud.png
 share/cantata/icons/stream.png
-share/cantata/mpd/
-share/cantata/mpd/mpd.conf.template
 share/cantata/scripts/
 share/cantata/scripts/cantata-dynamic
 share/cantata/scripts/cantata-remote
+share/cantata/scripts/mount.cifs.wrapper
 share/cantata/translations/
-share/cantata/translations/blank.qm
 share/cantata/translations/cantata_cs.qm
+share/cantata/translations/cantata_da.qm
 share/cantata/translations/cantata_de.qm
 share/cantata/translations/cantata_en_GB.qm
 share/cantata/translations/cantata_es.qm
@@ -62,6 +28,14 @@ share/cantata/translations/cantata_ko.qm
 share/cantata/translations/cantata_pl.qm
 share/cantata/translations/cantata_ru.qm
 share/cantata/translations/cantata_zh_CN.qm
+share/dbus-1/system-services/mpd.cantata.mounter.service
+share/examples/cantata/
+share/examples/cantata/dbus-1/
+@sample ${SYSCONFDIR}/dbus-1/
+share/examples/cantata/dbus-1/system.d/
+@sample ${SYSCONFDIR}/dbus-1/system.d/
+share/examples/cantata/dbus-1/system.d/mpd.cantata.mounter.conf
+@sample ${SYSCONFDIR}/dbus-1/system.d/mpd.cantata.mounter.conf
 share/icons/hicolor/128x128/apps/cantata.png
 share/icons/hicolor/16x16/apps/cantata.png
 share/icons/hicolor/22x22/apps/cantata.png
@@ -71,7 +45,7 @@ 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-symbolic.svg
 share/icons/hicolor/scalable/apps/cantata.svg
+share/icons/hicolor/symbolic/apps/cantata-symbolic.svg
 @tag gtk-update-icon-cache %D/share/icons/hicolor
-@tag update-desktop-database
+@tag update-desktop-database