Date: Sun, 23 Mar 2014 15:09:50 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348859 - head/Mk Message-ID: <201403231509.s2NF9oIn048206@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403231509.s2NF9oIn048206>