6 files changed, 126 insertions, 104 deletions

diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile
index 8f8a7b8eadf7..646b6c3ffbdc 100644
--- a/net-p2p/eiskaltdcpp-lib/Makefile
+++ b/net-p2p/eiskaltdcpp-lib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eiskaltdcpp-lib
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2.1
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	eiskaltdcpp-${DISTVERSION}
@@ -14,11 +14,13 @@ DISTNAME=	eiskaltdcpp-${DISTVERSION}
 MAINTAINER=	gelraen.ua@gmail.com
 COMMENT=	A Direct Connect client shared library
 
+LICENSE=	GPLv3
+
 LIB_DEPENDS=	boost_system:${PORTSDIR}/devel/boost-libs
 
 PROJECTHOST=	eiskaltdc
 
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_GCC=	4.2+
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/net-p2p/eiskaltdcpp-lib/distinfo b/net-p2p/eiskaltdcpp-lib/distinfo
index 44a689707872..b90927dbed33 100644
--- a/net-p2p/eiskaltdcpp-lib/distinfo
+++ b/net-p2p/eiskaltdcpp-lib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (eiskaltdcpp-2.1.1.tar.bz2) = 7c9d2288c2f39e95d02baff20df94f00c8343dbec182206758c3751fc880d944
-SIZE (eiskaltdcpp-2.1.1.tar.bz2) = 2079712
+SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40
+SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt
index 3f29ba0ead9d..0046ae712f1f 100644
--- a/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-CMakeLists.txt
@@ -1,6 +1,17 @@
---- ./CMakeLists.txt.orig	2010-11-22 00:38:14.000000000 +0200
-+++ ./CMakeLists.txt	2010-11-22 01:35:58.000000000 +0200
-@@ -493,3 +493,12 @@
+--- ./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)
  endif (APPLE)
  endif (USE_QT OR USE_GTK)
diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt
index 965a32acdbdf..f8df4c4767d5 100644
--- a/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-lib/files/patch-dcpp__CMakeLists.txt
@@ -1,25 +1,26 @@
---- ./dcpp/CMakeLists.txt.orig	2010-11-22 00:38:14.000000000 +0200
-+++ ./dcpp/CMakeLists.txt	2010-11-22 01:37:22.000000000 +0200
-@@ -27,9 +27,6 @@
- if (APPLE)
- set (APPLE_LIBS "iconv")
+--- ./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 @@
+   set (APPLE_LIBS "iconv")
  endif (APPLE)
--if (USE_MINIUPNP OR FREE_SPACE_BAR_C)
+ 
 -set (UPNP "extra")
--endif (USE_MINIUPNP OR FREE_SPACE_BAR_C)
+-
  add_library (dcpp ${LINK} ${dcpp_srcs})
+ 
  if (USE_DHT)
- add_definitions ( -DUSE_DHT )
-@@ -45,7 +42,7 @@
+@@ -71,8 +69,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})
+-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)
++set_target_properties(dcpp PROPERTIES SOVERSION 2 VERSION ${SOVERSION} OUTPUT_NAME "eiskaltdcpp")
  
- target_link_libraries (dcpp ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES}
- ${OPENSSL_LIBRARIES} ${GETTEXT_LIBRARIES} ${ICONV_LIBRARIES} ${WIN32_LIBS} ${APPLE_LIBS} ${LUA_LIBRARIES} ${UPNP} ${PCRE})
--set_target_properties(dcpp PROPERTIES VERSION ${VERSION} OUTPUT_NAME "eiskaltdcpp")
-+set_target_properties(dcpp PROPERTIES SOVERSION 2 VERSION ${VERSION} OUTPUT_NAME "eiskaltdcpp")
  if (APPLE)
