From owner-svn-ports-head@FreeBSD.ORG  Sat Mar  9 22:53:59 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DE6EE6DF;
 Sat,  9 Mar 2013 22:53:59 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C71BEE41;
 Sat,  9 Mar 2013 22:53:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r29MrxAS042094;
 Sat, 9 Mar 2013 22:53:59 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r29MrxqG042093;
 Sat, 9 Mar 2013 22:53:59 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201303092253.r29MrxqG042093@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 9 Mar 2013 22:53:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313770 - head/ports-mgmt/pkg
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.14
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: Sat, 09 Mar 2013 22:53:59 -0000

Author: bdrewery
Date: Sat Mar  9 22:53:59 2013
New Revision: 313770
URL: http://svnweb.freebsd.org/changeset/ports/313770

Log:
  - Use USE_SUBMAKE to fix running 'make build deinstall install' not properly
    using the pkg-static(8) from WRKSRC during the install phase
  
  PR:		ports/171831
  Reported by:	Garrett Cooper <yaneurabeya@gmail.com>
  Approved by:	portmgr (bapt)

Modified:
  head/ports-mgmt/pkg/Makefile

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Sat Mar  9 22:45:46 2013	(r313769)
+++ head/ports-mgmt/pkg/Makefile	Sat Mar  9 22:53:59 2013	(r313770)
@@ -22,6 +22,9 @@ MANCOMPRESSED=	yes
 
 MAKE_ENV+=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
 USE_STAGE=	yes
+# Use a submake as 'deinstall install' needs to reevaluate PKG_CMD
+# so that pkg-static is used from the wrkdir
+USE_SUBMAKE=	yes
 
 MAN8=	pkg.8 \
 	pkg-add.8 \