Index: bsd.commands.mk
===================================================================
--- bsd.commands.mk	(révision 305639)
+++ bsd.commands.mk	(copie de travail)
@@ -115,6 +115,8 @@
 # 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
Index: bsd.port.mk
===================================================================
--- bsd.port.mk	(révision 305639)
+++ bsd.port.mk	(copie de travail)
@@ -1217,6 +1217,9 @@
 .endif
 .endif
 
+# Only define tools here (for transition period with between pkg tools
+.include "${PORTSDIR}/Mk/bsd.commands.mk"
+
 MASTERDIR?=	${.CURDIR}
 
 .if ${MASTERDIR} != ${.CURDIR}