summaryrefslogtreecommitdiff
path: root/x11-fonts
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-04-04 20:23:31 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-04-04 20:23:31 +0000
commitfebce36476de3055f8e9f41ea89ea042251f411b (patch)
tree8a9b329e6da4f5d73c460217600f4c5868b5f68e /x11-fonts
parentAdd a hack to link with libstdc++. This will fix the configure error (diff)
fontconfig-config is no longer installed. Therefore, Xft wasn't being
linked against libfontconfig. This broke KDE since KDE expected libfontconfig to be imported via Xft. GNOME was okay since it uses pkg-config, and explicitly linked against fontconfig. Reported by: Benjamin Lutz <benlutz@datacomm.ch> Bjarne Wichmann Petersen <kde.nospam@mekanix.dk>
Notes
Notes: svn path=/head/; revision=78204
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/Xft/Makefile3
-rw-r--r--x11-fonts/libXft/Makefile3
2 files changed, 4 insertions, 2 deletions
diff --git a/x11-fonts/Xft/Makefile b/x11-fonts/Xft/Makefile
index 013f972ea8d4..8a9027590dd9 100644
--- a/x11-fonts/Xft/Makefile
+++ b/x11-fonts/Xft/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Xft
PORTVERSION= 2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts
MASTER_SITES= http://fontconfig.org/fontconfig/release/
DISTNAME= fcpackage.${PORTVERSION:S/./_/}
@@ -22,6 +22,7 @@ USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
+CONFIGURE_ARGS= --with-fontconfig-config="pkg-config fontconfig"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-unknown-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LIBS="-L${X11BASE}/lib"
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 013f972ea8d4..8a9027590dd9 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Xft
PORTVERSION= 2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts
MASTER_SITES= http://fontconfig.org/fontconfig/release/
DISTNAME= fcpackage.${PORTVERSION:S/./_/}
@@ -22,6 +22,7 @@ USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
+CONFIGURE_ARGS= --with-fontconfig-config="pkg-config fontconfig"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-unknown-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LIBS="-L${X11BASE}/lib"