diff --git a/www/crp/Makefile b/www/crp/Makefile index f8bf540ab84d..7227bd80d8fc 100644 --- a/www/crp/Makefile +++ b/www/crp/Makefile @@ -19,17 +19,15 @@ SPOOLDIR?= /var/spool/conference PKGMESSAGE= ${WRKDIR}/pkg-message -NO_STAGE= yes post-patch: @${SED} -e 's|%%WWWDIR%%|${WWWDIR}|g; s|%%DISTNAME%%|${DISTNAME}|g' \ ${MASTERDIR}/pkg-message > ${PKGMESSAGE} do-install: - @${MKDIR} -m 755 ${WWWDIR} ${SPOOLDIR} - @${CP} -R ${WRKSRC}/ ${WWWDIR}/ + @${MKDIR} -m 755 ${STAGEDIR}${WWWDIR} ${STAGEDIR}${SPOOLDIR} + @${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ @${SED} -e 's#/var/www/html#${WWWDIR}#' \ - ${WRKSRC}/Code/confHeader.inc > ${WWWDIR}/Code/confHeader.inc - @${CHOWN} -R ${WWWOWN}:${WWWGROUP} ${WWWDIR} ${SPOOLDIR} - @${CAT} ${PKGMESSAGE} + ${WRKSRC}/Code/confHeader.inc > ${STAGEDIR}${WWWDIR}/Code/confHeader.inc + @${CHOWN} -R ${WWWOWN}:${WWWGROUP} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${SPOOLDIR} .include diff --git a/www/crp/pkg-plist b/www/crp/pkg-plist index 5f2937215cd8..8b9d3f3943fe 100644 --- a/www/crp/pkg-plist +++ b/www/crp/pkg-plist @@ -237,3 +237,4 @@ @dirrm %%WWWDIR%%/Assistant @dirrm %%WWWDIR%%/All @dirrm %%WWWDIR%% +@dirrmtry /var/spool/conference