aboutsummaryrefslogtreecommitdiffstats
path: root/x11/kdelibs3
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2005-08-28 16:20:53 +0800
committerlofi <lofi@FreeBSD.org>2005-08-28 16:20:53 +0800
commitb864eaa588a581350ef682f7de7f58ba112b0e4b (patch)
treecfb8a0c936043766cd2a7c98f46917cad6111f5a /x11/kdelibs3
parent1db7008dd9e21d759624bc316c19a207b9d511e2 (diff)
downloadfreebsd-ports-gnome-b864eaa588a581350ef682f7de7f58ba112b0e4b.tar.gz
freebsd-ports-gnome-b864eaa588a581350ef682f7de7f58ba112b0e4b.tar.zst
freebsd-ports-gnome-b864eaa588a581350ef682f7de7f58ba112b0e4b.zip
Rearrange the kdelibs3 and kdelibs3-nocups ports so that it's possible
to build a cups-disabled kdelibs from the get-go by defining WITHOUT_CUPS or KDE_WITHOUT_CUPS during builds. Proposed and based on a patch submitted by: mi
Diffstat (limited to 'x11/kdelibs3')
-rw-r--r--x11/kdelibs3/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 6c228e839832..e959c44f3193 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -36,11 +36,14 @@ RUN_DEPENDS= iceauth:${X_CLIENTS_PORT} \
${FONTSCALE}:${X_FONTS_TTF_PORT} \
${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
-.if ${PKGNAMESUFFIX} == -nocups
CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdepim-3.2*
+.if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS)
+CONFLICTS+= kdelibs-[0-9]*
+PKGNAMESUFFIX= -nocups
+CONFIGURE_ARGS+=--disable-cups
.else
-CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2*
-LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
+CONFLICTS+= kdelibs-nocups-[0-9]*
+LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-base
.endif
USE_GETTEXT= yes