19 files changed, 417 insertions, 110 deletions

diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile
index 3acc30a6f418..f8ff4411f5ba 100644
--- a/net-p2p/eiskaltdcpp-lib/Makefile
+++ b/net-p2p/eiskaltdcpp-lib/Makefile
@@ -1,69 +1,69 @@
 # Created by: Stas Timokhin <stast@bsdportal.ru>
 # $FreeBSD$
 
-PORTNAME=	eiskaltdcpp-lib
-PORTVERSION=	2.2.4
-PORTREVISION=	7
+PORTNAME=	eiskaltdcpp
+PORTVERSION=	2.2.9
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	eiskaltdcpp-${DISTVERSION}
+PROJECTHOST=	eiskaltdc
+PKGNAMESUFFIX?=	-lib
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Direct Connect client shared library
 
 LICENSE=	GPLv3
 
+.if !defined (MASTERDIR)
 LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
-BUILD_DEPENDS+=	chrpath:${PORTSDIR}/devel/chrpath
-
-PROJECTHOST=	eiskaltdc
 
-USES=		cmake gettext tar:xz compiler:gcc-c++11-lib
+USES=		cmake gettext compiler:c++11-lib
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	LUA PCRE IDN DHT
+OPTIONS_DEFINE=	LUA PCRE IDN DHT MINIUPNP
 OPTIONS_DEFAULT=	IDN DHT
 DHT_DESC=	DHT support
+MINIUPNP_DESC=	UPnP support
 
-.include <bsd.port.options.mk>
-
-CMAKE_ARGS+=	-DINSTALL_HEADERS:BOOL=ON
+CMAKE_ARGS+=	-DBUILD_LIB:BOOL=ON
+CMAKE_ARGS+=	-DWITH_DEV_FILES:BOOL=ON
 CMAKE_ARGS+=	-DUSE_QT:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_GTK:BOOL=OFF
+CMAKE_ARGS+=	-DUSE_GTK3:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_ASPELL:BOOL=OFF
-CMAKE_ARGS+=	-DUSE_MINIUPNP:BOOL=OFF
-CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=ON
 
-.if ${PORT_OPTIONS:MLUA}
-USES+=		lua
-CMAKE_ARGS+=	-DLUA_SCRIPT:BOOL=ON
-#IGNORE=	crashes on connect attempt if built with Lua support
-.else
-CMAKE_ARGS+=	-DLUA_SCRIPT:BOOL=OFF
-.endif
+LUA_USES=	lua:51
+LUA_CMAKE_ON=	-DLUA_SCRIPT:BOOL=ON
+LUA_CMAKE_OFF=	-DLUA_SCRIPT:BOOL=OFF
 
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
-CMAKE_ARGS+=	-DPERL_REGEX:BOOL=ON
-.else
-CMAKE_ARGS+=	-DPERL_REGEX:BOOL=OFF
-.endif
+PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_CMAKE_ON=	-DPERL_REGEX:BOOL=ON
+PCRE_CMAKE_OFF=	-DPERL_REGEX:BOOL=OFF
 
-.if ${PORT_OPTIONS:MIDN}
-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
-CMAKE_ARGS+=	-DUSE_IDNA:BOOL=ON
-.else
-CMAKE_ARGS+=	-DUSE_IDNA:BOOL=OFF
-.endif
+IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_CMAKE_ON=	-DUSE_IDNA:BOOL=ON
+IDN_CMAKE_OFF=	-DUSE_IDNA:BOOL=OFF
+
+DHT_CMAKE_ON=	-DWITH_DHT:BOOL=ON
+DHT_CMAKE_OFF=	-DWITH_DHT:BOOL=OFF
 
-.if ${PORT_OPTIONS:MDHT}
-CMAKE_ARGS+=	-DWITH_DHT:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_DHT:BOOL=OFF
+MINIUPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+MINIUPNP_CMAKE_ON=	-DUSE_MINIUPNP:BOOL=ON -DLOCAL_MINIUPNP:BOOL=OFF
+MINIUPNP_CMAKE_OFF=	-DUSE_MINIUPNP:BOOL=OFF
 .endif
 
