Update to 4.22.9. Note that 4.22.8 contains a security fix.

    * 2009-12-14  CenterIM 4.22.9 released
      This release fixes the issues with connection to the MSN
      protocol.

    * 2009-08-09 CenterIM 4.22.8 released
      This release fixes the issues with connection to the Yahoo
      messenger protocol as well as a Security bug in the gadugadu
      library CVE-2008-4776.

    * 2009-06-24 Yahoo! protocol change
      CenterIM has updated support for new version and YIM should
      work again - try latest mobshot

    * 2009-02-22 Centerim 4.22.7 has been released
      This release fixes the AIM regression from 4.22.6. Also
      introduces Atom feed support and much more. See the Changelog
      for more details.

    * 2008-10-26 Centerim 4.22.6 has been released

13 files changed, 35 insertions, 210 deletions

diff --git a/chat/centerim/Makefile b/chat/centerim/Makefile
index 3558b195ec7..70f9129aec2 100644
--- a/chat/centerim/Makefile
+++ b/chat/centerim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/08/26 19:57:15 sno Exp $
+# $NetBSD: Makefile,v 1.9 2009/12/15 08:29:35 jnemeth Exp $
 #
 
-DISTNAME=	centerim-4.22.5
-PKGREVISION=	1
+DISTNAME=	centerim-4.22.9
 CATEGORIES=	chat
 MASTER_SITES=	http://www.centerim.org/download/releases/ \
 		http://transacid.de/centerim/releases/
@@ -10,6 +9,7 @@ MASTER_SITES=	http://www.centerim.org/download/releases/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.centerim.org/
 COMMENT=	Instant Messenger interface supporting many protocols
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -60,7 +60,7 @@ CONFIGURE_ENV+=		ac_cv_lib_iconv_iconv=yes
 .endif
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/centerim.1 ${DESTDIR:Q}${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_MAN} ${WRKSRC}/centerim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/chat/centerim/PLIST b/chat/centerim/PLIST
index 5ad2d2ffbc5..21ec83cd5d9 100644
--- a/chat/centerim/PLIST
+++ b/chat/centerim/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:37:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/12/15 08:29:35 jnemeth Exp $
+bin/CenterIMLog2HTML.py
 bin/centerim
 bin/cimconv
 man/man1/centerim.1
diff --git a/chat/centerim/distinfo b/chat/centerim/distinfo
index f16d46cda78..b67ce1bed69 100644
--- a/chat/centerim/distinfo
+++ b/chat/centerim/distinfo
@@ -1,18 +1,10 @@
-$NetBSD: distinfo,v 1.3 2008/05/13 15:15:51 obache Exp $
+$NetBSD: distinfo,v 1.4 2009/12/15 08:29:35 jnemeth Exp $
 
-SHA1 (centerim-4.22.5.tar.gz) = 422c368064f47886585720c1c639515acff21ae9
-RMD160 (centerim-4.22.5.tar.gz) = 94ade501f8ba46ff24bf4b3cc283533924c3e2f4
-Size (centerim-4.22.5.tar.gz) = 2803217 bytes
-SHA1 (patch-aa) = 6fb3a3dc309b32be177f3e21a1dc5dd43ddbf7e5
+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 (patch-aa) = 47ddb8568aa36255ad20b71d999284f023726980
 SHA1 (patch-ac) = 4ef992ed632a57e921661b1b0054beff0c0aa587
 SHA1 (patch-ad) = bfe19ca98facfbb23a87dd28a176980fb4e986de
-SHA1 (patch-al) = d0c627ffc4ec2a7d179367dd2ddbbfd5ba52a377
-SHA1 (patch-am) = 942bab1a28fd79a40ac824e58855af35fb139141
-SHA1 (patch-an) = ec94c04118e6395b7ef14c9231255f34092acb95
-SHA1 (patch-ao) = ce9585139b7390884fcbbb92bcd9d107fc5b8a8b
-SHA1 (patch-ap) = b2aa04db28b38332d00b1cdb22887e2985edea59
-SHA1 (patch-aq) = 03be56591d3c925a6ffa48a1b87eb61a582f25c6
-SHA1 (patch-ar) = c74e757e3ef6bf1f6bc9575955f5b8f73ac4b51d
-SHA1 (patch-as) = b74310eb515c425cc98528f2b0384652370cef18
 SHA1 (patch-av) = 05758183016fb1bb297c9c3d2c0606e6a66f9901
-SHA1 (patch-bb) = 9fa08e7313967f3cc8c1e2d9d05d124f62f4dd58
+SHA1 (patch-bb) = 7312d496cdde7f619eff6bfef6025fe9be14529d
diff --git a/chat/centerim/patches/patch-aa b/chat/centerim/patches/patch-aa
index 421dba70848..981b0fda3e3 100644
--- a/chat/centerim/patches/patch-aa
+++ b/chat/centerim/patches/patch-aa
@@ -1,30 +1,30 @@
-$NetBSD: patch-aa,v 1.2 2008/05/13 15:15:51 obache Exp $
+$NetBSD: patch-aa,v 1.3 2009/12/15 08:29:35 jnemeth Exp $
 
