From 783b4b0e4c0ec5e6ec323a3e14971af1f3faf54f Mon Sep 17 00:00:00 2001 From: xtraeme Date: Fri, 3 Oct 2003 20:13:52 +0000 Subject: Fix installation on systems where libXft.so.$(MAJOR_VERSION).$(MINOR_VERSION) was not built (at least FreeBSD/Linux). --- fonts/Xft2/Makefile | 10 +++++++++- fonts/Xft2/PLIST | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'fonts/Xft2') diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile index a8002343b4b..eafe142519a 100644 --- a/fonts/Xft2/Makefile +++ b/fonts/Xft2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/09/27 18:50:11 grant Exp $ +# $NetBSD: Makefile,v 1.21 2003/10/03 20:13:52 xtraeme Exp $ # DISTNAME= xft-2.1.2 @@ -29,6 +29,14 @@ MAKE_ENV+= EGREP="${EGREP}" BUILDLINK_DEPENDS.Xrender= Xrender>=0.8.2 +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" +PLIST_SUBST+= LIBXFT="@comment " +.else +PLIST_SUBST+= LIBXFT="" +.endif + .include "../../devel/pkgconfig/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" .include "../../fonts/fontconfig/buildlink2.mk" diff --git a/fonts/Xft2/PLIST b/fonts/Xft2/PLIST index d7a73bc0444..9ae7cf5bfea 100644 --- a/fonts/Xft2/PLIST +++ b/fonts/Xft2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/09/19 15:46:52 markd Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/10/03 20:13:52 xtraeme Exp $ bin/xft-config include/X11/Xft/Xft.h include/X11/Xft/XftCompat.h @@ -6,7 +6,7 @@ lib/libXft.a lib/libXft.la lib/libXft.so lib/libXft.so.2 -lib/libXft.so.2.1 +${LIBXFT}lib/libXft.so.2.1 lib/pkgconfig/xft.pc man/man3/Xft.3 @dirrm include/X11/Xft -- cgit v1.2.3