Ticket #48226: QMK-Groundstation_Portfile.diff

Portfile

@@ -3 +3 @@
 
 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 +23 @@
 
 worksrcdir          ${name}_${version}
 
+depends_lib-append  port:qwt52
+
 post-extract {
     # rename worksrcdir to remove a space
     file rename "${workpath}/${name} ${version}" ${workpath}/${worksrcdir}
@@ -35 +37 @@
         ${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 +51 @@
         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
-}