Revision: 138227 https://trac.macports.org/changeset/138227 Author: michaelld@macports.org Date: 2015-07-02 09:30:38 -0700 (Thu, 02 Jul 2015) Log Message: ----------- qt4-mac-postgresql91-plugin: + update to 4.8.7 to match qt4-mac version; + fix to use qmake PortGroup; addresses ticket #39424; + fix various URLs for new qt.io project domain. Modified Paths: -------------- trunk/dports/aqua/qt4-mac-postgresql91-plugin/Portfile Modified: trunk/dports/aqua/qt4-mac-postgresql91-plugin/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac-postgresql91-plugin/Portfile 2015-07-02 16:25:53 UTC (rev 138226) +++ trunk/dports/aqua/qt4-mac-postgresql91-plugin/Portfile 2015-07-02 16:30:38 UTC (rev 138227) @@ -6,25 +6,28 @@ # use the qt4 group; 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-postgresql91-plugin -version 4.8.5 +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 sha1 745f9ebf091696c0d5403ce691dc28c039d77b9e \ - rmd160 1e7bb099d5d1cda0b663cebe207c846c8d04750d +checksums rmd160 afb5e5a99388e6429faca59cb5000054feffd166 \ + sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 dist_subdir qt4-mac + +# when using 'building_qt4' and qmake, have to include dependency on qt4-mac depends_lib-append port:qt4-mac set DB psql @@ -41,14 +44,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 {postgresql80 postgresql81 postgresql82 postgresql83 postgresql84 postgresql90 postgresql91 postgresql92} foreach mp.port ${mp.ports} { @@ -66,7 +62,7 @@ long_description ${description} eval conflicts-append ${mp.conflicts} depends_lib-append port:${mp.port} - configure.args INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port} ${prefix}/include/${mp.port}/server ${prefix}/include/Qt" \ + configure.args-append INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port} ${prefix}/include/${mp.port}/server ${prefix}/include/Qt" \ LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -lpq" configure.post_args psql.pro @@ -91,7 +87,7 @@ long_description ${description} eval conflicts-append ${mp.conflicts} depends_lib-append port:${mp.port} - configure.args INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port} ${prefix}/include/${mp.port}/server ${prefix}/include/Qt" \ + configure.args-append INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port} ${prefix}/include/${mp.port}/server ${prefix}/include/Qt" \ LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -lpq" configure.post_args psql.pro @@ -116,5 +112,5 @@ build.target {} livecheck.type regex -livecheck.url http://releases.qt-project.org/qt4/source -livecheck.regex "qt-everywhere-opensource-src-(\[0-9a-z.-\]+)${extract.suffix}" +livecheck.url http://download.qt.io/official_releases/qt/${branch}/ +livecheck.regex >(\[0-9.\]+)/<