diff options
| author | jlam <jlam> | 2007-09-07 22:12:10 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2007-09-07 22:12:10 +0000 |
| commit | 8fb7d902eedfbb493ada3287ea8f957d43e32ae3 (patch) | |
| tree | e65f4ff0343b21db10e01b4ee2a8fa56a72846a8 /mk/bsd.prefs.mk | |
| parent | 080f1d43dd82349717f70720539e3bd583864e4a (diff) | |
| download | pkgsrc-8fb7d902eedfbb493ada3287ea8f957d43e32ae3.tar.gz | |
Convert packages that test and use USE_INET6 to use the options framework
and to support the "inet6" option instead.
Remaining usage of USE_INET6 was solely for the benefit of the scripts
that generate the README.html files. Replace:
BUILD_DEFS+= USE_INET6
with
BUILD_DEFS+= IPV6_READY
and teach the README-generation tools to look for that instead.
This nukes USE_INET6 from pkgsrc proper. We leave a tiny bit of code
to continue to support USE_INET6 for pkgsrc-wip until it has been nuked
from there as well.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 714e6c72c22..a58643d8a31 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.266 2007/09/07 21:55:44 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.267 2007/09/07 22:12:14 jlam Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -456,18 +456,17 @@ PKG_INSTALLATION_TYPE?= ${PKG_INSTALLATION_TYPES:M${_pref_}:S/^/_pkginsttype_/1: PKG_INSTALLATION_TYPE?= none # if the system is IPv6-ready, compile with IPv6 support turned on. -.if defined(USE_INET6) -. if empty(USE_INET6:M[Yy][Ee][Ss]) -USE_INET6= NO -. else -USE_INET6= YES -. endif -.elif empty(_OPSYS_HAS_INET6:M[nN][oO]) -USE_INET6= YES +.if empty(_OPSYS_HAS_INET6:M[nN][oO]) +IPV6_READY= YES .else -USE_INET6= NO +IPV6_READY= NO .endif +# XXX +# XXX Retain the following until USE_INET6 has been purged from pkgsrc-wip. +# XXX +USE_INET6= ${IPV6_READY} + LOCALBASE?= /usr/pkg X11_TYPE?= native .if !empty(X11_TYPE:Mnative) |