Changes 2.2.6:

 - internal libgadu now work with gnutls instead openssl library.
 - fixed crash while start.
 - Tlen.pl configuration moved to .gg2/tlen file
 - Then to Everaldo www.everaldo.com for his Jabber icons.
 - close bugs #177,#146,#170,#141,#148
 - fixes of parsing links in chat window
 - and others.

5 files changed, 35 insertions, 27 deletions

diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile
index 344993bbcf4..ad71bc77c83 100644
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/27 13:47:05 adam Exp $
 
-DISTNAME=	gg2-2.2.5
+DISTNAME=	gg2-2.2.6
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ggadu/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://ggadu.sourceforge.net/
diff --git a/chat/gg2/PLIST b/chat/gg2/PLIST
index 6290ae83d32..c049c44d254 100644
--- a/chat/gg2/PLIST
+++ b/chat/gg2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/01/14 08:57:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/05/27 13:47:05 adam Exp $
 bin/gg2
 bin/gghist
 include/gg2_core.h
@@ -177,6 +177,7 @@ share/gg2/pixmaps/icons/bubble/gadu-gadu-offline-descr.png
 share/gg2/pixmaps/icons/bubble/gadu-gadu-offline.png
 share/gg2/pixmaps/icons/bubble/gadu-gadu-online-descr.png
 share/gg2/pixmaps/icons/bubble/gadu-gadu-online.png
+share/gg2/pixmaps/icons/bubble/gadu-gadu.png
 share/gg2/pixmaps/icons/bubble/icon.png
 share/gg2/pixmaps/icons/classic/README
 share/gg2/pixmaps/icons/classic/gadu-gadu-away-descr.png
@@ -187,7 +188,24 @@ share/gg2/pixmaps/icons/classic/gadu-gadu-offline-descr.png
 share/gg2/pixmaps/icons/classic/gadu-gadu-offline.png
 share/gg2/pixmaps/icons/classic/gadu-gadu-online-descr.png
 share/gg2/pixmaps/icons/classic/gadu-gadu-online.png
+share/gg2/pixmaps/icons/classic/gadu-gadu.png
 share/gg2/pixmaps/icons/classic/icon.png
+share/gg2/pixmaps/icons/classic/jabber-auth-from.png
+share/gg2/pixmaps/icons/classic/jabber-away.png
+share/gg2/pixmaps/icons/classic/jabber-dnd.png
+share/gg2/pixmaps/icons/classic/jabber-error.png
+share/gg2/pixmaps/icons/classic/jabber-noauth.png
+share/gg2/pixmaps/icons/classic/jabber-offline.png
+share/gg2/pixmaps/icons/classic/jabber-online.png
+share/gg2/pixmaps/icons/classic/jabber-xa.png
+share/gg2/pixmaps/icons/classic/jabber.png
+share/gg2/pixmaps/icons/classic/tlen-away.png
+share/gg2/pixmaps/icons/classic/tlen-beback.png
+share/gg2/pixmaps/icons/classic/tlen-chat.png
+share/gg2/pixmaps/icons/classic/tlen-invisible.png
+share/gg2/pixmaps/icons/classic/tlen-occupied.png
+share/gg2/pixmaps/icons/classic/tlen-offline.png
+share/gg2/pixmaps/icons/classic/tlen-online.png
 share/gg2/pixmaps/icons/ghosts/README
 share/gg2/pixmaps/icons/ghosts/gadu-gadu-away-descr.png
 share/gg2/pixmaps/icons/ghosts/gadu-gadu-away.png
@@ -197,6 +215,7 @@ share/gg2/pixmaps/icons/ghosts/gadu-gadu-offline-descr.png
 share/gg2/pixmaps/icons/ghosts/gadu-gadu-offline.png
 share/gg2/pixmaps/icons/ghosts/gadu-gadu-online-descr.png
 share/gg2/pixmaps/icons/ghosts/gadu-gadu-online.png
+share/gg2/pixmaps/icons/ghosts/gadu-gadu.png
 share/gg2/pixmaps/icons/ghosts/icon.png
 share/gg2/pixmaps/icons/modern/README
 share/gg2/pixmaps/icons/modern/gadu-gadu-away-descr.png
@@ -207,6 +226,7 @@ share/gg2/pixmaps/icons/modern/gadu-gadu-offline-descr.png
 share/gg2/pixmaps/icons/modern/gadu-gadu-offline.png
 share/gg2/pixmaps/icons/modern/gadu-gadu-online-descr.png
 share/gg2/pixmaps/icons/modern/gadu-gadu-online.png
