Module Name:	pkgsrc
Committed By:	jlam
Date:		Tue Dec 18 20:23:01 UTC 2001

Modified Files:
	pkgsrc/mk: bsd.pkg.defaults.mk bsd.pkg.obsolete.mk
	pkgsrc/net/samba: Makefile
	pkgsrc/net/samba20: Makefile
	pkgsrc/x11/kdelibs2: Makefile

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


To generate a diff of this commit:
cvs rdiff -r1.26 -r1.27 pkgsrc/mk/bsd.pkg.defaults.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/mk/bsd.pkg.obsolete.mk
cvs rdiff -r1.72 -r1.73 pkgsrc/net/samba/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/net/samba20/Makefile
cvs rdiff -r1.25 -r1.26 pkgsrc/x11/kdelibs2/Makefile

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