Update to 2.0.8, lots of bugs were fixed. Looks like they stopped

updating the Changelog file for changes (why??).

5 files changed, 25 insertions, 41 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index cce802aa655..7cc7d5a3a20 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/24 21:02:53 xtraeme Exp $
 #
 
-DISTNAME=		jabberd-2.0s6
-PKGREVISION=		1
+DISTNAME=		jabberd-2.0s8
 CATEGORIES=		chat
-MASTER_SITES=		http://www.jabberstudio.org/files/jabberd2/
+MASTER_SITES=		http://files.jabberstudio.org/jabberd2/
 
 MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://jabberd.jabberstudio.org/2/
@@ -72,10 +71,11 @@ OWN_DIRS_PERMS+=	${f} ${JABBERD_USER} ${JABBERD_GROUP} 770
 .undef f
 
 post-extract:
-.for f in jabberd.cfg ${FILES}
+.for f in ${FILES}
 	@${MV} ${WRKSRC}/etc/${f}.dist.in ${WRKSRC}/etc/${f}.in
 .endfor
 .undef f
+	@${MV} ${WRKSRC}/etc/jabberd.cfg.dist.in ${WRKSRC}/etc/jabberd.cfg.in
 
 pre-configure:
 .for f in ${FILES} jabberd.cfg
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index d1840b4d38f..e0d5f06513b 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.5 2005/01/20 15:08:54 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2005/05/24 21:02:53 xtraeme Exp $
 
-SHA1 (jabberd-2.0s6.tar.gz) = 10a160e804e3ace8f7f39174db6bfaabe50211f0
-Size (jabberd-2.0s6.tar.gz) = 724448 bytes
-SHA1 (patch-aa) = ff9a1aa6c39b7e96870d4f884de09be8307ac169
+SHA1 (jabberd-2.0s8.tar.gz) = 65e4cb3579a12775d305db273fc1258821f2cec0
+RMD160 (jabberd-2.0s8.tar.gz) = 9804e9a83ebb2fd02b234496974b5bda2a88b195
+Size (jabberd-2.0s8.tar.gz) = 757149 bytes
+SHA1 (patch-aa) = 2a3f7a9e9b9ecc248b5e05b54c6c7e08e9ca0183
 SHA1 (patch-ab) = de1c8ec12b55117223bcca2071499c42ab145a34
 SHA1 (patch-ac) = 312a07fa6772956297789e15025e0ca0fad9ebb7
 SHA1 (patch-ad) = b7776cbd6553f3b3b2f9b20250b1368f196cb85d
 SHA1 (patch-ae) = a5edb31af022b682c96ceacee615999f6439662e
 SHA1 (patch-af) = aad84cbfba7c0519e32df1ed6f31fa8383d73393
 SHA1 (patch-ag) = fda728bc2682c76376b68863797fcb085739a047
-SHA1 (patch-ai) = 207ea23701784272b8481a7f9b1cfee0c1887268
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index 79ec4f96e8a..18bafc54a3b 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2005/01/20 15:08:54 xtraeme Exp $
+# $NetBSD: options.mk,v 1.7 2005/05/24 21:02:53 xtraeme Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.jabberd2
@@ -6,6 +6,10 @@ PKG_SUPPORTED_OPTIONS=	db mysql pgsql ldap PAM
 PKG_DEFAULT_OPTIONS=	mysql
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mmysql) && !empty(PKG_OPTIONS:Mpgsql)
+PKG_FAIL_REASON+=	"Cannot use mysql and pgsql, use one of them."
+.endif
+
 .if !empty(PKG_OPTIONS:Mdb)
 BUILD_DEFS+=		JABBERD_DBDIR
 JABBERD_DBDIR?=         ${VARBASE}/db/jabberd
diff --git a/chat/jabberd2/patches/patch-aa b/chat/jabberd2/patches/patch-aa
index 4d92dde6a1d..2da44e996eb 100644
--- a/chat/jabberd2/patches/patch-aa
+++ b/chat/jabberd2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2004/07/14 00:25:11 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2005/05/24 21:02:53 xtraeme Exp $
 
---- Makefile.in.orig	2004-07-14 01:57:51.000000000 +0200
-+++ Makefile.in	2004-07-14 01:58:02.000000000 +0200
-@@ -93,7 +93,7 @@
- install_sh = @install_sh@
- EXTRA_DIST = PROTOCOL Doxyfile.in README.win32
- 
+--- 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
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
diff --git a/chat/jabberd2/patches/patch-ai b/chat/jabberd2/patches/patch-ai
deleted file mode 100644
index 683f21d577d..00000000000
--- a/chat/jabberd2/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/01/20 15:08:54 xtraeme Exp $
-
---- ltmain.sh.orig	Tue Nov 30 15:55:46 2004
-+++ ltmain.sh	Tue Nov 30 15:55:59 2004
-@@ -561,7 +561,6 @@
- 	    # Evaluate the configuration.
- 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
- 	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
--	    trimedcc="${CC/${host}-}"
- 	    case "$base_compile " in
- 	    "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
- 	    tagname=CC
-@@ -954,7 +953,6 @@
- 	    # Evaluate the configuration.
- 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
- 	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
--	    trimedcc="${CC/${host}-}"
- 	    case $base_compile in
- 	    "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
- 	    tagname=CC