From 2f6d2f62e829dc21a1cbfaaa76d13bf760884f5a Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Tue, 18 Nov 2003 21:19:22 +0000
Subject: [PATCH] update to 0.82; from Han Boetes <han@mijncomputer.nl>

---
 net/bitlbee/Makefile                | 17 +++++++----
 net/bitlbee/distinfo                |  9 ++++--
 net/bitlbee/patches/patch-configure | 46 ++++-------------------------
 net/bitlbee/pkg/PLIST               |  3 +-
 4 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index 4ddcdce51f8..4e9c8bfd82e 100644
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2003/10/16 15:00:17 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2003/11/18 21:19:22 naddy Exp $
 
 COMMENT=		"IRC proxy to connect to ICQ, AOL, MSN and Jabber"
 
-DISTNAME=		bitlbee-0.81
+DISTNAME=		bitlbee-0.82
 CATEGORIES=		net
+#PKGNAME=		${DISTNAME}p1
 
 HOMEPAGE=		http://bitlbee.org
 
@@ -17,6 +18,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 
 MASTER_SITES=		http://get.bitlbee.org/src/
+MASTER_SITES0=		http://get.bitlbee.org/patches/
+PATCHFILES=		bitlbee-0.82-segv.diff:0
+PATCH_DIST_STRIP=	-p1
 
 DB_DIR?=		/var/bitlbee
 DOCS=			${FILESDIR}/user-guide.html
@@ -26,17 +30,18 @@ BITLBEEGROUP=		_bitlbee
 ID=			509
 SUBST_VARS=		DB_DIR DOCDIR BITLBEEUSER BITLBEEGROUP ID
 
+LIB_DEPENDS=		soup-2.0.0.0::devel/libsoup
 
-USE_GMAKE=		Yes
 CONFIGURE_STYLE=	simple
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/libexec \
 			--mandir=${PREFIX}/man \
 			--config=${DB_DIR} \
-			--etcdir=${PREFIX}/share/bitlbee
-
-LIB_DEPENDS=		glib::devel/glib
+			--etcdir=${PREFIX}/share/bitlbee \
+			--tcpd=0
 
+USE_GMAKE=		Yes
 MAKE_ENV=		CC="${CC}"
+INSTALL_TARGET=		install install-etc
 
 NO_REGRESS=		Yes
 
diff --git a/net/bitlbee/distinfo b/net/bitlbee/distinfo
index 3d716b80445..cd7e882bfcd 100644
--- a/net/bitlbee/distinfo
+++ b/net/bitlbee/distinfo
@@ -1,3 +1,6 @@
-MD5 (bitlbee-0.81.tar.gz) = 5d3257ef3f0b02e2c2ebfed544b0405d
-RMD160 (bitlbee-0.81.tar.gz) = 93616ac67d9d3edce1baced0683d50e86ef176b4
-SHA1 (bitlbee-0.81.tar.gz) = 220d42c6abaa24de7e646574c29d2b3d9eb0d5b4
+MD5 (bitlbee-0.82-segv.diff) = ccb2adcfc701f086102639f5d5b38802
+MD5 (bitlbee-0.82.tar.gz) = fecb84a97e13a46b45989d71e7723b35
+RMD160 (bitlbee-0.82-segv.diff) = 6a51b8daeeb3670593674a1388e4b3d570e61115
+RMD160 (bitlbee-0.82.tar.gz) = 27ed86580b2acd14a995fad9cac799bbf101a0ee
+SHA1 (bitlbee-0.82-segv.diff) = e65f4525a80494c8e8a2f65875a6f5b4dbfa4f0e
+SHA1 (bitlbee-0.82.tar.gz) = 68c4efba710db785158f35e71fe8ed35d0b08d0e
diff --git a/net/bitlbee/patches/patch-configure b/net/bitlbee/patches/patch-configure
index 088da8474b8..c44fe53ca0b 100644
--- a/net/bitlbee/patches/patch-configure
+++ b/net/bitlbee/patches/patch-configure
@@ -1,46 +1,12 @@
-$OpenBSD: patch-configure,v 1.2 2003/10/16 15:00:17 naddy Exp $
---- configure.orig	2003-10-15 13:46:42.000000000 +0200
-+++ configure	2003-10-15 16:26:58.000000000 +0200
-@@ -97,22 +97,23 @@ cat<<EOF>config.h
- EOF
- 
+$OpenBSD: patch-configure,v 1.3 2003/11/18 21:19:22 naddy Exp $
+--- configure.orig	2003-11-01 07:30:41.000000000 +0100
++++ configure	2003-11-01 07:30:54.000000000 +0100
+@@ -99,8 +99,6 @@ EOF
  if [ "$debug" = "1" ]; then
--	echo 'CFLAGS=-g' >> Makefile.settings
-+	echo 'CFLAGS+=-g' >> Makefile.settings
+ 	echo 'CFLAGS=-g' >> Makefile.settings
  	echo 'DEBUG=1' >> Makefile.settings
- else
+-else
 -	echo 'CFLAGS=-O3' >> Makefile.settings;
-+echo
-+#	echo 'CFLAGS+=-O3' >> Makefile.settings;
  fi
  
  echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
- 
--if type gcc > /dev/null 2> /dev/null; then
--	echo "CC=gcc" >> Makefile.settings;
--elif type cc > /dev/null 2> /dev/null; then
--	echo "CC=cc" >> Makefile.settings;
--else
--	echo 'Cannot find a C compiler, aborting.'
--	exit 1;
--fi
-+#if type gcc > /dev/null 2> /dev/null; then
-+#	echo "CC=gcc" >> Makefile.settings;
-+#elif type cc > /dev/null 2> /dev/null; then
-+#	echo "CC=cc" >> Makefile.settings;
-+#else
-+#	echo 'Cannot find a C compiler, aborting.'
-+#	exit 1;
-+#fi
- 
- if type ld > /dev/null 2> /dev/null; then
- 	echo "LD=ld" >> Makefile.settings;
-@@ -160,7 +161,7 @@ if [ -e /usr/include/iconv.h -a "$iconv"
- 	## no-op
- elif [ -e /usr/local/include/iconv.h -a "$iconv" = "1" ]; then
- 	cat<<EOF>>Makefile.settings
--LFLAGS+=-L/usr/local/lib
-+LFLAGS+=-L/usr/local/lib -liconv
- CFLAGS+=-I/usr/local/include
- EOF
- else
diff --git a/net/bitlbee/pkg/PLIST b/net/bitlbee/pkg/PLIST
index 46874f56cef..eca94a37370 100644
--- a/net/bitlbee/pkg/PLIST
+++ b/net/bitlbee/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/10/11 14:48:02 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/11/18 21:19:22 naddy Exp $
 libexec/bitlbee
 man/man8/bitlbee.8
+share/bitlbee/bitlbee.conf
 share/bitlbee/help.txt
 share/bitlbee/motd.txt
 share/doc/bitlbee/user-guide.html