--- a/programs/mythwelcome/mythwelcome.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythwelcome/mythwelcome.pro	2018-08-09 23:40:23.983363440 -0600
@@ -3,7 +3,7 @@
 include (../programs-libs.pro)
 
 QT += xml sql network
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythutil/mythutil.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythutil/mythutil.pro	2018-08-09 23:40:23.984363458 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro )
 
 QT += network sql xml
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythtv-setup/mythtv-setup.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythtv-setup/mythtv-setup.pro	2018-08-09 23:40:23.986363495 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro )
 
 QT += network xml sql
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythtranscode/mythtranscode.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythtranscode/mythtranscode.pro	2018-08-09 23:40:23.987363513 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro)
 
 QT += network xml sql
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythscreenwizard/mythscreenwizard.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythscreenwizard/mythscreenwizard.pro	2018-08-09 23:40:23.992363606 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro)
 
 QT += sql network
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythpreviewgen/mythpreviewgen.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythpreviewgen/mythpreviewgen.pro	2018-08-09 23:40:23.993363624 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro )
 
 QT += network sql
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythmediaserver/mythmediaserver.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythmediaserver/mythmediaserver.pro	2018-08-09 23:40:23.996363679 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro )
 
 QT += network sql
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythlogserver/mythlogserver.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythlogserver/mythlogserver.pro	2018-08-09 23:40:23.997363698 -0600
@@ -2,7 +2,7 @@
 include ( ../programs-libs.pro )
 
 QT += sql network
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythlcdserver/mythlcdserver.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythlcdserver/mythlcdserver.pro	2018-08-09 23:40:23.998363716 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro )
 
 QT += network xml sql
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 using_opengl:QT += opengl
--- a/programs/mythjobqueue/mythjobqueue.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythjobqueue/mythjobqueue.pro	2018-08-09 23:40:24.000363753 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro)
 
 QT += sql network
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythfrontend/mythfrontend.pro	2018-08-09 23:39:57.759879879 -0600
+++ b/programs/mythfrontend/mythfrontend.pro	2018-08-09 23:40:24.001363771 -0600
@@ -11,7 +11,7 @@
 QT += webkit
 using_qtdbus: CONFIG += qdbus
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 QT += webkitwidgets
 using_qtdbus: QT += dbus
--- a/programs/mythfilldatabase/mythfilldatabase.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythfilldatabase/mythfilldatabase.pro	2018-08-09 23:40:24.003363808 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro )
 
 QT += network xml sql
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythfilerecorder/mythfilerecorder.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythfilerecorder/mythfilerecorder.pro	2018-08-09 23:40:24.004363827 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro )
 
 QT += network xml sql script
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythcommflag/mythcommflag.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythcommflag/mythcommflag.pro	2018-08-09 23:40:24.006363864 -0600
@@ -2,7 +2,7 @@
 include (../../version.pro)
 include ( ../programs-libs.pro )
 
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythccextractor/mythccextractor.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythccextractor/mythccextractor.pro	2018-08-09 23:40:24.007363882 -0600
@@ -2,7 +2,7 @@
 include ( ../programs-libs.pro )
 
 QT += sql network
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythbackend/mythbackend.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythbackend/mythbackend.pro	2018-08-09 23:40:24.009363919 -0600
@@ -10,7 +10,7 @@
    # need the following for QUrl::addQueryItem
    DEFINES += QT_DISABLE_DEPRECATED_BEFORE
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/programs/mythavtest/mythavtest.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/programs/mythavtest/mythavtest.pro	2018-08-09 23:40:24.010363937 -0600
@@ -3,7 +3,7 @@
 include ( ../programs-libs.pro )
 
 QT += network xml sql
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/libs/libmythui/libmythui.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythui/libmythui.pro	2018-08-09 23:40:24.018364085 -0600
@@ -4,7 +4,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 QT += webkit
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 QT += webkitwidgets
 android: QT += androidextras
