diff options
| author | tron <tron> | 2003-03-18 13:56:31 +0000 |
|---|---|---|
| committer | tron <tron> | 2003-03-18 13:56:31 +0000 |
| commit | 86b71b245d831877143de309d92ca6504cd426ec (patch) | |
| tree | 464fc6255ffc2ab50ea3e867ded326e67a387e63 /fonts | |
| parent | 00316837126a24be17914fad0c775ac45d05ad68 (diff) | |
| download | pkgsrc-86b71b245d831877143de309d92ca6504cd426ec.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')
| -rw-r--r-- | fonts/Xft2/buildlink2.mk | 8 | ||||
| -rw-r--r-- | fonts/fontconfig/buildlink2.mk | 8 |
2 files changed, 2 insertions, 14 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 diff --git a/fonts/fontconfig/buildlink2.mk b/fonts/fontconfig/buildlink2.mk index e368208bf5e..428d523f0fb 100644 --- a/fonts/fontconfig/buildlink2.mk +++ b/fonts/fontconfig/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2003/03/13 20:38:41 tron Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2003/03/18 13:56:31 tron Exp $ # # This Makefile fragment is included by packages that use fontconfig. # @@ -8,18 +8,12 @@ .if !defined(FONTCONFIG_BUILDLINK2_MK) FONTCONFIG_BUILDLINK2_MK= # defined -.include "../../mk/bsd.prefs.mk" - -.if exists(${X11BASE}/bin/fontconfig-config) -BUILDLINK_PREFIX.fontconfig= ${X11BASE} -.else BUILDLINK_PACKAGES+= fontconfig BUILDLINK_DEPENDS.fontconfig?= fontconfig>=2.1nb1 BUILDLINK_PKGSRCDIR.fontconfig?= ../../fonts/fontconfig EVAL_PREFIX+= BUILDLINK_PREFIX.fontconfig=fontconfig BUILDLINK_PREFIX.fontconfig_DEFAULT= ${LOCALBASE} -.endif BUILDLINK_FILES.fontconfig+= include/fontconfig/fcfreetype.h BUILDLINK_FILES.fontconfig+= include/fontconfig/fcprivate.h BUILDLINK_FILES.fontconfig+= include/fontconfig/fontconfig.h |