svn commit: r495395 - in head: . Mk Mk/Uses arabic/ae_fonts_mono arabic/ae_fonts_ttf arabic/kacst_fonts chinese/CJKUnifonts chinese/CNS11643-font chinese/arphicttf chinese/fandol chinese/fireflyttf...

Mon Mar 11 21:26:17 UTC 2019

Author: zeising
Date: Mon Mar 11 21:25:57 2019
New Revision: 495395
URL: https://svnweb.freebsd.org/changeset/ports/495395

Log:
  x11-fonts/mkfontscale: Update to 1.2.0
  
  Update x11-fonts/mkfontscale to 1.2.0
  Remove x11-fonts/mkfontdir, which has been merged into mkfontscale.
  Update dependencies and bump portrevisions.
  Add an entry to UPDATING and MOVES
  
  Changelog:
  https://lists.x.org/archives/xorg/2019-March/059633.html
  
  Thanks to Antoine for the exp-run!
  
  PR:		236336 (exp-run)
  Obtained from:	FreeBSD Graphics Team dev repo
  		https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/mkfontscale
  Sponsored by:	B3 Init

Deleted:
  head/x11-fonts/mkfontdir/
Modified:
  head/MOVED
  head/Mk/Uses/fonts.mk
  head/Mk/bsd.xorg.mk
  head/UPDATING
  head/arabic/ae_fonts_mono/Makefile
  head/arabic/ae_fonts_ttf/Makefile
  head/arabic/kacst_fonts/Makefile
  head/chinese/CJKUnifonts/Makefile
  head/chinese/CNS11643-font/Makefile
  head/chinese/arphicttf/Makefile
  head/chinese/fandol/Makefile
  head/chinese/fireflyttf/Makefile
  head/chinese/kcfonts/Makefile
  head/chinese/moettf/Makefile
  head/chinese/opendesktop-fonts/Makefile
  head/chinese/sourcehanserif-sc-otf/Makefile
  head/chinese/sourcehanserif-tc-otf/Makefile
  head/deskutils/conkyforecast/Makefile
  head/emulators/pcemu/Makefile
  head/emulators/stonx/Makefile
  head/emulators/vice/Makefile
  head/games/xjewel/Makefile
  head/hebrew/culmus/Makefile
  head/hebrew/elmar-fonts/Makefile
  head/japanese/alias-fonts/Makefile
  head/japanese/font-ayu18/Makefile
  head/japanese/font-ayu20/Makefile
  head/japanese/font-elisa10/Makefile
  head/japanese/font-elisa8/Makefile
  head/japanese/font-jisx0213/Makefile
  head/japanese/font-kaname12/Makefile
  head/japanese/font-kanji18/Makefile
  head/japanese/font-kappa20/Makefile
  head/japanese/font-mona/Makefile
  head/japanese/font-mplus-bitmap/Makefile
  head/japanese/font-mplus-outline/Makefile
  head/japanese/font-naga10/Makefile
  head/japanese/font-shinonome/Makefile
  head/japanese/kterm/Makefile
  head/japanese/sourcehanserif-otf/Makefile
  head/korean/aleefonts-ttf/Makefile
  head/korean/baekmukfonts-bdf/Makefile
  head/korean/baekmukfonts-ttf/Makefile
  head/korean/d2coding-ttf/Makefile
  head/korean/hanyangfonts/Makefile
  head/korean/kaistfonts/Makefile
  head/korean/nanumcoding-ttf/Makefile
  head/korean/nanumfonts-otf/Makefile
  head/korean/sourcehanserif-otf/Makefile
  head/korean/unfonts-core/Makefile
  head/korean/unfonts-extra/Makefile
  head/mail/metamail/Makefile
  head/print/adobe-cmaps/Makefile
  head/print/font-amsfonts/Makefile
  head/russian/artwiz-ru/Makefile
  head/ukrainian/monacofonts/Makefile
  head/vietnamese/unicode-uhoai/Makefile
  head/vietnamese/urwvn/Makefile
  head/vietnamese/vietunicode-hannom/Makefile
  head/vietnamese/vietunicode-trichlor/Makefile
  head/vietnamese/vietunicode-web1/Makefile
  head/www/alef-webfont/Makefile
  head/x11-fonts/3270font/Makefile
  head/x11-fonts/Hasklig/Makefile
  head/x11-fonts/Makefile
  head/x11-fonts/alef/Makefile
  head/x11-fonts/alegreya-sans/Makefile
  head/x11-fonts/alegreya/Makefile
  head/x11-fonts/andika/Makefile
  head/x11-fonts/anonymous-pro/Makefile
  head/x11-fonts/artwiz-aleczapka-de/Makefile
  head/x11-fonts/artwiz-aleczapka-se/Makefile
  head/x11-fonts/artwiz-aleczapka/Makefile
  head/x11-fonts/artwiz-fonts/Makefile
  head/x11-fonts/averiagwf/Makefile
  head/x11-fonts/b612/Makefile
  head/x11-fonts/bitstream-vera/Makefile
  head/x11-fonts/bitter/Makefile
  head/x11-fonts/cantarell-fonts/Makefile
  head/x11-fonts/charis-compact/Makefile
  head/x11-fonts/charis/Makefile
  head/x11-fonts/clearsans/Makefile
  head/x11-fonts/code2000/Makefile
  head/x11-fonts/comfortaa-ttf/Makefile
  head/x11-fonts/comic-neue/Makefile
  head/x11-fonts/consolamono-ttf/Makefile
  head/x11-fonts/courier-prime/Makefile
  head/x11-fonts/croscorefonts-fonts-ttf/Makefile
  head/x11-fonts/crosextrafonts-caladea-ttf/Makefile
  head/x11-fonts/crosextrafonts-carlito-ttf/Makefile
  head/x11-fonts/cyberbit-ttfonts/Makefile
  head/x11-fonts/cyr-rfx/Makefile
  head/x11-fonts/datalegreya/Makefile
  head/x11-fonts/dejavu/Makefile
  head/x11-fonts/dina/Makefile
  head/x11-fonts/doulos-compact/Makefile
  head/x11-fonts/doulos/Makefile
  head/x11-fonts/droid-fonts-ttf/Makefile
  head/x11-fonts/exo/Makefile
  head/x11-fonts/fantasque-sans-mono/Makefile
  head/x11-fonts/fanwood/Makefile
  head/x11-fonts/farsifonts/Makefile
  head/x11-fonts/fifteen/Makefile
  head/x11-fonts/fira/Makefile
  head/x11-fonts/firacode/Makefile
  head/x11-fonts/firago/Makefile
  head/x11-fonts/font-adobe-100dpi/Makefile
  head/x11-fonts/font-adobe-75dpi/Makefile
  head/x11-fonts/font-adobe-utopia-100dpi/Makefile
  head/x11-fonts/font-adobe-utopia-75dpi/Makefile
  head/x11-fonts/font-adobe-utopia-type1/Makefile
  head/x11-fonts/font-arabic-misc/Makefile
  head/x11-fonts/font-awesome/Makefile
  head/x11-fonts/font-bh-100dpi/Makefile
  head/x11-fonts/font-bh-75dpi/Makefile
  head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
  head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
  head/x11-fonts/font-bh-ttf/Makefile
  head/x11-fonts/font-bh-type1/Makefile
  head/x11-fonts/font-bitstream-100dpi/Makefile
  head/x11-fonts/font-bitstream-75dpi/Makefile
  head/x11-fonts/font-bitstream-speedo/Makefile
  head/x11-fonts/font-bitstream-type1/Makefile
  head/x11-fonts/font-cronyx-cyrillic/Makefile
  head/x11-fonts/font-cursor-misc/Makefile
  head/x11-fonts/font-daewoo-misc/Makefile
  head/x11-fonts/font-dec-misc/Makefile
  head/x11-fonts/font-gost/Makefile
  head/x11-fonts/font-ibm-type1/Makefile
  head/x11-fonts/font-isas-misc/Makefile
  head/x11-fonts/font-jis-misc/Makefile
  head/x11-fonts/font-micro-misc/Makefile
  head/x11-fonts/font-misc-cyrillic/Makefile
  head/x11-fonts/font-misc-ethiopic/Makefile
  head/x11-fonts/font-misc-meltho/Makefile
  head/x11-fonts/font-misc-misc/Makefile
  head/x11-fonts/font-mutt-misc/Makefile
  head/x11-fonts/font-schumacher-misc/Makefile
  head/x11-fonts/font-screen-cyrillic/Makefile
  head/x11-fonts/font-sony-misc/Makefile
  head/x11-fonts/font-sun-misc/Makefile
  head/x11-fonts/font-tex-gyre-bonum-math/Makefile
  head/x11-fonts/font-tex-gyre-pagella-math/Makefile
  head/x11-fonts/font-tex-gyre-schola-math/Makefile
  head/x11-fonts/font-tex-gyre-termes-math/Makefile
  head/x11-fonts/font-winitzki-cyrillic/Makefile
  head/x11-fonts/font-xfree86-type1/Makefile
  head/x11-fonts/fonts-indic/Makefile
  head/x11-fonts/freefont-ttf/Makefile
  head/x11-fonts/freefonts/Makefile
  head/x11-fonts/geminifonts/Makefile
  head/x11-fonts/gentium-basic/Makefile
  head/x11-fonts/gentium-plus/Makefile
  head/x11-fonts/gnu-unifont/Makefile
  head/x11-fonts/gofont-ttf/Makefile
  head/x11-fonts/gohufont/Makefile
  head/x11-fonts/google-fonts/Makefile
  head/x11-fonts/hack-font/Makefile
  head/x11-fonts/hanazono-fonts-ttf/Makefile
  head/x11-fonts/hermit/Makefile
  head/x11-fonts/inconsolata-lgc-ttf/Makefile
  head/x11-fonts/inconsolata-ttf/Makefile
  head/x11-fonts/indic-ttf/Makefile
  head/x11-fonts/intlfonts/Makefile
  head/x11-fonts/iosevka/Makefile
  head/x11-fonts/isabella/Makefile
  head/x11-fonts/jmk-x11-fonts/Makefile
  head/x11-fonts/junction/Makefile
  head/x11-fonts/junicode/Makefile
  head/x11-fonts/kaputa/Makefile
  head/x11-fonts/khmeros/Makefile
  head/x11-fonts/lato/Makefile
  head/x11-fonts/league-gothic/Makefile
  head/x11-fonts/league-spartan/Makefile
  head/x11-fonts/lfpfonts-fix/Makefile
  head/x11-fonts/lfpfonts-var/Makefile
  head/x11-fonts/liberation-fonts-ttf/Makefile
  head/x11-fonts/linden-hill/Makefile
  head/x11-fonts/linuxlibertine-g/Makefile
  head/x11-fonts/linuxlibertine/Makefile
  head/x11-fonts/lohit/Makefile
  head/x11-fonts/manu-gothica/Makefile
  head/x11-fonts/material-icons-ttf/Makefile
  head/x11-fonts/materialdesign-ttf/Makefile
  head/x11-fonts/meslo/Makefile
  head/x11-fonts/mgopen/Makefile
  head/x11-fonts/mkfontscale/Makefile
  head/x11-fonts/mkfontscale/distinfo
  head/x11-fonts/mondulkiri/Makefile
  head/x11-fonts/montecarlo_fonts/Makefile
  head/x11-fonts/montserrat/Makefile
  head/x11-fonts/moveable-type-fonts/Makefile
  head/x11-fonts/nerd-fonts/Makefile
  head/x11-fonts/noto-basic/Makefile
  head/x11-fonts/noto-extra/Makefile
  head/x11-fonts/noto-jp/Makefile
  head/x11-fonts/noto-kr/Makefile
  head/x11-fonts/noto-sc/Makefile
  head/x11-fonts/noto-tc/Makefile
  head/x11-fonts/nucleus/Makefile
  head/x11-fonts/ohsnap/Makefile
  head/x11-fonts/oldschool-pc-fonts/Makefile
  head/x11-fonts/p5-type1inst/Makefile
  head/x11-fonts/padauk/Makefile
  head/x11-fonts/paratype/Makefile
  head/x11-fonts/pingwi/Makefile
  head/x11-fonts/plex-ttf/Makefile
  head/x11-fonts/powerline-fonts/Makefile
  head/x11-fonts/prociono/Makefile
  head/x11-fonts/profont/Makefile
  head/x11-fonts/proggy_fonts-ttf/Makefile
  head/x11-fonts/proggy_fonts/Makefile
  head/x11-fonts/raleway/Makefile
  head/x11-fonts/roboto-fonts-ttf/Makefile
  head/x11-fonts/sgifonts/Makefile
  head/x11-fonts/sharefonts/Makefile
  head/x11-fonts/sourcecodepro-ttf/Makefile
  head/x11-fonts/sourcesanspro-ttf/Makefile
  head/x11-fonts/sourceserifpro-ttf/Makefile
  head/x11-fonts/spleen/Makefile
  head/x11-fonts/stix-fonts/Makefile
  head/x11-fonts/suxus/Makefile
  head/x11-fonts/symbola/Makefile
  head/x11-fonts/tamsyn/Makefile
  head/x11-fonts/tamzen/Makefile
  head/x11-fonts/terminus-font/Makefile
  head/x11-fonts/terminus-ttf/Makefile
  head/x11-fonts/tmu/Makefile
  head/x11-fonts/tv-fonts/Makefile
  head/x11-fonts/twemoji-color-font-ttf/Makefile
  head/x11-fonts/ubuntu-font/Makefile
  head/x11-fonts/urwfonts-ttf/Makefile
  head/x11-fonts/urwfonts/Makefile
  head/x11-fonts/uw-ttyp0/Makefile
  head/x11-fonts/vollkorn-ttf/Makefile
  head/x11-fonts/webfonts/Makefile
  head/x11-fonts/wqy/Makefile
  head/x11-toolkits/xview/Makefile
  head/x11-wm/libdockapp/Makefile
  head/x11/cde/Makefile
  head/x11/x3270/Makefile
  head/x11/xorg-apps/Makefile

