Ticket #51411: mlt.diff

multimedia/mlt/Portfile

@@ -3 +3 @@
 
 PortSystem          1.0
 PortGroup           muniversal 1.0
-PortGroup           qt4 1.0
 
 name                mlt
 epoch               3
-version             6.0.0
+version             6.2.0
 categories          multimedia
 maintainers         dennedy.org:dan
 license             GPL-2+
@@ -26 +25 @@
 master_sites        sourceforge:project/mlt/mlt
 platforms           darwin
 
-checksums           rmd160 e9b03671545aa5349541495bc226328f639178cf \
-                    sha256 317874cfc7fc528dddbb3a7a32fd46372aae22bdc4527be1cfb55c93fa66e3bd 
+checksums           rmd160  3d9fb67e6d90aae844b0187f31df351c8bae8fd1 \
+                    sha256  5acdc8760cc28b19e9dc291f66cbe3faa2bc5e8d53e2de3ef543eb5be0feb9f4
+
+subport qt5-${name} {
+    description     ${description} - Qt5 version
+    long_description \
+                    ${long_description} Built against Qt5.
+}
+
+if {${subport} eq "${name}"} {
+    conflicts       ${name}-qt5 qt5-${name}
+    PortGroup       qt4 1.0
+} else {
+    conflicts       ${name}
+    PortGroup       qt5 1.0
+}
 
 depends_build-append port:git \
                     port:doxygen
@@ -43 +56 @@
                     port:libxml2 \
                     port:libexif
 
-configure.args      --enable-gpl \
+# NB: qt-includedir can and should be set to ${qt_includes_dir},
+# not ${qt_includes_dir}/Qt !!
+configure.args-append \
+                    --enable-gpl \
                     --qt-libdir=${qt_frameworks_dir} \
-                    --qt-includedir=${qt_includes_dir}/Qt \
+                    --qt-includedir=${qt_includes_dir} \
                     --disable-jackrack \
                     --disable-mmx \
                     --disable-gtk2 \