diff options
| author | bapt <bapt@FreeBSD.org> | 2012-10-10 21:12:17 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2012-10-10 21:12:17 +0800 |
| commit | 4dc39452c67fb32a6fe42b2e23af90443102d39b (patch) | |
| tree | e557938b866ff0c68226d9950c69c6b7953ca8b0 /Mk | |
| parent | b14e50cc6a8627ed763b47393a4b69d8c186bc42 (diff) | |
| download | freebsd-ports-gnome-4dc39452c67fb32a6fe42b2e23af90443102d39b.tar.gz freebsd-ports-gnome-4dc39452c67fb32a6fe42b2e23af90443102d39b.tar.zst freebsd-ports-gnome-4dc39452c67fb32a6fe42b2e23af90443102d39b.zip | |
Add a part forgotten in previous commit concerning switching to pkgng
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.commands.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk index 72b2cae05208..c35ae16e9d74 100644 --- a/Mk/bsd.commands.mk +++ b/Mk/bsd.commands.mk @@ -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 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 9e542945108d..6099f3407693 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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} |