Received: by mail.netbsd.org (Postfix, from userid 605) id 541B484D64; Fri, 4 Jun 2021 18:59:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8BA8C84CE8 for ; Fri, 4 Jun 2021 18:59:19 +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 4xvFWSePrkqJ for ; Fri, 4 Jun 2021 18:59:19 +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 136A484CDF for ; Fri, 4 Jun 2021 18:59:19 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 10E1FFA95; Fri, 4 Jun 2021 18:59:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1622833159181470" MIME-Version: 1.0 Date: Fri, 4 Jun 2021 18:59:19 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20210604185919.10E1FFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1622833159181470 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Fri Jun 4 18:59:19 UTC 2021 Modified Files: pkgsrc/mk: fuse.buildlink3.mk Log Message: fuse.buildlink3.mk: on macOS, allow to use macFUSE (formerly OSXFUSE) To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/mk/fuse.buildlink3.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1622833159181470 Content-Disposition: inline Content-Length: 1728 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/fuse.buildlink3.mk diff -u pkgsrc/mk/fuse.buildlink3.mk:1.21 pkgsrc/mk/fuse.buildlink3.mk:1.22 --- pkgsrc/mk/fuse.buildlink3.mk:1.21 Fri May 1 21:12:05 2020 +++ pkgsrc/mk/fuse.buildlink3.mk Fri Jun 4 18:59:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: fuse.buildlink3.mk,v 1.21 2020/05/01 21:12:05 rillig Exp $ +# $NetBSD: fuse.buildlink3.mk,v 1.22 2021/06/04 18:59:18 adam Exp $ # # Makefile fragment for packages using the FUSE framework. # @@ -12,12 +12,13 @@ MK_FUSE_BUILDLINK3_MK= # defined . if ${OPSYS} == "Darwin" -# On Darwin, we only attempt to support "Fuse for OS X", known as -# "OSXFUSE". MacFuse is dead, and fuse4x is merging into OSXFUSE. +# On Darwin, we only attempt to support macFUSE. +# https://macfuse.io/ -. if !exists(/usr/local/lib/pkgconfig/osxfuse.pc) +. if !exists(/usr/local/lib/pkgconfig/osxfuse.pc) && \ + !exists(/usr/local/lib/pkgconfig/fuse.pc) PKG_FAIL_REASON+= \ - "Couldn't find fuse; please install OSXFUSE." + "Couldn't find fuse; please install macFUSE." . endif do-configure-pre-hook: override-fuse-pkgconfig @@ -27,10 +28,14 @@ override-message-fuse-pkgconfig: @${STEP_MSG} "Setting up usage of native fuse." override-fuse-pkgconfig: - ${RUN} \ - ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ + ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig +.if exists(/usr/local/lib/pkgconfig/osxfuse.pc) ${LN} -s /usr/local/lib/pkgconfig/osxfuse.pc \ ${BUILDLINK_DIR}/lib/pkgconfig/fuse.pc +.elif exists(/usr/local/lib/pkgconfig/fuse.pc) + ${LN} -s /usr/local/lib/pkgconfig/fuse.pc \ + ${BUILDLINK_DIR}/lib/pkgconfig/fuse.pc +.endif BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/osxfuse # Too much! But allows -losxfuse to work. --_----------=_1622833159181470--