From 02d10138eca23f2960b5ccf4cb023541c5a3f762 Mon Sep 17 00:00:00 2001 From: sobomax Date: Mon, 21 May 2001 09:22:42 +0000 Subject: Fix PLIST when compiled with XFree86-4. PR: 27343 Submitted by: David W. Chapman Jr. --- x11-toolkits/pango/Makefile | 10 +++++++++- x11-toolkits/pango/pkg-plist | 9 +++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'x11-toolkits') diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 6accf5bc66c1..1a14cef86659 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -27,8 +27,16 @@ CONFIGURE_ARGS= --with-qt=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +.include + +.if ${XFREE86_VERSION} == 3 +PLIST_SUB+= XFREE4:="@comment " +.else +PLIST_SUB+= XFREE4:="" +.endif + pre-patch: @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' -.include +.include diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 8b9a93feca88..d2b3eab583a2 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -14,12 +14,14 @@ include/pango-1.0/pango/pango-indic.h include/pango-1.0/pango/pango-item.h include/pango-1.0/pango/pango-layout.h include/pango-1.0/pango/pango-modules.h +%%XFREE4:%%include/pango-1.0/pango/pango-ot.h include/pango-1.0/pango/pango-tabs.h include/pango-1.0/pango/pango-types.h include/pango-1.0/pango/pango-utils.h include/pango-1.0/pango/pango.h include/pango-1.0/pango/pangoft2.h include/pango-1.0/pango/pangox.h +%%XFREE4:%%include/pango-1.0/pango/pangoxft.h lib/libpango.a lib/libpango.so lib/libpango.so.0 @@ -29,9 +31,14 @@ lib/libpangoft2.so.0 lib/libpangox.a lib/libpangox.so lib/libpangox.so.0 +%%XFREE4:%%lib/libpangoxft.a +%%XFREE4:%%lib/libpangoxft.so +%%XFREE4:%%lib/libpangoxft.so.0 lib/pango/modules/pango-arabic-x.so +%%XFREE4:%%lib/pango/modules/pango-arabic-xft.so lib/pango/modules/pango-basic-ft2.so lib/pango/modules/pango-basic-x.so +%%XFREE4:%%lib/pango/modules/pango-basic-xft.so lib/pango/modules/pango-bengali-x.so lib/pango/modules/pango-devanagari-x.so lib/pango/modules/pango-gujarati-x.so @@ -40,10 +47,12 @@ lib/pango/modules/pango-hangul-x.so lib/pango/modules/pango-hebrew-x.so lib/pango/modules/pango-myanmar-x.so lib/pango/modules/pango-tamil-x.so +%%XFREE4:%%lib/pango/modules/pango-tamil-xft.so lib/pango/modules/pango-thai-x.so libdata/pkgconfig/pango.pc libdata/pkgconfig/pangoft2.pc libdata/pkgconfig/pangox.pc +%%XFREE4:%%libdata/pkgconfig/pangoxft.pc @dirrm lib/pango/modules @dirrm lib/pango @dirrm include/pango-1.0/pango -- cgit