add bitlbee and libiconv from Erik Bosman, thx. fix some depends for cbtt and bitchx

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3375 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 192 insertions, 0 deletions

diff --git a/package/bitlbee/Config.in b/package/bitlbee/Config.in
new file mode 100644
index 000000000..a62e10b37
--- /dev/null
+++ b/package/bitlbee/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_BITLBEE
+	prompt "BitlBee........................... IRC gateway to IM chat networks"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBOPENSSL
+	select BR2_PACKAGE_LIBGLIB
+	select BR2_PACKAGE_LIBICONV
+	help
+
+	  BitlBee is an IRC daemon that can talk to instant messaging
+	  networks and acts as a gateway. Users can connect to the
+	  server with any normal IRC client and see their 'buddy list'
+	  in #bitlbee.
+	  
+	  http://www.bitlbee.org/
+
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
new file mode 100644
index 000000000..482381a13
--- /dev/null
+++ b/package/bitlbee/Makefile
@@ -0,0 +1,67 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bitlbee
+PKG_VERSION:=1.0.1
+PKG_RELEASE:=1
+PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a
+
+PKG_SOURCE_URL:=http://get.bitlbee.org/src \
+	http://get.bitlbee.be/src \
+	http://get.us.bitlbee.org/src \
+	http://ftp.snt.utwente.nl/pub/software/bitlbee/src
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,BITLBEE,bitlbee,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+	(cd $(PKG_BUILD_DIR); \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		STAGING_DIR="$(STAGING_DIR)" \
+		STRIP="$(STRIP)" \
+		./configure \
+		--prefix=/usr/ \
+		--bindir=/usr/sbin/ \
+		--etcdir=/etc/bitlbee/ \
+		--datadir=/usr/share/bitlbee/ \
+		--config=/var/lib/bitlbee/ \
+		--arch=OpenWrt \
+		--cpu="$(ARCH)" \
+		--debug=0 \
+		--strip=1 \
+		--sizeopt=1 \
+		--ipv6=1 \
+		--ssl=openssl \
+		--glib1=1 \
+		--glib1prefix="$(STAGING_DIR)/usr" \
+	);
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) -C $(PKG_BUILD_DIR)
+	touch $@
+
+$(IPKG_BITLBEE):
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(IDIR_BITLBEE)" install-etc install-bin 
+	$(MAKE) -C $(PKG_BUILD_DIR)/doc/user-guide \
+		DESTDIR="$(IDIR_BITLBEE)" install 
+	install -d -m0755 $(IDIR_BITLBEE)/etc/init.d
+	install -m0755 ./files/S55bitlbee $(IDIR_BITLBEE)/etc/init.d/S55bitlbee
+	$(IPKG_BUILD) $(IDIR_BITLBEE) $(PACKAGE_DIR)
+	touch $@
+
+mostlyclean:
+	$(MAKE) -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built
+
diff --git a/package/bitlbee/files/S55bitlbee b/package/bitlbee/files/S55bitlbee
new file mode 100755
index 000000000..d7f691d24
--- /dev/null
+++ b/package/bitlbee/files/S55bitlbee
@@ -0,0 +1,3 @@
+#!/bin/sh
+mkdir -p /var/lib/bitlbee
+bitlbee -D
diff --git a/package/bitlbee/ipkg/bitlbee.conffiles b/package/bitlbee/ipkg/bitlbee.conffiles
new file mode 100644
index 000000000..cd9548925
--- /dev/null
+++ b/package/bitlbee/ipkg/bitlbee.conffiles
@@ -0,0 +1,3 @@
+/etc/bitlbee/motd.txt
+/etc/bitlbee/bitlbee.conf
+/etc/init.d/S55bitlbee
diff --git a/package/bitlbee/ipkg/bitlbee.control b/package/bitlbee/ipkg/bitlbee.control
new file mode 100644
index 000000000..997cdd66c
--- /dev/null
+++ b/package/bitlbee/ipkg/bitlbee.control
@@ -0,0 +1,5 @@
+Package: bitlbee
+Priority: optional
+Section: net
+Depends: glib1, libopenssl, libiconv
+Description: IRC gateway to IM chat networks
diff --git a/package/bitlbee/patches/100-cross_compile_configure_fix b/package/bitlbee/patches/100-cross_compile_configure_fix
new file mode 100644
index 000000000..3ba17d2c6
--- /dev/null
+++ b/package/bitlbee/patches/100-cross_compile_configure_fix
@@ -0,0 +1,98 @@
+diff -Nur bitlbee-1.0.1-orig/configure bitlbee-1.0.1/configure
+--- bitlbee-1.0.1-orig/configure	2006-01-14 16:14:05.000000000 +0100
++++ bitlbee-1.0.1/configure	2006-03-06 18:30:19.000000000 +0100
+@@ -21,9 +21,12 @@
+ 
+ debug=0
+ strip=1
++sizeopt=0
+ ipv6=1
+ ssl=auto
+ 
++glib1=0
++
+ arch=`uname -s`
+ cpu=`uname -m`
+ 
+@@ -52,11 +55,18 @@
+ 
+ --debug=0/1	Disable/enable debugging		$debug
+ --strip=0/1	Disable/enable binary stripping		$strip
++--sizeopt=0/1	Disable/enable size optimization        $sizeopt
++
++--arch=...	Describe Operating System ?!		$arch
++--cpu=...	Describe CPU				$cpu
+ 
+ --ipv6=0/1	IPv6 socket support			$ipv6
+ 
+ --ssl=...	SSL library to use (gnutls, nss, openssl, bogus, auto)
+ 							$ssl
++--glib1=0/1	Force usage of glib1 even if glib2 is present
++--glib1prefix=...
++
+ EOF
+ 		exit;
+ 	fi
+@@ -110,8 +120,13 @@
+ 	echo 'CFLAGS=-g' >> Makefile.settings
+ 	echo 'DEBUG=1' >> Makefile.settings
+ 	echo '#define DEBUG' >> config.h
++	if [ "$sizeopt" = "1" ]; then
++		echo "Warning: won't optimize for size since debug is on."
++	fi
++elif [ "$sizeopt" = "1" ]; then
++	echo 'CFLAGS=-Os' >> Makefile.settings
+ else
+-	echo 'CFLAGS=-O3' >> Makefile.settings
++	echo 'CFLAGS=-O2' >> Makefile.settings
+ fi
+ 
+ echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
+@@ -138,24 +153,33 @@
+ 	exit 1;
+ fi
+ 
+-if type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then
++if [ "$glib1" != "1" ] && \
++   type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then
+ 	cat<<EOF>>Makefile.settings
+ EFLAGS+=`pkg-config --libs glib-2.0`
+ CFLAGS+=`pkg-config --cflags glib-2.0`
+ EOF
+ 	echo '#define GLIB2' >> config.h
+-elif type glib-config > /dev/null 2> /dev/null; then
++elif [ "x$glib1prefix" = "x" ] && \
++     type glib-config > /dev/null 2> /dev/null; then
+ 	cat<<EOF>>Makefile.settings
+ EFLAGS+=`glib-config --libs`
+ CFLAGS+=`glib-config --cflags`
+ EOF
+ 	echo '#define GLIB1' >> config.h
++elif [ "x$glib1prefix" != "x" ] && \
++     type "$glib1prefix/bin/glib-config" > /dev/null 2> /dev/null; then
++	cat<<EOF>>Makefile.settings
++EFLAGS+=`$glib1prefix/bin/glib-config --prefix=$glib1prefix --libs`
++CFLAGS+=`$glib1prefix/bin/glib-config --prefix=$glib1prefix --cflags`
++EOF
++	echo '#define GLIB1' >> config.h
+ else
+ 	echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
+ 	exit 1;
+ fi
+ 
+-if [ -r /usr/include/iconv.h ]; then
++if [ -r "$STAGING_DIR/usr/include/iconv.h" ]; then
+ 	:;
+ elif [ -r /usr/local/include/iconv.h ]; then
+ 	echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
+@@ -360,6 +384,10 @@
+ CYGWIN* )
+ 	echo 'Cygwin is not officially supported.'
+ ;;
++OpenWrt )
++	echo 'EFLAGS+=-liconv' >> Makefile.settings;
++	echo "CFLAGS+=\"-I$STAGING_DIR/usr/include\"" >> Makefile.settings;
++;;
+ * )
+ 	echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'
+ 	echo 'Please report any problems at http://bugs.bitlbee.org/.'