diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2006-09-25 10:39:15 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2006-09-25 10:39:15 +0000 |
| commit | fcc49d2e29e76e25eb9bc54fd20992cb7b7daa88 (patch) | |
| tree | e93245ec9b69018ee758990704d7b087b0ffa619 /sysutils/munin-master | |
| parent | 49e6e0171db6b81245becfdcc51ac7d7c24d02fb (diff) | |
Notes
Diffstat (limited to 'sysutils/munin-master')
| -rw-r--r-- | sysutils/munin-master/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/munin-master/files/patch-Makefile.config | 4 | ||||
| -rw-r--r-- | sysutils/munin-master/pkg-install | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile index dec78d4ace62..3bf4275f78dd 100644 --- a/sysutils/munin-master/Makefile +++ b/sysutils/munin-master/Makefile @@ -7,6 +7,7 @@ PORTNAME= munin PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= munin diff --git a/sysutils/munin-master/files/patch-Makefile.config b/sysutils/munin-master/files/patch-Makefile.config index 52f43ea968a4..c7097d2ab7e4 100644 --- a/sysutils/munin-master/files/patch-Makefile.config +++ b/sysutils/munin-master/files/patch-Makefile.config @@ -78,8 +78,8 @@ -GETENT = $(shell which getent || which true 2>/dev/null) -CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) -CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) -+CHECKUSER:= $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) -+CHECKGROUP:= $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) ++CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) ++CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) CHOWN = chown CHMOD = chmod diff --git a/sysutils/munin-master/pkg-install b/sysutils/munin-master/pkg-install index 1208f695a04e..3ce03edb2f51 100644 --- a/sysutils/munin-master/pkg-install +++ b/sysutils/munin-master/pkg-install @@ -45,7 +45,7 @@ make_account() { echo "Done." else echo "Please create it, and try again." - if ! grep -q "^${u}:" /etc/passwd; then + if ! /usr/sbin/pw user show ${u} >/dev/null 2>/dev/null; then echo "While you're at it, please create a user \"${u}\" too," echo "with a default group of \"${g}\"." fi |