Ticket #51411: mlt.4.diff

multimedia/mlt/Portfile

@@ -1 +1 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
+# $Id: Portfile 145945 2016-02-22 08:53:45Z devans@macports.org $
 
 PortSystem          1.0
 PortGroup           muniversal 1.0
-PortGroup           qt4 1.0
 
 name                mlt
 epoch               3
-version             6.0.0
-revision            1
+version             6.4.1
 categories          multimedia
-maintainers         dennedy.org:dan
+maintainers         gmail.com:rjvbertin dennedy.org:dan openmaintainer
 license             GPL-2+
 
 description         Open source multimedia framework - core libraries
@@ -27 +25 @@
 master_sites        sourceforge:project/mlt/mlt
 platforms           darwin
 
-checksums           rmd160 e9b03671545aa5349541495bc226328f639178cf \
-                    sha256 317874cfc7fc528dddbb3a7a32fd46372aae22bdc4527be1cfb55c93fa66e3bd 
+checksums           rmd160  647cdad41974b93c5745a358e1129f2ed5f6e577 \
+                    sha256  d3a992f3e67463e68630cb0b455d408a2a12f4da7a19e46807fa08a79f09b2b6
+
+subport ${name}-qt5 {
+    description     ${description} - Qt5 version
+    long_description \
+                    ${long_description} Built against Qt5.
+}
+
+if {${subport} eq "${name}"} {
+    conflicts       ${name}-qt5
+    PortGroup       qt4 1.0
+} else {
+    conflicts       ${name}
+    PortGroup       qt5 1.0
+    if {[info procs qt5.depends_component] eq ""} {
+        # A procedure to indicate dependencies on Qt components that are not
+        # included in the default dependency declared by the Qt5 PortGroup.
+        # It allows to specify those dependencies without having to handle
+        # the appropriate path-style declarations that work against every Qt5 port
+        # (currently port:qt5, port:qt55, "soon" port:qt5-kde too.)
+        # A complete version of this procedure will be provided by the Qt5 PG
+        # after qt5-kde is introduced. Provide a simplified version in the meantime.
+        proc qt5.depends_component {first args} {
+            # join ${first} and (the optional) ${args}
+            set args [linsert $args[set list {}] 0 ${first}]
+            # select the Qt5 port prefix, depending on OS version and which Qt5 port is installed
+            if {${os.major} == 11} {
+                set qt5pprefix  "qt55"
+            } else {
+                set qt5pprefix  "qt5"
+            }
+            foreach comp ${args} {
+                if {${comp} eq "qt5"} {
+                    # in case one needs an explicit dependency on the Qt5 main port itself:
+                    depends_lib-append port:${qt5pprefix}
+                } else {
+                    set portname "${qt5pprefix}-${comp}"
+                    depends_lib-append port:${portname}
+                }
+            }
+        }
+    }
+
+    qt5.depends_component \
+                    qtsvg
+}
 
 depends_build-append port:git \
                     port:doxygen
@@ -44 +87 @@
                     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 \