Date: Friday, May 31, 2013 @ 02:26:46
Author: seblu
Revision: 92044
upgpkg: ngircd 20.2-2
- /usr merge
Modified:
ngircd/trunk/PKGBUILD
ngircd/trunk/ngircd.service
Deleted:
ngircd/trunk/ngircd.sh
----------------+
PKGBUILD | 8 +++-----
ngircd.service | 2 +-
ngircd.sh | 36 ------------------------------------
3 files changed, 4 insertions(+), 42 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-31 00:24:49 UTC (rev 92043)
+++ PKGBUILD 2013-05-31 00:26:46 UTC (rev 92044)
@@ -5,7 +5,7 @@
pkgname=ngircd
pkgver=20.2
-pkgrel=1
+pkgrel=2
pkgdesc="Next Generation IRC Daemon"
arch=('x86_64' 'i686')
backup=(etc/ngircd.conf)
@@ -13,17 +13,16 @@
license=('GPL')
depends=('openssl' 'libident')
source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz";
- ngircd.sh
ngircd.service)
sha256sums=('306c0ef0d2ceac0836a84ecf871a6bc4dd16c25683aa87c0f172b6e68b93357d'
- 'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5'
- '13ffad9647ef42d1a9c8f01f6208bef9dfe9e0f86dce9a01f72711d813d720a0')
+ 'f02e30f6864ba1130bcc85bedc44ad782687f572c06f10e0501b0ddcf532b404')
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
--sysconfdir=/etc \
+ --sbindir=/usr/bin \
--mandir=/usr/share/man \
--with-ident \
--with-openssl \
@@ -35,7 +34,6 @@
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
- install -Dm 755 ../ngircd.sh "$pkgdir/etc/rc.d/ngircd"
install -Dm 755 ../ngircd.service
"$pkgdir/usr/lib/systemd/system/ngircd.service"
}
Modified: ngircd.service
===================================================================
--- ngircd.service 2013-05-31 00:24:49 UTC (rev 92043)
+++ ngircd.service 2013-05-31 00:26:46 UTC (rev 92044)
@@ -4,7 +4,7 @@
[Service]
# don't daemonize to simplify stuff
-ExecStart=/usr/sbin/ngircd -n
+ExecStart=/usr/bin/ngircd -n
ExecReload=/bin/kill -HUP $MAINPID
[Install]
Deleted: ngircd.sh
===================================================================
--- ngircd.sh 2013-05-31 00:24:49 UTC (rev 92043)
+++ ngircd.sh 2013-05-31 00:26:46 UTC (rev 92044)
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting ngircd IRC daemon"
- /usr/sbin/ngircd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- add_daemon ngircd
- fi
- ;;
- stop)
- stat_busy "Stopping ngircd IRC daemon"
- PID=`pidof -o %PPID /usr/sbin/ngircd`
- kill $PID > /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon ngircd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
