diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-11-28 13:59:05 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-11-28 13:59:05 +0800 |
| commit | 7cb827c5489117d632dca4330dd3f50c5a570f5b (patch) | |
| tree | 36aab6956e723b7fd1dc2259d8c79803853832d4 /sysutils/hal | |
| parent | a0dfb461133f22cd363af37e9e97670fc7bcac6e (diff) | |
| download | marcuscom-ports-7cb827c5489117d632dca4330dd3f50c5a570f5b.tar marcuscom-ports-7cb827c5489117d632dca4330dd3f50c5a570f5b.tar.gz marcuscom-ports-7cb827c5489117d632dca4330dd3f50c5a570f5b.tar.bz2 marcuscom-ports-7cb827c5489117d632dca4330dd3f50c5a570f5b.tar.lz marcuscom-ports-7cb827c5489117d632dca4330dd3f50c5a570f5b.tar.xz marcuscom-ports-7cb827c5489117d632dca4330dd3f50c5a570f5b.tar.zst marcuscom-ports-7cb827c5489117d632dca4330dd3f50c5a570f5b.zip | |
-Sync w/ FreeBSD.
-Reset the $FreeBSD$ while I am there.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13259 df743ca5-7f9a-e211-a948-0013205c9059
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 fe27b11ab..8f3503d2a 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.70 2009/10/24 06:34:26 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.71 2009/11/22 01:04:36 marcus Exp $ # PORTNAME= hal @@ -50,6 +50,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ #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 59505fc30..253eef1f0 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 |