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.

5 files changed, 23 insertions, 14 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
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 116bfc1e88a..bd6617d4061 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2001/12/02 06:56:43 jlam Exp $
+# $NetBSD: Makefile,v 1.73 2001/12/18 20:23:00 jlam Exp $
 
 DISTNAME=		samba-2.2.2
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
@@ -50,8 +50,9 @@ CFLAGS+=		-I${BUILDLINK_DIR}/include/openssl	# ssl.h, err.h
 
 CONFIGURE_ENV+=		ac_cv_lib_curses_tgetent=no
 
-.if defined(SAMBA_WITH_CUPS)
+.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
 .include "../../print/cups/buildlink.mk"
+BUILD_DEFS+=		USE_CUPS
 .endif
 
 .if defined(USE_PAM)
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index 160ecb36fda..60c5b0e7190 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/12/02 06:56:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/12/18 20:23:00 jlam Exp $
 
 DISTNAME=		samba-2.0.10
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
@@ -37,8 +37,9 @@ CONFIGURE_ARGS+=	--with-ssl
 CONFIGURE_ARGS+=	--with-sslinc=${BUILDLINK_DIR}
 CFLAGS+=		-I${BUILDLINK_DIR}/include/openssl      # ssl.h, err.h
 
-.if defined(SAMBA_WITH_CUPS)
+.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
 .include "../../print/cups/buildlink.mk"
+BUILD_DEFS+=		USE_CUPS
 .endif
 
 .if defined(USE_PAM)
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 775db36e6f1..a75e93baa51 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/12/07 10:59:31 skrll Exp $
+# $NetBSD: Makefile,v 1.26 2001/12/18 20:23:00 jlam Exp $
 
 DISTNAME=	kdelibs-2.2.2
 CATEGORIES=	x11
@@ -38,6 +38,11 @@ REPLACE_PERL= \
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
+.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
+.include "../../print/cups/buildlink.mk"
+BUILD_DEFS+=		USE_CUPS
+.endif
+
 # We will create the complete icon directory tree for use by other KDE2
 # packages at post-install time.
 #
@@ -71,7 +76,6 @@ post-install:
 .include "../../devel/pcre/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
 .include "../../lang/perl5/buildlink.mk"
-.include "../../print/cups/buildlink.mk"
 .include "../../security/openssl/buildlink.mk"
 .include "../../textproc/libxml2/buildlink.mk"
 .include "../../textproc/libxslt/buildlink.mk"