Modified: head/MOVED
==============================================================================

--- head/MOVED	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/MOVED	Mon Mar 11 21:25:57 2019	(r495395)
@@ -11681,3 +11681,4 @@ net-mgmt/py-pysnmp-apps|net-mgmt/py-snmpclitools|2019-
 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

Modified: head/Mk/Uses/fonts.mk
==============================================================================
--- head/Mk/Uses/fonts.mk	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/Mk/Uses/fonts.mk	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}

Modified: head/Mk/bsd.xorg.mk
==============================================================================
--- head/Mk/bsd.xorg.mk	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/Mk/bsd.xorg.mk	Mon Mar 11 21:25:57 2019	(r495395)
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fo
 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"

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/UPDATING	Mon Mar 11 21:25:57 2019	(r495395)
@@ -6,6 +6,18 @@ You should get into the habit of checking this file fo
 you update your ports collection, before attempting any port upgrades.
 
 20190311:
+  AFFECTS: users of x11/xorg, x11-fonts/mkfontscale, x11-fonts/mkfontdir
+  AUTHOR: zeising at 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 at freebsd.org
 

Modified: head/arabic/ae_fonts_mono/Makefile
==============================================================================
--- head/arabic/ae_fonts_mono/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/arabic/ae_fonts_mono/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}

