Tue Nov 16 09:28:40 2010 UTC ()
Pullup ticket #3275 - requested by dholland
filesystems/fuse: portability fix

Revisions pulled up:
- mk/fuse.buildlink3.mk			1.11
---
Module Name:	pkgsrc
Committed By:	dholland
Date:		Mon Nov 15 04:51:33 UTC 2010

Modified Files:
	pkgsrc/mk: fuse.buildlink3.mk

Log Message:
Use an include guard symbol name that doesn't conflict with
filesystems/fuse/buildlink3.mk.


(tron)
diff -r1.10 -r1.10.6.1 pkgsrc/mk/fuse.buildlink3.mk
cvs diff -r1.10 -r1.10.6.1 pkgsrc/mk/fuse.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/fuse.buildlink3.mk 2010/02/01 21:51:55 1.10
+++ pkgsrc/mk/fuse.buildlink3.mk 2010/11/16 09:28:40 1.10.6.1
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: fuse.buildlink3.mk,v 1.10 2010/02/01 21:51:55 jmmv Exp $ 1# $NetBSD: fuse.buildlink3.mk,v 1.10.6.1 2010/11/16 09:28:40 tron Exp $
2# 2#
3# Makefile fragment for packages using the FUSE framework. 3# Makefile fragment for packages using the FUSE framework.
4# 4#
5 5
6.if !defined(FUSE_BUILDLINK3_MK) 6# The symbol FUSE_BUILDLINK3_MK is used by filesystems/fuse's bl3.mk,
7FUSE_BUILDLINK3_MK= # defined 7# so use something else for our include guard.
 8.if !defined(MK_FUSE_BUILDLINK3_MK)
 9MK_FUSE_BUILDLINK3_MK= # defined
8 10
9.include "bsd.fast.prefs.mk" 11.include "bsd.fast.prefs.mk"
10 12
11. if ${OPSYS} == "Darwin" 13. if ${OPSYS} == "Darwin"
12 14
13. if !exists(/usr/local/include/fuse.h) 15. if !exists(/usr/local/include/fuse.h)
14PKG_FAIL_REASON+= "Couldn't find fuse headers; please install MacFUSE." 16PKG_FAIL_REASON+= "Couldn't find fuse headers; please install MacFUSE."
15. endif 17. endif
16 18
17do-configure-pre-hook: override-fuse-pkgconfig 19do-configure-pre-hook: override-fuse-pkgconfig
18 20
19override-fuse-pkgconfig: override-message-fuse-pkgconfig 21override-fuse-pkgconfig: override-message-fuse-pkgconfig
20override-message-fuse-pkgconfig: 22override-message-fuse-pkgconfig:
@@ -77,14 +79,14 @@ SUBST_FILES.refuse= configure @@ -77,14 +79,14 @@ SUBST_FILES.refuse= configure
77. if exists(${WRKSRC}/${_f_}) 79. if exists(${WRKSRC}/${_f_})
78SUBST_FILES.refuse+= ${_f_} 80SUBST_FILES.refuse+= ${_f_}
79. endif 81. endif
80. endfor 82. endfor
81SUBST_SED.refuse= -e "s|fuse_main|fuse_exit|g" 83SUBST_SED.refuse= -e "s|fuse_main|fuse_exit|g"
82. endif 84. endif
83 85
84. else # !NetBSD 86. else # !NetBSD
85 87
86PKG_FAIL_REASON+= "Your OS is not supported by the FUSE pkgsrc framework." 88PKG_FAIL_REASON+= "Your OS is not supported by the FUSE pkgsrc framework."
87 89
88. endif # end of Operating Systems 90. endif # end of Operating Systems
89 91
90.endif # FUSE_BUILDLINK3_MK 92.endif # MK_FUSE_BUILDLINK3_MK