bring jabberd2 up to 2.2.9. From the changelog:

What changed:
- Implemented component clustering
- Many virtual hosts in one SM process
- FreeBSD kqueue support
- Implemented PBX integration interface
- crypt() password support for LDAP backend

There is new <local/> section in sm.xml. You may use it to configure
domains serviced by the SM process. Old style domain name in <id/>
section still works for backward compatibility, but the <local/>
section overrides it.  You need to give different <id/> names to
SM instances participating in clustering. Router needs a way to
differenciate these.

There is new <pbx/> section in c2s.xml configuration file. Please
see it if you want to use the PBX integration.

Packaging changes:
    added PKG_OPTIONS_GROUP.mio to control the choice of I/O modules.
    Defaulting to mio-select and mio-poll, which are known to work  with
    NetBSD > 4.0.

5 files changed, 54 insertions, 31 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index a32f559c4fe..780722b61cf 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2009/08/21 02:28:12 schnoebe Exp $
+# $NetBSD: Makefile,v 1.53 2009/09/06 04:18:11 schnoebe Exp $
 
-DISTNAME=		jabberd-2.2.8
+DISTNAME=		jabberd-2.2.9
 CATEGORIES=		chat
 MASTER_SITES=		http://ftp.xiaoka.com/jabberd2/releases/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 3829e7940f8..42c3bb4c6e8 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.18 2009/08/21 07:16:03 taca Exp $
+$NetBSD: distinfo,v 1.19 2009/09/06 04:18:11 schnoebe Exp $
 
-SHA1 (jabberd-2.2.8.tar.bz2) = 0af7fd0d15bed16acae2b02aed838cfaadb784b6
-RMD160 (jabberd-2.2.8.tar.bz2) = ec3b1a03220bb5521b6dce611a8f74f987486123
-Size (jabberd-2.2.8.tar.bz2) = 631830 bytes
-SHA1 (patch-aa) = 3ee5be684a018de3dbf564a325f0e875d778aa87
+SHA1 (jabberd-2.2.9.tar.bz2) = 1da9da3305e6fd402336ffba402b80dc767afa27
+RMD160 (jabberd-2.2.9.tar.bz2) = 7b8075653d14dbdf491d96b28894d5450a374a91
+Size (jabberd-2.2.9.tar.bz2) = 653992 bytes
+SHA1 (patch-aa) = e069e26e9c88a48baee9b9eb8ebbc9a403e91f9f
 SHA1 (patch-ab) = c33cefcb0ddbcec732e475eaf5b931cdc8dd6cc7
-SHA1 (patch-ac) = 00e66406abcba8957a93102a8132e1d099249e37
+SHA1 (patch-ac) = 7fce39dc745cf1e9cd793150840eac1543f3b597
 SHA1 (patch-ad) = 2930f23bc8616ba2a5783cc8bb2a42c5d1c5eff7
 SHA1 (patch-ae) = 0c57279c309ef4f6a226d65a491fd040e03ae4f0
 SHA1 (patch-ag) = 64c5338daa59a5eb1eed70608ac766df36dc2f83
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index 6c479eb33cc..14d49033563 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.22 2009/08/21 02:28:12 schnoebe Exp $
+# $NetBSD: options.mk,v 1.23 2009/09/06 04:18:11 schnoebe Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.jabberd2
-PKG_OPTIONS_REQUIRED_GROUPS=	auth storage sasl
+PKG_OPTIONS_REQUIRED_GROUPS=	auth storage sasl mio
 # Authentication backend
 PKG_OPTIONS_GROUP.auth=		auth-mysql auth-pgsql auth-sqlite
 PKG_OPTIONS_GROUP.auth+=	auth-db auth-ldap auth-pam
@@ -10,9 +10,13 @@ PKG_OPTIONS_GROUP.storage=	storage-mysql storage-pgsql
 PKG_OPTIONS_GROUP.storage+=	storage-sqlite storage-db
 # SASL implementation
 PKG_OPTIONS_GROUP.sasl=		sasl-cyrus sasl-gnu
+# mio implementations
+PKG_OPTIONS_GROUP.mio=		mio-kqueue mio-select mio-poll mio-epoll
 # debugging
 PKG_SUPPORTED_OPTIONS+=		debug
+
 PKG_SUGGESTED_OPTIONS=		auth-sqlite storage-sqlite sasl-gnu
+PKG_SUGGESTED_OPTIONS+=		mio-select mio-poll
 
 .include "../../mk/bsd.options.mk"
 
@@ -82,4 +86,23 @@ CONFIGURE_ARGS+=	--disable-pam
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
 CONFIGURE_ARGS+=	--enable-developer
