[arch-commits] Commit in bitlbee/repos (4 files)

[Jeff Mickey]

    Date: Tuesday, December 9, 2008 @ 22:12:45
  Author: jeff
Revision: 21121

Merged revisions 21120 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/bitlbee/trunk

........
  r21120 | jeff | 2008-12-09 22:12:03 -0500 (Tue, 09 Dec 2008) | 1 line
  
  upgpkg: bitlbee 1.2.3-1
........

Added:
  bitlbee/repos/extra-x86_64/bitlbee.rcd
    (from rev 21120, bitlbee/trunk/bitlbee.rcd)
Modified:
  bitlbee/repos/extra-x86_64/	(properties)
  bitlbee/repos/extra-x86_64/PKGBUILD
  bitlbee/repos/extra-x86_64/bitlbee.install

-----------------+
 PKGBUILD        |   41 +++++++++++++++++++++++++----------------
 bitlbee.install |    3 +--
 bitlbee.rcd     |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 18 deletions(-)


Property changes on: bitlbee/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /bitlbee/trunk:1-7623
   + /bitlbee/trunk:1-21120

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-10 03:12:03 UTC (rev 21120)
+++ extra-x86_64/PKGBUILD	2008-12-10 03:12:45 UTC (rev 21121)
@@ -1,28 +1,37 @@
 # $Id$
 # Contributor: FUBAR <mrfubar at gmail.com>
-# Maintainer: simo <simo at archlinux.org>
+# Contributor: simo <simo at archlinux.org>
+# Maintainer: Jeff 'codemac' Mickey <jeff at archlinux.org>
 pkgname=bitlbee
-pkgver=1.0.4
-pkgrel=2
+pkgver=1.2.3
+pkgrel=1
 pkgdesc="An IRC to IM gateway. Supports MSN, ICQ, Jabber, Yahoo!, and AIM"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.bitlbee.org/" 
-license="GPL"
-depends=('gnutls>=2.4.1' 'glib2>=2.12.4' 'xinetd')
+license=('GPL')
+depends=('gnutls>=2.4.2' 'glib2>=2.18.3' 'xinetd')
 install=bitlbee.install
 backup=(etc/bitlbee/bitlbee.conf etc/bitlbee/motd.txt etc/xinetd.d/bitlbee)
-source=(http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz bitlbee.xinetd)
-md5sums=('b92e301930e2322a86b73b1f6c857674'
-         '81e576369e31377f5217e636b00874b1')
+source=(http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz \
+		bitlbee.xinetd \
+		bitlbee.rcd)
 
 build() { 
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --ssl=gnutls --etcdir=/etc/bitlbee || return 1
   make || return 1
-  install -m755 -d $startdir/pkg/var/lib || return 1
-  install -o65 -g65 -d -m0770 $startdir/pkg/var/lib/bitlbee
-  install -D -m644 $startdir/src/bitlbee.xinetd \
-                   $startdir/pkg/etc/xinetd.d/bitlbee || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  make DESTDIR=$startdir/pkg install-etc || return 1
+
+  install -m755 -d $pkgdir/var/lib
+  install -o65 -g65 -d -m0770 $pkgdir/var/lib/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
 }
+
+md5sums=('2b1674d98804970809de3da3edf0bed2'
+         '81e576369e31377f5217e636b00874b1'
+         '1e426299fd3bb9c20843abb6cab4fc70')

Modified: extra-x86_64/bitlbee.install
===================================================================
--- extra-x86_64/bitlbee.install	2008-12-10 03:12:03 UTC (rev 21120)
+++ extra-x86_64/bitlbee.install	2008-12-10 03:12:45 UTC (rev 21121)
@@ -1,6 +1,5 @@
 post_install() {
-  echo "-> Bitlbee runs through xinetd for now."
-  echo "-> An rc script will be provided when a standalone daemon is available."
+  echo "-> Bitlbee can run through xinetd or as a daemon for now."
   if [ ! `grep bitlbee /etc/group` ]; then
     groupadd -g 65 bitlbee &>/dev/null;
   fi

Copied: bitlbee/repos/extra-x86_64/bitlbee.rcd (from rev 21120, bitlbee/trunk/bitlbee.rcd)
===================================================================
--- extra-x86_64/bitlbee.rcd	                        (rev 0)
+++ extra-x86_64/bitlbee.rcd	2008-12-10 03:12:45 UTC (rev 21121)
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+get_pid() {
+	pidof -o %PPID /usr/sbin/bitlbee
+}
+
+case "$1" in
+  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
+    ;;
+
+  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
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0