since XFree86 4.* includes libXft and XFree86 3.* does not we end up with

a different PLIST.  Add a check for XFree86 4.* (like the one from suse_x11)
and fix up the PLIST.

Packages properly again on non-XFree86 4.* systems.

3 files changed, 31 insertions, 21 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 04cb0c3a419..163ff9cbcb6 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/06/30 01:51:29 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2002/07/03 01:29:39 dmcmahill Exp $
 #
 
 DISTNAME=		pango-1.0.3
@@ -18,6 +18,15 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_GMAKE=		yes
 
+# directory appeared in XFree86 4.*
+# if it is there, we are using XFree86 4.* and will
+# install some additional files
+.if exists(${X11BASE}/lib/X11/locale/common)
+PLIST_SRC=		${PKGDIR}/PLIST.xf4 ${PKGDIR}/PLIST
+.else
+PLIST_SRC=		${PKGDIR}/PLIST
+.endif
+
 test: build
 	cd ${WRKSRC} &&  ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
 		tee ${WRKDIR}/check.log
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index 9b854e83f16..2da37b10874 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/30 01:51:30 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/07/03 01:29:39 dmcmahill Exp $
 bin/pango-querymodules
 etc/pango/pango.modules
 etc/pango/pangox.aliases
@@ -23,7 +23,6 @@ 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
-include/pango-1.0/pango/pangoxft.h
 lib/libpango-1.0.a
 lib/libpango-1.0.la
 lib/libpango-1.0.so
@@ -39,29 +38,18 @@ lib/libpangox-1.0.la
 lib/libpangox-1.0.so
 lib/libpangox-1.0.so.0
 lib/libpangox-1.0.so.0.3
-lib/libpangoxft-1.0.a
-lib/libpangoxft-1.0.la
-lib/libpangoxft-1.0.so
-lib/libpangoxft-1.0.so.0
-lib/libpangoxft-1.0.so.0.3
 lib/pango/1.0.0/modules/pango-arabic-ft2.a
 lib/pango/1.0.0/modules/pango-arabic-ft2.la
 lib/pango/1.0.0/modules/pango-arabic-ft2.so
 lib/pango/1.0.0/modules/pango-arabic-x.a
 lib/pango/1.0.0/modules/pango-arabic-x.la
 lib/pango/1.0.0/modules/pango-arabic-x.so
-lib/pango/1.0.0/modules/pango-arabic-xft.a
-lib/pango/1.0.0/modules/pango-arabic-xft.la
-lib/pango/1.0.0/modules/pango-arabic-xft.so
 lib/pango/1.0.0/modules/pango-basic-ft2.a
 lib/pango/1.0.0/modules/pango-basic-ft2.la
 lib/pango/1.0.0/modules/pango-basic-ft2.so
 lib/pango/1.0.0/modules/pango-basic-x.a
 lib/pango/1.0.0/modules/pango-basic-x.la
 lib/pango/1.0.0/modules/pango-basic-x.so
-lib/pango/1.0.0/modules/pango-basic-xft.a
-lib/pango/1.0.0/modules/pango-basic-xft.la
-lib/pango/1.0.0/modules/pango-basic-xft.so
 lib/pango/1.0.0/modules/pango-bengali-x.a
 lib/pango/1.0.0/modules/pango-bengali-x.la
 lib/pango/1.0.0/modules/pango-bengali-x.so
@@ -83,25 +71,18 @@ lib/pango/1.0.0/modules/pango-hebrew-ft2.so
 lib/pango/1.0.0/modules/pango-hebrew-x.a
 lib/pango/1.0.0/modules/pango-hebrew-x.la
 lib/pango/1.0.0/modules/pango-hebrew-x.so
-lib/pango/1.0.0/modules/pango-hebrew-xft.a
-lib/pango/1.0.0/modules/pango-hebrew-xft.la
-lib/pango/1.0.0/modules/pango-hebrew-xft.so
 lib/pango/1.0.0/modules/pango-myanmar-x.a
 lib/pango/1.0.0/modules/pango-myanmar-x.la
 lib/pango/1.0.0/modules/pango-myanmar-x.so
 lib/pango/1.0.0/modules/pango-tamil-x.a
 lib/pango/1.0.0/modules/pango-tamil-x.la
 lib/pango/1.0.0/modules/pango-tamil-x.so
-lib/pango/1.0.0/modules/pango-tamil-xft.a
-lib/pango/1.0.0/modules/pango-tamil-xft.la
-lib/pango/1.0.0/modules/pango-tamil-xft.so
 lib/pango/1.0.0/modules/pango-thai-x.a
 lib/pango/1.0.0/modules/pango-thai-x.la
 lib/pango/1.0.0/modules/pango-thai-x.so
 lib/pkgconfig/pango.pc
 lib/pkgconfig/pangoft2.pc
 lib/pkgconfig/pangox.pc
-lib/pkgconfig/pangoxft.pc
 share/gtk-doc/html/pango/index.html
 share/gtk-doc/html/pango/index.sgml
 share/gtk-doc/html/pango/layout.gif
diff --git a/devel/pango/PLIST.xf4 b/devel/pango/PLIST.xf4
new file mode 100644
index 00000000000..9cab0b8b9d2
--- /dev/null
+++ b/devel/pango/PLIST.xf4
@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST.xf4,v 1.1 2002/07/03 01:29:39 dmcmahill Exp $
+include/pango-1.0/pango/pangoxft.h
+lib/libpangoxft-1.0.a
+lib/libpangoxft-1.0.la
+lib/libpangoxft-1.0.so
+lib/libpangoxft-1.0.so.0
+lib/libpangoxft-1.0.so.0.3
+lib/pango/1.0.0/modules/pango-arabic-xft.a
+lib/pango/1.0.0/modules/pango-arabic-xft.la
+lib/pango/1.0.0/modules/pango-arabic-xft.so
+lib/pango/1.0.0/modules/pango-basic-xft.a
+lib/pango/1.0.0/modules/pango-basic-xft.la
+lib/pango/1.0.0/modules/pango-basic-xft.so
+lib/pango/1.0.0/modules/pango-hebrew-xft.a
+lib/pango/1.0.0/modules/pango-hebrew-xft.la
+lib/pango/1.0.0/modules/pango-hebrew-xft.so
+lib/pango/1.0.0/modules/pango-tamil-xft.a
+lib/pango/1.0.0/modules/pango-tamil-xft.la
+lib/pango/1.0.0/modules/pango-tamil-xft.so
+lib/pkgconfig/pangoxft.pc