4 files changed, 42 insertions, 18 deletions

diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile
index 646b6c3ffbdc..debcab56c15a 100644
--- a/net-p2p/eiskaltdcpp-lib/Makefile
+++ b/net-p2p/eiskaltdcpp-lib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eiskaltdcpp-lib
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	eiskaltdcpp-${DISTVERSION}
@@ -20,8 +20,8 @@ LIB_DEPENDS=	boost_system:${PORTSDIR}/devel/boost-libs
 
 PROJECTHOST=	eiskaltdc
 
-USE_XZ=	yes
-USE_GCC=	4.2+
+USE_XZ=		yes
+USE_GCC=	4.4+
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
 USE_OPENSSL=	yes
@@ -29,7 +29,9 @@ USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	LUA	"Lua scripting support"	off \
-		PCRE	"PCRE support in ADL Search" off
+		PCRE	"PCRE support in ADL Search" off \
+		IDN	"IDN support" on \
+		DHT	"DHT support" on
 
 .include <bsd.port.options.mk>
 
@@ -38,6 +40,7 @@ CMAKE_ARGS+=	-DUSE_QT:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_GTK:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_ASPELL:BOOL=OFF
 CMAKE_ARGS+=	-DUSE_MINIUPNP:BOOL=OFF
+CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=ON
 
 .if defined(WITH_LUA) && !defined(WITHOUT_LUA)
 USE_LUA=	5.1
@@ -54,8 +57,23 @@ CMAKE_ARGS+=	-DPERL_REGEX:BOOL=ON
 CMAKE_ARGS+=	-DPERL_REGEX:BOOL=OFF
 .endif
 
+.if defined(WITH_IDN) && !defined(WITHOUT_IDN)
+LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
+CMAKE_ARGS+=	-DUSE_IDNA:BOOL=ON
+.else
+CMAKE_ARGS+=	-DUSE_IDNA:BOOL=OFF
+.endif
+
+.if defined(WITH_DHT) && !defined(WITHOUT_DHT)
+CMAKE_ARGS+=	-DWITH_DHT:BOOL=ON
+.else
+CMAKE_ARGS+=	-DWITH_DHT: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-lib/distinfo b/net-p2p/eiskaltdcpp-lib/distinfo
index b90927dbed33..f94894f67b5f 100644
--- a/net-p2p/eiskaltdcpp-lib/distinfo
+++ b/net-p2p/eiskaltdcpp-lib/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-lib/files/patch-dcpp__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt
index f8df4c4767d5..f6d06a763923 100644
--- a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt
@@ -1,6 +1,6 @@
---- ./dcpp/CMakeLists.txt.orig	2011-03-08 19:47:12.000000000 +0200
-+++ ./dcpp/CMakeLists.txt	2011-03-09 19:22:26.000000000 +0200
-@@ -30,8 +30,6 @@
+--- 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)
  
@@ -8,19 +8,19 @@
 -
  add_library (dcpp ${LINK} ${dcpp_srcs})
  
- if (USE_DHT)
-@@ -71,8 +69,8 @@
+ if (WITH_DHT)
+@@ -76,8 +74,8 @@
  endif (WIN32)
  
- target_link_libraries (dcpp ${PTHREADS} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES}
--${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${DHT_LIB})
+ 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})
 -set_target_properties(dcpp PROPERTIES VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")
-+${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE} ${DHT_LIB} extra)
++${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 .)
-@@ -81,6 +79,6 @@
+@@ -86,6 +84,6 @@
  
  if (LINK STREQUAL SHARED)
  install (TARGETS dcpp
diff --git a/net-p2p/eiskaltdcpp-lib/pkg-plist b/net-p2p/eiskaltdcpp-lib/pkg-plist
index 0904904fa9d7..486dcca58278 100644
--- a/net-p2p/eiskaltdcpp-lib/pkg-plist
+++ b/net-p2p/eiskaltdcpp-lib/pkg-plist
@@ -3,8 +3,6 @@ include/eiskaltdcpp/dcpp/AdcCommand.h
 include/eiskaltdcpp/dcpp/AdcHub.h
 include/eiskaltdcpp/dcpp/Atomic.h
 include/eiskaltdcpp/dcpp/BZUtils.h
-include/eiskaltdcpp/dcpp/BitInputStream.h
-include/eiskaltdcpp/dcpp/BitOutputStream.h
 include/eiskaltdcpp/dcpp/BloomFilter.h
 include/eiskaltdcpp/dcpp/BufferedSocket.h
 include/eiskaltdcpp/dcpp/BufferedSocketListener.h
@@ -61,6 +59,7 @@ include/eiskaltdcpp/dcpp/SSLSocket.h
 include/eiskaltdcpp/dcpp/ScriptManager.h
 include/eiskaltdcpp/dcpp/SearchManager.h
 include/eiskaltdcpp/dcpp/SearchManagerListener.h
+include/eiskaltdcpp/dcpp/SearchQueue.h
 include/eiskaltdcpp/dcpp/SearchResult.h
 include/eiskaltdcpp/dcpp/Segment.h
 include/eiskaltdcpp/dcpp/Semaphore.h
@@ -96,9 +95,15 @@ 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/stdinc.h
+include/eiskaltdcpp/dcpp/typedefs.h
 include/eiskaltdcpp/dcpp/version.h
+include/eiskaltdcpp/dcpp/w.h
 @dirrm include/eiskaltdcpp/dcpp
 @dirrm include/eiskaltdcpp
 lib/libeiskaltdcpp.so.2.2
@@ -107,6 +112,7 @@ lib/libeiskaltdcpp.so
 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/en/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/es/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/fr/LC_MESSAGES/libeiskaltdcpp.mo