Update to version 2.2.4

Changelog: https://github.com/negativ/eiskaltdcpp/blob/master/ChangeLog.txt

PR:		ports/161898
Submitted by:	Maxim Ignatenko <gelraen.ua@gmail.com> (maintainer)

6 files changed, 123 insertions, 61 deletions

diff --git a/net-p2p/eiskaltdcpp-daemon/Makefile b/net-p2p/eiskaltdcpp-daemon/Makefile
index 3dff08b3d7d7..963171a4833d 100644
--- a/net-p2p/eiskaltdcpp-daemon/Makefile
+++ b/net-p2p/eiskaltdcpp-daemon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eiskaltdcpp-daemon
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	eiskaltdcpp-${DISTVERSION}
@@ -21,12 +21,14 @@ LIB_DEPENDS+=	eiskaltdcpp:${PORTSDIR}/net-p2p/eiskaltdcpp-lib
 PROJECTHOST=	eiskaltdc
 
 USE_XZ=		yes
-USE_GCC=	4.2+
+USE_GCC=	4.4+
 USE_GETTEXT=	yes
 USE_CMAKE=	yes
 USE_OPENSSL=	yes
 MAKE_JOBS_SAFE=	yes
 
+OPTIONS=	XMLRPC	"XMLRPC interface support" on
+
 MAN1=		${PORTNAME}.1
 MANCOMPRESSED=	yes
 
@@ -38,12 +40,23 @@ CMAKE_ARGS+=	-DUSE_QT:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_GTK:BOOL=OFF
 CMAKE_ARGS+=	-DNO_UI_DAEMON:BOOL=ON
 CMAKE_ARGS+=	-DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
+CMAKE_ARGS+=	-DUSE_IDNA:BOOL=OFF
 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}/nasdc
 INSTALL_WRKSRC=	${WRKSRC}/nasdc
 
+.include <bsd.port.options.mk>
+
+.if defined(WITH_XMLRPC) && !defined(WITHOUT_XMLRPC)
+LIB_DEPENDS+=	xmlrpc++:${PORTSDIR}/net/xmlrpc-c-devel
+CMAKE_ARGS+=	-DXMLRPC_DAEMON:BOOL=ON
+.else
+CMAKE_ARGS+=	-DXMLRPC_DAEMON:BOOL=OFF
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700024
diff --git a/net-p2p/eiskaltdcpp-daemon/distinfo b/net-p2p/eiskaltdcpp-daemon/distinfo
index b90927dbed33..f94894f67b5f 100644
--- a/net-p2p/eiskaltdcpp-daemon/distinfo
+++ b/net-p2p/eiskaltdcpp-daemon/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-daemon/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt
index f14f5c6f4f14..6667079b1c8e 100644
--- a/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-daemon/files/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
---- ./CMakeLists.txt.orig	2011-03-08 19:47:12.000000000 +0200
-+++ ./CMakeLists.txt	2011-03-10 19:49:48.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-daemon/files/patch-cmake__CMakeLists.txt b/net-p2p/eiskaltdcpp-daemon/files/patch-cmake__CMakeLists.txt
new file mode 100644
index 000000000000..6780e45dbb26
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-daemon/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-daemon/files/patch-nasdc__CMakeLists.txt b/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt
index 549974f404a0..55ce7fe7b86f 100644
--- a/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__CMakeLists.txt
@@ -1,24 +1,24 @@
---- ./nasdc/CMakeLists.txt.orig	2011-03-08 19:47:12.000000000 +0200
-+++ ./nasdc/CMakeLists.txt	2011-03-10 19:52:25.000000000 +0200
-@@ -47,7 +47,16 @@
- target_link_libraries (sampleclient ${XMLRPCLIBS})
- endif()
+--- nasdc/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
++++ nasdc/CMakeLists.txt	2011-10-03 10:51:06.000000000 +0300
+@@ -49,7 +49,16 @@
+                 ${nasdc_SRCS}
+                 )
  
--target_link_libraries (nasdc dcpp ${XMLRPCLIBS} ${RL_LIBS})
+-target_link_libraries (nasdc dcpp ${XMLRPCLIBS})
 +if (BUILD_LIB)
-+	set(DCPP_LIB dcpp)
++      set(DCPP_LIB dcpp)
 +else (BUILD_LIB)
-+	find_library(DCPP_LIB eiskaltdcpp)
-+	if (DCPP_LIB)
-+		message(STATUS "EiskaltDC++ shared library found at ${DCPP_LIB}")
-+	endif (DCPP_LIB)
++      find_library(DCPP_LIB eiskaltdcpp)
++      if (DCPP_LIB)
++              message(STATUS "EiskaltDC++ shared library found at ${DCPP_LIB}")
++      endif (DCPP_LIB)
 +endif (BUILD_LIB)
 +
-+target_link_libraries (nasdc ${DCPP_LIB} ${XMLRPCLIBS} ${RL_LIBS})
++target_link_libraries (nasdc ${DCPP_LIB} ${XMLRPCLIBS})
  
  if (UNIX)
   set (BINDIR bin)
-@@ -77,5 +86,5 @@
+@@ -81,5 +90,5 @@
  if (APPLE)
    install (FILES ${PROJECT_BINARY_DIR}/eiskaltdcpp-daemon.1.gz DESTINATION ${PROJECT_NAME_GLOBAL}.app/man/man1)
  elseif (UNIX AND NOT APPLE)
diff --git a/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__nasdc.cpp b/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__nasdc.cpp
deleted file mode 100644
index 2a4db0d4f9ea..000000000000
--- a/net-p2p/eiskaltdcpp-daemon/files/patch-nasdc__nasdc.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./nasdc/nasdc.cpp.orig	2011-03-08 19:47:12.000000000 +0200
-+++ ./nasdc/nasdc.cpp	2011-03-10 19:49:48.000000000 +0200
-@@ -23,7 +23,6 @@
- #ifndef _WIN32
- #include <syslog.h>
- #include <signal.h>
--#include "extra/stacktrace.h"
- #endif
- 
- #ifdef CLI_DAEMON
-@@ -237,9 +236,6 @@
-     temp = (char *)NULL;
-     prompt = "edcppd$ ";
- #endif
--#ifndef _WIN32
--    signal(SIGSEGV, printBacktrace);
--#endif
-     while (bServerRunning) {
-         Thread::sleep(1);
-         #ifdef CLI_DAEMON