Modified: head/arabic/ae_fonts_ttf/Makefile
==============================================================================
--- head/arabic/ae_fonts_ttf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/arabic/ae_fonts_ttf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}

Modified: head/arabic/kacst_fonts/Makefile
==============================================================================
--- head/arabic/kacst_fonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/arabic/kacst_fonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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/

Modified: head/chinese/CJKUnifonts/Makefile
==============================================================================
--- head/chinese/CJKUnifonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/chinese/CJKUnifonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/chinese/CNS11643-font/Makefile
==============================================================================
--- head/chinese/CNS11643-font/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/chinese/CNS11643-font/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/chinese/arphicttf/Makefile
==============================================================================
--- head/chinese/arphicttf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/chinese/arphicttf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}

Modified: head/chinese/fandol/Makefile
==============================================================================
--- head/chinese/fandol/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/chinese/fandol/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,6 +3,7 @@
 
 PORTNAME=	fandol
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	http://mirrors.ctan.org/fonts/
 DISTNAME=	${PORTNAME}

Modified: head/chinese/fireflyttf/Makefile
==============================================================================
--- head/chinese/fireflyttf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/chinese/fireflyttf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}

Modified: head/chinese/kcfonts/Makefile
==============================================================================
--- head/chinese/kcfonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/chinese/kcfonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kcfonts
 PORTVERSION=	1.05
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	GENTOO
 

