svn commit: r348880 - head/Mk

[Bryan Drewery]

Author: bdrewery
Date: Sun Mar 23 19:31:36 2014
New Revision: 348880
URL: http://svnweb.freebsd.org/changeset/ports/348880
QAT: https://qat.redports.org/buildarchive/r348880/

Log:
  - Fix installing with pkg_install when running 'make install' due to the
    exists() being evaluated before the package is created.
  
    Regression from r348859
  
   With hat:	portmgr
   Pointyhat to:	bdrewery

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sun Mar 23 18:27:06 2014	(r348879)
+++ head/Mk/bsd.port.mk	Sun Mar 23 19:31:36 2014	(r348880)
@@ -3843,11 +3843,12 @@ delete-package-list: delete-package-link
 _INSTALL_PKG_ARGS=	-f
 .endif
 install-package:
-.if exists(${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX})
-	@${PKG_ADD} ${_INSTALL_PKG_ARGS} ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}
-.else
-	@${PKG_ADD} ${_INSTALL_PKG_ARGS} ${PKGFILE}
-.endif
+	@if [ -f "${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}" ]; then \
+	    _pkgfile="${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}"; \
+	else \
+	    _pkgfile="${PKGFILE}"; \
+	fi; \
+	${PKG_ADD} ${_INSTALL_PKG_ARGS} $${_pkgfile}
 .endif