svn commit: r348859 - head/Mk

[Bryan Drewery]

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