diff options
| -rw-r--r-- | japanese/tiarra/Makefile | 24 | ||||
| -rw-r--r-- | japanese/tiarra/pkg-plist | 7 |
2 files changed, 11 insertions, 20 deletions
diff --git a/japanese/tiarra/Makefile b/japanese/tiarra/Makefile index 5a8509613350..116ff2481785 100644 --- a/japanese/tiarra/Makefile +++ b/japanese/tiarra/Makefile @@ -17,6 +17,7 @@ USE_PERL5= run USE_BZIP2= yes USE_RC_SUBR= tiarra NO_BUILD= yes +NEED_ROOT= yes USERS= ${TIARRA_USER} GROUPS= ${TIARRA_GROUP} @@ -24,24 +25,17 @@ GROUPS= ${TIARRA_GROUP} SUB_FILES= pkg-message SUB_LIST= TIARRA_USER=${TIARRA_USER} -PLIST_SUB= TIARRA_USER=${TIARRA_USER} \ - TIARRA_GROUP=${TIARRA_GROUP} - TIARRA_USER= tiarra TIARRA_GROUP= tiarra -NO_STAGE= yes do-install: - @${MKDIR} ${PREFIX}/tiarra - @${TAR} cfC - ${WRKSRC} . | ${TAR} xfC - ${PREFIX}/tiarra - @if [ ! -f ${PREFIX}/tiarra/tiarra.conf ]; then \ - ${CP} -p ${PREFIX}/tiarra/sample.conf \ - ${PREFIX}/tiarra/tiarra.conf; \ - fi - @${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/tiarra - @${MKDIR} ${PREFIX}/tiarra/log - @${CHOWN} -R ${TIARRA_USER}:${TIARRA_GROUP} ${PREFIX}/tiarra/log - @${CHMOD} o-rwx ${PREFIX}/tiarra/log - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PREFIX}/tiarra + @${TAR} cfC - ${WRKSRC} . | \ + ${TAR} xfC - ${STAGEDIR}${PREFIX}/tiarra + @${CHOWN} -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}/tiarra + @${MKDIR} ${STAGEDIR}${PREFIX}/tiarra/log + @${CHOWN} -R ${TIARRA_USER}:${TIARRA_GROUP} \ + ${STAGEDIR}${PREFIX}/tiarra/log + @${CHMOD} o-rwx ${STAGEDIR}${PREFIX}/tiarra/log .include <bsd.port.mk> diff --git a/japanese/tiarra/pkg-plist b/japanese/tiarra/pkg-plist index ce55a0a2c789..cd6575345d02 100644 --- a/japanese/tiarra/pkg-plist +++ b/japanese/tiarra/pkg-plist @@ -255,8 +255,5 @@ tiarra/sample.conf tiarra/tiarra tiarra/tiarra-conf.el tiarra/tiarra-conf.l -@dirrm tiarra/log -@exec mkdir %D/tiarra/log -@exec chown %%TIARRA_USER%%:%%TIARRA_GROUP%% %D/tiarra/log -@exec chmod o-rwx %D/tiarra/log -@dirrm tiarra +@dirrmtry tiarra/log +@dirrmtry tiarra |