[59540] trunk/dports/kde/kdenetwork4

[sharky at macports.org]

Revision: 59540
          http://trac.macports.org/changeset/59540
Author:   sharky at macports.org
Date:     2009-10-16 03:33:16 -0700 (Fri, 16 Oct 2009)
Log Message:
-----------
kdenetwork4: build kopete with jabber support

* remove variant to disable jabber, it works now
* add runtime dependency on qca-ossl for SSL support in kopete
* remove obsolete patch for libiris

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

Removed Paths:
-------------
    trunk/dports/kde/kdenetwork4/files/libiris-CMakeLists.diff

Modified: trunk/dports/kde/kdenetwork4/Portfile
===================================================================
--- trunk/dports/kde/kdenetwork4/Portfile	2009-10-16 10:02:47 UTC (rev 59539)
+++ trunk/dports/kde/kdenetwork4/Portfile	2009-10-16 10:33:16 UTC (rev 59540)
@@ -5,6 +5,7 @@
 
 name                kdenetwork4
 version             4.3.2
+revision            1
 categories          kde kde4 network
 maintainers         snc sharky
 description         KDE4 networking applications
@@ -17,26 +18,23 @@
 distname            kdenetwork-${version}
 checksums           md5     57b44a9b59c35366a0c287c591bb9bdc
 
-#patchfiles          libiris-CMakeLists.diff
-#patch.dir           ${workpath}/${distname}
-
 depends_lib-append  port:kdebase4-runtime \
-                    port:qca path:lib/libspeex.dylib:speex \
-                    port:meanwhile port:libotr
+                    port:meanwhile \
+                    port:qca \
+                    path:lib/libspeex.dylib:speex \
+                    port:libidn \
+                    port:libotr
+depends_run-append  port:qca-ossl
 
 configure.args-append   ../${distname} \
-                        -DBUILD_kopete=ON -DWITH_jabber=OFF \
                         -DQCA2_LIBRARIES=${prefix}/lib/libqca.2.dylib \
                         -DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto
 
 variant no_kopete conflicts jabber description "Do not install Kopete instant messaging client" {
-    depends_lib-delete      port:qca path:lib/libspeex.dylib:speex port:libotr
-    configure.args-delete   -DBUILD_kopete=ON
+    depends_lib-delete      port:qca \
+                            path:lib/libspeex.dylib:speex \
+                            port:libotr \
+                            port:libidn
+    depends_run-delete      port:qca-ossl
     configure.args-append   -DBUILD_kopete=OFF
 }
-
-# Test if working for 4.2.3 then remove variant
-variant jabber conflicts no_kopete description "Enable jabber support in kopete" {
-    configure.args-delete   -DWITH_jabber=OFF
-    configure.args-append   -DWITH_jabber=ON
-}

Deleted: trunk/dports/kde/kdenetwork4/files/libiris-CMakeLists.diff
===================================================================
--- trunk/dports/kde/kdenetwork4/files/libiris-CMakeLists.diff	2009-10-16 10:02:47 UTC (rev 59539)
+++ trunk/dports/kde/kdenetwork4/files/libiris-CMakeLists.diff	2009-10-16 10:33:16 UTC (rev 59540)
@@ -1,30 +0,0 @@
-Index: kopete/protocols/jabber/libiris/CMakeLists.txt
-===================================================================
---- kopete/protocols/jabber/libiris/CMakeLists.txt	(Revision 914888)
-+++ kopete/protocols/jabber/libiris/CMakeLists.txt	(Revision 914889)
-@@ -33,9 +33,9 @@
- 
- set(iris_SRCS 
- iris/jabber/filetransfer.cpp
--iris/jabber/jinglesessionmanager.cpp
- iris/jabber/s5b.cpp
- iris/jabber/xmpp_ibb.cpp
-+iris/jabber/jinglesessionmanager.cpp
- iris/jabber/jinglesession.cpp
- iris/jabber/jingletasks.cpp
- iris/jabber/jinglecontent.cpp
-@@ -100,10 +100,10 @@
- 
- #	iris/xmpp-im/xmpp_tasks.h
- #	iris/xmpp-im/xmpp_discoinfotask.h
--	iris/jabber/jinglesession.h
--	iris/jabber/jingletasks.h
--	iris/jabber/jinglecontent.h
--	iris/jabber/jinglesessionmanager.h
-+#	iris/jabber/jinglesession.h
-+#	iris/jabber/jingletasks.h
-+#	iris/jabber/jinglecontent.h
-+#	iris/jabber/jinglesessionmanager.h
- 
- )
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091016/01b7c932/attachment.html>