summaryrefslogtreecommitdiff
path: root/doc/install
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-08-15 15:11:45 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-08-15 15:11:45 -0400
commit0832346dc9113a713bbbcb6d1dadeb81f0b5409e (patch)
tree7ce1c9487901630959e31a01f23dd7f1ed82c174 /doc/install
parentcf2b59d496e9da8e8ae6215676a454d2e04a97e6 (diff)
reorg, moving MacPorts to a separate page
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/OSX.mdwn24
-rw-r--r--doc/install/OSX/Homebrew.mdwn (renamed from doc/install/Homebrew.mdwn)0
-rw-r--r--doc/install/OSX/MacPorts.mdwn27
-rw-r--r--doc/install/OSX/MacPorts/comment_21_987f1302f56107c926b6daf83e124654._comment (renamed from doc/install/OSX/comment_21_987f1302f56107c926b6daf83e124654._comment)0
-rw-r--r--doc/install/OSX/MacPorts/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment (renamed from doc/install/OSX/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment)0
5 files changed, 29 insertions, 22 deletions
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
-
-<pre>
-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
-</pre>
-
-## PATH setup
-
-Do not forget to add to your PATH variable your ~/bin folder. In your .bashrc, for example:
-<pre>
-PATH=$HOME/bin:$PATH
-</pre>
-
-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/Homebrew.mdwn b/doc/install/OSX/Homebrew.mdwn
index bd9a840b0..bd9a840b0 100644
--- a/doc/install/Homebrew.mdwn
+++ b/doc/install/OSX/Homebrew.mdwn
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
+
+<pre>
+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
+</pre>
+
+## PATH setup
+
+Do not forget to add to your PATH variable your ~/bin folder. In your .bashrc, for example:
+<pre>
+PATH=$HOME/bin:$PATH
+</pre>
+
+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/comment_21_987f1302f56107c926b6daf83e124654._comment b/doc/install/OSX/MacPorts/comment_21_987f1302f56107c926b6daf83e124654._comment
index e7d42b534..e7d42b534 100644
--- a/doc/install/OSX/comment_21_987f1302f56107c926b6daf83e124654._comment
+++ b/doc/install/OSX/MacPorts/comment_21_987f1302f56107c926b6daf83e124654._comment
diff --git a/doc/install/OSX/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment b/doc/install/OSX/MacPorts/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment
index 69f3f0fee..69f3f0fee 100644
--- a/doc/install/OSX/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment
+++ b/doc/install/OSX/MacPorts/comment_3_47a77a03040fe628109bd54f82f9ad7a._comment