Merge branch '0.5.x' into 0.6.0.x

[novacoin.git] / doc / build-osx.txt

diff --git a/doc/build-osx.txt b/doc/build-osx.txt
index a13f8d3..2ae7706 100644 (file)
--- a/doc/build-osx.txt
+++ b/doc/build-osx.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Bitcoin Developers
+Copyright (c) 2009-2012 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying file
 license.txt or http://www.opensource.org/licenses/mit-license.php.  This
 product includes software developed by the OpenSSL Project for use in the
@@ -31,14 +31,15 @@ git clone git@github.com:bitcoin/bitcoin.git bitcoin
 
 2.  Download and install MacPorts from http://www.macports.org/
 
+2a. (for 10.7 Lion)
+    Edit /opt/local/etc/macports/macports.conf and uncomment "build_arch i386"
+
 3.  Install dependencies from MacPorts
 
-sudo port install boost db48 openssl
+sudo port install boost db48 openssl miniupnpc
 
-Install the right version of miniupnpc:
-pushd bitcoin/contrib/minipupnpc; sudo port install; popd
-(this will be unnecessary soon, you will just port install miniupnpc
-along with the rest of the dependencies).
+Optionally install qrencode (and set USE_QRCODE=1):
+sudo port install qrencode
 
 4.  Now you should be able to build bitcoind: