--- Mk.orig/Uses/ninja.mk 2016-03-27 01:23:25 UTC +++ Mk/Uses/ninja.mk @@ -7,6 +7,7 @@ # # User defined variables: # NINJA_VERBOSE - Enable verbose output. +# Default: not set, unless BATCH or PACKAGE_BUILDING is defined. # # MAINTAINER: portmgr@FreeBSD.org @@ -17,6 +18,10 @@ IGNORE= Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments .endif +.if defined(BATCH) || defined(PACKAGE_BUILDING) +NINJA_VERBOSE= yes +.endif + .if defined(NINJA_VERBOSE) MAKE_ARGS+= -v .endif --- Mk.orig/bsd.port.mk 2016-09-05 19:23:42 UTC +++ Mk/bsd.port.mk @@ -789,6 +789,11 @@ # CONFIGURE_LOG - The name of configure log file. It will be printed to # the screen if configure fails. # Default: config.log +# CONFIGURE_VERBOSE +# - Enable configure verbose build output. +# Default: not set, unless BATCH or PACKAGE_BUILDING is defined. +# Feature depends from "--disable-silent-rules" configure option +# support. # CONFIGURE_FAIL_MESSAGE # - A message displayed to users when configure # fails (note: this assumes the do-configure @@ -2488,6 +2493,9 @@ GNU_CONFIGURE_MANPREFIX?= ${MANPREFIX} CONFIG_SITE?= ${PORTSDIR}/Templates/config.site CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS} +.if defined(BATCH) || defined(PACKAGE_BUILDING) +CONFIGURE_VERBOSE= yes +.endif .if defined(X_BUILD_FOR) CONFIGURE_ARGS+= --host=${X_BUILD_FOR} .endif @@ -2503,6 +2511,9 @@ if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \ fi ; \ + if [ -n "${CONFIGURE_VERBOSE}" ] && [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--disable-silent-rules'`" ]; then \ + _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --disable-silent-rules" ; \ + fi ; \ if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${GNU_CONFIGURE_PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \ fi ; \