[pkgsrc/trunk]: pkgsrc/mk Rename describe-options to show-options, replacing ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/251bb17188e7
branches:  trunk
changeset: 494819:251bb17188e7
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Tue May 31 12:10:07 2005 +0000

description:
Rename describe-options to show-options, replacing the old show-options
target.

diffstat:

 mk/bsd.options.mk |  12 +++---------
 mk/bsd.pkg.mk     |   8 ++++----
 2 files changed, 7 insertions(+), 13 deletions(-)

diffs (55 lines):

diff -r 411f0a81fdd4 -r 251bb17188e7 mk/bsd.options.mk
--- a/mk/bsd.options.mk Tue May 31 11:31:07 2005 +0000
+++ b/mk/bsd.options.mk Tue May 31 12:10:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.26 2005/05/31 11:05:31 dillo Exp $
+# $NetBSD: bsd.options.mk,v 1.27 2005/05/31 12:10:07 dillo Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -198,8 +198,8 @@
                END { if (length(line) > 0) print "     "line }         \
        '
 
-.PHONY: describe-options
-describe-options:
+.PHONY: show-options
+show-options:
        @${ECHO} The following options are supported by this package:
 .for _opt_ in ${PKG_SUPPORTED_OPTIONS:O}
        @${ECHO} "      "${_opt_:Q}"    "`${SED} -n "s/^"${_opt_:Q}"    //p" ../../mk/defaults/options.description`
@@ -208,12 +208,6 @@
        @${ECHO} "These options are enabled by default: "${PKG_SUGGESTED_OPTIONS:O:Q}
        @${ECHO} "These options are currently enabled: "${PKG_OPTIONS:O:Q}
 
-.PHONY: show-options
-show-options:
-       @${ECHO} "available: "${PKG_SUPPORTED_OPTIONS:O:Q}
-       @${ECHO} "default: "${PKG_SUGGESTED_OPTIONS:O:Q}
-       @${ECHO} "enabled: "${PKG_OPTIONS:O:Q}
-
 .if defined(PKG_SUPPORTED_OPTIONS)
 .PHONY: supported-options-message
 pre-extract: supported-options-message
diff -r 411f0a81fdd4 -r 251bb17188e7 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue May 31 11:31:07 2005 +0000
+++ b/mk/bsd.pkg.mk     Tue May 31 12:10:07 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1679 2005/05/29 17:12:16 jmmv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1680 2005/05/31 12:10:07 dillo Exp $
 #
 # This file is in the public domain.
 #
@@ -4083,9 +4083,9 @@
 
 # This target is defined in bsd.options.mk for packages that use
 # the options framework.
-.if !target(describe-options)
-.PHONY: describe-options
-describe-options:
+.if !target(show-options)
+.PHONY: show-options
+show-options:
        @${ECHO} This package does not use the options framework.
 .endif