From 733c503a6c0c14e5e8e1b39fe635a7bc049e3560 Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Wed, 17 Nov 2004 21:08:26 +0000
Subject: [PATCH] resolve conflict and update to 2.0s4

---
 net/jabberd/Makefile | 14 ++++++++++----
 net/jabberd/distinfo |  6 +++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/net/jabberd/Makefile b/net/jabberd/Makefile
index ae56233e8b9..445d6e6e9f4 100644
--- a/net/jabberd/Makefile
+++ b/net/jabberd/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.4 2004/10/08 15:27:27 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2004/11/17 21:08:26 jakob Exp $
 
 COMMENT=		"jabber server"
-DISTNAME=		jabberd-2.0s3
+DISTNAME=		jabberd-2.0s4
 CATEGORIES=		net
 HOMEPAGE=		http://jabberd.jabberstudio.org/2/
 MAINTAINER=		Gerardo Santana Gomez Garrido <santana@openbsd.org.mx>
@@ -26,11 +26,17 @@ SUBST_VARS=		CONFIG_DIR EXAMPLES \
 
 LIB_DEPENDS=		lib/mysql/mysqlclient.10::databases/mysql
 
-MODULES=		converters/libiconv
+MODULES+=		iconv
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--localstatedir=${JABBERDDIR:H} \
+CONFIGURE_ARGS+=	--localstatedir=/var \
+			--enable-ssl \
 			--disable-idn \
+			--enable-mysql \
+			--with-extra-include-path=${LOCALBASE}/include \
+			--with-extra-library-path=${LOCALBASE}/lib \
+
+CONFIGURE_ARGS+=	--enable-mysql \
 			--with-extra-include-path=${LOCALBASE}/include/mysql \
 			--with-extra-library-path=${LOCALBASE}/lib/mysql
 
diff --git a/net/jabberd/distinfo b/net/jabberd/distinfo
index d79694eac09..2aff147b1c6 100644
--- a/net/jabberd/distinfo
+++ b/net/jabberd/distinfo
@@ -1,3 +1,3 @@
-MD5 (jabberd-2.0s3.tar.gz) = c15f8f07cb2ee499cd21c0b883b9f353
-RMD160 (jabberd-2.0s3.tar.gz) = 0229f1f9453e31cd47d29f94e0f278c038d2ef5c
-SHA1 (jabberd-2.0s3.tar.gz) = 9a592f71e45445db7aca20b8fd87b97ae9690c22
+MD5 (jabberd-2.0s4.tar.gz) = 2682037fc177e1f3e7d7869cb3f59c1d
+RMD160 (jabberd-2.0s4.tar.gz) = 985c13e51b264f6c1e6d2c95de05ecc70d826848
+SHA1 (jabberd-2.0s4.tar.gz) = cb429db090982118f2b448499635ff14b91718b8