svn commit: r381894 - in head/sysutils/grub2-pcbsd: . files
Baptiste Daroussin
bapt at FreeBSD.org
Sun Mar 22 10:07:36 UTC 2015
Author: bapt
Date: Sun Mar 22 10:07:35 2015
New Revision: 381894
URL: https://svnweb.freebsd.org/changeset/ports/381894
QAT: https://qat.redports.org/buildarchive/r381894/
Log:
Fix detection of unifont
Modified:
head/sysutils/grub2-pcbsd/Makefile
head/sysutils/grub2-pcbsd/files/patch-configure.ac
Modified: head/sysutils/grub2-pcbsd/Makefile
==============================================================================
--- head/sysutils/grub2-pcbsd/Makefile Sun Mar 22 09:50:01 2015 (r381893)
+++ head/sysutils/grub2-pcbsd/Makefile Sun Mar 22 10:07:35 2015 (r381894)
@@ -55,7 +55,7 @@ PLIST_SUB+= EFIEMU=${EFIEMU}
.if ${PORT_OPTIONS:MMKFONT}
LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2
BUILD_DEPENDS+= ${LOCALBASE}//fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
- ${LOCALBASE}/share/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
+ ${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
MAN1+= grub-mkfont.1
CONFIGURE_ARGS+= --enable-grub-mkfont
.else
Modified: head/sysutils/grub2-pcbsd/files/patch-configure.ac
==============================================================================
--- head/sysutils/grub2-pcbsd/files/patch-configure.ac Sun Mar 22 09:50:01 2015 (r381893)
+++ head/sysutils/grub2-pcbsd/files/patch-configure.ac Sun Mar 22 10:07:35 2015 (r381894)
@@ -14,7 +14,7 @@
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
-+ for dir in . /usr/src /usr/local/share/fonts/local /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
++ for dir in . /usr/src /usr/local/share/fonts/gnu-unifont /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
if test -f "$dir/unifont.$ext"; then
md5="$(md5sum "$dir/unifont.$ext"|awk '{ print $1; }')"
# PCF and BDF from version 6.3 isn't hanled properly by libfreetype.
More information about the svn-ports-head
mailing list