Modified: head/chinese/moettf/Makefile
==============================================================================
--- head/chinese/moettf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/chinese/moettf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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 \

Modified: head/chinese/opendesktop-fonts/Makefile
==============================================================================
--- head/chinese/opendesktop-fonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/chinese/opendesktop-fonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opendesktop-fonts
 PORTVERSION=	1.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES?=	LOCAL/chinsan/fonts
 

Modified: head/chinese/sourcehanserif-sc-otf/Makefile
==============================================================================
--- head/chinese/sourcehanserif-sc-otf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/chinese/sourcehanserif-sc-otf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -2,6 +2,7 @@
 
 PORTNAME=		sourcehanserif
 PORTVERSION=		1.001
+PORTREVISION=		1
 DISTVERSIONSUFFIX=	R
 CATEGORIES=		chinese x11-fonts
 PKGNAMESUFFIX=		-sc-otf

Modified: head/chinese/sourcehanserif-tc-otf/Makefile
==============================================================================
--- head/chinese/sourcehanserif-tc-otf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/chinese/sourcehanserif-tc-otf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -2,6 +2,7 @@
 
 PORTNAME=		sourcehanserif
 PORTVERSION=		1.001
+PORTREVISION=		1
 DISTVERSIONSUFFIX=	R
 CATEGORIES=		chinese x11-fonts
 PKGNAMESUFFIX=		-tc-otf

