Add an option for the configure script to enable/disable IPv6 support

(by default disabled in configure, but enabled via bsd.options.mk),
you can enable/disable it via "PKG_OPTIONS.bitlbee=-inet6", this closes
PR pkg/27691 by Georg Schwarz.

Bump PKGREVISION.

3 files changed, 58 insertions, 2 deletions

diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index a7c96d8ca4d..49f9c76ad6a 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/10/25 09:37:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.16 2004/12/27 23:35:41 xtraeme Exp $
 #
 
 DISTNAME=		bitlbee-0.91
+PKGREVISION=		1
 CATEGORIES=		chat
 MASTER_SITES=		http://get.bitlbee.org/src/
 
@@ -47,6 +48,14 @@ do-install:
 .endfor
 .undef f
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.bitlbee
+PKG_SUPPORTED_OPTIONS=	inet6
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--ipv6=1
+.endif
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/chat/bitlbee/distinfo b/chat/bitlbee/distinfo
index 0decc90cdab..be469657b5a 100644
--- a/chat/bitlbee/distinfo
+++ b/chat/bitlbee/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.7 2004/10/25 09:37:44 xtraeme Exp $
+$NetBSD: distinfo,v 1.8 2004/12/27 23:35:41 xtraeme Exp $
 
 SHA1 (bitlbee-0.91.tar.gz) = f2f202ff86380e193044625ee3a258943d3b3aed
 Size (bitlbee-0.91.tar.gz) = 462675 bytes
+SHA1 (patch-aa) = 7df85fd53227dcddb57f7b71d374fbe2068ebd95
diff --git a/chat/bitlbee/patches/patch-aa b/chat/bitlbee/patches/patch-aa
new file mode 100644
index 00000000000..87d3e4b88e4
--- /dev/null
+++ b/chat/bitlbee/patches/patch-aa
@@ -0,0 +1,46 @@
+$NetBSD: patch-aa,v 1.3 2004/12/27 23:35:41 xtraeme Exp $
+
+--- configure.orig	2004-12-28 00:04:47.000000000 +0100
++++ configure	2004-12-28 00:08:13.000000000 +0100
+@@ -14,6 +14,8 @@
+ datadir='$prefix/share/bitlbee/'
+ config='/var/lib/bitlbee/'
+ 
++ipv6=0
++
+ msn=1
+ jabber=1
+ oscar=1
+@@ -45,6 +47,7 @@
+ --datadir=...						$datadir
+ --config=...						$config
+ 
++--ipv6=0/1	Disable/enable IPv6 support		$ipv6
+ --msn=0/1	Disable/enable MSN part			$msn
+ --jabber=0/1	Disable/enable Jabber part		$jabber
+ --oscar=0/1	Disable/enable Oscar part (ICQ, AIM)	$oscar
+@@ -100,9 +103,13 @@
+ #define DATADIR "$datadir"
+ #define ARCH "$arch"
+ #define CPU "$cpu"
+-#define IPV6
+ EOF
+ 
++if [ "$ipv6" = "1" ]; then
++	echo "#define IPV6" >> config.h
++	echo "CPPFLAGS+=-DIPV6" >> Makefile.settings
++fi
++
+ if [ "$debug" = "1" ]; then
+ 	echo 'CFLAGS=-g' >> Makefile.settings
+ 	echo 'DEBUG=1' >> Makefile.settings
+@@ -383,3 +390,9 @@
+ else
+ 	echo '  Building without IM-protocol support. We wish you a lot of fun...';
+ fi
++
++if [ "$ipv6" = "1" ]; then
++	echo '  Building with IPv6 support.'
++else
++	echo '  Building without IPv6 support.'
++fi