diff options
| author | jlam <jlam> | 2001-12-18 20:22:59 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-12-18 20:22:59 +0000 |
| commit | 2cc0ce35e60242a68a65b71a5341c76c42788fe1 (patch) | |
| tree | 4398d1c69eccb0c7b3d197ff556f4f1145defdb1 /mk | |
| parent | e53070f84e4a28124865bcd6cc9a4da745568e9e (diff) | |
| download | pkgsrc-2cc0ce35e60242a68a65b71a5341c76c42788fe1.tar.gz | |
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.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 13 | ||||
| -rw-r--r-- | mk/bsd.pkg.obsolete.mk | 6 |
2 files changed, 11 insertions, 8 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. diff --git a/mk/bsd.pkg.obsolete.mk b/mk/bsd.pkg.obsolete.mk index b77dd2a23a7..6fd8d71fc16 100644 --- a/mk/bsd.pkg.obsolete.mk +++ b/mk/bsd.pkg.obsolete.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.obsolete.mk,v 1.4 2001/11/28 14:01:16 jlam Exp $ +# $NetBSD: bsd.pkg.obsolete.mk,v 1.5 2001/12/18 20:22:59 jlam 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 @@ -24,3 +24,7 @@ PKG_SYSCONFDIR.php?= ${PHP_CONFDIR} .if defined(VTUN_SYSCONFDIR) PKG_SYSCONFDIR.vtun?= ${VTUN_SYSCONFDIR} .endif + +.if defined(SAMBA_WITH_CUPS) +USE_CUPS= YES +.endif |