From a7f463fd3a4ed0ed451b12e125683bc37309a998 Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Thu, 13 Mar 2003 23:07:30 +0000
Subject: 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)
---
 x11-fonts/fontconfig/Makefile              |  4 ++--
 x11-fonts/fontconfig/files/patch-configure | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 x11-fonts/fontconfig/files/patch-configure

(limited to 'x11-fonts')

diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index fd9195a0b715..70b3be9b8697 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -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
diff --git a/x11-fonts/fontconfig/files/patch-configure b/x11-fonts/fontconfig/files/patch-configure
new file mode 100644
index 000000000000..8a8378a7a11d
--- /dev/null
+++ b/x11-fonts/fontconfig/files/patch-configure
@@ -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
-- 
cgit