diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2009-09-06 21:18:50 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2009-09-06 21:18:50 +0000 |
| commit | 80ce349ead781fafb5528d69310848254d4afbf8 (patch) | |
| tree | 9e4543908f3bf06a3af78267b4523928d41925b9 /sysutils/hal | |
| parent | 082f117cfc49edb878d4e17e43719ab6e461af0b (diff) | |
Notes
Diffstat (limited to 'sysutils/hal')
| -rw-r--r-- | sysutils/hal/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/hal/files/pkg-install.in | 27 |
2 files changed, 4 insertions, 28 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index a0ed228cd194..c83611bfa3b3 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -8,7 +8,7 @@ PORTNAME= hal DISTVERSION= 0.5.11 -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ @@ -50,6 +50,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CK_0_3" \ #HALVERSION= 0.5.10 #SNAPVERSION= 20080218 +USERS= haldaemon +GROUPS= haldaemon + USE_RC_SUBR= hald USE_GNOME_SUBR= yes DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in index 59505fc30505..253eef1f0e62 100644 --- a/sysutils/hal/files/pkg-install.in +++ b/sysutils/hal/files/pkg-install.in @@ -4,33 +4,6 @@ case $2 in POST-INSTALL) USER=haldaemon GROUP=${USER} - UID=560 - GID=${UID} - PW=/usr/sbin/pw - - if ${PW} group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if ${PW} groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if ${PW} user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "/nonexistent" -s /sbin/nologin -c "HAL Daemon User" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/hald /usr/bin/install -d -o ${USER} -g ${GROUP} /var/cache/hald |