Update to 4.20.0, provided by Znarf Ainav on tech-pkg:

4.14.0
------

Because of the mistake I made in the previous version, the 'u' letter was
eaten by the RTF parser when processing messages from windows icq clients.
It looked for unicode chars, but ate all 'u' characters it used to found.
Fixed that.

A memory leak problem when checking RSS was fixed.

Gadu-Gadu module used to produce a segfault when it was unable to obtain
a registration token from the server. Now it doesn't crash, though the
impossibility to register a new UIN is still there. The serve simply
doesn't find an appropriate document by the registration URL. Too bad.

Applied a small patch by Paul Chitescu so that it's now possible to start
centericq with all protocols set to offline.

Another type of external event was added. Now you can execute your actions
when someone goes offline. Hope someone finds that useful.

4.20.0
------

PGP encryption support was implemented for the Jabber module. In a nutshell
this means that with a proper setup your communications get a way more secure.
GPGME library is needed to build the PGP support.

Fixed the RTF parser that takes charge when a message from a Windows ICQ
client is received. One problem was that it used to treat backspace characters
wrong sometimes. Another problem with utf-16 was fixed with a patch submitted
by Vadim Nosovsky.

After ICQ dual login detection centericq used to try re-connecting, though it
wasn't supposed to. Fixed.

During a long time noone reported me the bug related to libicq2000's header
files getting installed each time "make install" was run for centericq. Finally
Wolfram Schlich noted this one, so I fixed it.

Logging on Yahoo! didn't work on Sun Sparc machines. Fixed that. That might
also revive Gadu-Gadu on bigendian architectures.

A couple of interface related bugs were fixed, such as a mistake in the group
organization dialog as well as not clearing pending messages for contacts in
non-chat communication mode.

5 files changed, 35 insertions, 41 deletions

diff --git a/chat/centericq/DESCR b/chat/centericq/DESCR
index 9115df948c7..53b9c11a83e 100644
--- a/chat/centericq/DESCR
+++ b/chat/centericq/DESCR
@@ -1,6 +1,8 @@
-Text mode menu- and window-driven IM interface that supports the ICQ2000,
-Yahoo!, and MSN protocols. It allows you to send, receive, and forward
-messages, URLs, SMSes (both through the ICQ server and e-mail gateways
-supported by Mirabilis), contacts, and email express messages. It also
-lets you set your own and fetch others' away messages, and define external
-handlers for incoming events.
+Text mode menu- and window-driven IM interface that supports the
+ICQ2000, Yahoo!, AIM, IRC, MSN, Gadu-Gadu and Jabber protocols. It
+allows you to send, receive, and forward messages, URLs, SMSes
+(both through the ICQ server and e-mail gateways supported by
+Mirabilis), contacts, and email express messages. It also lets you
+set your own and fetch others' away messages, and define external
+handlers for incoming events. Apart from IM it supports LiveJournal
+management and receiving RSS feeds.
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index 8f75e77ad86..9bf77e8b0d8 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2005/02/21 20:26:09 hubertf Exp $
+# $NetBSD: Makefile,v 1.48 2005/04/05 12:44:17 wiz Exp $
 #
 
-DISTNAME=	centericq-4.13.0
-PKGREVISION=	1
+DISTNAME=	centericq-4.20.0
 CATEGORIES=	chat
 MASTER_SITES=	http://konst.org.ua/download/ \
 		http://centericq.de/archive/source/releases/
@@ -10,7 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://konst.org.ua/eng/software/centericq/info.html
-COMMENT=	Instant Messenger interface for ICQ2000, Yahoo!, MSN and Jabber
+COMMENT=	Instant Messenger interface supporting many protocols
 
 USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
@@ -19,6 +18,7 @@ USE_LANGUAGES=		c c++
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl --with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=      	--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
 LIBS=			${LDFLAGS}
 
 USE_PERL5=		run
@@ -26,6 +26,7 @@ REPLACE_PERL=		misc/cicqconv
 
 INCOMPAT_CURSES+=	NetBSD-1.[45]*-* NetBSD-1.6-* NetBSD-1.6.[1-9]-*
 INCOMPAT_CURSES+=	NetBSD-1.6_*-* NetBSD-1.6.[1-9]_*-* NetBSD-1.6[A-T]-*
+INCOMPAT_CURSES+=	NetBSD-2.* NetBSD-3.*	# see PR 29060
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -46,6 +47,7 @@ GCC_REQD+=    3.0			# see PR 29185
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
+.include "../../security/gpgme/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 
diff --git a/chat/centericq/PLIST b/chat/centericq/PLIST
index dcc3ec87b21..dcd65ab381c 100644
--- a/chat/centericq/PLIST
+++ b/chat/centericq/PLIST
@@ -1,25 +1,13 @@
-@comment $NetBSD: PLIST,v 1.6 2004/07/24 00:16:50 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/04/05 12:44:17 wiz Exp $
 bin/centericq
 bin/cicqconv
 bin/cicqsync
-include/libicq2000/libicq2000/Client.h
-include/libicq2000/libicq2000/Contact.h
-include/libicq2000/libicq2000/ContactList.h
-include/libicq2000/libicq2000/ContactTree.h
-include/libicq2000/libicq2000/Translator.h
-include/libicq2000/libicq2000/constants.h
-include/libicq2000/libicq2000/events.h
-include/libicq2000/libicq2000/exceptions.h
-include/libicq2000/libicq2000/ref_ptr.h
-include/libicq2000/libicq2000/sigslot.h
-include/libicq2000/libicq2000/time_extra.h
-include/libicq2000/libicq2000/userinfoconstants.h
-include/libicq2000/libicq2000/version.h
 man/man1/centericq.1
 man/man1/cicqconv.1
 man/man1/cicqsync.1
 share/centericq/email.wav
 share/centericq/msg.wav
