Ticket #13185: sshfs-gui.diff

File sshfs-gui.diff, 11.6 KB (added by takanori@…, 16 years ago)

  • 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,

  • 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",

  • 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                         };

  • 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",

  • Portfile

     
    44PortGroup xcode 1.0
    55
    66name                sshfs-gui
    7 version             0.3.0
     7version             1.0.0
     8set macfuse_version 1.0.0
    89categories          fuse
    910platforms           macosx
    1011maintainers         eridius@macports.org
    … …  
    1415
    1516homepage            http://code.google.com/p/macfuse/
    1617
    17 master_sites        macports
    18 checksums           md5 23e29333a9974f87d4466c64607f3581 \
    19                     sha1 3df742fac97ea4f853b07f2ea41a6b8597af3508
     18master_sites        macports:fusefs
     19distname            macfuse-${macfuse_version}
     20checksums           md5 721e9527b03563a6bed4f918bae83e2b \
     21                    sha1 2259cfa93a7d6537c1b3b925454543a66d76752b
    2022
    21 livecheck.distname  sshfs-(.*).dmg
     23worksrcdir          ${distname}/filesystems/sshfs-gui
    2224
    23 patchfiles          patch-AppController.m patch-project.pbxproj
     25patchfiles          patch-AppController.m.diff \
     26                    patch-sshfs.xcodeproj_project.pbxproj.diff
    2427
    2528use_bzip2           yes
    2629
    … …  
    3134
    3235post-patch {
    3336    reinplace "s|##PREFIX##|${prefix}|" AppController.m
     37}
     38
     39post-destroot {
     40    xinstall -d ${destroot}/Applications/MacPorts
     41    copy ${worksrcpath}/build/UninstalledProducts/sshfs.app ${destroot}/Applications/MacPorts
    3442}
     43 No newline at end of file