View | Details | Raw Unified | Return to bug 248548
Collapse All | Expand All

(-)Mk/bsd.port.mk (-1 / +2 lines)
Lines 3306-3311 Link Here
3306
.endif
3306
.endif
3307
3307
3308
.if !target(identify-install-conflicts)
3308
.if !target(identify-install-conflicts)
3309
CONFLICT_WARNING_WAIT?=	10
3309
identify-install-conflicts:
3310
identify-install-conflicts:
3310
.if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) ) && !defined(DISABLE_CONFLICTS)
3311
.if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) ) && !defined(DISABLE_CONFLICTS)
3311
	@conflicts_with=$$( \
3312
	@conflicts_with=$$( \
Lines 3324-3330 Link Here
3324
		${ECHO_MSG}; \
3325
		${ECHO_MSG}; \
3325
		${ECHO_MSG} "      They install files into the same place."; \
3326
		${ECHO_MSG} "      They install files into the same place."; \
3326
		${ECHO_MSG} "      You may want to stop build with Ctrl + C."; \
3327
		${ECHO_MSG} "      You may want to stop build with Ctrl + C."; \
3327
		sleep 10; \
3328
		sleep ${CONFLICT_WARNING_WAIT}; \
3328
	fi
3329
	fi
3329
.endif
3330
.endif
3330
.endif
3331
.endif

Return to bug 248548