svn commit: r338994 - head/www/lightsquid

[Baptiste Daroussin]

On Tue, Jan 07, 2014 at 10:12:33AM +0000, Dima Panov wrote:
> Author: fluffy
> Date: Tue Jan  7 10:12:32 2014
> New Revision: 338994
> URL: http://svnweb.freebsd.org/changeset/ports/338994
> 
> Log:
>   - Support staging
> 
> Modified:
>   head/www/lightsquid/Makefile
> 
> Modified: head/www/lightsquid/Makefile
> ==============================================================================
> --- head/www/lightsquid/Makefile	Tue Jan  7 10:02:05 2014	(r338993)
> +++ head/www/lightsquid/Makefile	Tue Jan  7 10:12:32 2014	(r338994)
> @@ -18,7 +18,6 @@ USES=		perl5
>  USE_PERL5=	run
>  NO_BUILD=	yes
>  
> -NO_STAGE=	yes
>  .include <bsd.port.options.mk>
>  
>  CONFIGS=	lightsquid.cfg realname.cfg skipuser.cfg group.cfg
> @@ -49,37 +48,37 @@ post-patch:
>  	@${MV} ${WRKSRC}/group.cfg.src ${WRKSRC}/group.cfg
>  
>  do-install:
> -	${MKDIR} ${DATADIR}/lang
> +	${MKDIR} ${STAGEDIR}/${DATADIR}/lang
>  	cd ${WRKSRC}/lang && \
>  	${FIND} . -type f -regex '.*\.lng' -exec \
> -		${INSTALL_DATA} "{}" "${DATADIR}/lang/{}" \;
> -	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
> +		${INSTALL_DATA} "{}" "${STAGEDIR}/${DATADIR}/lang/{}" \;
> +	${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}
>  	cd ${WRKSRC}/ip2name && \
>  	${FIND} . -type f -exec \
> -		${INSTALL_DATA} "{}" "${PREFIX}/libexec/${PORTNAME}/{}" \;
> -	${MKDIR} ${ETCDIR}
> +		${INSTALL_DATA} "{}" "${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/{}" \;
> +	${MKDIR} ${STAGEDIR}/${ETCDIR}
>  .for i in ${CONFIGS}
> -	${INSTALL_DATA} ${WRKSRC}/${i} ${ETCDIR}/${i}.dist
> +	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR}/${i}.dist
>  .if !exists(${ETCDIR}/${i})
> -	${INSTALL_DATA} ${WRKSRC}/${i} ${ETCDIR}
> +	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR}
>  .endif
>  .endfor
> -	${MKDIR} ${WWWDIR}/report
> -	${MKDIR} ${WWWDIR}/tpl
> +	${MKDIR} ${STAGEDIR}/${WWWDIR}/report
> +	${MKDIR} ${STAGEDIR}/${WWWDIR}/tpl
>  	cd ${WRKSRC}/tpl && \
>  	${FIND} . -type d ! -empty -exec \
> -		${MKDIR} "${WWWDIR}/tpl/{}" \; && \
> +		${MKDIR} "${STAGEDIR}/${WWWDIR}/tpl/{}" \; && \
>  	${FIND} . -type f -exec \
> -		${INSTALL_DATA} "{}" "${WWWDIR}/tpl/{}" \;
> +		${INSTALL_DATA} "{}" "${STAGEDIR}/${WWWDIR}/tpl/{}" \;
>  	cd ${WRKSRC} && \
>  	${FIND} -E . -maxdepth 1 -regex '.*\.(cgi|pl)' -exec \
> -		${INSTALL_SCRIPT} "{}" "${WWWDIR}/{}" \; && \
> -		${INSTALL_DATA} .htaccess ${WWWDIR}/
> -	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
> +		${INSTALL_SCRIPT} "{}" "${STAGEDIR}/${WWWDIR}/{}" \; && \
> +		${INSTALL_DATA} .htaccess ${STAGEDIR}/${WWWDIR}/
> +	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}

The above does not allow to build the package as a user so either you need
NEED_ROOT or you need to then those right via the plist
@owner www
@group www
files
@dirs
@owner
@group

Along with a @exec chown -R for pkg_install otherwise it will mess up things

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20140107/f243d3ba/attachment.sig>