7 files changed, 181 insertions, 58 deletions

diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile
index 994873afea57..ec5162550279 100644
--- a/net-p2p/eiskaltdcpp-qt/Makefile
+++ b/net-p2p/eiskaltdcpp-qt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eiskaltdcpp-qt
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	eiskaltdcpp-${DISTVERSION}
@@ -25,7 +25,7 @@ CMAKE_ARGS+=	-DBUILD_LIB:BOOL=OFF
 PROJECTHOST=	eiskaltdc
 
 USE_XZ=		yes
-USE_GCC=	4.2+
+USE_GCC=	4.4+
 USE_GETTEXT=	yes
 USE_CMAKE=	yes
 USE_OPENSSL=	yes
@@ -50,6 +50,7 @@ CMAKE_ARGS+=	-DUSE_GTK:BOOL=OFF
 CMAKE_ARGS+=	-DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
 CMAKE_ARGS+=	-DCREATE_MO:BOOL=OFF
 CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
+CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=ON
 
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}
@@ -107,8 +108,10 @@ CMAKE_ARGS+=	-DUSE_MINIUPNP:BOOL=ON -DLOCAL_MINIUPNP:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_MINIUPNP:BOOL=OFF
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} < 700024
 USE_OPENSSL_PORT=yes
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-p2p/eiskaltdcpp-qt/distinfo b/net-p2p/eiskaltdcpp-qt/distinfo
index b90927dbed33..f94894f67b5f 100644
--- a/net-p2p/eiskaltdcpp-qt/distinfo
+++ b/net-p2p/eiskaltdcpp-qt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40
-SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680
+SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4
+SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920
diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt
index 3c65dc23ad44..6667079b1c8e 100644
--- a/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
---- ./CMakeLists.txt.orig	2011-03-08 19:47:12.000000000 +0200
-+++ ./CMakeLists.txt	2011-03-09 15:49:15.000000000 +0200
-@@ -316,16 +316,14 @@
-     if (MINGW)
-         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import")
+--- CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
++++ CMakeLists.txt	2011-10-03 10:40:18.000000000 +0300
+@@ -370,16 +370,14 @@
+     else (MINGW)
+         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
      endif (MINGW)
 -    if (NOT APPLE)
 -        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")
@@ -20,9 +20,9 @@
     ${eiskaltdcpp_SOURCE_DIR}
     ${GMP_INCLUDE_DIR}
     )
-@@ -395,7 +393,9 @@
- add_subdirectory (dht)
- endif (DHT)
+@@ -451,7 +449,9 @@
+   add_subdirectory (dht)
+ endif (WITH_DHT)
  
 -add_subdirectory (dcpp)
 +if (BUILD_LIB)
@@ -31,19 +31,3 @@
  
  if (USE_QT)
    add_subdirectory (eiskaltdcpp-qt)
