[pkgsrc/trunk]: pkgsrc/mk On Darwin, support osxfuse, and drop support for ma...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e31df907b725
branches:  trunk
changeset: 633681:e31df907b725
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Apr 30 15:06:25 2014 +0000

description:
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.)

diffstat:

 mk/fuse.buildlink3.mk |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 70b7bc02815b -r e31df907b725 mk/fuse.buildlink3.mk
--- a/mk/fuse.buildlink3.mk     Wed Apr 30 14:19:40 2014 +0000
+++ b/mk/fuse.buildlink3.mk     Wed Apr 30 15:06:25 2014 +0000
@@ -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 @@
 
 .  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-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"