head 1.29; access; symbols pkgsrc-2023Q4:1.29.0.94 pkgsrc-2023Q4-base:1.29 pkgsrc-2023Q3:1.29.0.92 pkgsrc-2023Q3-base:1.29 pkgsrc-2023Q2:1.29.0.90 pkgsrc-2023Q2-base:1.29 pkgsrc-2023Q1:1.29.0.88 pkgsrc-2023Q1-base:1.29 pkgsrc-2022Q4:1.29.0.86 pkgsrc-2022Q4-base:1.29 pkgsrc-2022Q3:1.29.0.84 pkgsrc-2022Q3-base:1.29 pkgsrc-2022Q2:1.29.0.82 pkgsrc-2022Q2-base:1.29 pkgsrc-2022Q1:1.29.0.80 pkgsrc-2022Q1-base:1.29 pkgsrc-2021Q4:1.29.0.78 pkgsrc-2021Q4-base:1.29 pkgsrc-2021Q3:1.29.0.76 pkgsrc-2021Q3-base:1.29 pkgsrc-2021Q2:1.29.0.74 pkgsrc-2021Q2-base:1.29 pkgsrc-2021Q1:1.29.0.72 pkgsrc-2021Q1-base:1.29 pkgsrc-2020Q4:1.29.0.70 pkgsrc-2020Q4-base:1.29 pkgsrc-2020Q3:1.29.0.68 pkgsrc-2020Q3-base:1.29 pkgsrc-2020Q2:1.29.0.64 pkgsrc-2020Q2-base:1.29 pkgsrc-2020Q1:1.29.0.44 pkgsrc-2020Q1-base:1.29 pkgsrc-2019Q4:1.29.0.66 pkgsrc-2019Q4-base:1.29 pkgsrc-2019Q3:1.29.0.62 pkgsrc-2019Q3-base:1.29 pkgsrc-2019Q2:1.29.0.60 pkgsrc-2019Q2-base:1.29 pkgsrc-2019Q1:1.29.0.58 pkgsrc-2019Q1-base:1.29 pkgsrc-2018Q4:1.29.0.56 pkgsrc-2018Q4-base:1.29 pkgsrc-2018Q3:1.29.0.54 pkgsrc-2018Q3-base:1.29 pkgsrc-2018Q2:1.29.0.52 pkgsrc-2018Q2-base:1.29 pkgsrc-2018Q1:1.29.0.50 pkgsrc-2018Q1-base:1.29 pkgsrc-2017Q4:1.29.0.48 pkgsrc-2017Q4-base:1.29 pkgsrc-2017Q3:1.29.0.46 pkgsrc-2017Q3-base:1.29 pkgsrc-2017Q2:1.29.0.42 pkgsrc-2017Q2-base:1.29 pkgsrc-2017Q1:1.29.0.40 pkgsrc-2017Q1-base:1.29 pkgsrc-2016Q4:1.29.0.38 pkgsrc-2016Q4-base:1.29 pkgsrc-2016Q3:1.29.0.36 pkgsrc-2016Q3-base:1.29 pkgsrc-2016Q2:1.29.0.34 pkgsrc-2016Q2-base:1.29 pkgsrc-2016Q1:1.29.0.32 pkgsrc-2016Q1-base:1.29 pkgsrc-2015Q4:1.29.0.30 pkgsrc-2015Q4-base:1.29 pkgsrc-2015Q3:1.29.0.28 pkgsrc-2015Q3-base:1.29 pkgsrc-2015Q2:1.29.0.26 pkgsrc-2015Q2-base:1.29 pkgsrc-2015Q1:1.29.0.24 pkgsrc-2015Q1-base:1.29 pkgsrc-2014Q4:1.29.0.22 pkgsrc-2014Q4-base:1.29 pkgsrc-2014Q3:1.29.0.20 pkgsrc-2014Q3-base:1.29 pkgsrc-2014Q2:1.29.0.18 pkgsrc-2014Q2-base:1.29 pkgsrc-2014Q1:1.29.0.16 pkgsrc-2014Q1-base:1.29 pkgsrc-2013Q4:1.29.0.14 pkgsrc-2013Q4-base:1.29 pkgsrc-2013Q3:1.29.0.12 pkgsrc-2013Q3-base:1.29 pkgsrc-2013Q2:1.29.0.10 pkgsrc-2013Q2-base:1.29 pkgsrc-2013Q1:1.29.0.8 pkgsrc-2013Q1-base:1.29 pkgsrc-2012Q4:1.29.0.6 pkgsrc-2012Q4-base:1.29 pkgsrc-2012Q3:1.29.0.4 pkgsrc-2012Q3-base:1.29 pkgsrc-2012Q2:1.29.0.2 pkgsrc-2012Q2-base:1.29 pkgsrc-2012Q1:1.28.0.48 pkgsrc-2012Q1-base:1.28 pkgsrc-2011Q4:1.28.0.46 pkgsrc-2011Q4-base:1.28 pkgsrc-2011Q3:1.28.0.44 pkgsrc-2011Q3-base:1.28 pkgsrc-2011Q2:1.28.0.42 pkgsrc-2011Q2-base:1.28 pkgsrc-2011Q1:1.28.0.40 pkgsrc-2011Q1-base:1.28 pkgsrc-2010Q4:1.28.0.38 pkgsrc-2010Q4-base:1.28 pkgsrc-2010Q3:1.28.0.36 pkgsrc-2010Q3-base:1.28 pkgsrc-2010Q2:1.28.0.34 pkgsrc-2010Q2-base:1.28 pkgsrc-2010Q1:1.28.0.32 pkgsrc-2010Q1-base:1.28 pkgsrc-2009Q4:1.28.0.30 pkgsrc-2009Q4-base:1.28 pkgsrc-2009Q3:1.28.0.28 pkgsrc-2009Q3-base:1.28 pkgsrc-2009Q2:1.28.0.26 pkgsrc-2009Q2-base:1.28 pkgsrc-2009Q1:1.28.0.24 pkgsrc-2009Q1-base:1.28 pkgsrc-2008Q4:1.28.0.22 pkgsrc-2008Q4-base:1.28 pkgsrc-2008Q3:1.28.0.20 pkgsrc-2008Q3-base:1.28 cube-native-xorg:1.28.0.18 cube-native-xorg-base:1.28 pkgsrc-2008Q2:1.28.0.16 pkgsrc-2008Q2-base:1.28 cwrapper:1.28.0.14 pkgsrc-2008Q1:1.28.0.12 pkgsrc-2008Q1-base:1.28 pkgsrc-2007Q4:1.28.0.10 pkgsrc-2007Q4-base:1.28 pkgsrc-2007Q3:1.28.0.8 pkgsrc-2007Q3-base:1.28 pkgsrc-2007Q2:1.28.0.6 pkgsrc-2007Q2-base:1.28 pkgsrc-2007Q1:1.28.0.4 pkgsrc-2007Q1-base:1.28 jlam-pkgviews:1.28.0.2 jlam-pkgviews-base:1.28 pkgsrc-2006Q4:1.27.0.6 pkgsrc-2006Q4-base:1.27 pkgsrc-2006Q3:1.27.0.4 pkgsrc-2006Q3-base:1.27 pkgsrc-2006Q2:1.27.0.2 pkgsrc-2006Q2-base:1.27 tv-derecurse-eol:1.2.2.3 pkgsrc-2006Q1:1.26.0.2 pkgsrc-2006Q1-base:1.26 pkgsrc-2005Q4:1.25.0.2 pkgsrc-2005Q4-base:1.25 pkgsrc-2005Q3:1.15.0.2 pkgsrc-2005Q3-base:1.15 pkgsrc-2005Q2:1.11.0.2 pkgsrc-2005Q2-base:1.11 tv-derecurse-merge:1.6 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 tv-derecurse:1.2.0.2 tv-derecurse-base:1.4; locks; strict; comment @# @; 1.29 date 2012.06.13.14.29.16; author gdt; state Exp; branches; next 1.28; 1.28 date 2007.01.30.07.09.40; author wiz; state Exp; branches; next 1.27; 1.27 date 2006.04.07.00.29.52; author reed; state Exp; branches; next 1.26; 1.26 date 2006.01.01.18.53.03; author wiz; state Exp; branches; next 1.25; 1.25 date 2005.12.02.17.29.42; author wiz; state Exp; branches; next 1.24; 1.24 date 2005.12.02.17.07.14; author wiz; state Exp; branches; next 1.23; 1.23 date 2005.12.01.20.21.10; author wiz; state Exp; branches; next 1.22; 1.22 date 2005.12.01.20.11.52; author wiz; state Exp; branches; next 1.21; 1.21 date 2005.12.01.19.47.27; author wiz; state Exp; branches; next 1.20; 1.20 date 2005.12.01.19.19.20; author wiz; state Exp; branches; next 1.19; 1.19 date 2005.12.01.19.09.39; author wiz; state Exp; branches; next 1.18; 1.18 date 2005.12.01.19.07.06; author wiz; state Exp; branches; next 1.17; 1.17 date 2005.12.01.18.22.46; author wiz; state Exp; branches; next 1.16; 1.16 date 2005.10.03.21.25.17; author wiz; state Exp; branches; next 1.15; 1.15 date 2005.08.29.14.28.25; author tv; state Exp; branches; next 1.14; 1.14 date 2005.08.01.14.56.44; author wiz; state Exp; branches; next 1.13; 1.13 date 2005.08.01.12.19.37; author wiz; state Exp; branches; next 1.12; 1.12 date 2005.08.01.11.37.38; author wiz; state Exp; branches; next 1.11; 1.11 date 2005.06.06.13.54.51; author dillo; state Exp; branches; next 1.10; 1.10 date 2005.06.02.22.20.37; author wiz; state Exp; branches; next 1.9; 1.9 date 2005.05.31.21.50.56; author wiz; state Exp; branches; next 1.8; 1.8 date 2005.05.31.11.24.33; author dillo; state Exp; branches; next 1.7; 1.7 date 2005.05.31.10.01.40; author dillo; state Exp; branches; next 1.6; 1.6 date 2005.05.08.13.43.31; author dillo; state Exp; branches; next 1.5; 1.5 date 2005.03.28.09.39.57; author jlam; state Exp; branches; next 1.4; 1.4 date 2005.03.06.02.43.05; author wiz; state Exp; branches; next 1.3; 1.3 date 2005.02.07.11.35.41; author jlam; state Exp; branches; next 1.2; 1.2 date 2004.11.17.23.28.12; author jlam; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2004.10.06.20.51.47; author jlam; state Exp; branches; next ; 1.2.2.1 date 2005.02.11.15.27.57; author tv; state Exp; branches; next 1.2.2.2; 1.2.2.2 date 2005.03.06.02.47.42; author tv; state Exp; branches; next 1.2.2.3; 1.2.2.3 date 2005.05.17.18.29.45; author tv; state Exp; branches; next 1.2.2.4; 1.2.2.4 date 2006.06.07.15.25.39; author tv; state dead; branches; next ; desc @@ 1.29 log @Drop USE_INET6 => inet6 option binding. For a long time, the norm in pkgsrc was that packages had an option for IPv6 support "inet6", and this was not in PKG_SUGGESTED_OPTIONS. On NetBSD (and probably other BSD), USE_INET6 was defined in system mk files, and pkgsrc noticed this and enabled the inet6 option globally. But, in some environments, this did not happen. The inet6 option has been added to PKG_SUGGESTED_OPTIONS for almost all packages. This change decouples IPv6 support in pkgsrc from the base system. People building on systems that do not support IPv6, or who do not want IPv6 support in packages, can add PKG_DEFAULT_OPTIONS+= -inet6 to mk.conf. (Discussed for the last week on various lists, and ok wiz@@.) @ text @# $NetBSD: obsolete.mk,v 1.28 2007/01/30 07:09:40 wiz Exp $ # # This file holds make(1) logic to allow obsolete or deprecated variables # still to be used. These may eventually disappear over time as the contents # are, by definition, obsolete and deprecated. .if defined(PRIV_CONF_DIR) PKG_SYSCONFDIR.priv?= ${PRIV_CONF_DIR} .endif ### ### Set PKG_LEGACY_OPTIONS based on to-be-deprecated global variables. ### .if defined(KERBEROS) . if ${KERBEROS} == "4" && !empty(PKG_SUPPORTED_OPTIONS:Mkerberos4) PKG_LEGACY_OPTIONS+= kerberos4 PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos4 instead." . elif !empty(PKG_SUPPORTED_OPTIONS:Mkerberos) PKG_LEGACY_OPTIONS+= kerberos PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos instead." . endif .endif @ 1.28 log @Remove obsolete IGNORE_RECOMMENDED support after two branches. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.27 2006/04/07 00:29:52 reed Exp $ a23 2 PKG_OPTIONS_LEGACY_VARS+= USE_INET6:inet6 @ 1.27 log @For backwards compatibility ... IGNORE_RECOMMENDED is deprecated and will be removed after 2006Q2 branch. If YES then it sets USE_ABI_DEPENDS=no (Forgot to commit earlier today.) @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.26 2006/01/01 18:53:03 wiz Exp $ a25 7 # # IGNORE_RECOMMENDED is deprecated and will be removed after 2006Q2 branch. # .if defined(IGNORE_RECOMMENDED) && !empty(IGNORE_RECOMMENDED:M[yY][eE][sS]) USE_ABI_DEPENDS= no .endif @ 1.26 log @Remove stuff that was marked for removal after 2005Q4. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.25 2005/12/02 17:29:42 wiz Exp $ d26 7 @ 1.25 log @Remove legacy option translations for postgresql, they have been here for over 4 months. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.24 2005/12/02 17:07:14 wiz Exp $ a25 22 # remove everything below this line after 2005Q4 .if defined(USE_SOCKS) . if ${USE_SOCKS} == "4" && !empty(PKG_SUPPORTED_OPTIONS:Msocks4) PKG_LEGACY_OPTIONS+= socks4 PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks4 instead." . elif ${USE_SOCKS} == "5" && !empty(PKG_SUPPORTED_OPTIONS:Msocks5) PKG_LEGACY_OPTIONS+= socks5 PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks5 instead." . endif .endif PKG_OPTIONS_LEGACY_VARS+= USE_CANNA:canna PKG_OPTIONS_LEGACY_VARS+= USE_CUPS:cups PKG_OPTIONS_LEGACY_VARS+= USE_I586:i586 PKG_OPTIONS_LEGACY_VARS+= USE_OPENLDAP:ldap PKG_OPTIONS_LEGACY_VARS+= USE_OSS:oss PKG_OPTIONS_LEGACY_VARS+= USE_RSAREF2:rsaref PKG_OPTIONS_LEGACY_VARS+= USE_SASL:sasl PKG_OPTIONS_LEGACY_VARS+= USE_SASL2:sasl PKG_OPTIONS_LEGACY_VARS+= USE_SJ3:sj3 PKG_OPTIONS_LEGACY_VARS+= USE_WNN4:wnn4 PKG_OPTIONS_LEGACY_VARS+= USE_XFACE:xface @ 1.24 log @Mark USE_SOCKS handling as to-be-deprecated after 2005Q4. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.23 2005/12/01 20:21:10 wiz Exp $ a24 4 PKG_OPTIONS_LEGACY_OPTS+= postgresql:pgsql PKG_OPTIONS_LEGACY_OPTS+= postgresql73:pgsql PKG_OPTIONS_LEGACY_OPTS+= postgresql74:pgsql @ 1.23 log @Mark USE_RSAREF for removal after 2005Q4. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.22 2005/12/01 20:11:52 wiz Exp $ d24 8 a40 8 PKG_OPTIONS_LEGACY_OPTS+= postgresql:pgsql PKG_OPTIONS_LEGACY_OPTS+= postgresql73:pgsql PKG_OPTIONS_LEGACY_OPTS+= postgresql74:pgsql PKG_OPTIONS_LEGACY_VARS+= USE_INET6:inet6 # remove after 2005Q4 @ 1.22 log @Mark USE_OPENLDAP for removal after 2005Q4. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.21 2005/12/01 19:47:27 wiz Exp $ a38 1 PKG_OPTIONS_LEGACY_VARS+= USE_RSAREF2:rsaref d46 1 @ 1.21 log @Remove obsolete USE_INN; LEGACY_VARS handling is in trn's options.mk. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.20 2005/12/01 19:19:20 wiz Exp $ a38 1 PKG_OPTIONS_LEGACY_VARS+= USE_OPENLDAP:ldap d45 1 @ 1.20 log @Mark USE_OSS for removal after 2005Q4. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.19 2005/12/01 19:09:39 wiz Exp $ a38 1 PKG_OPTIONS_LEGACY_VARS+= USE_INN:inn @ 1.19 log @Mark USE_XFACE for removal after 2005Q4. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.18 2005/12/01 19:07:06 wiz Exp $ a40 1 PKG_OPTIONS_LEGACY_VARS+= USE_OSS:oss d47 1 @ 1.18 log @Mark USE_CANNA, USE_SJ3, and USE_WNN4 for removal after 2005Q4. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.17 2005/12/01 18:22:46 wiz Exp $ a42 1 PKG_OPTIONS_LEGACY_VARS+= USE_XFACE:xface d52 1 @ 1.17 log @Mark some PKG_OPTIONS_LEGACY_VARS for removal after 2005Q4. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.16 2005/10/03 21:25:17 wiz Exp $ a37 1 PKG_OPTIONS_LEGACY_VARS+= USE_CANNA:canna a42 2 PKG_OPTIONS_LEGACY_VARS+= USE_SJ3:sj3 PKG_OPTIONS_LEGACY_VARS+= USE_WNN4:wnn4 d46 1 d51 2 @ 1.16 log @Remove some PKG_OPTIONS_LEGACY_VARS that were due to be removed after pkgsrc-2005Q3. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.15 2005/08/29 14:28:25 tv Exp $ a38 2 PKG_OPTIONS_LEGACY_VARS+= USE_CUPS:cups PKG_OPTIONS_LEGACY_VARS+= USE_I586:i586 a43 2 PKG_OPTIONS_LEGACY_VARS+= USE_SASL:sasl PKG_OPTIONS_LEGACY_VARS+= USE_SASL2:sasl d47 6 @ 1.15 log @Map legacy "postgresql*" options to standard "pgsql". @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.14 2005/08/01 14:56:44 wiz Exp $ a50 4 # remove following after pkgsrc-2005Q3 PKG_OPTIONS_LEGACY_VARS+= USE_DB4:db4 PKG_OPTIONS_LEGACY_VARS+= USE_MILTER:milter @ 1.14 log @Another variable can be removed after the next branch. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.13 2005/08/01 12:19:37 wiz Exp $ d34 4 @ 1.13 log @Add comment that USE_MILTER legacy handling can be removed after 2005Q3. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.12 2005/08/01 11:37:38 wiz Exp $ a35 1 PKG_OPTIONS_LEGACY_VARS+= USE_DB4:db4 d49 1 @ 1.12 log @Remove some legacy vars that were removed from pkgsrc before the previous branch. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.11 2005/06/06 13:54:51 dillo Exp $ a39 1 PKG_OPTIONS_LEGACY_VARS+= USE_MILTER:milter d48 3 @ 1.11 log @make legacy variables external: PKG_LEGACY_OPTIONS PKG_OPTIONS_DEPRECATED_WARNINGS @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.10 2005/06/02 22:20:37 wiz Exp $ a36 2 PKG_OPTIONS_LEGACY_VARS+= USE_ESOUND:esound PKG_OPTIONS_LEGACY_VARS+= USE_GIF:gif a37 1 PKG_OPTIONS_LEGACY_VARS+= USE_IDEA:idea a39 1 PKG_OPTIONS_LEGACY_VARS+= USE_LIBCRACK:libcrack a40 1 PKG_OPTIONS_LEGACY_VARS+= USE_MMX:mmx a42 1 PKG_OPTIONS_LEGACY_VARS+= USE_PAM:pam a46 1 PKG_OPTIONS_LEGACY_VARS+= USE_SSL:ssl a48 2 PKG_OPTIONS_LEGACY_OPTS+= PAM:pam @ 1.10 log @Fix USE_SOCKS=5 case. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.9 2005/05/31 21:50:56 wiz Exp $ d12 1 a12 1 ### Set _PKG_LEGACY_OPTIONS based on to-be-deprecated global variables. d17 2 a18 2 _PKG_LEGACY_OPTIONS+= kerberos4 _DEPRECATED_WARNING+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos4 instead." d20 2 a21 2 _PKG_LEGACY_OPTIONS+= kerberos _DEPRECATED_WARNING+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos instead." d26 2 a27 2 _PKG_LEGACY_OPTIONS+= socks4 _DEPRECATED_WARNING+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks4 instead." d29 2 a30 2 _PKG_LEGACY_OPTIONS+= socks5 _DEPRECATED_WARNING+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks5 instead." @ 1.9 log @Suggest pam instead of PAM as USE_PAM replacement. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.8 2005/05/31 11:24:33 dillo Exp $ d28 1 a28 1 . elif ${USE_SOCKS} == "5 && !empty(PKG_SUPPORTED_OPTIONS:Msocks5)" @ 1.8 log @Rename option PAM to pam (so all options are lower case). Backwards compatibility provided via PKG_OPTIONS_LEGACY_OPTS. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.7 2005/05/31 10:01:40 dillo Exp $ d48 1 a48 1 PKG_OPTIONS_LEGACY_VARS+= USE_PAM:PAM @ 1.7 log @Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a user settable variable. Set PKG_SUGGESTED_OPTIONS instead. Also, make use of PKG_OPTIONS_LEGACY_VARS. Reviewed by wiz. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.6 2005/05/08 13:43:31 dillo Exp $ d56 2 @ 1.6 log @Rewrite how PKG_OPTIONS is computed: - PKG_SUGGESTED_OPTIONS (set by pkg maintainer in pkg Makefile) lists options enabled by default. - PKG_DEFAULT_OPTIONS (set by user in /etc/mk.conf) enables or disables (when prefixed with `-') options for all packages, takes precedence over PKG_SUGGESTED_OPTIONS - PKG_OPTIONS.foo (set by user in /etc/mk.conf) enables or disables (when prefixed with `-') options for a specific package, takes precedence over PKG_DEFAULT_OPTIONS and PKG_SUGGESTED_OPTIONS Also simplify conversion of legacy USE_XXX variables to options via the new PKG_OPTIONS_LEGACY_VARS variable and emit warnings if legacy variables are in use. Add a new target describe-options that lists all supported options with a one-line description, the options enabled by default and the currently enabled optoions. Reviewed by jlam and wiz. XXX: defaults/options.description has to be filled in XXX: the pkgsrc guide has to be updated @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.5 2005/03/28 09:39:57 jlam Exp $ d41 1 d44 1 d48 1 d53 1 @ 1.5 log @Remove security/cyrus-sasl and security/cy-login. These packages tracked the Cyrus SASL 1.5.x releases, which are no longer maintained. Adjust packages to use security/cyrus-sasl2 instead for SASL support. This closes PR pkg/28218 and PR pkg/29736. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.4 2005/03/06 02:43:05 wiz Exp $ d12 1 a12 1 ### Set PKG_DEFAULT_OPTIONS based on to-be-deprecated global variables. d14 1 d16 6 a21 4 . if ${KERBEROS} == "4" PKG_DEFAULT_OPTIONS+= kerberos4 . else PKG_DEFAULT_OPTIONS+= kerberos a23 48 .if defined(USE_CANNA) && !empty(USE_CANNA:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= canna .endif .if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= cups .endif .if defined(USE_DB4) && !empty(USE_DB4:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= db4 .endif .if defined(USE_ESOUND) && !empty(USE_ESOUND:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= esound .endif .if defined(USE_GIF) PKG_DEFAULT_OPTIONS+= gif .endif .if defined(USE_I586) && !empty(USE_I586:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= i586 .endif .if defined(USE_IDEA) && !empty(USE_IDEA:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= idea .endif .if defined(USE_INN) && !empty(USE_INN:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= inn .endif .if defined(USE_LIBCRACK) && !empty(USE_LIBCRACK:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= libcrack .endif .if defined(USE_MMX) && !empty(USE_MMX:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= mmx .endif .if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= ldap .endif .if defined(USE_OSS) PKG_DEFAULT_OPTIONS+= oss .endif .if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= rsaref .endif .if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= sasl .endif .if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= sasl .endif .if defined(USE_SJ3) && !empty(USE_SJ3:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= sj3 .endif d25 6 a30 4 . if ${USE_SOCKS} == "4" PKG_DEFAULT_OPTIONS+= socks4 . elif ${USE_SOCKS} == "5" PKG_DEFAULT_OPTIONS+= socks5 d33 19 a51 6 .if defined(USE_WNN4) && !empty(USE_WNN4:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= wnn4 .endif .if defined(USE_XFACE) && !empty(USE_XFACE:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= xface .endif @ 1.4 log @Add sasl2 to PKG_DEFAULT_OPTIONS when USE_SASL2 is set, not sasl. From Lloyd Parkes in PR 29604. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.3 2005/02/07 11:35:41 jlam Exp $ d12 1 a12 1 ### Set PKG_DEFAULT_OPTIONS based on global variable settings. d64 1 a64 1 PKG_DEFAULT_OPTIONS+= sasl2 @ 1.3 log @Instantly deprecate USE_PAM from pkgsrc as its value is being set from within NetBSD-current's bsd.own.mk, which conflicts with its usage in pkgsrc. The package that use USE_PAM have been converted to use the bsd.options.mk framework. This should fix PR pkg/29257. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.2 2004/11/17 23:28:12 jlam Exp $ d64 1 a64 1 PKG_DEFAULT_OPTIONS+= sasl @ 1.2 log @Remove some obsolete/deprecated variables that have been in this file for over two years. They're officially dead now for the upcoming branch and beyond. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $ a56 3 .if defined(USE_PAM) PKG_DEFAULT_OPTIONS+= PAM .endif @ 1.2.2.1 log @sync with HEAD @ text @d1 1 a1 1 # $NetBSD$ d57 3 @ 1.2.2.2 log @sync with HEAD @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.2.2.1 2005/02/11 15:27:57 tv Exp $ d64 1 a64 1 PKG_DEFAULT_OPTIONS+= sasl2 @ 1.2.2.3 log @sync [all but bsd.pkg.mk] with HEAD @ text @d1 1 a1 1 # $NetBSD$ d12 1 a12 1 ### Set _PKG_LEGACY_OPTIONS based on to-be-deprecated global variables. a13 1 d15 4 a18 6 . if ${KERBEROS} == "4" && !empty(PKG_SUPPORTED_OPTIONS:Mkerberos4) _PKG_LEGACY_OPTIONS+= kerberos4 _DEPRECATED_WARNING+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos4 instead." . elif !empty(PKG_SUPPORTED_OPTIONS:Mkerberos) _PKG_LEGACY_OPTIONS+= kerberos _DEPRECATED_WARNING+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos instead." d21 48 d70 4 a73 6 . if ${USE_SOCKS} == "4" && !empty(PKG_SUPPORTED_OPTIONS:Msocks4) _PKG_LEGACY_OPTIONS+= socks4 _DEPRECATED_WARNING+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks4 instead." . elif ${USE_SOCKS} == "5 && !empty(PKG_SUPPORTED_OPTIONS:Msocks5)" _PKG_LEGACY_OPTIONS+= socks5 _DEPRECATED_WARNING+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks5 instead." d76 6 a81 19 PKG_OPTIONS_LEGACY_VARS+= USE_CANNA:canna PKG_OPTIONS_LEGACY_VARS+= USE_CUPS:cups PKG_OPTIONS_LEGACY_VARS+= USE_DB4:db4 PKG_OPTIONS_LEGACY_VARS+= USE_ESOUND:esound PKG_OPTIONS_LEGACY_VARS+= USE_GIF:gif PKG_OPTIONS_LEGACY_VARS+= USE_I586:i586 PKG_OPTIONS_LEGACY_VARS+= USE_IDEA:idea PKG_OPTIONS_LEGACY_VARS+= USE_INN:inn PKG_OPTIONS_LEGACY_VARS+= USE_LIBCRACK:libcrack PKG_OPTIONS_LEGACY_VARS+= USE_MMX:mmx PKG_OPTIONS_LEGACY_VARS+= USE_OPENLDAP:ldap PKG_OPTIONS_LEGACY_VARS+= USE_OSS:oss PKG_OPTIONS_LEGACY_VARS+= USE_RSAREF2:rsaref PKG_OPTIONS_LEGACY_VARS+= USE_SASL:sasl PKG_OPTIONS_LEGACY_VARS+= USE_SASL2:sasl PKG_OPTIONS_LEGACY_VARS+= USE_SJ3:sj3 PKG_OPTIONS_LEGACY_VARS+= USE_WNN4:wnn4 PKG_OPTIONS_LEGACY_VARS+= USE_XFACE:xface @ 1.2.2.4 log @EOL the tv-derecurse branch; it has become too outdated. The last live revision can be fetched at the tv-derecurse-eol tag. @ text @d1 1 a1 1 # $NetBSD: obsolete.mk,v 1.2.2.3 2005/05/17 18:29:45 tv Exp $ @ 1.1 log @Reorganize some of the files under pkgsrc/mk: (1) defs.${OPSYS}.mk --> platform/${OPSYS}.mk. The "platform" subdirectory is where all of the ${OPSYS}-specific infrastructure logic should reside. (2) bsd.pkg.defaults.mk --> defaults/mk.conf bsd.pkg.obsolete.mk --> defaults/obsolete.mk Renaming bsd.pkg.defaults.mk to defaults/mk.conf is to mimic the way that NetBSD has /etc/rc.conf as well as /etc/defaults/rc.conf, where the latter is a full list of user-settable variables, and the two files share the same name to reinforce the fact /etc/defaults/rc.conf can be directly copied in place as /etc/rc.conf. This is the same relationship shared by defaults/mk.conf and /etc/mk.conf. @ text @d1 1 a1 1 # $NetBSD: bsd.pkg.obsolete.mk,v 1.17 2004/08/22 19:10:26 jlam Exp $ a6 42 .if defined(APACHE_SUEXEC_USER) APACHE_USER?= ${APACHE_SUEXEC_USER} .endif .if defined(APACHE_SYSCONFDIR) PKG_SYSCONFDIR.ap-ssl?= ${APACHE_SYSCONFDIR} PKG_SYSCONFDIR.apache?= ${APACHE_SYSCONFDIR} PKG_SYSCONFDIR.apache6?= ${APACHE_SYSCONFDIR} PKG_SYSCONFDIR.apc-gui?= ${APACHE_SYSCONFDIR} PKG_SYSCONFDIR.cvsweb?= ${APACHE_SYSCONFDIR} PKG_SYSCONFDIR.imp?= ${APACHE_SYSCONFDIR} PKG_SYSCONFDIR.horde?= ${APACHE_SYSCONFDIR} PKG_SYSCONFDIR.p5-HTTPD-User-Manage?= ${APACHE_SYSCONFDIR} PKG_SYSCONFDIR.squirrelmail?= ${APACHE_SYSCONFDIR} PKG_SYSCONFDIR.stripes?= ${APACHE_SYSCONFDIR} .endif .if defined(PHP_CONFDIR) PKG_SYSCONFDIR.php?= ${PHP_CONFDIR} .endif .if defined(SSH_CONF_DIR) PKG_SYSCONFDIR.openssh?= ${SSH_CONF_DIR} PKG_SYSCONFDIR.ssh?= ${SSH_CONF_DIR} .endif .if defined(VTUN_SYSCONFDIR) PKG_SYSCONFDIR.vtun?= ${VTUN_SYSCONFDIR} .endif .if defined(SAMBA_WITH_CUPS) USE_CUPS= YES .endif .if defined(SQUID_SYSCONFDIR) PKG_SYSCONFDIR.squid?= ${SQUID_SYSCONFDIR} .endif .if defined(ELK_USE_X11) ELK_GUI= xaw .endif @