Since print/cups conflicts with another popular print package,

print/lprng, we make a new variable USE_CUPS that is used by packages to
determine whether depend on print/cups and to compile in support for CUPS.
USE_CUPS may be either "YES" or undefined.  Deprecate SAMBA_WITH_CUPS as
its purpose is superseded by USE_CUPS.  Convert net/samba and net/samba20
to use USE_CUPS and make x11/kdelibs2 respect USE_CUPS.

1 files changed, 6 insertions, 7 deletions

diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index ce1273360c7..92fcdb3f315 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.26 2001/12/17 11:45:05 bouyer Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.27 2001/12/18 20:22:59 jlam Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1055,12 +1055,6 @@ RASMOL_DEPTH?= 8
 # Possible: 8, 16, 32
 # Default: 8
 
-#SAMBA_WITH_CUPS=
-# Used in the samba package to compile in native support for the UNIX IPP
-# implementation, CUPS.
-# Possible: defined, not defined
-# Default: not defined
-
 #SDL_USE_NAS=
 # Used in SDL package to enable use of the network audio system
 # Possible: defined, not defined
@@ -1153,6 +1147,11 @@ USE_CRYPTO?=	YES
 # Possible: YES, or NO.
 # Default: YES
 
+#USE_CUPS= YES
+# Used by packages to compile in support for the UNIX IPP implementation, CUPS.
+# Possible: YES, not defined
+# Default: not defined
+
 USE_DB2?= NO
 # Used in sendmail to build with database library 2.x from the db package.
 # Possible: YES, or NO.