--- a/libs/libmythtv/libmythtv.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythtv/libmythtv.pro	2018-08-09 23:40:24.029364288 -0600
@@ -1,7 +1,7 @@
 include ( ../../settings.pro )
 
 QT += network xml sql
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/libs/libmythtv/test/test_mpegtables/test_mpegtables.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythtv/test/test_mpegtables/test_mpegtables.pro	2018-08-09 23:40:24.020364122 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmythtv/test/test_iptvrecorder/test_iptvrecorder.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythtv/test/test_iptvrecorder/test_iptvrecorder.pro	2018-08-09 23:40:24.022364159 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmythtv/test/test_eitfixups/test_eitfixups.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythtv/test/test_eitfixups/test_eitfixups.pro	2018-08-09 23:40:24.023364177 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmythtv/test/test_copyframes/test_copyframes.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythtv/test/test_copyframes/test_copyframes.pro	2018-08-09 23:40:24.025364214 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmythprotoserver/libmythprotoserver.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythprotoserver/libmythprotoserver.pro	2018-08-09 23:40:24.033364362 -0600
@@ -1,7 +1,7 @@
 include ( ../../settings.pro )
 
 QT += network sql
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/libs/libmythmetadata/libmythmetadata.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythmetadata/libmythmetadata.pro	2018-08-09 23:40:24.040364491 -0600
@@ -1,7 +1,7 @@
 include ( ../../settings.pro )
 
 QT += network xml sql
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro	2018-08-09 23:40:24.037364435 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmythbase/libmythbase.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythbase/libmythbase.pro	2018-08-09 23:40:24.052364712 -0600
@@ -154,7 +154,7 @@
 
 QT += xml sql network
 
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 }
 
--- a/libs/libmythbase/test/test_template/test_template.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythbase/test/test_template/test_template.pro	2018-08-09 23:40:24.044364564 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro	2018-08-09 23:40:24.046364601 -0600
@@ -3,7 +3,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro	2018-08-09 23:40:24.047364620 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro	2018-08-09 23:40:24.049364657 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmyth/libmyth.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmyth/libmyth.pro	2018-08-09 23:40:24.058364823 -0600
@@ -1,7 +1,7 @@
 include ( ../../settings.pro )
 
 QT += network xml sql script
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += widgets
 android: QT += androidextras
 }
@@ -169,7 +169,7 @@
     SOURCES += mediamonitor-unix.cpp
     HEADERS += mediamonitor-unix.h
     !android {
-    contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+    contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
         using_qtdbus: QT += dbus
     } else {
         using_qtdbus: CONFIG += qdbus
--- a/libs/libmyth/test/test_programinfo/test_programinfo.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmyth/test/test_programinfo/test_programinfo.pro	2018-08-09 23:40:24.053364730 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmyth/test/test_audioutils/test_audioutils.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmyth/test/test_audioutils/test_audioutils.pro	2018-08-09 23:40:24.054364749 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/libs/libmyth/test/test_audioconvert/test_audioconvert.pro	2017-02-01 02:49:25.000000000 -0700
+++ b/libs/libmyth/test/test_audioconvert/test_audioconvert.pro	2018-08-09 23:40:24.056364786 -0600
@@ -5,7 +5,7 @@
 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
 }
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
 QT += testlib
 }
 
--- a/configure	2018-08-09 07:49:10.658929854 -0600
+++ b/configure	2018-08-09 07:45:36.856987334 -0600
@@ -1592,12 +1592,12 @@
     func=$4
     shift 4
     disable $cfg
-    check_cmd ${pkg}-config --version
+    check_cmd $pkg_config --version
     err=$?
     if test "$err" = 0; then
         backup_cflags=$CFLAGS
-        temp_extralibs=$(${pkg}-config --libs)
-        add_cflags $(${pkg}-config --cflags)
+        temp_extralibs=$($pkg_config --libs $pkg)
+        add_cflags $($pkg_config --cflags $pkg)
         check_lib "$@" $header $func $temp_extralibs && enable $cfg
         CFLAGS=$backup_cflags
     fi
@@ -5907,7 +5907,7 @@
 enabled pic && enable_weak_pic
 
 is_qmake5(){
-    $1 --version 2>&1 | egrep -q -e "Qt version 5\.[2-9]\.[0-9]"
+    $1 --version 2>&1 | egrep -q -e 'Qt version 5\.(([1-9][0-9]+)|[2-9])\.[0-9]'
 }
 
 # qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
@@ -6902,7 +6902,7 @@
 EOF
 done
 
-check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
+check_foo_config freetype2 freetype2 ft2build.h FT_Init_FreeType
 
 enabled freetype2 ||
     die "ERROR! You must have FreeType installed to compile MythTV."