aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2010-09-23 10:32:19 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-09-23 12:55:50 +0000
commit2aebc427d1072ab5195104ce8b7f94b225fc584f (patch)
tree338e2896e898b4fe0ef7fafc10d62c9c6d232226 /main
parentd75eb48ccf696bb9c296dab18e06aeb31440c12b (diff)
downloadaports-2aebc427d1072ab5195104ce8b7f94b225fc584f.tar.bz2
aports-2aebc427d1072ab5195104ce8b7f94b225fc584f.tar.xz
main/nagios: fix install script to add group
fixes #427
Diffstat (limited to 'main')
-rw-r--r--main/nagios/APKBUILD15
-rw-r--r--main/nagios/nagios.pre-install2
2 files changed, 9 insertions, 8 deletions
diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD
index 714d468b86..1194b98bc6 100644
--- a/main/nagios/APKBUILD
+++ b/main/nagios/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter at gmail>
pkgname=nagios
pkgver=3.2.2
-pkgrel=0
+pkgrel=1
pkgdesc="Popular monitoring tool"
url="http://www.nagios.org/"
license="GPL-2"
@@ -10,16 +10,17 @@ depends="perl"
install="$pkgname.pre-install"
makedepends="gd-dev pkgconfig perl-dev libpng-dev libjpeg"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-nagios.confd
-nagios.initd
-lighttpd-nagios.conf"
+ nagios.confd
+ nagios.initd
+ lighttpd-nagios.conf"
subpackages="${pkgname}-web"
pkgusers="nagios"
pkggroups="nagios"
-build() {
- cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
+build() {
+ cd "$_builddir"
./configure --prefix=/usr \
--sysconfdir=/etc/nagios \
--mandir=/usr/share/man \
@@ -39,7 +40,7 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$_builddir"
make DESTDIR="$pkgdir" install
make DESTDIR="$pkgdir" install-config
make DESTDIR="$pkgdir" install-commandmode
diff --git a/main/nagios/nagios.pre-install b/main/nagios/nagios.pre-install
index 0e036c6a44..3039983023 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -S -H -h /var/nagios -s /bin/false -D nagios 2>/dev/null
+adduser -H -h /var/nagios -s /bin/false -D nagios 2>/dev/null
exit 0