Update to 2.1.6 (last stable version).

A lot of changes were made since previous update, like SASL support,
SQLite support, etc. Please see the following URL for a full list
of changes:

http://jabberd2.xiaoka.com/wiki/Releases

11 files changed, 264 insertions, 101 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 107226e8d63..9cf6ad61062 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.34 2007/02/22 19:26:12 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/05/26 11:50:12 xtraeme Exp $
 #
 
-DISTNAME=		jabberd-2.0s11
+DISTNAME=		jabberd-2.1.6
 CATEGORIES=		chat
-MASTER_SITES=		http://files.jabberstudio.org/jabberd2/
+MASTER_SITES=		http://ftp.xiaoka.com/jabberd2/releases/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		xtraeme@NetBSD.org
-HOMEPAGE=		http://jabberd.jabberstudio.org/2/
+HOMEPAGE=		http://jabberd2.xiaoka.com/
 COMMENT=		Instant messaging server (version 2)
 
 CONFLICTS=		jabberd-[0-9]*
 
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.6b
 BUILDLINK_FNAME_TRANSFORM.db4+=	-e "s,/db4/,/,g"
 
 SUBST_CLASSES+=		path
@@ -35,7 +36,8 @@ REPLACE_PERL+=		tools/*.pl
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=	JABBERD_USER JABBERD_GROUP JABBERD_LOGDIR JABBERD_PIDDIR
+BUILD_DEFS+=		JABBERD_USER JABBERD_GROUP
+BUILD_DEFS+=		JABBERD_LOGDIR JABBERD_PIDDIR
 
 PKG_SYSCONFSUBDIR=	jabberd
 RCD_SCRIPTS=		jabberd c2s sm resolver router s2s
@@ -53,8 +55,10 @@ EGDIR=			${PREFIX}/share/examples/jabberd
 CONF_FILES=		${EGDIR}/jabberd.cfg ${PKG_SYSCONFDIR}/jabberd.cfg
 
 FILES=			c2s.xml resolver.xml router.xml			\
-			router-users.xml s2s.xml sm.xml
-DBFILES=		db-setup.mysql db-setup.pgsql
+			router-users.xml router-filter.xml s2s.xml	\
+			sm.xml storage.xml
+DBFILES=		db-setup.mysql db-setup.pgsql db-update.mysql	\
+			db-setup-status.mysql db-setup.sqlite
 
 .for f in ${FILES}
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
@@ -69,13 +73,13 @@ OWN_DIRS_PERMS+=	${f} ${JABBERD_USER} ${JABBERD_GROUP} 770
 
 post-extract:
 .for f in ${FILES}
-	@${MV} ${WRKSRC}/etc/${f}.dist.in ${WRKSRC}/etc/${f}.in
+	${MV} ${WRKSRC}/etc/${f}.dist.in ${WRKSRC}/etc/${f}.in
 .endfor
-	@${MV} ${WRKSRC}/etc/jabberd.cfg.dist.in ${WRKSRC}/etc/jabberd.cfg.in
+	${MV} ${WRKSRC}/etc/jabberd.cfg.dist.in ${WRKSRC}/etc/jabberd.cfg.in
 
 pre-configure:
 .for f in ${FILES} jabberd.cfg
-	@${SED}								\
+	${SED}								\
 		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"		\
 		-e "s|@PIDDIR@|${JABBERD_PIDDIR}|g"			\
 		-e "s|@LOGDIR@|${JABBERD_LOGDIR}|g"			\
@@ -101,4 +105,5 @@ post-install:
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index 9bf4b326e0d..20b9224546e 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/03 15:33:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/05/26 11:50:12 xtraeme Exp $
 bin/c2s
 bin/jabberd
 bin/migrate.pl
@@ -7,6 +7,42 @@ bin/resolver
 bin/router
 bin/s2s
 bin/sm
+lib/jabberd/authreg_anon.la
+${DB_OPT}lib/jabberd/authreg_db.la
+${LDAP_OPT}lib/jabberd/authreg_ldap.la
+${MYSQL_OPT}lib/jabberd/authreg_mysql.la
+${PAM_OPT}lib/jabberd/authreg_pam.la
+${PGSQL_OPT}lib/jabberd/authreg_pgsql.la
+${SQLITE_OPT}lib/jabberd/authreg_sqlite.la
+lib/jabberd/authreg_pipe.la
+lib/jabberd/mod_active.la
+lib/jabberd/mod_amp.la
+lib/jabberd/mod_announce.la
+lib/jabberd/mod_deliver.la
+lib/jabberd/mod_disco-publish.la
+lib/jabberd/mod_disco.la
+lib/jabberd/mod_echo.la
+lib/jabberd/mod_help.la
+lib/jabberd/mod_iq-last.la
+lib/jabberd/mod_iq-ping.la
+lib/jabberd/mod_iq-private.la
+lib/jabberd/mod_iq-time.la
+lib/jabberd/mod_iq-vcard.la
+lib/jabberd/mod_iq-version.la
+lib/jabberd/mod_offline.la
+lib/jabberd/mod_presence.la
+lib/jabberd/mod_privacy.la
+lib/jabberd/mod_roster.la
+lib/jabberd/mod_session.la
+lib/jabberd/mod_status.la
+lib/jabberd/mod_template-roster.la
+lib/jabberd/mod_vacation.la
+lib/jabberd/mod_validate.la
+lib/jabberd/storage_fs.la
+${DB_OPT}lib/jabberd/storage_db.la
+${MYSQL_OPT}lib/jabberd/storage_mysql.la
+${PGSQL_OPT}lib/jabberd/storage_pgsql.la
+${SQLITE_OPT}lib/jabberd/storage_sqlite.la
 man/man8/c2s.8
 man/man8/jabberd.8
 man/man8/resolver.8
@@ -14,15 +50,20 @@ man/man8/router.8
 man/man8/s2s.8
 man/man8/sm.8
 share/examples/jabberd/c2s.xml
+share/examples/jabberd/db-setup-status.mysql
 share/examples/jabberd/db-setup.mysql
 share/examples/jabberd/db-setup.pgsql
+share/examples/jabberd/db-setup.sqlite
+share/examples/jabberd/db-update.mysql
 share/examples/jabberd/jabberd.cfg
 share/examples/jabberd/resolver.xml
 share/examples/jabberd/roster.xml
+share/examples/jabberd/router-filter.xml
 share/examples/jabberd/router-users.xml
 share/examples/jabberd/router.xml
 share/examples/jabberd/s2s.xml
 share/examples/jabberd/sm.xml
+share/examples/jabberd/storage.xml
 share/examples/rc.d/c2s
 share/examples/rc.d/jabberd
 share/examples/rc.d/resolver
@@ -30,3 +71,4 @@ share/examples/rc.d/router
 share/examples/rc.d/s2s
 share/examples/rc.d/sm
 @dirrm share/examples/jabberd
+@dirrm lib/jabberd
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 78ce48c3f36..49d7668955d 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.10 2006/06/11 01:57:27 xtraeme Exp $
+$NetBSD: distinfo,v 1.11 2007/05/26 11:50:12 xtraeme Exp $
 
-SHA1 (jabberd-2.0s11.tar.gz) = c938d95fc17634b889ba9b1d7d27115593b13e3d
-RMD160 (jabberd-2.0s11.tar.gz) = 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d
-Size (jabberd-2.0s11.tar.gz) = 777466 bytes
-SHA1 (patch-aa) = 2a3f7a9e9b9ecc248b5e05b54c6c7e08e9ca0183
+SHA1 (jabberd-2.1.6.tar.bz2) = fbb846a164d9ae5e6eaf8227ac8c82257acdb1e8
+RMD160 (jabberd-2.1.6.tar.bz2) = d02b395d0e9fded2d9136cb3fbd27f907958aa84
+Size (jabberd-2.1.6.tar.bz2) = 865179 bytes
+SHA1 (patch-aa) = bd62fd5956cb6722f7cb4b5bdca05ee502f43e46
 SHA1 (patch-ab) = de1c8ec12b55117223bcca2071499c42ab145a34
-SHA1 (patch-ac) = 312a07fa6772956297789e15025e0ca0fad9ebb7
-SHA1 (patch-ad) = b7776cbd6553f3b3b2f9b20250b1368f196cb85d
-SHA1 (patch-ae) = 9b03c202c5b9944906f0311fac350d563d27199b
-SHA1 (patch-af) = aad84cbfba7c0519e32df1ed6f31fa8383d73393
-SHA1 (patch-ag) = fda728bc2682c76376b68863797fcb085739a047
+SHA1 (patch-ac) = 6750c724910a7be4b19488af02d57784ff06af3d
+SHA1 (patch-ad) = 3a4b9f80912c70fb1cdc7756b6d4dcc12feadb5a
+SHA1 (patch-ae) = 56cb29f139c9f6e74afd9bb0361d70fe4fad0c47
+SHA1 (patch-af) = 83b16643caae2a0c5ca396793f0a80c0bb5d83e7
+SHA1 (patch-ag) = e4dc021acbc40dd9bc6206014fe12ee4aedefdc7
+SHA1 (patch-ah) = f896a30c9ee44bb0bd19a9c848a455e94eefcdb4
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index c98cd451908..bdb6458cc72 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,38 +1,87 @@
-# $NetBSD: options.mk,v 1.12 2007/02/22 19:26:12 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2007/05/26 11:50:12 xtraeme Exp $
 #
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.jabberd2
-PKG_SUPPORTED_OPTIONS=	db ldap pam
-PKG_OPTIONS_OPTIONAL_GROUPS=	database
-PKG_OPTIONS_GROUP.database=	mysql pgsql
-PKG_SUGGESTED_OPTIONS=	mysql
+PKG_OPTIONS_VAR=		PKG_OPTIONS.jabberd2
+PKG_OPTIONS_REQUIRED_GROUPS=	auth storage sasl
+# Authentication backend
+PKG_OPTIONS_GROUP.auth=		auth-mysql auth-pgsql auth-sqlite
+PKG_OPTIONS_GROUP.auth+=	auth-db auth-ldap auth-pam
+# Storage backend
+PKG_OPTIONS_GROUP.storage=	storage-mysql storage-pgsql
+PKG_OPTIONS_GROUP.storage+=	storage-sqlite storage-db
+# SASL implementation
+PKG_OPTIONS_GROUP.sasl=		cyrus-sasl gnusasl
+PKG_SUGGESTED_OPTIONS=		auth-sqlite storage-sqlite gnusasl
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mdb)
-BUILD_DEFS+=		JABBERD_DBDIR
+.if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
+BUILD_DEFS+=		VARBASE JABBERD_DBDIR
 JABBERD_DBDIR?=		${VARBASE}/db/jabberd
+PLIST_SUBST+=		DB_OPT=
 CONFIGURE_ARGS+=	--enable-db
 .  include "../../databases/db4/buildlink3.mk"
+.else
+PLIST_SUBST+=		DB_OPT='@comment '
+CONFIGURE_ARGS+=	--disable-db
 .endif
 
-.if !empty(PKG_OPTIONS:Mmysql)
+.if !empty(PKG_OPTIONS:Mauth-mysql) || !empty(PKG_OPTIONS:Mstorage-mysql)
+PLIST_SUBST+=		MYSQL_OPT=
 CONFIGURE_ARGS+=	--enable-mysql
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
 .  include "../../mk/mysql.buildlink3.mk"
+.else
+PLIST_SUBST+=		MYSQL_OPT='@comment '
+CONFIGURE_ARGS+=	--disable-mysql
 .endif
 
-.if !empty(PKG_OPTIONS:Mpgsql)
+.if !empty(PKG_OPTIONS:Mauth-pgsql) || !empty(PKG_OPTIONS:Mstorage-pgsql)
+PLIST_SUBST+=		PGSQL_OPT=
 CONFIGURE_ARGS+=	--enable-pgsql
 .  include "../../mk/pgsql.buildlink3.mk"
+.else
+PLIST_SUBST+=		PGSQL_OPT='@comment '
+CONFIGURE_ARGS+=	--disable-pgsql
 .endif
 
-.if !empty(PKG_OPTIONS:Mldap)
+.if !empty(PKG_OPTIONS:Mauth-sqlite) || !empty(PKG_OPTIONS:Mstorage-sqlite)
+PLIST_SUBST+=		SQLITE_OPT=
+CONFIGURE_ARGS+=	--enable-sqlite
+.  include "../../databases/sqlite3/buildlink3.mk"
+.else
+PLIST_SUBST+=		SQLITE_OPT='@comment '
+CONFIGURE_ARGS+=	--disable-sqlite
+.endif
+
+.if !empty(PKG_OPTIONS:Mauth-ldap)
+PLIST_SUBST+=		LDAP_OPT=
 CONFIGURE_ARGS+=	--enable-ldap
 .  include "../../databases/openldap-client/buildlink3.mk"
+.else
+PLIST_SUBST+=		LDAP_OPT='@comment '
+CONFIGURE_ARGS+=	--disable-ldap
+.endif
+
+.if !empty(PKG_OPTIONS:Mcyrus-sasl)
+CONFIGURE_ARGS+=	--enable-cyrus
+.  include "../../security/cyrus-sasl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-cyrus
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnusasl)
+CONFIGURE_ARGS+=	--enable-gsasl
+.  include "../../security/gsasl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-gsasl
 .endif
 
-.if !empty(PKG_OPTIONS:Mpam)
+.if !empty(PKG_OPTIONS:Mauth-pam)
+PLIST_SUBST+=		PAM_OPT=
 CONFIGURE_ARGS+=	--enable-pam
 .  include "../../mk/pam.buildlink3.mk"
+.else
+PLIST_SUBST+=		PAM_OPT='@comment '
+CONFIGURE_ARGS+=	--disable-pam
 .endif
diff --git a/chat/jabberd2/patches/patch-aa b/chat/jabberd2/patches/patch-aa
index 2da44e996eb..8505a97f445 100644
--- a/chat/jabberd2/patches/patch-aa
+++ b/chat/jabberd2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2005/05/24 21:02:53 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2007/05/26 11:50:12 xtraeme Exp $
 
---- Makefile.in.orig	2005-05-24 22:43:59.000000000 +0200
-+++ Makefile.in	2005-05-24 22:44:20.000000000 +0200
-@@ -170,7 +170,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- EXTRA_DIST = PROTOCOL Doxyfile.in README.win32 contrib
--SUBDIRS = etc tools man expat mio scod subst sx util c2s resolver router s2s sm
-+SUBDIRS = tools man expat mio scod subst sx util c2s resolver router s2s sm
+--- Makefile.in.orig	2007-05-26 12:01:18.000000000 +0200
++++ Makefile.in	2007-05-26 12:01:22.000000000 +0200
+@@ -191,7 +191,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = PROTOCOL Doxyfile.in README.win32 contrib UPGRADE
+-SUBDIRS = etc tools man mio subst sx util c2s resolver router s2s sm storage
++SUBDIRS = tools man mio subst sx util c2s resolver router s2s sm storage
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
diff --git a/chat/jabberd2/patches/patch-ac b/chat/jabberd2/patches/patch-ac
index 50ba0c2aa72..d913f57014e 100644
--- a/chat/jabberd2/patches/patch-ac
+++ b/chat/jabberd2/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
 
---- etc/sm.xml.in.orig	2003-10-08 02:32:20.000000000 +0200
-+++ etc/sm.xml.in	2003-10-08 02:33:37.000000000 +0200
+--- etc/sm.xml.in.orig	2007-05-26 12:01:56.000000000 +0200
++++ etc/sm.xml.in	2007-05-26 12:03:46.000000000 +0200
 @@ -9,7 +9,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -11,16 +11,16 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
  
    <!-- Router connection configuration -->
    <router>
-@@ -26,7 +26,7 @@
-          commented out, or the file can't be read, no attempt will be
-          made to establish an encrypted channel with the router. -->
+@@ -31,7 +31,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. -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
      <!-- Router connection retry -->
-@@ -55,7 +55,7 @@
+@@ -64,7 +64,7 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
      -->
    </log>
  
-@@ -116,7 +116,7 @@
+@@ -128,7 +128,7 @@
      <!-- Berkeley DB driver configuration -->
      <db>
        <!-- Directory to store database files under -->
@@ -38,12 +38,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
  
        <!-- Synchronize the database to disk after each write. If you
             disable this, database accesses may be faster, but data may
-@@ -371,7 +371,7 @@
-          stored in the users data store when they are created. -->
-     <template>
-       <!--
--      <roster>@sysconfdir@/templates/roster.xml</roster>
-+      <roster>@PKG_SYSCONFDIR@/roster.xml</roster>
-       -->
-     </template>
-   </user>
+@@ -153,7 +153,7 @@
+     <!-- SQLite driver configuration -->
+     <sqlite>
+       <!-- Database name -->
+-      <dbname>@localstatedir@/jabberd/db/sqlite.db</dbname>
++      <dbname>@DBDIR@/sqlite.db</dbname>
+ 
+       <!-- Transacation support. If this is commented out, transactions
+            will be disabled. This might make database accesses faster,
diff --git a/chat/jabberd2/patches/patch-ad b/chat/jabberd2/patches/patch-ad
index 319ed91ce72..81aaa737dde 100644
--- a/chat/jabberd2/patches/patch-ad
+++ b/chat/jabberd2/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
 
---- etc/s2s.xml.in.orig	2003-10-08 02:31:16.000000000 +0200
-+++ etc/s2s.xml.in	2003-10-08 02:31:56.000000000 +0200
+--- etc/s2s.xml.in.orig	2007-05-26 12:04:13.000000000 +0200
++++ etc/s2s.xml.in	2007-05-26 12:05:01.000000000 +0200
 @@ -6,7 +6,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -11,16 +11,16 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
  
    <!-- Router connection configuration -->
    <router>
-@@ -33,7 +33,7 @@
-          commented out, or the file can't be read, no attempt will be
-          made to establish an encrypted channel with the router. -->
+@@ -38,7 +38,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. -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
      <!-- Router connection retry -->
-@@ -62,7 +62,7 @@
+@@ -71,7 +71,7 @@
  
      <!-- if logging to file, this is the filename of the logfile -->
      <!--
@@ -29,3 +29,21 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
      -->
    </log>
  
+@@ -105,7 +105,7 @@
+          If this is commented out, or the file can't be read, no attempt will be
+          made to establish encrypted connections with other servers. -->
+     <!--
+-    <pemfile>@sysconfdir@/server.pem</pemfile>
++    <pemfile>@SSLCERTS@/server.pem</pemfile>
+     -->
+ 
+     <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
+@@ -116,7 +116,7 @@
+     <!-- File containing an optional SSL certificate chain file for SSL 
+          connections. -->
+     <!--
+-    <cachain>@sysconfdir@/cachain.pem</cachain>
++    <cachain>@SSLCERTS@/cachain.pem</cachain>
+     -->
+ 
+   </local>
diff --git a/chat/jabberd2/patches/patch-ae b/chat/jabberd2/patches/patch-ae
index cbfa8923e68..d9d11f88eb2 100644
--- a/chat/jabberd2/patches/patch-ae
+++ b/chat/jabberd2/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2006/04/21 09:18:37 rillig Exp $
+$NetBSD: patch-ae,v 1.3 2007/05/26 11:50:13 xtraeme Exp $
 
---- etc/router.xml.in.orig	2003-11-05 01:19:46.000000000 +0100
-+++ etc/router.xml.in	2003-11-05 01:20:44.000000000 +0100
+--- etc/router.xml.in.orig	2007-05-26 12:05:26.000000000 +0200
++++ etc/router.xml.in	2007-05-26 12:06:18.000000000 +0200
 @@ -6,7 +6,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -29,12 +29,20 @@ $NetBSD: patch-ae,v 1.2 2006/04/21 09:18:37 rillig Exp $
  
      <!-- Shared secret used to identify legacy components (that is,
           "jabber:component:accept" components that authenticate using
-@@ -46,7 +46,7 @@
-          connections. If this is commented out, connecting components
-          will not be able to request a SSL-encrypted channel. -->
+@@ -52,7 +52,7 @@
+          If this is commented out, connecting components will not be able
+          to request an SSL-encrypted channel. -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
    </local>
  
+@@ -185,6 +185,6 @@
+ 
+   <!-- File containing packet filter rules.
+        May be used for fine grained packet routing control. -->
+-  <filter>@sysconfdir@/router-filter.xml</filter>
++  <filter>@PKG_SYSCONFDIR@/router-filter.xml</filter>
+ 
+ </router>
diff --git a/chat/jabberd2/patches/patch-af b/chat/jabberd2/patches/patch-af
index 5fb10d670cb..96b67cedc0d 100644
--- a/chat/jabberd2/patches/patch-af
+++ b/chat/jabberd2/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/03/28 19:44:10 xtraeme Exp $
+$NetBSD: patch-af,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
 
---- etc/resolver.xml.in.orig	2003-10-08 02:27:59.000000000 +0200
-+++ etc/resolver.xml.in	2003-10-08 02:28:49.000000000 +0200
+--- etc/resolver.xml.in.orig	2007-05-26 12:06:43.000000000 +0200
++++ etc/resolver.xml.in	2007-05-26 12:07:09.000000000 +0200
 @@ -6,7 +6,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -11,16 +11,16 @@ $NetBSD: patch-af,v 1.1.1.1 2004/03/28 19:44:10 xtraeme Exp $
  
    <!-- Router connection configuration -->
    <router>
-@@ -23,7 +23,7 @@
-          commented out, or the file can't be read, no attempt will be
-          made to establish an encrypted channel with the router. -->
+@@ -28,7 +28,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. -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
      <!-- Router connection retry -->
-@@ -52,7 +52,7 @@
+@@ -61,7 +61,7 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
diff --git a/chat/jabberd2/patches/patch-ag b/chat/jabberd2/patches/patch-ag
index 9ded7708323..2bd8673028a 100644
--- a/chat/jabberd2/patches/patch-ag
+++ b/chat/jabberd2/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $
+$NetBSD: patch-ag,v 1.4 2007/05/26 11:50:13 xtraeme Exp $
 
---- etc/c2s.xml.in.orig	2005-01-20 15:39:58.000000000 +0100
-+++ etc/c2s.xml.in	2005-01-20 15:41:39.000000000 +0100
+--- etc/c2s.xml.in.orig	2007-05-26 12:07:39.000000000 +0200
++++ etc/c2s.xml.in	2007-05-26 12:09:13.000000000 +0200
 @@ -6,7 +6,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -11,16 +11,16 @@ $NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $
  
    <!-- Router connection configuration -->
    <router>
-@@ -23,7 +23,7 @@
-          commented out, or the file can't be read, no attempt will be
-          made to establish an encrypted channel with the router. -->
+@@ -28,7 +28,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. -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
      <!-- Router connection retry -->
-@@ -56,7 +56,7 @@
+@@ -61,7 +61,7 @@
      
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
@@ -29,23 +29,25 @@ $NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $
      -->
    </log>
  
-@@ -88,13 +88,13 @@
-          connections. If this is commented out, clients will not be
-          offered the STARTTLS stream extension -->
+@@ -109,7 +109,7 @@
+     <id register-enable='true'>localhost</id>
+     <!-- or
+     <id realm='company'
+-        pemfile='/usr/local/etc/jabberd/server.pem'
++	pemfile='@SSLCERTS@/server.pem'
+         verify-mode='7'
+         require-starttls='true'
+         register-enable='true'
+@@ -142,7 +142,7 @@
+          If this is commented out, clients will not be offered
+          the STARTTLS stream extension -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
-     <!-- File containing an optional SSL certificate chain file for client
-          SSL connections. -->
-     <!--
--    <cachain>@sysconfdir@/cachain.pem</cachain>
-+    <cachain>@SSLCERTS@/cachain.pem</cachain>
-     -->
- 
-     <!-- Require STARTTLS. If this is enabled, clients must do STARTTLS
-@@ -295,7 +295,7 @@
+     <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
+@@ -339,7 +339,7 @@
      <!-- Berkeley DB module configuration -->
      <db>
        <!-- Directory to store database files under -->
@@ -54,7 +56,7 @@ $NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $
        
        <!-- Synchronize the database to disk after each write. If you
             disable this, database accesses may be faster, but data may
-@@ -348,7 +348,7 @@
+@@ -403,13 +403,13 @@
      <!-- Pipe module configuration -->
      <pipe>
        <!-- Program to execute -->
@@ -62,4 +64,11 @@ $NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $
 +      <exec>@BINDIR@/pipe-auth.pl</exec>
      </pipe>
  
-   </authreg>
+     <!-- SQLite driver configuration -->
+     <sqlite>
+       <!-- Database name -->
+-      <dbname>@localstatedir@/jabberd/db/sqlite.db</dbname>
++      <dbname>@DBDIR@/sqlite.db</dbname>
+ 
+       <!-- Transacation support. If this is commented out, transactions
+            will be disabled. This might make database accesses faster,
diff --git a/chat/jabberd2/patches/patch-ah b/chat/jabberd2/patches/patch-ah
new file mode 100644
index 00000000000..df7be7f008f
--- /dev/null
+++ b/chat/jabberd2/patches/patch-ah
@@ -0,0 +1,31 @@
+$NetBSD: patch-ah,v 1.3 2007/05/26 11:50:13 xtraeme Exp $
+
+--- etc/storage.xml.in.orig	2007-05-26 12:40:47.000000000 +0200
++++ etc/storage.xml.in	2007-05-26 12:41:15.000000000 +0200
+@@ -6,7 +6,7 @@
+   <!-- The process ID file. comment this out if you don't need to know
+        to know the process ID from outside the process (eg for control
+        scripts) -->
+-  <pidfile>@localstatedir@/jabberd/pid/storage.pid</pidfile>
++  <pidfile>@PIDDIR@/storage.pid</pidfile>
+ 
+   <!-- Router connection configuration -->
+   <router>
+@@ -28,7 +28,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. -->
+     <!--
+-    <pemfile>@sysconfdir@/server.pem</pemfile>
++    <pemfile>@SSLCERTS@/server.pem</pemfile>
+     -->
+ 
+     <!-- Router connection retry -->
+@@ -61,7 +61,7 @@
+ 
+     <!-- If logging to file, this is the filename of the logfile -->
+     <!--
+-    <file>@localstatedir@/jabberd/log/storage.log</file>
++    <file>@LOGDIR@/storage.log</file>
+     -->
+   </log>
+