Modified: head/deskutils/conkyforecast/Makefile
==============================================================================
--- head/deskutils/conkyforecast/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/deskutils/conkyforecast/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,7 +3,7 @@
 
 PORTNAME=	conkyforecast
 PORTVERSION=	2.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpadlibrarian.net/70673352/ \
 		LOCAL/vg

Modified: head/emulators/pcemu/Makefile
==============================================================================
--- head/emulators/pcemu/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/emulators/pcemu/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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 at 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

Modified: head/emulators/stonx/Makefile
==============================================================================
--- head/emulators/stonx/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/emulators/stonx/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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
 

Modified: head/emulators/vice/Makefile
==============================================================================
--- head/emulators/vice/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/emulators/vice/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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,
 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 \

Modified: head/games/xjewel/Makefile
==============================================================================
--- head/games/xjewel/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/games/xjewel/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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 at 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

Modified: head/hebrew/culmus/Makefile
==============================================================================
--- head/hebrew/culmus/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/hebrew/culmus/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,6 +3,7 @@
 
 PORTNAME=	culmus
 PORTVERSION=	0.131
+PORTREVISION=	1
 CATEGORIES=	hebrew
 MASTER_SITES=	SF
 

Modified: head/hebrew/elmar-fonts/Makefile
==============================================================================
--- head/hebrew/elmar-fonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/hebrew/elmar-fonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/japanese/alias-fonts/Makefile
==============================================================================
--- head/japanese/alias-fonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/alias-fonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,7 +3,7 @@
 
 PORTNAME=	alias-fonts
 PORTVERSION=	1.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	# empty
 DISTFILES=	# empty

