socsvn commit: r238494 - soc2012/scher/par_ports/head/Mk
scher at FreeBSD.org
scher at FreeBSD.org
Thu Jun 28 19:57:57 UTC 2012
Author: scher
Date: Thu Jun 28 19:57:55 2012
New Revision: 238494
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238494
Log:
[user_feedback] minor changes in make targets
Modified:
soc2012/scher/par_ports/head/Mk/bsd.parallel.mk
Modified: soc2012/scher/par_ports/head/Mk/bsd.parallel.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.parallel.mk Thu Jun 28 19:06:16 2012 (r238493)
+++ soc2012/scher/par_ports/head/Mk/bsd.parallel.mk Thu Jun 28 19:57:55 2012 (r238494)
@@ -552,16 +552,16 @@
fi; \
done; \
if [ $${license_to_ask} ]; then \
- ${ECHO_CMD} "The following ports will ask for license conformation:"; \
+ ${ECHO_CMD} " The following ports will ask for license conformation:"; \
for port in $${license_to_ask}; do \
- ${ECHO_CMD} " $${port}"; \
+ ${ECHO_CMD} " $${port}"; \
done; \
- ${ECHO_CMD} "Unable to process in parallel way."; \
- ${ECHO_CMD} "Call:"; \
- ${ECHO_CMD} " make -D_parv_WANT_NON_PARALLEL_BUILD patch"; \
- ${ECHO_CMD} "in the following directories:"; \
+ ${ECHO_CMD} " Unable to process in parallel way."; \
+ ${ECHO_CMD} " Call:"; \
+ ${ECHO_CMD} " make -D_parv_WANT_NON_PARALLEL_BUILD patch"; \
+ ${ECHO_CMD} " in the following directories:"; \
for dir in $${dirs_to_process}; do \
- ${ECHO_CMD} " $${dir}"; \
+ ${ECHO_CMD} " $${dir}"; \
done; \
exit 1; \
fi
@@ -582,6 +582,7 @@
# TODO: shift to the beginning
_parv_CHECKED_CONFIG_F_PREFIX= already-checked-config
+# TODO: doc is needed
config-recursive: config-conditional
@if [ ! ${DEP_CHECK_CONFIG} ]; then \
already_checked_file=/tmp/${_parv_CHECKED_CONFIG_F_PREFIX}.${.MAKE.PID}; \
@@ -592,7 +593,7 @@
fi; \
for dir in $$(${MAKE} run-depends-list build-depends-list | uniq); do \
if [ ! $$(grep $${dir}$$ $${already_checked_file}) ]; then \
- ${ECHO_CMD} configure options for $${dir}; \
+ ${ECHO_CMD} " configure options for $${dir}"; \
( cd $${dir}; \
${MAKE} "DEP_CHECK_CONFIG=$${already_checked_file}" config-recursive ); \
${ECHO_CMD} $${dir} >> $${already_checked_file}; \
@@ -617,15 +618,13 @@
}; \
done; \
if [ -n "$${conflicts_with}" ]; then \
- ${_dparv_START_OUTPUT}; \
${ECHO_MSG}; \
- ${ECHO_MSG} "===> ${PKGNAME} conflicts with currently installing package(s): "; \
+ ${ECHO_MSG} "===> ${PKGNAME} conflicts with currently installing package(s): "; \
for entry in $${conflicts_with}; do \
- ${ECHO_MSG} " $${entry}"; \
+ ${ECHO_MSG} " $${entry}"; \
done; \
${ECHO_MSG}; \
- ${ECHO_MSG} " Please remove them first with pkg_delete(1)."; \
- ${_dparv_END_OUTPUT}; \
+ ${ECHO_MSG} " Please remove them first with pkg_delete(1)."; \
exit 1; \
fi
.endif
More information about the svn-soc-all
mailing list