--- mkspecs/common/clang.conf.orig	2016-12-01 01:17:04.000000000 -0700
+++ mkspecs/common/clang.conf	2016-12-26 05:05:56.000000000 -0700
@@ -4,8 +4,8 @@
 
 QMAKE_COMPILER          = gcc clang llvm   # clang pretends to be gcc
 
-QMAKE_CC                = clang
-QMAKE_CXX               = clang++
+QMAKE_CC                = __MACPORTS_CC__
+QMAKE_CXX               = __MACPORTS_CXX__
 
 QMAKE_LINK_C            = $$QMAKE_CC
 QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
--- mkspecs/common/macx.conf.orig	2016-12-01 01:17:04.000000000 -0700
+++ mkspecs/common/macx.conf	2017-02-05 05:10:55.000000000 -0700
@@ -3,6 +3,6 @@
 #
 
 QMAKE_PLATFORM         += macos osx macx
-QMAKE_MAC_SDK           = macosx
+QMAKE_MAC_SDK           = __MACPORTS_MAC_SDK__
 
 include(mac.conf)
--- mkspecs/macx-clang/qmake.conf.orig	2016-09-15 22:49:42.000000000 -0700
+++ mkspecs/macx-clang/qmake.conf	2016-12-24 08:54:33.000000000 -0700
@@ -7,6 +7,10 @@
 include(../common/clang.conf)
 include(../common/clang-mac.conf)
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
+
+QMAKE_CFLAGS           += -arch x86_64
+QMAKE_CXXFLAGS         += -arch x86_64
+QMAKE_LFLAGS           += -arch x86_64
 
 load(qt_config)
--- mkspecs/macx-clang-32/qmake.conf.orig	2016-10-31 19:11:03.000000000 -0700
+++ mkspecs/macx-clang-32/qmake.conf	2016-10-31 19:13:21.000000000 -0700
@@ -7,7 +7,7 @@
 include(../common/clang.conf)
 include(../common/clang-mac.conf)
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
 
 QMAKE_CFLAGS           += -arch i386
 QMAKE_CXXFLAGS         += -arch i386
--- mkspecs/macx-g++/qmake.conf.orig	2016-09-15 22:49:42.000000000 -0700
+++ mkspecs/macx-g++/qmake.conf	2016-12-24 08:56:11.000000000 -0700
@@ -14,6 +14,10 @@
 include(../common/gcc-base-mac.conf)
 include(../common/g++-macx.conf)
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
+
+QMAKE_CFLAGS           += -arch x86_64
+QMAKE_CXXFLAGS         += -arch x86_64
+QMAKE_LFLAGS           += -arch x86_64
 
 load(qt_config)
--- mkspecs/macx-g++-32/qmake.conf.orig	2016-10-31 19:11:18.000000000 -0700
+++ mkspecs/macx-g++-32/qmake.conf	2016-10-31 19:13:56.000000000 -0700
@@ -14,7 +14,7 @@
 include(../common/gcc-base-mac.conf)
 include(../common/g++-macx.conf)
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
 
 QMAKE_CFLAGS           += -arch i386
 QMAKE_CXXFLAGS         += -arch i386
--- mkspecs/macx-g++40/qmake.conf.orig	2016-10-31 19:11:25.000000000 -0700
+++ mkspecs/macx-g++40/qmake.conf	2016-10-31 19:14:40.000000000 -0700
@@ -14,7 +14,7 @@
 include(../common/gcc-base-mac.conf)
 include(../common/g++-macx.conf)
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
 
 QMAKE_CC                = gcc-4.0
 QMAKE_CXX               = g++-4.0
--- mkspecs/macx-g++42/qmake.conf.orig	2016-10-31 19:11:33.000000000 -0700
+++ mkspecs/macx-g++42/qmake.conf	2016-10-31 19:14:56.000000000 -0700
@@ -14,7 +14,7 @@
 include(../common/gcc-base-mac.conf)
 include(../common/g++-macx.conf)
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
 
 QMAKE_CC                = gcc-4.2
 QMAKE_CXX               = g++-4.2
--- mkspecs/macx-icc/qmake.conf.orig	2016-10-31 19:11:43.000000000 -0700
+++ mkspecs/macx-icc/qmake.conf	2016-10-31 19:15:29.000000000 -0700
@@ -90,7 +90,7 @@
 QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
 QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
 
 include(../common/macx.conf)
 
--- mkspecs/macx-llvm/qmake.conf.orig	2016-10-31 19:11:55.000000000 -0700
+++ mkspecs/macx-llvm/qmake.conf	2016-10-31 19:15:50.000000000 -0700
@@ -14,7 +14,7 @@
 include(../common/gcc-base-mac.conf)
 include(../common/llvm.conf)
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
 
 QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
 
--- mkspecs/common/clang-mac.conf.orig	2017-05-06 08:49:54.000000000 -0700
+++ mkspecs/common/clang-mac.conf	2017-05-06 08:51:06.000000000 -0700
@@ -6,6 +6,6 @@
 
 QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
 
-QMAKE_CXXFLAGS += -stdlib=libc++
-QMAKE_LFLAGS   += -stdlib=libc++
+QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__
+QMAKE_LFLAGS   += -stdlib=__MACPORTS_CXX_STDLIB__
 QMAKE_AR_LTCG  = libtool -static -o
--- mkspecs/common/gcc-base.conf.orig	2017-10-12 10:45:54.000000000 -0700
+++ mkspecs/common/gcc-base.conf	2017-10-12 10:46:13.000000000 -0700
@@ -31,7 +31,7 @@
 # you can use the manual test in tests/manual/mkspecs.
 #
 
-QMAKE_CFLAGS_OPTIMIZE      = -O2
+QMAKE_CFLAGS_OPTIMIZE      = __MACPORTS_OPTFLAGS__
 QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
 
 QMAKE_CFLAGS               += -pipe