From 38805e871a0ec7d383e76a6cb1d979ba6c291d56 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 18 Feb 2003 04:51:34 +0000 Subject: Remove the renaming of Xft headers and library from the Xft (Xft2) port. Remove installing of Xft1 from XFree86-4-libraries, and add dependencies to the Xft port by all the ports that use it along with whatever patches are necessary. Approved by: portmgr (kris), marcus --- www/mozilla/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'www/mozilla/Makefile') diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 3152f71941d0..e68984f7f1be 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -40,7 +40,7 @@ USE_GNOME= gtk12 .endif .if !defined(WITHOUT_XFT) -LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/Xft .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir) BROKEN= Mozilla and Xft2 render the mozilla-fonts \ illegibly. Please remove the mozilla-fonts package. @@ -167,11 +167,6 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh -.if !defined(WITHOUT_XFT) - @${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \ - ${WRKSRC}/gfx/src/gtk/nsDrawingSurfaceGTK.cpp \ - ${WRKSRC}/gfx/src/gtk/nsFontMetricsXft.h -.endif @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%HEADERS_SUFX%%||g' \ ${WRKSRC}/config/autoconf.mk.in -- cgit v1.2.3