aboutsummaryrefslogtreecommitdiffstats
path: root/Mk/Uses
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-03-22 07:05:19 +0800
committerbapt <bapt@FreeBSD.org>2015-03-22 07:05:19 +0800
commitfe5a7e4bee2fc7a40343278a44de77847b5c91c5 (patch)
treeb9556c9042a9d20d7c71f49869f39f95afc00052 /Mk/Uses
parent9167139629893ea7664f3b1cf93141ff1eeb82b4 (diff)
downloadfreebsd-ports-gnome-fe5a7e4bee2fc7a40343278a44de77847b5c91c5.tar.gz
freebsd-ports-gnome-fe5a7e4bee2fc7a40343278a44de77847b5c91c5.tar.zst
freebsd-ports-gnome-fe5a7e4bee2fc7a40343278a44de77847b5c91c5.zip
Make fonts repecting XDG
Xorg is now looking in ${LOCALBASE}/share/fonts by default Xorg now accepts symlinks in etc/X11/fontpath.d (as decribed in Xserver(1)) Large cleanup on lots of font ports All fonts are now properly dynamically generating fonts.dir and fonts.scale instead of sometime overwriting existing ones) All fonts are generating fontconfig's cache Improve consistency in fonts ports
Diffstat (limited to 'Mk/Uses')
-rw-r--r--Mk/Uses/display.mk4
-rw-r--r--Mk/Uses/fonts.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk
index 5b5c8b533559..b3aec5a49f33 100644
--- a/Mk/Uses/display.mk
+++ b/Mk/Uses/display.mk
@@ -17,8 +17,8 @@ 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/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
+ ${LOCALBASE}/share/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/Uses/fonts.mk b/Mk/Uses/fonts.mk
index c0493dd4e72d..54d282bd5aec 100644
--- a/Mk/Uses/fonts.mk
+++ b/Mk/Uses/fonts.mk
@@ -14,7 +14,7 @@ RUN_DEPENDS+= fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
FONTNAME?= ${PORTNAME}
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME}
+FONTSDIR?= ${PREFIX}/share/fonts/${FONTNAME}
PLIST_FILES+= "@fcfontsdir ${FONTSDIR}"
SUB_LIST+= FONTSDIR="${FONTSDIR}"
PLIST_SUB+= FONTSDIR="${FONTSDIR}"