(pkgsrc)

 - remove patches/patch-ad. #include <utmp.h> does not exist any more.
(upstream)
 - Update 4.22.9 to 4.22.10

2010-10-26  Roger  <roger@jikos.cz>
	Disable standard printf() redefinition in yahoo_util.h Should fix #165

2010-10-23  Boris Petersen  <transacid@gmail.com>
	Fix for CVE-2009-3720 in libjabber's xml parser

2010-10-19  Roger  <roger@jikos.cz>
	Updated po files
	Merge branch 'mob' of git+ssh://repo.or.cz:22/srv/git/centerim into mob
	Yahoo - disable conference and file transfer support (it doesn't work anyway)
	Propper authorization and buzz events

2010-10-19  Boris Petersen  <transacid@gmail.com>
	updated po files

2010-10-19  Roger  <roger@jikos.cz>
	Yahoo - add buddy authentication

2010-10-11  Roger  <roger@jikos.cz>
	Add missing initialization to get rid of some valgrind warnings

2010-10-07  Boris Petersen  <transacid@gmail.com>
	updated po files

2010-10-07  Roger  <roger@jikos.cz>
	Yahoo - implement missing callback stubs

2010-10-05  Boris Petersen  <transacid@gmail.com>
	updated po files

2010-10-05  Roger  <roger@jikos.cz>
	Yahoo - implement missing callbacks

2010-10-04  Roger  <roger@jikos.cz>
	fix GNUTLS connection

2010-10-02  Roger  <roger@jikos.cz>
	connwrap - initialize gnutls session in cw_connect
	connwrap - don't deinit gnutls session in cw_nb_connect on error, it's done in delsock

2010-09-16  Roger  <roger@jikos.cz>
	Add missing sources to libyahoo2 makefile

2010-09-16  Boris Petersen  <transacid@gmail.com>
	updated po files
	ignore .version file

2010-09-16  Roger  <roger@jikos.cz>
	Port Yahoo to new libyahoo2-1.0.1
	Disables file transfer (at least for now)

	Fix SSL context leak in connwrap

2010-08-27  Boris Petersen  <transacid@gmail.com>
	Added gettext-devel test to autogen.sh

2010-08-27  Sven Putteneers  <sven@tuxera.be>
	display received time if different from sent time

	Added script to extract a part of a chatlog history and pretty-print it.
	Run without parameters for usage info.

2010-07-31  Boris Petersen  <transacid@gmail.com>
	adding new script for history formating.
	initial script by Ilya Sukhanov <ilya@sukhanov.net>

2010-06-19  Roger  <roger@lv.(none)>
	Add missing initialization to perm/deny SNAC and don't overwrite its id in SBL parsing

2010-04-24  Boris Petersen  <transacid@gmail.com>
	Merge git-version-gen with gnulib

2010-02-25  Damyan Yordanov  <damyan@web.de>
	bulgarian translation updated

2010-02-25  Boris Petersen  <transacid@gmail.com>
	updated po files

2010-02-21  Boris Petersen  <transacid@gmail.com>
	refresh index before checking for dirty versions

2010-02-21  Damyan Yordanov  <damyan@web.de>
	bulgarian translation updated

2010-02-18  Lubomir Rintel  <lkundrak@v3.sk>
	Use RAND_add() with nss_compat_openssl
	It does not provide RAND_seed().

2010-02-18  Boris Petersen  <transacid@gmail.com>
	updated po files

2010-02-17  Roger  <roger@lv.(none)>
	Better jabber presence handling

2010-02-05  Boris Petersen  <transacid@gmail.com>
	Merge branch 'versioning' into mob

2010-02-05 Ahmed El-Mahmoudy  <aelmahmoudy@sabily.org>
	Check for FriBidi using pkg-config
	New upstream releases of FriBidi don't provide fribidi-config anymore, so
	using pkg-config instead to check for FriBidi.

2010-01-31  Boris Petersen  <transacid@gmail.com>
	new packaging friendlier versioning
	This basically omits the 4 hash digits at the end of the version string.
	so e.g.:
	centerim-4.22.9.12-3be3.tar.gz
	will end up
	centerim-4.22.9.12.tar.gz
	This makes it easier to package mobshot in gentoo for example.

	Updated po files

2010-01-29  Hakan Kvist  <hagar@df.lth.se>
	Fixed compiler warnings in kkiproc.cc
	Removed unused function in kkiproc.cc and fixed
	compilewarnings regarding xprintf.

	stringstream << should be used instead of sprintf,
	and cout << instead of printf.

	Beacause:
	int64_t foo = 0xffffffffffffffff;
	printf (%lx, foo);

	printf will behave as expected on a 64 bit platform,
	but not on a 32 bit platform (only ffffffff will be printed).

2010-01-28  Hakan Kvist  <hagar@df.lth.se>
	Cleanup of "extra protection" for ~/.centerim directory.
	Reverted some parts of the commits:
	e0ab4eeb52cdba438aa2834c4223881ab006b854
	deb0cbaa7c385d2656229ac366071c090c55f597

	See the discussion here:
	http://centerim.org/pipermail/centerim-devel/2009-June/000678.html

	If the ~/.centerim directory got the proper protection, then there
	is no need for bloating the code with a lot of extra verifications.
	No one else than the owner can access the files in ~/centerim
	anyway.

	Removal of unused variables
	Removed a couple of unused variables.
	There is still a lot to do if we want to be able to use -Wall for detecting
	real errors (currently there are too many warnings in the output, so -Wall isn't
	really useful).

	Ncurses RTFM. remove ugly prototypes for FreeBSD and OSX
	When reading the ncurses man page you find that
	_XOPEN_SOURCE_EXTENDED must be defined when using
	wide character functions when including ncurses.h.

2010-01-26  Hakan Kvist  <hagar@df.lth.se>
	Try to fix FreeBSD ncurses compile errors.
	Tested on Ubuntu 9.04 and FreeBSD 7.2.

	Try to fix FreeBSD ncurses compile errors.
	Tested on Ubuntu 9.04 and FreeBSD 7.2.

	Try to fix FreeBSD ncurses compile errors.

2010-01-25  Hakan Kvist  <hagar@df.lth.se>
	configure: check for ncurses/ncursesw. Only curses is not enough.
	Some platforms (i.e Solaris 11), still ships ancient curses.
	However centerim requires ncurses in order to compile.
	Adapted configure.ac to only check for ncurses(w) instead of (n)curses(w).

	Cleaned up #ifdefs in conscommon.h

2010-01-19  Hakan Kvist  <hagar@df.lth.se>
	Fixed compiler error with FreeBSD. Also fixed link error against curseslib.
	FreeBSD do not want <utmp.h> to be included. However utmp is only used in linux,
	so we do not need to include utmp.h for non linux systems.

	Also bug in configure script was fixed.
	The curses-lib was not properly included in the $LIBS-variable in the
	configure.ac file.

2010-01-19  Boris Petersen  <transacid@gmail.com>
	Better check for ncurses/ncursesw
	With many thanks to the autoconf archive for the macro
	and Stéphane "kjir" Bisinger for the pointers and hints ;)

