[pkgsrc/trunk]: pkgsrc/mk Output the currently selected options after telling...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b20b95ce3424
branches:  trunk
changeset: 484353:b20b95ce3424
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Nov 27 04:50:55 2004 +0000

description:
Output the currently selected options after telling the user which
options are available.

diffstat:

 mk/bsd.options.mk |  34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diffs (55 lines):

diff -r 9f756e6eccff -r b20b95ce3424 mk/bsd.options.mk
--- a/mk/bsd.options.mk Sat Nov 27 04:41:45 2004 +0000
+++ b/mk/bsd.options.mk Sat Nov 27 04:50:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.9 2004/09/15 03:59:17 jlam Exp $
+# $NetBSD: bsd.options.mk,v 1.10 2004/11/27 04:50:55 jlam Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -160,18 +160,7 @@
 .  endif
 .endfor
 
-.PHONY: pre-install-depends supported-options-message
-pre-install-depends: supported-options-message
-.if !defined(PKG_SUPPORTED_OPTIONS)
-supported-options-message: # do nothing
-.else
-supported-options-message: ${WRKDIR}/.som_done
-${WRKDIR}/.som_done: ${WRKDIR}
-.  if !empty(PKG_SUPPORTED_OPTIONS)
-       @${ECHO} "=========================================================================="
-       @${ECHO} "The supported build options for this package are:"
-       @${ECHO} ""
-       @${ECHO} "${PKG_SUPPORTED_OPTIONS}" | ${XARGS} -n 1 | ${SORT} | \
+_PKG_OPTIONS_WORDWRAP_FILTER=                                          \
        ${AWK} '                                                        \
                BEGIN { printwidth = 40; line = "" }                    \
                {                                                       \
@@ -186,6 +175,25 @@
                }                                                       \
                END { if (length(line) > 0) print "     "line }         \
        '
+
+.PHONY: pre-install-depends supported-options-message
+pre-install-depends: supported-options-message
+.if !defined(PKG_SUPPORTED_OPTIONS)
+supported-options-message: # do nothing
+.else
+supported-options-message: ${WRKDIR}/.som_done
+${WRKDIR}/.som_done: ${WRKDIR}
+.  if !empty(PKG_SUPPORTED_OPTIONS)
+       @${ECHO} "=========================================================================="
+       @${ECHO} "The supported build options for this package are:"
+       @${ECHO} ""
+       @${ECHO} "${PKG_SUPPORTED_OPTIONS}" | ${XARGS} -n 1 | ${SORT} | \
+               ${_PKG_OPTIONS_WORDWRAP_FILTER}
+       @${ECHO} ""
+       @${ECHO} "The currently selected options are:"
+       @${ECHO} ""
+       @${ECHO} "${PKG_OPTIONS}" | ${XARGS} -n 1 | ${SORT} |           \
+               ${_PKG_OPTIONS_WORDWRAP_FILTER}
        @${ECHO} ""
        @${ECHO} "You can select which build options to use by setting the following"
        @${ECHO} "variables.  Their current value is shown:"