- Update to 2.2.4

PR:		ports/76758
Submitted by:	Piotr Smyrak <piotr.smyrak@heron.pl> (maintainer)

12 files changed, 297 insertions, 239 deletions

diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 5733c09174f7..37a504fe4589 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnugadu2
-PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTVERSION=	2.2.4
 CATEGORIES=	polish net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggadu
@@ -16,25 +15,24 @@ DISTNAME=	gg2-${PORTVERSION}
 MAINTAINER=	smyru@heron.pl
 COMMENT=	GTK2 based Gadu-Gadu client for X11
 
-LIB_DEPENDS=	gadu.3:${PORTSDIR}/polish/ekg
+LIB_DEPENDS=	gadu.3:${PORTSDIR}/polish/ekg \
+		audiofile.0:${PORTSDIR}/audio/libaudiofile
 
 USE_X_PREFIX=	yes
-USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
 CONFLICTS=	qhacc-*
 
-CONFIGURE_ARGS=	--with-gui \
-		--with-gadu \
-		--with-sms \
-		--with-external \
+CONFIGURE_ARGS=	\
 		--with-external-libgadu \
-		--with-update
+		--with-static=no \
+		--without-dbus \
+		--without-remote
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -45,78 +43,65 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 WITH_ESOUND=	yes
 .endif
 
-.if defined(WITH_GTKSPELL)
-CONFIGURE_ARGS+=	--with-gtkspell
+.if !defined(WITH_GTKSPELL)
+CONFIGURE_ARGS+=	--without-gtkspell
+.else
 LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
 .endif
 
-.if defined(WITH_DOCKLET)
-CONFIGURE_ARGS+=	--with-docklet_system_tray
-PLIST_SUB+=	DOCKLET:=""
-.else
-CONFIGURE_ARGS+=	--without-docklet_system_tray
+.if !defined(WITH_DOCKLET)
+CONFIGURE_ARGS+=	--without-docklet-system-tray
 PLIST_SUB+=	DOCKLET:="@comment "
+.else
+PLIST_SUB+=	DOCKLET:=""
 .endif
 
-.if defined(WITH_DOCKAPP)
-CONFIGURE_ARGS+=	--with-docklet_dockapp
-PLIST_SUB+=	DOCKAPP:=""
-.else
+.if !defined(WITH_DOCKAPP)
 CONFIGURE_ARGS+=	--without-docklet_dockapp
 PLIST_SUB+=	DOCKAPP:="@comment "
+.else
+PLIST_SUB+=	DOCKAPP:=""
 .endif
 
-.if defined(WITH_TLEN)
-CONFIGURE_ARGS+=	--with-tlen
-LIB_DEPENDS+=	tlen.1:${PORTSDIR}/polish/libtlen
-PLIST_SUB+=	TLEN:=""
-.else
+.if !defined(WITH_TLEN)
 CONFIGURE_ARGS+=	--without-tlen
 PLIST_SUB+=	TLEN:="@comment "
+.else
+LIB_DEPENDS+=	tlen.1:${PORTSDIR}/polish/libtlen
+PLIST_SUB+=	TLEN:=""
 .endif
 
-.if defined(WITH_JABBER)
-CONFIGURE_ARGS+=	--with-jabber
-LIB_DEPENDS+=	loudmouth-1.0:${PORTSDIR}/net/loudmouth
-PLIST_SUB+=	JABBER:=""
-.else
+.if !defined(WITH_JABBER)
 CONFIGURE_ARGS+=	--without-jabber
 PLIST_SUB+=	JABBER:="@comment "
+.else
+LIB_DEPENDS+=	loudmouth-1.0:${PORTSDIR}/net/loudmouth
+PLIST_SUB+=	JABBER:=""
 .endif
 
-.if defined(WITH_ESOUND)
-CONFIGURE_ARGS+=	--with-esd
+.if !defined(WITH_ESOUND)
+CONFIGURE_ARGS+=	--without-esd
+PLIST_SUB+=	ESOUND:="@comment "
+.else
 PKGNAMESUFFIX=	-esound
 USE_GNOME+=	esound
 PLIST_SUB+=	ESOUND:=""
-.else
-CONFIGURE_ARGS+=	--without-esd
-PLIST_SUB+=	ESOUND:="@comment "
 .endif
 
-.if defined(WITH_ARTS)
-CONFIGURE_ARGS+=	--with-arts
-LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-PLIST_SUB+=	ARTS:=""
-.else
+.if !defined(WITH_ARTS)
 CONFIGURE_ARGS+=	--without-arts
 PLIST_SUB+=	ARTS:="@comment "
