[70520] trunk/dports/kde

[michaelld at macports.org]

Revision: 70520
          http://trac.macports.org/changeset/70520
Author:   michaelld at macports.org
Date:     2010-08-12 04:25:14 -0700 (Thu, 12 Aug 2010)
Log Message:
-----------
Fix for ticket #26026.  Instead of hard-wiring QCA information, use
PKG_CONFIG and let CMake figure it out.  When using Qt's Phonon, use
#include <phonon...>, not <Phonon...>.

Modified Paths:
--------------
    trunk/dports/kde/kdenetwork4/Portfile
    trunk/dports/kde/ktorrent/Portfile

Modified: trunk/dports/kde/kdenetwork4/Portfile
===================================================================
--- trunk/dports/kde/kdenetwork4/Portfile	2010-08-12 11:15:33 UTC (rev 70519)
+++ trunk/dports/kde/kdenetwork4/Portfile	2010-08-12 11:25:14 UTC (rev 70520)
@@ -29,11 +29,16 @@
                     port:libotr
 depends_run-append  port:qca-ossl
 
-set qca_dir         ${prefix}/libexec/qt4-mac
+post-extract {
+    # change #include <Phonon...> to <phonon...> in all files that
+    # contain that header.
+    foreach item [exec grep -lr "Phonon" ${workpath}/${distname}] {
+        reinplace "/#include/s at Phonon@phonon@" ${item}
+    }
+}
 
-configure.args-append   ../${distname} \
-                        -DQCA2_LIBRARIES=${qca_dir}/lib/libqca.2.dylib \
-                        -DQCA2_INCLUDE_DIR=${qca_dir}/include/QtCrypto
+configure.args-append   ../${distname}
+configure.pkg_config_path-append ${qt_dir}/lib/pkgconfig
 
 variant no_kopete conflicts libmsn xmms description "Do not install Kopete instant messaging client" {
     depends_lib-delete      port:qca \

Modified: trunk/dports/kde/ktorrent/Portfile
===================================================================
--- trunk/dports/kde/ktorrent/Portfile	2010-08-12 11:15:33 UTC (rev 70519)
+++ trunk/dports/kde/ktorrent/Portfile	2010-08-12 11:25:14 UTC (rev 70520)
@@ -24,12 +24,9 @@
 
 depends_build-append bin:perl:perl5
 
-set qca_dir          ${prefix}/libexec/qt4-mac
+configure.args-append	../${distname}
+configure.pkg_config_path-append ${qt_dir}/lib/pkgconfig
 
-configure.args-append	../${distname} \
-		-DQCA2_LIBRARIES=${qca_dir}/lib/libqca.2.dylib \
-		-DQCA2_INCLUDE_DIR=${qca_dir}/include/QtCrypto 
-
 post-extract {
     # change #include <Phonon...> to <phonon...> in all files that
     # contain that header.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100812/02a9caeb/attachment.html>