-@@ -443,11 +443,11 @@
-       LOCALE_LIST "${LANGUAGES}"
-       COPYRIGHT_HOLDER "EiskaltDC++ team"
-       SOURCES "${DCPP_SRCS};${DCPP_HDRS}"
--      PO_DIR "${dcpp_SOURCE_DIR}/po"
--      POT_BUILD_DIR "${dcpp_SOURCE_DIR}/po"
-+      PO_DIR "${PROJECT_SOURCE_DIR}/po"
-+      POT_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"
-       #PO_PREFIX    ""
--      PO_BUILD_DIR "${dcpp_SOURCE_DIR}/po"
--      MO_BUILD_DIR "${dcpp_BINARY_DIR}/locale"
-+      PO_BUILD_DIR "${PROJECT_SOURCE_DIR}/po"
-+      MO_BUILD_DIR "${PROJECT_BINARY_DIR}/locale"
-       MO_INSTALL_DIR "/${LOCALE_DIR}"
-       CREATE_POT_TARGET ${create_pot}
-       CREATE_PO_TARGET ${create_po}
diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-cmake__CMakeLists.txt b/net-p2p/eiskaltdcpp-qt/files/patch-cmake__CMakeLists.txt
new file mode 100644
index 000000000000..6780e45dbb26
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-qt/files/patch-cmake__CMakeLists.txt
@@ -0,0 +1,85 @@
+--- ./cmake/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
++++ ./cmake/CMakeLists.txt	2011-10-10 11:10:30.000000000 +0300
+@@ -37,12 +37,14 @@
+ 
+ endmacro(GET_RELATIVE_SOURCES)
+ 
++if (BUILD_LIB)
+ get_absolute_sources(abs_dcpp_sources "${DCPP_SRCS};${DCPP_HDRS}")
+ get_relative_sources(rel_dcpp_sources "${dcpp_SOURCE_DIR}/po" "${abs_dcpp_sources}")
+ file(MAKE_DIRECTORY "${dcpp_BINARY_DIR}/po")
+ set(dcpp_files_from "${dcpp_BINARY_DIR}/po/libeiskaltdcpp_srcs.txt")
+ string(REGEX REPLACE ";" "\n" dcpp_contents "${rel_dcpp_sources}")
+ file(WRITE "${dcpp_files_from}" "${dcpp_contents}")
++endif (BUILD_LIB)
+ 
+ if (USE_GTK)
+ get_absolute_sources(abs_gtk_cpp_sources "${GTK_SRCS};${GTK_HDRS}")
+@@ -163,6 +165,7 @@
+ 			# if the po file doesn't exist. The case where a po file used to
+ 			# exist and no longer exists should never occur
+ 
++			if (BUILD_LIB)
+ 			if(NOT EXISTS ${dcpp_SOURCE_DIR}/po/${LANG}.po)
+ 				add_custom_command(
+ 					OUTPUT ${dcpp_SOURCE_DIR}/po/${LANG}.po
+@@ -194,6 +197,7 @@
+ 				WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
+ 				COMMENT "pot-update [dcpp-${LANG}]: Updated po file."
+ 			)
++			endif (BUILD_LIB)
+ 
+ 			if (USE_GTK)
+ 			if(NOT EXISTS ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po)
+@@ -231,15 +235,19 @@
+ 			SET(pot-update-SRC ${pot-update-SRC} ${eiskaltdcpp-gtk_SOURCE_DIR}/po/${LANG}.po.dummy )
+ 			endif (USE_GTK)
+ 
++			if (BUILD_LIB)
+ 			SET(pot-update-SRC ${pot-update-SRC} ${dcpp_SOURCE_DIR}/po/${LANG}.po.dummy)
++			endif (BUILD_LIB)
+ 		endforeach(LANG ${LANGUAGES})
+ 
+ 		# Add to target list
++		if (BUILD_LIB)
+ 		SET(pot-update-SRC
+ 			${pot-update-SRC}
+ 			${dcpp_SOURCE_DIR}/po/libeiskaltdcpp.pot # should depend on languages
+ 
+ 		)
++		endif (BUILD_LIB)
+ 		if (USE_GTK)
+ 		SET(pot-update-SRC
+ 			${pot-update-SRC}
+@@ -329,6 +337,7 @@
+ 
+ 	foreach(LANG ${LANGUAGES})
+ 
++		if (BUILD_LIB)
+ 			add_custom_command(
+ 				OUTPUT ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
+ 				COMMAND ${CMAKE_COMMAND} -E make_directory
+@@ -346,6 +355,7 @@
+ 				WORKING_DIRECTORY ${dcpp_SOURCE_DIR}/po
+ 				COMMENT "mo-update [dcpp-${LANG}]: Creating mo file."
+ 			)
++			endif (BUILD_LIB)
+ 			if (USE_GTK)
+ 			add_custom_command(
+ 				OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
+@@ -377,6 +387,7 @@
+ 			)
+ 			endif (USE_GTK)
+ 
++			if (BUILD_LIB)
+ 			install(FILES
+ 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
+ 					DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES)
+@@ -387,6 +398,7 @@
+ 			set(mo-update-LANG-SRC ${mo-update-LANG-SRC}
+ 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
+ 			)
++			endif (BUILD_LIB)
+ 
+ 		if(UPDATE_PO)
+ 			add_custom_target(mo-update-${LANG}
diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt
index 9f78c795996d..4e02989c7e8f 100644
--- a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt
@@ -1,8 +1,8 @@
---- ./eiskaltdcpp-qt/CMakeLists.txt.orig	2011-03-08 19:47:12.000000000 +0200
-+++ ./eiskaltdcpp-qt/CMakeLists.txt	2011-03-09 15:49:15.000000000 +0200
-@@ -356,6 +356,10 @@
-    set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/main.cpp PROPERTY COMPILE_DEFINITIONS FORCE_XDG )
- endif (FORCE_XDG)
+--- eiskaltdcpp-qt/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
++++ eiskaltdcpp-qt/CMakeLists.txt	2011-10-03 11:20:59.000000000 +0300
+@@ -359,6 +359,10 @@
+     set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/main.cpp PROPERTY COMPILE_DEFINITIONS ENABLE_STACKTRACE)
+ endif (ENABLE_STACKTRACE)
  
 +if (USE_MINIUPNP OR FREE_SPACE_BAR_C)
 +	list(APPEND LIBS extra)
@@ -11,7 +11,7 @@
  if (APPLE)
    set (MACOSICON "${PROJECT_SOURCE_DIR}/../icons/icon_128x128.icns")
    set (MACOSICONINBUNDLE "icon_128x128.icns")
-@@ -393,10 +397,19 @@
+@@ -396,10 +400,19 @@
    add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/qt/resources")
  endif (APPLE)
  
@@ -33,12 +33,12 @@
  endif (APPLE)
  
  if (APPLE)
