Ticket #23007: patch-macfuse-10.5.diff

Portfile

@@ -32 +32 @@
                     patch-macfuse_buildtool.sh.diff \
                     patch-sdk-objc_GMUserFileSystem.m.diff \
                     patch-sdk-objc_MacFuse.xcodeproj.diff \
-                    patch-10.4_libfuse_fuse-2.7.3-macosx.patch.diff \
+                    patch-10.5_fusefs_fusefs.xcodeproj_project.pbxproj.diff \
                     patch-10.5_libfuse_fuse-2.7.3-macosx.patch.diff \
                     patch-10.6_libfuse_fuse-2.7.3-macosx.patch.diff
 
@@ -46 +46 @@
     # and we don't want to error out if someone says +universal
 }
 
-# ensure that user is running OS X 10.4 or higher
+# ensure that user is running OS X 10.5 or higher: MacFUSE requires XCode 3
 pre-fetch {
-    if {${os.platform} != "darwin" || [rpm-vercomp ${os.version} 8.0.0] < 0} {
-        return -code error "MacFUSE requires at least Mac OS X 10.4 to run"
+    if {${os.platform} != "darwin" || [rpm-vercomp ${os.version} 9.0.0] < 0} {
+        return -code error "MacFUSE requires at least Mac OS X 10.5 to build"
     }
 }
 
@@ -64 +64 @@
 post-patch {
     reinplace s,/usr/local,${prefix},g ${worksrcpath}/macfuse_buildtool.sh
     reinplace s,/usr/local,${prefix},g ${worksrcpath}/sdk-objc/MacFUSE.xcodeproj/project.pbxproj
+    reinplace s,@@PREFIX@@,${prefix},g ${worksrcpath}/10.5/libfuse/fuse-2.7.3-macosx.patch
     reinplace s,@@PREFIX@@,${prefix},g ${worksrcpath}/10.6/libfuse/fuse-2.7.3-macosx.patch
     reinplace s,@@WORKPATH@@,${workpath},g ${worksrcpath}/macfuse_buildtool.sh
     reinplace s,@@DESTPATH@@,${destpath},g ${worksrcpath}/macfuse_buildtool.sh

files/patch-10.5_fusefs_fusefs.xcodeproj_project.pbxproj.diff

@@ +1 @@
+--- 10.5/fusefs/fusefs.xcodeproj/project.pbxproj        2008-11-06 15:41:14.000000000 -0800
++++ 10.5/fusefs/fusefs.xcodeproj/project.pbxproj        2009-12-23 19:18:15.000000000 -0800
+@@ -551,7 +551,7 @@
+                        baseConfigurationReference = 54A06B920C9DE6060045DC0D /* MacFUSE.xcconfig */;
+                        buildSettings = {
+                                ARCHS = (
+-                                       x86_64,
++                                       /*x86_64,*/
+                                        i386,
+                                        ppc,
+                                );
+@@ -613,7 +613,7 @@
+                        baseConfigurationReference = 54A06B920C9DE6060045DC0D /* MacFUSE.xcconfig */;
+                        buildSettings = {
+                                ARCHS = (
+-                                       x86_64,
++                                       /*x86_64,*/
+                                        i386,
+                                        ppc,
+                                );