Modified: trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile (138219 => 138220)

--- trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile	2015-07-02 16:02:44 UTC (rev 138219)
+++ trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile	2015-07-02 16:12:42 UTC (rev 138220)
@@ -3,36 +3,30 @@
 
 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-sqlite2-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.nokia.com/
+master_sites        http://download.qt.io/official_releases/qt/${branch}/${version}/
 
-master_sites        trolltech
 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
 
-if {[variant_isset universal]} {
-
-    configure.universal_args-delete --disable-dependency-tracking
-}
-
 if {${name} == ${subport}} {
 
     set DB              sqlite2
@@ -70,7 +64,7 @@
     long_description    ${description}
     conflicts-append    qt4-mac-sqlite2-plugin
     depends_lib-append  port:sqlite3
-    configure.args      INCLUDEPATH+=${worksrcpath}/include \
+    configure.args-append INCLUDEPATH+=${worksrcpath}/include \
                         LIBS+="-L${prefix}/lib -lsqlite3"
     configure.post_args sqlite.pro
 
@@ -105,12 +99,9 @@
 configure.env-append \
                     QMAKESPEC=${qt_mkspecs_dir}/macx-g++
 
-configure.cmd       ${qt_qmake_cmd}
-configure.pre_args  PREFIX=${prefix}
-
 build.dir           ${worksrcpath}/${PLUGIN}
 build.target        {}
 
 livecheck.type      regex
-livecheck.url       http://qt-project.org/downloads
-livecheck.regex     "qt-everywhere-opensource-src-(${branch}\[0-9a-z.-\]+)${extract.suffix}"
+livecheck.url       http://download.qt.io/official_releases/qt/${branch}/
+livecheck.regex     >(\[0-9.\]+)/<