[140991] trunk/dports/aqua/QMK-Groundstation/Portfile

[michaelld at macports.org]

Revision: 140991
          https://trac.macports.org/changeset/140991
Author:   michaelld at macports.org
Date:     2015-10-07 08:59:23 -0700 (Wed, 07 Oct 2015)
Log Message:
-----------
QMK-Groundstation: various fixes and tweaks to make more robust; addresses ticket #48226 and #39424 maintainer timeout.

Modified Paths:
--------------
    trunk/dports/aqua/QMK-Groundstation/Portfile

Modified: trunk/dports/aqua/QMK-Groundstation/Portfile
===================================================================
--- trunk/dports/aqua/QMK-Groundstation/Portfile	2015-10-07 15:56:41 UTC (rev 140990)
+++ trunk/dports/aqua/QMK-Groundstation/Portfile	2015-10-07 15:59:23 UTC (rev 140991)
@@ -3,17 +3,17 @@
 
 PortSystem          1.0
 PortGroup           xcode 1.0
-PortGroup           qt4 1.0
+PortGroup           qmake 1.0
 
 name                QMK-Groundstation
 version             1.0.1
-revision            2
+revision            3
 maintainers         lilalinux.net:macports
 description         Configuration and Debugging Utility for the MikroKopter Project
 long_description    Configuration and Debugging Utility for the MikroKopter Project.
 homepage            http://www.mikrokopter.de/
 
-master_sites        http://svn.mikrokopter.de/filedetails.php?repname=Projects&path=%2FQMK-Groundstation%2FRelease%2F
+master_sites        http://svn.mikrokopter.de/websvn/listing.php?repname=Projects&path=%2FQMK-Groundstation%2FRelease%2F
 distname            ${name}-v${version}
 extract.suffix      .tgz
 
@@ -23,6 +23,8 @@
 
 worksrcdir          ${name}_${version}
 
+depends_lib-append  port:qwt52
+
 post-extract {
     # rename worksrcdir to remove a space
     file rename "${workpath}/${name} ${version}" ${workpath}/${worksrcdir}
@@ -35,8 +37,9 @@
         ${worksrcpath}/osx.pro
 }
 
-configure.cmd       ${qt_qmake_cmd}
-configure.pre_args  -spec macx-xcode osx.pro
+configure.pre_args-append -spec macx-xcode osx.pro
+
+# override the xcode PortGroup's setting, to use qmake for configure
 use_configure       yes
 
 post-build {
@@ -48,15 +51,3 @@
        	xinstall -d -m 755 ${appPath}
        	file copy ${worksrcpath}/build/Release/${name}.app ${appPath}/${name}.app
 }
-
-variant qwt conflicts qwt52 description {Use qwt} {
-    depends_lib-append  port:qwt
-}
-
-variant qwt52 conflicts qwt description {Use qwt52} {
-    depends_lib-append  port:qwt52
-}
-
-if {![variant_isset qwt] && ![variant_isset qwt52]} {
-    default_variants    +qwt52
-}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151007/e41d723a/attachment.html>