Date: Wed, 10 Oct 2012 13:12:17 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305658 - head/Mk Message-ID: <201210101312.q9ADCHem033516@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210101312.q9ADCHem033516>