Hi.
Update for net/nextcloudclient v3.3.0.
Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.3.0
I could not make Inotify be found by cmake, then I removed
FATAL_ON_MISSING_REQUIRED_PACKAGES from feature_summary on
CMakeLists.txt to be able to build. Appreciate any help.
Thank you for testing.
--
Adriano Barbosa
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 4 Jul 2021 05:34:03 -0000 1.20
+++ Makefile 3 Aug 2021 22:02:04 -0000
@@ -2,7 +2,7 @@
COMMENT = desktop sync client for Nextcloud
-V = 3.2.3
+V = 3.3.0
DISTNAME = nextcloudclient-${V}
GH_ACCOUNT = nextcloud
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 4 Jul 2021 05:34:03 -0000 1.17
+++ distinfo 3 Aug 2021 22:02:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.2.3.tar.gz) = QNxv46qmKFGvP6SA8QjMfjv/9ktr6gYC6VRjWbPSy6I=
-SIZE (nextcloudclient-3.2.3.tar.gz) = 15381488
+SHA256 (nextcloudclient-3.3.0.tar.gz) = Oh0CMxigZhWSWkC+MHXvy9borLDdpncofVcd3yjGHtQ=
+SIZE (nextcloudclient-3.3.0.tar.gz) = 13960334
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 24 Apr 2021 04:53:27 -0000 1.4
+++ patches/patch-CMakeLists_txt 3 Aug 2021 22:02:04 -0000
@@ -1,17 +1,11 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.4 2021/04/24 04:53:27 rsadowski Exp $
+$OpenBSD$
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -187,10 +187,8 @@ if(BUILD_CLIENT)
- find_package(Sparkle)
- endif()
+@@ -266,4 +266,4 @@ elseif(BUILD_CLIENT)
+ configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
+ endif()
-- if(UNIX)
-+ if(UNIX AND NOT APPLE)
- find_package(INotify REQUIRED)
-- else()
-- find_package(INotify)
- endif()
- find_package(Sphinx)
- find_package(PdfLatex)
+-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES)
++feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES)
Index: patches/patch-cmake_modules_FindINotify_cmake
===================================================================
RCS file: patches/patch-cmake_modules_FindINotify_cmake
diff -N patches/patch-cmake_modules_FindINotify_cmake
--- patches/patch-cmake_modules_FindINotify_cmake 24 Apr 2021 04:53:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,94 +0,0 @@
-$OpenBSD: patch-cmake_modules_FindINotify_cmake,v 1.1 2021/04/24 04:53:27 rsadowski Exp $
-
-Index: cmake/modules/FindINotify.cmake
---- cmake/modules/FindINotify.cmake.orig
-+++ cmake/modules/FindINotify.cmake
-@@ -1,30 +1,62 @@
--# (c) 2014 Copyright ownCloud GmbH
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING* file.
-+#.rst:
-+# FindInotify
-+# --------------
-+#
-+# Try to find inotify on this system. This finds:
-+# - libinotify on Unix like systems, or
-+# - the kernel's inotify on Linux systems.
-+#
-+# This will define the following variables:
-+#
-+# ``Inotify_FOUND``
-+# True if inotify is available
-+# ``Inotify_LIBRARIES``
-+# This has to be passed to target_link_libraries()
-+# ``Inotify_INCLUDE_DIRS``
-+# This has to be passed to target_include_directories()
-+#
-+# On Linux, the libraries and include directories are empty,
-+# even though ``Inotify_FOUND`` may be set to TRUE. This is because
-+# no special includes or libraries are needed. On other systems
-+# these may be needed to use inotify.
-+#
-+# Since 5.32.0.
-
--# This module defines
--# INOTIFY_INCLUDE_DIR, where to find inotify.h, etc.
--# INOTIFY_LIBRARY_DIR, the directory holding the inotify library.
--# INOTIFY_FOUND, If false, do not try to use inotify.
--# also defined, but not for general use are
--# INOTIFY_LIBRARY, where to find the inotify library.
-+#=============================================================================
-+# SPDX-FileCopyrightText: 2016 Tobias C. Berner <tcber...@freebsd.org>
-+# SPDX-FileCopyrightText: 2017 Adriaan de Groot <gr...@kde.org>
-+#
-+# SPDX-License-Identifier: BSD-2-Clause
-+#=============================================================================
-
--find_path(INOTIFY_INCLUDE_DIR sys/inotify.h
-- PATH_SUFFIXES inotify)
--mark_as_advanced(INOTIFY_INCLUDE_DIR)
-+find_path(Inotify_INCLUDE_DIRS sys/inotify.h)
-
--find_library(INOTIFY_LIBRARY inotify PATH_SUFFIXES lib/inotify)
-+if(Inotify_INCLUDE_DIRS)
-+# On Linux there is no library to link against, on the BSDs there is.
-+# On the BSD's, inotify is implemented through a library, libinotify.
-+ if( CMAKE_SYSTEM_NAME MATCHES "Linux")
-+ set(Inotify_FOUND TRUE)
-+ set(Inotify_LIBRARIES "")
-+ set(Inotify_INCLUDE_DIRS "")
-+ else()
-+ find_library(Inotify_LIBRARIES NAMES inotify)
-+ include(FindPackageHandleStandardArgs)
-+ find_package_handle_standard_args(Inotify
-+ FOUND_VAR
-+ Inotify_FOUND
-+ REQUIRED_VARS
-+ Inotify_LIBRARIES
-+ Inotify_INCLUDE_DIRS
-+ )
-+ mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS)
-+ include(FeatureSummary)
-+ set_package_properties(Inotify PROPERTIES
-+ URL "https://github.com/libinotify-kqueue/";
-+ DESCRIPTION "inotify API on the *BSD family of operating systems."
-+ )
-+ endif()
-+else()
-+ set(Inotify_FOUND FALSE)
-+endif()
-
--get_filename_component(INOTIFY_LIBRARY_DIR ${INOTIFY_LIBRARY} PATH)
--mark_as_advanced(INOTIFY_LIBRARY_DIR)
--
--# all listed variables are TRUE
--# handle the QUIETLY and REQUIRED arguments and set INOTIFY_FOUND to TRUE if
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(INOTIFY DEFAULT_MSG INOTIFY_INCLUDE_DIR INOTIFY_LIBRARY_DIR)
--
--IF(INOTIFY_FOUND)
-- SET(INotify_INCLUDE_DIRS ${INOTIFY_INCLUDE_DIR})
-- SET(INotify_LIBRARY_DIRS ${INOTIFY_LIBRARY_DIR})
--ENDIF(INOTIFY_FOUND)
--
-+mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS)
Index: patches/patch-src_libsync_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_libsync_CMakeLists_txt
diff -N patches/patch-src_libsync_CMakeLists_txt
--- patches/patch-src_libsync_CMakeLists_txt 24 Apr 2021 04:53:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-src_libsync_CMakeLists_txt,v 1.1 2021/04/24 04:53:27 rsadowski Exp $
-
-Index: src/libsync/CMakeLists.txt
---- src/libsync/CMakeLists.txt.orig
-+++ src/libsync/CMakeLists.txt
-@@ -11,12 +11,6 @@ if ( APPLE )
- )
- endif()
-
--IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|OpenBSD")
-- list(APPEND OS_SPECIFIC_LINK_LIBRARIES
-- inotify
-- )
--ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|OpenBSD")
--
- set(libsync_SRCS
- account.cpp
- pushnotifications.cpp
-@@ -135,10 +129,9 @@ if (NOT TOKEN_AUTH_ONLY)
- target_link_libraries(${synclib_NAME} PUBLIC Qt5::Widgets Qt5::Svg qt5keychain)
- endif()
-
--if(INOTIFY_FOUND)
-- target_include_directories(${synclib_NAME} PRIVATE ${INOTIFY_INCLUDE_DIR})
-- link_directories(${INOTIFY_LIBRARY_DIR})
-- target_link_libraries(${synclib_NAME} ${INOTIFY_LIBRARY} )
-+if(Inotify_FOUND)
-+ target_include_directories(${synclib_NAME} PRIVATE ${Inotify_INCLUDE_DIRS})
-+ target_link_libraries(${synclib_NAME} PUBLIC ${Inotify_LIBRARIES})
- endif()
-
- GENERATE_EXPORT_HEADER( ${synclib_NAME}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 2 May 2021 14:59:45 -0000 1.8
+++ pkg/PLIST 3 Aug 2021 22:02:04 -0000
@@ -15,6 +15,7 @@ include/nextcloudsync/mirall/syncfileite
include/nextcloudsync/mirall/syncresult.h
@lib lib/libnextcloud_csync.so.${LIBnextcloud_csync_VERSION}
@lib lib/libnextcloudsync.so.${LIBnextcloudsync_VERSION}
+@so lib/nextcloudsync_vfs_suffix.so
share/applications/com.nextcloud.desktopclient.nextcloud.desktop
share/examples/Nextcloud/
@sample ${SYSCONFDIR}/Nextcloud/
