CVS commit: pkgsrc/filesystems/fuse-encfs

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Apr 18 05:36:14 UTC 2024

Modified Files:
        pkgsrc/filesystems/fuse-encfs: Makefile distinfo
Added Files:
        pkgsrc/filesystems/fuse-encfs/patches: patch-cmake_FindFUSE.cmake

Log Message:
filesystems/fuse-encfs: Fix build on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/filesystems/fuse-encfs/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/filesystems/fuse-encfs/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake

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

Modified files:

Index: pkgsrc/filesystems/fuse-encfs/Makefile
diff -u pkgsrc/filesystems/fuse-encfs/Makefile:1.23 pkgsrc/filesystems/fuse-encfs/Makefile:1.24
--- pkgsrc/filesystems/fuse-encfs/Makefile:1.23 Tue Oct 24 22:09:05 2023
+++ pkgsrc/filesystems/fuse-encfs/Makefile      Thu Apr 18 05:36:13 2024
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2023/10/24 22:09:05 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2024/04/18 05:36:13 pho Exp $
 #
 
-GITHUB_PROJECT=        encfs
-GITHUB_TAG=    v${PKGVERSION_NOREV}
 DISTNAME=      encfs-1.9.5
-PKGREVISION=   2
 PKGNAME=       fuse-${DISTNAME}
+PKGREVISION=   2
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vgough/}
+GITHUB_PROJECT=        encfs
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://vgough.github.io/encfs/
@@ -38,6 +38,7 @@ TEST_TARGET=  test
 post-extract:
        ${RUN} mkdir -p ${WRKDIR}/build
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/fuse.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/filesystems/fuse-encfs/distinfo
diff -u pkgsrc/filesystems/fuse-encfs/distinfo:1.15 pkgsrc/filesystems/fuse-encfs/distinfo:1.16
--- pkgsrc/filesystems/fuse-encfs/distinfo:1.15 Sat Jan 22 18:32:47 2022
+++ pkgsrc/filesystems/fuse-encfs/distinfo      Thu Apr 18 05:36:13 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.15 2022/01/22 18:32:47 pho Exp $
+$NetBSD: distinfo,v 1.16 2024/04/18 05:36:13 pho Exp $
 
 BLAKE2s (encfs-1.9.5.tar.gz) = 58fea7cdf47aadffcfbf315f5881ceb77da74e07a964042d7d3a7e8587f13362
 SHA512 (encfs-1.9.5.tar.gz) = 036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46
 Size (encfs-1.9.5.tar.gz) = 2798888 bytes
+SHA1 (patch-cmake_FindFUSE.cmake) = e8ec6f66892e10951b42e28d2bdcad56f602eb52
 SHA1 (patch-encfs_DirNode.cpp) = 960480ee442f534357e3325c5001b6056b2338a6
 SHA1 (patch-encfs_FileUtils.cpp) = 05e67084abb853d8d01f6da2079994689722a343
 SHA1 (patch-encfs_main.cpp) = d1215725edce4b6ec766e6b96f46acb441dd4088

Added files:

Index: pkgsrc/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake
diff -u /dev/null pkgsrc/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake:1.3
--- /dev/null   Thu Apr 18 05:36:14 2024
+++ pkgsrc/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake    Thu Apr 18 05:36:13 2024
@@ -0,0 +1,32 @@
+$NetBSD: patch-cmake_FindFUSE.cmake,v 1.3 2024/04/18 05:36:13 pho Exp $
+
+Use pkg-config for finding FUSE. Don't look for hard-coded paths.
+
+--- cmake/FindFUSE.cmake.orig  2018-04-27 08:52:22.000000000 +0000
++++ cmake/FindFUSE.cmake
+@@ -9,21 +9,10 @@ if (FUSE_INCLUDE_DIR)
+         SET (FUSE_FIND_QUIETLY TRUE)
+ endif (FUSE_INCLUDE_DIR)
+ 
+-if (APPLE)
+-    set (FUSE_NAMES libosxfuse.dylib fuse)
+-    set (FUSE_SUFFIXES osxfuse fuse)
+-else (APPLE)
+-    set (FUSE_NAMES fuse refuse)
+-    set (FUSE_SUFFIXES fuse refuse)
+-endif (APPLE)
+-
+-# find includes
+-find_path (FUSE_INCLUDE_DIR fuse.h
+-        PATHS /opt /opt/local /usr/pkg
+-        PATH_SUFFIXES ${FUSE_SUFFIXES})
+-
+-# find lib
+-find_library (FUSE_LIBRARIES NAMES ${FUSE_NAMES})
++find_package(PkgConfig REQUIRED)
++pkg_search_module(FUSE REQUIRED fuse)
++set(FUSE_INCLUDE_DIR "${FUSE_INCLUDE_DIRS}")
++set(FUSE_LIBRARIES "${FUSE_LINK_LIBRARIES}")
+ 
+ include ("FindPackageHandleStandardArgs")
+ find_package_handle_standard_args ("FUSE" DEFAULT_MSG