[80427] trunk/dports/fuse/macfuse

dports at macports.org dports at macports.org
Tue Jul 12 10:37:15 PDT 2011


Revision: 80427
          http://trac.macports.org/changeset/80427
Author:   dports at macports.org
Date:     2011-07-12 10:37:14 -0700 (Tue, 12 Jul 2011)
Log Message:
-----------
macfuse: add Lion support (#30066)
 * create a 10.7 dir for fusefs/libfuse that links against the proper SDK
 * patch fusefs kext to reflect new layout of ucred struct
 * patch to prevent compiler warning on mount_fusefs
 * add 10.7 build support to Obj-C SDK
 * build Obj-C SDK using default system gcc version rather than
   forcing 4.0 since it is not installed by default on Lion. Note that
   this affects 10.6 builds too (will use 4.2 instead of 4.0).

Modified Paths:
--------------
    trunk/dports/fuse/macfuse/Portfile
    trunk/dports/fuse/macfuse/files/patch-macfuse_buildtool.sh.diff
    trunk/dports/fuse/macfuse/files/patch-sdk-objc_MacFuse.xcodeproj.diff

Added Paths:
-----------
    trunk/dports/fuse/macfuse/files/patch-10.5-to-10.7.diff
    trunk/dports/fuse/macfuse/files/patch-10.7-cr_posix.diff
    trunk/dports/fuse/macfuse/files/patch-10.7_fusefs_mount_mount_fusefs.c.diff
    trunk/dports/fuse/macfuse/files/patch-10.7_libfuse_fuse-2.7.3-macosx.patch.diff
    trunk/dports/fuse/macfuse/files/patch-sdk-objc_MacFUSE.xcodeproj-default-gcc.diff

Modified: trunk/dports/fuse/macfuse/Portfile
===================================================================
--- trunk/dports/fuse/macfuse/Portfile	2011-07-12 17:29:20 UTC (rev 80426)
+++ trunk/dports/fuse/macfuse/Portfile	2011-07-12 17:37:14 UTC (rev 80427)
@@ -5,7 +5,7 @@
 
 name                macfuse
 version             2.0.3
-revision            4
+revision            5
 categories          fuse devel
 platforms           macosx
 maintainers         dports
@@ -32,13 +32,18 @@
 depends_lib         port:libiconv
 
 patchfiles          patch-10.5-to-10.6.diff \
+                    patch-10.5-to-10.7.diff \
                     patch-macfuse_buildtool.sh.diff \
                     patch-sdk-objc_GMUserFileSystem.m.diff \
+                    patch-sdk-objc_MacFUSE.xcodeproj-default-gcc.diff \
                     patch-sdk-objc_MacFuse.xcodeproj.diff \
                     patch-10.5_fusefs_fusefs.xcodeproj_project.pbxproj.diff \
                     patch-10.5_universal_build.diff \
                     patch-10.5_libfuse_fuse-2.7.3-macosx.patch.diff \
-                    patch-10.6_libfuse_fuse-2.7.3-macosx.patch.diff
+                    patch-10.6_libfuse_fuse-2.7.3-macosx.patch.diff \
+                    patch-10.7_libfuse_fuse-2.7.3-macosx.patch.diff \
+                    patch-10.7-cr_posix.diff \
+                    patch-10.7_fusefs_mount_mount_fusefs.c.diff
 
 livecheck.type      googlecode
 livecheck.distname  MacFUSE-(.*)%2C.*.dmg
@@ -63,6 +68,7 @@
 # use cp -R instead of cp -r or copy to preserve symlinks
 pre-patch {
     system "cp -R ${worksrcpath}/10.5 ${worksrcpath}/10.6"
+    system "cp -R ${worksrcpath}/10.5 ${worksrcpath}/10.7"
 }
 
 post-patch {
@@ -70,6 +76,7 @@
     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,@@PREFIX@@,${prefix},g ${worksrcpath}/10.7/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
 }

Added: trunk/dports/fuse/macfuse/files/patch-10.5-to-10.7.diff
===================================================================
--- trunk/dports/fuse/macfuse/files/patch-10.5-to-10.7.diff	                        (rev 0)
+++ trunk/dports/fuse/macfuse/files/patch-10.5-to-10.7.diff	2011-07-12 17:37:14 UTC (rev 80427)
@@ -0,0 +1,184 @@
+--- 10.7/fusefs/fusefs.xcodeproj/project.pbxproj	2010-03-29 16:18:38.000000000 -0400
++++ 10.7/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.7;
+ 			};
+ 			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.7;
+ 				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.7/libfuse/fuse-2.7.3-macosx.patch	2009-12-15 19:51:06.000000000 -0500
++++ 10.7/libfuse/fuse-2.7.3-macosx.patch	2009-11-29 20:58:34.000000000 -0500
+@@ -375,7 +375,7 @@
+ +
+ +Making a Universal build of libfuse:
+ +
+-+1. Run "/bin/sh ./darwin_configure.sh /path/to/macfuse/core/10.5/fusefs/"
+++1. Run "/bin/sh ./darwin_configure.sh /path/to/macfuse/core/10.7/fusefs/"
+ +2. Run make
+ +
+ +If you begin with the "raw" patch, you need to perform a step 0 as follows:
+@@ -37607,7 +37607,7 @@
+ +MACFUSE_SRCROOT=${MACFUSE_SRCROOT:-$1}
+ +MACFUSE_SRCROOT=${MACFUSE_SRCROOT:?}
+ +
+-+CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch ppc -arch x86_64 -arch ppc64 -isysroot /Developer/SDKs/MacOSX10.5.sdk" LDFLAGS="-arch i386 -arch ppc -arch x86_64 -arch ppc64 -framework CoreFoundation" ./configure --prefix=/usr/local --disable-dependency-tracking --disable-static
+++CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.7.sdk" LDFLAGS="-arch i386 -arch x86_64  -framework CoreFoundation" ./configure --prefix=/usr/local --disable-dependency-tracking --disable-static
+ diff -Naur old/darwin_configure_ino64.sh new/darwin_configure_ino64.sh
+ --- old/darwin_configure_ino64.sh	1969-12-31 16:00:00.000000000 -0800
+ +++ new/darwin_configure_ino64.sh	2008-11-26 21:50:02.000000000 -0800
+@@ -37617,7 +37617,7 @@
+ +MACFUSE_SRCROOT=${MACFUSE_SRCROOT:-$1}
+ +MACFUSE_SRCROOT=${MACFUSE_SRCROOT:?}
+ +
+-+CFLAGS="-D__DARWIN_64_BIT_INO_T=1 -D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch ppc -arch x86_64 -arch ppc64 -isysroot /Developer/SDKs/MacOSX10.5.sdk" LDFLAGS="-arch i386 -arch ppc -arch x86_64 -arch ppc64 -framework CoreFoundation" ./configure --prefix=/usr/local --disable-dependency-tracking --disable-static
+++CFLAGS="-D__DARWIN_64_BIT_INO_T=1 -D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.7.sdk" LDFLAGS="-arch i386 -arch x86_64 -framework CoreFoundation" ./configure --prefix=/usr/local --disable-dependency-tracking --disable-static
+ diff -Naur old/example/Makefile.am new/example/Makefile.am
+ --- old/example/Makefile.am	2008-02-19 11:51:22.000000000 -0800
+ +++ new/example/Makefile.am	2008-11-26 21:50:02.000000000 -0800
+diff -ur work/core-orig/10.5/libfuse/fuse-current-macosx.patch work/core/10.7/libfuse/fuse-current-macosx.patch

