[81778] trunk/dports/devel/GitX
cal at macports.org
cal at macports.org
Thu Aug 4 13:31:03 PDT 2011
Revision: 81778
http://trac.macports.org/changeset/81778
Author: cal at macports.org
Date: 2011-08-04 13:31:03 -0700 (Thu, 04 Aug 2011)
Log Message:
-----------
GitX: renamed patchfiles
Modified Paths:
--------------
trunk/dports/devel/GitX/Portfile
Added Paths:
-----------
trunk/dports/devel/GitX/files/10-disable-finder-integration.patch
trunk/dports/devel/GitX/files/20-remove-enable-terminal-usage.patch
trunk/dports/devel/GitX/files/21-remove-install-cli-tool.patch
Removed Paths:
-------------
trunk/dports/devel/GitX/files/disable-finder-integration.patch
trunk/dports/devel/GitX/files/remove-enable-terminal-usage.patch
trunk/dports/devel/GitX/files/remove-install-cli-tool.patch
Modified: trunk/dports/devel/GitX/Portfile
===================================================================
--- trunk/dports/devel/GitX/Portfile 2011-08-04 20:30:28 UTC (rev 81777)
+++ trunk/dports/devel/GitX/Portfile 2011-08-04 20:31:03 UTC (rev 81778)
@@ -28,9 +28,9 @@
xcode.target GitX
xcode.configuration Release
-patchfiles disable-finder-integration.patch \
- remove-enable-terminal-usage.patch \
- remove-install-cli-tool.patch
+patchfiles 10-disable-finder-integration.patch \
+ 20-remove-enable-terminal-usage.patch \
+ 21-remove-install-cli-tool.patch
variant finder_integration description {Enable finder integration, opening .git folders with GitX} {
patchfiles-delete disable-finder-integration.patch
Copied: trunk/dports/devel/GitX/files/10-disable-finder-integration.patch (from rev 81767, trunk/dports/devel/GitX/files/disable-finder-integration.patch)
===================================================================
--- trunk/dports/devel/GitX/files/10-disable-finder-integration.patch (rev 0)
+++ trunk/dports/devel/GitX/files/10-disable-finder-integration.patch 2011-08-04 20:31:03 UTC (rev 81778)
@@ -0,0 +1,10 @@
+--- Info.plist.orig 2011-08-04 20:53:01.000000000 +0200
++++ Info.plist 2011-08-04 20:53:13.000000000 +0200
+@@ -23,7 +23,6 @@
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+- <string>git</string>
+ <string></string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
Copied: trunk/dports/devel/GitX/files/20-remove-enable-terminal-usage.patch (from rev 81776, trunk/dports/devel/GitX/files/remove-enable-terminal-usage.patch)
===================================================================
--- trunk/dports/devel/GitX/files/20-remove-enable-terminal-usage.patch (rev 0)
+++ trunk/dports/devel/GitX/files/20-remove-enable-terminal-usage.patch 2011-08-04 20:31:03 UTC (rev 81778)
@@ -0,0 +1,53 @@
+--- English.lproj/MainMenu.xib.orig 2011-08-04 21:36:13.000000000 +0200
++++ English.lproj/MainMenu.xib 2011-08-04 21:49:00.000000000 +0200
+@@ -78,15 +78,6 @@
+ <reference key="NSOnImage" ref="889736156"/>
+ <reference key="NSMixedImage" ref="37108609"/>
+ </object>
+- <object class="NSMenuItem" id="332179816">
+- <reference key="NSMenu" ref="492995933"/>
+- <string type="base64-UTF8" key="NSTitle">RW5hYmxlIFRlcm1pbmFsIFVzYWdl4oCmA</string>
+- <string key="NSKeyEquiv"/>
+- <int key="NSKeyEquivModMask">1048576</int>
+- <int key="NSMnemonicLoc">2147483647</int>
+- <reference key="NSOnImage" ref="889736156"/>
+- <reference key="NSMixedImage" ref="37108609"/>
+- </object>
+ <object class="NSMenuItem" id="704355783">
+ <reference key="NSMenu" ref="492995933"/>
+ <string type="base64-UTF8" key="NSTitle">UHJlZmVyZW5jZXPigKY</string>
+@@ -1134,14 +1125,6 @@
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+- <string key="label">installCliTool:</string>
+- <reference key="source" ref="859235683"/>
+- <reference key="destination" ref="332179816"/>
+- </object>
+- <int key="connectionID">910</int>
+- </object>
+- <object class="IBConnectionRecord">
+- <object class="IBActionConnection" key="connection">
+ <string key="label">checkForUpdates:</string>
+ <reference key="source" ref="203602687"/>
+ <reference key="destination" ref="679871620"/>
+@@ -1290,7 +1273,6 @@
+ <reference ref="550312819"/>
+ <reference ref="950810233"/>
+ <reference ref="105066652"/>
+- <reference ref="332179816"/>
+ <reference ref="679871620"/>
+ </object>
+ <reference key="parent" ref="859553509"/>
+@@ -1821,11 +1803,6 @@
+ <reference key="parent" ref="91482642"/>
+ </object>
+ <object class="IBObjectRecord">
+- <int key="objectID">909</int>
+- <reference key="object" ref="332179816"/>
+- <reference key="parent" ref="492995933"/>
+- </object>
+- <object class="IBObjectRecord">
+ <int key="objectID">912</int>
+ <reference key="object" ref="391227374"/>
+ <reference key="parent" ref="91482642"/>
Copied: trunk/dports/devel/GitX/files/21-remove-install-cli-tool.patch (from rev 81776, trunk/dports/devel/GitX/files/remove-install-cli-tool.patch)
===================================================================
--- trunk/dports/devel/GitX/files/21-remove-install-cli-tool.patch (rev 0)
+++ trunk/dports/devel/GitX/files/21-remove-install-cli-tool.patch 2011-08-04 20:31:03 UTC (rev 81778)
@@ -0,0 +1,62 @@
+--- ApplicationController.h.orig 2011-08-04 21:55:51.000000000 +0200
++++ ApplicationController.h 2011-08-04 21:56:11.000000000 +0200
+@@ -30,8 +30,6 @@
+ - (IBAction)openPreferencesWindow:(id)sender;
+ - (IBAction)showAboutPanel:(id)sender;
+
+-- (IBAction)installCliTool:(id)sender;
+-
+ - (IBAction)saveAction:sender;
+ - (IBAction) showHelp:(id) sender;
+
+--- ApplicationController.m.orig 2011-08-04 21:55:57.000000000 +0200
++++ ApplicationController.m 2011-08-04 21:57:31.000000000 +0200
+@@ -123,48 +123,6 @@
+ [NSApp orderFrontStandardAboutPanelWithOptions:dict];
+ }
+
+-- (IBAction)installCliTool:(id)sender;
+-{
+- BOOL success = NO;
+- NSString* installationPath = @"/usr/local/bin/";
+- NSString* installationName = @"gitx";
+- NSString* toolPath = [[NSBundle mainBundle] pathForResource:@"gitx" ofType:@""];
+- if (toolPath) {
+- AuthorizationRef auth;
+- if (AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &auth) == errAuthorizationSuccess) {
+- char const* mkdir_arg[] = { "-p", [installationPath UTF8String], NULL};
+- char const* mkdir = "/bin/mkdir";
+- AuthorizationExecuteWithPrivileges(auth, mkdir, kAuthorizationFlagDefaults, (char**)mkdir_arg, NULL);
+- char const* arguments[] = { "-f", "-s", [toolPath UTF8String], [[installationPath stringByAppendingString: installationName] UTF8String], NULL };
+- char const* helperTool = "/bin/ln";
+- if (AuthorizationExecuteWithPrivileges(auth, helperTool, kAuthorizationFlagDefaults, (char**)arguments, NULL) == errAuthorizationSuccess) {
+- int status;
+- int pid = wait(&status);
+- if (pid != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
+- success = true;
+- else
+- errno = WEXITSTATUS(status);
+- }
+-
+- AuthorizationFree(auth, kAuthorizationFlagDefaults);
+- }
+- }
+-
+- if (success) {
+- [[NSAlert alertWithMessageText:@"Installation Complete"
+- defaultButton:nil
+- alternateButton:nil
+- otherButton:nil
+- informativeTextWithFormat:@"The gitx tool has been installed to %@", installationPath] runModal];
+- } else {
+- [[NSAlert alertWithMessageText:@"Installation Failed"
+- defaultButton:nil
+- alternateButton:nil
+- otherButton:nil
+- informativeTextWithFormat:@"Installation to %@ failed", installationPath] runModal];
+- }
+-}
+-
+ /**
+ Returns the support folder for the application, used to store the Core Data
+ store file. This code uses a folder named "GitTest" for
Deleted: trunk/dports/devel/GitX/files/disable-finder-integration.patch
===================================================================
--- trunk/dports/devel/GitX/files/disable-finder-integration.patch 2011-08-04 20:30:28 UTC (rev 81777)
+++ trunk/dports/devel/GitX/files/disable-finder-integration.patch 2011-08-04 20:31:03 UTC (rev 81778)
@@ -1,10 +0,0 @@
---- Info.plist.orig 2011-08-04 20:53:01.000000000 +0200
-+++ Info.plist 2011-08-04 20:53:13.000000000 +0200
-@@ -23,7 +23,6 @@
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
-- <string>git</string>
- <string></string>
- </array>
- <key>CFBundleTypeIconFile</key>
Deleted: trunk/dports/devel/GitX/files/remove-enable-terminal-usage.patch
===================================================================
--- trunk/dports/devel/GitX/files/remove-enable-terminal-usage.patch 2011-08-04 20:30:28 UTC (rev 81777)
+++ trunk/dports/devel/GitX/files/remove-enable-terminal-usage.patch 2011-08-04 20:31:03 UTC (rev 81778)
@@ -1,53 +0,0 @@
---- English.lproj/MainMenu.xib.orig 2011-08-04 21:36:13.000000000 +0200
-+++ English.lproj/MainMenu.xib 2011-08-04 21:49:00.000000000 +0200
-@@ -78,15 +78,6 @@
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
-- <object class="NSMenuItem" id="332179816">
-- <reference key="NSMenu" ref="492995933"/>
-- <string type="base64-UTF8" key="NSTitle">RW5hYmxlIFRlcm1pbmFsIFVzYWdl4oCmA</string>
-- <string key="NSKeyEquiv"/>
-- <int key="NSKeyEquivModMask">1048576</int>
-- <int key="NSMnemonicLoc">2147483647</int>
-- <reference key="NSOnImage" ref="889736156"/>
-- <reference key="NSMixedImage" ref="37108609"/>
-- </object>
- <object class="NSMenuItem" id="704355783">
- <reference key="NSMenu" ref="492995933"/>
- <string type="base64-UTF8" key="NSTitle">UHJlZmVyZW5jZXPigKY</string>
-@@ -1134,14 +1125,6 @@
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
-- <string key="label">installCliTool:</string>
-- <reference key="source" ref="859235683"/>
-- <reference key="destination" ref="332179816"/>
-- </object>
-- <int key="connectionID">910</int>
-- </object>
-- <object class="IBConnectionRecord">
-- <object class="IBActionConnection" key="connection">
- <string key="label">checkForUpdates:</string>
- <reference key="source" ref="203602687"/>
- <reference key="destination" ref="679871620"/>
-@@ -1290,7 +1273,6 @@
- <reference ref="550312819"/>
- <reference ref="950810233"/>
- <reference ref="105066652"/>
-- <reference ref="332179816"/>
- <reference ref="679871620"/>
- </object>
- <reference key="parent" ref="859553509"/>
-@@ -1821,11 +1803,6 @@
- <reference key="parent" ref="91482642"/>
- </object>
- <object class="IBObjectRecord">
-- <int key="objectID">909</int>
-- <reference key="object" ref="332179816"/>
-- <reference key="parent" ref="492995933"/>
-- </object>
-- <object class="IBObjectRecord">
- <int key="objectID">912</int>
- <reference key="object" ref="391227374"/>
- <reference key="parent" ref="91482642"/>
Deleted: trunk/dports/devel/GitX/files/remove-install-cli-tool.patch
===================================================================
--- trunk/dports/devel/GitX/files/remove-install-cli-tool.patch 2011-08-04 20:30:28 UTC (rev 81777)
+++ trunk/dports/devel/GitX/files/remove-install-cli-tool.patch 2011-08-04 20:31:03 UTC (rev 81778)
@@ -1,62 +0,0 @@
---- ApplicationController.h.orig 2011-08-04 21:55:51.000000000 +0200
-+++ ApplicationController.h 2011-08-04 21:56:11.000000000 +0200
-@@ -30,8 +30,6 @@
- - (IBAction)openPreferencesWindow:(id)sender;
- - (IBAction)showAboutPanel:(id)sender;
-
--- (IBAction)installCliTool:(id)sender;
--
- - (IBAction)saveAction:sender;
- - (IBAction) showHelp:(id) sender;
-
---- ApplicationController.m.orig 2011-08-04 21:55:57.000000000 +0200
-+++ ApplicationController.m 2011-08-04 21:57:31.000000000 +0200
-@@ -123,48 +123,6 @@
- [NSApp orderFrontStandardAboutPanelWithOptions:dict];
- }
-
--- (IBAction)installCliTool:(id)sender;
--{
-- BOOL success = NO;
-- NSString* installationPath = @"/usr/local/bin/";
-- NSString* installationName = @"gitx";
-- NSString* toolPath = [[NSBundle mainBundle] pathForResource:@"gitx" ofType:@""];
-- if (toolPath) {
-- AuthorizationRef auth;
-- if (AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &auth) == errAuthorizationSuccess) {
-- char const* mkdir_arg[] = { "-p", [installationPath UTF8String], NULL};
-- char const* mkdir = "/bin/mkdir";
-- AuthorizationExecuteWithPrivileges(auth, mkdir, kAuthorizationFlagDefaults, (char**)mkdir_arg, NULL);
-- char const* arguments[] = { "-f", "-s", [toolPath UTF8String], [[installationPath stringByAppendingString: installationName] UTF8String], NULL };
-- char const* helperTool = "/bin/ln";
-- if (AuthorizationExecuteWithPrivileges(auth, helperTool, kAuthorizationFlagDefaults, (char**)arguments, NULL) == errAuthorizationSuccess) {
-- int status;
-- int pid = wait(&status);
-- if (pid != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
-- success = true;
-- else
-- errno = WEXITSTATUS(status);
-- }
--
-- AuthorizationFree(auth, kAuthorizationFlagDefaults);
-- }
-- }
--
-- if (success) {
-- [[NSAlert alertWithMessageText:@"Installation Complete"
-- defaultButton:nil
-- alternateButton:nil
-- otherButton:nil
-- informativeTextWithFormat:@"The gitx tool has been installed to %@", installationPath] runModal];
-- } else {
-- [[NSAlert alertWithMessageText:@"Installation Failed"
-- defaultButton:nil
-- alternateButton:nil
-- otherButton:nil
-- informativeTextWithFormat:@"Installation to %@ failed", installationPath] runModal];
-- }
--}
--
- /**
- Returns the support folder for the application, used to store the Core Data
- store file. This code uses a folder named "GitTest" for
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110804/e987867b/attachment-0001.html>
More information about the macports-changes
mailing list