---- src/icqconf.cc.orig	2008-04-08 17:51:09.000000000 +0000
+--- src/icqconf.cc.orig	2009-08-09 06:41:55.000000000 -0700
 +++ src/icqconf.cc
-@@ -27,7 +27,11 @@
- #include <dirent.h>
+@@ -28,7 +28,11 @@
  #include <fstream>
  
--#if defined(__sun__) || defined(__NetBSD__)
+ 
+-#if defined(__sun__) || defined(__NetBSD__) || defined(__sgi__)
 +#ifdef __NetBSD__
 +/* Find out about __NetBSD_Version__ */
 +#  include <sys/param.h>
 +#endif
-+#if defined(__sun) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))
++#if defined(__sun) || defined(__sgi) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))
  #include <sys/statvfs.h>
  #endif
  
-@@ -797,12 +801,12 @@ void icqconf::loadsounds() {
+@@ -920,12 +924,12 @@ void icqconf::loadsounds() {
  
  	    switch(rs) {
  		case rscard:
--		    fo << "*\tmsg\tplay " << SHARE_DIR << "/msg.wav" << endl;
--		    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\taplay " << SHARE_DIR << "/msg.wav" << endl;
+-		    fo << "*\turl\taplay " << SHARE_DIR << "/url.wav" << endl;
+-		    fo << "*\temail\taplay " << SHARE_DIR << "/email.wav" << endl;
+-		    fo << "*\tonline\taplay " << SHARE_DIR << "/online.wav" << endl;
+-		    fo << "*\toffline\taplay " << SHARE_DIR << "/offline.wav" << endl;
+-		    fo << "*\tsms\taplay " << 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;
@@ -34,12 +34,12 @@ $NetBSD: patch-aa,v 1.2 2008/05/13 15:15:51 obache Exp $
  		    break;
  
  		case rsspeaker:
-@@ -1735,7 +1739,7 @@ string icqconf::gethttpproxypasswd() con
+@@ -1870,7 +1874,7 @@ string icqconf::gethttpproxypasswd() con
  void icqconf::checkdiskspace() {
      fenoughdiskspace = true;
  
--#if !(defined(__sun__) || defined(__NetBSD__))
-+#if !(defined(__sun) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)))
+-#if !(defined(__sun__) || defined(__NetBSD__) || defined(__sgi__))
++#if !(defined(__sun) || defined(__sgi) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)))
      struct statfs st;
-     if(!statfs(conf.getdirname().c_str(), &st)) {
+     if(!statfs(conf->getdirname().c_str(), &st)) {
  #else
diff --git a/chat/centerim/patches/patch-al b/chat/centerim/patches/patch-al
deleted file mode 100644
index 9336fae2987..00000000000
--- a/chat/centerim/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
-
---- connwrap/configure.orig	2007-06-13 15:45:08.000000000 -0700
-+++ connwrap/configure
-@@ -1045,11 +1045,11 @@ Try \`$0 --help' for more information." 
-     export $ac_envvar ;;
- 
-   *)
--    # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
--    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+#    # FIXME: should be removed in autoconf 3.0.
-+#    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+#    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+#      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+#    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-   esac
diff --git a/chat/centerim/patches/patch-am b/chat/centerim/patches/patch-am
deleted file mode 100644
index a5386f52ded..00000000000
--- a/chat/centerim/patches/patch-am
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
-
---- kkconsui/configure.orig	2007-06-13 15:45:11.000000000 -0700
-+++ kkconsui/configure
-@@ -1090,11 +1090,11 @@ Try \`$0 --help' for more information." 
-     export $ac_envvar ;;
- 
-   *)
--    # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
--    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+#    # FIXME: should be removed in autoconf 3.0.
-+#    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+#    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+#      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+#    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-   esac
diff --git a/chat/centerim/patches/patch-an b/chat/centerim/patches/patch-an
deleted file mode 100644
index 5e5c0c1216d..00000000000
--- a/chat/centerim/patches/patch-an
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-an,v 1.2 2008/05/13 15:15:51 obache Exp $
-
---- kkstrtext/configure.orig	2008-04-08 17:51:39.000000000 +0000
-+++ kkstrtext/configure
-@@ -1140,11 +1140,11 @@ Try \`$0 --help' for more information." 
-     export $ac_envvar ;;
- 
-   *)
--    # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
--    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+#    # FIXME: should be removed in autoconf 3.0.
-+#    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+#    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+#      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+#    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-   esac
diff --git a/chat/centerim/patches/patch-ao b/chat/centerim/patches/patch-ao
deleted file mode 100644
index 0a5a5c24725..00000000000
--- a/chat/centerim/patches/patch-ao
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
-
---- kksystr/configure.orig	2007-06-13 15:44:20.000000000 -0700
-+++ kksystr/configure
-@@ -1082,11 +1082,11 @@ Try \`$0 --help' for more information." 
-     export $ac_envvar ;;
- 
-   *)
--    # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
--    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+#    # FIXME: should be removed in autoconf 3.0.
-+#    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+#    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+#      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+#    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-   esac
diff --git a/chat/centerim/patches/patch-ap b/chat/centerim/patches/patch-ap
deleted file mode 100644
index 417a12782e6..00000000000
--- a/chat/centerim/patches/patch-ap
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
-
---- libicq2000/configure.orig	2007-06-13 15:45:05.000000000 -0700
-+++ libicq2000/configure
-@@ -1084,11 +1084,11 @@ Try \`$0 --help' for more information." 
-     export $ac_envvar ;;
- 
-   *)
--    # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
--    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+#    # FIXME: should be removed in autoconf 3.0.
-+#    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+#    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+#      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+#    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-   esac
diff --git a/chat/centerim/patches/patch-aq b/chat/centerim/patches/patch-aq
deleted file mode 100644
index f23f3bfce00..00000000000
--- a/chat/centerim/patches/patch-aq
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aq,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
-
---- libjabber/configure.orig	2007-06-13 15:44:16.000000000 -0700
-+++ libjabber/configure
-@@ -1044,11 +1044,11 @@ Try \`$0 --help' for more information." 
-     export $ac_envvar ;;
- 
-   *)
--    # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
--    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+#    # FIXME: should be removed in autoconf 3.0.
-+#    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+#    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+#      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+#    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-   esac
diff --git a/chat/centerim/patches/patch-ar b/chat/centerim/patches/patch-ar
deleted file mode 100644
index 90e7b708a69..00000000000
--- a/chat/centerim/patches/patch-ar
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
-
---- libmsn/configure.orig	2007-06-13 15:45:14.000000000 -0700
-+++ libmsn/configure
-@@ -1087,11 +1087,11 @@ Try \`$0 --help' for more information." 
-     export $ac_envvar ;;
- 
-   *)
--    # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
--    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+#    # FIXME: should be removed in autoconf 3.0.
-+#    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+#    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+#      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+#    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-   esac
diff --git a/chat/centerim/patches/patch-as b/chat/centerim/patches/patch-as
deleted file mode 100644
index 66ed9dee2f5..00000000000
--- a/chat/centerim/patches/patch-as
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
-
---- libyahoo2/configure.orig	2007-06-13 15:44:24.000000000 -0700
-+++ libyahoo2/configure
-@@ -1084,11 +1084,11 @@ Try \`$0 --help' for more information." 
-     export $ac_envvar ;;
- 
-   *)
--    # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
--    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+#    # FIXME: should be removed in autoconf 3.0.
-+#    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+#    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+#      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+#    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-   esac
diff --git a/chat/centerim/patches/patch-bb b/chat/centerim/patches/patch-bb
index 7ebcea48c7f..72001b47770 100644
--- a/chat/centerim/patches/patch-bb
+++ b/chat/centerim/patches/patch-bb
@@ -1,13 +1,13 @@
-$NetBSD: patch-bb,v 1.1 2008/05/13 15:15:51 obache Exp $
+$NetBSD: patch-bb,v 1.2 2009/12/15 08:29:35 jnemeth Exp $
 
---- src/Makefile.in.orig	2008-04-08 17:51:30.000000000 +0000
+--- src/Makefile.in.orig	2009-08-09 06:42:12.000000000 -0700
 +++ src/Makefile.in
-@@ -348,7 +348,7 @@ AUTOMAKE_OPTIONS = foreign
+@@ -360,7 +360,7 @@ AUTOMAKE_OPTIONS = foreign
  
  # regenerate git-version.h if its content differs from the output of
  # git-version-gen
--g_get_cur := sed -ne "s/^\#[ \x09]*define[ \x09]\+GIT_VERSION[ \x09]\+\"\([0-9]\+.*\)\"/\1/p" \
-+g_get_cur := sed -ne "s/^\#[ 	]*define[ 	][ 	]*GIT_VERSION[ 	][ 	]*\"\([0-9].*\)\"/\1/p" \
+-g_get_cur = sed -ne "s/^\#[ \x09]*define[ \x09]\+GIT_VERSION[ \x09]\+\"\([0-9]\+.*\)\"/\1/p" \
++g_get_cur = sed -ne "s/^\#[ 	]*define[ 	][ 	]*GIT_VERSION[ 	][ 	]*\"\([0-9].*\)\"/\1/p" \
               2>/dev/null < git-version.h | tr -d '\012'
  
- g_subst_f := sed -e "s/@GIT_VERSION@/$$VER_GIT/" < git-version.h.in > git-version.h
+ g_subst_f = sed -e "s/@GIT_VERSION@/$$VER_GIT/" < git-version.h.in > git-version.h