View | Details | Raw Unified | Return to bug 217325 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Scripts/do-depends.sh (-2 / +2 lines)
Lines 11-17 Link Here
11
	dp_DEPENDS_CLEAN dp_DEPENDS_ARGS dp_USE_PACKAGE_DEPENDS \
11
	dp_DEPENDS_CLEAN dp_DEPENDS_ARGS dp_USE_PACKAGE_DEPENDS \
12
	dp_USE_PACKAGE_DEPENDS_ONLY dp_PKG_ADD dp_PKG_INFO dp_WRKDIR \
12
	dp_USE_PACKAGE_DEPENDS_ONLY dp_PKG_ADD dp_PKG_INFO dp_WRKDIR \
13
	dp_PKGNAME dp_STRICT_DEPENDS dp_LOCALBASE dp_LIB_DIRS dp_SH \
13
	dp_PKGNAME dp_STRICT_DEPENDS dp_LOCALBASE dp_LIB_DIRS dp_SH \
14
	dp_SCRIPTSDIR PORTSDIR dp_MAKE
14
	dp_SCRIPTSDIR PORTSDIR dp_MAKE dp_SU_CMD
15
15
16
[ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_DO_DEPENDS}" ] && set -x
16
[ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_DO_DEPENDS}" ] && set -x
17
17
Lines 39-45 Link Here
39
			${dp_WRKDIR}/pkg-static add ${pkgfile}
39
			${dp_WRKDIR}/pkg-static add ${pkgfile}
40
			rm -f ${dp_WRKDIR}/pkg-static
40
			rm -f ${dp_WRKDIR}/pkg-static
41
		else
41
		else
42
			${dp_PKG_ADD} -A ${pkgfile}
42
			${dp_SU_CMD} "${dp_PKG_ADD} -A ${pkgfile}"
43
		fi
43
		fi
44
	elif [ -n "${dp_USE_PACKAGE_DEPENDS_ONLY}" -a "${target}" = "${dp_DEPENDS_TARGET}" ]; then
44
	elif [ -n "${dp_USE_PACKAGE_DEPENDS_ONLY}" -a "${target}" = "${dp_DEPENDS_TARGET}" ]; then
45
		echo "===>   ${dp_PKGNAME} depends on package: ${pkgfile} - not found" >&2
45
		echo "===>   ${dp_PKGNAME} depends on package: ${pkgfile} - not found" >&2
(-)Mk/bsd.port.mk (-1 / +2 lines)
Lines 3411-3417 Link Here
3411
	else \
3411
	else \
3412
	    _pkgfile="${PKGFILE}"; \
3412
	    _pkgfile="${PKGFILE}"; \
3413
	fi; \
3413
	fi; \
3414
	${PKG_ADD} ${_INSTALL_PKG_ARGS} $${_pkgfile}
3414
	${SU_CMD} "${PKG_ADD} ${_INSTALL_PKG_ARGS} $${_pkgfile}"
3415
.endif
3415
.endif
3416
3416
3417
3417
Lines 3907-3912 Link Here
3907
		dp_SCRIPTSDIR="${SCRIPTSDIR}" \
3907
		dp_SCRIPTSDIR="${SCRIPTSDIR}" \
3908
		PORTSDIR="${PORTSDIR}" \
3908
		PORTSDIR="${PORTSDIR}" \
3909
		dp_MAKE="${MAKE}" \
3909
		dp_MAKE="${MAKE}" \
3910
		dp_SU_CMD="${SU_CMD}" \
3910
		${SH} ${SCRIPTSDIR}/do-depends.sh
3911
		${SH} ${SCRIPTSDIR}/do-depends.sh
3911
.endif
3912
.endif
3912
.endfor
3913
.endfor

Return to bug 217325