[pkgsrc/trunk]: pkgsrc/www Fix the broken test for when to enable Xft. Addre...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6b6806bfc10b
branches:  trunk
changeset: 530208:6b6806bfc10b
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Mon Jun 18 21:33:32 2007 +0000

description:
Fix the broken test for when to enable Xft.  Addresses the remainder of
PR/31481.

diffstat:

 www/firefox/Makefile.common   |  4 ++--
 www/seamonkey/Makefile.common |  5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 52c97fd145b2 -r 6b6806bfc10b www/firefox/Makefile.common
--- a/www/firefox/Makefile.common       Mon Jun 18 21:16:10 2007 +0000
+++ b/www/firefox/Makefile.common       Mon Jun 18 21:33:32 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2007/06/17 13:47:00 joerg Exp $
+# $NetBSD: Makefile.common,v 1.22 2007/06/18 21:33:32 dmcmahill Exp $
 
 MOZ_DIST_VER?=         ${MOZ_VER}
 DISTNAME?=             mozilla-${MOZ_DIST_VER}-source
@@ -211,7 +211,7 @@
 CONFIGURE_ARGS+=        --with-pthreads
 .endif
 
-.if ${MOZILLA_USE_XFT} == "YES" && (exists(${X11BASE}/include/X11/Xdefs.h) || ${X11_TYPE} != "native")
+.if ${MOZILLA_USE_XFT} == "YES"
 CONFIGURE_ARGS+=       --enable-xft
 # pkgconfig defaults to a "build" dependency, which is what we want.
 .include "../../x11/libXft/buildlink3.mk"
diff -r 52c97fd145b2 -r 6b6806bfc10b www/seamonkey/Makefile.common
--- a/www/seamonkey/Makefile.common     Mon Jun 18 21:16:10 2007 +0000
+++ b/www/seamonkey/Makefile.common     Mon Jun 18 21:33:32 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2007/06/17 14:03:30 joerg Exp $
+# $NetBSD: Makefile.common,v 1.27 2007/06/18 21:33:33 dmcmahill Exp $
 
 MOZ_DIST_VER?=         ${MOZ_VER}
 DISTNAME?=             seamonkey-${MOZ_DIST_VER}.source
@@ -220,8 +220,7 @@
 CONFIGURE_ARGS+=       --with-pthreads
 .endif
 
-.if ${MOZILLA_USE_XFT} == "YES" && \
-    (${X11_TYPE} != "native" || exists(${X11BASE}/include/X11/Xdefs.h))
+.if ${MOZILLA_USE_XFT} == "YES"
 CONFIGURE_ARGS+=       --enable-xft
 # pkgconfig defaults to a "build" dependency, which is what we want.
 .include "../../x11/libXft/buildlink3.mk"