Received: by mail.netbsd.org (Postfix, from userid 605) id C7BD384E33; Tue, 16 Apr 2019 19:30:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4D99884E06 for ; Tue, 16 Apr 2019 19:30:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id WsgB8z6Q8LzM for ; Tue, 16 Apr 2019 19:30:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BFA0784D91 for ; Tue, 16 Apr 2019 19:30:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B8760FB16; Tue, 16 Apr 2019 19:30:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1555443055182790" MIME-Version: 1.0 Date: Tue, 16 Apr 2019 19:30:55 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/filesystems/fuse-ntfs-3g To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20190416193055.B8760FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1555443055182790 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Tue Apr 16 19:30:55 UTC 2019 Modified Files: pkgsrc/filesystems/fuse-ntfs-3g: Makefile Log Message: filesystems/fuse-ntfs-3g: Use libfuse on NetBSD Due to not fully understood reasons, perhaps use of the low-level FUSE API, or perhaps using a different FUSE high-level API version, this package fails to build with NetBSD's librefuse. It does build when linked against filesystems/fuse, so do that. Not tested, but building is an improvement over not building. (This commit only changes the build on NetBSD.) To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/filesystems/fuse-ntfs-3g/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1555443055182790 Content-Disposition: inline Content-Length: 1310 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/filesystems/fuse-ntfs-3g/Makefile diff -u pkgsrc/filesystems/fuse-ntfs-3g/Makefile:1.20 pkgsrc/filesystems/fuse-ntfs-3g/Makefile:1.21 --- pkgsrc/filesystems/fuse-ntfs-3g/Makefile:1.20 Sat Apr 7 19:46:21 2018 +++ pkgsrc/filesystems/fuse-ntfs-3g/Makefile Tue Apr 16 19:30:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2018/04/07 19:46:21 adam Exp $ +# $NetBSD: Makefile,v 1.21 2019/04/16 19:30:55 gdt Exp $ .include "../../filesystems/libntfs/Makefile.common" @@ -10,12 +10,21 @@ COMMENT= NTFS driver with read and write CONFIGURE_ARGS+= --disable-ntfsprogs CONFIGURE_ARGS+= --enable-mount-helper -NOT_FOR_PLATFORM= NetBSD-*-* # ancient fuse API - BUILD_DIRS= src USE_TOOLS+= pkg-config +.include "../../mk/bsd.prefs.mk" + .include "../../filesystems/libntfs/buildlink3.mk" +.if ${OPSYS} == "NetBSD" +.include "../../filesystems/perfuse/buildlink3.mk" +# fuse-ntfs-3g does not build with librefuse from netbsd-8. +# \todo Add a mechanism in mk/fuse.buildlink3.mk to declare this, rather +# than open-coding the changing of which bl3 line is used. +.include "../../filesystems/fuse/buildlink3.mk" +.else +# Find this platform's preferred FUSE implementation (normal approach). .include "../../mk/fuse.buildlink3.mk" +.endif .include "../../mk/bsd.pkg.mk" --_----------=_1555443055182790--