[pkgsrc/trunk]: pkgsrc/fonts/fontconfig fontconfig's configure doesn't suppor...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9c0b41c087f5
branches:  trunk
changeset: 523679:9c0b41c087f5
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 11 11:25:57 2007 +0000

description:
fontconfig's configure doesn't support multiple --with-add-fonts,
so list them explictly in one option. This fixes the build for
non-modular Xorg as noticed by tron@ in PR 35397. Bump revision.

diffstat:

 fonts/fontconfig/Makefile |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r 1d75e276c7b0 -r 9c0b41c087f5 fonts/fontconfig/Makefile
--- a/fonts/fontconfig/Makefile Thu Jan 11 11:17:51 2007 +0000
+++ b/fonts/fontconfig/Makefile Thu Jan 11 11:25:57 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2007/01/09 08:58:29 joerg Exp $
+# $NetBSD: Makefile,v 1.62 2007/01/11 11:25:57 joerg Exp $
 
 DISTNAME=      fontconfig-2.4.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    fonts
 MASTER_SITES=  http://www.fontconfig.org/release/
 
@@ -33,11 +33,11 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if ${X11BASE} != ${LOCALBASE}
-CONFIGURE_ARGS+=       --with-add-fonts=${X11BASE}/lib/X11/fonts
+CONFIGURE_ARGS+=       --with-add-fonts=${X11BASE}/lib/X11/fonts,${PREFIX}/share/ghostscript/fonts
+.else
+CONFIGURE_ARGS+=       --with-add-fonts=${PREFIX}/share/ghostscript/fonts
 .endif
 
-CONFIGURE_ARGS+=       --with-add-fonts=${PREFIX}/share/ghostscript/fonts
-
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=       --with-arch=${MACHINE_ARCH}
 .endif