summaryrefslogtreecommitdiffstats
path: root/main/nagios
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2010-09-26 19:27:33 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2010-09-26 19:27:33 +0000
commit30e8feac61c3c7cc7e84159c29b00f5e49dbedef (patch)
tree26de2e814714096f0ae86a7846ec8e5b82be5db7 /main/nagios
parent6267ff5c95ad547b5698bb2fe38a51475ad61da8 (diff)
parente59f25e6a0d9d18f07ee5b249c535edfbfdb832e (diff)
downloadaports-eglibc.tar.bz2
aports-eglibc.tar.xz
Merge branch 'master' into eglibceglibc
Diffstat (limited to 'main/nagios')
-rw-r--r--main/nagios/APKBUILD15
-rw-r--r--main/nagios/nagios.pre-install3
2 files changed, 10 insertions, 8 deletions
diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD
index 714d468b8..ec3fcc267 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=2
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 0e036c6a4..52ca32900 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
@@ -1,4 +1,5 @@
#!/bin/sh
-adduser -S -H -h /var/nagios -s /bin/false -D nagios 2>/dev/null
+addgroup -S nagios 2>/dev/null
+adduser -S -G nagios -H -h /var/nagios -s /bin/false nagios 2>/dev/null
exit 0