+# CONFIGURE_ARGS+=	--enable-nad-debug
+# CONFIGURE_ARGS+=	--enable-pool-debug
+# CONFIGURE_ARGS+=	--enable-mio-debug
+.endif
+
+.if !empty(PKG_OPTIONS:Mmio-kqueue)
+CONFIGURE_ARGS+=	--enable-mio=kqueue
+.endif
+
+.if !empty(PKG_OPTIONS:Mmio-epoll)
+CONFIGURE_ARGS+=	--enable-mio=epoll
+.endif
+
+.if !empty(PKG_OPTIONS:Mmio-poll)
+CONFIGURE_ARGS+=	--enable-mio=poll
+.endif
+
+.if !empty(PKG_OPTIONS:Mmio-select)
+CONFIGURE_ARGS+=	--enable-mio=select
 .endif
diff --git a/chat/jabberd2/patches/patch-aa b/chat/jabberd2/patches/patch-aa
index f7acda5ab71..7cd8b0dae91 100644
--- a/chat/jabberd2/patches/patch-aa
+++ b/chat/jabberd2/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.7 2009/08/21 02:28:12 schnoebe Exp $
+$NetBSD: patch-aa,v 1.8 2009/09/06 04:18:11 schnoebe Exp $
 
---- Makefile.in.orig	2009-04-27 04:05:40.000000000 -0500
+--- Makefile.in.orig	2009-07-05 16:54:47.000000000 -0500
 +++ Makefile.in
-@@ -200,7 +200,7 @@ top_build_prefix = @top_build_prefix@
+@@ -201,7 +201,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- EXTRA_DIST = Doxyfile.in README.win32 README.protocol contrib UPGRADE
+ EXTRA_DIST = Doxyfile.in README.win32 README.protocol contrib UPGRADE tests/Makefile.in
 -SUBDIRS = etc man $(am__append_1) tools mio sx util c2s router s2s sm \
 +SUBDIRS = man $(am__append_1) tools mio sx util c2s router s2s sm \
  	storage
diff --git a/chat/jabberd2/patches/patch-ac b/chat/jabberd2/patches/patch-ac
index 0a2ce2168ad..4805d79c759 100644
--- a/chat/jabberd2/patches/patch-ac
+++ b/chat/jabberd2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2009/08/21 02:28:13 schnoebe Exp $
+$NetBSD: patch-ac,v 1.6 2009/09/06 04:18:11 schnoebe Exp $
 
---- etc/sm.xml.in.orig	2009-04-27 04:05:14.000000000 -0500
+--- etc/sm.xml.in.orig	2009-07-05 16:54:18.000000000 -0500
 +++ etc/sm.xml.in
-@@ -7,7 +7,7 @@
+@@ -5,7 +5,7 @@
  
    <!-- The process ID file. Comment this out if you don't need to know
         the process ID from outside the process (eg for control scripts) -->
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2009/08/21 02:28:13 schnoebe Exp $
  
    <!-- Router connection configuration -->
    <router>
-@@ -29,7 +29,7 @@
+@@ -27,7 +27,7 @@
           If this is commented out, or the file can't be read, no attempt
           will be made to establish an encrypted channel with the router. -->
      <!--
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.5 2009/08/21 02:28:13 schnoebe Exp $
      -->
  
      <!-- Router connection retry -->
-@@ -62,7 +62,7 @@
+@@ -60,7 +60,7 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
@@ -29,16 +29,7 @@ $NetBSD: patch-ac,v 1.5 2009/08/21 02:28:13 schnoebe Exp $
      -->
    </log>
  
-@@ -153,7 +153,7 @@
-          implementation does not implement the 'count' callback). -->
-     <db>
-       <!-- Directory to store database files under -->
--      <path>@localstatedir@/jabberd/db</path>
-+      <path>@DBDIR@</path>
- 
-       <!-- Synchronize the database to disk after each write. If you
-            disable this, database accesses may be faster, but data may
-@@ -178,7 +178,7 @@
+@@ -114,7 +114,7 @@
      <!-- SQLite driver configuration -->
      <sqlite>
        <!-- Database name -->
@@ -47,7 +38,16 @@ $NetBSD: patch-ac,v 1.5 2009/08/21 02:28:13 schnoebe Exp $
  
        <!-- Transacation support. If this is commented out, transactions
             will be disabled. This might make database accesses faster,
-@@ -192,7 +192,7 @@
+@@ -180,7 +180,7 @@
+          implementation does not implement the 'count' callback). -->
+     <db>
+       <!-- Directory to store database files under -->
+-      <path>@localstatedir@/jabberd/db</path>
++      <path>@DBDIR@</path>
+ 
+       <!-- Synchronize the database to disk after each write. If you
+            disable this, database accesses may be faster, but data may
+@@ -205,7 +205,7 @@
      <!-- Filesystem driver configuration -->
      <fs>
        <!-- Directory to store database files under. -->
@@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.5 2009/08/21 02:28:13 schnoebe Exp $
      </fs>
  
      <!-- LDAPVCARD driver configuration -->
-@@ -654,7 +654,7 @@
+@@ -667,7 +667,7 @@
  
        <!-- If you defined publish, you should comment <roster> -->
        <!--