Ticket #13185: fuse-1.1_revision1.diff

File fuse-1.1_revision1.diff, 20.2 KB (added by takanori@…, 17 years ago)

revision 1. (tested on 10.4.10/ppc and 10.5.0/ppc)

  • fuse/sshfs/Portfile

     
    33PortSystem 1.0
    44
    55name                sshfs
    6 version             1.7
    7 revision            5
     6version             1.8
     7revision            1
     8set macfuse_version 1.1
    89categories          fuse
    910platforms           darwin
    1011maintainers         eridius@macports.org
     
    2122
    2223distname            sshfs-fuse-${version}
    2324master_sites        sourceforge:fuse
    24 checksums           ${distfiles} md5 e91a2fed1da952a375798408dc6e41a0 \
    25                                  sha1 c68fa99e9127b59141a5ac5babec39d5bb541141
     25checksums           ${distfiles} md5 3c575cf89a6d3d8ab6063c2f60bd5b25 \
     26                                 sha1 ab1df8d8b2a601bc22959a14e95e57fae5fc3787
    2627
    2728livecheck.distname  sshfs-fuse
    2829
    29 depends_lib         port:glib2 port:libfuse port:pkgconfig
     30depends_lib         port:gettext \
     31                    port:glib2 \
     32                    port:libfuse \
     33                    port:libiconv \
     34                    port:pkgconfig
    3035
    31 configure.cflags-append    -DSSH_NODELAY_WORKAROUND
     36configure.cflags-append    "-D__FreeBSD__=10 -DDARWIN_SEMAPHORE_COMPAT -DSSH_NODELAY_WORKAROUND -D_POSIX_C_SOURCE=200112L"
     37configure.post_args-append --disable-dependency-tracking
    3238
    3339platform darwin {
    3440    depends_run         port:fusefs
    35     patch_sites         http://macfuse.googlecode.com/svn/tags/macfuse-0.4.0/filesystems/sshfs
    36     patchfiles          sshfs-fuse-1.7-macosx.patch
    37     checksums-append    sshfs-fuse-1.7-macosx.patch md5 4efb4c2d6cc862ca3fb9b5f77aafc744 \
    38                                                     sha1 242e0a8136e48ed6b4b24495c1164f33f19d669a
     41    patch_sites         http://macfuse.googlecode.com/svn/tags/macfuse-${macfuse_version}/filesystems/sshfs
     42    patchfiles          sshfs-fuse-${version}-macosx.patch
     43    checksums-append    sshfs-fuse-${version}-macosx.patch md5 5d3cec641c22e89dd840c6bbc3af89d4 \
     44                                                           sha1 79f058e0ae4b90ec09d50ab39401773d146bdf95
    3945   
    4046    # override patch.pre_args since it defaults to -p0
    4147    patch.pre_args -p1
  • fuse/sshfs-gui/files/patch-sshfs.xcodeproj_project.pbxproj.diff

     
     1--- ./sshfs.xcodeproj/project.pbxproj.orig      2007-10-27 09:54:51.000000000 +0900
     2+++ ./sshfs.xcodeproj/project.pbxproj   2007-11-07 09:39:36.000000000 +0900
     3@@ -8,8 +8,6 @@
     4 
     5 /* Begin PBXBuildFile section */
     6                54B5A1AC0CD2BC7B00158571 /* GoogleShared_SystemVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 54B5A1AB0CD2BC7B00158571 /* GoogleShared_SystemVersion.m */; };
     7-               54B5A1C50CD2BF3B00158571 /* sshfs-static-10.5 in Resources */ = {isa = PBXBuildFile; fileRef = 54B5A1C40CD2BF3B00158571 /* sshfs-static-10.5 */; };
     8-               8205AF7A0B653F3700A99579 /* sshfs-static in Resources */ = {isa = PBXBuildFile; fileRef = 8205AF790B653F3700A99579 /* sshfs-static */; };
     9                823578210B44701F00FE77BB /* ssh.icns in Resources */ = {isa = PBXBuildFile; fileRef = 823578200B44701F00FE77BB /* ssh.icns */; };
     10                8235784C0B44782400FE77BB /* askpass.c in Sources */ = {isa = PBXBuildFile; fileRef = 8235784B0B44782400FE77BB /* askpass.c */; };
     11                823578540B44786400FE77BB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 823578530B44786400FE77BB /* CoreFoundation.framework */; };
     12@@ -45,8 +43,6 @@
     13                32CA4F630368D1EE00C91783 /* sshfs.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sshfs.pch; sourceTree = "<group>"; };
     14                54B5A1AA0CD2BC7B00158571 /* GoogleShared_SystemVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GoogleShared_SystemVersion.h; sourceTree = "<group>"; };
     15                54B5A1AB0CD2BC7B00158571 /* GoogleShared_SystemVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoogleShared_SystemVersion.m; sourceTree = "<group>"; };
     16-               54B5A1C40CD2BF3B00158571 /* sshfs-static-10.5 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "sshfs-static-10.5"; path = "Resources/sshfs-static-10.5"; sourceTree = "<group>"; };
     17-               8205AF790B653F3700A99579 /* sshfs-static */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "sshfs-static"; path = "Resources/sshfs-static"; sourceTree = "<group>"; };
     18                823578200B44701F00FE77BB /* ssh.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = ssh.icns; path = Resources/ssh.icns; sourceTree = "<group>"; };
     19                823578420B4477D800FE77BB /* askpass */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = askpass; sourceTree = BUILT_PRODUCTS_DIR; };
     20                8235784B0B44782400FE77BB /* askpass.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = askpass.c; sourceTree = "<group>"; };
     21@@ -115,13 +111,11 @@
     22                29B97317FDCFA39411CA2CEA /* Resources */ = {
     23                        isa = PBXGroup;
     24                        children = (
     25-                               54B5A1C40CD2BF3B00158571 /* sshfs-static-10.5 */,
     26                                D4A6C9A709479AD300354625 /* Info.plist */,
     27                                D4A6C9B709479B9200354625 /* InfoPlist.strings */,
     28                                8249C9140B547465007CFB64 /* Localizable.strings */,
     29                                D4A6C9DF09479C8900354625 /* MainMenu.nib */,
     30                                823578200B44701F00FE77BB /* ssh.icns */,
     31-                               8205AF790B653F3700A99579 /* sshfs-static */,
     32                                82743E560BD7CE2D006FB711 /* sshnodelay.so */,
     33                                8235791D0B4481C700FE77BB /* askpass */,
     34                        );
     35@@ -197,7 +191,6 @@
     36                                823578500B44782F00FE77BB /* PBXTargetDependency */,
     37                        );
     38                        name = sshfs;
     39-                       productInstallPath = "$(HOME)/Applications";
     40                        productName = sshfs;
     41                        productReference = 8D1107320486CEB800E47090 /* sshfs.app */;
     42                        productType = "com.apple.product-type.application";
     43@@ -230,9 +223,7 @@
     44                                823578210B44701F00FE77BB /* ssh.icns in Resources */,
     45                                8235791E0B4481C700FE77BB /* askpass in Resources */,
     46                                8249C9150B547465007CFB64 /* Localizable.strings in Resources */,
     47-                               8205AF7A0B653F3700A99579 /* sshfs-static in Resources */,
     48                                82743E570BD7CE2D006FB711 /* sshnodelay.so in Resources */,
     49-                               54B5A1C50CD2BF3B00158571 /* sshfs-static-10.5 in Resources */,
     50                        );
     51                        runOnlyForDeploymentPostprocessing = 0;
     52                };
     53@@ -307,7 +298,6 @@
     54                                GCC_OPTIMIZATION_LEVEL = 0;
     55                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
     56                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
     57-                               INSTALL_PATH = "$(HOME)/bin";
     58                                OTHER_LDFLAGS = (
     59                                        "-framework",
     60                                        Carbon,
     61@@ -327,7 +317,6 @@
     62                                GCC_MODEL_TUNING = G5;
     63                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
     64                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
     65-                               INSTALL_PATH = "$(HOME)/bin";
     66                                OTHER_LDFLAGS = (
     67                                        "-framework",
     68                                        Carbon,
  • fuse/sshfs-gui/files/patch-AppController.m.diff

     
     1--- ./AppController.m.old       2007-11-07 05:15:32.000000000 +0900
     2+++ ./AppController.m   2007-11-07 08:24:25.000000000 +0900
     3@@ -76,11 +76,7 @@
     4   // setup for task
     5   NSString *askPassPath = [[NSBundle mainBundle] pathForResource:@"askpass"
     6                                                           ofType:@""];
     7-  NSString *sshfsPath = [[NSBundle mainBundle] pathForResource:@"sshfs-static"
     8-                                                        ofType:@""];
     9-  if ([GoogleShared_SystemVersion isLeopard]) {
     10-      sshfsPath = [sshfsPath stringByAppendingString:@"-10.5"];
     11-  }
     12+  NSString *sshfsPath = @"##PREFIX##/bin/sshfs";
     13   NSDictionary *sshfsEnv = [NSDictionary dictionaryWithObjectsAndKeys:
     14     @"NONE", @"DISPLAY", // I know "NONE" is bogus; I just need something
     15     askPassPath, @"SSH_ASKPASS",
  • fuse/sshfs-gui/files/patch-project.pbxproj

     
    1 --- ../sshfs-gui.old/sshfs.xcodeproj/project.pbxproj    2007-04-23 18:37:41.000000000 -0400
    2 +++ sshfs.xcodeproj/project.pbxproj     2007-04-23 18:44:11.000000000 -0400
    3 @@ -7,7 +7,6 @@
    4         objects = {
    5  
    6  /* Begin PBXBuildFile section */
    7 -               8205AF7A0B653F3700A99579 /* sshfs-static in Resources */ = {isa = PBXBuildFile; fileRef = 8205AF790B653F3700A99579 /* sshfs-static */; };
    8                 823578210B44701F00FE77BB /* ssh.icns in Resources */ = {isa = PBXBuildFile; fileRef = 823578200B44701F00FE77BB /* ssh.icns */; };
    9                 8235784C0B44782400FE77BB /* askpass.c in Sources */ = {isa = PBXBuildFile; fileRef = 8235784B0B44782400FE77BB /* askpass.c */; };
    10                 823578540B44786400FE77BB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 823578530B44786400FE77BB /* CoreFoundation.framework */; };
    11 @@ -41,7 +40,6 @@
    12                 29B97316FDCFA39411CA2CEA /* sshfsMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sshfsMain.m; sourceTree = "<group>"; };
    13                 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
    14                 32CA4F630368D1EE00C91783 /* sshfs.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sshfs.pch; sourceTree = "<group>"; };
    15 -               8205AF790B653F3700A99579 /* sshfs-static */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "sshfs-static"; path = "Resources/sshfs-static"; sourceTree = "<group>"; };
    16                 823578200B44701F00FE77BB /* ssh.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = ssh.icns; path = Resources/ssh.icns; sourceTree = "<group>"; };
    17                 823578420B4477D800FE77BB /* askpass */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = askpass; sourceTree = BUILT_PRODUCTS_DIR; };
    18                 8235784B0B44782400FE77BB /* askpass.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = askpass.c; sourceTree = "<group>"; };
    19 @@ -115,7 +113,6 @@
    20                                 8249C9140B547465007CFB64 /* Localizable.strings */,
    21                                 D4A6C9DF09479C8900354625 /* MainMenu.nib */,
    22                                 823578200B44701F00FE77BB /* ssh.icns */,
    23 -                               8205AF790B653F3700A99579 /* sshfs-static */,
    24                                 82743E560BD7CE2D006FB711 /* sshnodelay.so */,
    25                                 8235791D0B4481C700FE77BB /* askpass */,
    26                         );
    27 @@ -220,7 +217,6 @@
    28                                 823578210B44701F00FE77BB /* ssh.icns in Resources */,
    29                                 8235791E0B4481C700FE77BB /* askpass in Resources */,
    30                                 8249C9150B547465007CFB64 /* Localizable.strings in Resources */,
    31 -                               8205AF7A0B653F3700A99579 /* sshfs-static in Resources */,
    32                                 82743E570BD7CE2D006FB711 /* sshnodelay.so in Resources */,
    33                         );
    34                         runOnlyForDeploymentPostprocessing = 0;
    35 @@ -315,7 +311,6 @@
    36                                 GCC_MODEL_TUNING = G5;
    37                                 GCC_PRECOMPILE_PREFIX_HEADER = YES;
    38                                 GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
    39 -                               INSTALL_PATH = "$(HOME)/bin";
    40                                 OTHER_LDFLAGS = (
    41                                         "-framework",
    42                                         Carbon,
    43 @@ -339,6 +334,7 @@
    44                         isa = XCBuildConfiguration;
    45                         buildSettings = {
    46                                 INFOPLIST_FILE = Resources/Info.plist;
    47 +                               INSTALL_PATH = /Applications;
    48                                 PRODUCT_NAME = sshfs;
    49                                 WRAPPER_EXTENSION = app;
    50                         };
  • fuse/sshfs-gui/files/patch-AppController.m

     
    1 --- ../sshfs-gui.old/AppController.m    2007-04-23 18:37:41.000000000 -0400
    2 +++ AppController.m     2007-04-23 18:38:39.000000000 -0400
    3 @@ -75,8 +75,7 @@
    4    // setup for task
    5    NSString *askPassPath = [[NSBundle mainBundle] pathForResource:@"askpass"
    6                                                            ofType:@""];
    7 -  NSString *sshfsPath = [[NSBundle mainBundle] pathForResource:@"sshfs-static"
    8 -                                                        ofType:@""];
    9 +  NSString *sshfsPath = @"##PREFIX##/bin/sshfs";
    10    NSDictionary *sshfsEnv = [NSDictionary dictionaryWithObjectsAndKeys:
    11      @"NONE", @"DISPLAY", // I know "NONE" is bogus; I just need something
    12      askPassPath, @"SSH_ASKPASS",
  • fuse/sshfs-gui/Portfile

     
    44PortGroup xcode 1.0
    55
    66name                sshfs-gui
    7 version             0.3.0
     7version             1.0.0
     8revision            1
     9set macfuse_version 1.1
    810categories          fuse
    911platforms           macosx
    1012maintainers         eridius@macports.org
     
    1416
    1517homepage            http://code.google.com/p/macfuse/
    1618
    17 master_sites        macports
    18 checksums           md5 23e29333a9974f87d4466c64607f3581 \
    19                     sha1 3df742fac97ea4f853b07f2ea41a6b8597af3508
     19master_sites        macports:fusefs
     20distname            macfuse-${macfuse_version}
     21dist_subdir         fusefs
     22checksums           md5 42487d7684b1f9a8eb2f8a61b10f7913 \
     23                    sha1 6347e5b6b0f810a3e5b0fbc82cbccfdf3f4c6311
    2024
    21 livecheck.distname  sshfs-(.*).dmg
     25worksrcdir          ${distname}/filesystems/sshfs-gui
    2226
    23 patchfiles          patch-AppController.m patch-project.pbxproj
     27patchfiles          patch-AppController.m.diff \
     28                    patch-sshfs.xcodeproj_project.pbxproj.diff
    2429
    2530use_bzip2           yes
    2631
     
    3136
    3237post-patch {
    3338    reinplace "s|##PREFIX##|${prefix}|" AppController.m
     39}
     40
     41post-destroot {
     42    xinstall -d ${destroot}/Applications/MacPorts
     43    copy ${worksrcpath}/build/UninstalledProducts/sshfs.app ${destroot}/Applications/MacPorts
    3444}
     45 No newline at end of file
  • fuse/libfuse/Portfile

     
    33PortSystem 1.0
    44
    55name                libfuse
    6 version             2.6.5
     6version             2.7.1
    77revision            1
     8set macfuse_version 1.1
    89categories          fuse devel
    910platforms           darwin
    1011maintainers         eridius@macports.org
     
    1314
    1415homepage            http://fuse.sourceforge.net/
    1516
    16 distname            fuse-${version}
    17 master_sites        sourceforge:fuse
    18 checksums           ${distfiles} md5 66bd30503df55a87b9868835ca5a45bc \
    19                                  sha1 bbb6baa147ff9057b66a64f10e5027434468c0aa
     17master_sites        macports:fusefs
     18distname            macfuse-${macfuse_version}
     19dist_subdir         fusefs
     20checksums           md5 42487d7684b1f9a8eb2f8a61b10f7913 \
     21                    sha1 6347e5b6b0f810a3e5b0fbc82cbccfdf3f4c6311
    2022
    21 livecheck.distname  fuse-2.X
     23platform darwin 8 {}
    2224
    23 depends_lib         port:pkgconfig
    24 
    25 platform darwin {
    26     depends_run         port:fusefs
    27     patch_sites         http://macfuse.googlecode.com/svn/tags/macfuse-0.4.0/libfuse/
    28     patchfiles          fuse-2.6.5-macosx.patch
    29     checksums-append    fuse-2.6.5-macosx.patch md5 96c27b9d8c5d719ff7db99064c21ec87 \
    30                                                 sha1 edbf8769809eea32f9f83e7fa7e8b791e6cbe106
    31    
    32     configure.post_args-append CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L"
    33    
    34     # override patch.pre_args since it defaults to -p0
    35     patch.pre_args -p1
     25if {[variant_isset darwin_8]} {
     26    set product_version 10.4
     27} else {
     28    set product_version 10.5
    3629}
    3730
     31worksrcdir          ${distname}/core/${product_version}/${name}/fuse-${version}
     32
     33#livecheck.distname  fuse-2.X
     34
     35use_bzip2           yes
     36
     37depends_lib         port:pkgconfig
     38depends_run         port:fusefs
     39
    3840pre-fetch {
    3941    # LibFUSE currently only works on OS X
    4042    # so error out if attempting to install elsewhere
    41     if {![variant_isset darwin]} {
     43    if {${os.platform} != "darwin"} {
    4244        return -code error "LibFUSE is only supported for Mac OS X"
    4345    }
    44    
    45     if {[variant_isset darwin]} {
    46         patch_checksum
    47     }
    4846}
    4947
    50 proc patch_checksum {} {
    51     global checksums_array UI_PREFIX
    52     # assume we only have one patchfile, because at the moment that's true
    53     set patchfile [option patchfiles]
    54     # do our own checksumming of an existing $patchfile because URL changes between revisions
    55     # if the checksum fails, delete the patchfile
    56     # a lot of this code is copied from checksum_main
    57     # Eventually this technique should be replaced with a patchfile dist subdir
    58     if {[file exists [option distpath]/$patchfile]} {
    59         ui_info "$UI_PREFIX $patchfile exists, checksumming to detect URL change"
    60         if {[parse_checksums [option checksums]] == "yes"} {
    61             ui_info "$UI_PREFIX [format [msgcat::mc "Checksumming %s"] $patchfile]"
    62             set fullpath [file join [option distpath] $patchfile]
    63             if {[info exists checksums_array($patchfile)]} {
    64                 set checksums $checksums_array($patchfile)
    65                
    66                 foreach {type sum} $checksums {
    67                     set calculated_sum [calc_$type $fullpath]
    68                     if {![string equal $sum $calculated_sum]} {
    69                         ui_debug "Checksum mismatch for $patchfile"
    70                         delete $fullpath
    71                         break
    72                     }
    73                 }
    74             }
    75         } else {
    76             return -code error "Unable to parse checksum string"
    77         }
    78     }
    79 }
    80  No newline at end of file
     48post-extract {
     49    system "cd ${workpath}/${distname}/core/${product_version}/${name} && gzip -dc fuse-current.tar.gz | tar --no-same-owner -xf -"
     50    system "cd ${worksrcpath} && patch -p1 < ../fuse-current-macosx.patch"
     51}
     52
     53patch {
     54    reinplace "s|--prefix=/usr/local|--prefix=${prefix}|" ${worksrcpath}/darwin_configure.sh
     55}
     56
     57configure {
     58    system "cd ${worksrcpath} && /bin/sh ./darwin_configure.sh ${workpath}/${distname}/core/${product_version}/fusefs"
     59}
  • fuse/fusefs/Portfile

     
    44PortGroup xcode 1.0
    55
    66name                fusefs
    7 version             0.4.0
     7version             1.1
     8revision            1
    89categories          fuse devel
    910platforms           darwin
    1011maintainers         eridius@macports.org
     
    1819
    1920homepage            http://code.google.com/p/macfuse/
    2021master_sites        macports
    21 distname            fusefs-${version}
    22 worksrcdir          fusefs
    23 checksums           md5 fb49ac9bc2412da7e02b9e3f1f448545 \
    24                     sha1 0b870c2e4d14180510348c49cc0647bff812f520
     22distname            macfuse-${version}
     23checksums           md5 42487d7684b1f9a8eb2f8a61b10f7913 \
     24                    sha1 6347e5b6b0f810a3e5b0fbc82cbccfdf3f4c6311
    2525
    26 livecheck.distname  MacFUSE-Core-(.*).dmg
     26platform darwin 8 {}
    2727
     28if {[variant_isset darwin_8]} {
     29    set product_version 10.4
     30} else {
     31    set product_version 10.5
     32}
     33
     34worksrcdir          ${distname}/core/${product_version}/${name}
     35livecheck.distname  MacFUSE-Core-${product_version}-(.*).dmg
     36
    2837use_bzip2           yes
    2938
    3039destroot.violate_mtree yes
     
    3443xcode.build.settings    OBJROOT=build/ SYMROOT=build/
    3544
    3645# ensure that user is running OS X 10.4
    37 platform darwin {}
    3846pre-fetch {
    39     if {[variant_isset darwin]} {
     47    if {${os.platform} == "darwin"} {
    4048        set vers [split [exec sw_vers -productVersion] .]
    4149        set majorVersion [lindex $vers 0]
    4250        set minorVersion [lindex $vers 1]
     
    4957}
    5058
    5159destroot {
    52     set sysfsdir ${destroot}/System/Library/Filesystems
     60    if {[variant_isset darwin_8]} {
     61        set sysfsdir ${destroot}/System/Library/Filesystems
     62    } else {
     63        set sysfsdir ${destroot}/Library/Filesystems
     64    }
    5365    set macfuse_bundle_dir ${sysfsdir}/fusefs.fs
    5466    set macfuse_support_dir ${macfuse_bundle_dir}/Support
    5567