Revert 0163949..fc1a317

This rolls back to commit 016394940ff1e746f0716f3250c2b3b1a0c974df.

5 files changed, 13 insertions, 42 deletions

diff --git a/src/compat.h b/src/compat.h
index 7297a4d46..582300a92 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -28,10 +28,6 @@
 #endif
 
 typedef u_int SOCKET;
-#ifdef MAC_OSX
-#define MSG_NOSIGNAL        SO_NOSIGPIPE
-#endif
-
 #ifdef WIN32
 #define MSG_NOSIGNAL        0
 #define MSG_DONTWAIT        0
diff --git a/src/leveldb/build_detect_platform b/src/leveldb/build_detect_platform
index bdfd64172..bdfd64172 100755..100644
--- a/src/leveldb/build_detect_platform
+++ b/src/leveldb/build_detect_platform
diff --git a/src/mac/Info.plist b/src/mac/Info.plist
deleted file mode 100644
index b3432ff1a..000000000
--- a/src/mac/Info.plist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleShortVersionString</key>
-        <string>1.5.0.1</string>
-	<key>CFBundleVersion</key>
-        <string>1.5 Alpha 1</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>CFBundleIconFile</key>
-	<string>Dogecoin.icns</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>© Dogecoin</string>
-	<key>CFBundleSignature</key>
-	<string>DOGE</string>
-	<key>CFBundleExecutable</key>
-	<string>Dogecoin-Qt</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.dogecoin.wallet-qt</string>
-	<key>CFBundleName</key>
-	<string>Dogecoin-Qt</string>
-</dict>
-</plist>
diff --git a/src/makefile.osx b/src/makefile.osx
index 4fd7a859f..deab964e7 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -4,20 +4,21 @@
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-# Mac OS X makefile for Dogecoin
+# Mac OS X makefile for bitcoin
 # Originally by Laszlo Hanyecz ([email protected])
 
-STATIC=yes
-CXX=c++
-DEPSDIR=/usr/local
+CXX=llvm-g++
+DEPSDIR=/opt/local
 
 INCLUDEPATHS= \
  -I"$(CURDIR)" \
  -I"$(CURDIR)"/obj \
- -I"$(DEPSDIR)/include" 
+ -I"$(DEPSDIR)/include" \
+ -I"$(DEPSDIR)/include/db48"
 
 LIBPATHS= \
- -L"$(DEPSDIR)/lib" 
+ -L"$(DEPSDIR)/lib" \
+ -L"$(DEPSDIR)/lib/db48"
 
 USE_UPNP:=1
 USE_IPV6:=1
@@ -31,20 +32,20 @@ ifdef STATIC
 TESTLIBS += \
  $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
 LIBS += \
- $(DEPSDIR)/lib/libdb_cxx.a \
+ $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
  $(DEPSDIR)/lib/libboost_system-mt.a \
  $(DEPSDIR)/lib/libboost_filesystem-mt.a \
  $(DEPSDIR)/lib/libboost_program_options-mt.a \
  $(DEPSDIR)/lib/libboost_thread-mt.a \
  $(DEPSDIR)/lib/libboost_chrono-mt.a \
- -lssl \
- -lcrypto \
+ $(DEPSDIR)/lib/libssl.a \
+ $(DEPSDIR)/lib/libcrypto.a \
  -lz
 else
 TESTLIBS += \
  -lboost_unit_test_framework-mt
 LIBS += \
- -ldb_cxx \
+ -ldb_cxx-4.8 \
  -lboost_system-mt \
  -lboost_filesystem-mt \
  -lboost_program_options-mt \
@@ -62,7 +63,7 @@ ifdef RELEASE
 # Compile for maximum compatibility and smallest size.
 # This requires that dependencies are compiled
 # the same way.
-CFLAGS = -mmacosx-version-min=10.6 -O3
+CFLAGS = -mmacosx-version-min=10.5 -arch i386 -O3
 else
 DEBUGFLAGS = -g
 endif
@@ -143,7 +144,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
 DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
 DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
 leveldb/libleveldb.a:
-	@echo "Building LevelDB ..." && cd leveldb && chmod +x build_detect_platform && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd ..
+	@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd ..
 
 # auto-generated dependencies:
 -include obj/*.P
diff --git a/src/qt/res/icons/dogecoin.icns b/src/qt/res/icons/dogecoin.icns
deleted file mode 100644
index 1ced687b5..000000000
--- a/src/qt/res/icons/dogecoin.icns
+++ /dev/null