svn commit: r523058 - in head/devel/kf5-solid: . files

[Gleb Popov]

Author: arrowd
Date: Tue Jan 14 18:06:21 2020
New Revision: 523058
URL: https://svnweb.freebsd.org/changeset/ports/523058

Log:
  devel/kf5-solid: Enable bsdisks backend unconditionally.
  
  To use it, install sysutils/bsdisks and disable hald (set hald_enable="NO" in rc.conf or just remove the package).
  
  PR:		242902
  Reviewed by:	tcberner

Added:
  head/devel/kf5-solid/files/
  head/devel/kf5-solid/files/patch-CMakeLists.txt   (contents, props changed)
  head/devel/kf5-solid/pkg-message   (contents, props changed)
Modified:
  head/devel/kf5-solid/Makefile

Modified: head/devel/kf5-solid/Makefile
==============================================================================
--- head/devel/kf5-solid/Makefile	Tue Jan 14 17:19:37 2020	(r523057)
+++ head/devel/kf5-solid/Makefile	Tue Jan 14 18:06:21 2020	(r523058)
@@ -2,6 +2,7 @@
 
 PORTNAME=	solid
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde at FreeBSD.org
@@ -12,9 +13,6 @@ USE_KDE=	ecm
 USE_QT=		buildtools_build concurrent core dbus declarative gui linguisttools \
 		network qmake_build testlib widgets xml
 
-OPTIONS_DEFINE=		BSDISKS
-BSDISKS_DESC=		Use bsdisks instead of hald to mount drives
-BSDISKS_CMAKE_BOOL=	EXPERIMENTAL_BSDISKS
-BSDISKS_RUN_DEPENDS=	bsdisks:sysutils/bsdisks
+CMAKE_ON=	EXPERIMENTAL_BSDISKS
 
 .include <bsd.port.mk>

Added: head/devel/kf5-solid/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/kf5-solid/files/patch-CMakeLists.txt	Tue Jan 14 18:06:21 2020	(r523058)
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2019-12-07 21:50:54 UTC
++++ CMakeLists.txt
+@@ -117,9 +117,8 @@ elseif (NOT ANDROID)
+     endif()
+     if(EXPERIMENTAL_BSDISKS)
+         add_device_backend(udisks2)
+-    else()
+-        add_device_backend(hal)
+     endif()
++    add_device_backend(hal)
+ endif()
+ add_device_backends_cmake()
+ 

Added: head/devel/kf5-solid/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/kf5-solid/pkg-message	Tue Jan 14 18:06:21 2020	(r523058)
@@ -0,0 +1,4 @@
+Solid now has UDisks2 backend turned on by default. If you want to use it, install
+sysutils/bsdisks package and **disable** hald (set hald_enable="NO" in rc.conf or
+just remove the package). If you want to stay with hald, don't install bsdisks, as
+you'll get duplicated entries for removable disks.