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

Collapse All | Expand All

(-)bsd.port.mk (-13 / +13 lines)
Lines 4329-4346 Link Here
4329
.if ${UID} != 0 && defined(_${target:U}_SUSEQ) && !defined(INSTALL_AS_USER)
4329
.if ${UID} != 0 && defined(_${target:U}_SUSEQ) && !defined(INSTALL_AS_USER)
4330
.if defined(USE_SUBMAKE)
4330
.if defined(USE_SUBMAKE)
4331
${${target:U}_COOKIE}: ${_${target:U}_DEP}
4331
${${target:U}_COOKIE}: ${_${target:U}_DEP}
4332
	@cd ${.CURDIR} && ${MAKE} ${_${target:U}_SEQ}
4332
	@cd ${.CURDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${_${target:U}_SEQ}
4333
.else
4333
.else
4334
${${target:U}_COOKIE}: ${_${target:U}_DEP} ${_${target:U}_SEQ}
4334
${${target:U}_COOKIE}: ${_${target:U}_DEP} ${_${target:U}_SEQ}
4335
.endif
4335
.endif
4336
	@${ECHO_MSG} "===>  Switching to root credentials for '${target}' target"
4336
	@${ECHO_MSG} "===>  Switching to root credentials for '${target}' target"
4337
	@cd ${.CURDIR} && \
4337
	@cd ${.CURDIR} && \
4338
		${SU_CMD} "${MAKE} ${_${target:U}_SUSEQ}"
4338
		${SU_CMD} "${SETENV} ${MAKE_ENV} ${MAKE} ${_${target:U}_SUSEQ}"
4339
	@${ECHO_MSG} "===>  Returning to user credentials"
4339
	@${ECHO_MSG} "===>  Returning to user credentials"
4340
	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
4340
	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
4341
.elif defined(USE_SUBMAKE)
4341
.elif defined(USE_SUBMAKE)
4342
${${target:U}_COOKIE}: ${_${target:U}_DEP}
4342
${${target:U}_COOKIE}: ${_${target:U}_DEP}
4343
	@cd ${.CURDIR} && \
4343
	@cd ${.CURDIR} && ${SETENV} ${MAKE_ENV} \
4344
		${MAKE} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ}
4344
		${MAKE} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ}
4345
	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
4345
	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
4346
.else
4346
.else
Lines 4353-4359 Link Here
4353
	@if [ -e ${.TARGET} ]; then \
4353
	@if [ -e ${.TARGET} ]; then \
4354
		${DO_NADA}; \
4354
		${DO_NADA}; \
4355
	else \
4355
	else \
4356
		cd ${.CURDIR} && ${MAKE} ${.TARGET}; \
4356
		cd ${.CURDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${.TARGET}; \
4357
	fi
4357
	fi
4358
.endif
4358
.endif
4359
4359
Lines 5263-5276 Link Here
5263
fetch-recursive:
5263
fetch-recursive:
5264
	@${ECHO_MSG} "===> Fetching all distfiles for ${PKGNAME} and dependencies"
5264
	@${ECHO_MSG} "===> Fetching all distfiles for ${PKGNAME} and dependencies"
5265
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
5265
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
5266
		(cd $$dir; ${MAKE} fetch); \
5266
		(cd $$dir; ${SETENV} ${MAKE_ENV} ${MAKE} fetch); \
5267
	done
5267
	done
5268
.endif
5268
.endif
5269
5269
5270
.if !target(fetch-recursive-list)
5270
.if !target(fetch-recursive-list)
5271
fetch-recursive-list:
5271
fetch-recursive-list:
5272
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
5272
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
5273
		(cd $$dir; ${MAKE} fetch-list); \
5273
		(cd $$dir; ${SETENV} ${MAKE_ENV} ${MAKE} fetch-list); \
5274
	done
5274
	done
5275
.endif
5275
.endif
5276
5276
Lines 5333-5339 Link Here
5333
checksum-recursive:
5333
checksum-recursive:
5334
	@${ECHO_MSG} "===> Fetching and checking checksums for ${PKGNAME} and dependencies"
5334
	@${ECHO_MSG} "===> Fetching and checking checksums for ${PKGNAME} and dependencies"
5335
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
5335
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
5336
		(cd $$dir; ${MAKE} checksum); \
5336
		(cd $$dir; ${SETENV} ${MAKE_ENV} ${MAKE} checksum); \
5337
	done
5337
	done
5338
.endif
5338
.endif
5339
5339
Lines 5458-5464 Link Here
5458
5458
5459
package-recursive: package
5459
package-recursive: package
5460
	@for dir in $$(${ALL-DEPENDS-LIST}); do \
5460
	@for dir in $$(${ALL-DEPENDS-LIST}); do \
5461
		(cd $$dir; ${MAKE} package-noinstall); \
5461
		(cd $$dir; ${SETENV} ${MAKE_ENV} ${MAKE} package-noinstall); \
5462
	done
5462
	done
5463
5463
5464
# Show missing dependencies
5464
# Show missing dependencies
Lines 6008-6014 Link Here
6008
config-recursive:
6008
config-recursive:
6009
	@${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies";
6009
	@${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies";
6010
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
6010
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
6011
		(cd $$dir; ${MAKE} config-conditional); \
6011
		(cd $$dir; ${SETENV} ${MAKE_ENV} ${MAKE} config-conditional); \
6012
	done
6012
	done
6013
.endif
6013
.endif
6014
6014
Lines 6037-6046 Link Here
6037
		shift 3; \
6037
		shift 3; \
6038
	done; \
6038
	done; \
6039
	if [ "$${OPTIONS_INVALID}" = "yes" ]; then \
6039
	if [ "$${OPTIONS_INVALID}" = "yes" ]; then \
6040
		cd ${.CURDIR} && ${MAKE} config; \
6040
		cd ${.CURDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} config; \
6041
	fi;
6041
	fi;
6042
.else
6042
.else
6043
	cd ${.CURDIR} && ${MAKE} config;
6043
	cd ${.CURDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} config;
6044
.endif
6044
.endif
6045
.endif
6045
.endif
6046
.endif
6046
.endif
Lines 6077-6083 Link Here
6077
showconfig-recursive:
6077
showconfig-recursive:
6078
	@${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME} and dependencies";
6078
	@${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME} and dependencies";
6079
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
6079
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
6080
		(cd $$dir; ${MAKE} showconfig); \
6080
		(cd $$dir; ${SETENV} ${MAKE_ENV} ${MAKE} showconfig); \
6081
	done
6081
	done
6082
.endif
6082
.endif
6083
6083
Lines 6104-6110 Link Here
6104
rmconfig-recursive:
6104
rmconfig-recursive:
6105
	@${ECHO_MSG} "===> Removing user-specified options for ${PKGNAME} and dependencies";
6105
	@${ECHO_MSG} "===> Removing user-specified options for ${PKGNAME} and dependencies";
6106
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
6106
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
6107
		(cd $$dir; ${MAKE} rmconfig); \
6107
		(cd $$dir; ${SETENV} ${MAKE_ENV} ${MAKE} rmconfig); \
6108
	done
6108
	done
6109
.endif
6109
.endif

Return to bug 164423