-post-build:
-	${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/dcpp/libeiskaltdcpp.so.2.2"
+USES+=		tar:xz
+PLIST=		${.CURDIR}/pkg-plist
+
+.if defined (MASTERDIR) && !defined (NO_BUILD)
+CMAKE_ARGS+=	-DBUILD_LIB:BOOL=OFF
+CMAKE_ARGS+=	-DEISKALTDCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/eiskaltdcpp"
+CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
+# these slave ports options have to be in sync with master library
+CMAKE_ARGS+=	-DUSE_IDNA:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^IDN ' | ${CUT} -f 2 -d ' '`
+CMAKE_ARGS+=	-DWITH_DHT:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^DHT ' | ${CUT} -f 2 -d ' '`
+CMAKE_ARGS+=	-DLUA_SCRIPT:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^LUA ' | ${CUT} -f 2 -d ' '`
+CMAKE_ARGS+=	-DUSE_MINIUPNP:BOOL=`${PKG_QUERY} '%Ok %Ov' ${PORTNAME}-lib | ${GREP} '^MINIUPNP ' | ${CUT} -f 2 -d ' '`
+.endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/eiskaltdcpp-lib/distinfo b/net-p2p/eiskaltdcpp-lib/distinfo
index f94894f67b5f..8d61c080f2df 100644
--- a/net-p2p/eiskaltdcpp-lib/distinfo
+++ b/net-p2p/eiskaltdcpp-lib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (eiskaltdcpp-2.2.4.tar.xz) = a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4
-SIZE (eiskaltdcpp-2.2.4.tar.xz) = 2008920
+SHA256 (eiskaltdcpp-2.2.9.tar.xz) = 3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf
+SIZE (eiskaltdcpp-2.2.9.tar.xz) = 2327732
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt
index 0046ae712f1f..5e323eee1429 100644
--- a/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt
@@ -1,26 +1,51 @@
---- ./CMakeLists.txt.orig	2011-03-08 19:47:12.000000000 +0200
-+++ ./CMakeLists.txt	2011-03-09 19:18:26.000000000 +0200
-@@ -316,10 +316,6 @@
-     if (MINGW)
-         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import")
-     endif (MINGW)
--    if (NOT APPLE)
--        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")
--        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed")
--    endif (NOT APPLE)
-     set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -pipe -DNDEBUG")
-     set (CMAKE_CXX_FLAGS_RELEASE     "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG -pipe")
-     set (CMAKE_CXX_FLAGS_DEBUG       "${CMAKE_CXX_FLAGS_DEBUG} -UNDEBUG -g3 -pipe")
-@@ -514,3 +510,12 @@
-   install (FILES icons/icon_128x128.png DESTINATION ${SHARE_DIR}/pixmaps/ RENAME eiskaltdcpp.png)
+--- CMakeLists.txt.orig	2011-10-02 22:12:43.000000000 +0700
++++ CMakeLists.txt	2013-05-09 17:58:03.000000000 +0700
+@@ -169,7 +169,7 @@
+ endif()
+ message (STATUS "USED LOCAL BOOST HEADERS")
+ else (LOCAL_BOOST)
+-    find_package (Boost REQUIRED)
++    find_package (Boost COMPONENTS system REQUIRED)
+     if (Boost_VERSION VERSION_LESS 104200)
+         add_definitions(-DTIMER_OLD_BOOST)
+     endif()
+@@ -234,7 +234,7 @@
+ if (APPLE)
+   set (MAN_DIR "${PROJECT_NAME_GLOBAL}.app/man/man1")
+ else (APPLE)
+-  set (MAN_DIR "${SHARE_DIR}/man/man1")
++  set (MAN_DIR "${CMAKE_INSTALL_PREFIX}/man/man1")
  endif (APPLE)
- endif (USE_QT OR USE_GTK)
-+
-+if (INSTALL_HEADERS)
-+	message(STATUS "DCPP headers will be installed")
-+	file(GLOB DCPP_HEADERS dcpp/*.h)
-+	INSTALL(FILES ${DCPP_HEADERS}
-+		DESTINATION "include/eiskaltdcpp/dcpp")
-+else (INSTALL_HEADERS)
-+	message(STATUS "DCPP headers will not be installed")
-+endif (INSTALL_HEADERS)
+ 
+ message (STATUS "Data directory: ${CLIENT_DATA_DIR}")
+@@ -287,7 +287,9 @@
+     endif ()
+ endif ()
+ 
+-include_directories(${eiskaltdcpp_BINARY_DIR}
++include_directories(
++   ${EISKALTDCPP_INCLUDE_DIR}
++   ${eiskaltdcpp_BINARY_DIR}
+    ${eiskaltdcpp_SOURCE_DIR}
+    ${GMP_INCLUDE_DIR}
+    )
+@@ -336,13 +338,17 @@
+ endif (WIN32 OR HAIKU)
+ 
+ add_subdirectory(extra)
+-add_subdirectory(data)
++if (INSTALL_DATA)
++	add_subdirectory(data)
++endif (INSTALL_DATA)
+ 
+ if (WITH_DHT)
+   add_subdirectory (dht)
+ endif (WITH_DHT)
+ 
+-add_subdirectory (dcpp)
++if (BUILD_LIB)
++	add_subdirectory (dcpp)
++endif (BUILD_LIB)
+ 
+ if (HAIKU AND HAIKU_PKG)
+   add_subdirectory (haiku)
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-cmake__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-cmake__CMakeLists.txt
new file mode 100644
index 000000000000..0958fddc1810
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-cmake__CMakeLists.txt
@@ -0,0 +1,84 @@
+--- ./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 OR USE_GTK3)
+ 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 OR USE_GTK3)
+ 			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 OR USE_GTK3)
+ 
++			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 OR USE_GTK3)
+ 		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 OR USE_GTK3)
+ 			add_custom_command(
+ 				OUTPUT ${eiskaltdcpp-gtk_BINARY_DIR}/locale/${LANG}/LC_MESSAGES
+@@ -374,12 +384,14 @@
+ 			)
+ 			endif (USE_GTK OR USE_GTK3)
+ 
++			if (BUILD_LIB)
+ 			set(mo-update-SRC ${mo-update-SRC}
+ 			    ${dcpp_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/libeiskaltdcpp.mo
+ 			)
+ 			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-lib/files/patch-dcpp-Atomic.h b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp-Atomic.h
deleted file mode 100644
index 3d8eb02871a8..000000000000
--- a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp-Atomic.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- dcpp/Atomic.h.orig	2012-01-27 21:20:06.000000000 +0300
-+++ dcpp/Atomic.h	2012-01-27 21:21:11.000000000 +0300
-@@ -57,18 +57,18 @@
- 
-         // type cast
-         operator value_type() const {
--                return boost::interprocess::detail::atomic_read32(&m_value);
-+                return boost::interprocess::ipcdetail::atomic_read32(&m_value);
-         }
- 
-         // increment
--        void inc() { boost::interprocess::detail::atomic_inc32(&m_value); }
-+        void inc() { boost::interprocess::ipcdetail::atomic_inc32(&m_value); }
- 
-         // decrement
--        void dec() { boost::interprocess::detail::atomic_dec32(&m_value); }
-+        void dec() { boost::interprocess::ipcdetail::atomic_dec32(&m_value); }
- 
- private:
-         mutable value_type m_value;
--        void assign(value_type val) { boost::interprocess::detail::atomic_write32(&m_value, val); }
-+        void assign(value_type val) { boost::interprocess::ipcdetail::atomic_write32(&m_value, val); }
- };
- 
- // int32_t
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt
index f6d06a763923..6d75f6280ce8 100644
--- a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt
@@ -1,26 +1,15 @@
 --- dcpp/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
 +++ dcpp/CMakeLists.txt	2011-10-03 10:14:13.000000000 +0300
-@@ -34,8 +34,6 @@
-   set (APPLE_LIBS "iconv")
- endif (APPLE)
- 
--set (UPNP "extra")
--
- add_library (dcpp ${LINK} ${dcpp_srcs})
- 
- if (WITH_DHT)
-@@ -76,8 +74,8 @@
- endif (WIN32)
+@@ -82,7 +82,7 @@
  
  target_link_libraries (dcpp ${DHT_LIB} ${PTHREADS} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES}
--${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES})
+ ${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES} ${XATTR_LIBRARIES} ${HAIKU_LIB} ${Boost_LIBRARIES})
 -set_target_properties(dcpp PROPERTIES VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")
-+${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${IDNA_LIBRARIES} extra)
 +set_target_properties(dcpp PROPERTIES SOVERSION 2 VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")
  
  if (APPLE)
    set (LIBDIR1 .)
-@@ -86,6 +84,6 @@
+@@ -91,7 +91,7 @@
  
  if (LINK STREQUAL SHARED)
  install (TARGETS dcpp
@@ -28,3 +17,4 @@
 +            LIBRARY DESTINATION ${LIBDIR}
              BUNDLE DESTINATION ${LIBDIR1})
  endif (LINK STREQUAL SHARED)
+ 
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__cli-jsonrpc.pl b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__cli-jsonrpc.pl
new file mode 100644
index 000000000000..f5d5f5d30be3
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__cli-jsonrpc.pl
@@ -0,0 +1,32 @@
+--- eiskaltdcpp-cli/cli-jsonrpc.pl.orig	2013-08-29 21:25:02.000000000 +0400
++++ eiskaltdcpp-cli/cli-jsonrpc.pl	2014-08-10 16:43:19.942914548 +0400
+@@ -35,8 +35,7 @@
+     unshift @INC, 
+ 	 "$XDG_CONFIG_HOME/eiskaltdc++",
+ 	 "$HOME/.config/eiskaltdc++/",
+-	 "/usr/local/share/eiskaltdcpp/cli",
+-	 "/usr/share/eiskaltdcpp/cli"
++	 "/usr/local/etc/eiskaltdcpp"
+ }
+ 
+ # preparing terminal
+@@ -87,15 +86,16 @@
+ my $res;
+ 
+ # creating and configuring jsonrpc client
+-my $client = eval
++my $client;
++eval
+ {
+ 	require JSON::RPC::Client;
+-	JSON::RPC::Client->new();
++	$client = JSON::RPC::Client->new();
+ }
+ or do
+ {
+ 	require JSON::RPC::Legacy::Client;
+-	JSON::RPC::Legacy::Client->new();
++	$client=JSON::RPC::Legacy::Client->new();
+ };
+ $client->version("2.0");
+ $client->ua->timeout(10);
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__cli-xmlrpc.pl b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__cli-xmlrpc.pl
new file mode 100644
index 000000000000..b3ef63addc69
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__cli-xmlrpc.pl
@@ -0,0 +1,12 @@
+--- eiskaltdcpp-cli/cli-xmlrpc.pl.orig	2013-08-29 21:25:02.000000000 +0400
++++ eiskaltdcpp-cli/cli-xmlrpc.pl	2014-08-10 16:45:28.978906623 +0400
+@@ -36,8 +36,7 @@
+     unshift @INC, 
+ 	 "$XDG_CONFIG_HOME/eiskaltdc++",
+ 	 "~/.config/eiskaltdc++/",
+-	 "/usr/local/share/eiskaltdcpp/cli",
+-	 "/usr/share/eiskaltdcpp/cli"
++	 "/usr/local/etc/eiskaltdcpp"
+ }
+ 
+ # preparing terminal
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli-jsonrpc.1 b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli-jsonrpc.1
new file mode 100644
index 000000000000..5823a33f0beb
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli-jsonrpc.1
@@ -0,0 +1,11 @@
+--- eiskaltdcpp-cli/eiskaltdcpp-cli-jsonrpc.1.orig	2013-08-29 21:25:02.000000000 +0400
++++ eiskaltdcpp-cli/eiskaltdcpp-cli-jsonrpc.1	2014-08-10 16:48:06.194885609 +0400
+@@ -33,7 +33,7 @@
+ .B "~/.config/eiskaltdc++/" or "$XDG_CONFIG_HOME/eiskaltdc++/"
+ Directory with user configuration files and logs
+ .TP
+-.B "/usr/local/share/eiskaltdcpp/cli/" or "/usr/share/eiskaltdcpp/cli/"
++.B "/usr/local/etc/eiskaltdcpp"
+ Directory with default configuration file
+ .SH "DOCUMENTATION"
+ .TP
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli-xmlrpc.1 b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli-xmlrpc.1
new file mode 100644
index 000000000000..06ba19242447
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-cli__eiskaltdcpp-cli-xmlrpc.1
@@ -0,0 +1,11 @@
+--- eiskaltdcpp-cli/eiskaltdcpp-cli-xmlrpc.1.orig	2013-08-29 21:25:02.000000000 +0400
++++ eiskaltdcpp-cli/eiskaltdcpp-cli-xmlrpc.1	2014-08-10 16:50:11.790938668 +0400
+@@ -33,7 +33,7 @@
+ .B "~/.config/eiskaltdc++/" or "$XDG_CONFIG_HOME/eiskaltdc++/"
+ Directory with user configuration files and logs
+ .TP
+-.B "/usr/local/share/eiskaltdcpp/cli/" or "/usr/share/eiskaltdcpp/cli/"
++.B "/usr/local/etc/eiskaltdcpp"
+ Directory with default configuration file
+ .SH "DOCUMENTATION"
+ .TP
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-daemon__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-daemon__CMakeLists.txt
new file mode 100644
index 000000000000..1ca83baf3c7b
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-daemon__CMakeLists.txt
@@ -0,0 +1,20 @@
+--- eiskaltdcpp-daemon/CMakeLists.txt.orig	2013-08-29 21:25:02.000000000 +0400
++++ eiskaltdcpp-daemon/CMakeLists.txt	2014-08-10 17:16:29.124891587 +0400
+@@ -63,7 +63,16 @@
+         ${ICONV_LIBRARIES}
+         )
+ 
+-target_link_libraries (${PROJECT_NAME} dcpp ${LIBS})
++if (BUILD_LIB)
++	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)
++endif (BUILD_LIB)
++
++target_link_libraries (${PROJECT_NAME} ${DCPP_LIB} ${LIBS} ${Boost_LIBRARIES} ${GETTEXT_LIBRARIES} extra)
+ 
+ if (CMAKE_BUILD_TYPE STREQUAL Debug)
+     add_definitions(-D_DEBUG)
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-gtk__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-gtk__CMakeLists.txt
new file mode 100644
index 000000000000..09c063aa782e
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-gtk__CMakeLists.txt
@@ -0,0 +1,62 @@
+--- ./eiskaltdcpp-gtk/CMakeLists.txt.orig	2011-10-02 18:12:43.000000000 +0300
++++ ./eiskaltdcpp-gtk/CMakeLists.txt	2011-10-10 11:10:30.000000000 +0300
+@@ -12,7 +12,7 @@
+ 
+ if (USE_LIBGNOME2)
+     message (STATUS "Building with LibGnome2 support")
+-    find_package (LibGnome2 REQUIRED)
++    find_library(LIBGNOME2_LIBRARIES gnome-2)
+     set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/sound.cc ${PROJECT_SOURCE_DIR}/src/settingsdialog.cc PROPERTY COMPILE_DEFINITIONS USE_MINIUPNP APPEND)
+     message (STATUS "Building without LibCanberra support")
+ elseif (USE_LIBCANBERRA)
+@@ -26,7 +26,7 @@
+ 
+ if (USE_LIBNOTIFY)
+     message (STATUS "Building with libnotify support")
+-    set (LIBNOTIFY "-lnotify")
++    find_library(LIBNOTIFY notify)
+ else (USE_LIBNOTIFY)
+     message (STATUS "Building without libnotify support")
+ endif (USE_LIBNOTIFY)
+@@ -39,7 +39,7 @@
+ set (GTK_SRCS @gtk_srcs@ PARENT_SCOPE)
+ set (GTK_HDRS @gtk_hdrs@ PARENT_SCOPE)
+ set (GTK_UI   @gtk_ui@   PARENT_SCOPE)
+-set (GTHREAD "-lgthread-2.0")
++find_library (GTHREAD "gthread-2.0")
+ 
+ if (USE_GTK)
+     set(GTK_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS})
+@@ -74,6 +74,10 @@
+   list (APPEND LIBS ${LUA_LIBRARIES})
+ endif (LUA_SCRIPT)
+ 
++if (USE_MINIUPNP OR FREE_SPACE_BAR_C)
++	list(APPEND LIBS extra)
++endif (USE_MINIUPNP OR FREE_SPACE_BAR_C)
++
+ add_executable (${PROJECT_NAME} MACOSX_BUNDLE WIN32
+                 ${gtk_srcs}
+                 )
+@@ -124,10 +128,19 @@
+   add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/gtk/resources")
+ endif (APPLE)
+ 
++if (BUILD_LIB)
++	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)
++endif (BUILD_LIB)
++
+ if (APPLE)
+-  target_link_libraries (${PROJECT_NAME} ${LIBS} dcpp iconv intl)
++  target_link_libraries (${PROJECT_NAME} ${LIBS} ${DCPP_LIB} iconv intl)
+ else (APPLE)
+-  target_link_libraries (${PROJECT_NAME} ${LIBS} dcpp)
++  target_link_libraries (${PROJECT_NAME} ${LIBS} ${DCPP_LIB})
+ endif (APPLE)
+ 
+ if (UNIX)
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__CMakeLists.txt
new file mode 100644
index 000000000000..6416c4335aa8
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__CMakeLists.txt
@@ -0,0 +1,38 @@
+--- 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
+@@ -238,6 +238,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)
++endif (USE_MINIUPNP OR FREE_SPACE_BAR_C)
++
+ if (APPLE)
+   set (MACOSICON "${PROJECT_SOURCE_DIR}/../data/icons/icon_128x128.icns")
+   set (MACOSICONINBUNDLE "icon_128x128.icns")
+@@ -275,12 +279,21 @@
+   add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/qt/resources")
+ endif (APPLE)
+ 
++if (BUILD_LIB)
++	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)
++endif (BUILD_LIB)
++
+ if (APPLE)
+-  target_link_libraries (${PROJECT_NAME} ${LIBS} dcpp iconv)
++  target_link_libraries (${PROJECT_NAME} ${LIBS} ${DCPP_LIB} iconv)
+ elseif (HAIKU)
+-  target_link_libraries (${PROJECT_NAME} ${LIBS} dcpp be)
++  target_link_libraries (${PROJECT_NAME} ${LIBS} ${DCPP_LIB} be)
+ else (APPLE)
+-  target_link_libraries (${PROJECT_NAME} ${LIBS} dcpp)
++  target_link_libraries (${PROJECT_NAME} ${LIBS} ${DCPP_LIB})
+ endif (APPLE)
+ 
+ if (APPLE)
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.cpp b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.cpp
new file mode 100644
index 000000000000..6a4935d2552c
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.cpp
@@ -0,0 +1,11 @@
+--- eiskaltdcpp-qt/src/HubFrame.cpp.orig	2013-08-29 21:25:02.000000000 +0400
++++ eiskaltdcpp-qt/src/HubFrame.cpp	2014-08-17 02:00:34.000000000 +0400
+@@ -772,7 +772,7 @@
+     }
+ }
+ 
+-HubFrame::HubFrame(QWidget *parent=NULL, QString hub="", QString encoding=""):
++HubFrame::HubFrame(QWidget *parent, QString hub, QString encoding):
+         QWidget(parent),
+         d_ptr(new HubFramePrivate())
+ {
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.h b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.h
new file mode 100644
index 000000000000..1d69ec0b7b36
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__HubFrame.h
@@ -0,0 +1,11 @@
+--- eiskaltdcpp-qt/src/HubFrame.h.orig	2014-08-17 01:57:00.000000000 +0400
++++ eiskaltdcpp-qt/src/HubFrame.h	2014-08-17 01:57:33.000000000 +0400
+@@ -128,7 +128,7 @@
+     typedef QMap<QString, QVariant> VarMap;
+     typedef QList<ShellCommandRunner*> ShellList;
+ 
+-    HubFrame(QWidget *parent, QString, QString);
++    HubFrame(QWidget *parent=NULL, QString hub="", QString encoding="");
+     ~HubFrame();
+ 
+     bool parseForCmd(QString, QWidget *);
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__main.cpp b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__main.cpp
new file mode 100644
index 000000000000..845bedff2b45
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-eiskaltdcpp-qt__src__main.cpp
@@ -0,0 +1,10 @@
+--- eiskaltdcpp-qt/src/main.cpp.orig	2013-08-29 21:25:02.000000000 +0400
++++ eiskaltdcpp-qt/src/main.cpp	2014-08-16 10:25:44.000000000 +0400
+@@ -73,7 +73,6 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #if !defined (__HAIKU__)
+-#include <execinfo.h>
+ 
+ #ifdef ENABLE_STACKTRACE
+ #include "extra/stacktrace.h"
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-json__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-json__CMakeLists.txt
new file mode 100644
index 000000000000..e044b7c47a40
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-json__CMakeLists.txt
@@ -0,0 +1,11 @@
+--- json/CMakeLists.txt.orig	2013-08-29 21:25:02.000000000 +0400
++++ json/CMakeLists.txt	2014-08-14 09:48:27.364617149 +0400
+@@ -12,7 +12,7 @@
+ set_source_files_properties(${PROJECT_SOURCE_DIR}/jsonrpc-cpp/mongoose.c PROPERTIES COMPILE_FLAGS "-DNDEBUG -DNO_CGI -DNO_SSL")
+ #option (LOCAL_JSONCPP "Use local JsonCpp" ON)
+ #if (LOCAL_JSONCPP)
+-    set (JSONCPP_LIBRARY jsoncpp)
++    set (JSONCPP_LIBRARY jsoncpp ${CMAKE_THREAD_LIBS_INIT})
+     set (JSONCPP_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp/)
+     include_directories(${JSONCPP_INCLUDE_DIR})
+     aux_source_directory(${PROJECT_SOURCE_DIR}/jsoncpp/ jsoncpp_SRCS)
diff --git a/net-p2p/eiskaltdcpp-lib/pkg-descr b/net-p2p/eiskaltdcpp-lib/pkg-descr
index cf93e173f6ac..d21bf7f070b4 100644
--- a/net-p2p/eiskaltdcpp-lib/pkg-descr
+++ b/net-p2p/eiskaltdcpp-lib/pkg-descr
@@ -5,4 +5,4 @@ interoperates with all common DC hub software.
 
 This port is DC++ core (customized) compiled as shared library.
 
-WWW:	http://code.google.com/p/eiskaltdc/
+WWW: http://code.google.com/p/eiskaltdc/
diff --git a/net-p2p/eiskaltdcpp-lib/pkg-plist b/net-p2p/eiskaltdcpp-lib/pkg-plist
index 486dcca58278..5f5bc55cd551 100644
--- a/net-p2p/eiskaltdcpp-lib/pkg-plist
+++ b/net-p2p/eiskaltdcpp-lib/pkg-plist
@@ -44,6 +44,7 @@ include/eiskaltdcpp/dcpp/HttpConnection.h
 include/eiskaltdcpp/dcpp/HubEntry.h
 include/eiskaltdcpp/dcpp/LogManager.h
 include/eiskaltdcpp/dcpp/LogManagerListener.h
+include/eiskaltdcpp/dcpp/MediaInfo.h
 include/eiskaltdcpp/dcpp/MerkleCheckOutputStream.h
 include/eiskaltdcpp/dcpp/MerkleTree.h
 include/eiskaltdcpp/dcpp/NmdcHub.h
@@ -91,21 +92,21 @@ include/eiskaltdcpp/dcpp/UserConnection.h
 include/eiskaltdcpp/dcpp/UserConnectionListener.h
 include/eiskaltdcpp/dcpp/Util.h
 include/eiskaltdcpp/dcpp/Wildcards.h
-include/eiskaltdcpp/dcpp/WindowInfo.h
-include/eiskaltdcpp/dcpp/WindowManager.h
-include/eiskaltdcpp/dcpp/WindowManagerListener.h
 include/eiskaltdcpp/dcpp/ZUtils.h
 include/eiskaltdcpp/dcpp/compiler.h
 include/eiskaltdcpp/dcpp/debug.h
 include/eiskaltdcpp/dcpp/format.h
 include/eiskaltdcpp/dcpp/forward.h
 include/eiskaltdcpp/dcpp/noexcept.h
+include/eiskaltdcpp/dcpp/nullptr.h
 include/eiskaltdcpp/dcpp/stdinc.h
 include/eiskaltdcpp/dcpp/typedefs.h
 include/eiskaltdcpp/dcpp/version.h
 include/eiskaltdcpp/dcpp/w.h
 @dirrm include/eiskaltdcpp/dcpp
 @dirrm include/eiskaltdcpp
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 lib/libeiskaltdcpp.so.2.2
 lib/libeiskaltdcpp.so.2
 lib/libeiskaltdcpp.so
@@ -113,12 +114,15 @@ share/locale/be/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/bg/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/cs/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/de/LC_MESSAGES/libeiskaltdcpp.mo
+share/locale/el/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/en/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/es/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/fr/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/hu/LC_MESSAGES/libeiskaltdcpp.mo
+share/locale/it/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/pl/LC_MESSAGES/libeiskaltdcpp.mo
+share/locale/pt_BR/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/ru/LC_MESSAGES/libeiskaltdcpp.mo
-share/locale/sr/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/sk/LC_MESSAGES/libeiskaltdcpp.mo
+share/locale/sr@latin/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/uk/LC_MESSAGES/libeiskaltdcpp.mo