From owner-svn-ports-head@FreeBSD.ORG  Sun Mar 23 19:31:37 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3F8631EF;
 Sun, 23 Mar 2014 19:31:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2C6CCCFC;
 Sun, 23 Mar 2014 19:31:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NJVbF4057860;
 Sun, 23 Mar 2014 19:31:37 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2NJVa99057859;
 Sun, 23 Mar 2014 19:31:36 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201403231931.s2NJVa99057859@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 23 Mar 2014 19:31:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348880 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Mar 2014 19:31:37 -0000

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