svn commit: r348859 - head/Mk

[Bryan Drewery]

On 3/23/2014 10:09 AM, Bryan Drewery wrote:
> Author: bdrewery
> Date: Sun Mar 23 15:09:50 2014
> New Revision: 348859
> URL: http://svnweb.freebsd.org/changeset/ports/348859
> QAT: https://qat.redports.org/buildarchive/r348859/
> 
> Log:
>   install-package: Use WRKDIR/PKGNAME.PKG_SUFX if available

Got my msg backwards, this supports installing from PKGFILE if available
as a fallback.

>   
>   With hat:	portmgr
> 
> Modified:
>   head/Mk/bsd.port.mk
> 
> Modified: head/Mk/bsd.port.mk
> ==============================================================================
> --- head/Mk/bsd.port.mk	Sun Mar 23 14:50:25 2014	(r348858)
> +++ head/Mk/bsd.port.mk	Sun Mar 23 15:09:50 2014	(r348859)
> @@ -3835,13 +3835,17 @@ delete-package-list: delete-package-link
>  	@${ECHO_CMD} "[ -f ${PKGFILE} ] && (${ECHO_CMD} deleting ${PKGFILE}; ${RM} -f ${PKGFILE})"
>  .endif
>  
> -# Only used if !defined(NO_STAGE)
> +# Used if !defined(NO_STAGE) during install, or manually to install package
> +# from local repository.
>  .if !target(install-package)
> -install-package:
>  .if defined(FORCE_PKG_REGISTER)
> -	@${PKG_ADD} -f ${WRKDIR}/${PKGNAME}${PKG_SUFX}
> +_INSTALL_PKG_ARGS=	-f
> +.endif
> +install-package:
> +.if exists(${WRKDIR}/${PKGNAME}${PKG_SUFX})
> +	@${PKG_ADD} ${_INSTALL_PKG_ARGS} ${WRKDIR}/${PKGNAME}${PKG_SUFX}
>  .else
> -	@${PKG_ADD} ${WRKDIR}/${PKGNAME}${PKG_SUFX}
> +	@${PKG_ADD} ${_INSTALL_PKG_ARGS} ${PKGFILE}
>  .endif
>  .endif
>  
> 


-- 
Regards,
Bryan Drewery

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