Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -1063,7 +1063,7 @@ MINIMAL_PKG_VERSION= 1.6.0 _PORTS_DIRECTORIES+= ${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \ - ${STAGEDIR}${PREFIX} ${WRKDIR}/pkg + ${STAGEDIR}${PREFIX} ${WRKDIR}/pkg ${WRKDIRBIN} # Ensure .CURDIR contains an absolute path without a trailing slash. Failed # builds can occur when PORTSDIR is a symbolic link, or with something like @@ -1607,6 +1607,13 @@ .endif WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/${_WRKDIR} +WRKDIRBIN?= ${WRKDIR}/.bin +PATH:= ${WRKDIRBIN}:${PATH} +.if !${MAKE_ENV:MPATH=*} && !${CONFIGURE_ENV:MPATH=*} +MAKE_ENV+= PATH=${PATH} +CONFIGURE_ENV+= PATH=${PATH} +.endif + .if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault) WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} .endif @@ -5182,6 +5189,13 @@ .endif .endif +.if !target(create-binary-alias) +create-binary-alias: ${WRKDIRBIN} +.for src target in ${BINARY_ALIAS} + @${RLN} `which ${src}` ${WRKDIRBIN}/${target} +.endfor +.endif + .if defined(WARNING) WARNING_WAIT?= 10 show-warnings: @@ -5269,7 +5283,8 @@ 700:post-patch 850:post-patch-script \ ${_OPTIONS_patch} ${_USES_patch} _CONFIGURE_DEP= patch -_CONFIGURE_SEQ= 150:build-depends 151:lib-depends 200:configure-message \ +_CONFIGURE_SEQ= 150:build-depends 151:lib-depends 160:create-binary-alias \ + 200:configure-message \ 300:pre-configure 450:pre-configure-script \ 490:run-autotools-fixup 500:do-configure 700:post-configure \ 850:post-configure-script \