Modified: head/japanese/font-ayu18/Makefile
==============================================================================
--- head/japanese/font-ayu18/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-ayu18/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/japanese/font-ayu20/Makefile
==============================================================================
--- head/japanese/font-ayu20/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-ayu20/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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-

Modified: head/japanese/font-elisa10/Makefile
==============================================================================
--- head/japanese/font-elisa10/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-elisa10/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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-

Modified: head/japanese/font-elisa8/Makefile
==============================================================================
--- head/japanese/font-elisa8/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-elisa8/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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-

Modified: head/japanese/font-jisx0213/Makefile
==============================================================================
--- head/japanese/font-jisx0213/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-jisx0213/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/japanese/font-kaname12/Makefile
==============================================================================
--- head/japanese/font-kaname12/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-kaname12/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kaname12
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-

Modified: head/japanese/font-kanji18/Makefile
==============================================================================
--- head/japanese/font-kanji18/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-kanji18/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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-

Modified: head/japanese/font-kappa20/Makefile
==============================================================================
--- head/japanese/font-kappa20/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-kappa20/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kappa20
 PORTVERSION=	0.396
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-

Modified: head/japanese/font-mona/Makefile
==============================================================================
--- head/japanese/font-mona/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-mona/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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 at 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

Modified: head/japanese/font-mplus-bitmap/Makefile
==============================================================================
--- head/japanese/font-mplus-bitmap/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-mplus-bitmap/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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-

Modified: head/japanese/font-mplus-outline/Makefile
==============================================================================
--- head/japanese/font-mplus-outline/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-mplus-outline/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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 at 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

Modified: head/japanese/font-naga10/Makefile
==============================================================================
--- head/japanese/font-naga10/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-naga10/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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-

Modified: head/japanese/font-shinonome/Makefile
==============================================================================
--- head/japanese/font-shinonome/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/font-shinonome/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/japanese/kterm/Makefile
==============================================================================
--- head/japanese/kterm/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/kterm/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/japanese/sourcehanserif-otf/Makefile
==============================================================================
--- head/japanese/sourcehanserif-otf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/japanese/sourcehanserif-otf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -2,6 +2,7 @@
 
 PORTNAME=		sourcehanserif
 PORTVERSION=		1.001
+PORTREVISION=		1
 DISTVERSIONSUFFIX=	R
 CATEGORIES=		japanese x11-fonts
 PKGNAMESUFFIX=		-otf

Modified: head/korean/aleefonts-ttf/Makefile
==============================================================================
--- head/korean/aleefonts-ttf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/aleefonts-ttf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/korean/baekmukfonts-bdf/Makefile
==============================================================================
--- head/korean/baekmukfonts-bdf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/baekmukfonts-bdf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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 at 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 \

Modified: head/korean/baekmukfonts-ttf/Makefile
==============================================================================
--- head/korean/baekmukfonts-ttf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/baekmukfonts-ttf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/korean/d2coding-ttf/Makefile
==============================================================================
--- head/korean/d2coding-ttf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/d2coding-ttf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/korean/hanyangfonts/Makefile
==============================================================================
--- head/korean/hanyangfonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/hanyangfonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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/ \

