8 files changed, 49 insertions, 45 deletions

diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile
index cd3bf20f9068..5b10a497277a 100644
--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	eiskaltdcpp-gtk
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	eiskaltdcpp-${DISTVERSION}
@@ -15,13 +14,15 @@ DISTNAME=	eiskaltdcpp-${DISTVERSION}
 MAINTAINER=	gelraen.ua@gmail.com
 COMMENT=	EiskaltDC++ Direct Connect client GTK GUI
 
+LICENSE=	GPLv3
+
 RUN_DEPENDS=	${LOCALBASE}/share/eiskaltdcpp/keep_me:${PORTSDIR}/net-p2p/eiskaltdcpp-data
 LIB_DEPENDS=	eiskaltdcpp:${PORTSDIR}/net-p2p/eiskaltdcpp-lib
 
 CMAKE_ARGS+=	-DBUILD_LIB:BOOL=OFF
 PROJECTHOST=	eiskaltdc
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GCC=	4.2+
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/net-p2p/eiskaltdcpp-gtk/distinfo b/net-p2p/eiskaltdcpp-gtk/distinfo
index 44a689707872..b90927dbed33 100644
--- a/net-p2p/eiskaltdcpp-gtk/distinfo
+++ b/net-p2p/eiskaltdcpp-gtk/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-gtk/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-gtk/files/patch-CMakeLists.txt
index 61a522eb92bc..87cd1d634262 100644
--- a/net-p2p/eiskaltdcpp-gtk/files/patch-CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-gtk/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2010-11-21 23:38:14.000000000 +0100
-+++ CMakeLists.txt	2010-11-26 15:24:18.000000000 +0100
-@@ -175,14 +175,14 @@
+--- ./CMakeLists.txt.orig	2011-03-08 19:47:12.000000000 +0200
++++ ./CMakeLists.txt	2011-03-10 16:22:20.000000000 +0200
+@@ -184,14 +184,14 @@
  
      if (USE_LIBGNOME2)
          message (STATUS "Building with LibGnome2 support")
@@ -13,36 +13,31 @@
      if (USE_LIBNOTIFY)
          message (STATUS "Building with libnotify support")
 -        set (LIBNOTIFY "-lnotify")
-+        find_library(LIBNOTIFY notify)
++		find_library(LIBNOTIFY notify)
      else (USE_LIBNOTIFY)
          message (STATUS "Building without libnotify support")
      endif (USE_LIBNOTIFY)
