diff options
| author | gdt <gdt@pkgsrc.org> | 2014-04-30 15:06:25 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2014-04-30 15:06:25 +0000 |
| commit | c02d6057e6575e20ee54d9cd14b9ec9bf73155e6 (patch) | |
| tree | 4b4c8d1d0cc216e6d7360219950103ec05967725 | |
| parent | bd44ea34790ba62e6ab46d929bf002656d883e5a (diff) | |
| download | pkgsrc-c02d6057e6575e20ee54d9cd14b9ec9bf73155e6.tar.gz | |
On Darwin, support osxfuse, and drop support for macfuse.
No change for !=Darwin.
This fixes at least some fuse-using packages.
(Proposed on tech-pkg on April 6, no objections received.)
| -rw-r--r-- | mk/fuse.buildlink3.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mk/fuse.buildlink3.mk b/mk/fuse.buildlink3.mk index e5e361fb5ff..de3d5980744 100644 --- a/mk/fuse.buildlink3.mk +++ b/mk/fuse.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: fuse.buildlink3.mk,v 1.16 2013/03/01 00:08:31 tcort Exp $ +# $NetBSD: fuse.buildlink3.mk,v 1.17 2014/04/30 15:06:25 gdt Exp $ # # Makefile fragment for packages using the FUSE framework. # @@ -12,9 +12,12 @@ MK_FUSE_BUILDLINK3_MK= # defined . if ${OPSYS} == "Darwin" -. if !exists(/usr/local/lib/pkgconfig/fuse.pc) +# On Darwin, we only attempt to support "Fuse for OS X", known as +# "OSXFUSE". MacFuse is dead, and fuse4x is merging into OSXFUSE. + +. if !exists(/usr/local/lib/pkgconfig/osxfuse.pc) PKG_FAIL_REASON+= \ - "Couldn't find fuse; please install MacFUSE or OSXFUSE." + "Couldn't find fuse; please install OSXFUSE." . endif do-configure-pre-hook: override-fuse-pkgconfig @@ -26,12 +29,12 @@ override-message-fuse-pkgconfig: override-fuse-pkgconfig: ${RUN} \ ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ - ${LN} -s /usr/local/lib/pkgconfig/fuse.pc \ + ${LN} -s /usr/local/lib/pkgconfig/osxfuse.pc \ ${BUILDLINK_DIR}/lib/pkgconfig/fuse.pc -BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/fuse -BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/macfuse BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/osxfuse +# Too much! But allows -losxfuse to work. +BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib . elif ${OPSYS} == "Linux" |