pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/fonts/Xft2 Fix installation on systems where libXft.so...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c91c7f1d32bf
branches:  trunk
changeset: 462486:c91c7f1d32bf
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Oct 03 20:13:52 2003 +0000

description:
Fix installation on systems where libXft.so.$(MAJOR_VERSION).$(MINOR_VERSION)
was not built (at least FreeBSD/Linux).

diffstat:

 fonts/Xft2/Makefile |  10 +++++++++-
 fonts/Xft2/PLIST    |   4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 87fabb22a4ac -r c91c7f1d32bf fonts/Xft2/Makefile
--- a/fonts/Xft2/Makefile       Fri Oct 03 20:11:41 2003 +0000
+++ b/fonts/Xft2/Makefile       Fri Oct 03 20:13:52 2003 +0000
@@ -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 @@
 
 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 -r 87fabb22a4ac -r c91c7f1d32bf fonts/Xft2/PLIST
--- a/fonts/Xft2/PLIST  Fri Oct 03 20:11:41 2003 +0000
+++ b/fonts/Xft2/PLIST  Fri Oct 03 20:13:52 2003 +0000
@@ -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.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



Home | Main Index | Thread Index | Old Index