svn commit: r328081 - head/Mk

[Bryan Drewery]

On 9/23/2013 8:31 PM, Bryan Drewery wrote:
> Author: bdrewery
> Date: Tue Sep 24 01:31:44 2013
> New Revision: 328081
> URL: http://svnweb.freebsd.org/changeset/ports/328081
> 
> Log:
>   - Be explicit about prefix with @cwd for USE_LDCONFIG
>     This fixes an issue with staging with pkg_install since it uses pkg_create
>     -S which doesn't seem to work properly with "@cwd" resetting to -p
> 

I should have mentioned that this fixes the many portupgrade build
failure reports I received.

> Modified:
>   head/Mk/bsd.port.mk
> 
> Modified: head/Mk/bsd.port.mk
> ==============================================================================
> --- head/Mk/bsd.port.mk	Tue Sep 24 01:13:35 2013	(r328080)
> +++ head/Mk/bsd.port.mk	Tue Sep 24 01:31:44 2013	(r328081)
> @@ -4054,7 +4054,7 @@ install-ldconfig-file:
>  .endif
>  	@${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \
>  		> ${STAGEDIR}${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME}
> -	@${ECHO_CMD} "@cwd" >> ${TMPPLIST}
> +	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
>  	@${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST}
>  .if defined(NO_LDCONFIG_MTREE)
>  	@${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1 || true" >> ${TMPPLIST}
> @@ -4079,7 +4079,7 @@ install-ldconfig-file:
>  .endif
>  	@${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \
>  		> ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME}
> -	@${ECHO_CMD} "@cwd" >> ${TMPPLIST}
> +	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
>  	@${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST}
>  .if defined(NO_LDCONFIG_MTREE)
>  	@${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST}
> 


-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20130923/4d97ddea/attachment.sig>