Index: net-mgmt/nfsen/Makefile =================================================================== --- net-mgmt/nfsen/Makefile (revision 417042) +++ net-mgmt/nfsen/Makefile (working copy) @@ -25,7 +25,9 @@ USE_PHP= session pcre sockets NO_BUILD= yes NO_ARCH= yes +NFSENOWN?= www PLIST_SUB+= PORTNAME=${PORTNAME} +PLIST_SUB+= NFSENOWN=${NFSENOWN} USE_RC_SUBR= nfsen perl_OLD_CMD= %%PERL%% SHEBANG_FILES= bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend libexec/NfSenRRD.pm \ @@ -40,6 +42,7 @@ SUB_LIST+= "PREFIX=${PREFIX}" SUB_LIST+= "WWWDIR=${WWWDIR}" SUB_LIST+= "PORTNAME=${PORTNAME}" +SUB_LIST+= "NFSENOWN=${NFSENOWN}" post-patch: .for nfsenfile in ${REINPLACE_LIST} @@ -52,6 +55,8 @@ @${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/conf.php @${REINPLACE_CMD} "s|/usr/bin/perl|${perl_CMD}|" ${WRKSRC}/libexec/Nfcomm.pm +FIND_EXPR= ! -name \._* -prune + do-install: ${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles-data/live ${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles-stat/live @@ -62,10 +67,10 @@ ${INSTALL} -d ${STAGEDIR}/${WWWDIR}/plugins (cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} * ${STAGEDIR}/${PREFIX}/bin/) ${INSTALL_DATA} ${WRKSRC}/etc/nfsen-dist.conf ${STAGEDIR}/${PREFIX}/etc/ - (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/) - (cd ${WRKSRC}/plugins/frontend/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/) + (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/ "${FIND_EXPR}") + (cd ${WRKSRC}/plugins/frontend/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/ "${FIND_EXPR}") (cd ${WRKSRC}/libexec && ${INSTALL_SCRIPT} * ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/) - (cd ${WRKSRC}/plugins/backend && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/plugins/) + (cd ${WRKSRC}/plugins/backend && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/plugins/ "${FIND_EXPR}") ${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/ ${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/ ${INSTALL_DATA} ${WRKSRC}/conf.php ${STAGEDIR}/${WWWDIR} Index: net-mgmt/nfsen/files/nfsen.in =================================================================== --- net-mgmt/nfsen/files/nfsen.in (revision 417042) +++ net-mgmt/nfsen/files/nfsen.in (working copy) @@ -15,6 +15,7 @@ nfsen_enable=${nfsen_enable-"NO"} #nfsen_flags=${nfsen_flags-""} +nfsen_user=${nfsen_user-"%%NFSENOWN%%"} command="%%PREFIX%%/bin/nfsen" start_cmd="%%PREFIX%%/bin/nfsen start" @@ -34,6 +35,7 @@ if [ ! -e %%PREFIX%%/var/nfsen/profiles-stat/live/profile.dat ]; then time=$(/bin/date +%s); timeu=$(/bin/expr $time - 300); + profile_dat=%%PREFIX%%/var/nfsen/profiles-stat/live/profile.dat /usr/bin/printf "name = live group = . tbegin = $time @@ -47,7 +49,8 @@ type = 0 locked = 0 status = OK - version = 130" | /usr/bin/tr -d '\011' > %%PREFIX%%/var/nfsen/profiles-stat/live/profile.dat; + version = 130" | /usr/bin/tr -d '\011' > ${profile_dat} + chown ${nfsen_user} ${profile_dat} fi } Index: net-mgmt/nfsen/pkg-plist =================================================================== --- net-mgmt/nfsen/pkg-plist (revision 417042) +++ net-mgmt/nfsen/pkg-plist (working copy) @@ -74,13 +74,13 @@ %%WWWDIR%%/colour_picker.html %%WWWDIR%%/colour_palette.html %%WWWDIR%%/alerting.php -@dir var/%%PORTNAME%%/run -@dir var/%%PORTNAME%%/profiles-stat/live -@dir var/%%PORTNAME%%/profiles-stat -@dir var/%%PORTNAME%%/profiles-data/live -@dir var/%%PORTNAME%%/profiles-data -@dir var/%%PORTNAME%%/profiles/live -@dir var/%%PORTNAME%%/profiles -@dir var/%%PORTNAME%%/filters -@dir var/%%PORTNAME%% +@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/run +@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-stat/live +@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-stat +@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-data/live +@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-data +@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles/live +@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles +@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/filters +@dir(%%NFSENOWN%%,,) var/%%PORTNAME%% @dir var