Modified: head/korean/kaistfonts/Makefile
==============================================================================
--- head/korean/kaistfonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/kaistfonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/korean/nanumcoding-ttf/Makefile
==============================================================================
--- head/korean/nanumcoding-ttf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/nanumcoding-ttf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/korean/nanumfonts-otf/Makefile
==============================================================================
--- head/korean/nanumfonts-otf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/nanumfonts-otf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -2,6 +2,7 @@
 
 PORTNAME=	nanumfonts
 PORTVERSION=	20160201
+PORTREVISION=	1
 CATEGORIES=	korean
 MASTER_SITES=	http://appdown.naver.com/naver/font/NanumFont/setup/ \
 		LOCAL/jkim

Modified: head/korean/sourcehanserif-otf/Makefile
==============================================================================
--- head/korean/sourcehanserif-otf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/sourcehanserif-otf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -2,6 +2,7 @@
 
 PORTNAME=		sourcehanserif
 PORTVERSION=		1.001
+PORTREVISION=		1
 DISTVERSIONSUFFIX=	R
 CATEGORIES=		korean x11-fonts
 PKGNAMESUFFIX=		-otf

Modified: head/korean/unfonts-core/Makefile
==============================================================================
--- head/korean/unfonts-core/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/unfonts-core/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}

Modified: head/korean/unfonts-extra/Makefile
==============================================================================
--- head/korean/unfonts-extra/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/korean/unfonts-extra/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -1,7 +1,7 @@
 # Created by: Hye-Shik Chang <perky at FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 
 FILEID=		2608
 

Modified: head/mail/metamail/Makefile
==============================================================================
--- head/mail/metamail/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/mail/metamail/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/print/adobe-cmaps/Makefile
==============================================================================
--- head/print/adobe-cmaps/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/print/adobe-cmaps/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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 \

Modified: head/print/font-amsfonts/Makefile
==============================================================================
--- head/print/font-amsfonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/print/font-amsfonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,7 +3,7 @@
 
 PORTNAME=	amsfonts
 PORTVERSION=	3.02
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	font-

Modified: head/russian/artwiz-ru/Makefile
==============================================================================
--- head/russian/artwiz-ru/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/russian/artwiz-ru/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/ukrainian/monacofonts/Makefile
==============================================================================
--- head/ukrainian/monacofonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/ukrainian/monacofonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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 at 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

Modified: head/vietnamese/unicode-uhoai/Makefile
==============================================================================
--- head/vietnamese/unicode-uhoai/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/vietnamese/unicode-uhoai/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,7 +3,7 @@
 
 PORTNAME=	unicode-uhoai
 PORTVERSION=	2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	LOCAL/obrien
 DISTNAME=	uhoaiw21

Modified: head/vietnamese/urwvn/Makefile
==============================================================================
--- head/vietnamese/urwvn/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/vietnamese/urwvn/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/vietnamese/vietunicode-hannom/Makefile
==============================================================================
--- head/vietnamese/vietunicode-hannom/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/vietnamese/vietunicode-hannom/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/vietnamese/vietunicode-trichlor/Makefile
==============================================================================
--- head/vietnamese/vietunicode-trichlor/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/vietnamese/vietunicode-trichlor/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/vietnamese/vietunicode-web1/Makefile
==============================================================================
--- head/vietnamese/vietunicode-web1/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/vietnamese/vietunicode-web1/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/www/alef-webfont/Makefile
==============================================================================
--- head/www/alef-webfont/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/www/alef-webfont/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/x11-fonts/3270font/Makefile
==============================================================================
--- head/x11-fonts/3270font/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/3270font/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}/

Modified: head/x11-fonts/Hasklig/Makefile
==============================================================================
--- head/x11-fonts/Hasklig/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/Hasklig/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}/
 

Modified: head/x11-fonts/Makefile
==============================================================================
--- head/x11-fonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -152,7 +152,6 @@
     SUBDIR += mgopen
     SUBDIR += mkbold
     SUBDIR += mkbold-mkitalic
