Revision: 67203 http://trac.macports.org/changeset/67203 Author: macsforever2000@macports.org Date: 2010-05-01 20:10:12 -0700 (Sat, 01 May 2010) Log Message: ----------- build fix. (#24248) Modified Paths: -------------- trunk/dports/fuse/macfuse/files/patch-10.5-to-10.6.diff Modified: trunk/dports/fuse/macfuse/files/patch-10.5-to-10.6.diff =================================================================== --- trunk/dports/fuse/macfuse/files/patch-10.5-to-10.6.diff 2010-05-01 23:47:52 UTC (rev 67202) +++ trunk/dports/fuse/macfuse/files/patch-10.5-to-10.6.diff 2010-05-02 03:10:12 UTC (rev 67203) @@ -1,3 +1,157 @@ +--- 10.6/fusefs/fusefs.xcodeproj/project.pbxproj 2010-03-29 16:18:38.000000000 -0400 ++++ 10.6/fusefs/fusefs.xcodeproj/project.pbxproj 2010-03-29 16:25:47.000000000 -0400 +@@ -550,11 +550,7 @@ + isa = XCBuildConfiguration; + baseConfigurationReference = 54A06B920C9DE6060045DC0D /* MacFUSE.xcconfig */; + buildSettings = { +- ARCHS = ( +- x86_64, +- i386, +- ppc, +- ); ++ ARCHS = i386; + COPY_PHASE_STRIP = NO; + GCC_C_LANGUAGE_STANDARD = "compiler-default"; + GCC_DYNAMIC_NO_PIC = NO; +@@ -591,7 +587,6 @@ + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; + INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Extensions"; +- MACOSX_DEPLOYMENT_TARGET = 10.5; + "MACOSX_DEPLOYMENT_TARGET[sdk=macosx10.6][arch=x86_64]" = 10.6; + MODULE_NAME = com.google.filesystems.fusefs; + MODULE_START = fusefs_start; +@@ -612,11 +607,7 @@ + isa = XCBuildConfiguration; + baseConfigurationReference = 54A06B920C9DE6060045DC0D /* MacFUSE.xcconfig */; + buildSettings = { +- ARCHS = ( +- x86_64, +- i386, +- ppc, +- ); ++ ARCHS = i386; + COPY_PHASE_STRIP = YES; + DEPLOYMENT_POSTPROCESSING = YES; + EXPORTED_SYMBOLS_FILE = MacFUSE.exports; +@@ -653,7 +644,6 @@ + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; + INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Extensions"; +- MACOSX_DEPLOYMENT_TARGET = 10.5; + "MACOSX_DEPLOYMENT_TARGET[sdk=macosx10.6][arch=x86_64]" = 10.6; + MODULE_NAME = com.google.filesystems.fusefs; + MODULE_START = fusefs_start; +@@ -675,10 +665,7 @@ + isa = XCBuildConfiguration; + baseConfigurationReference = 54A06B920C9DE6060045DC0D /* MacFUSE.xcconfig */; + buildSettings = { +- ARCHS = ( +- i386, +- ppc, +- ); ++ ARCHS = i386; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; +@@ -686,7 +673,7 @@ + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; + PREBINDING = NO; +- SDKROOT = macosx10.5; ++ SDKROOT = macosx10.6; + }; + name = Debug; + }; +@@ -694,10 +681,7 @@ + isa = XCBuildConfiguration; + baseConfigurationReference = 54A06B920C9DE6060045DC0D /* MacFUSE.xcconfig */; + buildSettings = { +- ARCHS = ( +- i386, +- ppc, +- ); ++ ARCHS = i386; + COPY_PHASE_STRIP = NO; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; +@@ -706,7 +690,7 @@ + INFOPLIST_PREPROCESS = YES; + INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; + PREBINDING = NO; +- SDKROOT = macosx10.5; ++ SDKROOT = macosx10.6; + STRIP_INSTALLED_PRODUCT = NO; + }; + name = Release; +@@ -714,7 +698,7 @@ + 540966220C33B4F800F5E227 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { +- ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ++ ARCHS = i386; + COPY_PHASE_STRIP = NO; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_DYNAMIC_NO_PIC = NO; +@@ -747,7 +731,6 @@ + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VALUE = YES; + INSTALL_PATH = "$(HOME)/bin"; +- MACOSX_DEPLOYMENT_TARGET = 10.5; + PREBINDING = NO; + PRODUCT_NAME = mount_fusefs; + ZERO_LINK = YES; +@@ -757,7 +740,7 @@ + 540966230C33B4F800F5E227 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { +- ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ++ ARCHS = i386; + COPY_PHASE_STRIP = YES; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_C_LANGUAGE_STANDARD = c99; +@@ -790,7 +773,6 @@ + GCC_WARN_UNUSED_VALUE = YES; + INSTALL_PATH = "$(HOME)/bin"; + LINK_WITH_STANDARD_LIBRARIES = YES; +- MACOSX_DEPLOYMENT_TARGET = 10.5; + PREBINDING = NO; + PRODUCT_NAME = mount_fusefs; + STRIP_INSTALLED_PRODUCT = YES; +@@ -849,7 +831,7 @@ + 54D47B910B4F614B00A8FE1C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { +- ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ++ ARCHS = i386; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; +@@ -882,7 +864,6 @@ + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VALUE = YES; + INSTALL_PATH = "$(HOME)/bin"; +- MACOSX_DEPLOYMENT_TARGET = 10.5; + PREBINDING = NO; + PRODUCT_NAME = load_fusefs; + ZERO_LINK = YES; +@@ -892,7 +873,7 @@ + 54D47B920B4F614B00A8FE1C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { +- ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ++ ARCHS = i386; + COPY_PHASE_STRIP = YES; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; +@@ -924,7 +905,6 @@ + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VALUE = YES; + INSTALL_PATH = "$(HOME)/bin"; +- MACOSX_DEPLOYMENT_TARGET = 10.5; + PREBINDING = NO; + PRODUCT_NAME = load_fusefs; + STRIP_INSTALLED_PRODUCT = YES; --- 10.6/libfuse/fuse-2.7.3-macosx.patch 2009-12-15 19:51:06.000000000 -0500 +++ 10.6/libfuse/fuse-2.7.3-macosx.patch 2009-11-29 20:58:34.000000000 -0500 @@ -375,7 +375,7 @@