summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authordillo <dillo>2005-06-02 21:55:05 +0000
committerdillo <dillo>2005-06-02 21:55:05 +0000
commitce1bd5e3f96bce0feebcded52850c9ab7f6e0f66 (patch)
tree539a71cbeadb89375c00a3f9bdd27305f3f06101 /mk
parent8e70c064e3f6c260c776cc1897dafdfc30616098 (diff)
downloadpkgsrc-ce1bd5e3f96bce0feebcded52850c9ab7f6e0f66.tar.gz
add group options to PKG_SUPPORTED_OPTIONS before includeing
mk/defaults/obsolete.mk so socks and kerberos work when listed in groups
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.options.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk
index a9dcc16f9a3..2ff040ee6d6 100644
--- a/mk/bsd.options.mk
+++ b/mk/bsd.options.mk
@@ -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_SUPPORTED_OPTIONS is not defined."
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 @@ _PKG_OPTIONS_GROUP_MAP.${_opt_}=${_cls_}
.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}