diff options
| author | leot <leot@pkgsrc.org> | 2018-06-25 10:01:51 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2018-06-25 10:01:51 +0000 |
| commit | 372f420c1d7e43c3d611482d547daef52b19025b (patch) | |
| tree | 46e8a2b42c3998d4751dba2061c7fc2a4fa1f08a /print/cups-base | |
| parent | 8cac434fae24232b403ee7fbc38ae78ec31ff118 (diff) | |
| download | pkgsrc-372f420c1d7e43c3d611482d547daef52b19025b.tar.gz | |
cups-base: Rename PKG_OPTIONS.cups to PKG_OPTIONS.cups-base
Using a PKG_OPTIONS_VAR that is different to PKGBASE is problematic when
PKG_BUILD_OPTIONS is used. Deprecate the `cups' option (via PKG_LEGACY_OPTIONS
so if `cups' is still used everything will continue to work) in favour of
`cups-base'.
Thanks to <bouyer> for pointing out this problem on tech-pkg@ ML!
Diffstat (limited to 'print/cups-base')
| -rw-r--r-- | print/cups-base/buildlink3.mk | 8 | ||||
| -rw-r--r-- | print/cups-base/options.mk | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/print/cups-base/buildlink3.mk b/print/cups-base/buildlink3.mk index 59257f761dc..add1cf4f1a3 100644 --- a/print/cups-base/buildlink3.mk +++ b/print/cups-base/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2018/04/17 22:29:33 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/06/25 10:01:51 leot Exp $ BUILDLINK_TREE+= cups-base @@ -12,15 +12,15 @@ BUILDLINK_PKGSRCDIR.cups-base?= ../../print/cups-base pkgbase := cups-base .include "../../mk/pkg-build-options.mk" -.if !empty(PKG_BUILD_OPTIONS.cups:Mkerberos) +.if !empty(PKG_BUILD_OPTIONS.cups-base:Mkerberos) .include "../../mk/krb5.buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.cups:Mdnssd) +.if !empty(PKG_BUILD_OPTIONS.cups-base:Mdnssd) .include "../../net/mDNSResponder/buildlink3.mk" .endif -.if ${OPSYS} != "Darwin" && !empty(PKG_BUILD_OPTIONS.cups:Mavahi) +.if ${OPSYS} != "Darwin" && !empty(PKG_BUILD_OPTIONS.cups-base:Mavahi) .include "../../net/avahi/buildlink3.mk" .endif diff --git a/print/cups-base/options.mk b/print/cups-base/options.mk index 5502efb8c00..adc28c98bcb 100644 --- a/print/cups-base/options.mk +++ b/print/cups-base/options.mk @@ -1,11 +1,17 @@ -# $NetBSD: options.mk,v 1.2 2018/06/24 10:17:42 bouyer Exp $ +# $NetBSD: options.mk,v 1.3 2018/06/25 10:01:51 leot Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.cups +PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers PKG_SUGGESTED_OPTIONS= dnssd kerberos PLIST_VARS+= apple dbus dnssd dnssd-backend ippfind libusb pam +.if defined(PKG_OPTIONS.cups) +PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups} +PKG_OPTIONS_DEPRECATED_WARNINGS+= \ + "Deprecated variable PKG_OPTIONS.cups used, use ${PKG_OPTIONS_VAR} instead." +.endif + .if ${OPSYS} == "Darwin" PLIST.apple= yes PLIST.ippfind= yes |