-@@ -301,19 +301,17 @@
-     if (CMAKE_CROSSCOMPILING)
-         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -enable-auto-import")
-     endif (CMAKE_CROSSCOMPILING)
+@@ -316,16 +316,14 @@
+     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")
+-        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")
- #endif (CMAKE_COMPILER_IS_GNUСXX AND CMAKE_COMPILER_IS_GNUC)
- endif (NOT MSVC)
+ endif ()
  
 -include_directories(${eiskaltdcpp_BINARY_DIR}
--   ${eiskaltdcpp_SOURCE_DIR}
--   ${GMP_INCLUDE_DIR}
 +include_directories(
-+	${EISKALTDCPP_INCLUDE_DIR}
-+	${eiskaltdcpp_BINARY_DIR}
-+	${eiskaltdcpp_SOURCE_DIR}
-+	${GMP_INCLUDE_DIR}
++   ${EISKALTDCPP_INCLUDE_DIR}
++   ${eiskaltdcpp_BINARY_DIR}
+    ${eiskaltdcpp_SOURCE_DIR}
+    ${GMP_INCLUDE_DIR}
     )
- 
- message(STATUS "CMAKE will use this libs (and headers) during build:
-@@ -375,7 +373,9 @@
+@@ -395,7 +393,9 @@
  add_subdirectory (dht)
  endif (DHT)
  
@@ -53,7 +48,7 @@
  
  if (USE_QT)
    add_subdirectory (eiskaltdcpp-qt)
-@@ -420,11 +420,11 @@
+@@ -443,11 +443,11 @@
        LOCALE_LIST "${LANGUAGES}"
        COPYRIGHT_HOLDER "EiskaltDC++ team"
        SOURCES "${DCPP_SRCS};${DCPP_HDRS}"
diff --git a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__CMakeLists.txt b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__CMakeLists.txt
index 01e10ce89312..0fef9a529f3c 100644
--- a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__CMakeLists.txt
@@ -1,5 +1,5 @@
---- ./eiskaltdcpp-gtk/CMakeLists.txt.orig	2010-11-22 00:38:14.000000000 +0200
-+++ ./eiskaltdcpp-gtk/CMakeLists.txt	2010-11-24 14:47:03.000000000 +0200
+--- ./eiskaltdcpp-gtk/CMakeLists.txt.orig	2011-03-08 19:47:12.000000000 +0200
++++ ./eiskaltdcpp-gtk/CMakeLists.txt	2011-03-10 16:22:20.000000000 +0200
 @@ -12,7 +12,7 @@
  set (GTK_SRCS @gtk_srcs@ PARENT_SCOPE)
  set (GTK_HDRS @gtk_hdrs@ PARENT_SCOPE)
@@ -9,8 +9,8 @@
  
  include_directories (
          ${GTK2_INCLUDE_DIRS}
-@@ -36,6 +36,10 @@
-   list (APPEND LIBS ${LUA_LIBRARIES})
+@@ -37,6 +37,10 @@
+   set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/mainwindow.cc ${PROJECT_SOURCE_DIR}/src/hub.cc PROPERTY COMPILE_DEFINITIONS LUA_SCRIPT)
  endif (LUA_SCRIPT)
  
 +if (USE_MINIUPNP OR FREE_SPACE_BAR_C)
@@ -20,7 +20,7 @@
  add_executable (eiskaltdcpp-gtk MACOSX_BUNDLE WIN32
                  ${gtk_srcs}
                  )
-@@ -56,10 +60,19 @@
+@@ -71,10 +75,19 @@
    add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/gtk/resources")
  endif (APPLE)
  
@@ -42,7 +42,7 @@
  endif (APPLE)
  
  if (UNIX)
-@@ -98,6 +111,6 @@
+@@ -113,6 +126,6 @@
  else (APPLE)
    if (UNIX)
      install (FILES eiskaltdcpp-gtk.desktop DESTINATION ${SHARE_DIR}/applications)
diff --git a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__src__wulfor.cc b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__src__wulfor.cc
new file mode 100644
index 000000000000..c1df3a1ff5b9
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk__src__wulfor.cc
@@ -0,0 +1,18 @@
+--- ./eiskaltdcpp-gtk/src/wulfor.cc.orig	2011-03-10 16:43:57.000000000 +0200
++++ ./eiskaltdcpp-gtk/src/wulfor.cc	2011-03-10 16:44:22.000000000 +0200
+@@ -37,7 +37,6 @@
+ #define GUI_PACKAGE "eiskaltdcpp-gtk"
+ 
+ #include "VersionGlobal.h"
+-#include "extra/stacktrace.h"
+ 
+ void printHelp()
+ {
+@@ -135,7 +134,6 @@
+     g_set_application_name("EiskaltDC++ Gtk");
+ 
+     signal(SIGPIPE, SIG_IGN);
+-    signal(SIGSEGV, printBacktrace);
+ 
+     WulforSettingsManager::newInstance();
+     WulforManager::start(argc, argv);
diff --git a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk_src_notify.cc b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk_src_notify.cc
deleted file mode 100644
index ae4fd4637498..000000000000
--- a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk_src_notify.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- eiskaltdcpp-gtk/src/notify.cc.orig	2011-08-12 11:54:13.000000000 +0200
-+++ eiskaltdcpp-gtk/src/notify.cc	2011-08-12 11:54:24.000000000 +0200
-@@ -69,7 +69,7 @@ void Notify::init()
- {
- #ifdef USE_LIBNOTIFY
- 	notify_init(g_get_application_name());
--	notification = notify_notification_new("template", "template", NULL, NULL);
-+	notification = notify_notification_new("template", "template", NULL);
- #endif // USE_LIBNOTIFY
- 	action = FALSE;
- }
diff --git a/net-p2p/eiskaltdcpp-gtk/pkg-descr b/net-p2p/eiskaltdcpp-gtk/pkg-descr
index 96c3d14e9fb4..b96cc9ac83f1 100644
--- a/net-p2p/eiskaltdcpp-gtk/pkg-descr
+++ b/net-p2p/eiskaltdcpp-gtk/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-gtk/pkg-plist b/net-p2p/eiskaltdcpp-gtk/pkg-plist
index 8c94ebc27d74..ac48f8ae83cc 100644
--- a/net-p2p/eiskaltdcpp-gtk/pkg-plist
+++ b/net-p2p/eiskaltdcpp-gtk/pkg-plist
@@ -1,6 +1,7 @@
 bin/eiskaltdcpp-gtk
 share/applications/eiskaltdcpp-gtk.desktop
 share/eiskaltdcpp/gtk/glade/adlsearch.glade
+share/eiskaltdcpp/gtk/glade/cmddebug.glade
 share/eiskaltdcpp/gtk/glade/downloadqueue.glade
 share/eiskaltdcpp/gtk/glade/favoritehubs.glade
 share/eiskaltdcpp/gtk/glade/favoriteusers.glade