summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam>2001-12-18 20:22:59 +0000
committerjlam <jlam>2001-12-18 20:22:59 +0000
commitafc5fd33dbb7ebc6cd7a56ab42c923248418bc98 (patch)
tree4398d1c69eccb0c7b3d197ff556f4f1145defdb1 /x11
parentb9b8a9a48107d4b13ec764e4b4a1eabed6804ff9 (diff)
downloadpkgsrc-afc5fd33dbb7ebc6cd7a56ab42c923248418bc98.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 'x11')
-rw-r--r--x11/kdelibs2/Makefile8
1 files changed, 6 insertions, 2 deletions
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"