From 4eb209da7d941e66e0cb065aead6bda76c9e97f3 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
Date: Fri, 23 Jul 2004 19:10:32 +0000
Subject: - Add the X_WINDOW_SYSTEM={xorg,xfree86-4,xfree86-3} variable to
 bsd.port.mk,   and make XFREE86_VERSION map to it.  XFREE86_VERSION is now
 deprecated. - Make xorg the default X_WINDOW_SYSTEM on -current. - Add
 several new X_*_PORT variables which point to various pieces of X11 based  
 on the setting of X_WINDOW_SYSTEM, and make ports use them. - Add information
 to CHANGES about how to handle the transition.

PR:		ports/68763
Approved by:	portmgr (marcus)
Approved by:	re (scottl)
---
 x11/kdelibs4/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'x11/kdelibs4')

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 2d4b2dc146ec..3415a7ebcf7e 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Base set of libraries needed by KDE programs
 
 CONFLICTS=	kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.*
 
-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		artsc.0:${PORTSDIR}/audio/arts \
 		cups.2:${PORTSDIR}/print/cups-base \
@@ -30,8 +30,8 @@ LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
 		pcre.0:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
-		${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
+RUN_DEPENDS=	${FONTSCALE}:${X_FONTS_TTF_PORT} \
+		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
 
 USE_GETTEXT=	yes
 USE_QT_VER=	3
-- 
cgit v1.2.3