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

(-)Mk/bsd.port.mk (-6 / +77 lines)
Lines 6073-6081 Link Here
6073
6073
6074
.if !target(config-recursive)
6074
.if !target(config-recursive)
6075
config-recursive:
6075
config-recursive:
6076
	@${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies";
6076
	@${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies"; \
6077
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
6077
	${MAKE} config-conditional;					\
6078
		(cd $$dir; ${MAKE} config-conditional); \
6078
	L=$$(${MAKE} -V _DEPEND_DIRS);					\
6079
	checked="";							\
6080
	while [ -n "$$L" ]; do						\
6081
		l="";							\
6082
		for d in $$L; do					\
6083
			case $$checked in				\
6084
			$$d\ *|*\ $$d\ *|*\ $$d)			\
6085
				continue;;				\
6086
			esac;						\
6087
			checked="$$checked $$d";			\
6088
			if [ ! -d $$d ]; then				\
6089
				${ECHO_MSG} "${PKGNAME}: \"$$d\" non-existent -- recursive config incomplete" >&2; \
6090
				continue;				\
6091
			fi;						\
6092
			${MAKE} -C $$d config-conditional;		\
6093
			if ! children=$$(cd $$d && ${MAKE} -V _DEPEND_DIRS); then \
6094
				${ECHO_MSG} "${PKGNAME}: \"$$d\" erroneous -- recursive config incomplete" >&2; \
6095
				continue;				\
6096
			fi;						\
6097
			for child in $$children; do			\
6098
				case "$$checked $$l" in			\
6099
				$$child\ *|*\ $$child\ *|*\ $$child)	\
6100
					continue;;			\
6101
				esac;					\
6102
				l="$$l $$child";			\
6103
			done;						\
6104
		done;							\
6105
		L=$$l;							\
6079
	done
6106
	done
6080
.endif
6107
.endif
6081
6108
Lines 6169-6180 Link Here
6169
6196
6170
.if !target(rmconfig-recursive)
6197
.if !target(rmconfig-recursive)
6171
rmconfig-recursive:
6198
rmconfig-recursive:
6172
	@${ECHO_MSG} "===> Removing user-specified options for ${PKGNAME} and dependencies";
6199
	@${ECHO_MSG} "===> Removing user-specified options for ${PKGNAME} and dependencies"; \
6173
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
6200
	L=${.CURDIR};							\
6174
		(cd $$dir; ${MAKE} rmconfig); \
6201
	checked="";							\
6202
	while [ -n "$$L" ]; do						\
6203
		l="";							\
6204
		for d in $$L; do					\
6205
			case $$checked in				\
6206
			$$d\ *|*\ $$d\ *|*\ $$d)			\
6207
				continue;;				\
6208
			esac;						\
6209
			checked="$$checked $$d";			\
6210
			if [ ! -d $$d ]; then				\
6211
				${ECHO_MSG} "${PKGNAME}: \"$$d\" non-existent -- recursive rmconfig incomplete" >&2; \
6212
				continue;				\
6213
			fi;						\
6214
			if ! children=$$(${MAKE} -C $$d -V _DEPEND_DIRS); then \
6215
				${ECHO_MSG} "${PKGNAME}: \"$$d\" erroneous -- recursive rmconfig incomplete" >&2; \
6216
				continue;				\
6217
			fi;						\
6218
			if (${MAKE} -C $$d rmconfig-internal > /dev/null); then \
6219
				${ECHO_MSG} "===> Removing user-configured options for `${MAKE} -C $$d -V PKGNAME`"; \
6220
				children="$${children} $$(${MAKE} -C $$d -V _DEPEND_DIRS)"; \
6221
			else						\
6222
				${ECHO_MSG} "===> No user-specified options configured for `${MAKE} -C $$d -V PKGNAME`"; \
6223
			fi;						\
6224
			for child in $$children; do			\
6225
				case "$$checked $$l" in			\
6226
				$$child\ *|*\ $$child\ *|*\ $$child)	\
6227
					continue;;			\
6228
				esac;					\
6229
				l="$$l $$child";			\
6230
			done;						\
6231
		done;							\
6232
		L=$$l;							\
6175
	done
6233
	done
6176
.endif
6234
.endif
6177
6235
6236
# This should only be used by rmconfig-recursive.
6237
.if !target(rmconfig-internal)
6238
rmconfig-internal:
6239
.if defined(OPTIONS) && exists(${OPTIONSFILE})
6240
	-@${ECHO_CMD}; \
6241
	optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \
6242
	${RM} -f ${OPTIONSFILE}; \
6243
	${RMDIR} $${optionsdir};
6244
.else
6245
	exit 1;
6246
.endif
6247
.endif
6248
6178
desktop-categories:
6249
desktop-categories:
6179
	@categories=""; \
6250
	@categories=""; \
6180
	for native_category in ${CATEGORIES}; do \
6251
	for native_category in ${CATEGORIES}; do \

Return to bug 141641