diff options
| author | joerg <joerg> | 2007-01-11 11:25:57 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-01-11 11:25:57 +0000 |
| commit | 390382004406961816495b3a3ae034d1956e63c1 (patch) | |
| tree | 1903463fe671f174b5c8fc1ce42f5d99b607c6e6 /fonts/fontconfig | |
| parent | aca8087146c5e45f7ffb5a9283ccaf40dc555892 (diff) | |
| download | pkgsrc-390382004406961816495b3a3ae034d1956e63c1.tar.gz | |
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 (limited to 'fonts/fontconfig')
| -rw-r--r-- | fonts/fontconfig/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index 567530a4171..a3ecdb3d332 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -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,10 +33,10 @@ CONFIGURE_ENV+= HASDOCBOOK=no .include "../../mk/bsd.prefs.mk" .if ${X11BASE} != ${LOCALBASE} -CONFIGURE_ARGS+= --with-add-fonts=${X11BASE}/lib/X11/fonts -.endif - +CONFIGURE_ARGS+= --with-add-fonts=${X11BASE}/lib/X11/fonts,${PREFIX}/share/ghostscript/fonts +.else CONFIGURE_ARGS+= --with-add-fonts=${PREFIX}/share/ghostscript/fonts +.endif .if ${OPSYS} == "Darwin" CONFIGURE_ARGS+= --with-arch=${MACHINE_ARCH} |