sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use normal PORTSDIR rather than dp_PORTSDIR so it is passed around properly.

Browse source 
This fixes errors when PORTSDIR is not set and /usr/ports is not used.  The
/usr/share/bsd.port.mk logic will auto set PORTSDIR, but this was not being
passed into children in the dependency scripts.

With hat:	portmgr
Reported by:	bapt
This commit is contained in:
Bryan Drewery 2015-12-04 22:18:29 +00:00
parent 6f4bf7baa0
commit baf3ba05d0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=403013
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mk/Scripts/depends-list.sh
View file

@ -26,12 +26,12 @@ while getopts "rw" FLAG; do
done
shift $((OPTIND-1))
validate_env dp_PORTSDIR dp_PKGNAME
validate_env PORTSDIR dp_PKGNAME
if [ ${recursive} -eq 1 -o ${requires_wrkdir} -eq 1 ]; then
validate_env dp_MAKE
# Cache command executions to avoid looking them up again in every
# sub-make.
MAKE="${dp_MAKE}" PORTSDIR="${dp_PORTSDIR}" export_ports_env >/dev/null
MAKE="${dp_MAKE}" export_ports_env >/dev/null
fi
set -u
@ -47,7 +47,7 @@ check_dep() {
case "${2}" in
/*) d=${2} ;;
*) d=${dp_PORTSDIR}/${2} ;;
*) d=${PORTSDIR}/${2} ;;
esac
case " ${checked} " in

4
Mk/Scripts/do-depends.sh
View file

@ -11,7 +11,7 @@ validate_env dp_RAWDEPENDS dp_DEPTYPE dp_DEPENDS_TARGET dp_DEPENDS_PRECLEAN \
dp_DEPENDS_CLEAN dp_DEPENDS_ARGS dp_USE_PACKAGE_DEPENDS \
dp_USE_PACKAGE_DEPENDS_ONLY dp_PKG_ADD dp_PKG_INFO dp_WRKDIR \
dp_PKGNAME dp_STRICT_DEPENDS dp_LOCALBASE dp_LIB_DIRS dp_SH \
dp_SCRIPTSDIR dp_PORTSDIR dp_MAKE
dp_SCRIPTSDIR PORTSDIR dp_MAKE
set -u
@ -123,7 +123,7 @@ for _line in ${dp_RAWDEPENDS} ; do
case "${origin}" in
/*) ;;
*) origin="${dp_PORTSDIR}/${origin}" ;;
*) origin="${PORTSDIR}/${origin}" ;;
esac
depends_args="${dp_DEPENDS_ARGS}"

4
Mk/bsd.port.mk
View file

@ -4350,7 +4350,7 @@ ${deptype:tl}-depends:
dp_LIB_DIRS="${LIB_DIRS}" \
dp_SH="${SH}" \
dp_SCRIPTSDIR="${SCRIPTSDIR}" \
dp_PORTSDIR="${PORTSDIR}" \
PORTSDIR="${PORTSDIR}" \
dp_MAKE="${MAKE}" \
${SH} ${SCRIPTSDIR}/do-depends.sh
.endif
@ -4370,7 +4370,7 @@ all-depends-list:
# usage.
DEPENDS-LIST= \
${SETENV} \
dp_PORTSDIR="${PORTSDIR}" \
PORTSDIR="${PORTSDIR}" \
dp_MAKE="${MAKE}" \
dp_PKGNAME="${PKGNAME}" \
dp_SCRIPTSDIR="${SCRIPTSDIR}" \