+share/centericq/offline.wav
 share/centericq/online.wav
 share/centericq/sms.wav
 share/centericq/url.wav
@@ -40,5 +28,3 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/centericq.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/centericq.mo
 ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/centericq.mo
 @dirrm share/centericq
-@dirrm include/libicq2000/libicq2000
-@dirrm include/libicq2000
diff --git a/chat/centericq/distinfo b/chat/centericq/distinfo
index e6cb25ffca1..ef5ed2ffb2f 100644
--- a/chat/centericq/distinfo
+++ b/chat/centericq/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2005/03/10 14:13:24 tv Exp $
+$NetBSD: distinfo,v 1.15 2005/04/05 12:44:17 wiz Exp $
 
-SHA1 (centericq-4.13.0.tar.bz2) = e8d276c689dd2284ed82e4655fe8cbf843e545d6
-RMD160 (centericq-4.13.0.tar.bz2) = bc0f14bffce4777a233508694e0b10391337b320
-Size (centericq-4.13.0.tar.bz2) = 1251118 bytes
-SHA1 (patch-aa) = b3e610a1a3b30a716215889b9f51c6de7e78fb22
+SHA1 (centericq-4.20.0.tar.bz2) = 14b37c5257039853f0a1b948c7eaa49581a5913c
+RMD160 (centericq-4.20.0.tar.bz2) = 7f17cd87aa4b98269fa65173b3e6317143c7c8ca
+Size (centericq-4.20.0.tar.bz2) = 1287040 bytes
+SHA1 (patch-aa) = 47dc554bb923e8fe3c5aeb3792166dc3fea1b46a
 SHA1 (patch-ab) = 6d9beb28024666bbfef2e95cab648d7058f8136c
 SHA1 (patch-ac) = 74ae25e19bf5d250a407a937bf78405b38cc86da
 SHA1 (patch-ad) = be8ba5c952bf560b0758c97ba81c4faef04ffe49
diff --git a/chat/centericq/patches/patch-aa b/chat/centericq/patches/patch-aa
index 47ccab6e2ac..a3c1e73b45f 100644
--- a/chat/centericq/patches/patch-aa
+++ b/chat/centericq/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2004/05/07 23:18:50 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2005/04/05 12:44:17 wiz Exp $
 
---- src/icqconf.cc.orig	2003-10-26 11:46:52.000000000 +0100
+--- src/icqconf.cc.orig	2005-01-27 00:52:47.000000000 +0100
 +++ src/icqconf.cc
 @@ -27,7 +27,11 @@
  #include <dirent.h>
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.2 2004/05/07 23:18:50 hubertf Exp $
  #include <sys/statvfs.h>
  #endif
  
-@@ -427,11 +431,11 @@ void icqconf::loadsounds() {
+@@ -644,13 +648,13 @@ void icqconf::loadsounds() {
  
  	    switch(rs) {
  		case rscard:
@@ -23,16 +23,20 @@ $NetBSD: patch-aa,v 1.2 2004/05/07 23:18:50 hubertf Exp $
 -		    fo << "*\turl\tplay " << SHARE_DIR << "/url.wav" << endl;
 -		    fo << "*\temail\tplay " << SHARE_DIR << "/email.wav" << endl;
 -		    fo << "*\tonline\tplay " << SHARE_DIR << "/online.wav" << endl;
+-		    fo << "*\toffline\tplay " << SHARE_DIR << "/offline.wav" << endl;
 -		    fo << "*\tsms\tplay " << SHARE_DIR << "/sms.wav" << endl;
-+		    fo << "*\tmsg\t" AUDIO_PLAYER " " << SHARE_DIR << "/msg.wav" << endl;
-+		    fo << "*\turl\t" AUDIO_PLAYER " " << SHARE_DIR << "/url.wav" << endl;
-+		    fo << "*\temail\t" AUDIO_PLAYER " " << SHARE_DIR << "/email.wav" << endl;
-+		    fo << "*\tonline\t" AUDIO_PLAYER " " << SHARE_DIR << "/online.wav" << endl;
-+		    fo << "*\tsms\t" AUDIO_PLAYER " " << SHARE_DIR << "/sms.wav" << endl;
- 		    break;
+-		    break;
++                   fo << "*\tmsg\t" AUDIO_PLAYER " " << SHARE_DIR << "/msg.wav" << endl;
++                   fo << "*\turl\t" AUDIO_PLAYER " " << SHARE_DIR << "/url.wav" << endl;
++                   fo << "*\temail\t" AUDIO_PLAYER " " << SHARE_DIR << "/email.wav" << endl;
++                   fo << "*\tonline\t" AUDIO_PLAYER " " << SHARE_DIR << "/online.wav" << endl;
++                   fo << "*\toffline\t" AUDIO_PLAYER << SHARE_DIR << "/offline.wav" << endl;
++                   fo << "*\tsms\t" AUDIO_PLAYER " " << SHARE_DIR << "/sms.wav" << endl;
++		   break;
  
  		case rsspeaker:
-@@ -1126,7 +1130,7 @@ unsigned int icqconf::gethttpproxyport()
+ 		    fo << "*\tmsg\t!spk1" << endl;
+@@ -1433,7 +1437,7 @@ string icqconf::gethttpproxypasswd() con
  void icqconf::checkdiskspace() {
      fenoughdiskspace = true;