Tue May 14 01:18:40 PDT 2013

2 files changed, 5 insertions, 59 deletions

diff --git a/community/ultimate-ircd/PKGBUILD b/community/ultimate-ircd/PKGBUILD
index 88aaeff64..4a3f0c2da 100644
--- a/community/ultimate-ircd/PKGBUILD
+++ b/community/ultimate-ircd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78358 2012-10-17 15:20:09Z spupykin $
+# $Id: PKGBUILD 90729 2013-05-13 14:39:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ultimate-ircd
 pkgver=3.0.2
-pkgrel=6
+pkgrel=7
 pkgdesc="ultimate irc server"
 arch=(i686 x86_64)
 url="http://www.shadow-realm.org/"
@@ -16,12 +16,10 @@ provides=(ircd)
 backup=()
 install=ircd.install
 source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2
-	ultimate-ircd
 	ultimate-ircd.service
 	ultimate-ircd.tmpfiles
 	conf-fix.patch)
 md5sums=('8bc14b97d22a3ce3415cc0540ae459f6'
-         'cf6ab14d8dd8805342b70a9beb01c9af'
          '526fd78018b9b011787e4e9012437116'
          'e51723ab29e7a3ddc3589846815de0c9'
          '5e0f2a02e12675ac070a148c3234e111')
@@ -42,7 +40,10 @@ build() {
 
   cd include && patch -N <../../conf-fix.patch && cd ..
   make || return 1
+}
 
+package() {
+  cd $srcdir/Ultimate$pkgver
   mkdir -p $pkgdir/usr/bin
   mkdir -p $pkgdir/var/log/ircd
   mkdir -p $pkgdir/etc/ircd/networks
@@ -54,7 +55,6 @@ build() {
   mv mkpasswd irc-mkpasswd
   mv ssl-cert.sh irc-ssl-cert.sh
   mv ssl-search.sh irc-ssl-search.sh
-  install -D -m 0755 $srcdir/ultimate-ircd $pkgdir/etc/rc.d/ultimate-ircd
   install -d -m 0755 $pkgdir/var/lib/ircd
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
   install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
diff --git a/community/ultimate-ircd/ultimate-ircd b/community/ultimate-ircd/ultimate-ircd
deleted file mode 100644
index df73d7389..000000000
--- a/community/ultimate-ircd/ultimate-ircd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof /usr/bin/ircd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting Ultimate IRCd"
-
-    [ -d /var/run/ircd ] || mkdir -p /var/run/ircd
-    [ -f /var/run/ircd/ircd.pid ] && rm -f /var/run/ircd/ircd.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-      su -c '/usr/bin/ircd -f /etc/ircd/ircd.conf' ircd 1>>/var/log/ircd/stdout.log 2>>/var/log/ircd/sterr.log
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon ultimate-ircd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Ultimate IRCd"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/ircd/ircd.pid &> /dev/null
-      rm_daemon ultimate-ircd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0