--- mkspecs/common/clang.conf.orig	2017-06-28 02:54:29.000000000 -0700
+++ mkspecs/common/clang.conf	2017-08-27 07:20:26.000000000 -0700
@@ -4,8 +4,8 @@
 
 QMAKE_COMPILER          = gcc clang llvm   # clang pretends to be gcc
 
-QMAKE_CC                = $${CROSS_COMPILE}clang
-QMAKE_CXX               = $${CROSS_COMPILE}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	2017-06-28 02:54:29.000000000 -0700
+++ mkspecs/common/macx.conf	2017-08-27 07:11:49.000000000 -0700
@@ -3,7 +3,7 @@
 #
 
 QMAKE_PLATFORM         += macos osx macx
-QMAKE_MAC_SDK           = macosx
+QMAKE_MAC_SDK           = __MACPORTS_MAC_SDK__
 
 QT_MAC_SDK_VERSION_TESTED_WITH = 10.13
 
--- mkspecs/macx-clang/qmake.conf.orig	2017-06-28 02:54:29.000000000 -0700
+++ mkspecs/macx-clang/qmake.conf	2017-08-27 07:13:38.000000000 -0700
@@ -2,9 +2,9 @@
 # qmake configuration for Clang on OS X
 #
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
 
-QMAKE_APPLE_DEVICE_ARCHS = x86_64
+QMAKE_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
 
 # Opt-in xcb QPA support with XQuartz:
 #
@@ -25,8 +25,8 @@
 # and X11, OpenGL is currently not supported.
 
 QMAKE_LIBS_X11 = -lX11 -lXext -lm
-QMAKE_LIBDIR_X11 = /opt/X11/lib
-QMAKE_INCDIR_X11 = /opt/X11/include
+QMAKE_LIBDIR_X11 = __MACPORTS_PREFIX__/lib
+QMAKE_INCDIR_X11 = __MACPORTS_PREFIX__/include
 
 include(../common/macx.conf)
 include(../common/gcc-base-mac.conf)
--- mkspecs/macx-g++/qmake.conf.orig	2017-06-28 02:54:29.000000000 -0700
+++ mkspecs/macx-g++/qmake.conf	2017-08-27 07:14:36.000000000 -0700
@@ -10,9 +10,9 @@
 CONFIG                 += app_bundle incremental global_init_link_order lib_version_first
 QMAKE_INCREMENTAL_STYLE = sublib
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
 
-QMAKE_APPLE_DEVICE_ARCHS = x86_64
+QMAKE_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
 
 include(../common/macx.conf)
 include(../common/gcc-base-mac.conf)
--- mkspecs/macx-icc/qmake.conf.orig	2017-06-28 02:54:29.000000000 -0700
+++ mkspecs/macx-icc/qmake.conf	2017-08-27 07:16:51.000000000 -0700
@@ -98,9 +98,9 @@
 QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
 QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
+QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__
 
-QMAKE_APPLE_DEVICE_ARCHS = x86_64
+QMAKE_APPLE_DEVICE_ARCHS = __MACPORTS_DEVICE_ARCHS__
 
 include(../common/macx.conf)
 
--- mkspecs/common/clang-mac.conf.orig	2017-06-28 02:54:29.000000000 -0700
+++ mkspecs/common/clang-mac.conf	2017-08-27 07:17:44.000000000 -0700
@@ -6,8 +6,8 @@
 
 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
 
 QMAKE_CFLAGS_APPLICATION_EXTENSION  = -fapplication-extension
--- mkspecs/common/gcc-base.conf.orig	2017-06-28 02:54:29.000000000 -0700
+++ mkspecs/common/gcc-base.conf	2017-10-12 09:42:06.000000000 -0700
@@ -34,7 +34,7 @@
 QMAKE_CFLAGS_OPTIMIZE      = -O2
 QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
 QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
-QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+QMAKE_CFLAGS_OPTIMIZE_SIZE = __MACPORTS_OPTFLAGS__
 
 !equals(QMAKE_HOST.os, Windows): QMAKE_CFLAGS += -pipe
 QMAKE_CFLAGS_DEPS          += -M