summaryrefslogtreecommitdiff
path: root/fonts/Xft2
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2003-03-18 13:56:31 +0000
committertron <tron@pkgsrc.org>2003-03-18 13:56:31 +0000
commita62d25bc20a539001b5883e12da61da38a599f9e (patch)
tree464fc6255ffc2ab50ea3e867ded326e67a387e63 /fonts/Xft2
parent129d0572bd73ba1dd69c695868b2ba897a3fb459 (diff)
downloadpkgsrc-a62d25bc20a539001b5883e12da61da38a599f9e.tar.gz
Revert last change because XFree86 4.3.0's "fontconfig" and "Xft" library
are linked with the bundled "expat" library which is quite old. This would lead to shared library conflicts sooner or later.
Diffstat (limited to 'fonts/Xft2')
-rw-r--r--fonts/Xft2/buildlink2.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/fonts/Xft2/buildlink2.mk b/fonts/Xft2/buildlink2.mk
index f119283637b..5011bbb03a9 100644
--- a/fonts/Xft2/buildlink2.mk
+++ b/fonts/Xft2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/03/13 20:40:01 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/03/18 13:56:32 tron Exp $
#
# This Makefile fragment is included by packages that use Xft2.
#
@@ -8,18 +8,12 @@
.if !defined(XFT2_BUILDLINK2_MK)
XFT2_BUILDLINK2_MK= # defined
-.include "../../mk/bsd.prefs.mk"
-
-.if exists(${X11BASE}/bin/xft-config)
-BUILDLINK_PREFIX.Xft2= ${X11BASE}
-.else
BUILDLINK_PACKAGES+= Xft2
BUILDLINK_DEPENDS.Xft2?= Xft2>=2.1nb1
BUILDLINK_PKGSRCDIR.Xft2?= ../../fonts/Xft2
EVAL_PREFIX+= BUILDLINK_PREFIX.Xft2=Xft2
BUILDLINK_PREFIX.Xft2_DEFAULT= ${LOCALBASE}
-.endif
BUILDLINK_FILES.Xft2+= include/X11/Xft/*
BUILDLINK_FILES.Xft2+= lib/libXft.*
BUILDLINK_FILES.Xft2+= lib/pkgconfig/xft.pc