-    SUBDIR += mkfontdir
     SUBDIR += mkfontscale
     SUBDIR += mkitalic
     SUBDIR += mondulkiri

Modified: head/x11-fonts/alef/Makefile
==============================================================================
--- head/x11-fonts/alef/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/alef/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -2,7 +2,7 @@
 
 PORTNAME=	alef
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://alef.hagilda.com/
 DISTNAME=	Alef

Modified: head/x11-fonts/alegreya-sans/Makefile
==============================================================================
--- head/x11-fonts/alegreya-sans/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/alegreya-sans/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,6 +3,7 @@
 PORTNAME=	alegreya-sans
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.008
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 

Modified: head/x11-fonts/alegreya/Makefile
==============================================================================
--- head/x11-fonts/alegreya/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/alegreya/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -2,6 +2,7 @@
 
 PORTNAME=	alegreya
 PORTVERSION=	2.008
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-fonts
 

Modified: head/x11-fonts/andika/Makefile
==============================================================================
--- head/x11-fonts/andika/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/andika/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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=/
 

Modified: head/x11-fonts/anonymous-pro/Makefile
==============================================================================
--- head/x11-fonts/anonymous-pro/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/anonymous-pro/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}

Modified: head/x11-fonts/artwiz-aleczapka-de/Makefile
==============================================================================
--- head/x11-fonts/artwiz-aleczapka-de/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/artwiz-aleczapka-de/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}
 

Modified: head/x11-fonts/artwiz-aleczapka-se/Makefile
==============================================================================
--- head/x11-fonts/artwiz-aleczapka-se/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/artwiz-aleczapka-se/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}
 

Modified: head/x11-fonts/artwiz-aleczapka/Makefile
==============================================================================
--- head/x11-fonts/artwiz-aleczapka/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/artwiz-aleczapka/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}
 

Modified: head/x11-fonts/artwiz-fonts/Makefile
==============================================================================
--- head/x11-fonts/artwiz-fonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/artwiz-fonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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/

Modified: head/x11-fonts/averiagwf/Makefile
==============================================================================
--- head/x11-fonts/averiagwf/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/averiagwf/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/x11-fonts/b612/Makefile
==============================================================================
--- head/x11-fonts/b612/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/b612/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,6 +3,7 @@
 
 PORTNAME=	b612
 PORTVERSION=	1.005
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	sunpoet at FreeBSD.org

Modified: head/x11-fonts/bitstream-vera/Makefile
==============================================================================
--- head/x11-fonts/bitstream-vera/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/bitstream-vera/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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}

Modified: head/x11-fonts/bitter/Makefile
==============================================================================
--- head/x11-fonts/bitter/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/bitter/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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=
 

Modified: head/x11-fonts/cantarell-fonts/Makefile
==============================================================================
--- head/x11-fonts/cantarell-fonts/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/cantarell-fonts/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cantarell-fonts
 PORTVERSION=	0.101
+PORTREVISION=	1
 CATEGORIES=	x11-fonts gnome
 MASTER_SITES=	GNOME
 

Modified: head/x11-fonts/charis-compact/Makefile
==============================================================================
--- head/x11-fonts/charis-compact/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/charis-compact/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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)

Modified: head/x11-fonts/charis/Makefile
==============================================================================
--- head/x11-fonts/charis/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/charis/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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

Modified: head/x11-fonts/clearsans/Makefile
==============================================================================
--- head/x11-fonts/clearsans/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/clearsans/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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/
 

Modified: head/x11-fonts/code2000/Makefile
==============================================================================
--- head/x11-fonts/code2000/Makefile	Mon Mar 11 21:20:21 2019	(r495394)
+++ head/x11-fonts/code2000/Makefile	Mon Mar 11 21:25:57 2019	(r495395)
@@ -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 OUTPUT TRUNCATED AT 1000 LINES ***
