Modified: trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile (138223 => 138224)

--- trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile	2015-07-02 16:20:14 UTC (rev 138223)
+++ trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile	2015-07-02 16:20:19 UTC (rev 138224)
@@ -3,30 +3,29 @@
 
 PortSystem          1.0
 
-# use the qt4 group; set 'building_qt4' so that the portgroup
-# does not include certain parts
+# use the qt4 group (indirectly via the qmake PortGroup); set
+# 'building_qt4' so that the portgroup does not include certain parts
 set building_qt4    1
-PortGroup           qt4 1.0
+PortGroup           qmake 1.0
 PortGroup           xcodeversion 1.0
 
 name                qt4-mac-mysql55-plugin
-version             4.8.6
+version             4.8.7
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          aqua databases
 platforms           macosx
 maintainers         michaelld pixilla openmaintainer
 license             {LGPL-2.1 GPL-3}
+homepage            http://www.qt.io/
 
-homepage            http://qt-project.org
-master_sites        http://download.qt-project.org/official_releases/qt/${branch}/${version}/
+master_sites        http://download.qt.io/official_releases/qt/${branch}/${version}/
 
 distname            qt-everywhere-opensource-src-${version}
 
-checksums           rmd160  0220d4e76ac761c9ecfb8ddab6f2c1dc6ad70c33 \
-                    sha256  8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
+checksums           rmd160 afb5e5a99388e6429faca59cb5000054feffd166 \
+                    sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
 
 dist_subdir         qt4-mac
-depends_lib-append  port:qt4-mac
 
 set DB              mysql
 set DRIVER          src/sql/drivers/${DB}
@@ -42,14 +41,7 @@
 configure.dir       ${worksrcpath}/${PLUGIN}
 configure.env-append \
                     QMAKESPEC=${qt_mkspecs_dir}/macx-g++
-configure.cmd       ${qt_qmake_cmd}
-configure.pre_args  PREFIX=${prefix}
 
-if {[variant_isset universal]} {
-
-    configure.universal_args-delete --disable-dependency-tracking
-}
-
 set mp.ports     {mysql5 mysql51 mysql55 mysql56 mariadb mariadb-10.0 mariadb-10.1 percona}
 foreach mp.port ${mp.ports} {
 
@@ -68,7 +60,7 @@
         long_description    ${description}
         eval conflicts-append    ${mp.conflicts}
         depends_lib-append  port:${mp.port}
-        configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql" \
+        configure.args-append INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql" \
                             LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r"
         configure.post_args mysql.pro
 
@@ -118,5 +110,5 @@
 build.target        {}
 
 livecheck.type      regex
-livecheck.url       http://download.qt-project.org/official_releases/qt/${branch}/
+livecheck.url       http://download.qt.io/official_releases/qt/${branch}/
 livecheck.regex     >(\[0-9.\]+)/<