[pkgsrc/trunk]: pkgsrc/mk Merge down janitorial change from tv-derecurse branch:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a449ae96a415
branches:  trunk
changeset: 488070:a449ae96a415
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Jan 24 18:04:24 2005 +0000

description:
Merge down janitorial change from tv-derecurse branch:

No need to do .som_done dance; just show the message as part of the
pre-extract phase.  If that means showing it more than once if the extract
is interrupted and restarted, no harm done.

diffstat:

 mk/bsd.options.mk |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (34 lines):

diff -r e5cb4be87515 -r a449ae96a415 mk/bsd.options.mk
--- a/mk/bsd.options.mk Mon Jan 24 17:57:15 2005 +0000
+++ b/mk/bsd.options.mk Mon Jan 24 18:04:24 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.15 2005/01/15 08:59:28 adrianp Exp $
+# $NetBSD: bsd.options.mk,v 1.16 2005/01/24 18:04:24 tv Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -192,13 +192,10 @@
        @${ECHO} "default: ${_PKG_OPTIONS_DEFAULT}"
        @${ECHO} "enabled: ${_PKG_OPTIONS_ENABLED}"
 
-.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 defined(PKG_SUPPORTED_OPTIONS)
+.PHONY: supported-options-message
+pre-extract: supported-options-message
+supported-options-message:
 .  if !empty(PKG_SUPPORTED_OPTIONS)
        @${ECHO} "=========================================================================="
        @${ECHO} "The supported build options for this package are:"
@@ -226,6 +223,5 @@
 .    undef _var_
        @${ECHO} ""
        @${ECHO} "=========================================================================="
-       @${TOUCH} ${.TARGET}
 .  endif
 .endif