2009-12-14  Boris Petersen  <transacid@gmail.com>
	Updating Changelog for 4.22.9

2009-12-13  Boris Petersen  <transacid@gmail.com>
	New taging model.
	To be up to date with gnulib's git-version-gen.
	WARNING: This breaks compatibility with non v* tags.
	For us that means everything before 4.22.9 won't work
	anymore.

4 files changed, 13 insertions, 25 deletions

diff --git a/chat/centerim/Makefile b/chat/centerim/Makefile
index b780abaf17d..0d396829aee 100644
--- a/chat/centerim/Makefile
+++ b/chat/centerim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2014/05/29 23:35:17 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2014/11/21 12:02:02 mef Exp $
 #
 
-DISTNAME=	centerim-4.22.9
-PKGREVISION=	13
+DISTNAME=	centerim-4.22.10
 CATEGORIES=	chat
 MASTER_SITES=	http://www.centerim.org/download/releases/ \
 		http://transacid.de/centerim/releases/
@@ -13,15 +12,17 @@ COMMENT=	Instant Messenger interface supporting many protocols
 LICENSE=	gnu-gpl-v2
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake perl:run
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl --with-openssl=${SSLBASE:Q}
 LIBS+=			${LDFLAGS}
 
-REPLACE_PERL=		misc/cimconv
+REPLACE_PERL=		misc/cimextracthistory.pl
+REPLACE_PERL+=		misc/cimconv
 REPLACE_PYTHON+=	misc/CenterIMLog2HTML.py
+REPLACE_AWK+=		misc/cimformathistory
 
 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]-*
diff --git a/chat/centerim/PLIST b/chat/centerim/PLIST
index 21ec83cd5d9..dc7e4f9e4ac 100644
--- a/chat/centerim/PLIST
+++ b/chat/centerim/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2009/12/15 08:29:35 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/11/21 12:02:02 mef Exp $
 bin/CenterIMLog2HTML.py
 bin/centerim
 bin/cimconv
+bin/cimextracthistory.pl
+bin/cimformathistory
 man/man1/centerim.1
 man/man1/cimconv.1
 share/centerim/email.wav
diff --git a/chat/centerim/distinfo b/chat/centerim/distinfo
index 655e568620c..42a0d52cc28 100644
--- a/chat/centerim/distinfo
+++ b/chat/centerim/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.7 2013/05/06 15:04:54 joerg Exp $
+$NetBSD: distinfo,v 1.8 2014/11/21 12:02:02 mef Exp $
 
-SHA1 (centerim-4.22.9.tar.gz) = ebe9f4ee2064a2fa10f1084ce26083ccd295673e
-RMD160 (centerim-4.22.9.tar.gz) = 253007e466a211ec740f7843538e4f686ab95cad
-Size (centerim-4.22.9.tar.gz) = 2252262 bytes
+SHA1 (centerim-4.22.10.tar.gz) = 46fbac7a55f33b0d4f42568cca21ed83770650e5
+RMD160 (centerim-4.22.10.tar.gz) = 2514c871388edb98b4a8957f965ccee3450b968f
+Size (centerim-4.22.10.tar.gz) = 2287832 bytes
 SHA1 (patch-aa) = 47ddb8568aa36255ad20b71d999284f023726980
 SHA1 (patch-ac) = 4ef992ed632a57e921661b1b0054beff0c0aa587
-SHA1 (patch-ad) = bfe19ca98facfbb23a87dd28a176980fb4e986de
 SHA1 (patch-av) = 05758183016fb1bb297c9c3d2c0606e6a66f9901
 SHA1 (patch-bb) = 7312d496cdde7f619eff6bfef6025fe9be14529d
 SHA1 (patch-libicq2000_libicq2000_sigslot.h) = a812915ad5b329a6c82ff90835d26f73552eeebb
diff --git a/chat/centerim/patches/patch-ad b/chat/centerim/patches/patch-ad
deleted file mode 100644
index db7afd11cd0..00000000000
--- a/chat/centerim/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
-
---- kksystr/include/kkiproc.h.orig	Tue Jul  9 13:07:29 2002
-+++ kksystr/include/kkiproc.h
-@@ -9,7 +9,9 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#ifdef __linux__
- #include <utmp.h>
-+#endif
- #include <string.h>
- #include <ctype.h>
-