diff options
| author | joerg <joerg> | 2010-09-19 17:48:56 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2010-09-19 17:48:56 +0000 |
| commit | 4257f24eee95f723ad8eccbb4ad8846cb512da89 (patch) | |
| tree | 3106063c42ac1e670c0322398a774e7c70315150 /x11 | |
| parent | c1b994f0b46012ff4c59a1d39b203bb9b9dde7d8 (diff) | |
| download | pkgsrc-4257f24eee95f723ad8eccbb4ad8846cb512da89.tar.gz | |
Allow both, new and old, font locations for now. Bump revision.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/modular-xorg-server/Makefile | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index 366a5a908d1..b9db388261b 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.62 2010/09/14 11:03:10 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2010/09/19 17:48:56 joerg Exp $ # DISTNAME= xorg-server-1.6.5 PKGNAME= modular-${DISTNAME} -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} EXTRACT_SUFX= .tar.bz2 @@ -56,6 +56,18 @@ CONFIGURE_ARGS+= --with-vendor-web="http://www.pkgsrc.org/" CONFIGURE_ARGS+= --enable-xorg +CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts/X11 + +LEGACY_FONT_PATH= +DEFAULT_FONT_PATH= +.for f in misc TTF OTF Type1 100dpi 75dpi cyrillic +DEFAULT_FONT_PATH+= ${PREFIX}/share/fonts/X11/${f} +LEGACY_FONT_PATH+= ${PREFIX}/lib/X11/fonts/${f} +.endfor +FONT_PATH= ${DEFAULT_FONT_PATH} ${LEGACY_FONT_PATH} + +CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATH:ts,:Q} + CONFIGURE_ARGS+= --disable-config-hal CONFIGURE_ARGS+= --disable-dmx CONFIGURE_ARGS+= --disable-xprint |