diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2007-06-18 21:33:32 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2007-06-18 21:33:32 +0000 |
| commit | 16b3af6b82cfb7196ee0ec02a0f71821cdba62b6 (patch) | |
| tree | f57fa8c64f963e2da68a31df53a43a6529070a7b /www | |
| parent | 975f19ec8aeaaf2407363de1220fcc3f8fe63371 (diff) | |
| download | pkgsrc-16b3af6b82cfb7196ee0ec02a0f71821cdba62b6.tar.gz | |
Fix the broken test for when to enable Xft. Addresses the remainder of
PR/31481.
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox/Makefile.common | 4 | ||||
| -rw-r--r-- | www/seamonkey/Makefile.common | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common index d41cba6b265..19c530cbb85 100644 --- a/www/firefox/Makefile.common +++ b/www/firefox/Makefile.common @@ -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+= --without-pthreads 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 --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common index 0dd375d0223..cf356761fe5 100644 --- a/www/seamonkey/Makefile.common +++ b/www/seamonkey/Makefile.common @@ -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+= --without-pthreads 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" |