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

7 files changed, 14 insertions, 11 deletions

diff --git a/x11-wm/fbdesk/Makefile b/x11-wm/fbdesk/Makefile
index 4a767988d4e9..981505307aeb 100644
--- a/x11-wm/fbdesk/Makefile
+++ b/x11-wm/fbdesk/Makefile
@@ -12,7 +12,8 @@ MASTER_SITES=	http://fluxbox.sourceforge.net/download/
 
 MAINTAINER=	hendrik@scholz.net
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index f61785df63ec..b3b0695bcd38 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -20,6 +20,7 @@ PATCHFILES=	remember-0.1.14-4.gz
 
 MAINTAINER=	hendrik@scholz.net
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
 		xterm:${PORTSDIR}/x11/XFree86-4-clients
 BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index f61785df63ec..b3b0695bcd38 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -20,6 +20,7 @@ PATCHFILES=	remember-0.1.14-4.gz
 
 MAINTAINER=	hendrik@scholz.net
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
 		xterm:${PORTSDIR}/x11/XFree86-4-clients
 BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 7f061cc8c3ba..efb62083409e 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -15,6 +15,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cy@FreeBSD.org
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 .if defined(WITH_STROKE)
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 6d0e5b1dd497..63e7d12e8d72 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -17,7 +17,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-gtk1
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep
+LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 BUILD_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
 RUN_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
 
@@ -32,8 +33,8 @@ WANT_GNOME=	yes
 USE_GNOME=	gnomehack gnomehier gtk12 imlib esound
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readline
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+		-I${LOCALBASE}/include/freetype2" LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index b468b12534f7..2e898c4568e7 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -17,7 +17,8 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep
+LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 BUILD_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
 RUN_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
 
@@ -45,8 +46,6 @@ post-patch:
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|[$$][(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \
-		${WRKSRC}/src/fonts.c
 
 post-install:
 	install-info --section="X11 window manager" \
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index 849c4fce9a0c..c4ac785ac863 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	waimea
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	waimea
 
 MAINTAINER=	danfe@regency.nsu.ru
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5_RUN=	yes
@@ -25,8 +28,4 @@ MAN1=		waimea.1
 LIB_DEPENDS+=	Imlib2.1:${PORTSDIR}/graphics/imlib2
 .endif
 
-.if defined(WITH_XFT2)
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
-.endif
-
 .include <bsd.port.mk>