-@@ -464,7 +477,7 @@
+@@ -469,7 +482,7 @@
  else (APPLE)
    install (FILES ${PROJECT_BINARY_DIR}/default.rcc DESTINATION ${CLIENT_DATA_DIR}/qt/resources)
-   if (UNIX)
+   if (UNIX AND NOT HAIKU)
 -    install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt.1.gz DESTINATION ${SHARE_DIR}/man/man1)
 +    install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt.1.gz DESTINATION man/man1)
      install (FILES eiskaltdcpp-qt.desktop DESTINATION ${SHARE_DIR}/applications)
-   endif (UNIX)
+   endif (UNIX AND NOT HAIKU)
  endif (APPLE)
diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__src__main.cpp b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__src__main.cpp
deleted file mode 100644
index f9ac3f6e4995..000000000000
--- a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__src__main.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./eiskaltdcpp-qt/src/main.cpp.orig	2011-03-09 15:49:53.000000000 +0200
-+++ ./eiskaltdcpp-qt/src/main.cpp	2011-03-09 15:50:14.000000000 +0200
-@@ -58,8 +58,6 @@
- #include <signal.h>
- #include <execinfo.h>
- 
--#include "extra/stacktrace.h"
--
- void installHandlers();
- 
- #ifdef FORCE_XDG
-@@ -214,8 +212,6 @@
-         std::cout << QObject::tr("Cannot handle SIGPIPE").toStdString() << std::endl;
-     }
- 
--    signal(SIGSEGV, printBacktrace);
--
-     std::cout << QObject::tr("Signal handlers installed.").toStdString() << std::endl;
- }
- 
diff --git a/net-p2p/eiskaltdcpp-qt/pkg-plist b/net-p2p/eiskaltdcpp-qt/pkg-plist
index a3789cb5ba14..79e694c50578 100644
--- a/net-p2p/eiskaltdcpp-qt/pkg-plist
+++ b/net-p2p/eiskaltdcpp-qt/pkg-plist
@@ -138,6 +138,75 @@ share/eiskaltdcpp/qt/icons/appl/faenza/view-close.png
 share/eiskaltdcpp/qt/icons/appl/faenza/view-filter.png
 share/eiskaltdcpp/qt/icons/appl/faenza/zoom-in.png
 share/eiskaltdcpp/qt/icons/appl/faenza/zoom-out.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/adls.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/application-exit.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/application-x-archive.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/application-x-executable.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/audio-x-generic.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/ball_green.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/bookmark-new.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/chat.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/configure.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/console.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/default.qrc
+share/eiskaltdcpp/qt/icons/appl/monochrome/dialog-close.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/document-edit.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/download.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/edit-clear-locationbar-rtl.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/edit-clear.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/edit-copy.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/edit-delete.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/edit-find.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/eraser.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/face-smile.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/fav.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/favadd.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/favrem.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/favserver.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/favusers.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/find.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/folder-blue.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/freespace.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/go-down-search.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/go-down.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/go-up-search.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/go-up.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/gui.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/hashing.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/hubmsg.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/icon_appl.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/icon_appl_big.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/icon_msg.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/im-user-away.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/image-x-generic.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/list-add.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/log_file.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/message.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/network-connect.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/network-disconnect.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/openlist.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/own_filelist.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/plugin.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/pmmsg.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/qt-logo.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/reconnect.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/refrlist.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/reload.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/server.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/slow.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/slow_off.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/spam.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/spy.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/status.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/text-x-generic.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/transfer.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/unknown.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/users.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/video-x-generic.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/view-close.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/view-filter.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/zoom-in.png
+share/eiskaltdcpp/qt/icons/appl/monochrome/zoom-out.png
 share/eiskaltdcpp/qt/icons/user/valknut/usericons.png
 %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.png
 %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.sh
@@ -171,6 +240,7 @@ share/eiskaltdcpp/qt/resources/default.rcc
 share/eiskaltdcpp/qt/ts/be.qm
 share/eiskaltdcpp/qt/ts/bg.qm
 share/eiskaltdcpp/qt/ts/cs.qm
+share/eiskaltdcpp/qt/ts/de.qm
 share/eiskaltdcpp/qt/ts/en.qm
 share/eiskaltdcpp/qt/ts/es.qm
 share/eiskaltdcpp/qt/ts/fr.qm
@@ -191,6 +261,7 @@ share/eiskaltdcpp/qt/ts/uk.qm
 %%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts
 @dirrm share/eiskaltdcpp/qt/icons/appl/default
 @dirrm share/eiskaltdcpp/qt/icons/appl/faenza
+@dirrm share/eiskaltdcpp/qt/icons/appl/monochrome
 @dirrm share/eiskaltdcpp/qt/icons/appl
 @dirrm share/eiskaltdcpp/qt/icons/user/default
 @dirrm share/eiskaltdcpp/qt/icons/user/valknut