Chase the new location of libXft.

svn path=/head/; revision=104228
2025-06-01 10:56:27 -04:00 · 2004-03-16 22:54:05 +00:00 · 2004-03-16 22:54:05 +00:00 · 61b3a6bec8 · 2021-03-31 03:12:20 +00:00
commit 61b3a6bec8
parent a46fd54d04
57 changed files with 57 additions and 57 deletions
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	dryice@liu.com.cn
 COMMENT=	A simple and fast GBK Chinese XIM server

-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft

 USE_BZIP2=	yes
 USE_XLIB=	yes
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@ -37,7 +37,7 @@ USE_XPM=	yes
 .if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XFT)
 CONFIGURE_ARGS+=	--without-xft
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--libs="${LDFLAGS}"
 CFLAGS+=	`freetype-config --cflags`
 LDFLAGS=	`freetype-config --libs`
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@ -109,7 +109,7 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \
 		${ANT}:${PORTSDIR}/devel/apache-ant \
 		${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
 		${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@ -109,7 +109,7 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \
 		${ANT}:${PORTSDIR}/devel/apache-ant \
 		${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
 		${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@ -109,7 +109,7 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \
 		${ANT}:${PORTSDIR}/devel/apache-ant \
 		${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
 		${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@ -109,7 +109,7 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \
 		${ANT}:${PORTSDIR}/devel/apache-ant \
 		${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
 		${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@ -114,7 +114,7 @@ BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft
+BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
 BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
--- a/mail/thunderbird-devel/Makefile
+++ b/mail/thunderbird-devel/Makefile
@ -67,7 +67,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@ -67,7 +67,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@ -67,7 +67,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@ -67,7 +67,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@ -60,7 +60,7 @@ PLIST_SUB+=	LIBARTS="@comment "
 .endif

 .if ${XFREE86_VERSION} >= 4 && !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--enable-xft
 CPPFLAGS+=	`freetype-config --cflags`
 LDFLAGS+=	`freetype-config --libs`
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@ -60,7 +60,7 @@ PLIST_SUB+=	LIBARTS="@comment "
 .endif

 .if ${XFREE86_VERSION} >= 4 && !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--enable-xft
 CPPFLAGS+=	`freetype-config --cflags`
 LDFLAGS+=	`freetype-config --libs`
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@ -73,7 +73,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@ -73,7 +73,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@ -73,7 +73,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@ -73,7 +73,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@ -73,7 +73,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@ -73,7 +73,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@ -73,7 +73,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@ -73,7 +73,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@ -73,7 +73,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif # !defined(WITHOUT_XFT)

 CPPFLAGS+=		-I${X11BASE}/include -I${LOCALBASE}/include
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@ -38,7 +38,7 @@ USE_GNOME=	gtk20 libidl
 .endif

 .if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
 BROKEN=		Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
 		illegibly. Please remove the mozilla-fonts package.
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@ -37,7 +37,7 @@ USE_GNOME=	gtk20 libidl
 .endif

 .if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
 BROKEN=		Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
 		illegibly. Please remove the mozilla-fonts package.
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@ -38,7 +38,7 @@ USE_GNOME=	gtk20 libidl
 .endif

 .if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
 BROKEN=		Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
 		illegibly. Please remove the mozilla-fonts package.
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@ -38,7 +38,7 @@ USE_GNOME=	gtk20 libidl
 .endif

 .if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
 BROKEN=		Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
 		illegibly. Please remove the mozilla-fonts package.
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@ -21,7 +21,7 @@ COMMENT=	GNUstep GUI backend

 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft

 USE_XLIB=		yes
 PREFIX=			${LOCALBASE}/GNUstep
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An open-source framework for the layout and rendering of i18n text

 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings

--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@ -20,7 +20,7 @@ COMMENT?=	A C++ X GUI toolkit
 LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		Xft.2:${PORTSDIR}/x11-fonts/Xft
+		Xft.2:${PORTSDIR}/x11-fonts/libXft

 CONFLICTS=	qt-3.*

--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@ -77,7 +77,7 @@ CONFIGURE_ARGS+=-platform ${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 .endif

 .if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .else
 CONFIGURE_ARGS+=-no-xft
 .endif
--- a/x11-wm/fbdesk/Makefile
+++ b/x11-wm/fbdesk/Makefile
@ -14,7 +14,7 @@ MAINTAINER=	hendrik@scholz.net
 COMMENT=	A Fluxbox utility to create and manage icons on the desktop

 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		Xft.2:${PORTSDIR}/x11-fonts/Xft
+		Xft.2:${PORTSDIR}/x11-fonts/libXft

 PLIST_FILES=	bin/fbdesk
 USE_X_PREFIX=	yes
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@ -16,7 +16,7 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	mezz7@cox.net
 COMMENT=	A small and fast window manager based on BlackBox

-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
 		xterm:${PORTSDIR}/x11/XFree86-4-clients
 BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@ -21,7 +21,7 @@ PATCHFILES=	remember-0.1.14-7.gz
 MAINTAINER=	hendrik@scholz.net
 COMMENT=	A small and fast window manager based on BlackBox

-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
 		xterm:${PORTSDIR}/x11/XFree86-4-clients
 BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@ -24,7 +24,7 @@ COMMENT=	Popular virtual window manager for X

 CONFIGURE_ARGS=	--with-iconv-library=${LOCALBASE}/lib \
 		--with-iconv-includes=${LOCALBASE}/include
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft \
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft \
 		biconv.2:${PORTSDIR}/converters/iconv
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4

--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@ -62,7 +62,7 @@ CONFIGURE_ARGS+=	--with-icesound=oss
 .if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XFT)
 CONFIGURE_ARGS+=	--enable-corefonts --disable-xfreetype
 .else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif

 .if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XINERAMA)
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@ -17,7 +17,7 @@ COMMENT=	Kahakai window manager
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13 \
 	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
 LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2 \
-		Xft.2:${PORTSDIR}/x11-fonts/Xft
+		Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	\
 	${X11BASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts

--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@ -15,7 +15,7 @@ MASTER_SITES=	http://icculus.org/openbox/releases/
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Derived from, and similar to, Blackbox

-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft

 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/openbox --prefix=${PREFIX} \
 		--sysconfdir=${PREFIX}/etc/openbox
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	waimea
 MAINTAINER=	danfe@regency.nsu.ru
 COMMENT=	An X11 window manager designed for maximum efficiency

-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	${X11BASE}/bin/Esetroot:${PORTSDIR}/x11/eterm

 USE_BZIP2=	yes
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@ -44,7 +44,7 @@ MAN1=		glob.1 xfbd.1 xfce.1 xfclock.1 xfglob.1 xfgnome.1 xfhelp.1 \

 .if ${XFREE86_VERSION} == 4
 .if defined(WITH_XFT)
-LIB_DEPENDS+=		Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=		Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--enable-xft
 .endif
 CONFIGURE_ARGS+=	--enable-xinerama
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@ -23,7 +23,7 @@ COMMENT=	XFree86-4 client programs and related files
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		Xcursor.1:${PORTSDIR}/x11/XFree86-4-libraries \
 		png.5:${PORTSDIR}/graphics/png \
-		Xft.2:${PORTSDIR}/x11-fonts/Xft
+		Xft.2:${PORTSDIR}/x11-fonts/libXft

 SCRIPTS_ENV=		InstallXdmConfig=${InstallXdmConfig} \
 			InstallXinitConfig=${InstallXinitConfig} \
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@ -14,7 +14,7 @@ MAINTAINER=	hendrik@scholz.net
 COMMENT=	A Fluxbox utility to create and manage icons on the desktop

 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		Xft.2:${PORTSDIR}/x11-fonts/Xft
+		Xft.2:${PORTSDIR}/x11-fonts/libXft

 PLIST_FILES=	bin/fbdesk
 USE_X_PREFIX=	yes
--- a/x11/fspanel/Makefile
+++ b/x11/fspanel/Makefile
@ -14,7 +14,7 @@ DISTNAME=	fspanel-0.8beta1
 MAINTAINER=	anarcat@anarcat.dyndns.org
 COMMENT=	Tiny panel listing opened windows for gnome-compliant WM

-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft

 USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An anti-aliased font support for gtk+

 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		Xft.2:${PORTSDIR}/x11-fonts/Xft
+		Xft.2:${PORTSDIR}/x11-fonts/libXft

 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}/
 MAINTAINER=	sascha@root-login.org
 COMMENT=	Place launch icons directly on your desktop

-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft

 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@ -36,7 +36,7 @@ MAN1=	mlterm.1 mlclient.1
 PKGNAMESUFFIX=	-noaa
 .else
 CONFIGURE_ARGS+=	--enable-anti-alias
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif

 pre-everything::
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.handhelds.org/pub/projects/xstroke/release-${PORTVERSION
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fullscreen gesture recognition

-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/libgnugetopt:extract

 USE_REINPLACE=	yes