-.endif
-
-.if defined(WITH_OSS)
-CONFIGURE_ARGS+=	--with-oss
-PLIST_SUB+=	OSS:=""
 .else
-PLIST_SUB+=	OSS:="@comment "
+LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+PLIST_SUB+=	ARTS:=""
 .endif
 
-.if defined(WITH_XOSD)
-CONFIGURE_ARGS+=	--with-xosd
-LIB_DEPENDS+=	xosd.4:${PORTSDIR}/misc/xosd
-PLIST_SUB+=	XOSD:=""
-.else
+.if !defined(WITH_XOSD)
 CONFIGURE_ARGS+=	--without-xosd
 PLIST_SUB+=	XOSD:="@comment "
+.else
+LIB_DEPENDS+=	xosd.4:${PORTSDIR}/misc/xosd
+PLIST_SUB+=	XOSD:=""
 .endif
 
 .if (${HAVE_GNOME:Mgnomehier}!="")
@@ -131,17 +116,35 @@ PLIST_SUB+=	KDE:="@comment "
 .endif
 
 pre-everything::
+.if defined(WITH_TLEN) || defined(WITH_JABBER) || defined(WITH_XOSD) || defined(WITH_DOCLET) || defined(WITH_DOCKAPP) || defined(WITH_ARTS) || defined(WITH_ESOUND) || defined(WITH_GTKSPELL)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "  You can define following build options:"
 	@${ECHO_MSG}
+.endif
+.if !defined(WITH_TLEN)
 	@${ECHO_MSG} "	WITH_TLEN      to enable Tlen.pl network plugin"
+.endif
+.if !defined(WITH_JABBER)
 	@${ECHO_MSG} "	WITH_JABBER    to enable Jabber loudmouth plugin"
+.endif
+.if !defined(WITH_XOSD)
 	@${ECHO_MSG} "	WITH_XOSD      to enable On-Screen-Display messages"
+.endif
+.if !defined(WITH_DOCKLET)
 	@${ECHO_MSG} "	WITH_DOCKLET   to enable freedesktop.org docklet plugin"
+.endif
+.if !defined(WITH_DOCKAPP)
 	@${ECHO_MSG} "	WITH_DOCKAPP   to enable WindowMaker dockapp plugin"
-	@${ECHO_MSG} "	WITH_OSS       to build with sound via OSS"
+.endif
+.if !defined(WITH_ARTS)
 	@${ECHO_MSG} "	WITH_ARTS      to build with aRts sound server"
+.endif
+.if !defined(WITH_ESOUND)
 	@${ECHO_MSG} "	WITH_ESOUND    to build with esound sound server"
+.endif
+.if !defined(WITH_GTKSPELL)
+	@${ECHO_MSG} "	WITH_GTKSPELL  to enable GTKSpell checker"
+.endif
 	@${ECHO_MSG}
 
 post-patch:
diff --git a/polish/gnugadu2/distinfo b/polish/gnugadu2/distinfo
index ab61b5f0f57a..4fd9b676f44b 100644
--- a/polish/gnugadu2/distinfo
+++ b/polish/gnugadu2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gg2-2.0.3.tar.bz2) = e8795ba49b9817a1db5e8628c9c9e30a
-SIZE (gg2-2.0.3.tar.bz2) = 1182315
+MD5 (gg2-2.2.4.tar.gz) = 3f9c87ac78bb23b4cd07a4b6eb380cf8
+SIZE (gg2-2.2.4.tar.gz) = 1363001
diff --git a/polish/gnugadu2/files/patch-configure b/polish/gnugadu2/files/patch-configure
index de6325abd82d..b2d2e49bbf7a 100644
--- a/polish/gnugadu2/files/patch-configure
+++ b/polish/gnugadu2/files/patch-configure
@@ -1,13 +1,5 @@
 --- configure.orig	Sun Dec 14 21:35:41 2003
 +++ configure	Sun Dec 14 21:39:11 2003
-@@ -19127,6 +19127,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -24937,7 +24938,7 @@
    fi
  else
