summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2019-03-11 21:25:57 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2019-03-11 21:25:57 +0000
commit7a325e6491e40f5b8019920ab62c25f5718b8ea7 (patch)
tree220eef0d4bb423caccb8b2d17fbea9c1f7c607f2 /Mk
parent12cb0a983fbaeb551c25a53f8f87cd997b6253c7 (diff)
downloadfreebsd-ports-7a325e6491e40f5b8019920ab62c25f5718b8ea7.zip
x11-fonts/mkfontscale: Update to 1.2.0
Update x11-fonts/mkfontscale to 1.2.0 Remove x11-fonts/mkfontdir, which has been merged into mkfontscale. Update dependencies and bump portrevisions. Add an entry to UPDATING and MOVES Changelog: https://lists.x.org/archives/xorg/2019-March/059633.html Thanks to Antoine for the exp-run! PR: 236336 (exp-run) Obtained from: FreeBSD Graphics Team dev repo https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/mkfontscale Sponsored by: B3 Init
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/fonts.mk3
-rw-r--r--Mk/bsd.xorg.mk2
2 files changed, 2 insertions, 3 deletions
diff --git a/Mk/Uses/fonts.mk b/Mk/Uses/fonts.mk
index 357f123328bb..104ad0c4eae8 100644
--- a/Mk/Uses/fonts.mk
+++ b/Mk/Uses/fonts.mk
@@ -54,8 +54,7 @@ IGNORE= USES=fonts - invalid ARGS (${fonts_ARGS})
RUN_DEPENDS+= fc-cache:x11-fonts/fontconfig
.endif
.if !empty(fonts_ARGS:Mfontsdir) || !empty(fonts_ARGS:Mfcfontsdir)
-RUN_DEPENDS+= mkfontdir:x11-fonts/mkfontdir \
- mkfontscale:x11-fonts/mkfontscale
+RUN_DEPENDS+= mkfontscale:x11-fonts/mkfontscale
.endif
FONTNAME?= ${PORTNAME}
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index 9e68d674ce5c..a5621f081386 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts
CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/share/fonts
. if !defined(NOFONT)
USES+= fonts
-BUILD_DEPENDS+= mkfontdir:x11-fonts/mkfontdir \
+BUILD_DEPENDS+= mkfontscale>=0:x11-fonts/mkfontscale \
bdftopcf:x11-fonts/bdftopcf
PLIST_FILES+= "@comment ${FONTSDIR}/fonts.dir" \
"@comment ${FONTSDIR}/fonts.scale"