From 38805e871a0ec7d383e76a6cb1d979ba6c291d56 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
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/firefox36/Makefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'www/firefox36/Makefile')

diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
-- 
cgit v1.2.3