Added: trunk/dports/fuse/macfuse/files/patch-10.7-cr_posix.diff
===================================================================
--- trunk/dports/fuse/macfuse/files/patch-10.7-cr_posix.diff	                        (rev 0)
+++ trunk/dports/fuse/macfuse/files/patch-10.7-cr_posix.diff	2011-07-12 17:37:14 UTC (rev 80427)
@@ -0,0 +1,79 @@
+--- 10.7/fusefs/fuse_internal.h.orig	2011-07-11 18:30:24.000000000 -0400
++++ 10.7/fusefs/fuse_internal.h	2011-07-11 18:31:43.000000000 -0400
+@@ -69,15 +69,15 @@
+ int
+ fuse_match_cred(kauth_cred_t daemoncred, kauth_cred_t requestcred)
+ {
+-    if ((daemoncred->cr_uid == requestcred->cr_uid)             &&  
+-        (daemoncred->cr_uid == requestcred->cr_ruid)            &&  
++    if ((daemoncred->cr_posix.cr_uid == requestcred->cr_posix.cr_uid)             &&  
++        (daemoncred->cr_posix.cr_uid == requestcred->cr_posix.cr_ruid)            &&  
+ 
+         // THINK_ABOUT_THIS_LATER
+-        // (daemoncred->cr_uid == requestcred->cr_svuid)        &&  
++        // (daemoncred->cr_posix.cr_uid == requestcred->cr_posix.cr_svuid)        &&  
+ 
+-        (daemoncred->cr_groups[0] == requestcred->cr_groups[0]) &&
+-        (daemoncred->cr_groups[0] == requestcred->cr_rgid)      &&  
+-        (daemoncred->cr_groups[0] == requestcred->cr_svgid)) {
++        (daemoncred->cr_posix.cr_groups[0] == requestcred->cr_posix.cr_groups[0]) &&
++        (daemoncred->cr_posix.cr_groups[0] == requestcred->cr_posix.cr_rgid)      &&  
++        (daemoncred->cr_posix.cr_groups[0] == requestcred->cr_posix.cr_svgid)) {
+         return 0;
+     }   
+ 
+@@ -88,7 +88,7 @@
+ int
+ fuse_vfs_context_issuser(vfs_context_t context)
+ {
+-    return (vfs_context_ucred(context)->cr_uid == 0);
++    return (vfs_context_ucred(context)->cr_posix.cr_uid == 0);
+ }
+ 
+ static __inline__
+--- 10.7/fusefs/fuse_ipc.c.orig	2011-07-11 18:21:29.000000000 -0400
++++ 10.7/fusefs/fuse_ipc.c	2011-07-11 18:33:40.000000000 -0400
+@@ -904,8 +904,8 @@
+ 
+     if (context) {
+         ihead->pid = vfs_context_pid(context);
+-        ihead->uid = vfs_context_ucred(context)->cr_uid;
+-        ihead->gid = vfs_context_ucred(context)->cr_gid;
++        ihead->uid = vfs_context_ucred(context)->cr_posix.cr_uid;
++        ihead->gid = vfs_context_ucred(context)->cr_posix.cr_gid;
+     } else {
+         /* XXX: could use more thought */
+         ihead->pid = proc_pid((proc_t)current_proc());
+--- 10.7/fusefs/fuse_vfsops.c.orig	2011-07-11 18:21:29.000000000 -0400
++++ 10.7/fusefs/fuse_vfsops.c	2011-07-11 18:33:54.000000000 -0400
+@@ -407,7 +407,7 @@
+     }
+ 
+     if (fuse_vfs_context_issuser(context) &&
+-        vfs_context_ucred(context)->cr_uid != data->daemoncred->cr_uid) {
++        vfs_context_ucred(context)->cr_posix.cr_uid != data->daemoncred->cr_posix.cr_uid) {
+         fuse_device_unlock(fdev);
+         err = EPERM;
+         goto out;
+@@ -476,7 +476,7 @@
+            vfsstatfsp->f_files  = vfs_attr.f_files;
+            vfsstatfsp->f_ffree  = vfs_attr.f_ffree;
+            /* vfsstatfsp->f_fsid already handled above */
+-           vfsstatfsp->f_owner  = data->daemoncred->cr_uid;
++           vfsstatfsp->f_owner  = data->daemoncred->cr_posix.cr_uid;
+            vfsstatfsp->f_flags  = vfs_flags(mp);
+            /* vfsstatfsp->f_fstypename already handled above */
+            /* vfsstatfsp->f_mntonname handled elsewhere */
+--- 10.7/fusefs/fuse_vnops.c.orig	2011-07-11 18:21:29.000000000 -0400
++++ 10.7/fusefs/fuse_vnops.c	2011-07-11 18:33:57.000000000 -0400
+@@ -810,8 +810,8 @@
+ fake:
+     bzero(vap, sizeof(*vap));
+     VATTR_RETURN(vap, va_type, vnode_vtype(vp));
+-    VATTR_RETURN(vap, va_uid, data->daemoncred->cr_uid);
+-    VATTR_RETURN(vap, va_gid, data->daemoncred->cr_gid);
++    VATTR_RETURN(vap, va_uid, data->daemoncred->cr_posix.cr_uid);
++    VATTR_RETURN(vap, va_gid, data->daemoncred->cr_posix.cr_gid);
+     VATTR_RETURN(vap, va_mode, S_IRWXU);
+ 
+     return 0;

Added: trunk/dports/fuse/macfuse/files/patch-10.7_fusefs_mount_mount_fusefs.c.diff
===================================================================
--- trunk/dports/fuse/macfuse/files/patch-10.7_fusefs_mount_mount_fusefs.c.diff	                        (rev 0)
+++ trunk/dports/fuse/macfuse/files/patch-10.7_fusefs_mount_mount_fusefs.c.diff	2011-07-12 17:37:14 UTC (rev 80427)
@@ -0,0 +1,11 @@
+--- 10.7/fusefs/mount/mount_fusefs.c.orig	2011-07-11 18:45:57.000000000 -0400
++++ 10.7/fusefs/mount/mount_fusefs.c	2011-07-11 18:46:11.000000000 -0400
+@@ -875,7 +875,7 @@
+ 
+     if (fstypename) {
+         if (strlen(fstypename) > FUSE_FSTYPENAME_MAXLEN) {
+-            errx(EX_USAGE, "fstypename can be at most %d characters",
++            errx(EX_USAGE, "fstypename can be at most %ld characters",
+                  FUSE_FSTYPENAME_MAXLEN);
+         } else {
+             snprintf(args.fstypename, MFSTYPENAMELEN, "%s", fstypename);

Added: trunk/dports/fuse/macfuse/files/patch-10.7_libfuse_fuse-2.7.3-macosx.patch.diff
===================================================================
--- trunk/dports/fuse/macfuse/files/patch-10.7_libfuse_fuse-2.7.3-macosx.patch.diff	                        (rev 0)
+++ trunk/dports/fuse/macfuse/files/patch-10.7_libfuse_fuse-2.7.3-macosx.patch.diff	2011-07-12 17:37:14 UTC (rev 80427)
@@ -0,0 +1,20 @@
+--- 10.7/libfuse/fuse-2.7.3-macosx.patch.orig	2010-10-31 19:01:52.000000000 -0400
++++ 10.7/libfuse/fuse-2.7.3-macosx.patch	2010-10-31 19:08:48.000000000 -0400
+@@ -37601,13 +37601,15 @@
+ diff -Naur old/darwin_configure.sh new/darwin_configure.sh
+ --- old/darwin_configure.sh	1969-12-31 16:00:00.000000000 -0800
+ +++ new/darwin_configure.sh	2008-11-26 21:50:02.000000000 -0800
+-@@ -0,0 +1,6 @@
++@@ -0,0 +1,8 @@
+ +#! /bin/sh
+ +
+ +MACFUSE_SRCROOT=${MACFUSE_SRCROOT:-$1}
+ +MACFUSE_SRCROOT=${MACFUSE_SRCROOT:?}
+ +
+-+CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.7.sdk" LDFLAGS="-arch i386 -arch x86_64  -framework CoreFoundation" ./configure --prefix=/usr/local --disable-dependency-tracking --disable-static
+++@@PREFIX@@/bin/autoreconf --install --force
+++
+++CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.6.sdk" LDFLAGS="-arch i386 -arch x86_64  -framework CoreFoundation" ./configure --prefix=@@PREFIX@@ --disable-dependency-tracking --disable-static --with-libiconv-prefix=@@PREFIX@@
+ diff -Naur old/darwin_configure_ino64.sh new/darwin_configure_ino64.sh
+ --- old/darwin_configure_ino64.sh	1969-12-31 16:00:00.000000000 -0800
+ +++ new/darwin_configure_ino64.sh	2008-11-26 21:50:02.000000000 -0800

Modified: trunk/dports/fuse/macfuse/files/patch-macfuse_buildtool.sh.diff
===================================================================
--- trunk/dports/fuse/macfuse/files/patch-macfuse_buildtool.sh.diff	2011-07-12 17:29:20 UTC (rev 80426)
+++ trunk/dports/fuse/macfuse/files/patch-macfuse_buildtool.sh.diff	2011-07-12 17:37:14 UTC (rev 80427)
@@ -14,7 +14,7 @@
  readonly M_CONFIGURATIONS="Debug Release" # default is Release
  readonly M_PLATFORMS="10.4 10.5 10.6"     # default is native
 -readonly M_PLATFORMS_REALISTIC="10.4 10.5"
-+readonly M_PLATFORMS_REALISTIC="10.4 10.5 10.6"
++readonly M_PLATFORMS_REALISTIC="10.4 10.5 10.6 10.7"
  readonly M_TARGETS="clean dist examples lib libsrc reload smalldist swconfigure"
  readonly M_TARGETS_WITH_PLATFORM="examples lib libsrc smalldist swconfigure"
  

Added: trunk/dports/fuse/macfuse/files/patch-sdk-objc_MacFUSE.xcodeproj-default-gcc.diff
===================================================================
--- trunk/dports/fuse/macfuse/files/patch-sdk-objc_MacFUSE.xcodeproj-default-gcc.diff	                        (rev 0)
+++ trunk/dports/fuse/macfuse/files/patch-sdk-objc_MacFUSE.xcodeproj-default-gcc.diff	2011-07-12 17:37:14 UTC (rev 80427)
@@ -0,0 +1,18 @@
+--- sdk-objc/MacFUSE.xcodeproj/project.pbxproj.orig	2011-07-11 19:58:21.000000000 -0400
++++ sdk-objc/MacFUSE.xcodeproj/project.pbxproj	2011-07-11 19:58:28.000000000 -0400
+@@ -408,7 +408,6 @@
+ 				GCC_ENABLE_OBJC_GC = supported;
+ 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+-				GCC_VERSION = 4.0;
+ 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ 				GCC_WARN_UNUSED_VARIABLE = YES;
+ 				INFOPLIST_EXPAND_BUILD_SETTINGS = YES;
+@@ -447,7 +446,6 @@
+ 				GCC_ENABLE_OBJC_GC = supported;
+ 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+-				GCC_VERSION = 4.0;
+ 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ 				GCC_WARN_UNUSED_VARIABLE = YES;
+ 				INFOPLIST_EXPAND_BUILD_SETTINGS = YES;

Modified: trunk/dports/fuse/macfuse/files/patch-sdk-objc_MacFuse.xcodeproj.diff
===================================================================
--- trunk/dports/fuse/macfuse/files/patch-sdk-objc_MacFuse.xcodeproj.diff	2011-07-12 17:29:20 UTC (rev 80426)
+++ trunk/dports/fuse/macfuse/files/patch-sdk-objc_MacFuse.xcodeproj.diff	2011-07-12 17:37:14 UTC (rev 80427)
@@ -1,5 +1,5 @@
 --- sdk-objc/MacFUSE.xcodeproj/project.pbxproj	2008-12-02 21:46:02.000000000 -0500
-+++ sdk-objc/MacFUSE.xcodeproj/project.pbxproj	2009-11-29 20:58:35.000000000 -0500
++++ sdk-objc/MacFUSE.xcodeproj/project.pbxproj	2011-07-11 19:20:28.000000000 -0400
 @@ -7,6 +7,20 @@
  	objects = {
  
@@ -21,7 +21,28 @@
  		28D525B50EA8076400B7CF7B /* GMAppleDouble.h in Headers */ = {isa = PBXBuildFile; fileRef = FF4337460D27697A00554C02 /* GMAppleDouble.h */; settings = {ATTRIBUTES = (Public, ); }; };
  		28D525B60EA8076400B7CF7B /* GMFinderInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = FF4337480D27697A00554C02 /* GMFinderInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
  		28D525B70EA8076400B7CF7B /* GMResourceFork.h in Headers */ = {isa = PBXBuildFile; fileRef = FF43374A0D27697A00554C02 /* GMResourceFork.h */; settings = {ATTRIBUTES = (Public, ); }; };
-@@ -38,6 +52,8 @@
+@@ -20,6 +34,20 @@
+ 		28D525C10EA8076400B7CF7B /* GMDataBackedFileDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FF6C40210D300D7E00E51DD2 /* GMDataBackedFileDelegate.m */; };
+ 		28D525C30EA8076400B7CF7B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+ 		28D526C80EA8342500B7CF7B /* macfuse_objc_dtrace.d in Sources */ = {isa = PBXBuildFile; fileRef = 28D526C70EA8342500B7CF7B /* macfuse_objc_dtrace.d */; };
++		37D03BCA13CBB97D00317407 /* GMAppleDouble.h in Headers */ = {isa = PBXBuildFile; fileRef = FF4337460D27697A00554C02 /* GMAppleDouble.h */; settings = {ATTRIBUTES = (Public, ); }; };
++		37D03BCB13CBB97D00317407 /* GMFinderInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = FF4337480D27697A00554C02 /* GMFinderInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
++		37D03BCC13CBB97D00317407 /* GMResourceFork.h in Headers */ = {isa = PBXBuildFile; fileRef = FF43374A0D27697A00554C02 /* GMResourceFork.h */; settings = {ATTRIBUTES = (Public, ); }; };
++		37D03BCD13CBB97D00317407 /* GMUserFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = FFC1BF780D2D81D5009D8847 /* GMUserFileSystem.h */; settings = {ATTRIBUTES = (Public, ); }; };
++		37D03BCE13CBB97D00317407 /* GMDataBackedFileDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = FF6C40200D300D7E00E51DD2 /* GMDataBackedFileDelegate.h */; };
++		37D03BCF13CBB97D00317407 /* MacFUSE.h in Headers */ = {isa = PBXBuildFile; fileRef = FF9CE9400EAC59C80006A9F1 /* MacFUSE.h */; settings = {ATTRIBUTES = (Public, ); }; };
++		37D03BD113CBB97D00317407 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
++		37D03BD313CBB97D00317407 /* GMAppleDouble.m in Sources */ = {isa = PBXBuildFile; fileRef = FF4337470D27697A00554C02 /* GMAppleDouble.m */; };
++		37D03BD413CBB97D00317407 /* GMFinderInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = FF4337490D27697A00554C02 /* GMFinderInfo.m */; };
++		37D03BD513CBB97D00317407 /* GMResourceFork.m in Sources */ = {isa = PBXBuildFile; fileRef = FF43374B0D27697A00554C02 /* GMResourceFork.m */; };
++		37D03BD613CBB97D00317407 /* GMUserFileSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = FFC1BF790D2D81D5009D8847 /* GMUserFileSystem.m */; };
++		37D03BD713CBB97D00317407 /* GMDataBackedFileDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FF6C40210D300D7E00E51DD2 /* GMDataBackedFileDelegate.m */; };
++		37D03BD813CBB97D00317407 /* macfuse_objc_dtrace.d in Sources */ = {isa = PBXBuildFile; fileRef = 28D526C70EA8342500B7CF7B /* macfuse_objc_dtrace.d */; };
++		37D03BDA13CBB97D00317407 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+ 		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
+ 		FF43374C0D27697A00554C02 /* GMAppleDouble.h in Headers */ = {isa = PBXBuildFile; fileRef = FF4337460D27697A00554C02 /* GMAppleDouble.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 		FF43374D0D27697A00554C02 /* GMAppleDouble.m in Sources */ = {isa = PBXBuildFile; fileRef = FF4337470D27697A00554C02 /* GMAppleDouble.m */; };
+@@ -38,6 +66,8 @@
  /* End PBXBuildFile section */
  
  /* Begin PBXFileReference section */
@@ -30,7 +51,16 @@
  		0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
  		089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
  		28D525C80EA8076400B7CF7B /* MacFUSE.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MacFUSE.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-@@ -62,6 +78,14 @@
+@@ -45,6 +75,8 @@
+ 		28D526C40EA833F100B7CF7B /* GMDTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GMDTrace.h; sourceTree = "<group>"; };
+ 		28D526C70EA8342500B7CF7B /* macfuse_objc_dtrace.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = macfuse_objc_dtrace.d; sourceTree = "<group>"; };
+ 		32DBCF5E0370ADEE00C91783 /* MacFUSE_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacFUSE_Prefix.pch; sourceTree = "<group>"; };
++		37D03BDF13CBB97D00317407 /* MacFUSE.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MacFUSE.framework; sourceTree = BUILT_PRODUCTS_DIR; };
++		37D03BE013CBB97D00317407 /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Info copy.plist"; sourceTree = "<group>"; };
+ 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 		8DC2EF5B0486A6940098B216 /* MacFUSE.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MacFUSE.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 		FF4337460D27697A00554C02 /* GMAppleDouble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GMAppleDouble.h; sourceTree = "<group>"; };
+@@ -62,6 +94,14 @@
  /* End PBXFileReference section */
  
  /* Begin PBXFrameworksBuildPhase section */
@@ -45,23 +75,40 @@
  		28D525C20EA8076400B7CF7B /* Frameworks */ = {
  			isa = PBXFrameworksBuildPhase;
  			buildActionMask = 2147483647;
-@@ -86,6 +110,7 @@
+@@ -70,6 +110,14 @@
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
++		37D03BD913CBB97D00317407 /* Frameworks */ = {
++			isa = PBXFrameworksBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				37D03BDA13CBB97D00317407 /* Foundation.framework in Frameworks */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
+ 		8DC2EF560486A6940098B216 /* Frameworks */ = {
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+@@ -86,6 +134,8 @@
  			children = (
  				8DC2EF5B0486A6940098B216 /* MacFUSE.framework */,
  				28D525C80EA8076400B7CF7B /* MacFUSE.framework */,
 +				04F584AC108BE9DC006329DD /* MacFUSE.framework */,
++				37D03BDF13CBB97D00317407 /* MacFUSE.framework */,
  			);
  			name = Products;
  			sourceTree = "<group>";
-@@ -117,6 +142,7 @@
+@@ -117,6 +167,8 @@
  			children = (
  				8DC2EF5A0486A6940098B216 /* Info.plist */,
  				089C1666FE841158C02AAC07 /* InfoPlist.strings */,
 +				04F584AD108BE9DC006329DD /* Info copy.plist */,
++				37D03BE013CBB97D00317407 /* Info copy.plist */,
  			);
  			name = Resources;
  			sourceTree = "<group>";
-@@ -168,6 +194,19 @@
+@@ -168,6 +220,19 @@
  /* End PBXGroup section */
  
  /* Begin PBXHeadersBuildPhase section */
@@ -81,7 +128,27 @@
  		28D525B40EA8076400B7CF7B /* Headers */ = {
  			isa = PBXHeadersBuildPhase;
  			buildActionMask = 2147483647;
-@@ -197,6 +236,26 @@
+@@ -181,6 +246,19 @@
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
++		37D03BC913CBB97D00317407 /* Headers */ = {
++			isa = PBXHeadersBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				37D03BCA13CBB97D00317407 /* GMAppleDouble.h in Headers */,
++				37D03BCB13CBB97D00317407 /* GMFinderInfo.h in Headers */,
++				37D03BCC13CBB97D00317407 /* GMResourceFork.h in Headers */,
++				37D03BCD13CBB97D00317407 /* GMUserFileSystem.h in Headers */,
++				37D03BCE13CBB97D00317407 /* GMDataBackedFileDelegate.h in Headers */,
++				37D03BCF13CBB97D00317407 /* MacFUSE.h in Headers */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
+ 		8DC2EF500486A6940098B216 /* Headers */ = {
+ 			isa = PBXHeadersBuildPhase;
+ 			buildActionMask = 2147483647;
+@@ -197,6 +275,26 @@
  /* End PBXHeadersBuildPhase section */
  
  /* Begin PBXNativeTarget section */
@@ -108,11 +175,39 @@
  		28D525B30EA8076400B7CF7B /* MacFUSE-10.5 */ = {
  			isa = PBXNativeTarget;
  			buildConfigurationList = 28D525C50EA8076400B7CF7B /* Build configuration list for PBXNativeTarget "MacFUSE-10.5" */;
-@@ -252,11 +311,20 @@
+@@ -217,6 +315,26 @@
+ 			productReference = 28D525C80EA8076400B7CF7B /* MacFUSE.framework */;
+ 			productType = "com.apple.product-type.framework";
+ 		};
++		37D03BC813CBB97D00317407 /* MacFUSE-10.7 */ = {
++			isa = PBXNativeTarget;
++			buildConfigurationList = 37D03BDC13CBB97D00317407 /* Build configuration list for PBXNativeTarget "MacFUSE-10.7" */;
++			buildPhases = (
++				37D03BC913CBB97D00317407 /* Headers */,
++				37D03BD013CBB97D00317407 /* Resources */,
++				37D03BD213CBB97D00317407 /* Sources */,
++				37D03BD913CBB97D00317407 /* Frameworks */,
++				37D03BDB13CBB97D00317407 /* ShellScript */,
++			);
++			buildRules = (
++			);
++			dependencies = (
++			);
++			name = "MacFUSE-10.7";
++			productInstallPath = /Library/Frameworks;
++			productName = MacFUSE;
++			productReference = 37D03BDF13CBB97D00317407 /* MacFUSE.framework */;
++			productType = "com.apple.product-type.framework";
++		};
+ 		8DC2EF4F0486A6940098B216 /* MacFUSE-10.4 */ = {
+ 			isa = PBXNativeTarget;
+ 			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "MacFUSE-10.4" */;
+@@ -252,11 +370,21 @@
  			targets = (
  				8DC2EF4F0486A6940098B216 /* MacFUSE-10.4 */,
  				28D525B30EA8076400B7CF7B /* MacFUSE-10.5 */,
 +				04F58495108BE9DC006329DD /* MacFUSE-10.6 */,
++				37D03BC813CBB97D00317407 /* MacFUSE-10.7 */,
  			);
  		};
  /* End PBXProject section */
@@ -129,7 +224,22 @@
  		28D525BA0EA8076400B7CF7B /* Resources */ = {
  			isa = PBXResourcesBuildPhase;
  			buildActionMask = 2147483647;
-@@ -277,6 +345,20 @@
+@@ -265,6 +393,14 @@
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
++		37D03BD013CBB97D00317407 /* Resources */ = {
++			isa = PBXResourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				37D03BD113CBB97D00317407 /* InfoPlist.strings in Resources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
+ 		8DC2EF520486A6940098B216 /* Resources */ = {
+ 			isa = PBXResourcesBuildPhase;
+ 			buildActionMask = 2147483647;
+@@ -277,6 +413,20 @@
  /* End PBXResourcesBuildPhase section */
  
  /* Begin PBXShellScriptBuildPhase section */
@@ -150,7 +260,28 @@
  		28D525C40EA8076400B7CF7B /* ShellScript */ = {
  			isa = PBXShellScriptBuildPhase;
  			buildActionMask = 12;
-@@ -308,6 +390,19 @@
+@@ -291,6 +441,20 @@
+ 			shellScript = "if [ x\"$ACTION\" != x\"build\" ]\nthen\n  exit 0\nfi\n\nTEMPLATE_DIR=\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ProjectTemplates/\"\nmkdir \"$TEMPLATE_DIR\"\ncp -R \"${SOURCE_ROOT}/ProjectTemplates/\" \"$TEMPLATE_DIR\"\nfind \"$TEMPLATE_DIR\" -type d -name '.svn' -exec rm -rf '{}' \\; > /dev/null 2>&1 || true\n\nGEN_BRIDGE_METADATA=/usr/bin/gen_bridge_metadata\nif [ ! -x $GEN_BRIDGE_METADATA ]\nthen\n  echo \"Skipping BridgeSupport due to missing gen_bridge_metadata.\"\n  exit 0\nfi\nOUT_FRAMEWORK=\"${TARGET_BUILD_DIR}/${SDK_NAME}.framework\"\nBRIDGE_DIR=\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/BridgeSupport/\"\nmkdir \"$BRIDGE_DIR\"\nDYLD_LIBRARY_PATH=\"${MACFUSE_BUILD_ROOT}/usr/local/lib/\" $GEN_BRIDGE_METADATA -f \"$OUT_FRAMEWORK\" > \"${BRIDGE_DIR}/${SDK_NAME}.bridgesupport\"\n\nDEBUG_DIR=\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Debug/\"\nmkdir \"$DEBUG_DIR\"\ncp -R \"${OUT_FRAMEWORK}.dSYM\" \"$DEBUG_DIR\"\n";
+ 			showEnvVarsInLog = 0;
+ 		};
++		37D03BDB13CBB97D00317407 /* ShellScript */ = {
++			isa = PBXShellScriptBuildPhase;
++			buildActionMask = 12;
++			files = (
++			);
++			inputPaths = (
++			);
++			outputPaths = (
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++			shellPath = /bin/sh;
++			shellScript = "if [ x\"$ACTION\" != x\"build\" ]\nthen\n  exit 0\nfi\n\nTEMPLATE_DIR=\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ProjectTemplates/\"\nmkdir \"$TEMPLATE_DIR\"\ncp -R \"${SOURCE_ROOT}/ProjectTemplates/\" \"$TEMPLATE_DIR\"\nfind \"$TEMPLATE_DIR\" -type d -name '.svn' -exec rm -rf '{}' \\; > /dev/null 2>&1 || true\n\nGEN_BRIDGE_METADATA=/usr/bin/gen_bridge_metadata\nif [ ! -x $GEN_BRIDGE_METADATA ]\nthen\n  echo \"Skipping BridgeSupport due to missing gen_bridge_metadata.\"\n  exit 0\nfi\nOUT_FRAMEWORK=\"${TARGET_BUILD_DIR}/${SDK_NAME}.framework\"\nBRIDGE_DIR=\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/BridgeSupport/\"\nmkdir \"$BRIDGE_DIR\"\nDYLD_LIBRARY_PATH=\"${MACFUSE_BUILD_ROOT}/usr/local/lib/\" $GEN_BRIDGE_METADATA -f \"$OUT_FRAMEWORK\" > \"${BRIDGE_DIR}/${SDK_NAME}.bridgesupport\"\n\nDEBUG_DIR=\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Debug/\"\nmkdir \"$DEBUG_DIR\"\ncp -R \"${OUT_FRAMEWORK}.dSYM\" \"$DEBUG_DIR\"\n";
++			showEnvVarsInLog = 0;
++		};
+ 		FF8DE2320D4EFE7C0007BFF6 /* ShellScript */ = {
+ 			isa = PBXShellScriptBuildPhase;
+ 			buildActionMask = 12;
+@@ -308,6 +472,19 @@
  /* End PBXShellScriptBuildPhase section */
  
  /* Begin PBXSourcesBuildPhase section */
@@ -170,7 +301,27 @@
  		28D525BC0EA8076400B7CF7B /* Sources */ = {
  			isa = PBXSourcesBuildPhase;
  			buildActionMask = 2147483647;
-@@ -347,6 +442,82 @@
+@@ -321,6 +498,19 @@
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
++		37D03BD213CBB97D00317407 /* Sources */ = {
++			isa = PBXSourcesBuildPhase;
++			buildActionMask = 2147483647;
++			files = (
++				37D03BD313CBB97D00317407 /* GMAppleDouble.m in Sources */,
++				37D03BD413CBB97D00317407 /* GMFinderInfo.m in Sources */,
++				37D03BD513CBB97D00317407 /* GMResourceFork.m in Sources */,
++				37D03BD613CBB97D00317407 /* GMUserFileSystem.m in Sources */,
++				37D03BD713CBB97D00317407 /* GMDataBackedFileDelegate.m in Sources */,
++				37D03BD813CBB97D00317407 /* macfuse_objc_dtrace.d in Sources */,
++			);
++			runOnlyForDeploymentPostprocessing = 0;
++		};
+ 		8DC2EF540486A6940098B216 /* Sources */ = {
+ 			isa = PBXSourcesBuildPhase;
+ 			buildActionMask = 2147483647;
+@@ -347,6 +537,82 @@
  /* End PBXVariantGroup section */
  
  /* Begin XCBuildConfiguration section */
@@ -253,7 +404,7 @@
  		1DEB91AE08733DA50010E9CD /* Debug */ = {
  			isa = XCBuildConfiguration;
  			baseConfigurationReference = 28D5261B0EA80E7000B7CF7B /* MacFUSE.xcconfig */;
-@@ -401,8 +572,6 @@
+@@ -401,8 +667,6 @@
  				ARCHS = (
  					i386,
  					x86_64,
@@ -262,7 +413,7 @@
  				);
  				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
  				GCC_ENABLE_OBJC_GC = supported;
-@@ -427,8 +596,8 @@
+@@ -427,8 +691,8 @@
  					"-L$(MACFUSE_BUILD_ROOT)/usr/local/lib",
  				);
  				PREBINDING = NO;
@@ -273,7 +424,7 @@
  			};
  			name = Debug;
  		};
-@@ -439,8 +608,6 @@
+@@ -439,8 +703,6 @@
  				ARCHS = (
  					i386,
  					x86_64,
@@ -282,7 +433,7 @@
  				);
  				DEPLOYMENT_POSTPROCESSING = YES;
  				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-@@ -467,8 +634,8 @@
+@@ -467,8 +729,8 @@
  					"-L$(MACFUSE_BUILD_ROOT)/usr/local/lib",
  				);
  				PREBINDING = NO;
@@ -293,7 +444,86 @@
  				SEPARATE_STRIP = NO;
  				STRIP_INSTALLED_PRODUCT = YES;
  				STRIP_STYLE = "non-global";
-@@ -545,6 +712,15 @@
+@@ -542,9 +806,94 @@
+ 			};
+ 			name = Release;
+ 		};
++		37D03BDD13CBB97D00317407 /* Debug */ = {
++			isa = XCBuildConfiguration;
++			baseConfigurationReference = 28D5261B0EA80E7000B7CF7B /* MacFUSE.xcconfig */;
++			buildSettings = {
++				ARCHS = (
++					i386,
++					x86_64,
++				);
++				COPY_PHASE_STRIP = NO;
++				DYLIB_COMPATIBILITY_VERSION = 1;
++				DYLIB_CURRENT_VERSION = 1;
++				FRAMEWORK_VERSION = A;
++				GCC_DYNAMIC_NO_PIC = NO;
++				GCC_ENABLE_FIX_AND_CONTINUE = YES;
++				GCC_MODEL_TUNING = G5;
++				GCC_OPTIMIZATION_LEVEL = 0;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = MacFUSE_Prefix.pch;
++				INFOPLIST_FILE = "Info.plist";
++				INSTALL_PATH = /Library/Frameworks;
++				OTHER_CFLAGS = (
++					"-D__DARWIN_64_BIT_INO_T=1",
++					"-D__FreeBSD__=10",
++					"-D_FILE_OFFSET_BITS=64",
++					"-std=c99",
++					"-I$(MACFUSE_BUILD_ROOT)/usr/local/include",
++					"${CUSTOM_CFLAGS}",
++				);
++				OTHER_LDFLAGS = (
++					"-lfuse_ino64",
++					"-L$(MACFUSE_BUILD_ROOT)/usr/local/lib",
++				);
++				PRODUCT_NAME = MacFUSE;
++				SDKROOT = macosx10.7;
++				"SDKROOT[arch=*64]" = macosx10.7;
++				WRAPPER_EXTENSION = framework;
++				ZERO_LINK = YES;
++			};
++			name = Debug;
++		};
++		37D03BDE13CBB97D00317407 /* Release */ = {
++			isa = XCBuildConfiguration;
++			baseConfigurationReference = 28D5261B0EA80E7000B7CF7B /* MacFUSE.xcconfig */;
++			buildSettings = {
++				ARCHS = (
++					i386,
++					x86_64,
++				);
++				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++				DYLIB_COMPATIBILITY_VERSION = 1;
++				DYLIB_CURRENT_VERSION = 1;
++				FRAMEWORK_VERSION = A;
++				GCC_MODEL_TUNING = G5;
++				GCC_PRECOMPILE_PREFIX_HEADER = YES;
++				GCC_PREFIX_HEADER = MacFUSE_Prefix.pch;
++				INFOPLIST_FILE = "Info.plist";
++				INSTALL_PATH = /Library/Frameworks;
++				OTHER_CFLAGS = (
++					"-D__DARWIN_64_BIT_INO_T=1",
++					"-D__FreeBSD__=10",
++					"-D_FILE_OFFSET_BITS=64",
++					"-std=c99",
++					"-I$(MACFUSE_BUILD_ROOT)/usr/local/include",
++					"${CUSTOM_CFLAGS}",
++				);
++				OTHER_LDFLAGS = (
++					"-lfuse_ino64",
++					"-L$(MACFUSE_BUILD_ROOT)/usr/local/lib",
++				);
++				PRODUCT_NAME = MacFUSE;
++				SDKROOT = macosx10.7;
++				STRIPFLAGS = "";
++				WRAPPER_EXTENSION = framework;
++			};
++			name = Release;
++		};
  /* End XCBuildConfiguration section */
  
  /* Begin XCConfigurationList section */
@@ -309,3 +539,19 @@
  		1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "MacFUSE-10.4" */ = {
  			isa = XCConfigurationList;
  			buildConfigurations = (
+@@ -572,6 +921,15 @@
+ 			defaultConfigurationIsVisible = 0;
+ 			defaultConfigurationName = Debug;
+ 		};
++		37D03BDC13CBB97D00317407 /* Build configuration list for PBXNativeTarget "MacFUSE-10.7" */ = {
++			isa = XCConfigurationList;
++			buildConfigurations = (
++				37D03BDD13CBB97D00317407 /* Debug */,
++				37D03BDE13CBB97D00317407 /* Release */,
++			);
++			defaultConfigurationIsVisible = 0;
++			defaultConfigurationName = Debug;
++		};
+ /* End XCConfigurationList section */
+ 	};
+ 	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110712/7d7df620/attachment-0001.html>


More information about the macports-changes mailing list