Fix a bug in fontconfig's configure script that was causing fonts.conf

to not include /usr/X11R6/lib/X11/fonts if XFree86 was not installed.
This was in turn leading to crashes in things such as xclock.  This bug
has been filed with fontconfig's Bugzilla as bug #45.

Reported by:	many
Brought to my attention by:	anholt
Approved by:	portmgr (will)
This commit is contained in:
Joe Marcus Clarke 2003-03-13 23:07:30 +00:00
parent 5349781c47
commit 2b7e6e3fea
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=77124
2 changed files with 13 additions and 2 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= fontconfig
PORTVERSION= 2.1
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= x11-fonts
MASTER_SITES= http://www.fontconfig.org/fontconfig/release/
DISTNAME= fcpackage.${PORTVERSION:S/./_/}
@ -27,7 +27,7 @@ GNU_CONFIGURE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \
--with-expat=${LOCALBASE} \
--with-default-fonts=${X11BASE}/lib/X11/fonts
--with-default_fonts=${X11BASE}/lib/X11/fonts
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
WRKSRC= ${WRKDIR}/${DISTNAME}/fontconfig
MAKE_ENV= LC_ALL=C

View File

@ -0,0 +1,11 @@
--- configure.orig Thu Mar 13 17:21:08 2003
+++ configure Thu Mar 13 17:21:15 2003
@@ -611,7 +611,7 @@
# Check whether --with-default_fonts or --without-default_fonts was given.
if test "${with_default_fonts+set}" = set; then
withval="$with_default_fonts"
- defaultfonts="$withval"
+ default_fonts="$withval"
else
default_fonts=yes
fi