diff options
| author | bapt <bapt@FreeBSD.org> | 2015-03-20 15:19:51 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-03-20 15:19:51 +0800 |
| commit | 6ec758cfd71ae4229781b0094577eb9e80767bd4 (patch) | |
| tree | cbf7118fbd91bcd76d039218dd833258fe9e4271 /Mk | |
| parent | f499da28b7ea3774eeebc171ec5e6be161c75016 (diff) | |
| download | freebsd-ports-gnome-6ec758cfd71ae4229781b0094577eb9e80767bd4.tar.gz freebsd-ports-gnome-6ec758cfd71ae4229781b0094577eb9e80767bd4.tar.zst freebsd-ports-gnome-6ec758cfd71ae4229781b0094577eb9e80767bd4.zip | |
Removing font-alias was a mistake, readd it which fixes tigervnc (and more)
Pointyhat to: bapt
Reported by: Corey <merlincorey@hushmail.me>
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/display.mk | 1 | ||||
| -rw-r--r-- | Mk/bsd.xorg.mk | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk index 200b58b26703..5b5c8b533559 100644 --- a/Mk/Uses/display.mk +++ b/Mk/Uses/display.mk @@ -18,6 +18,7 @@ display_ARGS= install .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \ ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \ + ${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \ ${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \ xkbcomp:${PORTSDIR}/x11/xkbcomp diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index 72427c95bb3c..f3f8ebc563e5 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -72,10 +72,12 @@ USES+= libtool FONTNAME?= ${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/} CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/lib/X11/fonts CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/lib/X11/fonts +. if !defined(NOFONT) USES+= fonts BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf -.endif +. endif +. endif . if ${XORG_CAT} == "lib" USES+= pathfix libtool:keepla |