Date: Thursday, May 20, 2010 @ 16:34:06
Author: dgriffiths
Revision: 80696
Modified:
bitlbee/trunk/PKGBUILD
bitlbee/trunk/bitlbee.rcd
-------------+
PKGBUILD | 49 ++++++++++++++++++------------------
bitlbee.rcd | 78 +++++++++++++++++++++++++++++-----------------------------
2 files changed, 64 insertions(+), 63 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-05-20 18:22:17 UTC (rev 80695)
+++ PKGBUILD 2010-05-20 20:34:06 UTC (rev 80696)
@@ -1,11 +1,11 @@
# $Id$
-# Maintainer:
# Contributor: FUBAR <mrfu...@gmail.com>
# Contributor: simo <s...@archlinux.org>
# Contributor: Jeff 'codemac' Mickey <j...@archlinux.org>
+# Maintainer: Daniel J Griffiths <ghost1...@archlinux.us>
pkgname=bitlbee
-pkgver=1.2.6a
+pkgver=1.2.7
pkgrel=1
pkgdesc="An IRC to IM gateway. Supports MSN, ICQ, Jabber, Yahoo!, and AIM"
arch=('i686' 'x86_64')
@@ -15,35 +15,36 @@
optdepends=('xinetd: to run bitlbee through xinetd')
install=${pkgname}.install
backup=(etc/bitlbee/bitlbee.conf etc/bitlbee/motd.txt etc/xinetd.d/bitlbee)
-source=(http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz
+source=(http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz
'bitlbee.xinetd'
'bitlbee.rcd')
-md5sums=('c5bb4330d1089721c178ba4b18995e89'
+md5sums=('46cb8c0a930970cccd09dce4b3155cae'
'81e576369e31377f5217e636b00874b1'
- '90893b706e0e50d37cfe6b283bc7d46c')
+ '8cf7500982838f5273ee025eeabfa7fb')
build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr \
- --ssl=gnutls \
- --etcdir=/etc/bitlbee \
- --pidfile=/var/run/bitlbee/bitlbee.pid \
- --ipcsocket=/var/run/bitlbee/bitlbee.sock || return 1
- make || return 1
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr \
+ --ssl=gnutls \
+ --etcdir=/etc/bitlbee \
+ --pidfile=/var/run/bitlbee/bitlbee.pid \
+ --ipcsocket=/var/run/bitlbee/bitlbee.sock || return 1
+ make || return 1
}
package() {
- cd $srcdir/$pkgname-$pkgver
+ cd ${srcdir}/${pkgname}-${pkgver}
- install -m755 -d $pkgdir/var/lib
- install -o65 -g65 -d -m0770 $pkgdir/var/lib/bitlbee
- install -m755 -d $pkgdir/var/run
- install -o65 -g65 -d -m755 $pkgdir/var/run/bitlbee
- install -D -m644 $srcdir/bitlbee.xinetd \
- $pkgdir/etc/xinetd.d/bitlbee
- install -D -m755 $srcdir/bitlbee.rcd \
- $pkgdir/etc/rc.d/bitlbee || return 1
- make DESTDIR=$pkgdir install || return 1
- make DESTDIR=$pkgdir install-etc || return 1
- make DESTDIR=$pkgdir install-dev || return 1
+ install -dm755 ${pkgdir}/var/lib
+ install -o65 -g65 -dm0770 ${pkgdir}/var/lib/bitlbee
+ install -dm755 ${pkgdir}/var/run
+ install -o65 -g65 -dm755 ${pkgdir}/var/run/bitlbee
+ install -Dm644 ${srcdir}/bitlbee.xinetd \
+ ${pkgdir}/etc/xinetd.d/bitlbee
+ install -Dm755 ${srcdir}/bitlbee.rcd \
+ ${pkgdir}/etc/rc.d/bitlbee || return 1
+ make DESTDIR=${pkgdir} install || return 1
+ make DESTDIR=${pkgdir} install-etc || return 1
+ make DESTDIR=${pkgdir} install-dev || return 1
}
Modified: bitlbee.rcd
===================================================================
--- bitlbee.rcd 2010-05-20 18:22:17 UTC (rev 80695)
+++ bitlbee.rcd 2010-05-20 20:34:06 UTC (rev 80696)
@@ -8,47 +8,47 @@
}
case "$1" in
- start)
- stat_busy "Starting Bitlbee"
+ start)
+ stat_busy 'Starting Bitlbee'
+ PID=$(get_pid)
+ if [ -z "$PID" ]; then
+ [ -f /var/run/bitlbee/bitlbee.pid ] && rm -f
/var/run/bitlbee/bitlbee.pid
+ su -s /bin/sh -c '/usr/sbin/bitlbee -F' 'bitlbee'
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ add_daemon bitlbee
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
- PID=$(get_pid)
- if [ -z "$PID" ]; then
- [ -f /var/run/bitlbee/bitlbee.pid ] && rm -f /var/run/bitlbee/bitlbee.pid
- su -s /bin/sh -c "/usr/sbin/bitlbee -F" "bitlbee"
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- add_daemon bitlbee
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
+ stop)
+ stat_busy 'Stopping Bitlbee'
+ PID=$(get_pid)
+ # KILL
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ rm -f /var/run/bitlbee/bitlbee.pid &> /dev/null
+ rm_daemon bitlbee
+ stat_done
+ fi
+ ;;
- stop)
- stat_busy "Stopping Bitlbee"
- PID=$(get_pid)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/bitlbee/bitlbee.pid &> /dev/null
- rm_daemon bitlbee
- stat_done
- fi
- ;;
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
+ *)
+ echo "usage: $0 {start|stop|restart}"
esac
exit 0
