pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Make the display of show-options more readable when...
details: https://anonhg.NetBSD.org/pkgsrc/rev/88619dec3beb
branches: trunk
changeset: 511445:88619dec3beb
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Apr 14 17:15:03 2006 +0000
description:
Make the display of show-options more readable when there are lots of
options, e.g. x11/xorg-server, by wordwrapping the output.
diffstat:
mk/bsd.options.mk | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diffs (40 lines):
diff -r d2b51d018ccb -r 88619dec3beb mk/bsd.options.mk
--- a/mk/bsd.options.mk Fri Apr 14 16:59:04 2006 +0000
+++ b/mk/bsd.options.mk Fri Apr 14 17:15:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.51 2006/04/13 21:45:14 wiz Exp $
+# $NetBSD: bsd.options.mk,v 1.52 2006/04/14 17:15:03 jlam Exp $
#
# This Makefile fragment provides boilerplate code for standard naming
# conventions for handling per-package build options.
@@ -326,6 +326,7 @@
PKG_OPTIONS:= ${PKG_OPTIONS:O:u}
_PKG_OPTIONS_WORDWRAP_FILTER= \
+ ${XARGS} -n 1 | \
${AWK} ' \
BEGIN { printwidth = 40; line = "" } \
{ \
@@ -368,8 +369,11 @@
. endfor
.endfor
@${ECHO}
- @${ECHO} "These options are enabled by default: "${PKG_SUGGESTED_OPTIONS:O:Q}
- @${ECHO} "These options are currently enabled: "${PKG_OPTIONS:O:Q}
+ @${ECHO} "These options are enabled by default:"
+ @${ECHO} ${PKG_SUGGESTED_OPTIONS:O:Q} | ${_PKG_OPTIONS_WORDWRAP_FILTER}
+ @${ECHO} ""
+ @${ECHO} "These options are currently enabled:"
+ @${ECHO} ${PKG_OPTIONS:O:Q} | ${_PKG_OPTIONS_WORDWRAP_FILTER}
. if defined(PKG_OPTIONS_DEPRECATED_WARNINGS)
@${ECHO}
@for l in ${PKG_OPTIONS_DEPRECATED_WARNINGS}; \
@@ -386,7 +390,7 @@
@${ECHO} "=========================================================================="
@${ECHO} "The supported build options for this package are:"
@${ECHO} ""
- @${ECHO} ${PKG_SUPPORTED_OPTIONS:O:Q} | ${XARGS} -n 1 | ${_PKG_OPTIONS_WORDWRAP_FILTER}
+ @${ECHO} ${PKG_SUPPORTED_OPTIONS:O:Q} | ${_PKG_OPTIONS_WORDWRAP_FILTER}
. if !empty(PKG_OPTIONS)
@${ECHO} ""
@${ECHO} "The currently selected options are:"
Home |
Main Index |
Thread Index |
Old Index