From 0832346dc9113a713bbbcb6d1dadeb81f0b5409e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 15 Aug 2014 15:11:45 -0400 Subject: reorg, moving MacPorts to a separate page --- doc/install/Homebrew.mdwn | 21 ----------------- doc/install/OSX.mdwn | 24 ++----------------- doc/install/OSX/Homebrew.mdwn | 21 +++++++++++++++++ doc/install/OSX/MacPorts.mdwn | 27 ++++++++++++++++++++++ ...nt_21_987f1302f56107c926b6daf83e124654._comment | 11 +++++++++ ...ent_3_47a77a03040fe628109bd54f82f9ad7a._comment | 17 ++++++++++++++ ...nt_21_987f1302f56107c926b6daf83e124654._comment | 11 --------- ...ent_3_47a77a03040fe628109bd54f82f9ad7a._comment | 17 -------------- 8 files changed, 78 insertions(+), 71 deletions(-) delete mode 100644 doc/install/Homebrew.mdwn create mode 100644 doc/install/OSX/Homebrew.mdwn create mode 100644 doc/install/OSX/MacPorts.mdwn create mode 100644 doc/install/OSX/MacPorts/comment_21_987f1302f56107c926b6daf83e124654._comment create mode 100644 doc/install/OSX/MacPorts/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment delete mode 100644 doc/install/OSX/comment_21_987f1302f56107c926b6daf83e124654._comment delete mode 100644 doc/install/OSX/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment (limited to 'doc/install') diff --git a/doc/install/Homebrew.mdwn b/doc/install/Homebrew.mdwn deleted file mode 100644 index bd9a840b0..000000000 --- a/doc/install/Homebrew.mdwn +++ /dev/null @@ -1,21 +0,0 @@ -[Homebrew](http://brew.sh/) has [a formula](https://github.com/Homebrew/homebrew/commits/master/Library/Formula/git-annex.rb) for git-annex. - -Homebrew users can simply run `brew install git-annex` to install git-annex. - -## buiding git-annex from sources - -This is the old recipe for building git-annex from source, using -packages from homebrew. Useful if you want a newer version than the version -in homebrew. - -
-brew install haskell-platform git ossp-uuid md5sha1sum coreutils gnutls libidn gsasl pkg-config libxml2
-brew link libxml2 --force
-cabal update
-mkdir $HOME/bin
-PATH=$HOME/bin:$PATH
-PATH=$HOME/.cabal/bin:$PATH
-cabal install c2hs --bindir=$HOME/bin
-cabal install gnuidn
-cabal install git-annex --bindir=$HOME/bin
-
diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn index 5a1505c60..edfeff6a7 100644 --- a/doc/install/OSX.mdwn +++ b/doc/install/OSX.mdwn @@ -31,25 +31,5 @@ git-annex is now [[available in Homebrew|Homebrew]]! ## using MacPorts -Install the Haskell Platform from [[http://hackage.haskell.org/platform/mac.html]]. -The version provided by Macports is too old to work with current versions of git-annex. -Then execute - -
-sudo port install git-core ossp-uuid md5sha1sum coreutils gnutls libxml2 libgsasl pkgconfig
-sudo cabal update
-PATH=$HOME/bin:$PATH
-cabal install c2hs git-annex --bindir=$HOME/bin
-
- -## PATH setup - -Do not forget to add to your PATH variable your ~/bin folder. In your .bashrc, for example: -
-PATH=$HOME/bin:$PATH
-
- -See also: - -* [[forum/OSX__39__s_haskell-platform_statically_links_things]] -* [[forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set]] +git-annex is not available in MacPorts, but can be built from source using +MacPorts tools. See [[MacPorts]] diff --git a/doc/install/OSX/Homebrew.mdwn b/doc/install/OSX/Homebrew.mdwn new file mode 100644 index 000000000..bd9a840b0 --- /dev/null +++ b/doc/install/OSX/Homebrew.mdwn @@ -0,0 +1,21 @@ +[Homebrew](http://brew.sh/) has [a formula](https://github.com/Homebrew/homebrew/commits/master/Library/Formula/git-annex.rb) for git-annex. + +Homebrew users can simply run `brew install git-annex` to install git-annex. + +## buiding git-annex from sources + +This is the old recipe for building git-annex from source, using +packages from homebrew. Useful if you want a newer version than the version +in homebrew. + +
+brew install haskell-platform git ossp-uuid md5sha1sum coreutils gnutls libidn gsasl pkg-config libxml2
+brew link libxml2 --force
+cabal update
+mkdir $HOME/bin
+PATH=$HOME/bin:$PATH
+PATH=$HOME/.cabal/bin:$PATH
+cabal install c2hs --bindir=$HOME/bin
+cabal install gnuidn
+cabal install git-annex --bindir=$HOME/bin
+
diff --git a/doc/install/OSX/MacPorts.mdwn b/doc/install/OSX/MacPorts.mdwn new file mode 100644 index 000000000..379e42d12 --- /dev/null +++ b/doc/install/OSX/MacPorts.mdwn @@ -0,0 +1,27 @@ +This is not a recommended way to install git-annex. Use [[HomeBrew]] or the +prebuilt app bundle instead. + +But if you really want to use MacPorts: + +Install the Haskell Platform from [[http://hackage.haskell.org/platform/mac.html]]. +The version provided by Macports is too old to work with current versions of git-annex. +Then execute + +
+sudo port install git-core ossp-uuid md5sha1sum coreutils gnutls libxml2 libgsasl pkgconfig
+sudo cabal update
+PATH=$HOME/bin:$PATH
+cabal install c2hs git-annex --bindir=$HOME/bin
+
+ +## PATH setup + +Do not forget to add to your PATH variable your ~/bin folder. In your .bashrc, for example: +
+PATH=$HOME/bin:$PATH
+
+ +See also: + +* [[forum/OSX__39__s_haskell-platform_statically_links_things]] +* [[forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set]] diff --git a/doc/install/OSX/MacPorts/comment_21_987f1302f56107c926b6daf83e124654._comment b/doc/install/OSX/MacPorts/comment_21_987f1302f56107c926b6daf83e124654._comment new file mode 100644 index 000000000..e7d42b534 --- /dev/null +++ b/doc/install/OSX/MacPorts/comment_21_987f1302f56107c926b6daf83e124654._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmJdzisfT6DhorwRz0kKJ_9-zQbccCopu4" + nickname="Alejandro" + subject="Macports _iconv" + date="2013-07-18T14:23:02Z" + content=""" +If you get an error like `undefined symbol _iconv for x86_64`, you're most likely using libiconv installed by macports. You can fix this by running + + cabal install c2hs git-annex --bindir=$HOME/bin --extra-lib-dirs=/usr/lib + +"""]] diff --git a/doc/install/OSX/MacPorts/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment b/doc/install/OSX/MacPorts/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment new file mode 100644 index 000000000..69f3f0fee --- /dev/null +++ b/doc/install/OSX/MacPorts/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlDDW-g2WLLsLpcnCm4LykAquFY_nwbIrU" + nickname="Daniel" + subject="comment 3" + date="2013-01-15T15:22:43Z" + content=""" +Installing via the MacPorts method. I ran into this error. + + \"_locale_charset\", referenced from: _localeEncoding in libHSbase-4.5.1.0.a(PrelIOUtils.o) + ld: symbol(s) not found for architecture x86_64 + +I was able to solve and get git-annex to build buy providing the --extra-lib-dirs parameter + + cabal install c2hs git-annex --bindir=$HOME/bin --extra-lib-dirs=/usr/lib + +Cheers, [Daniel Wozniak](http://woz.io) +"""]] diff --git a/doc/install/OSX/comment_21_987f1302f56107c926b6daf83e124654._comment b/doc/install/OSX/comment_21_987f1302f56107c926b6daf83e124654._comment deleted file mode 100644 index e7d42b534..000000000 --- a/doc/install/OSX/comment_21_987f1302f56107c926b6daf83e124654._comment +++ /dev/null @@ -1,11 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawmJdzisfT6DhorwRz0kKJ_9-zQbccCopu4" - nickname="Alejandro" - subject="Macports _iconv" - date="2013-07-18T14:23:02Z" - content=""" -If you get an error like `undefined symbol _iconv for x86_64`, you're most likely using libiconv installed by macports. You can fix this by running - - cabal install c2hs git-annex --bindir=$HOME/bin --extra-lib-dirs=/usr/lib - -"""]] diff --git a/doc/install/OSX/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment b/doc/install/OSX/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment deleted file mode 100644 index 69f3f0fee..000000000 --- a/doc/install/OSX/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment +++ /dev/null @@ -1,17 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawlDDW-g2WLLsLpcnCm4LykAquFY_nwbIrU" - nickname="Daniel" - subject="comment 3" - date="2013-01-15T15:22:43Z" - content=""" -Installing via the MacPorts method. I ran into this error. - - \"_locale_charset\", referenced from: _localeEncoding in libHSbase-4.5.1.0.a(PrelIOUtils.o) - ld: symbol(s) not found for architecture x86_64 - -I was able to solve and get git-annex to build buy providing the --extra-lib-dirs parameter - - cabal install c2hs git-annex --bindir=$HOME/bin --extra-lib-dirs=/usr/lib - -Cheers, [Daniel Wozniak](http://woz.io) -"""]] -- cgit v1.2.3