From 5be83ac100a3a951f78f220237d776f466ca106a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Sep 2012 17:08:22 -0400 Subject: add brew section to osx page and move away comments obsoleted by this change --- .../comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment | 13 ------------- .../comment_2_25552ff2942048fafe97d653757f1ad6._comment | 1 + .../comment_3_733147cebe501c60f2141b711f1d7f24._comment | 16 ---------------- .../comment_4_d513e21512a9b207983d38abf348d00f._comment | 16 ---------------- .../comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment | 13 +++++++++++++ .../comment_3_733147cebe501c60f2141b711f1d7f24._comment | 16 ++++++++++++++++ 6 files changed, 30 insertions(+), 45 deletions(-) delete mode 100644 doc/install/OSX/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment delete mode 100644 doc/install/OSX/comment_3_733147cebe501c60f2141b711f1d7f24._comment delete mode 100644 doc/install/OSX/comment_4_d513e21512a9b207983d38abf348d00f._comment create mode 100644 doc/install/OSX/old_comments/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment create mode 100644 doc/install/OSX/old_comments/comment_3_733147cebe501c60f2141b711f1d7f24._comment (limited to 'doc/install/OSX') diff --git a/doc/install/OSX/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment b/doc/install/OSX/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment deleted file mode 100644 index 1148a87ca..000000000 --- a/doc/install/OSX/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment +++ /dev/null @@ -1,13 +0,0 @@ -[[!comment format=mdwn - username="http://www.schleptet.net/~cfm/" - ip="64.30.148.100" - subject="comment 1" - date="2011-08-30T14:31:36Z" - content=""" -You can also use Homebrew instead of MacPorts. Homebrew's `haskell-platform` is up-to-date, too: - - brew install haskell-platform git ossp-uuid md5sha1sum coreutils pcre - ln -s /usr/local/include/pcre.h /usr/include/pcre.h - -As of this writing, however, Homebrew's `md5sha1sum` has a broken mirror. I wound up getting that from MacPorts anyway. -"""]] diff --git a/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment b/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment index 62ee10910..8d7010a1b 100644 --- a/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment +++ b/doc/install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment @@ -4,4 +4,5 @@ date="2012-07-24T15:09:29Z" content=""" I've moved some outdated comments about installing on OSX to [[old_comments]]. +And also moved away some comments that helped build the instructions above. """]] diff --git a/doc/install/OSX/comment_3_733147cebe501c60f2141b711f1d7f24._comment b/doc/install/OSX/comment_3_733147cebe501c60f2141b711f1d7f24._comment deleted file mode 100644 index 51e667ab6..000000000 --- a/doc/install/OSX/comment_3_733147cebe501c60f2141b711f1d7f24._comment +++ /dev/null @@ -1,16 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawnnIQkoUQo4RYzjUNyiB3v6yJ5aR41WG8k" - nickname="Markus" - subject="Updated install instructions with homebrew" - date="2012-08-07T06:46:47Z" - content=""" -To install git annex with homebrew simply do: - - brew update - brew install haskell-platform git ossp-uuid md5sha1sum coreutils pcre - cabal install git-annex - -Then link the binary to your `PATH` e.g. with - - ln -s ~/.cabal/bin/git-annex* /usr/local/bin/ -"""]] diff --git a/doc/install/OSX/comment_4_d513e21512a9b207983d38abf348d00f._comment b/doc/install/OSX/comment_4_d513e21512a9b207983d38abf348d00f._comment deleted file mode 100644 index 049f7e962..000000000 --- a/doc/install/OSX/comment_4_d513e21512a9b207983d38abf348d00f._comment +++ /dev/null @@ -1,16 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawm_-2XlXNyd6cCLI4n_jaBNqVUOWwJquko" - nickname="David" - subject="installing via homebrew" - date="2012-09-05T11:11:55Z" - content=""" -I had to: - - cabal update - -before: - - cabal install git-annex - - -"""]] diff --git a/doc/install/OSX/old_comments/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment b/doc/install/OSX/old_comments/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment new file mode 100644 index 000000000..1148a87ca --- /dev/null +++ b/doc/install/OSX/old_comments/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="http://www.schleptet.net/~cfm/" + ip="64.30.148.100" + subject="comment 1" + date="2011-08-30T14:31:36Z" + content=""" +You can also use Homebrew instead of MacPorts. Homebrew's `haskell-platform` is up-to-date, too: + + brew install haskell-platform git ossp-uuid md5sha1sum coreutils pcre + ln -s /usr/local/include/pcre.h /usr/include/pcre.h + +As of this writing, however, Homebrew's `md5sha1sum` has a broken mirror. I wound up getting that from MacPorts anyway. +"""]] diff --git a/doc/install/OSX/old_comments/comment_3_733147cebe501c60f2141b711f1d7f24._comment b/doc/install/OSX/old_comments/comment_3_733147cebe501c60f2141b711f1d7f24._comment new file mode 100644 index 000000000..51e667ab6 --- /dev/null +++ b/doc/install/OSX/old_comments/comment_3_733147cebe501c60f2141b711f1d7f24._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnnIQkoUQo4RYzjUNyiB3v6yJ5aR41WG8k" + nickname="Markus" + subject="Updated install instructions with homebrew" + date="2012-08-07T06:46:47Z" + content=""" +To install git annex with homebrew simply do: + + brew update + brew install haskell-platform git ossp-uuid md5sha1sum coreutils pcre + cabal install git-annex + +Then link the binary to your `PATH` e.g. with + + ln -s ~/.cabal/bin/git-annex* /usr/local/bin/ +"""]] -- cgit v1.2.3