[pkgsrc/trunk]: pkgsrc/mk add group options to PKG_SUPPORTED_OPTIONS before i...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1aeff891544
branches:  trunk
changeset: 495127:f1aeff891544
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Thu Jun 02 21:55:05 2005 +0000

description:
add group options to PKG_SUPPORTED_OPTIONS before includeing
mk/defaults/obsolete.mk so socks and kerberos work when listed in
groups

diffstat:

 mk/bsd.options.mk |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 62c7dc964ee6 -r f1aeff891544 mk/bsd.options.mk
--- a/mk/bsd.options.mk Thu Jun 02 21:50:21 2005 +0000
+++ b/mk/bsd.options.mk Thu Jun 02 21:55:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.33 2005/06/02 20:43:55 wiz Exp $
+# $NetBSD: bsd.options.mk,v 1.34 2005/06/02 21:55:05 dillo Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -126,9 +126,6 @@
 PKG_FAIL_REASON+=      "bsd.options.mk: PKG_OPTIONS_VAR is not defined."
 .else # process the rest of the file
 
-# include deprecated variable to options mapping
-.include "${.CURDIR}/../../mk/defaults/obsolete.mk"
-
 #
 # create map of option to group and add group options to PKG_SUPPORTED_OPTOINS
 #
@@ -141,6 +138,11 @@
 .endfor
 
 #
+# include deprecated variable to options mapping
+#
+.include "${.CURDIR}/../../mk/defaults/obsolete.mk"
+
+#
 # place options imlied by legacy variables in _PKG_LEGACY_OPTIONS
 #
 .for _m_ in ${PKG_OPTIONS_LEGACY_VARS}