diff --git a/polish/gnugadu2/files/patch-contrib-gghist-gghist.c b/polish/gnugadu2/files/patch-contrib-gghist-gghist.c
new file mode 100644
index 000000000000..9f83d65d8ded
--- /dev/null
+++ b/polish/gnugadu2/files/patch-contrib-gghist-gghist.c
@@ -0,0 +1,43 @@
+--- contrib/gghist/gghist.c.orig	Fri Aug 20 14:17:29 2004
++++ contrib/gghist/gghist.c	Fri Jan 28 00:54:48 2005
+@@ -244,6 +244,7 @@
+ 	GtkWidget *field_s;
+ 	GtkWidget *base_field;
+ 	GtkTextBuffer *buf;
++	int fd;
+ 
+ 	gtk_init(&argc, &argv);
+ 
+@@ -257,7 +258,7 @@
+ #ifdef GGADU_DEBUG
+ 	g_print("Trying to open a file..\n");
+ #endif
+-	int fd = open(argv[1], O_RDONLY);
++	fd = open(argv[1], O_RDONLY);
+ 
+ 	if (fd == -1) {
+ 		GtkWidget *dialog;
+@@ -279,6 +280,7 @@
+ 	g_print("Getting lines count..\n");
+ #endif
+ 	lines = lines_count(fd);
++	{
+ 	int list[lines + 2];
+ 
+ 
+@@ -326,7 +328,6 @@
+ 	/* Add 'Base container' to window */
+ 	gtk_container_add(GTK_CONTAINER(window), base_field);
+ 
+-
+ 	list[lines + 2] = fd;
+ #ifdef GGADU_DEBUG
+ 	g_print("Reading offsets of lines..%d\n", lines);
+@@ -344,6 +345,7 @@
+ 	else
+ 	    show_lines(0, display_pages, list);
+ 
++	}
+ 	gtk_widget_show_all(window);
+ 
+ 	gtk_main();
diff --git a/polish/gnugadu2/files/patch-src-plugins-GUI-gui_chat.c b/polish/gnugadu2/files/patch-src-plugins-GUI-gui_chat.c
new file mode 100644
index 000000000000..a61020e88a15
--- /dev/null
+++ b/polish/gnugadu2/files/patch-src-plugins-GUI-gui_chat.c
@@ -0,0 +1,19 @@
+--- src/plugins/GUI/gui_chat.c.orig	Mon Jan  3 16:51:02 2005
++++ src/plugins/GUI/gui_chat.c	Fri Jan 28 00:23:27 2005
+@@ -249,6 +249,7 @@
+ 
+ void on_clear_clicked(GtkWidget * button, gpointer user_data)
+ {
++	GtkTextBuffer *buf;
+ 	gint chat_type = (gint) ggadu_config_var_get(gui_handler, "chat_type");
+ 	gui_chat_session *session = NULL;
+ 	GtkWidget *textview = NULL;
+@@ -267,7 +268,7 @@
+ 		textview = g_object_get_data(G_OBJECT(session->chat), "history");
+ 	}
+ 
+-	GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
++	buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
+ 	gtk_text_buffer_set_text(buf, "", -1);
+ }
+ 
diff --git a/polish/gnugadu2/files/patch-src-plugins-GUI-gui_preferences.c b/polish/gnugadu2/files/patch-src-plugins-GUI-gui_preferences.c
new file mode 100644
index 000000000000..f8a6d697258c
--- /dev/null
+++ b/polish/gnugadu2/files/patch-src-plugins-GUI-gui_preferences.c
@@ -0,0 +1,66 @@
+--- src/plugins/GUI/gui_preferences.c.orig	Tue Jan  4 16:54:23 2005
++++ src/plugins/GUI/gui_preferences.c	Fri Jan 28 00:32:36 2005
+@@ -618,6 +618,8 @@
+ #endif
+ 	GtkWidget *label0_align, *label1_align, *label2_align;
+ 	GtkWidget *label3_align;
++	GtkWidget *exp;
++	GtkWidget *frm;
+ 
+ 	chat_vbox = gtk_vbox_new(FALSE, 5);
+ 
+@@ -694,8 +696,8 @@
+ 	gtk_table_set_row_spacings(GTK_TABLE(tabbox), 7);
+ 	gtk_table_set_col_spacings(GTK_TABLE(tabbox), 0);
+ 	
+-	GtkWidget *exp = gtk_expander_new(_("More advanced options"));
+-	GtkWidget *frm = gtk_frame_new(_("Default size of window"));
++	exp = gtk_expander_new(_("More advanced options"));
++	frm = gtk_frame_new(_("Default size of window"));
+ 	gtk_frame_set_shadow_type(GTK_FRAME(frm),GTK_SHADOW_ETCHED_OUT);
+ 	gtk_container_add(GTK_CONTAINER(frm), tabbox);
+ 	gtk_container_add(GTK_CONTAINER(exp), frm);
+@@ -746,6 +748,7 @@
+ 
+ static GtkWidget *create_advanced_tab()
+ {
++	GtkWidget *entry;
+ 	GtkWidget *hide_on_start;
+ 	GtkWidget *close_on_esc;
+ 	GtkWidget *blink_interval = NULL;
+@@ -922,7 +925,7 @@
+ 	label = gtk_label_new(_("Web Browser:"));
+ 	gtk_container_add(GTK_CONTAINER(label4_align), label);
+ 
+-	GtkWidget *entry = gtk_entry_new();
++	entry = gtk_entry_new();
+ 	gtk_table_attach_defaults(GTK_TABLE(tabbox2), label4_align, 0, 1, 0, 1);
+ 	gtk_table_attach_defaults(GTK_TABLE(tabbox2), entry, 1, 2, 0, 1);
+ 	g_object_set_data(G_OBJECT(adv_vbox), "browser_exec", entry);
+@@ -1221,6 +1224,8 @@
+ 	response = gtk_dialog_run(GTK_DIALOG(preferences));
+ 	if (response == GTK_RESPONSE_ACCEPT)
+ 	{
++		GSList *combo_theme_slist;
++		GSList *combo_icons_slist;
+ 		if (plugins_updated)
+ 		{
+ 			GIOChannel *ch = g_io_channel_new_file(g_build_filename(config->configdir, "modules.load", NULL), "w",
+@@ -1325,7 +1330,7 @@
+ 		entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_theme");
+ 		g_return_if_fail(entry != NULL);
+ 
+-		GSList *combo_theme_slist = g_object_get_data(G_OBJECT(entry), "combo_theme_slist");
++		combo_theme_slist = g_object_get_data(G_OBJECT(entry), "combo_theme_slist");
+ 		ggadu_config_var_set(gui_handler, "theme", (gpointer) g_strdup(g_slist_nth_data(combo_theme_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));
+ 
+ 		g_slist_foreach(combo_theme_slist, (GFunc) g_free, NULL);
+@@ -1333,7 +1338,7 @@
+ 
+ 		entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_icons");
+ 		g_return_if_fail(entry != NULL);
+-		GSList *combo_icons_slist = g_object_get_data(G_OBJECT(entry), "combo_icons_slist");
++		combo_icons_slist = g_object_get_data(G_OBJECT(entry), "combo_icons_slist");
+ 		ggadu_config_var_set(gui_handler, "icons", (gpointer) g_strdup(g_slist_nth_data(combo_icons_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));
+ 		g_slist_free(combo_icons_slist);
+ 
diff --git a/polish/gnugadu2/files/patch-src-plugins-gadu_gadu_plugin.c b/polish/gnugadu2/files/patch-src-plugins-gadu_gadu_plugin.c
new file mode 100644
index 000000000000..449ae24aabb0
--- /dev/null
+++ b/polish/gnugadu2/files/patch-src-plugins-gadu_gadu_plugin.c
@@ -0,0 +1,40 @@
+--- src/plugins/gadu_gadu/gadu_gadu_plugin.c.orig	Tue Jan  4 09:51:43 2005
++++ src/plugins/gadu_gadu/gadu_gadu_plugin.c	Fri Jan 28 00:39:28 2005
+@@ -422,6 +422,9 @@
+ 	uint32_t *uins;
+ 	GGaduMsg *msg = NULL;
+ 	gint i, j;
++	GSList *list;
++	GSList *us;
++	gchar *recipients_line = NULL;
+ 
+ 	/* w przypadku bledu/utraty polaczenia postap tak jak w przypadku disconnect */
+ 	if (!session || !(e = gg_watch_fd(session)) || (condition & G_IO_ERR) ||
+@@ -585,9 +588,8 @@
+ 
+ 		}
+ 
+-		GSList *list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
+-		GSList *us = list;
+-		gchar *recipients_line = NULL;
++		list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
++		us = list;
+ 
+ 		while (us)
+ 		{
+@@ -696,6 +698,7 @@
+ 
+ 				if (k)
+ 				{
++					gchar *status = NULL;
+ 					ip_addr.s_addr = n->remote_ip;
+ 					if (inet_ntoa(ip_addr) && (ggadu_strcasecmp(inet_ntoa(ip_addr), "0.0.0.0")))
+ 					{
+@@ -714,7 +717,6 @@
+ 
+ 					/* Zapiszmy sobie zmiane opisu do pliku historii */
+ 
+-					gchar *status = NULL;
+ 					if ((k->status == GG_STATUS_AVAIL) || (k->status == GG_STATUS_AVAIL_DESCR))
+ 						status = g_strdup_printf("avail");
+ 					else if ((k->status == GG_STATUS_BUSY) || (k->status == GG_STATUS_BUSY_DESCR))
diff --git a/polish/gnugadu2/files/patch-src-plugins-ignore-ignore.c b/polish/gnugadu2/files/patch-src-plugins-ignore-ignore.c
new file mode 100644
index 000000000000..8c97021e430b
--- /dev/null
+++ b/polish/gnugadu2/files/patch-src-plugins-ignore-ignore.c
@@ -0,0 +1,30 @@
+--- src/plugins/ignore/ignore.c.orig	Mon Dec 27 10:44:34 2004
++++ src/plugins/ignore/ignore.c	Fri Jan 28 00:41:57 2005
+@@ -102,10 +102,11 @@
+ 				{
+ 				case GGADU_IGNORE_ADD_ID:
+ 					{
++						gchar *ignored_list_prev;
++						gchar *ignored_list_after = NULL;
+ 						GGaduContact *k = g_new0(GGaduContact, 1);
+ 						k->id = g_strdup(kv->value);
+-						gchar *ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
+-						gchar *ignored_list_after = NULL;
++						ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
+ 
+ 						ignored_list_after = ggadu_add_ignored_contact(ignored_list_prev, k);
+ 						if (ignored_list_after)
+@@ -142,10 +143,11 @@
+ 				{
+ 				case GGADU_IGNORE_REMOVE_ID:
+ 					{
++						gchar *ignored_list_prev;
++						gchar *ignored_list_after = NULL;
+ 						GGaduContact *k = g_new0(GGaduContact, 1);
+ 						k->id = g_strdup(kv->value);
+-						gchar *ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
+-						gchar *ignored_list_after = NULL;
++						ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
+ 
+ 						ignored_list_after = ggadu_remove_ignored_contact(ignored_list_prev, k);
+ 						if (ignored_list_after)
diff --git a/polish/gnugadu2/files/patch-src::plugins::GUI::GUI_plugin.c b/polish/gnugadu2/files/patch-src::plugins::GUI::GUI_plugin.c
deleted file mode 100644
index d1218b9d6f1a..000000000000
--- a/polish/gnugadu2/files/patch-src::plugins::GUI::GUI_plugin.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/plugins/GUI/GUI_plugin.c.orig	Fri Jun 11 03:25:33 2004
-+++ src/plugins/GUI/GUI_plugin.c	Wed Jul 21 22:42:19 2004
-@@ -753,6 +753,7 @@
- 	GGaduMsg *msg = signal->data;
- 	gui_protocol *gp = NULL;
- 	gchar *soundfile = NULL;
-+	GtkWidget *window;
- 
- 	if (!signal || !msg)
- 	{
-@@ -816,7 +817,7 @@
- 	        if (msg->message && (soundfile = ggadu_config_var_get(gui_handler, "sound_msg_in")))
- 		        signal_emit_full("main-gui", "sound play file", soundfile, "sound*", NULL);
-             
--			GtkWidget *window = gtk_widget_get_ancestor(session->chat, GTK_TYPE_WINDOW);
-+			window = gtk_widget_get_ancestor(session->chat, GTK_TYPE_WINDOW);
- 		        if (!GTK_WIDGET_VISIBLE(window)) {
- 				if (showwindow) {
- /*				    GtkWidget *input = g_object_get_data(G_OBJECT(session->chat), "input");
diff --git a/polish/gnugadu2/files/patch-src::plugins::gadu_gadu::gadu_gadu_plugin.c b/polish/gnugadu2/files/patch-src::plugins::gadu_gadu::gadu_gadu_plugin.c
deleted file mode 100644
index c35ad40f9995..000000000000
--- a/polish/gnugadu2/files/patch-src::plugins::gadu_gadu::gadu_gadu_plugin.c
+++ /dev/null
@@ -1,140 +0,0 @@
---- src/plugins/gadu_gadu/gadu_gadu_plugin.c.orig	Sat Jun 12 09:04:53 2004
-+++ src/plugins/gadu_gadu/gadu_gadu_plugin.c	Wed Jul 21 23:11:11 2004
-@@ -385,6 +385,10 @@
- 	GGaduMsg *msg = NULL;
- 	gchar *hist_line = NULL;
- 	gint i, j;
-+	GSList *list;
-+	GSList *us;
-+	gchar *line2 = NULL;
-+		
- 
- 	/* w przypadku bledu/utraty polaczenia postap tak jak w przypadku disconnect */
- 	if (!(e = gg_watch_fd(session)) || (condition & G_IO_ERR) ||
-@@ -524,9 +528,8 @@
- 
- 		}
- 		
--		GSList *list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
--		GSList *us = list;
--		gchar *line2 = NULL;
-+		list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
-+		us = list;
- 		
- 		while(us)
- 		{
-@@ -560,6 +563,8 @@
- 				gchar *strIP = NULL;
- 				gchar *id = g_strdup_printf("%d", e->event.notify60[i].uin);
- 				struct in_addr ip_addr;
-+				gchar *status = NULL;
-+				gchar *line;
- 				GGaduContact *k = ggadu_repo_find_value("gadu-gadu", ggadu_repo_key_from_string(id));
- 
- 				if (k)
-@@ -581,7 +586,7 @@
- 					
- 					/* Zapiszmy sobie zmiane opisu do pliku historii */
- 					
--					gchar *status = NULL;
-+					status = NULL;
- 					if((k->status == GG_STATUS_AVAIL)||(k->status == GG_STATUS_AVAIL_DESCR))		status = g_strdup_printf("avail");
- 					else if((k->status == GG_STATUS_BUSY)||(k->status == GG_STATUS_BUSY_DESCR))		status = g_strdup_printf("busy");
- 					else if((k->status == GG_STATUS_INVISIBLE)||(k->status == GG_STATUS_INVISIBLE_DESCR))	status = g_strdup_printf("notavail");
-@@ -592,7 +597,7 @@
- 					/* Format kompatybilny z historią Kadu ;) 			*/
- 					/* Jednak pierw należy skasować [numerek].idx aby uaktualnić ;)	*/
- 
--					gchar *line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick, 
-+					line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick, 
- 							    ((k->ip == NULL) ? "0.0.0.0" : k->ip), (int)time(0), status,
- 							    ((k->status_descr == NULL) ? "" : g_strdup_printf(",%s",k->status_descr)));
- 					ggadu_gg_save_history((gchar *) k->id, line);
-@@ -623,6 +628,8 @@
- 
- 			while (n->uin)
- 			{
-+				gchar *status;
-+				gchar *line;
- 				gchar *id = g_strdup_printf("%d", n->uin);
- 				GGaduContact *k = ggadu_repo_find_value("gadu-gadu", ggadu_repo_key_from_string(id));
- 				struct in_addr ip_addr;
-@@ -647,7 +654,7 @@
- 					
- 					/* Zapiszmy sobie zmiane opisu do pliku historii */
- 					
--					gchar *status = NULL;
-+					status = NULL;
- 					if((k->status == GG_STATUS_AVAIL)||(k->status == GG_STATUS_AVAIL_DESCR))		status = g_strdup_printf("avail");
- 					else if((k->status == GG_STATUS_BUSY)||(k->status == GG_STATUS_BUSY_DESCR))		status = g_strdup_printf("busy");
- 					else if((k->status == GG_STATUS_INVISIBLE)||(k->status == GG_STATUS_INVISIBLE_DESCR))	status = g_strdup_printf("notavail");
-@@ -658,7 +665,7 @@
- 					/* Format kompatybilny z historią Kadu ;) 			*/
- 					/* Jednak pierw należy skasować [numerek].idx aby uaktualnić ;)	*/
- 					
--					gchar *line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick, 
-+					line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick, 
- 							    ((k->ip == NULL) ? "0.0.0.0" : k->ip), (gint)time(0), status,
- 							    ((k->status_descr == NULL) ? "" : g_strdup_printf(",%s",k->status_descr)));
- 					ggadu_gg_save_history((gchar *) k->id, line);
-@@ -674,6 +681,8 @@
- 	case GG_EVENT_STATUS60:
- 	case GG_EVENT_STATUS:
- 		{
-+			gchar *status;
-+			gchar *line;
- 			gchar *id =
- 				g_strdup_printf("%d",
- 						(e->type ==
-@@ -698,7 +707,7 @@
- 			
- 			/* Zapiszmy sobie zmiane opisu do pliku historii */
- 
--			gchar *status = NULL;
-+			status = NULL;
- 			if((k->status == GG_STATUS_AVAIL)||(k->status == GG_STATUS_AVAIL_DESCR))		status = g_strdup_printf("avail");
- 			else if((k->status == GG_STATUS_BUSY)||(k->status == GG_STATUS_BUSY_DESCR))		status = g_strdup_printf("busy");
- 			else if((k->status == GG_STATUS_INVISIBLE)||(k->status == GG_STATUS_INVISIBLE_DESCR))	status = g_strdup_printf("notavail");
-@@ -709,7 +718,7 @@
- 			/* Format kompatybilny z historią Kadu ;) 			*/
- 			/* Jednak pierw należy skasować [numerek].idx aby uaktualnić ;)	*/
- 
--			gchar *line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick, 
-+			line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick, 
- 				    ((k->ip == NULL) ? "0.0.0.0" : k->ip), (gint)time(0), status,
- 				    ((k->status_descr == NULL) ? "" : g_strdup_printf(",%s",k->status_descr)));
- 			ggadu_gg_save_history((gchar *) k->id, line);
-@@ -2275,6 +2284,7 @@
- 					GSList *tmp = msg->recipients;
- 					while (tmp)
- 					{	
-+						gchar *line;
- 						GSList *list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
- 						GSList *us = list;
- 						gchar *line2 = NULL;
-@@ -2288,7 +2298,7 @@
- 						}
- 						
- 						
--						gchar *line =
-+						line =
- 							g_strdup_printf("chatsend,%s,%s,%d,%s\n", msg->id, line2, (gint)time(0), msg->message);
- 						ggadu_gg_save_history((gchar *) tmp->data, line);
- 						g_free(line2);
-@@ -2312,6 +2322,7 @@
- 				}
- 				else if (ggadu_config_var_get(handler, "log"))
- 				{
-+					gchar *line;
- 					GSList *list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
- 					GSList *us = list;
- 					gchar *line2 = NULL;
-@@ -2324,7 +2335,7 @@
- 						us = us->next;
- 					}
- 						
--					gchar *line =
-+					line =
- 						g_strdup_printf("chatsend,%s,%s,%d,%s\n", msg->id, line2, (gint)time(0), msg->message);
- 					ggadu_gg_save_history(msg->id, line);
- 
diff --git a/polish/gnugadu2/pkg-descr b/polish/gnugadu2/pkg-descr
index 7faf27bffa7c..356273c4cc5f 100644
--- a/polish/gnugadu2/pkg-descr
+++ b/polish/gnugadu2/pkg-descr
@@ -1,9 +1,9 @@
-Development GTK2 based version of GaduGadu client for X11/GTK.  
-GaduGadu is an ICQ-like messenger network for the Polish language.
+Gadu-Gadu protocol client for X11/GTK+, instant messenger 
+targeting mainly users of Poland's based propietary IM network.
 
 GnuGadu2 is a complete rewrite featuring a plugin extensible 
-architecture, that opens it to the multiprotocol world. Transport
-plugins exist for Jabber, Tlen.pl, there are sound servers and 
-others.
+architecture, that has opened it to the multiprotocol world. 
+Transport plugins exist for Jabber, Tlen.pl, also for various 
+sound servers and others.
 
-WWW: http://gadu.gnu.pl
+WWW: http://www.gnugadu.org
diff --git a/polish/gnugadu2/pkg-plist b/polish/gnugadu2/pkg-plist
index e61ad2f3909c..40dbaa8e2f1f 100644
--- a/polish/gnugadu2/pkg-plist
+++ b/polish/gnugadu2/pkg-plist
@@ -1,17 +1,37 @@
 bin/gg2
+bin/gghist
 include/gg2_core.h
+lib/gg2/libGUI_plugin.a
 lib/gg2/libGUI_plugin.so
+lib/gg2/libaaway_plugin.a
+lib/gg2/libaaway_plugin.so
+%%DOCKAPP:%%lib/gg2/libdocklet_dockapp_plugin.a
 %%DOCKAPP:%%lib/gg2/libdocklet_dockapp_plugin.so
+%%DOCKLET:%%lib/gg2/libdocklet_system_tray_plugin.a
 %%DOCKLET:%%lib/gg2/libdocklet_system_tray_plugin.so
+lib/gg2/libgadu_gadu_plugin.a
 lib/gg2/libgadu_gadu_plugin.so
+lib/gg2/libhistory_external_plugin.a
+lib/gg2/libhistory_external_plugin.so
+lib/gg2/libignore_main_plugin.a
+lib/gg2/libignore_main_plugin.so
+%%JABBER:%%lib/gg2/libjabber_plugin.a
 %%JABBER:%%lib/gg2/libjabber_plugin.so
+lib/gg2/libsms_plugin.a
 lib/gg2/libsms_plugin.so
+%%ARTS:%%lib/gg2/libsound_arts_plugin.a
 %%ARTS:%%lib/gg2/libsound_arts_plugin.so
+%%ESOUND:%%lib/gg2/libsound_esd_plugin.a
 %%ESOUND:%%lib/gg2/libsound_esd_plugin.so
+lib/gg2/libsound_external_plugin.a
 lib/gg2/libsound_external_plugin.so
-%%OSS:%%lib/gg2/libsound_oss_plugin.so
+lib/gg2/libsound_oss_plugin.a
+lib/gg2/libsound_oss_plugin.so
+%%TLEN:%%lib/gg2/libtlen_plugin.a
 %%TLEN:%%lib/gg2/libtlen_plugin.so
+lib/gg2/libupdate_plugin.a
 lib/gg2/libupdate_plugin.so
+%%XOSD:%%lib/gg2/libxosd_plugin.a
 %%XOSD:%%lib/gg2/libxosd_plugin.so
 lib/libgg2_core.a
 lib/libgg2_core.so
@@ -228,14 +248,13 @@ share/gg2/pixmaps/icons/rozgwiazda/jabber.png
 share/gg2/pixmaps/icons/rozgwiazda/license.txt
 share/gg2/pixmaps/icons/rozgwiazda/sms.png
 share/gg2/pixmaps/icons/rozgwiazda/tlen.png
-share/gg2/pixmaps/icons/tlen-3d/README
-share/gg2/pixmaps/icons/tlen-3d/tlen-away.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-beback.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-chat.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-invisible.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-occupied.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-offline.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-online.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-away.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-beback.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-chat.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-invisible.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-occupied.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-offline.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-online.png
 share/gg2/pixmaps/icq-away.png
 share/gg2/pixmaps/icq-dnd.png
 share/gg2/pixmaps/icq-freechat.png
@@ -245,14 +264,16 @@ share/gg2/pixmaps/icq-occupied.png
 share/gg2/pixmaps/icq-offline.png
 share/gg2/pixmaps/icq-online.png
 share/gg2/pixmaps/icq.png
+share/gg2/pixmaps/jabber-auth-from.png
 share/gg2/pixmaps/jabber-away.png
 share/gg2/pixmaps/jabber-dnd.png
 share/gg2/pixmaps/jabber-error.png
+share/gg2/pixmaps/jabber-noauth.png
 share/gg2/pixmaps/jabber-offline.png
 share/gg2/pixmaps/jabber-online.png
 share/gg2/pixmaps/jabber-xa.png
 share/gg2/pixmaps/jabber.png
-share/gg2/pixmaps/new-msg.png
+share/gg2/pixmaps/new-msg.gif
 share/gg2/pixmaps/offline.png
 share/gg2/pixmaps/online.png
 share/gg2/pixmaps/push-pin.png
@@ -279,8 +300,10 @@ share/gg2/themes/default.theme
 share/gg2/themes/gray2.theme
 share/gg2/themes/green2.theme
 share/gg2/themes/lightblue.theme
+share/gg2/themes/office.theme
 share/gg2/themes/red2.theme
 share/gg2/themes/thinice.theme
+share/gg2/themes/tropic.theme
 share/gg2/themes/vblue2.theme
 share/gg2/themes/vgreen2.theme
 share/gg2/themes/vred2.theme
@@ -290,9 +313,10 @@ share/gg2/themes/white2.theme
 share/locale/nl/LC_MESSAGES/gg2.mo
 share/locale/pl/LC_MESSAGES/gg2.mo
 share/pixmaps/gg2.png
+@unexec rmdir %D/share/pixmaps 2>/dev/null || true
 @dirrm share/gg2/themes
 @dirrm share/gg2/sounds
-@dirrm share/gg2/pixmaps/icons/tlen-3d
+@dirrm share/gg2/pixmaps/icons/tlen-classic
 @dirrm share/gg2/pixmaps/icons/rozgwiazda
 @dirrm share/gg2/pixmaps/icons/modern
 @dirrm share/gg2/pixmaps/icons/ghosts