diff options
Diffstat (limited to 'audio/daapd')
| -rw-r--r-- | audio/daapd/Makefile | 3 | ||||
| -rw-r--r-- | audio/daapd/files/daapd.sh | 3 | ||||
| -rw-r--r-- | audio/daapd/pkg-install | 11 | ||||
| -rw-r--r-- | audio/daapd/pkg-plist | 4 |
4 files changed, 6 insertions, 15 deletions
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile index d91355771ab1..48bea77c2ed9 100644 --- a/audio/daapd/Makefile +++ b/audio/daapd/Makefile @@ -7,6 +7,7 @@ PORTNAME= daapd PORTVERSION= 0.2.1c +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.deleet.de/projekte/daap/daapd/ EXTRACT_SUFX= .tgz @@ -30,7 +31,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall DAAPD_USER= daapd DAAPD_GROUP= daapd -LOGDIR= ${DATADIR} +LOGDIR= /var/log FILES_SUB= USER=${DAAPD_USER} GROUP=${DAAPD_GROUP} \ PREFIX=${PREFIX} LOGDIR=${LOGDIR} DOCSDIR=${DOCSDIR} \ LOCALBASE=${LOCALBASE} diff --git a/audio/daapd/files/daapd.sh b/audio/daapd/files/daapd.sh index 6c4052638952..7266b44c0047 100644 --- a/audio/daapd/files/daapd.sh +++ b/audio/daapd/files/daapd.sh @@ -10,8 +10,7 @@ DAAPD_CONF=%%PREFIX%%/etc/daapd.conf case "$1" in start) if [ -r "${DAAPD_CONF}" ]; then - su -m ${DAAPD_USER} -c "${DAAPD} -c ${DAAPD_CONF}" \ - >> ${DAAPD_LOG} 2>&1 & + su -m ${DAAPD_USER} -c "${DAAPD} -c ${DAAPD_CONF}" >> ${DAAPD_LOG} 2>&1 & echo $(($!+1)) > "${DAAPD_PID}" echo -n ' daapd' fi diff --git a/audio/daapd/pkg-install b/audio/daapd/pkg-install index b539b4621aac..dc09fedcd663 100644 --- a/audio/daapd/pkg-install +++ b/audio/daapd/pkg-install @@ -23,18 +23,9 @@ PRE-INSTALL) else echo "---> Adding user \"%%USER%%\"" pw adduser %%USER%% -g %%GROUP%% -h - \ - -d "%%LOGDIR%%" -s "/sbin/nologin" -c "daapd User" || exit 1 + -d "/nonexistent" -s "/sbin/nologin" -c "daapd User" || exit 1 fi ;; -POST-INSTALL) - echo "---> Starting post-install script:" - - echo "---> Creating directory \"%%LOGDIR%%\"" - mkdir %%LOGDIR%% - chown %%USER%% %%LOGDIR%% - - ;; - esac diff --git a/audio/daapd/pkg-plist b/audio/daapd/pkg-plist index 71b9af9603c9..d3d045d65f2f 100644 --- a/audio/daapd/pkg-plist +++ b/audio/daapd/pkg-plist @@ -1,6 +1,6 @@ @comment $FreeBSD$ -sbin/daapd etc/daapd.conf.sample etc/rc.d/daapd.sh +sbin/daapd %%PORTDOCS%%%%DOCSDIR%%/README -@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% |