diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/hal/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/hal/files/pkg-install.in | 25 |
2 files changed, 18 insertions, 15 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index d139a0f19891..75c477abc6cd 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -8,7 +8,7 @@ PORTNAME= hal DISTVERSION= 0.5.11rc2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ @@ -105,11 +105,13 @@ post-install: ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor ${INSTALL_DATA} ${FILESDIR}/10-mouse-sysmouse.fdi \ ${PREFIX}/share/hal/fdi/policy/10osvendor - @${SETENV} PKG_PREFIX=${PREFIX} PACKAGE_BUILDING=${PACKAGE_BUILDING} \ +.if !defined(PACKAGE_BUILDING) + @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(PACKAGE_BUILDING) && defined(NEEDS_MEDIA) +.if defined(NEEDS_MEDIA) ${MKDIR} /media .endif +.endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \ diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in index 72b67ff95936..0935c06e157a 100644 --- a/sysutils/hal/files/pkg-install.in +++ b/sysutils/hal/files/pkg-install.in @@ -1,8 +1,7 @@ #!/bin/sh -[ "$2" != POST-INSTALL ] && exit 0 - -if [ -z "${PACKAGE_BUILDING}" ]; then +case $2 in +POST-INSTALL) USER=haldaemon GROUP=${USER} UID=560 @@ -36,14 +35,16 @@ if [ -z "${PACKAGE_BUILDING}" ]; then /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/hald /usr/bin/install -d -o ${USER} -g ${GROUP} /var/cache/hald /usr/bin/install -d -o ${USER} -g ${GROUP} /var/lib/hal -fi -for pair in %%RC_FILES%%; do - file=`echo $pair | cut -f 1 -d :` - destdir=`echo $pair | cut -f 2 -d :` + for pair in %%RC_FILES%%; do + file=`echo $pair | cut -f 1 -d :` + destdir=`echo $pair | cut -f 2 -d :` - if [ ! -f $destdir/$file ]; then - mkdir -p $destdir - cp -p %%DATADIR%%/dist/$file $destdir/$file - fi -done + if [ ! -f $destdir/$file ]; then + mkdir -p $destdir + cp -p %%DATADIR%%/dist/$file $destdir/$file + fi + done + exit 0 + ;; +esac |