From owner-svn-ports-all@FreeBSD.ORG  Wed Oct 10 13:12:18 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 28D75459;
 Wed, 10 Oct 2012 13:12:18 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 110858FC0C;
 Wed, 10 Oct 2012 13:12:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9ADCH3b033521;
 Wed, 10 Oct 2012 13:12:17 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9ADCHem033516;
 Wed, 10 Oct 2012 13:12:17 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201210101312.q9ADCHem033516@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 10 Oct 2012 13:12:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305658 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Oct 2012 13:12:18 -0000

Author: bapt
Date: Wed Oct 10 13:12:17 2012
New Revision: 305658
URL: http://svn.freebsd.org/changeset/ports/305658

Log:
  Add a part forgotten in previous commit concerning switching to pkgng

Modified:
  head/Mk/bsd.commands.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.commands.mk
==============================================================================
--- head/Mk/bsd.commands.mk	Wed Oct 10 13:11:13 2012	(r305657)
+++ head/Mk/bsd.commands.mk	Wed Oct 10 13:12:17 2012	(r305658)
@@ -115,6 +115,8 @@ ECHO_CMD?=	echo				# Shell builtin
 # Used to print all the '===>' style prompts - override this to turn them off.
 ECHO_MSG?=	${ECHO_CMD}
 
+.elif !defined(_PKGTOOLSDEFINED)
+_PKGTOOLDEFINED=	yes
 .if defined(WITH_PKGNG)
 PKG_BIN?=		${LOCALBASE}/sbin/pkg
 PKG_CMD?=		${PKG_BIN} register

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Oct 10 13:11:13 2012	(r305657)
+++ head/Mk/bsd.port.mk	Wed Oct 10 13:12:17 2012	(r305658)
@@ -1217,6 +1217,9 @@ WITH_PKGNG=	yes
 .endif
 .endif
 
+# Only define tools here (for transition period with between pkg tools)
+.include "${PORTSDIR}/Mk/bsd.commands.mk"
+
 MASTERDIR?=	${.CURDIR}
 
 .if ${MASTERDIR} != ${.CURDIR}