Ticket #46239: qca.diff

devel/qca/Portfile

@@ -6 +6 @@
 
 name                qca
 version             2.0.3
-revision            1
+revision            2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel crypto security
 maintainers         michaelld openmaintainer
@@ -59 +59 @@
 # use variants to change everything except framework
 configure.args        --verbose         \
                       --qtdir=${qt_dir} \
+                      --includedir=${qt_includes_dir} \
                       --release         \
                       --no-framework
 
@@ -74 +75 @@
     }
 }
 
+if {${qt_dir} ne ${prefix}} {
+   # temporary transitional variant to accompany qt4-mac's transitional subport:
+   variant transitional description \
+        {temporary variant that allows to install Qt4 and QCA "concurrently" without having to rebuild all dependents} {}
+   if {[file exists ${prefix}/lib/libQtCore.4.dylib]} {
+          default_variants      +transitional
+   }
+}
+
 post-destroot {
     # alias to destroot QCA top-level directory
     set destroot_qt ${destroot}${qt_dir}
@@ -90 +100 @@
     xinstall -d -m 755 ${destroot}${qt_cmake_module_dir}
     xinstall -m 644 -W ${filespath} FindQCA2.cmake \
         ${destroot}${qt_cmake_module_dir}
+
+    # check if Qt4 was installed in concurrent mode; should become unconditional
+    # once Qt4 can only install that way.
+    if {${qt_dir} ne ${prefix}} {
+        # temporary  
+        if {[variant_isset transitional]} {
+            ln -s ${qt_libs_dir}/libqca.2.dylib ${destroot}${prefix}/lib
+        }
+        # move the pkgconfig file to its designated location
+        move ${destroot}${qt_libs_dir}/pkgconfig/qca2.pc ${destroot}/${qt_pkg_config_dir}
+    }
 }
 
 variant debug description \