- set (LIBDIR1 .)
- set (LIBDIR ${PROJECT_NAME_GLOBAL}.app/Contents/MacOS)
-@@ -53,6 +50,6 @@
+   set (LIBDIR1 .)
+@@ -81,6 +79,6 @@
  
  if (LINK STREQUAL SHARED)
  install (TARGETS dcpp
diff --git a/net-p2p/eiskaltdcpp-lib/pkg-descr b/net-p2p/eiskaltdcpp-lib/pkg-descr
index 94f7da45bdc3..cf93e173f6ac 100644
--- a/net-p2p/eiskaltdcpp-lib/pkg-descr
+++ b/net-p2p/eiskaltdcpp-lib/pkg-descr
@@ -1,4 +1,4 @@
-EiskaltDC++ is a program for UNIX-like systems that uses the Direct Connect
+EiskaltDC++ is a cross-platform program that uses the Direct Connect
 and ADC protocol. It is compatible with other DC clients, such as the
 original DC from Neomodus, DC++ and derivatives. EiskaltDC++ also
 interoperates with all common DC hub software.
diff --git a/net-p2p/eiskaltdcpp-lib/pkg-plist b/net-p2p/eiskaltdcpp-lib/pkg-plist
index 88d83ddf61f8..0904904fa9d7 100644
--- a/net-p2p/eiskaltdcpp-lib/pkg-plist
+++ b/net-p2p/eiskaltdcpp-lib/pkg-plist
@@ -1,104 +1,112 @@
-include/eiskaltdcpp/dcpp/ScriptManager.h
-include/eiskaltdcpp/dcpp/DownloadManager.h
-include/eiskaltdcpp/dcpp/Transfer.h
-include/eiskaltdcpp/dcpp/Streams.h
-include/eiskaltdcpp/dcpp/FinishedManagerListener.h
-include/eiskaltdcpp/dcpp/HashManager.h
-include/eiskaltdcpp/dcpp/ConnectionManagerListener.h
-include/eiskaltdcpp/dcpp/BufferedSocketListener.h
-include/eiskaltdcpp/dcpp/FinishedManager.h
-include/eiskaltdcpp/dcpp/HttpConnection.h
-include/eiskaltdcpp/dcpp/ResourceManager.h
+include/eiskaltdcpp/dcpp/ADLSearch.h
+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/PerFolderLimit.h
-include/eiskaltdcpp/dcpp/ShareManager.h
+include/eiskaltdcpp/dcpp/BufferedSocketListener.h
+include/eiskaltdcpp/dcpp/CID.h
+include/eiskaltdcpp/dcpp/ChatMessage.h
+include/eiskaltdcpp/dcpp/Client.h
+include/eiskaltdcpp/dcpp/ClientListener.h
+include/eiskaltdcpp/dcpp/ClientManager.h
 include/eiskaltdcpp/dcpp/ClientManagerListener.h
-include/eiskaltdcpp/dcpp/ZUtils.h
-include/eiskaltdcpp/dcpp/SSLSocket.h
-include/eiskaltdcpp/dcpp/version.h
-include/eiskaltdcpp/dcpp/SettingsManager.h
-include/eiskaltdcpp/dcpp/HashBloom.h
+include/eiskaltdcpp/dcpp/ConnectionManager.h
+include/eiskaltdcpp/dcpp/ConnectionManagerListener.h
+include/eiskaltdcpp/dcpp/ConnectivityManager.h
+include/eiskaltdcpp/dcpp/CriticalSection.h
+include/eiskaltdcpp/dcpp/CryptoManager.h
+include/eiskaltdcpp/dcpp/DCPlusPlus.h
+include/eiskaltdcpp/dcpp/DebugManager.h
+include/eiskaltdcpp/dcpp/DirectoryListing.h
+include/eiskaltdcpp/dcpp/Download.h
+include/eiskaltdcpp/dcpp/DownloadManager.h
+include/eiskaltdcpp/dcpp/DownloadManagerListener.h
+include/eiskaltdcpp/dcpp/Encoder.h
+include/eiskaltdcpp/dcpp/Exception.h
 include/eiskaltdcpp/dcpp/FastAlloc.h
-include/eiskaltdcpp/dcpp/SSL.h
-include/eiskaltdcpp/dcpp/MerkleCheckOutputStream.h
+include/eiskaltdcpp/dcpp/FavHubGroup.h
 include/eiskaltdcpp/dcpp/FavoriteManager.h
-include/eiskaltdcpp/dcpp/Text.h
+include/eiskaltdcpp/dcpp/FavoriteManagerListener.h
 include/eiskaltdcpp/dcpp/FavoriteUser.h
-include/eiskaltdcpp/dcpp/SearchResult.h
-include/eiskaltdcpp/dcpp/Thread.h
-include/eiskaltdcpp/dcpp/Upload.h
-include/eiskaltdcpp/dcpp/SearchManager.h
-include/eiskaltdcpp/dcpp/UPnP.h
-include/eiskaltdcpp/dcpp/ConnectivityManager.h
-include/eiskaltdcpp/dcpp/CryptoManager.h
-include/eiskaltdcpp/dcpp/UserConnectionListener.h
-include/eiskaltdcpp/dcpp/Flags.h
+include/eiskaltdcpp/dcpp/File.h
+include/eiskaltdcpp/dcpp/FilteredFile.h
 include/eiskaltdcpp/dcpp/FinishedItem.h
+include/eiskaltdcpp/dcpp/FinishedManager.h
+include/eiskaltdcpp/dcpp/FinishedManagerListener.h
+include/eiskaltdcpp/dcpp/Flags.h
+include/eiskaltdcpp/dcpp/HashBloom.h
+include/eiskaltdcpp/dcpp/HashManager.h
+include/eiskaltdcpp/dcpp/HashManagerListener.h
+include/eiskaltdcpp/dcpp/HashValue.h
+include/eiskaltdcpp/dcpp/HttpConnection.h
+include/eiskaltdcpp/dcpp/HubEntry.h
+include/eiskaltdcpp/dcpp/LogManager.h
+include/eiskaltdcpp/dcpp/LogManagerListener.h
+include/eiskaltdcpp/dcpp/MerkleCheckOutputStream.h
+include/eiskaltdcpp/dcpp/MerkleTree.h
+include/eiskaltdcpp/dcpp/NmdcHub.h
+include/eiskaltdcpp/dcpp/PerFolderLimit.h
+include/eiskaltdcpp/dcpp/Pointer.h
 include/eiskaltdcpp/dcpp/QueueItem.h
-include/eiskaltdcpp/dcpp/BloomFilter.h
-include/eiskaltdcpp/dcpp/File.h
+include/eiskaltdcpp/dcpp/QueueManager.h
+include/eiskaltdcpp/dcpp/QueueManagerListener.h
+include/eiskaltdcpp/dcpp/ResourceManager.h
+include/eiskaltdcpp/dcpp/SFVReader.h
+include/eiskaltdcpp/dcpp/SSL.h
+include/eiskaltdcpp/dcpp/SSLSocket.h
+include/eiskaltdcpp/dcpp/ScriptManager.h
+include/eiskaltdcpp/dcpp/SearchManager.h
+include/eiskaltdcpp/dcpp/SearchManagerListener.h
+include/eiskaltdcpp/dcpp/SearchResult.h
 include/eiskaltdcpp/dcpp/Segment.h
-include/eiskaltdcpp/dcpp/Pointer.h
-include/eiskaltdcpp/dcpp/Singleton.h
-include/eiskaltdcpp/dcpp/forward.h
-include/eiskaltdcpp/dcpp/HubEntry.h
-include/eiskaltdcpp/dcpp/BitOutputStream.h
-include/eiskaltdcpp/dcpp/Wildcards.h
 include/eiskaltdcpp/dcpp/Semaphore.h
-include/eiskaltdcpp/dcpp/HashValue.h
-include/eiskaltdcpp/dcpp/CID.h
-include/eiskaltdcpp/dcpp/FavoriteManagerListener.h
-include/eiskaltdcpp/dcpp/UPnPManager.h
+include/eiskaltdcpp/dcpp/SettingsManager.h
+include/eiskaltdcpp/dcpp/ShareManager.h
+include/eiskaltdcpp/dcpp/SimpleXML.h
+include/eiskaltdcpp/dcpp/SimpleXMLReader.h
+include/eiskaltdcpp/dcpp/Singleton.h
+include/eiskaltdcpp/dcpp/Socket.h
+include/eiskaltdcpp/dcpp/Speaker.h
+include/eiskaltdcpp/dcpp/Streams.h
 include/eiskaltdcpp/dcpp/StringSearch.h
-include/eiskaltdcpp/dcpp/stdinc.h
-include/eiskaltdcpp/dcpp/DirectoryListing.h
-include/eiskaltdcpp/dcpp/ClientManager.h
-include/eiskaltdcpp/dcpp/Encoder.h
-include/eiskaltdcpp/dcpp/ThrottleManager.h
-include/eiskaltdcpp/dcpp/BZUtils.h
-include/eiskaltdcpp/dcpp/DownloadManagerListener.h
-include/eiskaltdcpp/dcpp/UserCommand.h
-include/eiskaltdcpp/dcpp/ConnectionManager.h
-include/eiskaltdcpp/dcpp/Download.h
-include/eiskaltdcpp/dcpp/ClientListener.h
-include/eiskaltdcpp/dcpp/AdcHub.h
-include/eiskaltdcpp/dcpp/Client.h
-include/eiskaltdcpp/dcpp/Exception.h
 include/eiskaltdcpp/dcpp/StringTokenizer.h
-include/eiskaltdcpp/dcpp/CriticalSection.h
-include/eiskaltdcpp/dcpp/TimerManager.h
-include/eiskaltdcpp/dcpp/UserConnection.h
-include/eiskaltdcpp/dcpp/AdcCommand.h
-include/eiskaltdcpp/dcpp/SFVReader.h
-include/eiskaltdcpp/dcpp/QueueManager.h
-include/eiskaltdcpp/dcpp/NmdcHub.h
-include/eiskaltdcpp/dcpp/DCPlusPlus.h
-include/eiskaltdcpp/dcpp/TigerHash.h
-include/eiskaltdcpp/dcpp/LogManagerListener.h
-include/eiskaltdcpp/dcpp/BitInputStream.h
-include/eiskaltdcpp/dcpp/ADLSearch.h
-include/eiskaltdcpp/dcpp/SearchManagerListener.h
-include/eiskaltdcpp/dcpp/FilteredFile.h
 include/eiskaltdcpp/dcpp/TaskQueue.h
-include/eiskaltdcpp/dcpp/MerkleTree.h
-include/eiskaltdcpp/dcpp/QueueManagerListener.h
-include/eiskaltdcpp/dcpp/Util.h
-include/eiskaltdcpp/dcpp/Speaker.h
+include/eiskaltdcpp/dcpp/Text.h
+include/eiskaltdcpp/dcpp/Thread.h
+include/eiskaltdcpp/dcpp/ThrottleManager.h
+include/eiskaltdcpp/dcpp/TigerHash.h
+include/eiskaltdcpp/dcpp/TimerManager.h
+include/eiskaltdcpp/dcpp/Transfer.h
+include/eiskaltdcpp/dcpp/UPnP.h
+include/eiskaltdcpp/dcpp/UPnPManager.h
+include/eiskaltdcpp/dcpp/Upload.h
 include/eiskaltdcpp/dcpp/UploadManager.h
 include/eiskaltdcpp/dcpp/UploadManagerListener.h
-include/eiskaltdcpp/dcpp/SimpleXML.h
-include/eiskaltdcpp/dcpp/Socket.h
-include/eiskaltdcpp/dcpp/LogManager.h
-include/eiskaltdcpp/dcpp/ServerSocket.h
-include/eiskaltdcpp/dcpp/HashManagerListener.h
 include/eiskaltdcpp/dcpp/User.h
+include/eiskaltdcpp/dcpp/UserCommand.h
+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/forward.h
+include/eiskaltdcpp/dcpp/stdinc.h
+include/eiskaltdcpp/dcpp/version.h
 @dirrm include/eiskaltdcpp/dcpp
 @dirrm include/eiskaltdcpp
-lib/libeiskaltdcpp.so.2.1.x
+lib/libeiskaltdcpp.so.2.2
 lib/libeiskaltdcpp.so.2
 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/en/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/es/LC_MESSAGES/libeiskaltdcpp.mo
 share/locale/fr/LC_MESSAGES/libeiskaltdcpp.mo