+share/gg2/pixmaps/icons/modern/gadu-gadu.png
 share/gg2/pixmaps/icons/modern/icon.png
 share/gg2/pixmaps/icons/modern/tlen-away.png
 share/gg2/pixmaps/icons/modern/tlen-beback.png
@@ -224,17 +244,7 @@ share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu-offline.png
 share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu-online-descr.png
 share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu-online.png
 share/gg2/pixmaps/icons/rozgwiazda/icon.png
-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-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
@@ -293,7 +303,6 @@ ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gg2.mo
 share/pixmaps/gg2.png
 @dirrm share/gg2/themes
 @dirrm share/gg2/sounds
-@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
diff --git a/chat/gg2/distinfo b/chat/gg2/distinfo
index 36751ebefa3..6b25906100c 100644
--- a/chat/gg2/distinfo
+++ b/chat/gg2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2005/04/13 16:31:26 rillig Exp $
+$NetBSD: distinfo,v 1.10 2005/05/27 13:47:05 adam Exp $
 
-SHA1 (gg2-2.2.5.tar.bz2) = c6642ae186194618019c3467c8d81eb80f5f0c23
-RMD160 (gg2-2.2.5.tar.bz2) = 3871c13c55caa3647bb9d9fa73165f897d11f55d
-Size (gg2-2.2.5.tar.bz2) = 1087478 bytes
-SHA1 (patch-aa) = 1e27a4b03da73dd0c15efd376fe506ef126580d0
+SHA1 (gg2-2.2.6.tar.gz) = 5142607ab6de127f64c3cf54a271dfae4d434bd6
+RMD160 (gg2-2.2.6.tar.gz) = 75b6185bf560edd3207bbe9d6cd5bb3c37cc0193
+Size (gg2-2.2.6.tar.gz) = 1371439 bytes
+SHA1 (patch-aa) = cf6fa7e1bf79dcaf90a10c4bc20b715cca67142e
 SHA1 (patch-af) = 9e1cc4b53f069e520a165bfed00c8b6692216ce9
-SHA1 (patch-ag) = e98012fda6ca186fecd1fedf0b43a16b0129d5fb
+SHA1 (patch-ag) = d7ddded776a5d61b57eae9a03e63269e22fe8437
 SHA1 (patch-ah) = b52abe3ed2fe478b7b55df78df299c3d7b706086
 SHA1 (patch-ai) = 39cd62d72007ba875dcb09156d53ab8852328eec
 SHA1 (patch-aj) = 0eeb9ec958e48d9d36f4ae078e51196f1fca158e
diff --git a/chat/gg2/patches/patch-aa b/chat/gg2/patches/patch-aa
index 07701c80262..5e1d4605703 100644
--- a/chat/gg2/patches/patch-aa
+++ b/chat/gg2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2005/04/04 08:26:29 adam Exp $
+$NetBSD: patch-aa,v 1.6 2005/05/27 13:47:05 adam Exp $
 
---- lib/Makefile.in.orig	2005-04-01 10:27:37.000000000 +0000
+--- lib/Makefile.in.orig	2005-05-26 14:40:37.000000000 +0000
 +++ lib/Makefile.in
-@@ -341,7 +341,7 @@ libgg2_core_la_SOURCES = \
+@@ -340,7 +340,7 @@ libgg2_core_la_SOURCES = \
  	perl_embed.h 
  
  libgg2_core_la_HEADERS = gg2_core.h
diff --git a/chat/gg2/patches/patch-ag b/chat/gg2/patches/patch-ag
index c2c51d1ff55..f5b194f923b 100644
--- a/chat/gg2/patches/patch-ag
+++ b/chat/gg2/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2005/04/04 08:26:29 adam Exp $
+$NetBSD: patch-ag,v 1.3 2005/05/27 13:47:05 adam Exp $
 
---- src/plugins/jabber/jabber_plugin.c.orig	2005-03-06 23:29:02.000000000 +0000
+--- src/plugins/jabber/jabber_plugin.c.orig	2005-05-20 16:20:12.000000000 +0000
 +++ src/plugins/jabber/jabber_plugin.c
-@@ -1484,9 +1484,10 @@ void start_plugin()
+@@ -1489,9 +1489,10 @@ void start_plugin()
  
  	if (ggadu_config_var_get(jabber_handler, "autoconnect"))
  	{