diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/Makefile /usr/ports/polish/kadu/Makefile --- /usr/ports/polish/kadu.orig/Makefile 2009-05-08 01:22:48.000000000 +0200 +++ /usr/ports/polish/kadu/Makefile 2009-05-17 00:26:22.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= kadu -PORTVERSION= 0.6.5.1 -PORTREVISION= 1 +PORTVERSION= 0.6.5.2 PORTEPOCH= 1 CATEGORIES= polish net-im MASTER_SITES= http://www.kadu.net/download/stable/:kadu \ @@ -23,8 +22,10 @@ COMMENT= QT Gadu-Gadu client BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash -LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu\ +LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu \ + qca.2:${PORTSDIR}/devel/qca \ sndfile.1:${PORTSDIR}/audio/libsndfile +RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl # TODO enable devel/libexecinfo TABS_MOD_DISTFILE= kadu-tabs-1.2.3.tar.bz2 @@ -35,11 +36,8 @@ USE_BZIP2= yes USE_CMAKE= yes -# remove option with typo when they fix it -CMAKE_ARGS= -DENABLE_AUTDOWNLOAD:BOOL=OFF \ - -DENABLE_AUTODOWNLOAD:BOOL=OFF +CMAKE_ARGS= -DENABLE_AUTODOWNLOAD:BOOL=OFF CMAKE_USE_PTHREAD= yes -USE_OPENSSL= yes USE_QT_VER= 4 QT_COMPONENTS= gui dbus linguist network qt3support webkit xml \ diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/distinfo /usr/ports/polish/kadu/distinfo --- /usr/ports/polish/kadu.orig/distinfo 2009-03-01 20:25:20.000000000 +0100 +++ /usr/ports/polish/kadu/distinfo 2009-05-16 22:52:50.000000000 +0200 @@ -1,6 +1,6 @@ -MD5 (kadu/kadu-0.6.5.1.tar.bz2) = 7101626c23a58d15bd35d23fdc4faac2 -SHA256 (kadu/kadu-0.6.5.1.tar.bz2) = e2df2e1d7c1fa9a5d931a35efeb936088c42ef4b5d42fef8dddadc40f87397e2 -SIZE (kadu/kadu-0.6.5.1.tar.bz2) = 1341099 +MD5 (kadu/kadu-0.6.5.2.tar.bz2) = 9cc1e59e538ff1aa416d162834ce43bb +SHA256 (kadu/kadu-0.6.5.2.tar.bz2) = 28d8e7e31a5e502217a2d5ddb93343c8c33ab09772035f32c568af0e3cc36183 +SIZE (kadu/kadu-0.6.5.2.tar.bz2) = 1554848 MD5 (kadu/spellchecker-20080821.tar.bz2) = 61c3b8e64758b44dae1996f972f9312e SHA256 (kadu/spellchecker-20080821.tar.bz2) = bb9f0e2d8b673355aac0e037826ff314e1f4a9600958f4239dc6b80460911cb7 SIZE (kadu/spellchecker-20080821.tar.bz2) = 6268 diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/files/openssl.pc.in /usr/ports/polish/kadu/files/openssl.pc.in --- /usr/ports/polish/kadu.orig/files/openssl.pc.in 2009-03-14 02:52:39.000000000 +0100 +++ /usr/ports/polish/kadu/files/openssl.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: OpenSSL -Description: Secure Sockets Layer and cryptography libraries and tools -Version: %%OPENSSL_BASE_VERSION%% -Requires: -Libs: -L${libdir} -lssl -lcrypto -Cflags: -I${includedir} diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/files/patch-kadu-core_CMakeLists.txt /usr/ports/polish/kadu/files/patch-kadu-core_CMakeLists.txt --- /usr/ports/polish/kadu.orig/files/patch-kadu-core_CMakeLists.txt 2009-03-08 02:47:53.000000000 +0100 +++ /usr/ports/polish/kadu/files/patch-kadu-core_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ ---- kadu-core/CMakeLists.txt.orig 2008-09-23 18:19:43.000000000 +0200 -+++ kadu-core/CMakeLists.txt 2009-03-08 02:46:30.000000000 +0100 -@@ -162,6 +162,7 @@ - target_link_libraries (kadu_c kadu_core) - else (WIN32) - add_executable (kadu main.cpp main_unix.cpp ${kadu_SRCS} ${MOC_FILES}) -+ set_target_properties (kadu PROPERTIES ENABLE_EXPORTS ON) - target_link_libraries (kadu ${STATIC_MODULES} ${QT_LIBRARIES} ${LIBGADU_LIBRARIES}) - endif (WIN32) - -@@ -175,14 +176,15 @@ - - - # install icons --install (FILES hi16-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-16.png) --install (FILES hi22-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-22.png) --install (FILES hi24-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-24.png) --install (FILES hi32-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu.png) --install (FILES hi48-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-48.png) --install (FILES hi64-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-64.png) --install (FILES hi128-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-128.png) --install (FILES hi256-app-kadu.png DESTINATION "share/pixmaps" RENAME kadu-256.png) -+install (FILES hi16-app-kadu.png DESTINATION "share/icons/hicolor/16x16/apps" RENAME kadu.png) -+install (FILES hi22-app-kadu.png DESTINATION "share/icons/hicolor/22x22/apps" RENAME kadu.png) -+install (FILES hi24-app-kadu.png DESTINATION "share/icons/hicolor/24x24/apps" RENAME kadu.png) -+install (FILES hi32-app-kadu.png DESTINATION "share/icons/hicolor/32x32/apps" RENAME kadu.png) -+install (FILES hi48-app-kadu.png DESTINATION "share/icons/hicolor/48x48/apps" RENAME kadu.png) -+install (FILES hi64-app-kadu.png DESTINATION "share/icons/hicolor/64x64/apps" RENAME kadu.png) -+install (FILES hi128-app-kadu.png DESTINATION "share/icons/hicolor/128x128/apps" RENAME kadu.png) -+# As of icon-theme-0.5 maximum supported pixmap size is 192, for anything larger one should use SVG. -+#install (FILES hi256-app-kadu.png DESTINATION "share/icons/hicolor/256x256/apps" RENAME kadu.png) - - if (APPLE) - pkg_search_module (SNDFILE REQUIRED sndfile>=1.0) diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/files/patch-kadu-core_main.cpp /usr/ports/polish/kadu/files/patch-kadu-core_main.cpp --- /usr/ports/polish/kadu.orig/files/patch-kadu-core_main.cpp 2009-03-07 18:27:01.000000000 +0100 +++ /usr/ports/polish/kadu/files/patch-kadu-core_main.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- kadu-core/main.cpp.orig 2009-01-04 14:18:33.000000000 +0100 -+++ kadu-core/main.cpp 2009-03-07 18:12:29.000000000 +0100 -@@ -19,7 +19,7 @@ - #else - #include - #endif --#ifdef Q_WS_MAC -+#ifdef Q_OS_BSD4 - #include - #include - #endif diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/files/patch-modules-encryption_CMakeLists.txt /usr/ports/polish/kadu/files/patch-modules-encryption_CMakeLists.txt --- /usr/ports/polish/kadu.orig/files/patch-modules-encryption_CMakeLists.txt 2009-03-15 21:13:00.000000000 +0100 +++ /usr/ports/polish/kadu/files/patch-modules-encryption_CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ ---- ./modules/encryption/CMakeLists.txt.orig 2008-10-25 13:29:59.000000000 +0400 -+++ ./modules/encryption/CMakeLists.txt 2009-03-14 01:17:21.000000000 +0300 -@@ -38,9 +38,8 @@ - cmake_policy(SET CMP0003 NEW) - endif (COMMAND cmake_policy) - --pkg_search_module (OPENSSL REQUIRED openssl) --include_directories (${OPENSSL_INCLUDE_DIRS}) --link_directories (${OPENSSL_INCLUDE_DIRS}) -+find_package (OpenSSL) -+include_directories (${OPENSSL_INCLUDE_DIR}) - - add_library (encryption ${encryption} ${SOURCES} ${MOC_FILES}) - target_link_libraries(encryption ${OPENSSL_LIBRARIES}) diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/pkg-plist /usr/ports/polish/kadu/pkg-plist --- /usr/ports/polish/kadu.orig/pkg-plist 2009-03-12 20:49:28.000000000 +0100 +++ /usr/ports/polish/kadu/pkg-plist 2009-05-17 00:02:33.000000000 +0200 @@ -10,6 +10,7 @@ lib/kadu/modules/libencryption.so lib/kadu/modules/libhints.so lib/kadu/modules/libhistory.so +lib/kadu/modules/libidle.so lib/kadu/modules/libnotify.so lib/kadu/modules/libsms.so lib/kadu/modules/libsound.so @@ -44,6 +45,20 @@ %%ASPELL_MOD%%%%DATADIR%%/modules/configuration/spellchecker.ui %%TABS_MOD%%%%DATADIR%%/modules/configuration/tabs.ui %%DATADIR%%/modules/configuration/voice.ui +%%DATADIR%%/modules/data/config_wizard/joi/brak.jpg +%%DATADIR%%/modules/data/config_wizard/ronk2/Blocking.png +%%DATADIR%%/modules/data/config_wizard/ronk2/Busy (d.).png +%%DATADIR%%/modules/data/config_wizard/ronk2/Busy.png +%%DATADIR%%/modules/data/config_wizard/ronk2/Invisible (d.).png +%%DATADIR%%/modules/data/config_wizard/ronk2/Invisible.png +%%DATADIR%%/modules/data/config_wizard/ronk2/Offline (d.).png +%%DATADIR%%/modules/data/config_wizard/ronk2/Offline.png +%%DATADIR%%/modules/data/config_wizard/ronk2/Online (d.).png +%%DATADIR%%/modules/data/config_wizard/ronk2/Online.png +%%DATADIR%%/modules/data/config_wizard/ronk2/message.png +%%DATADIR%%/modules/data/config_wizard/ronk2/mobile.png +%%DATADIR%%/modules/data/config_wizard/ronk2/tlo.jpg +%%DATADIR%%/modules/data/config_wizard/ronk2/tux.png %%DATADIR%%/modules/dcc.desc %%DATADIR%%/modules/default_sms.desc %%DATADIR%%/modules/docking.desc @@ -51,6 +66,7 @@ %%DATADIR%%/modules/encryption.desc %%DATADIR%%/modules/hints.desc %%DATADIR%%/modules/history.desc +%%DATADIR%%/modules/idle.desc %%DATADIR%%/modules/notify.desc %%DATADIR%%/modules/qt4_docking.desc %%DATADIR%%/modules/sms.desc @@ -125,12 +141,18 @@ %%DATADIR%%/modules/translations/window_notify_pl.qm %%DATADIR%%/modules/voice.desc %%DATADIR%%/modules/window_notify.desc +%%DATADIR%%/syntax/chat/Adi1981.syntax +%%DATADIR%%/syntax/chat/Arvenil.syntax +%%DATADIR%%/syntax/chat/aqq2_by_maddox84.syntax +%%DATADIR%%/syntax/chat/c34_white_gradient_compact.syntax %%DATADIR%%/syntax/chat/cheester.syntax %%DATADIR%%/syntax/chat/filozof.syntax %%DATADIR%%/syntax/chat/fuku.syntax %%DATADIR%%/syntax/chat/hapi.syntax %%DATADIR%%/syntax/chat/irc.syntax %%DATADIR%%/syntax/chat/kadu.syntax +%%DATADIR%%/syntax/chat/skp_by_dam.syntax +%%DATADIR%%/syntax/chat/skype_by_dorr.syntax %%DATADIR%%/syntax/infopanel/Arvenil.syntax %%DATADIR%%/syntax/infopanel/ciuciu.syntax %%DATADIR%%/syntax/infopanel/default.syntax @@ -1021,6 +1043,8 @@ @dirrm %%DATADIR%%/syntax/chat @dirrm %%DATADIR%%/syntax @dirrm %%DATADIR%%/modules/translations +@dirrm %%DATADIR%%/modules/data/config_wizard/ronk2 +@dirrm %%DATADIR%%/modules/data/config_wizard/joi @dirrm %%DATADIR%%/modules/data/config_wizard @dirrm %%DATADIR%%/modules/data @dirrm %%DATADIR%%/modules/configuration