aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--Mk/Uses/fonts.mk3
-rw-r--r--Mk/bsd.xorg.mk2
-rw-r--r--UPDATING12
-rw-r--r--arabic/ae_fonts_mono/Makefile2
-rw-r--r--arabic/ae_fonts_ttf/Makefile2
-rw-r--r--arabic/kacst_fonts/Makefile2
-rw-r--r--chinese/CJKUnifonts/Makefile2
-rw-r--r--chinese/CNS11643-font/Makefile2
-rw-r--r--chinese/arphicttf/Makefile2
-rw-r--r--chinese/fandol/Makefile1
-rw-r--r--chinese/fireflyttf/Makefile2
-rw-r--r--chinese/kcfonts/Makefile2
-rw-r--r--chinese/moettf/Makefile2
-rw-r--r--chinese/opendesktop-fonts/Makefile2
-rw-r--r--chinese/sourcehanserif-sc-otf/Makefile1
-rw-r--r--chinese/sourcehanserif-tc-otf/Makefile1
-rw-r--r--deskutils/conkyforecast/Makefile2
-rw-r--r--emulators/pcemu/Makefile5
-rw-r--r--emulators/stonx/Makefile3
-rw-r--r--emulators/vice/Makefile2
-rw-r--r--games/xjewel/Makefile4
-rw-r--r--hebrew/culmus/Makefile1
-rw-r--r--hebrew/elmar-fonts/Makefile2
-rw-r--r--japanese/alias-fonts/Makefile2
-rw-r--r--japanese/font-ayu18/Makefile2
-rw-r--r--japanese/font-ayu20/Makefile2
-rw-r--r--japanese/font-elisa10/Makefile2
-rw-r--r--japanese/font-elisa8/Makefile2
-rw-r--r--japanese/font-jisx0213/Makefile2
-rw-r--r--japanese/font-kaname12/Makefile2
-rw-r--r--japanese/font-kanji18/Makefile2
-rw-r--r--japanese/font-kappa20/Makefile2
-rw-r--r--japanese/font-mona/Makefile4
-rw-r--r--japanese/font-mplus-bitmap/Makefile2
-rw-r--r--japanese/font-mplus-outline/Makefile3
-rw-r--r--japanese/font-naga10/Makefile2
-rw-r--r--japanese/font-shinonome/Makefile2
-rw-r--r--japanese/kterm/Makefile3
-rw-r--r--japanese/sourcehanserif-otf/Makefile1
-rw-r--r--korean/aleefonts-ttf/Makefile1
-rw-r--r--korean/baekmukfonts-bdf/Makefile3
-rw-r--r--korean/baekmukfonts-ttf/Makefile2
-rw-r--r--korean/d2coding-ttf/Makefile1
-rw-r--r--korean/hanyangfonts/Makefile2
-rw-r--r--korean/kaistfonts/Makefile2
-rw-r--r--korean/nanumcoding-ttf/Makefile2
-rw-r--r--korean/nanumfonts-otf/Makefile1
-rw-r--r--korean/sourcehanserif-otf/Makefile1
-rw-r--r--korean/unfonts-core/Makefile2
-rw-r--r--korean/unfonts-extra/Makefile2
-rw-r--r--mail/metamail/Makefile6
-rw-r--r--print/adobe-cmaps/Makefile2
-rw-r--r--print/font-amsfonts/Makefile2
-rw-r--r--russian/artwiz-ru/Makefile2
-rw-r--r--ukrainian/monacofonts/Makefile3
-rw-r--r--vietnamese/unicode-uhoai/Makefile2
-rw-r--r--vietnamese/urwvn/Makefile2
-rw-r--r--vietnamese/vietunicode-hannom/Makefile2
-rw-r--r--vietnamese/vietunicode-trichlor/Makefile2
-rw-r--r--vietnamese/vietunicode-web1/Makefile2
-rw-r--r--www/alef-webfont/Makefile5
-rw-r--r--x11-fonts/3270font/Makefile1
-rw-r--r--x11-fonts/Hasklig/Makefile1
-rw-r--r--x11-fonts/Makefile1
-rw-r--r--x11-fonts/alef/Makefile2
-rw-r--r--x11-fonts/alegreya-sans/Makefile1
-rw-r--r--x11-fonts/alegreya/Makefile1
-rw-r--r--x11-fonts/andika/Makefile2
-rw-r--r--x11-fonts/anonymous-pro/Makefile2
-rw-r--r--x11-fonts/artwiz-aleczapka-de/Makefile2
-rw-r--r--x11-fonts/artwiz-aleczapka-se/Makefile2
-rw-r--r--x11-fonts/artwiz-aleczapka/Makefile2
-rw-r--r--x11-fonts/artwiz-fonts/Makefile2
-rw-r--r--x11-fonts/averiagwf/Makefile1
-rw-r--r--x11-fonts/b612/Makefile1
-rw-r--r--x11-fonts/bitstream-vera/Makefile2
-rw-r--r--x11-fonts/bitter/Makefile2
-rw-r--r--x11-fonts/cantarell-fonts/Makefile1
-rw-r--r--x11-fonts/charis-compact/Makefile2
-rw-r--r--x11-fonts/charis/Makefile2
-rw-r--r--x11-fonts/clearsans/Makefile2
-rw-r--r--x11-fonts/code2000/Makefile2
-rw-r--r--x11-fonts/comfortaa-ttf/Makefile1
-rw-r--r--x11-fonts/comic-neue/Makefile1
-rw-r--r--x11-fonts/consolamono-ttf/Makefile2
-rw-r--r--x11-fonts/courier-prime/Makefile1
-rw-r--r--x11-fonts/croscorefonts-fonts-ttf/Makefile1
-rw-r--r--x11-fonts/crosextrafonts-caladea-ttf/Makefile2
-rw-r--r--x11-fonts/crosextrafonts-carlito-ttf/Makefile2
-rw-r--r--x11-fonts/cyberbit-ttfonts/Makefile2
-rw-r--r--x11-fonts/cyr-rfx/Makefile4
-rw-r--r--x11-fonts/datalegreya/Makefile1
-rw-r--r--x11-fonts/dejavu/Makefile1
-rw-r--r--x11-fonts/dina/Makefile2
-rw-r--r--x11-fonts/doulos-compact/Makefile2
-rw-r--r--x11-fonts/doulos/Makefile2
-rw-r--r--x11-fonts/droid-fonts-ttf/Makefile2
-rw-r--r--x11-fonts/exo/Makefile1
-rw-r--r--x11-fonts/fantasque-sans-mono/Makefile2
-rw-r--r--x11-fonts/fanwood/Makefile1
-rw-r--r--x11-fonts/farsifonts/Makefile2
-rw-r--r--x11-fonts/fifteen/Makefile1
-rw-r--r--x11-fonts/fira/Makefile1
-rw-r--r--x11-fonts/firacode/Makefile1
-rw-r--r--x11-fonts/firago/Makefile1
-rw-r--r--x11-fonts/font-adobe-100dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-75dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-100dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-75dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-type1/Makefile2
-rw-r--r--x11-fonts/font-arabic-misc/Makefile2
-rw-r--r--x11-fonts/font-awesome/Makefile1
-rw-r--r--x11-fonts/font-bh-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-ttf/Makefile2
-rw-r--r--x11-fonts/font-bh-type1/Makefile2
-rw-r--r--x11-fonts/font-bitstream-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bitstream-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bitstream-speedo/Makefile2
-rw-r--r--x11-fonts/font-bitstream-type1/Makefile2
-rw-r--r--x11-fonts/font-cronyx-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-cursor-misc/Makefile2
-rw-r--r--x11-fonts/font-daewoo-misc/Makefile2
-rw-r--r--x11-fonts/font-dec-misc/Makefile2
-rw-r--r--x11-fonts/font-gost/Makefile2
-rw-r--r--x11-fonts/font-ibm-type1/Makefile2
-rw-r--r--x11-fonts/font-isas-misc/Makefile2
-rw-r--r--x11-fonts/font-jis-misc/Makefile2
-rw-r--r--x11-fonts/font-micro-misc/Makefile2
-rw-r--r--x11-fonts/font-misc-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-misc-ethiopic/Makefile2
-rw-r--r--x11-fonts/font-misc-meltho/Makefile2
-rw-r--r--x11-fonts/font-misc-misc/Makefile2
-rw-r--r--x11-fonts/font-mutt-misc/Makefile2
-rw-r--r--x11-fonts/font-schumacher-misc/Makefile2
-rw-r--r--x11-fonts/font-screen-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-sony-misc/Makefile2
-rw-r--r--x11-fonts/font-sun-misc/Makefile2
-rw-r--r--x11-fonts/font-tex-gyre-bonum-math/Makefile1
-rw-r--r--x11-fonts/font-tex-gyre-pagella-math/Makefile1
-rw-r--r--x11-fonts/font-tex-gyre-schola-math/Makefile1
-rw-r--r--x11-fonts/font-tex-gyre-termes-math/Makefile1
-rw-r--r--x11-fonts/font-winitzki-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-xfree86-type1/Makefile2
-rw-r--r--x11-fonts/fonts-indic/Makefile2
-rw-r--r--x11-fonts/freefont-ttf/Makefile2
-rw-r--r--x11-fonts/freefonts/Makefile2
-rw-r--r--x11-fonts/geminifonts/Makefile4
-rw-r--r--x11-fonts/gentium-basic/Makefile1
-rw-r--r--x11-fonts/gentium-plus/Makefile1
-rw-r--r--x11-fonts/gnu-unifont/Makefile1
-rw-r--r--x11-fonts/gofont-ttf/Makefile1
-rw-r--r--x11-fonts/gohufont/Makefile1
-rw-r--r--x11-fonts/google-fonts/Makefile2
-rw-r--r--x11-fonts/hack-font/Makefile1
-rw-r--r--x11-fonts/hanazono-fonts-ttf/Makefile1
-rw-r--r--x11-fonts/hermit/Makefile1
-rw-r--r--x11-fonts/inconsolata-lgc-ttf/Makefile2
-rw-r--r--x11-fonts/inconsolata-ttf/Makefile1
-rw-r--r--x11-fonts/indic-ttf/Makefile2
-rw-r--r--x11-fonts/intlfonts/Makefile2
-rw-r--r--x11-fonts/iosevka/Makefile1
-rw-r--r--x11-fonts/isabella/Makefile2
-rw-r--r--x11-fonts/jmk-x11-fonts/Makefile4
-rw-r--r--x11-fonts/junction/Makefile1
-rw-r--r--x11-fonts/junicode/Makefile1
-rw-r--r--x11-fonts/kaputa/Makefile2
-rw-r--r--x11-fonts/khmeros/Makefile2
-rw-r--r--x11-fonts/lato/Makefile1
-rw-r--r--x11-fonts/league-gothic/Makefile1
-rw-r--r--x11-fonts/league-spartan/Makefile1
-rw-r--r--x11-fonts/lfpfonts-fix/Makefile2
-rw-r--r--x11-fonts/lfpfonts-var/Makefile2
-rw-r--r--x11-fonts/liberation-fonts-ttf/Makefile1
-rw-r--r--x11-fonts/linden-hill/Makefile1
-rw-r--r--x11-fonts/linuxlibertine-g/Makefile2
-rw-r--r--x11-fonts/linuxlibertine/Makefile2
-rw-r--r--x11-fonts/lohit/Makefile2
-rw-r--r--x11-fonts/manu-gothica/Makefile2
-rw-r--r--x11-fonts/material-icons-ttf/Makefile1
-rw-r--r--x11-fonts/materialdesign-ttf/Makefile1
-rw-r--r--x11-fonts/meslo/Makefile1
-rw-r--r--x11-fonts/mgopen/Makefile1
-rw-r--r--x11-fonts/mkfontdir/Makefile22
-rw-r--r--x11-fonts/mkfontdir/distinfo2
-rw-r--r--x11-fonts/mkfontdir/pkg-descr4
-rw-r--r--x11-fonts/mkfontscale/Makefile10
-rw-r--r--x11-fonts/mkfontscale/distinfo6
-rw-r--r--x11-fonts/mondulkiri/Makefile2
-rw-r--r--x11-fonts/montecarlo_fonts/Makefile2
-rw-r--r--x11-fonts/montserrat/Makefile1
-rw-r--r--x11-fonts/moveable-type-fonts/Makefile2
-rw-r--r--x11-fonts/nerd-fonts/Makefile1
-rw-r--r--x11-fonts/noto-basic/Makefile1
-rw-r--r--x11-fonts/noto-extra/Makefile1
-rw-r--r--x11-fonts/noto-jp/Makefile1
-rw-r--r--x11-fonts/noto-kr/Makefile1
-rw-r--r--x11-fonts/noto-sc/Makefile1
-rw-r--r--x11-fonts/noto-tc/Makefile1
-rw-r--r--x11-fonts/nucleus/Makefile2
-rw-r--r--x11-fonts/ohsnap/Makefile1
-rw-r--r--x11-fonts/oldschool-pc-fonts/Makefile1
-rw-r--r--x11-fonts/p5-type1inst/Makefile5
-rw-r--r--x11-fonts/padauk/Makefile2
-rw-r--r--x11-fonts/paratype/Makefile1
-rw-r--r--x11-fonts/pingwi/Makefile2
-rw-r--r--x11-fonts/plex-ttf/Makefile1
-rw-r--r--x11-fonts/powerline-fonts/Makefile1
-rw-r--r--x11-fonts/prociono/Makefile1
-rw-r--r--x11-fonts/profont/Makefile2
-rw-r--r--x11-fonts/proggy_fonts-ttf/Makefile2
-rw-r--r--x11-fonts/proggy_fonts/Makefile2
-rw-r--r--x11-fonts/raleway/Makefile1
-rw-r--r--x11-fonts/roboto-fonts-ttf/Makefile1
-rw-r--r--x11-fonts/sgifonts/Makefile2
-rw-r--r--x11-fonts/sharefonts/Makefile2
-rw-r--r--x11-fonts/sourcecodepro-ttf/Makefile1
-rw-r--r--x11-fonts/sourcesanspro-ttf/Makefile1
-rw-r--r--x11-fonts/sourceserifpro-ttf/Makefile1
-rw-r--r--x11-fonts/spleen/Makefile1
-rw-r--r--x11-fonts/stix-fonts/Makefile1
-rw-r--r--x11-fonts/suxus/Makefile2
-rw-r--r--x11-fonts/symbola/Makefile2
-rw-r--r--x11-fonts/tamsyn/Makefile1
-rw-r--r--x11-fonts/tamzen/Makefile1
-rw-r--r--x11-fonts/terminus-font/Makefile1
-rw-r--r--x11-fonts/terminus-ttf/Makefile1
-rw-r--r--x11-fonts/tmu/Makefile1
-rw-r--r--x11-fonts/tv-fonts/Makefile4
-rw-r--r--x11-fonts/twemoji-color-font-ttf/Makefile1
-rw-r--r--x11-fonts/ubuntu-font/Makefile1
-rw-r--r--x11-fonts/urwfonts-ttf/Makefile2
-rw-r--r--x11-fonts/urwfonts/Makefile2
-rw-r--r--x11-fonts/uw-ttyp0/Makefile2
-rw-r--r--x11-fonts/vollkorn-ttf/Makefile1
-rw-r--r--x11-fonts/webfonts/Makefile2
-rw-r--r--x11-fonts/wqy/Makefile2
-rw-r--r--x11-toolkits/xview/Makefile5
-rw-r--r--x11-wm/libdockapp/Makefile2
-rw-r--r--x11/cde/Makefile3
-rw-r--r--x11/x3270/Makefile3
-rw-r--r--x11/xorg-apps/Makefile3
245 files changed, 272 insertions, 214 deletions
diff --git a/MOVED b/MOVED
index e266511f6a7f..d74b18c41232 100644
--- a/MOVED
+++ b/MOVED
@@ -11681,3 +11681,4 @@ net-mgmt/py-pysnmp-apps|net-mgmt/py-snmpclitools|2019-02-15|Renamed upstream
math/mumps|math/mumps4|2019-03-10|MUMPS 4 is the legacy version
math/mumps-edf|math/mumps|2019-03-10|Use mumps-edf as MUMPS 5
textproc/soprano||2019-03-11|Has expired: Qt4 has been EOL since december 2015
+x11-fonts/mkfontdir|x11-fonts/mkfontscale|2019-03-11|Merged into one package
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"
diff --git a/UPDATING b/UPDATING
index 763765895dbf..162b7c275247 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,18 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20190311:
+ AFFECTS: users of x11/xorg, x11-fonts/mkfontscale, x11-fonts/mkfontdir
+ AUTHOR: zeising@FreeBSD.org
+
+ The x11-fonts/mkfontdir port has been removed and the functionality
+ has been merged into x11-fonts/mkfontscale. This might cause issues
+ with upgrading. If you get conflicts between mkfontscale and mkfontdir
+ please remove mkfontdir before upgrading.
+
+ To do this, simply run the following:
+ pkg delete -f mkfontdir
+
+20190311:
AFFECTS: users of www/igal2
AUTHOR: rodrigo@freebsd.org
diff --git a/arabic/ae_fonts_mono/Makefile b/arabic/ae_fonts_mono/Makefile
index b27487ce59be..1ea0541932fc 100644
--- a/arabic/ae_fonts_mono/Makefile
+++ b/arabic/ae_fonts_mono/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ae_fonts_mono
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= arabic x11-fonts
MASTER_SITES= SF/arabeyes/Fonts/ae_fonts
DISTNAME= ${PORTNAME}
diff --git a/arabic/ae_fonts_ttf/Makefile b/arabic/ae_fonts_ttf/Makefile
index 851c824d643f..e5686eaa7a05 100644
--- a/arabic/ae_fonts_ttf/Makefile
+++ b/arabic/ae_fonts_ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ae_fonts1_ttf
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= arabic x11-fonts
MASTER_SITES= SF/arabeyes/Fonts/ae_fonts
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/arabic/kacst_fonts/Makefile b/arabic/kacst_fonts/Makefile
index b366f0c4e1b8..c4d630a027e5 100644
--- a/arabic/kacst_fonts/Makefile
+++ b/arabic/kacst_fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kacst_fonts
PORTVERSION= 2.01
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= arabic
MASTER_SITES= SF/arabeyes/${PORTNAME} \
http://www.c-s.li/ports/
diff --git a/chinese/CJKUnifonts/Makefile b/chinese/CJKUnifonts/Makefile
index f9f13677dae3..e535c394cec9 100644
--- a/chinese/CJKUnifonts/Makefile
+++ b/chinese/CJKUnifonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= CJKUnifonts
PORTVERSION= 0.2.20080216.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese x11-fonts
MASTER_SITES= LOCAL/chinsan/fonts/:uming \
LOCAL/chinsan/fonts/:ukai
diff --git a/chinese/CNS11643-font/Makefile b/chinese/CNS11643-font/Makefile
index 702c60cf8a5f..b80f073926d0 100644
--- a/chinese/CNS11643-font/Makefile
+++ b/chinese/CNS11643-font/Makefile
@@ -3,7 +3,7 @@
PORTNAME= CNS11643-font
PORTVERSION= 98.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= chinese x11-fonts
MASTER_SITES= http://www.cns11643.gov.tw/AIDB/file.do?path=download/%E5%AD%97%E5%9E%8B%E4%B8%8B%E8%BC%89%601q%60%E5%85%A8%E5%AD%97%E5%BA%AB%E6%AD%A3%E6%A5%B7%E9%AB%94/name/:kai \
http://www.cns11643.gov.tw/AIDB/file.do?path=download/%E5%AD%97%E5%9E%8B%E4%B8%8B%E8%BC%89%601q%60%E5%85%A8%E5%AD%97%E5%BA%AB%E6%AD%A3%E5%AE%8B%E9%AB%94/name/:sung
diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile
index 0ee999537c68..5a0fae027f56 100644
--- a/chinese/arphicttf/Makefile
+++ b/chinese/arphicttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= arphicttf
PORTVERSION= 2.11
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= chinese x11-fonts
MASTER_SITES= LOCAL/rafan/chinese/
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/chinese/fandol/Makefile b/chinese/fandol/Makefile
index 11ffda6f684c..3a90b064ad88 100644
--- a/chinese/fandol/Makefile
+++ b/chinese/fandol/Makefile
@@ -3,6 +3,7 @@
PORTNAME= fandol
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= http://mirrors.ctan.org/fonts/
DISTNAME= ${PORTNAME}
diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile
index 7d9fddb83afe..d920c107dd91 100644
--- a/chinese/fireflyttf/Makefile
+++ b/chinese/fireflyttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fireflyttf
PORTVERSION= 1.3.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= chinese x11-fonts
MASTER_SITES?= LOCAL/chinsan/fonts
DISTNAME?= fireflysung-${PORTVERSION}
diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 90f52f2afb05..8bf7afb6e2fa 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kcfonts
PORTVERSION= 1.05
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese x11-fonts
MASTER_SITES= GENTOO
diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile
index 313faa8d718f..37a95f73aa30 100644
--- a/chinese/moettf/Makefile
+++ b/chinese/moettf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= moettf
PORTVERSION= 2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= chinese x11-fonts
MASTER_SITES= LOCAL/marino/zh-moettf
DISTFILES= edustds1.exe edustds2.exe edustd-15.exe \
diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile
index 2cdbbc387971..511f744f5872 100644
--- a/chinese/opendesktop-fonts/Makefile
+++ b/chinese/opendesktop-fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opendesktop-fonts
PORTVERSION= 1.4.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= chinese x11-fonts
MASTER_SITES?= LOCAL/chinsan/fonts
diff --git a/chinese/sourcehanserif-sc-otf/Makefile b/chinese/sourcehanserif-sc-otf/Makefile
index ecea4e036f7b..087e07014125 100644
--- a/chinese/sourcehanserif-sc-otf/Makefile
+++ b/chinese/sourcehanserif-sc-otf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= sourcehanserif
PORTVERSION= 1.001
+PORTREVISION= 1
DISTVERSIONSUFFIX= R
CATEGORIES= chinese x11-fonts
PKGNAMESUFFIX= -sc-otf
diff --git a/chinese/sourcehanserif-tc-otf/Makefile b/chinese/sourcehanserif-tc-otf/Makefile
index eb1c8948734e..50000e37b508 100644
--- a/chinese/sourcehanserif-tc-otf/Makefile
+++ b/chinese/sourcehanserif-tc-otf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= sourcehanserif
PORTVERSION= 1.001
+PORTREVISION= 1
DISTVERSIONSUFFIX= R
CATEGORIES= chinese x11-fonts
PKGNAMESUFFIX= -tc-otf
diff --git a/deskutils/conkyforecast/Makefile b/deskutils/conkyforecast/Makefile
index 03165aba02d2..7d5cdbcfde37 100644
--- a/deskutils/conkyforecast/Makefile
+++ b/deskutils/conkyforecast/Makefile
@@ -3,7 +3,7 @@
PORTNAME= conkyforecast
PORTVERSION= 2.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= https://launchpadlibrarian.net/70673352/ \
LOCAL/vg
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 00512d0143f0..29fa6cdf9435 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pcemu
PORTVERSION= 1.01b
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= emulators
MASTER_SITES= LOCAL/joerg
DISTNAME= pcemu1.01alpha
@@ -12,8 +12,7 @@ MAINTAINER= joerg@FreeBSD.org
COMMENT= 8086 PC emulator, by David Hedley
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf
-RUN_DEPENDS= mkfontdir:x11-fonts/mkfontdir \
- mkfontscale:x11-fonts/mkfontscale
+RUN_DEPENDS= mkfontscale:x11-fonts/mkfontscale
USE_XORG= x11 xext
USES= dos2unix
diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile
index 02b155ade1a6..5509d64761bb 100644
--- a/emulators/stonx/Makefile
+++ b/emulators/stonx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= stonx
PORTVERSION= 0.6.7e.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= SF/stonx/stonx/0.6.7.6
DISTNAME= STonX-0.6.7.6
@@ -15,7 +15,6 @@ LICENSE= GPLv2+
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
gccmakedep:devel/gccmakedep \
- mkfontdir:x11-fonts/mkfontdir \
mkfontscale:x11-fonts/mkfontscale \
${LOCALBASE}/share/fonts/misc/10x20-ISO8859-1.pcf.gz:x11-fonts/font-misc-misc
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index a1c4ce835bf8..a35a2f12ca6b 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -3,6 +3,7 @@
PORTNAME= vice
PORTVERSION= 3.3
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF/vice-emu/releases
@@ -12,7 +13,6 @@ COMMENT= Emulator for Commodore C64, C128, VIC20, PET, and CBM-II
LICENSE= GPLv2
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir \
mkfontscale:x11-fonts/mkfontscale \
xa65:devel/xa65
LIB_DEPENDS= libpng.so:graphics/png \
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index b446afcee145..53fb6bba66ea 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xjewel
PORTVERSION= 1.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= XCONTRIB/../R5contrib
EXTRACT_SUFX= .tar.z
@@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= X11 dropping jewels game
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir
+ mkfontscale>=0:x11-fonts/mkfontscale
USES= fonts imake
USE_XORG= x11 xext
diff --git a/hebrew/culmus/Makefile b/hebrew/culmus/Makefile
index 72c3914e5722..96cf7e1e3ed4 100644
--- a/hebrew/culmus/Makefile
+++ b/hebrew/culmus/Makefile
@@ -3,6 +3,7 @@
PORTNAME= culmus
PORTVERSION= 0.131
+PORTREVISION= 1
CATEGORIES= hebrew
MASTER_SITES= SF
diff --git a/hebrew/elmar-fonts/Makefile b/hebrew/elmar-fonts/Makefile
index adc90598a886..28c612330da9 100644
--- a/hebrew/elmar-fonts/Makefile
+++ b/hebrew/elmar-fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= elmar
PORTVERSION= 3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= hebrew x11-fonts
MASTER_SITES= ftp://ftp.elmar.co.il/Portable/fonts/
PKGNAMESUFFIX= -fonts
diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile
index 965f91317a97..23b129e9ef07 100644
--- a/japanese/alias-fonts/Makefile
+++ b/japanese/alias-fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= alias-fonts
PORTVERSION= 1.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= japanese x11-fonts
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/japanese/font-ayu18/Makefile b/japanese/font-ayu18/Makefile
index 3f948510f17d..6e36d3346f66 100644
--- a/japanese/font-ayu18/Makefile
+++ b/japanese/font-ayu18/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ayu18
PORTVERSION= 1.3.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= OSDN/x-tt/8535/:goth \
OSDN/x-tt/8494/:min
diff --git a/japanese/font-ayu20/Makefile b/japanese/font-ayu20/Makefile
index 11a2128ab2ad..9696c24d22cc 100644
--- a/japanese/font-ayu20/Makefile
+++ b/japanese/font-ayu20/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ayu20
PORTVERSION= 1.7.a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= OSDN/x-tt/8536/
PKGNAMEPREFIX= ja-font-
diff --git a/japanese/font-elisa10/Makefile b/japanese/font-elisa10/Makefile
index e8abdfd52f97..993bea462f6f 100644
--- a/japanese/font-elisa10/Makefile
+++ b/japanese/font-elisa10/Makefile
@@ -2,7 +2,7 @@
PORTNAME= elisa10
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://www.wheel.gr.jp/~dai/software/
PKGNAMEPREFIX= ja-font-
diff --git a/japanese/font-elisa8/Makefile b/japanese/font-elisa8/Makefile
index f85c6cdba1b2..436db197d9da 100644
--- a/japanese/font-elisa8/Makefile
+++ b/japanese/font-elisa8/Makefile
@@ -3,7 +3,7 @@
PORTNAME= elisa8
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://www.bsdbbq.org/~toshi/distfiles/
PKGNAMEPREFIX= ja-font-
diff --git a/japanese/font-jisx0213/Makefile b/japanese/font-jisx0213/Makefile
index f8af4ceedde0..01f0f2f651eb 100644
--- a/japanese/font-jisx0213/Makefile
+++ b/japanese/font-jisx0213/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jisx0213
PORTVERSION= 20040425
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://www12.ocn.ne.jp/~imamura/ \
LOCAL/hrs:yagi
diff --git a/japanese/font-kaname12/Makefile b/japanese/font-kaname12/Makefile
index 76a9727d1ed4..0004339137f4 100644
--- a/japanese/font-kaname12/Makefile
+++ b/japanese/font-kaname12/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kaname12
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= LOCAL/hrs
PKGNAMEPREFIX= ja-font-
diff --git a/japanese/font-kanji18/Makefile b/japanese/font-kanji18/Makefile
index a86ab7893d6a..f1b31e202b78 100644
--- a/japanese/font-kanji18/Makefile
+++ b/japanese/font-kanji18/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kanji
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= PORTS_JP/${DISTNAME}
PKGNAMEPREFIX= ja-font-
diff --git a/japanese/font-kappa20/Makefile b/japanese/font-kappa20/Makefile
index f24ed0b95e16..f9bbcac3fffc 100644
--- a/japanese/font-kappa20/Makefile
+++ b/japanese/font-kappa20/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kappa20
PORTVERSION= 0.396
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= LOCAL/hrs
PKGNAMEPREFIX= ja-font-
diff --git a/japanese/font-mona/Makefile b/japanese/font-mona/Makefile
index e9430db17861..280fc6ad1cfd 100644
--- a/japanese/font-mona/Makefile
+++ b/japanese/font-mona/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mona
PORTVERSION= 2.90
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= SF/monafont/monafont/monafont-${PORTVERSION}
PKGNAMEPREFIX= ja-font-
@@ -13,7 +13,7 @@ MAINTAINER= nobutaka@FreeBSD.org
COMMENT= 12,14,16-dot Kanji fonts
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir
+ mkfontscale>=0:x11-fonts/mkfontscale
USES= fonts perl5 tar:bzip2
USE_PERL5= build
diff --git a/japanese/font-mplus-bitmap/Makefile b/japanese/font-mplus-bitmap/Makefile
index da343fdea505..1c48e41430b0 100644
--- a/japanese/font-mplus-bitmap/Makefile
+++ b/japanese/font-mplus-bitmap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mplus
PORTVERSION= 2.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese x11-fonts
MASTER_SITES= OSDN/${PORTNAME}-fonts/5030/
PKGNAMEPREFIX= ja-font-
diff --git a/japanese/font-mplus-outline/Makefile b/japanese/font-mplus-outline/Makefile
index cb3f429a83d5..3ce74bbf4081 100644
--- a/japanese/font-mplus-outline/Makefile
+++ b/japanese/font-mplus-outline/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mplus
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= japanese x11-fonts
MASTER_SITES= OSDN/${PORTNAME}-fonts/62344/
PKGNAMEPREFIX= ja-font-
@@ -12,7 +13,7 @@ DISTNAME= ${PORTNAME}-TESTFLIGHT-060
MAINTAINER= hrs@FreeBSD.org
COMMENT= M+ Outline Fonts
-RUN_DEPENDS= mkfontdir:x11-fonts/mkfontdir \
+RUN_DEPENDS= mkfontscale>=0:x11-fonts/mkfontscale \
mkfontscale:x11-fonts/mkfontscale
USES= fonts:fc tar:xz
diff --git a/japanese/font-naga10/Makefile b/japanese/font-naga10/Makefile
index 753350038794..dc89204243d1 100644
--- a/japanese/font-naga10/Makefile
+++ b/japanese/font-naga10/Makefile
@@ -3,7 +3,7 @@
PORTNAME= naga10
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://hp.vector.co.jp/authors/VA013391/fonts/
PKGNAMEPREFIX= ja-font-
diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index 2f62d515662c..596190041c36 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -3,7 +3,7 @@
PORTNAME= shinonome
PORTVERSION= 0.9.11.p1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://openlab.jp/efont/dist/shinonome/%SUBDIR%/
MASTER_SITE_SUBDIR= . old
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index c9c859da7632..eec7602f63b5 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -4,7 +4,7 @@ PORTNAME= kterm
PORTVERSION= 6.2.0
DISTVERSIONPREFIX= v
DISTVERSIONSUFFIX= .fb6
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= japanese x11
MASTER_SITES= LOCAL/hrs:pcemu
DISTFILES= pcemu1.01alpha.tar.gz:pcemu
@@ -45,7 +45,6 @@ VGAFONT_DESC= install VGA font
VGAFONT_EXTRACT_DEPENDS= \
${LOCALBASE}/bin/bdftopcf:x11-fonts/bdftopcf
VGAFONT_BUILD_DEPENDS= \
- ${LOCALBASE}/bin/mkfontdir:x11-fonts/mkfontdir \
${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale
NKFCMD= ${LOCALBASE}/bin/nkf
diff --git a/japanese/sourcehanserif-otf/Makefile b/japanese/sourcehanserif-otf/Makefile
index b0fb26c5cb02..a20f47b4c582 100644
--- a/japanese/sourcehanserif-otf/Makefile
+++ b/japanese/sourcehanserif-otf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= sourcehanserif
PORTVERSION= 1.001
+PORTREVISION= 1
DISTVERSIONSUFFIX= R
CATEGORIES= japanese x11-fonts
PKGNAMESUFFIX= -otf
diff --git a/korean/aleefonts-ttf/Makefile b/korean/aleefonts-ttf/Makefile
index 8efeb25e0b35..8da353104609 100644
--- a/korean/aleefonts-ttf/Makefile
+++ b/korean/aleefonts-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= aleefonts
PORTVERSION= 13.3
+PORTREVISION= 1
CATEGORIES= korean x11-fonts
MASTER_SITES= DEBIAN/pool/main/f/fonts-alee
PKGNAMESUFFIX= -ttf
diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile
index 7afe1b1ed1e1..e8f6e70635e1 100644
--- a/korean/baekmukfonts-bdf/Makefile
+++ b/korean/baekmukfonts-bdf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= baekmukfonts
PORTVERSION= 2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= korean x11-fonts
MASTER_SITES= ftp://ftp.mizi.com/pub/baekmuk/obsoletes/ \
ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
@@ -18,7 +18,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Free Hangul fonts for X11(baekmuk)
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir \
mkfontscale:x11-fonts/mkfontscale
FONTLIST= batang10 batang10b batang12 batang12b batang14 batang14b \
diff --git a/korean/baekmukfonts-ttf/Makefile b/korean/baekmukfonts-ttf/Makefile
index 44f6aaa02dd0..d038490a3dcf 100644
--- a/korean/baekmukfonts-ttf/Makefile
+++ b/korean/baekmukfonts-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= baekmukfonts
PORTVERSION= 2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= korean
MASTER_SITES= http://kldp.net/frs/download.php/1429/
PKGNAMESUFFIX= -ttf
diff --git a/korean/d2coding-ttf/Makefile b/korean/d2coding-ttf/Makefile
index 53a7ad3cfed4..ebd69d5b5f01 100644
--- a/korean/d2coding-ttf/Makefile
+++ b/korean/d2coding-ttf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= d2coding
PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= korean x11-fonts
MASTER_SITES= https://github.com/naver/d2codingfont/releases/download/VER${PORTVERSION}/ \
LOCAL/jkim
diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile
index 85f86ec13fef..153b96c60cc5 100644
--- a/korean/hanyangfonts/Makefile
+++ b/korean/hanyangfonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hanyangfonts
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= korean x11-fonts
MASTER_SITES= http://ftp.kaist.ac.kr/hangul/fonts/ \
ftp://ftp.kaist.ac.kr/hangul/fonts/ \
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index 5ffa271892ce..1c0d2fb7c388 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kaistfonts
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= korean x11-fonts
MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
PKGNAMESUFFIX= -ksc
diff --git a/korean/nanumcoding-ttf/Makefile b/korean/nanumcoding-ttf/Makefile
index 02a33557c529..489f98c45532 100644
--- a/korean/nanumcoding-ttf/Makefile
+++ b/korean/nanumcoding-ttf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= nanumcoding
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= korean
MASTER_SITES= http://dev.naver.com/frs/download.php/441/ \
LOCAL/jkim
diff --git a/korean/nanumfonts-otf/Makefile b/korean/nanumfonts-otf/Makefile
index 82d2c8b90272..54de597a53e5 100644
--- a/korean/nanumfonts-otf/Makefile
+++ b/korean/nanumfonts-otf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= nanumfonts
PORTVERSION= 20160201
+PORTREVISION= 1
CATEGORIES= korean
MASTER_SITES= http://appdown.naver.com/naver/font/NanumFont/setup/ \
LOCAL/jkim
diff --git a/korean/sourcehanserif-otf/Makefile b/korean/sourcehanserif-otf/Makefile
index f5c4e66707ca..2b5c1d26e26a 100644
--- a/korean/sourcehanserif-otf/Makefile
+++ b/korean/sourcehanserif-otf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= sourcehanserif
PORTVERSION= 1.001
+PORTREVISION= 1
DISTVERSIONSUFFIX= R
CATEGORIES= korean x11-fonts
PKGNAMESUFFIX= -otf
diff --git a/korean/unfonts-core/Makefile b/korean/unfonts-core/Makefile
index 30232843b3f6..5d28eaa62235 100644
--- a/korean/unfonts-core/Makefile
+++ b/korean/unfonts-core/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unfonts
PORTVERSION= 1.0.2.080608
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= korean x11-fonts
MASTER_SITES= https://kldp.net/unfonts/release/
PKGNAMESUFFIX= -${FONTCAT}
diff --git a/korean/unfonts-extra/Makefile b/korean/unfonts-extra/Makefile
index d4694a75abd4..b3564adf2cda 100644
--- a/korean/unfonts-extra/Makefile
+++ b/korean/unfonts-extra/Makefile
@@ -1,7 +1,7 @@
# Created by: Hye-Shik Chang <perky@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
FILEID= 2608
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index b6fc91d452d4..9909910c5e44 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -3,7 +3,7 @@
PORTNAME= metamail
PORTVERSION= 2.7
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= mail
MASTER_SITES= http://ftp.funet.fi/pub/unix/mail/metamail/ \
ftp://ftp.research.telcordia.com/pub/nsb/
@@ -24,9 +24,9 @@ OPTIONS_SUB= yes
X11_DESC= X11 hebrew font support
X11_BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontscale:x11-fonts/mkfontscale
+ mkfontscale>=0:x11-fonts/mkfontscale
X11_RUN_DEPENDS= xloadimage:x11/xloadimage \
- mkfontdir:x11-fonts/mkfontdir
+ mkfontscale>=0:x11-fonts/mkfontscale
X11_USE= XORG=x11
X11_EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile-x11
X11_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile-nox11
diff --git a/print/adobe-cmaps/Makefile b/print/adobe-cmaps/Makefile
index 2d7c2fdf80ff..9e7f48c3b3db 100644
--- a/print/adobe-cmaps/Makefile
+++ b/print/adobe-cmaps/Makefile
@@ -3,7 +3,7 @@
PORTNAME= adobe-cmaps
PORTVERSION= 20051217
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= LOCAL/hrs/adobe
DISTFILES= ac15.tar.gz ag15.tar.gz \
diff --git a/print/font-amsfonts/Makefile b/print/font-amsfonts/Makefile
index aa91b66bc34b..97a14c2cad5c 100644
--- a/print/font-amsfonts/Makefile
+++ b/print/font-amsfonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= amsfonts
PORTVERSION= 3.02
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= LOCAL/hrs
PKGNAMEPREFIX= font-
diff --git a/russian/artwiz-ru/Makefile b/russian/artwiz-ru/Makefile
index 1298f4c1d862..6eef6fc6d47a 100644
--- a/russian/artwiz-ru/Makefile
+++ b/russian/artwiz-ru/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artwiz-ru
PORTVERSION= 20041031
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= russian x11-fonts
MASTER_SITES= http://dev.gentoo.org/~sergey/ \
LOCAL/novel
diff --git a/ukrainian/monacofonts/Makefile b/ukrainian/monacofonts/Makefile
index a40fd147d071..4dcca644ebc4 100644
--- a/ukrainian/monacofonts/Makefile
+++ b/ukrainian/monacofonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= monaco
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= ukrainian x11-fonts
MASTER_SITES= http://www.brama.com/compute/unix/
PKGNAMEPREFIX= koi8-u-
@@ -14,7 +14,6 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Collection of 5 "fixed" fonts for X11 from www.brama.com
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir \
mkfontscale:x11-fonts/mkfontscale
USES= fonts zip
diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile
index 582920dc1df3..8914b6ac4b94 100644
--- a/vietnamese/unicode-uhoai/Makefile
+++ b/vietnamese/unicode-uhoai/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unicode-uhoai
PORTVERSION= 2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= vietnamese x11-fonts
MASTER_SITES= LOCAL/obrien
DISTNAME= uhoaiw21
diff --git a/vietnamese/urwvn/Makefile b/vietnamese/urwvn/Makefile
index 7556b5af6e11..dc9f70e8de1d 100644
--- a/vietnamese/urwvn/Makefile
+++ b/vietnamese/urwvn/Makefile
@@ -3,7 +3,7 @@
PORTNAME= urwvn
PORTVERSION= 3.04
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= vietnamese x11-fonts
MASTER_SITES= http://vntex.org/urwvn/download/ LOCAL/chinsan
DISTNAME= urwvn-${PORTVERSION}-ttf
diff --git a/vietnamese/vietunicode-hannom/Makefile b/vietnamese/vietunicode-hannom/Makefile
index c1b6502681e7..d77f4a341a83 100644
--- a/vietnamese/vietunicode-hannom/Makefile
+++ b/vietnamese/vietunicode-hannom/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vietunicode-hannom
PORTVERSION= 2005.02.06
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= vietnamese x11-fonts
MASTER_SITES= SF/vietunicode/hannom/hannom%20v2005
DISTNAME= hannom
diff --git a/vietnamese/vietunicode-trichlor/Makefile b/vietnamese/vietunicode-trichlor/Makefile
index 48457a7338d3..57ec56914cd9 100644
--- a/vietnamese/vietunicode-trichlor/Makefile
+++ b/vietnamese/vietunicode-trichlor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vietunicode-trichlor
PORTVERSION= 2004.04.30
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= vietnamese x11-fonts
MASTER_SITES= SF/vietunicode/VietFonts-TriChlor/TrichlorSet%20v2004
DISTNAME= VietFonts_TriChlor_ttf
diff --git a/vietnamese/vietunicode-web1/Makefile b/vietnamese/vietunicode-web1/Makefile
index e722601d6779..b8de7d14b9d0 100644
--- a/vietnamese/vietunicode-web1/Makefile
+++ b/vietnamese/vietunicode-web1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vietunicode-web1
PORTVERSION= 2004.04.30
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= vietnamese x11-fonts
MASTER_SITES= SF/vietunicode/VietFonts-Web1/Web1%20Package%20v2004
DISTNAME= VietFontsWeb1_ttf
diff --git a/www/alef-webfont/Makefile b/www/alef-webfont/Makefile
index 59948813aa31..6ba8cc926441 100644
--- a/www/alef-webfont/Makefile
+++ b/www/alef-webfont/Makefile
@@ -3,7 +3,7 @@
PORTNAME= alef
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://alef.hagilda.com/
PKGNAMESUFFIX= -webfont
@@ -15,8 +15,7 @@ COMMENT= Free multi-lingual font designed for screens
LICENSE= OFL11
LICENSE_FILE= ${WRKDIR}/OFL-license.txt
-BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:x11-fonts/mkfontdir \
- ${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale
+BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale
USES= zip
NO_BUILD= yes
diff --git a/x11-fonts/3270font/Makefile b/x11-fonts/3270font/Makefile
index 3837533dafc0..b921f4f2f0ab 100644
--- a/x11-fonts/3270font/Makefile
+++ b/x11-fonts/3270font/Makefile
@@ -3,6 +3,7 @@
PORTNAME= 3270font
DISTVERSIONPREFIX= v
DISTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://s3.amazonaws.com/${PORTNAME}/ \
https://github.com/rbanffy/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
diff --git a/x11-fonts/Hasklig/Makefile b/x11-fonts/Hasklig/Makefile
index 164009055363..036134815d7a 100644
--- a/x11-fonts/Hasklig/Makefile
+++ b/x11-fonts/Hasklig/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Hasklig
DISTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/i-tu/Hasklig/releases/download/${PORTVERSION}/
diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index d89d4b3b704f..d5c15ec6df3c 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -152,7 +152,6 @@
SUBDIR += mgopen
SUBDIR += mkbold
SUBDIR += mkbold-mkitalic
- SUBDIR += mkfontdir
SUBDIR += mkfontscale
SUBDIR += mkitalic
SUBDIR += mondulkiri
diff --git a/x11-fonts/alef/Makefile b/x11-fonts/alef/Makefile
index a3fc530dcf03..b67644c67879 100644
--- a/x11-fonts/alef/Makefile
+++ b/x11-fonts/alef/Makefile
@@ -2,7 +2,7 @@
PORTNAME= alef
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://alef.hagilda.com/
DISTNAME= Alef
diff --git a/x11-fonts/alegreya-sans/Makefile b/x11-fonts/alegreya-sans/Makefile
index 8664a347c34b..090f44bf0599 100644
--- a/x11-fonts/alegreya-sans/Makefile
+++ b/x11-fonts/alegreya-sans/Makefile
@@ -3,6 +3,7 @@
PORTNAME= alegreya-sans
DISTVERSIONPREFIX= v
DISTVERSION= 2.008
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fonts
diff --git a/x11-fonts/alegreya/Makefile b/x11-fonts/alegreya/Makefile
index 3fc5b96f7396..0f67b9b30222 100644
--- a/x11-fonts/alegreya/Makefile
+++ b/x11-fonts/alegreya/Makefile
@@ -2,6 +2,7 @@
PORTNAME= alegreya
PORTVERSION= 2.008
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= x11-fonts
diff --git a/x11-fonts/andika/Makefile b/x11-fonts/andika/Makefile
index 9b5be7bd9017..bcffb870c0fb 100644
--- a/x11-fonts/andika/Makefile
+++ b/x11-fonts/andika/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Andika
PORTVERSION= 5.000
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MEDIA_ID}&filename=/
diff --git a/x11-fonts/anonymous-pro/Makefile b/x11-fonts/anonymous-pro/Makefile
index 5f6c4727857f..c0c0b402b62b 100644
--- a/x11-fonts/anonymous-pro/Makefile
+++ b/x11-fonts/anonymous-pro/Makefile
@@ -3,7 +3,7 @@
PORTNAME= anonymous-pro
PORTVERSION= 1.002
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://www.marksimonson.com/assets/content/fonts/
DISTNAME= AnonymousPro-${PORTVERSION}
diff --git a/x11-fonts/artwiz-aleczapka-de/Makefile b/x11-fonts/artwiz-aleczapka-de/Makefile
index 9a95dd35a3e7..7dba85f55165 100644
--- a/x11-fonts/artwiz-aleczapka-de/Makefile
+++ b/x11-fonts/artwiz-aleczapka-de/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artwiz-aleczapka-de
PORTVERSION= 1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
diff --git a/x11-fonts/artwiz-aleczapka-se/Makefile b/x11-fonts/artwiz-aleczapka-se/Makefile
index 3edb0d1b86a4..23b85801ff53 100644
--- a/x11-fonts/artwiz-aleczapka-se/Makefile
+++ b/x11-fonts/artwiz-aleczapka-se/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artwiz-aleczapka-se
PORTVERSION= 1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
diff --git a/x11-fonts/artwiz-aleczapka/Makefile b/x11-fonts/artwiz-aleczapka/Makefile
index 7b6de0a6b9d8..adca6055e619 100644
--- a/x11-fonts/artwiz-aleczapka/Makefile
+++ b/x11-fonts/artwiz-aleczapka/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artwiz-aleczapka-en
PORTVERSION= 1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
diff --git a/x11-fonts/artwiz-fonts/Makefile b/x11-fonts/artwiz-fonts/Makefile
index dcbb92d85523..4df5098430e6 100644
--- a/x11-fonts/artwiz-fonts/Makefile
+++ b/x11-fonts/artwiz-fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artwiz-fonts
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= http://kobyla.info/soft/distfiles/ \
LOCAL/garga/artwiz/
diff --git a/x11-fonts/averiagwf/Makefile b/x11-fonts/averiagwf/Makefile
index 3583a3594ff3..d26c9b3d922f 100644
--- a/x11-fonts/averiagwf/Makefile
+++ b/x11-fonts/averiagwf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= averiagwf
PORTVERSION= 1.00
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://iotic.com/averia/font-files/GWF/
DISTNAME= AveriaGWF
diff --git a/x11-fonts/b612/Makefile b/x11-fonts/b612/Makefile
index e2503ba65e5b..1452f50c2fe7 100644
--- a/x11-fonts/b612/Makefile
+++ b/x11-fonts/b612/Makefile
@@ -3,6 +3,7 @@
PORTNAME= b612
PORTVERSION= 1.005
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= sunpoet@FreeBSD.org
diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index 011b453aedb2..70b703f9dc8b 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bitstream-vera
PORTVERSION= 1.10
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-fonts
MASTER_SITES= GNOME/sources/ttf-${PORTNAME}/${PORTVERSION}
DISTNAME= ttf-${PORTNAME}-${PORTVERSION}
diff --git a/x11-fonts/bitter/Makefile b/x11-fonts/bitter/Makefile
index 007f2d57c6d8..2b5e29246008 100644
--- a/x11-fonts/bitter/Makefile
+++ b/x11-fonts/bitter/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bitter
PORTVERSION= 20130930
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://www.huertatipografica.com/free_download/eo0pZGbJPxy2YyRkWQXx?dummy=
diff --git a/x11-fonts/cantarell-fonts/Makefile b/x11-fonts/cantarell-fonts/Makefile
index 6b44937cc23a..75a2eb5006a8 100644
--- a/x11-fonts/cantarell-fonts/Makefile
+++ b/x11-fonts/cantarell-fonts/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cantarell-fonts
PORTVERSION= 0.101
+PORTREVISION= 1
CATEGORIES= x11-fonts gnome
MASTER_SITES= GNOME
diff --git a/x11-fonts/charis-compact/Makefile b/x11-fonts/charis-compact/Makefile
index c58c7715583d..ce48e09f326e 100644
--- a/x11-fonts/charis-compact/Makefile
+++ b/x11-fonts/charis-compact/Makefile
@@ -3,7 +3,7 @@
PORTNAME= CharisSILCompact
PORTVERSION= 4.114
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
#unfortunately, the SIL server embeds timestamps in the distfile, so we use a static local copy
.if defined(MAINTAINER_MODE)
diff --git a/x11-fonts/charis/Makefile b/x11-fonts/charis/Makefile
index f7db6cf0bc2e..562ce392c83c 100644
--- a/x11-fonts/charis/Makefile
+++ b/x11-fonts/charis/Makefile
@@ -3,7 +3,7 @@
PORTNAME= CharisSIL
PORTVERSION= 4.114
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
LOCAL/bf
diff --git a/x11-fonts/clearsans/Makefile b/x11-fonts/clearsans/Makefile
index 7700a8aba581..23c901901e01 100644
--- a/x11-fonts/clearsans/Makefile
+++ b/x11-fonts/clearsans/Makefile
@@ -2,7 +2,7 @@
PORTNAME= clearsans
PORTVERSION= 1.00
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= https://01.org/sites/default/files/downloads/
diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index ce0f1041ba85..f209102673af 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -3,7 +3,7 @@
PORTNAME= code2000
PORTVERSION= 1.171
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= LOCAL/thierry/${DIST_SUBDIR}
DISTFILES= ${PORTNAME:tu}${EXTRACT_SUFX:tu}
diff --git a/x11-fonts/comfortaa-ttf/Makefile b/x11-fonts/comfortaa-ttf/Makefile
index ae7382b92d61..83f5e871982f 100644
--- a/x11-fonts/comfortaa-ttf/Makefile
+++ b/x11-fonts/comfortaa-ttf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= comfortaa-ttf
PORTVERSION= 3.001
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://orig00.deviantart.net/40a3/f/2017/093/d/4/
DISTNAME= comfortaa___font_by_aajohan-d1qr019
diff --git a/x11-fonts/comic-neue/Makefile b/x11-fonts/comic-neue/Makefile
index 58c4fadeb374..9b1a1aedea75 100644
--- a/x11-fonts/comic-neue/Makefile
+++ b/x11-fonts/comic-neue/Makefile
@@ -2,6 +2,7 @@
PORTNAME= comic-neue
PORTVERSION= 2.4
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/crozynski/comicneue/archive/v${PORTVERSION}/
diff --git a/x11-fonts/consolamono-ttf/Makefile b/x11-fonts/consolamono-ttf/Makefile
index f3aa6993847e..d92c00e76080 100644
--- a/x11-fonts/consolamono-ttf/Makefile
+++ b/x11-fonts/consolamono-ttf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= consolamono-ttf
PORTVERSION= 20130127
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= https://fontlibrary.org/assets/downloads/consolamono/61cc2afcc4eca96efe7c6ebf178d39df/
DISTNAME= consolamono
diff --git a/x11-fonts/courier-prime/Makefile b/x11-fonts/courier-prime/Makefile
index 072676a229fb..a3d9146aac83 100644
--- a/x11-fonts/courier-prime/Makefile
+++ b/x11-fonts/courier-prime/Makefile
@@ -2,6 +2,7 @@
PORTNAME= courier-prime
PORTVERSION= g20180831
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://quoteunquoteapps.com/downloads/
DISTNAME= ${PORTNAME}
diff --git a/x11-fonts/croscorefonts-fonts-ttf/Makefile b/x11-fonts/croscorefonts-fonts-ttf/Makefile
index 9ecc6ed9c444..7caeddee7bbd 100644
--- a/x11-fonts/croscorefonts-fonts-ttf/Makefile
+++ b/x11-fonts/croscorefonts-fonts-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= croscorefonts
PORTVERSION= 1.31.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://gsdview.appspot.com/chromeos-localmirror/distfiles/ \
LOCAL/sunpoet
diff --git a/x11-fonts/crosextrafonts-caladea-ttf/Makefile b/x11-fonts/crosextrafonts-caladea-ttf/Makefile
index a07c63870988..b86aa3535259 100644
--- a/x11-fonts/crosextrafonts-caladea-ttf/Makefile
+++ b/x11-fonts/crosextrafonts-caladea-ttf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crosextrafonts
PORTVERSION= 20130214
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://gsdview.appspot.com/chromeos-localmirror/distfiles/
PKGNAMESUFFIX= -caladea
diff --git a/x11-fonts/crosextrafonts-carlito-ttf/Makefile b/x11-fonts/crosextrafonts-carlito-ttf/Makefile
index 1af31bba16b2..d09518c4003f 100644
--- a/x11-fonts/crosextrafonts-carlito-ttf/Makefile
+++ b/x11-fonts/crosextrafonts-carlito-ttf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crosextrafonts-carlito
PORTVERSION= 20130920
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://gsdview.appspot.com/chromeos-localmirror/distfiles/
diff --git a/x11-fonts/cyberbit-ttfonts/Makefile b/x11-fonts/cyberbit-ttfonts/Makefile
index 5933644ab820..db987d8b7489 100644
--- a/x11-fonts/cyberbit-ttfonts/Makefile
+++ b/x11-fonts/cyberbit-ttfonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cyberbit-ttfonts
PORTVERSION= 2.0.20050220
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= http://freebsd.nsu.ru/distfiles/cyberbit/
DISTFILES= Cyberbit.ZIP 97CyberBase.Doc 97CyberBit.Doc 97CyberCJK.Doc \
diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile
index 9ff783d2d04b..32f26b03de8b 100644
--- a/x11-fonts/cyr-rfx/Makefile
+++ b/x11-fonts/cyr-rfx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cyr-rfx-${CYR_RFX_ENCODING}
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts ukrainian russian
MASTER_SITES= ftp://ftp.ptc.spbu.ru/mirror/ftp.inp.nsk.su/%SUBDIR%/ \
ftp://ftp.inp.nsk.su/%SUBDIR%/
@@ -14,7 +14,7 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Cyrillic X11 bitmap fonts from CYR-RFX project
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir
+ mkfontscale>=0:x11-fonts/mkfontscale
USES= fonts
USE_XORG= x11
diff --git a/x11-fonts/datalegreya/Makefile b/x11-fonts/datalegreya/Makefile
index 340a66d309d3..07ffbd0d2857 100644
--- a/x11-fonts/datalegreya/Makefile
+++ b/x11-fonts/datalegreya/Makefile
@@ -3,6 +3,7 @@
PORTNAME= datalegreya
PORTVERSION= 0.2017.03.29
+PORTREVISION= 1
CATEGORIES= x11-fonts math textproc
MAINTAINER= thierry@FreeBSD.org
diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile
index fecdb5eeadfe..46182056802d 100644
--- a/x11-fonts/dejavu/Makefile
+++ b/x11-fonts/dejavu/Makefile
@@ -3,6 +3,7 @@
PORTNAME= dejavu
PORTVERSION= 2.37
+PORTREVISION= 1
DISTVERSIONPREFIX= fonts-ttf-
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_${PORTVERSION:R}_${PORTVERSION:E}/
diff --git a/x11-fonts/dina/Makefile b/x11-fonts/dina/Makefile
index 415018bc64b8..b4b62a8b7c0d 100644
--- a/x11-fonts/dina/Makefile
+++ b/x11-fonts/dina/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dina
PORTVERSION= 2.92
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= LOCAL/rakuco
diff --git a/x11-fonts/doulos-compact/Makefile b/x11-fonts/doulos-compact/Makefile
index 18bf95421a78..33623605da57 100644
--- a/x11-fonts/doulos-compact/Makefile
+++ b/x11-fonts/doulos-compact/Makefile
@@ -3,7 +3,7 @@
PORTNAME= DoulosSILCompact
PORTVERSION= 4.110
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
#unfortunately, the SIL server embeds timestamps in the distfile, so we use a static local copy
.if defined(MAINTAINER_MODE)
diff --git a/x11-fonts/doulos/Makefile b/x11-fonts/doulos/Makefile
index fc92eee5f29e..25e652e8550a 100644
--- a/x11-fonts/doulos/Makefile
+++ b/x11-fonts/doulos/Makefile
@@ -3,7 +3,7 @@
PORTNAME= DoulosSIL
PORTVERSION= 4.112
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
LOCAL/bf
diff --git a/x11-fonts/droid-fonts-ttf/Makefile b/x11-fonts/droid-fonts-ttf/Makefile
index 3ec8a4baf0e5..660eb03d0395 100644
--- a/x11-fonts/droid-fonts-ttf/Makefile
+++ b/x11-fonts/droid-fonts-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= droid-fonts-ttf
PORTVERSION= 20131024
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= LOCAL/sunpoet
diff --git a/x11-fonts/exo/Makefile b/x11-fonts/exo/Makefile
index 6843e6e8c4ac..f605ff5e404a 100644
--- a/x11-fonts/exo/Makefile
+++ b/x11-fonts/exo/Makefile
@@ -3,6 +3,7 @@
PORTNAME= exo
PORTVERSION= 2.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.ndiscovered.com/downloads/exo2/
DISTNAME= EXO_2_OTF
diff --git a/x11-fonts/fantasque-sans-mono/Makefile b/x11-fonts/fantasque-sans-mono/Makefile
index 361d35c0a017..09226a02485f 100644
--- a/x11-fonts/fantasque-sans-mono/Makefile
+++ b/x11-fonts/fantasque-sans-mono/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fantasque-sans-mono
PORTVERSION= 1.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/belluzj/fantasque-sans/releases/download/v${PORTVERSION}/
diff --git a/x11-fonts/fanwood/Makefile b/x11-fonts/fanwood/Makefile
index f1e669153559..ad5f876d3e31 100644
--- a/x11-fonts/fanwood/Makefile
+++ b/x11-fonts/fanwood/Makefile
@@ -2,6 +2,7 @@
PORTNAME= fanwood
DISTVERSION= g20110526
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= flo@snakeoilproductions.net
diff --git a/x11-fonts/farsifonts/Makefile b/x11-fonts/farsifonts/Makefile
index 9ba050c60b77..a81608103916 100644
--- a/x11-fonts/farsifonts/Makefile
+++ b/x11-fonts/farsifonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= farsifonts
PORTVERSION= 0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= SF/farsi-fonts/
diff --git a/x11-fonts/fifteen/Makefile b/x11-fonts/fifteen/Makefile
index 1a400d6608a6..809086a0102d 100644
--- a/x11-fonts/fifteen/Makefile
+++ b/x11-fonts/fifteen/Makefile
@@ -2,6 +2,7 @@
PORTNAME= fifteen
PORTVERSION= 20150410
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://fontlibrary.org/assets/downloads/${PORTNAME}/c1556403ec283a1b5a23ad483af659f9/
DISTNAME= ${PORTNAME}
diff --git a/x11-fonts/fira/Makefile b/x11-fonts/fira/Makefile
index d56cd5bef0e3..e7f981ec6ed8 100644
--- a/x11-fonts/fira/Makefile
+++ b/x11-fonts/fira/Makefile
@@ -3,6 +3,7 @@
PORTNAME= fira
PORTVERSION= 4.301
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= trueos@norwegianrockcat.com
diff --git a/x11-fonts/firacode/Makefile b/x11-fonts/firacode/Makefile
index 4ccc25b7209e..b5d696de5d9e 100644
--- a/x11-fonts/firacode/Makefile
+++ b/x11-fonts/firacode/Makefile
@@ -3,6 +3,7 @@
PORTNAME= firacode
PORTVERSION= 1.205
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/tonsky/FiraCode/releases/download/${PORTVERSION}/
DISTNAME= FiraCode_${PORTVERSION}
diff --git a/x11-fonts/firago/Makefile b/x11-fonts/firago/Makefile
index 7d91fadfa195..cec6523c6c22 100644
--- a/x11-fonts/firago/Makefile
+++ b/x11-fonts/firago/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= firago
+PORTREVISION= 1
PORTVERSION= 1.001
CATEGORIES= x11-fonts
diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile
index 00b086cda91b..c4a2140dfaa2 100644
--- a/x11-fonts/font-adobe-100dpi/Makefile
+++ b/x11-fonts/font-adobe-100dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile
index 5b1d8e9b08fb..014964053dce 100644
--- a/x11-fonts/font-adobe-75dpi/Makefile
+++ b/x11-fonts/font-adobe-75dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile
index cd3e992d8394..c4bc7847fda5 100644
--- a/x11-fonts/font-adobe-utopia-100dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-100dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-utopia-100dpi
PORTVERSION= 1.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile
index bfd0639926d7..d8500c3da153 100644
--- a/x11-fonts/font-adobe-utopia-75dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-75dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-utopia-75dpi
PORTVERSION= 1.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile
index f25efe2af6a6..ce1b7855be11 100644
--- a/x11-fonts/font-adobe-utopia-type1/Makefile
+++ b/x11-fonts/font-adobe-utopia-type1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-adobe-utopia-type1
PORTVERSION= 1.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile
index 7edfd7c032c9..267af53054e7 100644
--- a/x11-fonts/font-arabic-misc/Makefile
+++ b/x11-fonts/font-arabic-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-arabic-misc
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-awesome/Makefile b/x11-fonts/font-awesome/Makefile
index 771cbbd8b047..58f689a11b8f 100644
--- a/x11-fonts/font-awesome/Makefile
+++ b/x11-fonts/font-awesome/Makefile
@@ -2,6 +2,7 @@
PORTNAME= font-awesome
DISTVERSION= 5.7.2
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://use.fontawesome.com/releases/v${DISTVERSION}/
DISTNAME= fontawesome-free-${DISTVERSION}-desktop
diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile
index 5f4405812812..df7cf89e3974 100644
--- a/x11-fonts/font-bh-100dpi/Makefile
+++ b/x11-fonts/font-bh-100dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile
index 9e897c564616..443b37c60ee9 100644
--- a/x11-fonts/font-bh-75dpi/Makefile
+++ b/x11-fonts/font-bh-75dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
index 466cb67ebba0..c7ed0e08e380 100644
--- a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-lucidatypewriter-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
index 0d43660842ba..809bd612753f 100644
--- a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-lucidatypewriter-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile
index e894736409b5..1df0904ce1cd 100644
--- a/x11-fonts/font-bh-ttf/Makefile
+++ b/x11-fonts/font-bh-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-ttf
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile
index 960707600ad5..2249a87bca7b 100644
--- a/x11-fonts/font-bh-type1/Makefile
+++ b/x11-fonts/font-bh-type1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bh-type1
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile
index fe78f608912d..c873207d514a 100644
--- a/x11-fonts/font-bitstream-100dpi/Makefile
+++ b/x11-fonts/font-bitstream-100dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bitstream-100dpi
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile
index 6dfe3b0675ac..c538b3e90bd9 100644
--- a/x11-fonts/font-bitstream-75dpi/Makefile
+++ b/x11-fonts/font-bitstream-75dpi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bitstream-75dpi
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile
index 2897bd1a9c41..9bfbfac7557d 100644
--- a/x11-fonts/font-bitstream-speedo/Makefile
+++ b/x11-fonts/font-bitstream-speedo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= font-bitstream-speedo
PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile
index deb212d45d91..af6f905e354b 100644
--- a/x11-fonts/font-bitstream-type1/Makefile
+++ b/x11-fonts/font-bitstream-type1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-bitstream-type1
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile
index b3e1eaad9356..be1119b3ebb6 100644
--- a/x11-fonts/font-cronyx-cyrillic/Makefile
+++ b/x11-fonts/font-cronyx-cyrillic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-cronyx-cyrillic
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile
index 6338c2ca795f..3816b9a32f21 100644
--- a/x11-fonts/font-cursor-misc/Makefile
+++ b/x11-fonts/font-cursor-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-cursor-misc
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile
index de7d9137d8fc..caf025f58529 100644
--- a/x11-fonts/font-daewoo-misc/Makefile
+++ b/x11-fonts/font-daewoo-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-daewoo-misc
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile
index 3862e4666270..ed2a83bfb27f 100644
--- a/x11-fonts/font-dec-misc/Makefile
+++ b/x11-fonts/font-dec-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-dec-misc
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-gost/Makefile b/x11-fonts/font-gost/Makefile
index 887c56a246c2..d0e19cf69f10 100644
--- a/x11-fonts/font-gost/Makefile
+++ b/x11-fonts/font-gost/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gost
PORTVERSION= 0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://sd.ascon.ru/ftp/Public/Utils/DWG-DXF/ \
LOCAL/vg
diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile
index c4ff24a3a353..66a11287fdfd 100644
--- a/x11-fonts/font-ibm-type1/Makefile
+++ b/x11-fonts/font-ibm-type1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-ibm-type1
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile
index 18ad8c0159c2..57beee7a0f1b 100644
--- a/x11-fonts/font-isas-misc/Makefile
+++ b/x11-fonts/font-isas-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-isas-misc
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile
index 457eb4bd2a8b..9b74fd84364d 100644
--- a/x11-fonts/font-jis-misc/Makefile
+++ b/x11-fonts/font-jis-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-jis-misc
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile
index cca984d6813a..a5dbfa9d1cf0 100644
--- a/x11-fonts/font-micro-misc/Makefile
+++ b/x11-fonts/font-micro-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-micro-misc
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile
index 135f1c2f3888..2f9535262f13 100644
--- a/x11-fonts/font-misc-cyrillic/Makefile
+++ b/x11-fonts/font-misc-cyrillic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-misc-cyrillic
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile
index ba4b5ad8ebe2..17fa85949ba0 100644
--- a/x11-fonts/font-misc-ethiopic/Makefile
+++ b/x11-fonts/font-misc-ethiopic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= font-misc-ethiopic
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile
index cf1c1fee3af5..ae59f3b7f6b5 100644
--- a/x11-fonts/font-misc-meltho/Makefile
+++ b/x11-fonts/font-misc-meltho/Makefile
@@ -2,7 +2,7 @@
PORTNAME= font-misc-meltho
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile
index a95b7569989d..59fee2f7ea33 100644
--- a/x11-fonts/font-misc-misc/Makefile
+++ b/x11-fonts/font-misc-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-misc-misc
PORTVERSION= 1.1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile
index 82b88f08ea19..ba2c7f455d61 100644
--- a/x11-fonts/font-mutt-misc/Makefile
+++ b/x11-fonts/font-mutt-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-mutt-misc
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile
index dcf9ae65d081..5a06b9b3c494 100644
--- a/x11-fonts/font-schumacher-misc/Makefile
+++ b/x11-fonts/font-schumacher-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-schumacher-misc
PORTVERSION= 1.1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile
index a30017520ca2..03791c81728a 100644
--- a/x11-fonts/font-screen-cyrillic/Makefile
+++ b/x11-fonts/font-screen-cyrillic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-screen-cyrillic
PORTVERSION= 1.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile
index eae4d3077487..3c6219581f3f 100644
--- a/x11-fonts/font-sony-misc/Makefile
+++ b/x11-fonts/font-sony-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-sony-misc
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile
index 74456f397bd3..cd7178d3ea9f 100644
--- a/x11-fonts/font-sun-misc/Makefile
+++ b/x11-fonts/font-sun-misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-sun-misc
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-tex-gyre-bonum-math/Makefile b/x11-fonts/font-tex-gyre-bonum-math/Makefile
index 80625e3dc95a..80d4bfb5e504 100644
--- a/x11-fonts/font-tex-gyre-bonum-math/Makefile
+++ b/x11-fonts/font-tex-gyre-bonum-math/Makefile
@@ -2,6 +2,7 @@
PORTNAME= font-tex-gyre-bonum-math
DISTVERSION= 1.005
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.gust.org.pl/projects/e-foundry/tg-math/download/
DISTNAME= ${PORTNAME:S/font-//:S/-//:S/-//}-${DISTVERSION:S/.//}
diff --git a/x11-fonts/font-tex-gyre-pagella-math/Makefile b/x11-fonts/font-tex-gyre-pagella-math/Makefile
index 469fb27ea7da..d27811453e2b 100644
--- a/x11-fonts/font-tex-gyre-pagella-math/Makefile
+++ b/x11-fonts/font-tex-gyre-pagella-math/Makefile
@@ -2,6 +2,7 @@
PORTNAME= font-tex-gyre-pagella-math
DISTVERSION= 1.632
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.gust.org.pl/projects/e-foundry/tg-math/download/
DISTNAME= ${PORTNAME:S/font-//:S/-//:S/-//}-${DISTVERSION:S/.//}
diff --git a/x11-fonts/font-tex-gyre-schola-math/Makefile b/x11-fonts/font-tex-gyre-schola-math/Makefile
index 1686b1768f4f..c90079f62b53 100644
--- a/x11-fonts/font-tex-gyre-schola-math/Makefile
+++ b/x11-fonts/font-tex-gyre-schola-math/Makefile
@@ -2,6 +2,7 @@
PORTNAME= font-tex-gyre-schola-math
DISTVERSION= 1.533
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.gust.org.pl/projects/e-foundry/tg-math/download/
DISTNAME= ${PORTNAME:S/font-//:S/-//:S/-//}-${DISTVERSION:S/.//}
diff --git a/x11-fonts/font-tex-gyre-termes-math/Makefile b/x11-fonts/font-tex-gyre-termes-math/Makefile
index 2c91c67ec532..084b6f246c8e 100644
--- a/x11-fonts/font-tex-gyre-termes-math/Makefile
+++ b/x11-fonts/font-tex-gyre-termes-math/Makefile
@@ -2,6 +2,7 @@
PORTNAME= font-tex-gyre-termes-math
DISTVERSION= 1.543
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.gust.org.pl/projects/e-foundry/tg-math/download/
DISTNAME= ${PORTNAME:S/font-//:S/-//:S/-//}-${DISTVERSION:S/.//}
diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile
index 5e7505920818..6273a1b10061 100644
--- a/x11-fonts/font-winitzki-cyrillic/Makefile
+++ b/x11-fonts/font-winitzki-cyrillic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-winitzki-cyrillic
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile
index c8eadba1ea02..4dda901d7301 100644
--- a/x11-fonts/font-xfree86-type1/Makefile
+++ b/x11-fonts/font-xfree86-type1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= font-xfree86-type1
PORTVERSION= 1.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/fonts-indic/Makefile b/x11-fonts/fonts-indic/Makefile
index d60bff34b1de..89fe63abbbe2 100644
--- a/x11-fonts/fonts-indic/Makefile
+++ b/x11-fonts/fonts-indic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fonts-indic
PORTVERSION= 2.1.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://gentoo.osuosl.org/distfiles/
diff --git a/x11-fonts/freefont-ttf/Makefile b/x11-fonts/freefont-ttf/Makefile
index 02ece971eee2..55c33c9bfe89 100644
--- a/x11-fonts/freefont-ttf/Makefile
+++ b/x11-fonts/freefont-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freefont-ttf
PORTVERSION= 20120503
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= GNU/freefont
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index fc33cd63ffb1..bc930d606d16 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freefonts
PORTVERSION= 0.10
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-fonts
MASTER_SITES= http://download.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/gnu/%SUBDIR%/ \
diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 7103ccbaf049..0285e6247fb4 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gemini
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= http://www.brama.com/compute/unix/
PKGNAMEPREFIX= koi8-u-
@@ -14,7 +14,7 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Ukrainian KOI8 fonts for X11R6 (koi8-u)
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir
+ mkfontscale>=0:x11-fonts/mkfontscale
USES= fonts perl5 tar:tgz
USE_PERL5= build
diff --git a/x11-fonts/gentium-basic/Makefile b/x11-fonts/gentium-basic/Makefile
index 919baec36b99..d0eae00155c7 100644
--- a/x11-fonts/gentium-basic/Makefile
+++ b/x11-fonts/gentium-basic/Makefile
@@ -3,6 +3,7 @@
PORTNAME= GentiumBasic
PORTVERSION= 1102
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://software.sil.org/downloads/gentium/
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/x11-fonts/gentium-plus/Makefile b/x11-fonts/gentium-plus/Makefile
index f2add1b0c252..d51dc8d84d5b 100644
--- a/x11-fonts/gentium-plus/Makefile
+++ b/x11-fonts/gentium-plus/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= GentiumPlus
+PORTREVISION= 1
PORTVERSION= 5.000
CATEGORIES= x11-fonts
MASTER_SITES= http://software.sil.org/downloads/gentium/
diff --git a/x11-fonts/gnu-unifont/Makefile b/x11-fonts/gnu-unifont/Makefile
index 295d88c83699..cfa79606f9e0 100644
--- a/x11-fonts/gnu-unifont/Makefile
+++ b/x11-fonts/gnu-unifont/Makefile
@@ -2,6 +2,7 @@
PORTNAME= unifont
PORTVERSION= 10.0.07
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fonts
MASTER_SITES= GNU/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-fonts/gofont-ttf/Makefile b/x11-fonts/gofont-ttf/Makefile
index f8ec32e1bc7f..b66f6121204d 100644
--- a/x11-fonts/gofont-ttf/Makefile
+++ b/x11-fonts/gofont-ttf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gofont-ttf
DISTVERSION= g20180511
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= tobik@FreeBSD.org
diff --git a/x11-fonts/gohufont/Makefile b/x11-fonts/gohufont/Makefile
index 7dfb3feed808..777bbd49a283 100644
--- a/x11-fonts/gohufont/Makefile
+++ b/x11-fonts/gohufont/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gohufont
PORTVERSION= 2.1
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://font.gohu.org/
diff --git a/x11-fonts/google-fonts/Makefile b/x11-fonts/google-fonts/Makefile
index ec03802ddd5f..9dc74e189d3b 100644
--- a/x11-fonts/google-fonts/Makefile
+++ b/x11-fonts/google-fonts/Makefile
@@ -2,7 +2,7 @@
PORTNAME= google-fonts
DISTVERSION= 0.0.0.20190118
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= dg@syrec.org
diff --git a/x11-fonts/hack-font/Makefile b/x11-fonts/hack-font/Makefile
index d3a550c057a4..523f642b9bfd 100644
--- a/x11-fonts/hack-font/Makefile
+++ b/x11-fonts/hack-font/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hack-font
PORTVERSION= 3.003
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= x11-fonts
diff --git a/x11-fonts/hanazono-fonts-ttf/Makefile b/x11-fonts/hanazono-fonts-ttf/Makefile
index cb75f151f97c..cf94c8d653ae 100644
--- a/x11-fonts/hanazono-fonts-ttf/Makefile
+++ b/x11-fonts/hanazono-fonts-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= hanazono-fonts-ttf
PORTVERSION= 20170904
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= OSDN/hanazono-font/68253
DISTNAME= ${PORTNAME:C/-.*//}-${PORTVERSION}
diff --git a/x11-fonts/hermit/Makefile b/x11-fonts/hermit/Makefile
index 94120da5cc20..c7b22acc4e23 100644
--- a/x11-fonts/hermit/Makefile
+++ b/x11-fonts/hermit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hermit
DISTVERSION= 2.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://pcaro.es/d/
PKGNAMESUFFIX= -font
diff --git a/x11-fonts/inconsolata-lgc-ttf/Makefile b/x11-fonts/inconsolata-lgc-ttf/Makefile
index a7b4baa02cf9..fbac34447e31 100644
--- a/x11-fonts/inconsolata-lgc-ttf/Makefile
+++ b/x11-fonts/inconsolata-lgc-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Inconsolata-LGC
PORTVERSION= 20131024
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= rum1cro@yandex.ru
diff --git a/x11-fonts/inconsolata-ttf/Makefile b/x11-fonts/inconsolata-ttf/Makefile
index 528e4b5332e4..3d0d9fb5ef63 100644
--- a/x11-fonts/inconsolata-ttf/Makefile
+++ b/x11-fonts/inconsolata-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= inconsolata-ttf
PORTVERSION= 2.001
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fonts
diff --git a/x11-fonts/indic-ttf/Makefile b/x11-fonts/indic-ttf/Makefile
index cb9da1e60c04..5118b667b92a 100644
--- a/x11-fonts/indic-ttf/Makefile
+++ b/x11-fonts/indic-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= indic-ttf
PORTVERSION= 0.5.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= DEBIAN/pool/main/t/ttf-indic-fonts
PKGNAMESUFFIX= -fonts
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index ee5929d015d3..82691024ace3 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= intlfonts
PORTVERSION= 1.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts
MASTER_SITES= GNU
diff --git a/x11-fonts/iosevka/Makefile b/x11-fonts/iosevka/Makefile
index 229491fe4359..3dedc590f56b 100644
--- a/x11-fonts/iosevka/Makefile
+++ b/x11-fonts/iosevka/Makefile
@@ -3,6 +3,7 @@
PORTNAME= iosevka
DISTVERSIONPREFIX= v
DISTVERSION= 2.1.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/be5invis/Iosevka/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
DISTFILES= 01-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
diff --git a/x11-fonts/isabella/Makefile b/x11-fonts/isabella/Makefile
index ef3e415d8221..fb3f09a207b4 100644
--- a/x11-fonts/isabella/Makefile
+++ b/x11-fonts/isabella/Makefile
@@ -3,7 +3,7 @@
PORTNAME= isabella-ttf
PORTVERSION= 1.202
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://www.thibault.org/fonts/isabella/
DISTNAME= Isabella-${PORTVERSION}-ttf
diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile
index 6ee9792a5b4a..1a795be0ff0d 100644
--- a/x11-fonts/jmk-x11-fonts/Makefile
+++ b/x11-fonts/jmk-x11-fonts/Makefile
@@ -2,7 +2,7 @@
PORTNAME= jmk-x11-fonts
PORTVERSION= 3.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts
MASTER_SITES= http://www.jmknoble.net/fonts/
@@ -10,7 +10,7 @@ MAINTAINER= olgeni@FreeBSD.org
COMMENT= Jim Knoble's font package for X
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir
+ mkfontscale>=0:x11-fonts/mkfontscale
USES= fonts imake
diff --git a/x11-fonts/junction/Makefile b/x11-fonts/junction/Makefile
index 6bad9c8f156e..0c8b74739ce9 100644
--- a/x11-fonts/junction/Makefile
+++ b/x11-fonts/junction/Makefile
@@ -2,6 +2,7 @@
PORTNAME= junction
PORTVERSION= 20140329 # GH_TAGNAME's commit date.
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= rakuco@FreeBSD.org
diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile
index 8185ee12dbc1..2ec73e4dc6c8 100644
--- a/x11-fonts/junicode/Makefile
+++ b/x11-fonts/junicode/Makefile
@@ -3,6 +3,7 @@
PORTNAME= junicode
DISTVERSION= 1.002
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/x11-fonts/kaputa/Makefile b/x11-fonts/kaputa/Makefile
index a26c92845570..21e007cdb7f7 100644
--- a/x11-fonts/kaputa/Makefile
+++ b/x11-fonts/kaputa/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kaputa
PORTVERSION= 1.000
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://www.kaputa.com/slword/
DISTNAME= ${PORTNAME}unicode
diff --git a/x11-fonts/khmeros/Makefile b/x11-fonts/khmeros/Makefile
index abb1e4b2c08a..43eb86a8e48f 100644
--- a/x11-fonts/khmeros/Makefile
+++ b/x11-fonts/khmeros/Makefile
@@ -3,7 +3,7 @@
PORTNAME= khmeros
PORTVERSION= 5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= SF/khmer/Fonts%20-%20KhmerOS/KhmerOS%20Fonts%205.0-%20LGPL%20Licence
DISTNAME= All_KhmerOS_5.0
diff --git a/x11-fonts/lato/Makefile b/x11-fonts/lato/Makefile
index 63df004bca67..983d68b23346 100644
--- a/x11-fonts/lato/Makefile
+++ b/x11-fonts/lato/Makefile
@@ -2,6 +2,7 @@
PORTNAME= lato
PORTVERSION= g20180831
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.latofonts.com/download/
DISTNAME= Lato2OFL
diff --git a/x11-fonts/league-gothic/Makefile b/x11-fonts/league-gothic/Makefile
index f4ba06890c11..ef492e02195d 100644
--- a/x11-fonts/league-gothic/Makefile
+++ b/x11-fonts/league-gothic/Makefile
@@ -3,6 +3,7 @@
PORTNAME= league-gothic
DISTVERSION= g20140319
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= flo@snakeoilproductions.net
diff --git a/x11-fonts/league-spartan/Makefile b/x11-fonts/league-spartan/Makefile
index fd7d16a7470c..2348cecd287e 100644
--- a/x11-fonts/league-spartan/Makefile
+++ b/x11-fonts/league-spartan/Makefile
@@ -3,6 +3,7 @@
PORTNAME= league-spartan
DISTVERSION= g20140922
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= flo@snakeoilproductions.net
diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile
index a04edf6273aa..ed3086c26eac 100644
--- a/x11-fonts/lfpfonts-fix/Makefile
+++ b/x11-fonts/lfpfonts-fix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lfpfonts-fix
PORTVERSION= 0.82
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= SF/xfonts/${PORTNAME}/${PORTVERSION}
diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile
index c76a0c4cb3cf..7f274a719cdd 100644
--- a/x11-fonts/lfpfonts-var/Makefile
+++ b/x11-fonts/lfpfonts-var/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lfpfonts-var
PORTVERSION= 0.83
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= SF/xfonts/${PORTNAME}/${PORTVERSION}
diff --git a/x11-fonts/liberation-fonts-ttf/Makefile b/x11-fonts/liberation-fonts-ttf/Makefile
index a038bbc2023b..fbeeb7d89f5b 100644
--- a/x11-fonts/liberation-fonts-ttf/Makefile
+++ b/x11-fonts/liberation-fonts-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= liberation-fonts-ttf
PORTVERSION= 2.00.5
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/liberationfonts/liberation-fonts/files/2926169/
diff --git a/x11-fonts/linden-hill/Makefile b/x11-fonts/linden-hill/Makefile
index fb80c2c3140d..d2efdef35bfd 100644
--- a/x11-fonts/linden-hill/Makefile
+++ b/x11-fonts/linden-hill/Makefile
@@ -3,6 +3,7 @@
PORTNAME= linden-hill
DISTVERSION= g20110526
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= flo@snakeoilproductions.net
diff --git a/x11-fonts/linuxlibertine-g/Makefile b/x11-fonts/linuxlibertine-g/Makefile
index 05b49d7efea4..d2207cff0372 100644
--- a/x11-fonts/linuxlibertine-g/Makefile
+++ b/x11-fonts/linuxlibertine-g/Makefile
@@ -2,7 +2,7 @@
PORTNAME= linuxlibertine-g
PORTVERSION= 20120116
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://www.numbertext.org/linux/
DISTNAME= e7a384790b13c29113e22e596ade9687-LinLibertineG-${PORTVERSION}
diff --git a/x11-fonts/linuxlibertine/Makefile b/x11-fonts/linuxlibertine/Makefile
index 6b9f12262db2..6bbe1a48ba2b 100644
--- a/x11-fonts/linuxlibertine/Makefile
+++ b/x11-fonts/linuxlibertine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= linuxlibertine
PORTVERSION= 4.7.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= SF
DISTNAME= LinLibertineFont-${PORTVERSION}-2
diff --git a/x11-fonts/lohit/Makefile b/x11-fonts/lohit/Makefile
index e39e41acdb35..5c72c8e722f1 100644
--- a/x11-fonts/lohit/Makefile
+++ b/x11-fonts/lohit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Lohit
PORTVERSION= 20140220
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= https://releases.pagure.org/lohit/
DISTNAME= lohit-ttf-${PORTVERSION}
diff --git a/x11-fonts/manu-gothica/Makefile b/x11-fonts/manu-gothica/Makefile
index 038aa6f6540d..1a7b204c5da2 100644
--- a/x11-fonts/manu-gothica/Makefile
+++ b/x11-fonts/manu-gothica/Makefile
@@ -3,7 +3,7 @@
PORTNAME= manu-gothica
DISTVERSION= 0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= http://www.bryld.dk/filer/ \
http://www.kswla.org/KATG%20Page%20Files/
diff --git a/x11-fonts/material-icons-ttf/Makefile b/x11-fonts/material-icons-ttf/Makefile
index 331f87854a47..e6e9895784d9 100644
--- a/x11-fonts/material-icons-ttf/Makefile
+++ b/x11-fonts/material-icons-ttf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= material-icons
DISTVERSION= 4.0.5
+PORTREVISION= 1
CATEGORIES= x11-fonts
PKGNAMESUFFIX= -ttf
diff --git a/x11-fonts/materialdesign-ttf/Makefile b/x11-fonts/materialdesign-ttf/Makefile
index 40a7fe05ec90..7ac16637f5dd 100644
--- a/x11-fonts/materialdesign-ttf/Makefile
+++ b/x11-fonts/materialdesign-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= materialdesign
DISTVERSIONPREFIX= v
DISTVERSION= 3.4.93
+PORTREVISION= 1
CATEGORIES= x11-fonts
PKGNAMESUFFIX= -ttf
diff --git a/x11-fonts/meslo/Makefile b/x11-fonts/meslo/Makefile
index eda3b9af9aeb..b121c26dfb46 100644
--- a/x11-fonts/meslo/Makefile
+++ b/x11-fonts/meslo/Makefile
@@ -3,6 +3,7 @@
PORTNAME= meslo
DISTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/andreberg/Meslo-Font/raw/master/dist/v${DISTVERSION}/
DISTNAME= Meslo%20LG%20v${DISTVERSION}
diff --git a/x11-fonts/mgopen/Makefile b/x11-fonts/mgopen/Makefile
index 4fccc81ac57b..244d7b0d8d4e 100644
--- a/x11-fonts/mgopen/Makefile
+++ b/x11-fonts/mgopen/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mgopen
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= DEBIAN/pool/main/f/fonts-mgopen
DISTNAME= fonts-mgopen_${PORTVERSION}.orig
diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile
deleted file mode 100644
index e9d1de57b7cc..000000000000
--- a/x11-fonts/mkfontdir/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Pawel Worach
-# $FreeBSD$
-
-PORTNAME= mkfontdir
-PORTVERSION= 1.0.7
-CATEGORIES= x11-fonts
-
-MAINTAINER= x11@FreeBSD.org
-COMMENT= Create an index of X font files in a directory
-
-LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-RUN_DEPENDS= mkfontscale:x11-fonts/mkfontscale
-
-XORG_CAT= app
-
-PLIST_FILES= bin/mkfontdir man/man1/mkfontdir.1.gz
-
-NO_ARCH= yes
-
-.include <bsd.port.mk>
diff --git a/x11-fonts/mkfontdir/distinfo b/x11-fonts/mkfontdir/distinfo
deleted file mode 100644
index af4e74d23cea..000000000000
--- a/x11-fonts/mkfontdir/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/app/mkfontdir-1.0.7.tar.bz2) = 56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530
-SIZE (xorg/app/mkfontdir-1.0.7.tar.bz2) = 108195
diff --git a/x11-fonts/mkfontdir/pkg-descr b/x11-fonts/mkfontdir/pkg-descr
deleted file mode 100644
index 0682df73b808..000000000000
--- a/x11-fonts/mkfontdir/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This package contains mkfontdir, used for creating an index of X font files
-in a directory.
-
-WWW: http://www.xfree86.org/current/mkfontdir.1.html
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
index 49c6fdf3a78f..c6840ab70ea2 100644
--- a/x11-fonts/mkfontscale/Makefile
+++ b/x11-fonts/mkfontscale/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mkfontscale
-PORTVERSION= 1.1.3
-PORTREVISION= 2
+PORTVERSION= 1.2.0
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
@@ -17,8 +16,9 @@ LIB_DEPENDS= libfreetype.so:print/freetype2
XORG_CAT= app
USE_XORG= xorgproto fontenc
-CONFIGURE_ARGS+=--disable-maintainer-mode
-
-PLIST_FILES= bin/mkfontscale man/man1/mkfontscale.1.gz
+PLIST_FILES= bin/mkfontdir \
+ bin/mkfontscale \
+ man/man1/mkfontdir.1.gz \
+ man/man1/mkfontscale.1.gz
.include <bsd.port.mk>
diff --git a/x11-fonts/mkfontscale/distinfo b/x11-fonts/mkfontscale/distinfo
index 428b1fe6de57..2acb9141e866 100644
--- a/x11-fonts/mkfontscale/distinfo
+++ b/x11-fonts/mkfontscale/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522336178
-SHA256 (xorg/app/mkfontscale-1.1.3.tar.bz2) = 1e98df69ee5f4542d711e140e1d93e2c3f2775407ccbb7849110d52b91782a6a
-SIZE (xorg/app/mkfontscale-1.1.3.tar.bz2) = 144386
+TIMESTAMP = 1551731053
+SHA256 (xorg/app/mkfontscale-1.2.0.tar.bz2) = 282b77be9f130d43d308287f87ed551ace2c64fee4447b5c4389870dea10c4be
+SIZE (xorg/app/mkfontscale-1.2.0.tar.bz2) = 150646
diff --git a/x11-fonts/mondulkiri/Makefile b/x11-fonts/mondulkiri/Makefile
index 54064b97bdc3..b910b2d4eea6 100644
--- a/x11-fonts/mondulkiri/Makefile
+++ b/x11-fonts/mondulkiri/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mondulkiri
PORTVERSION= 2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= SF/khmer/Fonts%20-%20Mondulkiri/Mondulkiri%20Unicode%20Fonts%20v2E3s/
DISTNAME= Mondulkiri_Unicode_fonts_V2E3s
diff --git a/x11-fonts/montecarlo_fonts/Makefile b/x11-fonts/montecarlo_fonts/Makefile
index f793126048c6..8fd3fc9f010c 100644
--- a/x11-fonts/montecarlo_fonts/Makefile
+++ b/x11-fonts/montecarlo_fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= montecarlo_fonts
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://bok.net/MonteCarlo/downloads/ \
http://mirror.4bit.ws/
diff --git a/x11-fonts/montserrat/Makefile b/x11-fonts/montserrat/Makefile
index 545f4b2574ee..207d462b08c5 100644
--- a/x11-fonts/montserrat/Makefile
+++ b/x11-fonts/montserrat/Makefile
@@ -2,6 +2,7 @@
PORTNAME= montserrat
PORTVERSION= 7.200
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= x11-fonts
diff --git a/x11-fonts/moveable-type-fonts/Makefile b/x11-fonts/moveable-type-fonts/Makefile
index 2ca2ff34824c..25cad10b4641 100644
--- a/x11-fonts/moveable-type-fonts/Makefile
+++ b/x11-fonts/moveable-type-fonts/Makefile
@@ -2,7 +2,7 @@
PORTNAME= moveable-type-fonts
PORTVERSION= 20100801
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://s3.amazonaws.com/theleague-production/fonts/
DISTFILES= junction.zip \
diff --git a/x11-fonts/nerd-fonts/Makefile b/x11-fonts/nerd-fonts/Makefile
index 11a856ffd24f..274b0719f062 100644
--- a/x11-fonts/nerd-fonts/Makefile
+++ b/x11-fonts/nerd-fonts/Makefile
@@ -3,6 +3,7 @@
PORTNAME= nerd-fonts
DISTVERSIONPREFIX= v
DISTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= gregf@hugops.pw
diff --git a/x11-fonts/noto-basic/Makefile b/x11-fonts/noto-basic/Makefile
index ce97fb6aba27..2fde8827c353 100644
--- a/x11-fonts/noto-basic/Makefile
+++ b/x11-fonts/noto-basic/Makefile
@@ -2,6 +2,7 @@
PORTNAME= noto
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://noto-website.storage.googleapis.com/pkgs/ \
https://github.com/googlei18n/noto-emoji/raw/master/fonts/:emoji
diff --git a/x11-fonts/noto-extra/Makefile b/x11-fonts/noto-extra/Makefile
index b76f755e237b..c0f7cb7e9e65 100644
--- a/x11-fonts/noto-extra/Makefile
+++ b/x11-fonts/noto-extra/Makefile
@@ -2,6 +2,7 @@
PORTNAME= noto
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://noto-website.storage.googleapis.com/pkgs/
DISTNAME= Noto-hinted
diff --git a/x11-fonts/noto-jp/Makefile b/x11-fonts/noto-jp/Makefile
index 3c1a16001402..47f690463ff6 100644
--- a/x11-fonts/noto-jp/Makefile
+++ b/x11-fonts/noto-jp/Makefile
@@ -2,6 +2,7 @@
PORTNAME= noto
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://noto-website.storage.googleapis.com/pkgs/
DISTNAME= Noto-hinted
diff --git a/x11-fonts/noto-kr/Makefile b/x11-fonts/noto-kr/Makefile
index 4af81537059b..36f6bc22d192 100644
--- a/x11-fonts/noto-kr/Makefile
+++ b/x11-fonts/noto-kr/Makefile
@@ -2,6 +2,7 @@
PORTNAME= noto
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://noto-website.storage.googleapis.com/pkgs/
DISTNAME= Noto-hinted
diff --git a/x11-fonts/noto-sc/Makefile b/x11-fonts/noto-sc/Makefile
index 7e04b519d0e2..c46960638de4 100644
--- a/x11-fonts/noto-sc/Makefile
+++ b/x11-fonts/noto-sc/Makefile
@@ -2,6 +2,7 @@
PORTNAME= noto
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://noto-website.storage.googleapis.com/pkgs/
DISTNAME= Noto-hinted
diff --git a/x11-fonts/noto-tc/Makefile b/x11-fonts/noto-tc/Makefile
index 12f78fdc6ad9..858e111d91f3 100644
--- a/x11-fonts/noto-tc/Makefile
+++ b/x11-fonts/noto-tc/Makefile
@@ -2,6 +2,7 @@
PORTNAME= noto
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://noto-website.storage.googleapis.com/pkgs/
DISTNAME= Noto-hinted
diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index 60b4b3b2acac..a3bad283faec 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -2,7 +2,7 @@
PORTNAME= nucleus
PORTVERSION= 0.77
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts
MASTER_SITES= SF/xfonts/OldFiles
diff --git a/x11-fonts/ohsnap/Makefile b/x11-fonts/ohsnap/Makefile
index 28b278e6061b..39edd66421f2 100644
--- a/x11-fonts/ohsnap/Makefile
+++ b/x11-fonts/ohsnap/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ohsnap
PORTVERSION= 1.8.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= SF/osnapfont/
diff --git a/x11-fonts/oldschool-pc-fonts/Makefile b/x11-fonts/oldschool-pc-fonts/Makefile
index 9ce23b5196fc..f6e28996e814 100644
--- a/x11-fonts/oldschool-pc-fonts/Makefile
+++ b/x11-fonts/oldschool-pc-fonts/Makefile
@@ -2,6 +2,7 @@
PORTNAME= oldschool-pc-fonts
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://int10h.org/${PORTNAME}/download/
DISTNAME= ultimate_oldschool_pc_font_pack_v${DISTVERSION}
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index 545073698e52..2b63264b80f6 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -3,7 +3,7 @@
PORTNAME= type1inst
PORTVERSION= 0.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts perl5
MASTER_SITES= SUNSITE/X11/xutils
PKGNAMEPREFIX= p5-
@@ -21,8 +21,7 @@ SHEBANG_FILES= type1inst t1embed
OPTIONS_DEFINE= DOCS X11
OPTIONS_DEFAULT=X11
-X11_RUN_DEPENDS= ${LOCALBASE}/bin/mkfontdir:x11-fonts/mkfontdir \
- ${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale
+X11_RUN_DEPENDS= ${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale
do-install:
(cd ${WRKSRC} && ${INSTALL_SCRIPT} type1inst t1embed \
diff --git a/x11-fonts/padauk/Makefile b/x11-fonts/padauk/Makefile
index 3f1dc47b724b..54a1c43f5c70 100644
--- a/x11-fonts/padauk/Makefile
+++ b/x11-fonts/padauk/Makefile
@@ -4,7 +4,7 @@
PORTNAME= padauk
PORTVERSION= 2.8
DISTVERSIONSUFFIX= 0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=Mh_Padauk_zip&filename=/
diff --git a/x11-fonts/paratype/Makefile b/x11-fonts/paratype/Makefile
index a36377657ee1..0922ce3435af 100644
--- a/x11-fonts/paratype/Makefile
+++ b/x11-fonts/paratype/Makefile
@@ -3,6 +3,7 @@
PORTNAME= paratype
PORTVERSION= 2.005
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.paratype.com/uni/public/
DISTFILES= PTSans.zip PTSerif.zip PTMono.zip
diff --git a/x11-fonts/pingwi/Makefile b/x11-fonts/pingwi/Makefile
index b6150e6e9b7c..e86df67bd941 100644
--- a/x11-fonts/pingwi/Makefile
+++ b/x11-fonts/pingwi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pingwi
PORTVERSION= 0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://www.pingwinsoft.ru/system/uploads/16/original/ \
http://fbsd.zlonet.ru/distfiles/
diff --git a/x11-fonts/plex-ttf/Makefile b/x11-fonts/plex-ttf/Makefile
index 63a9c114ba77..f7b76f73ad2e 100644
--- a/x11-fonts/plex-ttf/Makefile
+++ b/x11-fonts/plex-ttf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= plex-ttf
DISTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/IBM/plex/releases/download/v${DISTVERSION}/TrueType${EXTRACT_SUFX}?dummy=/
diff --git a/x11-fonts/powerline-fonts/Makefile b/x11-fonts/powerline-fonts/Makefile
index 17d9e43de8d3..60119c720eed 100644
--- a/x11-fonts/powerline-fonts/Makefile
+++ b/x11-fonts/powerline-fonts/Makefile
@@ -2,6 +2,7 @@
PORTNAME= powerline-fonts
PORTVERSION= 0.0.0.2017.07.26
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= swills@FreeBSD.org
diff --git a/x11-fonts/prociono/Makefile b/x11-fonts/prociono/Makefile
index e401abdd3f13..6c7a3b6fd9d0 100644
--- a/x11-fonts/prociono/Makefile
+++ b/x11-fonts/prociono/Makefile
@@ -3,6 +3,7 @@
PORTNAME= prociono
DISTVERSION= g20110526
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= flo@snakeoilproductions.net
diff --git a/x11-fonts/profont/Makefile b/x11-fonts/profont/Makefile
index d3f40ac13413..98553a3dfe05 100644
--- a/x11-fonts/profont/Makefile
+++ b/x11-fonts/profont/Makefile
@@ -3,7 +3,7 @@
PORTNAME= profont
PORTVERSION= 400
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= LOCAL/tobik \
http://tobiasjung.name/downloadfile.php?file=profont-x11.zip?dummy/
diff --git a/x11-fonts/proggy_fonts-ttf/Makefile b/x11-fonts/proggy_fonts-ttf/Makefile
index c4cce30bf6c6..f1e5d3fdb578 100644
--- a/x11-fonts/proggy_fonts-ttf/Makefile
+++ b/x11-fonts/proggy_fonts-ttf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= proggy_fonts-ttf
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MASTER_SITES= http://upperbounds.net/download/
DISTFILES= ProggyClean.ttf.zip ProggySquare.ttf.zip \
diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile
index 038b4d968cdb..217385289862 100644
--- a/x11-fonts/proggy_fonts/Makefile
+++ b/x11-fonts/proggy_fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= proggy_fonts
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= http://upperbounds.net/download/
DISTFILES= ProggyClean.pcf.zip ProggySquare.pcf.zip \
diff --git a/x11-fonts/raleway/Makefile b/x11-fonts/raleway/Makefile
index e830a2e89c54..15d24470a9f9 100644
--- a/x11-fonts/raleway/Makefile
+++ b/x11-fonts/raleway/Makefile
@@ -3,6 +3,7 @@
PORTNAME= raleway
DISTVERSION= g20140205
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= flo@snakeoilproductions.net
diff --git a/x11-fonts/roboto-fonts-ttf/Makefile b/x11-fonts/roboto-fonts-ttf/Makefile
index 61b26f7357bf..699ec21f704d 100644
--- a/x11-fonts/roboto-fonts-ttf/Makefile
+++ b/x11-fonts/roboto-fonts-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= roboto-fonts-ttf
PORTVERSION= 2.134
+PORTREVISION= 1
DISTVERSIONPREFIX=v
PORTEPOCH= 1
CATEGORIES= x11-fonts
diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile
index 8acd26749571..5e83eeaf82d5 100644
--- a/x11-fonts/sgifonts/Makefile
+++ b/x11-fonts/sgifonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sgifonts
PORTVERSION= 1.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fonts
MASTER_SITES= http://BSDforge.com/projects/source/x11-fonts/sgifonts/
DISTNAME= sgi-fonts-1.0-1.src
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index 0bc8ccb7176e..df59e5aae65e 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sharefonts
PORTVERSION= 0.10
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-fonts
MASTER_SITES= http://download.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/gnu/%SUBDIR%/ \
diff --git a/x11-fonts/sourcecodepro-ttf/Makefile b/x11-fonts/sourcecodepro-ttf/Makefile
index 927c630b0569..013111787e16 100644
--- a/x11-fonts/sourcecodepro-ttf/Makefile
+++ b/x11-fonts/sourcecodepro-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sourcecodepro
PORTVERSION= 2.030
+PORTREVISION= 1
DISTVERSIONSUFFIX= R-ro/1.050R-it
CATEGORIES= x11-fonts
PKGNAMESUFFIX= -ttf
diff --git a/x11-fonts/sourcesanspro-ttf/Makefile b/x11-fonts/sourcesanspro-ttf/Makefile
index 396a9f9cc203..16b71199781d 100644
--- a/x11-fonts/sourcesanspro-ttf/Makefile
+++ b/x11-fonts/sourcesanspro-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sourcesanspro
PORTVERSION= 2.045
+PORTREVISION= 1
DISTVERSIONSUFFIX= R-ro/1.095R-it
CATEGORIES= x11-fonts
PKGNAMESUFFIX= -ttf
diff --git a/x11-fonts/sourceserifpro-ttf/Makefile b/x11-fonts/sourceserifpro-ttf/Makefile
index 3a6126640de6..737a8a165478 100644
--- a/x11-fonts/sourceserifpro-ttf/Makefile
+++ b/x11-fonts/sourceserifpro-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sourceserifpro
PORTVERSION= 2.010
+PORTREVISION= 1
DISTVERSIONSUFFIX= R-ro/1.010R-it
CATEGORIES= x11-fonts
PKGNAMESUFFIX= -ttf
diff --git a/x11-fonts/spleen/Makefile b/x11-fonts/spleen/Makefile
index 584e7f63b26b..1e0c70ae55f2 100644
--- a/x11-fonts/spleen/Makefile
+++ b/x11-fonts/spleen/Makefile
@@ -2,6 +2,7 @@
PORTNAME= spleen
DISTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/fcambus/spleen/releases/download/${DISTVERSION}/
PKGNAMESUFFIX= -font
diff --git a/x11-fonts/stix-fonts/Makefile b/x11-fonts/stix-fonts/Makefile
index 1c978cfd9d80..5ab95244466b 100644
--- a/x11-fonts/stix-fonts/Makefile
+++ b/x11-fonts/stix-fonts/Makefile
@@ -3,6 +3,7 @@
PORTNAME= stixfonts
PORTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= thierry@FreeBSD.org
diff --git a/x11-fonts/suxus/Makefile b/x11-fonts/suxus/Makefile
index dea57c9eb607..0ddc5ce80791 100644
--- a/x11-fonts/suxus/Makefile
+++ b/x11-fonts/suxus/Makefile
@@ -2,7 +2,7 @@
PORTNAME= suxus
PORTVERSION= 1.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://oldhome.schmorp.de/marc/data/ \
http://www.atarininja.org/distfiles/
diff --git a/x11-fonts/symbola/Makefile b/x11-fonts/symbola/Makefile
index 0e3cc610d4c9..eef237bf0972 100644
--- a/x11-fonts/symbola/Makefile
+++ b/x11-fonts/symbola/Makefile
@@ -2,7 +2,7 @@
PORTNAME= symbola
PORTVERSION= 7.19
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= http://users.teilar.gr/~g1951d/
DISTNAME= Symbola
diff --git a/x11-fonts/tamsyn/Makefile b/x11-fonts/tamsyn/Makefile
index 1368bb8955f8..e5543c28a94a 100644
--- a/x11-fonts/tamsyn/Makefile
+++ b/x11-fonts/tamsyn/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tamsyn-font
DISTVERSION= 1.11
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.fial.com/~scott/tamsyn-font/download/
diff --git a/x11-fonts/tamzen/Makefile b/x11-fonts/tamzen/Makefile
index 33e4eeadbda4..1a13158f1588 100644
--- a/x11-fonts/tamzen/Makefile
+++ b/x11-fonts/tamzen/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tamzen-font
DISTVERSIONPREFIX= Tamzen-
DISTVERSION= 1.11.4
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= voidanix@420blaze.it
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index 9601265b4c54..df4f6fe753e0 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -3,6 +3,7 @@
PORTNAME= terminus-font
PORTVERSION= 4.47
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-fonts/terminus-ttf/Makefile b/x11-fonts/terminus-ttf/Makefile
index a1692d5bbff8..1f269b9e83ee 100644
--- a/x11-fonts/terminus-ttf/Makefile
+++ b/x11-fonts/terminus-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= terminus-ttf
PORTVERSION= 4.47.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://files.ax86.net/terminus-ttf/files/${PORTVERSION}/
diff --git a/x11-fonts/tmu/Makefile b/x11-fonts/tmu/Makefile
index bdca31bcb4b2..1429185e288b 100644
--- a/x11-fonts/tmu/Makefile
+++ b/x11-fonts/tmu/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tmu
DISTVERSION= 1.901b
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= SF/thdltools/TibetanMachineFont/TMU_${DISTVERSION}
DISTFILES= TibMachUni-${DISTVERSION}.ttf
diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile
index 1b278bbeec8d..ce305f78ab93 100644
--- a/x11-fonts/tv-fonts/Makefile
+++ b/x11-fonts/tv-fonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tv-fonts
PORTVERSION= 1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fonts
MASTER_SITES= http://dl.bytesex.org/releases/${PORTNAME}/
@@ -11,7 +11,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= Number of fonts which are useful for TV applications
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir
+ mkfontscale>=0:x11-fonts/mkfontscale
USES= gmake fonts tar:bzip2
MAKE_JOBS_UNSAFE= yes
diff --git a/x11-fonts/twemoji-color-font-ttf/Makefile b/x11-fonts/twemoji-color-font-ttf/Makefile
index 2de1e8944319..35973470d6f6 100644
--- a/x11-fonts/twemoji-color-font-ttf/Makefile
+++ b/x11-fonts/twemoji-color-font-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= twemoji-color-font-ttf
PORTVERSION= 11.2.0
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= https://github.com/eosrei/twemoji-color-font/releases/download/v${PORTVERSION}/
DISTNAME= TwitterColorEmoji-SVGinOT-Linux-${PORTVERSION}
diff --git a/x11-fonts/ubuntu-font/Makefile b/x11-fonts/ubuntu-font/Makefile
index 504fabb53d28..1d5fbdf15396 100644
--- a/x11-fonts/ubuntu-font/Makefile
+++ b/x11-fonts/ubuntu-font/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ubuntu-font
PORTVERSION= 0.83
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://font.ubuntu.com/download/
diff --git a/x11-fonts/urwfonts-ttf/Makefile b/x11-fonts/urwfonts-ttf/Makefile
index 4a71a69e5536..08526819de66 100644
--- a/x11-fonts/urwfonts-ttf/Makefile
+++ b/x11-fonts/urwfonts-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= urwfonts-ttf
PORTVERSION= 1.0.7b18
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.izmiran.rssi.ru/pub/fonts/urw/
DISTNAME= urw-fonts-${PORTVERSION:S/b/pre/}-ttf
diff --git a/x11-fonts/urwfonts/Makefile b/x11-fonts/urwfonts/Makefile
index 7ed797385375..4aef74941e98 100644
--- a/x11-fonts/urwfonts/Makefile
+++ b/x11-fonts/urwfonts/Makefile
@@ -2,7 +2,7 @@
PORTNAME= urwfonts
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/
DISTNAME= urw-fonts
diff --git a/x11-fonts/uw-ttyp0/Makefile b/x11-fonts/uw-ttyp0/Makefile
index 487f79f425eb..422797928c91 100644
--- a/x11-fonts/uw-ttyp0/Makefile
+++ b/x11-fonts/uw-ttyp0/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uw-ttyp0
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/
diff --git a/x11-fonts/vollkorn-ttf/Makefile b/x11-fonts/vollkorn-ttf/Makefile
index 7f9c96b5a08a..b547fbafa273 100644
--- a/x11-fonts/vollkorn-ttf/Makefile
+++ b/x11-fonts/vollkorn-ttf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= vollkorn-ttf
PORTVERSION= 4.105
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://vollkorn-typeface.com/download/
DISTNAME= vollkorn-${PORTVERSION:S|.|-|}
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index 0f018271e6f4..d5b69ac49721 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= webfonts
PORTVERSION= 0.30
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11-fonts
MASTER_SITES= SF/corefonts/the%20fonts/final:group1 \
ftp://ftp.botik.ru/rented/znamensk/distributions/ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \
diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile
index 9f8d0d457673..4b24156ca9f7 100644
--- a/x11-fonts/wqy/Makefile
+++ b/x11-fonts/wqy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wqy-fonts
PORTVERSION= 20100803
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES= x11-fonts
MASTER_SITES= SF/wqy/wqy-bitmapfont/1.0.0-RC1:bitmapfont \
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 8390a4ecb542..ceda1d6f4459 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xview
PORTVERSION= 3.2.1.4.19c
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.physionet.org/physiotools/xview/src/ \
http://komquats.com/distfiles/ \
@@ -15,8 +15,7 @@ COMMENT= X Window-System-based Visual/Integrated Environment for Workstations
MAKE_JOBS_UNSAFE= yes
-BUILD_DEPENDS= mkfontdir:x11-fonts/mkfontdir \
- mkfontscale:x11-fonts/mkfontscale
+BUILD_DEPENDS= mkfontscale:x11-fonts/mkfontscale
ONLY_FOR_ARCHS= i386
REINPLACE_ARGS= -i ""
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index d7a745817cc6..b58317c7741b 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libdockapp
PORTVERSION= 0.6.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= LOCAL/xride
diff --git a/x11/cde/Makefile b/x11/cde/Makefile
index 07c59b41b159..46b95c03655b 100644
--- a/x11/cde/Makefile
+++ b/x11/cde/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cde
DISTVERSION= 2.3.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF/cdesktopenv/src/
@@ -15,7 +16,7 @@ BROKEN_powerpc64= fails to build: ./config/imake/imake: No such file or director
BUILD_DEPENDS= ksh93:shells/ksh93 \
bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir \
+ mkfontscale>=0:x11-fonts/mkfontscale \
biconv:converters/iconv \
${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \
${LOCALBASE}/libdata/pkgconfig/freetype2.pc:print/freetype2
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 92797366d90f..fc80b5a83608 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -3,7 +3,7 @@
PORTNAME= x3270
PORTVERSION= 3.3.15
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 net
MASTER_SITES= http://x3270.bgp.nu/download/current/
EXTRACT_SUFX= ga7-src.tgz
@@ -12,7 +12,6 @@ MAINTAINER= ecrist@secure-computing.net
COMMENT= 3270 Terminal emulator
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
- mkfontdir:x11-fonts/mkfontdir \
mkfontscale:x11-fonts/mkfontscale
# Conflict due to x3270if
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index cf061ccedf78..b491ca55fd62 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -2,14 +2,13 @@
PORTNAME= xorg-apps
PORTVERSION= 7.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X.org apps meta-port
COMPONENTS= appres bitmap xf86dga:dga iceauth luit \
- x11-fonts/mkfontdir:mkfontdir \
x11-fonts/mkfontscale:mkfontscale sessreg \
setxkbmap smproxy x11perf xauth xbacklight xcalc \
xcmsdb xconsole xcursorgen xdpyinfo xdriinfo xev xgamma xgc \