Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Jun 2019 14:36:24 +0000 (UTC)
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r505091 - in head/sysutils/plasma5-ksysguard: . files
Message-ID:  <201906251436.x5PEaOcR024897@repo.freebsd.org>

Next in thread | Raw E-Mail | Index | Archive | Help
Author: fluffy
Date: Tue Jun 25 14:36:24 2019
New Revision: 505091
URL: https://svnweb.freebsd.org/changeset/ports/505091

Log:
  - Unbreak build
  - Teach ksysguardd to find Inotify by Right Way(tm)
  
  Pointyhat to:	pkubaj

Added:
  head/sysutils/plasma5-ksysguard/files/patch-CMakeLists.txt   (contents, props changed)
  head/sysutils/plasma5-ksysguard/files/patch-ksysguardd_CMakeLists.txt   (contents, props changed)
Modified:
  head/sysutils/plasma5-ksysguard/Makefile

Modified: head/sysutils/plasma5-ksysguard/Makefile
==============================================================================
--- head/sysutils/plasma5-ksysguard/Makefile	Tue Jun 25 13:50:27 2019	(r505090)
+++ head/sysutils/plasma5-ksysguard/Makefile	Tue Jun 25 14:36:24 2019	(r505091)
@@ -8,7 +8,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma5 utility to track and control the running processes
 
 USES=		cmake compiler:c++11-lib cpe desktop-file-utils \
-		gettext kde:5 qt:5 tar:xz
+		gettext kde:5 localbase pathfix qt:5 tar:xz
 USE_KDE=	attica auth codecs completion config configwidgets coreaddons \
 		dbusaddons emoticons i18n iconthemes init itemmodels \
 		itemviews jobwidgets kdelibs4support kio libksysguard \
@@ -23,6 +23,6 @@ OPTIONS_SUB=	yes
 
 INOTIFY_DESC=		Filesystem alteration notifications using inotify
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
-INOTIFY_LDFLAGS=	-linotify
+INOTIFY_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Inotify
 
 .include <bsd.port.mk>

Added: head/sysutils/plasma5-ksysguard/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/plasma5-ksysguard/files/patch-CMakeLists.txt	Tue Jun 25 14:36:24 2019	(r505091)
@@ -0,0 +1,14 @@
+--- CMakeLists.txt.orig	2019-06-18 09:56:54 UTC
++++ CMakeLists.txt
+@@ -63,6 +63,11 @@ add_subdirectory( doc )
+ add_subdirectory( pics )
+ add_subdirectory( example )
+ 
++find_package(Inotify)
++set_package_properties(Inotify PROPERTIES
++                       TYPE OPTIONAL
++                       PURPOSE "Filesystem alteration notifications using inotify")
++
+ add_subdirectory( ksysguardd )
+ 
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

Added: head/sysutils/plasma5-ksysguard/files/patch-ksysguardd_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/plasma5-ksysguard/files/patch-ksysguardd_CMakeLists.txt	Tue Jun 25 14:36:24 2019	(r505091)
@@ -0,0 +1,19 @@
+--- ksysguardd/CMakeLists.txt.orig	2019-06-18 09:56:21 UTC
++++ ksysguardd/CMakeLists.txt
+@@ -9,6 +9,7 @@ add_definitions(-DOSTYPE_${CMAKE_SYSTEM_NAME})
+ 
+ set(HAVE_LMSENSORS ${SENSORS_FOUND})
+ 
++include_directories(${Inotify_INCLUDE_DIRS})
+ check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
+ set(HAVE_SYS_INOTIFY_H ${SYS_INOTIFY_H_FOUND})
+ 
+@@ -46,7 +47,7 @@ endif()
+ 
+     add_executable(ksysguardd ${ksysguardd_SRCS})
+     set_property(TARGET ksysguardd PROPERTY C_STANDARD 11)
+-    target_link_libraries(ksysguardd libksysguardd)
++    target_link_libraries(ksysguardd libksysguardd ${Inotify_LIBRARIES})
+ 
+ if( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
+   message(STATUS "Adding kvm library on NetBSD")



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?201906251436.x5PEaOcR024897>