CVS commit: pkgsrc/print/cups-base

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon Jun 25 10:01:51 UTC 2018

Modified Files:
        pkgsrc/print/cups-base: buildlink3.mk options.mk

Log Message:
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!


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/cups-base/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/cups-base/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/cups-base/buildlink3.mk
diff -u pkgsrc/print/cups-base/buildlink3.mk:1.6 pkgsrc/print/cups-base/buildlink3.mk:1.7
--- pkgsrc/print/cups-base/buildlink3.mk:1.6    Tue Apr 17 22:29:33 2018
+++ pkgsrc/print/cups-base/buildlink3.mk        Mon Jun 25 10:01:51 2018
@@ -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?=             ../../p
 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
 

Index: pkgsrc/print/cups-base/options.mk
diff -u pkgsrc/print/cups-base/options.mk:1.2 pkgsrc/print/cups-base/options.mk:1.3
--- pkgsrc/print/cups-base/options.mk:1.2       Sun Jun 24 10:17:42 2018
+++ pkgsrc/print/cups-base/options.mk   Mon Jun 25 10:01:51 2018
@@ -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