Update build instructions and makefile.osx for Mac os

doc/build-osx.md

@@ -15,40 +15,62 @@ Douglas Huff <dhuff@jrbobdobbs.org>
 See readme-qt.rst for instructions on building DigitalNote QT, the
 graphical user interface.
 
-Tested on 10.5 and 10.6 intel.  PPC is not supported because it's big-endian.
+- Tested on 10.5 and 10.6 intel and 10.15.2.  
+- PPC is not supported because it's big-endian.
 
 All of the commands should be executed in Terminal.app.. it's in
 /Applications/Utilities
 
 You need to install XCode with all the options checked so that the compiler and
-everything is available in /usr not just /Developer I think it comes on the DVD
-but you can get the current version from http://developer.apple.com
-
-
-1.  Clone the github tree to get the source code:
-
-git clone http://github.com/DigitalNotedev/DigitalNote DigitalNote
-
-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 miniupnpc
-
-Optionally install qrencode (and set USE_QRCODE=1):
-sudo port install qrencode
-
-4.  Now you should be able to build DigitalNoted:
-
-cd DigitalNote/src
-make -f makefile.osx
+everything is available in /usr not just /Developer 
+You can get the current version from http://developer.apple.com
+
+
+1. Clone the github tree to get the source code
+
+    ```git clone http://github.com/DigitalNotedev/DigitalNote DigitalNote``` 
+
+2. Install dependencies using Homebrew
+    1. Install dependencies:
+    ```
+   brew install boost@1.59
+   brew install berkeley-db4           
+   brew install miniupnpc@2.1
+   brew install https://github.com/tebelorg/Tump/releases/download/v1.0.0/openssl.rb
+   brew install automake
+   brew install autoconf
+   brew install libtool
+   brew install qrencode
+   ```
+   2. You might need to create a symlink if `openssl/sha.h` or any other header from openssl/ folder cannot be found when building DigitalNoted:
+   ```
+   cd /usr/local/include
+   ln -s ../opt/openssl/include/openssl .
+   ```
+   Your compiler will search in this directory (one of many standard directories) and find the header file sha.h via the shortcut link.
+
+   3. Now create a symlink to miniupnpc files since it is installed in a folder without a version appended and source files are expecting a version:
+   ```
+   cd /usr/local/include
+   ln -s ../opt/miniupnpc/include/miniupnpc ./miniupnpc-2.1
+   ``` 
+   4. Check the versions of dependencies in src/makefile.osx and amend to match yours if required 
+
+3.  Now you should be able to build DigitalNoted:
+
+    ```
+    cd DigitalNote-2/src
+    make -f makefile.osx
+    ```
 
 Run:
-  ./DigitalNoted --help  # for a list of command-line options.
+  `./DigitalNoted --help` 
+for a list of command-line options.
+
 Run
-  ./DigitalNoted -daemon # to start the DigitalNote daemon.
+  `./DigitalNoted -daemon`
+to start the DigitalNote daemon.
+
 Run
-  ./DigitalNoted help # When the daemon is running, to get a list of RPC commands
+  `./DigitalNoted help`
+When the daemon is running, to get a list of RPC commands

src/makefile.osx

@@ -6,23 +6,23 @@
 # Mac OS X makefile for DigitalNote
 # Originally by Laszlo Hanyecz (solar@heliacal.net)
 
-CXX=clang++
+CXX=clang++ -std=c++11
 C=clang
 DEPSDIR=/usr/local
 
 INCLUDEPATHS= \
  -I"$(CURDIR)" \
  -I"$(CURDIR)"/obj \
  -I"$(DEPSDIR)/include" \
- -I"$(DEPSDIR)/Cellar/boost/1.59.0/include" \
- -I"$(DEPSDIR)/Cellar/berkeley-db4/4.8.30/include" \
- -I"$(DEPSDIR)/openssl-1.0.1p/include"
+ -I"$(DEPSDIR)/Cellar/boost@1.59/1.59.0/include" \
+ -I"$(DEPSDIR)/Cellar/berkeley-db@4/4.8.30/include" \
+ -I"$(DEPSDIR)/Cellar/openssl/1.0.2t/lib"
 
 LIBPATHS= \
  -L"$(DEPSDIR)/lib" \
- -L"$(DEPSDIR)/Cellar/boost/1.59.0/lib" \
- -L"$(DEPSDIR)/Cellar/berkeley-db4/4.8.30/lib" \
- -L"$(DEPSDIR)/openssl-1.0.1p/lib"
+ -L"$(DEPSDIR)/Cellar/boost@1.59/1.59.0/lib" \
+ -L"$(DEPSDIR)/Cellar/berkeley-db@4/4.8.30/lib" \
+ -L"$(DEPSDIR)/Cellar/openssl/1.0.2t/lib"
 
 USE_UPNP:=1
 USE_WALLET:=1