--- MOVED	(revision 494833)
+++ MOVED	(working copy)
@@ -11662,3 +11662,4 @@ 
 www/moodle31|www/moodle35|2019-03-04|Has expired: Upstream no longer maintained
 www/moodle34|www/moodle35|2019-03-04|Has expired: Upstream no longer maintained
 net/wireshark-qt5|net/wireshark|2019-03-05|Only GUI for wireshark is Qt5
+x11-fonts/mkfontdir|x11-fonts/mkfontscale|2019-03-06|Merged into one package
--- Mk/Uses/fonts.mk	(revision 494833)
+++ Mk/Uses/fonts.mk	(working copy)
@@ -54,8 +54,7 @@ 
 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}
--- Mk/bsd.xorg.mk	(revision 494833)
+++ Mk/bsd.xorg.mk	(working copy)
@@ -69,7 +69,7 @@ 
 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"
--- arabic/ae_fonts_mono/Makefile	(revision 494833)
+++ arabic/ae_fonts_mono/Makefile	(working copy)
@@ -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}
--- arabic/ae_fonts_ttf/Makefile	(revision 494833)
+++ arabic/ae_fonts_ttf/Makefile	(working copy)
@@ -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}
--- arabic/kacst_fonts/Makefile	(revision 494833)
+++ arabic/kacst_fonts/Makefile	(working copy)
@@ -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/
--- chinese/CJKUnifonts/Makefile	(revision 494833)
+++ chinese/CJKUnifonts/Makefile	(working copy)
@@ -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
--- chinese/CNS11643-font/Makefile	(revision 494833)
+++ chinese/CNS11643-font/Makefile	(working copy)
@@ -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
--- chinese/arphicttf/Makefile	(revision 494833)
+++ chinese/arphicttf/Makefile	(working copy)
@@ -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}
--- chinese/fandol/Makefile	(revision 494833)
+++ chinese/fandol/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	fandol
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	http://mirrors.ctan.org/fonts/
 DISTNAME=	${PORTNAME}
--- chinese/fireflyttf/Makefile	(revision 494833)
+++ chinese/fireflyttf/Makefile	(working copy)
@@ -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}
--- chinese/kcfonts/Makefile	(revision 494833)
+++ chinese/kcfonts/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	kcfonts
 PORTVERSION=	1.05
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	GENTOO
 
--- chinese/moettf/Makefile	(revision 494833)
+++ chinese/moettf/Makefile	(working copy)
@@ -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 \
--- chinese/opendesktop-fonts/Makefile	(revision 494833)
+++ chinese/opendesktop-fonts/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	opendesktop-fonts
 PORTVERSION=	1.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES?=	LOCAL/chinsan/fonts
 
--- chinese/sourcehanserif-sc-otf/Makefile	(revision 494833)
+++ chinese/sourcehanserif-sc-otf/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=		sourcehanserif
 PORTVERSION=		1.001
+PORTREVISION=		1
 DISTVERSIONSUFFIX=	R
 CATEGORIES=		chinese x11-fonts
 PKGNAMESUFFIX=		-sc-otf
--- chinese/sourcehanserif-tc-otf/Makefile	(revision 494833)
+++ chinese/sourcehanserif-tc-otf/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=		sourcehanserif
 PORTVERSION=		1.001
+PORTREVISION=		1
 DISTVERSIONSUFFIX=	R
 CATEGORIES=		chinese x11-fonts
 PKGNAMESUFFIX=		-tc-otf
--- deskutils/conkyforecast/Makefile	(revision 494833)
+++ deskutils/conkyforecast/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	conkyforecast
 PORTVERSION=	2.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpadlibrarian.net/70673352/ \
 		LOCAL/vg
--- emulators/pcemu/Makefile	(revision 494833)
+++ emulators/pcemu/Makefile	(working copy)
@@ -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 @@ 
 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
--- emulators/stonx/Makefile	(revision 494833)
+++ emulators/stonx/Makefile	(working copy)
@@ -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 @@ 
 
 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
 
--- emulators/vice/Makefile	(revision 494833)
+++ emulators/vice/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	vice
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/vice-emu/releases
 
@@ -12,7 +13,6 @@ 
 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 \
--- games/xjewel/Makefile	(revision 494833)
+++ games/xjewel/Makefile	(working copy)
@@ -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 @@ 
 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
--- hebrew/culmus/Makefile	(revision 494833)
+++ hebrew/culmus/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	culmus
 PORTVERSION=	0.131
+PORTREVISION=	1
 CATEGORIES=	hebrew
 MASTER_SITES=	SF
 
--- hebrew/elmar-fonts/Makefile	(revision 494833)
+++ hebrew/elmar-fonts/Makefile	(working copy)
@@ -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
--- japanese/alias-fonts/Makefile	(revision 494833)
+++ japanese/alias-fonts/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	alias-fonts
 PORTVERSION=	1.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	# empty
 DISTFILES=	# empty
--- japanese/font-ayu18/Makefile	(revision 494833)
+++ japanese/font-ayu18/Makefile	(working copy)
@@ -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
--- japanese/font-ayu20/Makefile	(revision 494833)
+++ japanese/font-ayu20/Makefile	(working copy)
@@ -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-
--- japanese/font-elisa10/Makefile	(revision 494833)
+++ japanese/font-elisa10/Makefile	(working copy)
@@ -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-
--- japanese/font-elisa8/Makefile	(revision 494833)
+++ japanese/font-elisa8/Makefile	(working copy)
@@ -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-
--- japanese/font-jisx0213/Makefile	(revision 494833)
+++ japanese/font-jisx0213/Makefile	(working copy)
@@ -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
--- japanese/font-kaname12/Makefile	(revision 494833)
+++ japanese/font-kaname12/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	kaname12
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-
--- japanese/font-kanji18/Makefile	(revision 494833)
+++ japanese/font-kanji18/Makefile	(working copy)
@@ -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-
--- japanese/font-kappa20/Makefile	(revision 494833)
+++ japanese/font-kappa20/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	kappa20
 PORTVERSION=	0.396
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-
--- japanese/font-mona/Makefile	(revision 494833)
+++ japanese/font-mona/Makefile	(working copy)
@@ -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 @@ 
 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
--- japanese/font-mplus-bitmap/Makefile	(revision 494833)
+++ japanese/font-mplus-bitmap/Makefile	(working copy)
@@ -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-
--- japanese/font-mplus-outline/Makefile	(revision 494833)
+++ japanese/font-mplus-outline/Makefile	(working copy)
@@ -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 @@ 
 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
--- japanese/font-naga10/Makefile	(revision 494833)
+++ japanese/font-naga10/Makefile	(working copy)
@@ -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-
--- japanese/font-shinonome/Makefile	(revision 494833)
+++ japanese/font-shinonome/Makefile	(working copy)
@@ -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
--- japanese/kterm/Makefile	(revision 494833)
+++ japanese/kterm/Makefile	(working copy)
@@ -4,7 +4,7 @@ 
 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_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
--- japanese/sourcehanserif-otf/Makefile	(revision 494833)
+++ japanese/sourcehanserif-otf/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=		sourcehanserif
 PORTVERSION=		1.001
+PORTREVISION=		1
 DISTVERSIONSUFFIX=	R
 CATEGORIES=		japanese x11-fonts
 PKGNAMESUFFIX=		-otf
--- korean/aleefonts-ttf/Makefile	(revision 494833)
+++ korean/aleefonts-ttf/Makefile	(working copy)
@@ -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
--- korean/baekmukfonts-bdf/Makefile	(revision 494833)
+++ korean/baekmukfonts-bdf/Makefile	(working copy)
@@ -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 @@ 
 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 \
--- korean/baekmukfonts-ttf/Makefile	(revision 494833)
+++ korean/baekmukfonts-ttf/Makefile	(working copy)
@@ -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
--- korean/d2coding-ttf/Makefile	(revision 494833)
+++ korean/d2coding-ttf/Makefile	(working copy)
@@ -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
--- korean/hanyangfonts/Makefile	(revision 494833)
+++ korean/hanyangfonts/Makefile	(working copy)
@@ -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/ \
--- korean/kaistfonts/Makefile	(revision 494833)
+++ korean/kaistfonts/Makefile	(working copy)
@@ -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
--- korean/nanumcoding-ttf/Makefile	(revision 494833)
+++ korean/nanumcoding-ttf/Makefile	(working copy)
@@ -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
--- korean/nanumfonts-otf/Makefile	(revision 494833)
+++ korean/nanumfonts-otf/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	nanumfonts
 PORTVERSION=	20160201
+PORTREVISION=	1
 CATEGORIES=	korean
 MASTER_SITES=	http://appdown.naver.com/naver/font/NanumFont/setup/ \
 		LOCAL/jkim
--- korean/sourcehanserif-otf/Makefile	(revision 494833)
+++ korean/sourcehanserif-otf/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=		sourcehanserif
 PORTVERSION=		1.001
+PORTREVISION=		1
 DISTVERSIONSUFFIX=	R
 CATEGORIES=		korean x11-fonts
 PKGNAMESUFFIX=		-otf
--- korean/unfonts-core/Makefile	(revision 494833)
+++ korean/unfonts-core/Makefile	(working copy)
@@ -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}
--- korean/unfonts-extra/Makefile	(revision 494833)
+++ korean/unfonts-extra/Makefile	(working copy)
@@ -1,7 +1,7 @@ 
 # Created by: Hye-Shik Chang <perky@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 
 FILEID=		2608
 
--- mail/metamail/Makefile	(revision 494833)
+++ mail/metamail/Makefile	(working copy)
@@ -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 @@ 
 
 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
--- print/adobe-cmaps/Makefile	(revision 494833)
+++ print/adobe-cmaps/Makefile	(working copy)
@@ -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 \
--- print/font-amsfonts/Makefile	(revision 494833)
+++ print/font-amsfonts/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	amsfonts
 PORTVERSION=	3.02
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	font-
--- russian/artwiz-ru/Makefile	(revision 494833)
+++ russian/artwiz-ru/Makefile	(working copy)
@@ -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
--- ukrainian/monacofonts/Makefile	(revision 494833)
+++ ukrainian/monacofonts/Makefile	(working copy)
@@ -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 @@ 
 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
--- vietnamese/unicode-uhoai/Makefile	(revision 494833)
+++ vietnamese/unicode-uhoai/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	unicode-uhoai
 PORTVERSION=	2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	LOCAL/obrien
 DISTNAME=	uhoaiw21
--- vietnamese/urwvn/Makefile	(revision 494833)
+++ vietnamese/urwvn/Makefile	(working copy)
@@ -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
--- vietnamese/vietunicode-hannom/Makefile	(revision 494833)
+++ vietnamese/vietunicode-hannom/Makefile	(working copy)
@@ -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
--- vietnamese/vietunicode-trichlor/Makefile	(revision 494833)
+++ vietnamese/vietunicode-trichlor/Makefile	(working copy)
@@ -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
--- vietnamese/vietunicode-web1/Makefile	(revision 494833)
+++ vietnamese/vietunicode-web1/Makefile	(working copy)
@@ -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
--- www/alef-webfont/Makefile	(revision 494833)
+++ www/alef-webfont/Makefile	(working copy)
@@ -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 @@ 
 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
--- x11/cde/Makefile	(revision 494833)
+++ x11/cde/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	cde
 DISTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	SF/cdesktopenv/src/
 
@@ -15,7 +16,7 @@ 
 
 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
--- x11/x3270/Makefile	(revision 494833)
+++ x11/x3270/Makefile	(working copy)
@@ -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 @@ 
 COMMENT=	3270 Terminal emulator
 
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
-		mkfontdir:x11-fonts/mkfontdir \
 		mkfontscale:x11-fonts/mkfontscale
 
 # Conflict due to x3270if
--- x11/xorg-apps/Makefile	(revision 494833)
+++ x11/xorg-apps/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	xorg-apps
 PORTVERSION=	7.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,7 +9,6 @@ 
 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 \
--- x11-fonts/3270font/Makefile	(revision 494833)
+++ x11-fonts/3270font/Makefile	(working copy)
@@ -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}/
--- x11-fonts/Hasklig/Makefile	(revision 494833)
+++ x11-fonts/Hasklig/Makefile	(working copy)
@@ -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}/
 
--- x11-fonts/Makefile	(revision 494833)
+++ x11-fonts/Makefile	(working copy)
@@ -152,7 +152,6 @@ 
     SUBDIR += mgopen
     SUBDIR += mkbold
     SUBDIR += mkbold-mkitalic
-    SUBDIR += mkfontdir
     SUBDIR += mkfontscale
     SUBDIR += mkitalic
     SUBDIR += mondulkiri
--- x11-fonts/alef/Makefile	(revision 494833)
+++ x11-fonts/alef/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	alef
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://alef.hagilda.com/
 DISTNAME=	Alef
--- x11-fonts/alegreya/Makefile	(revision 494833)
+++ x11-fonts/alegreya/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	alegreya
 PORTVERSION=	2.008
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-fonts
 
--- x11-fonts/alegreya-sans/Makefile	(revision 494833)
+++ x11-fonts/alegreya-sans/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 PORTNAME=	alegreya-sans
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.008
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
--- x11-fonts/andika/Makefile	(revision 494833)
+++ x11-fonts/andika/Makefile	(working copy)
@@ -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=/
 
--- x11-fonts/anonymous-pro/Makefile	(revision 494833)
+++ x11-fonts/anonymous-pro/Makefile	(working copy)
@@ -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}
--- x11-fonts/artwiz-aleczapka/Makefile	(revision 494833)
+++ x11-fonts/artwiz-aleczapka/Makefile	(working copy)
@@ -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}
 
--- x11-fonts/artwiz-aleczapka-de/Makefile	(revision 494833)
+++ x11-fonts/artwiz-aleczapka-de/Makefile	(working copy)
@@ -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}
 
--- x11-fonts/artwiz-aleczapka-se/Makefile	(revision 494833)
+++ x11-fonts/artwiz-aleczapka-se/Makefile	(working copy)
@@ -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}
 
--- x11-fonts/artwiz-fonts/Makefile	(revision 494833)
+++ x11-fonts/artwiz-fonts/Makefile	(working copy)
@@ -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/
--- x11-fonts/averiagwf/Makefile	(revision 494833)
+++ x11-fonts/averiagwf/Makefile	(working copy)
@@ -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
--- x11-fonts/b612/Makefile	(revision 494833)
+++ x11-fonts/b612/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	b612
 PORTVERSION=	1.005
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	sunpoet@FreeBSD.org
--- x11-fonts/bitstream-vera/Makefile	(revision 494833)
+++ x11-fonts/bitstream-vera/Makefile	(working copy)
@@ -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}
--- x11-fonts/bitter/Makefile	(revision 494833)
+++ x11-fonts/bitter/Makefile	(working copy)
@@ -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=
 
--- x11-fonts/cantarell-fonts/Makefile	(revision 494833)
+++ x11-fonts/cantarell-fonts/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	cantarell-fonts
 PORTVERSION=	0.101
+PORTREVISION=	1
 CATEGORIES=	x11-fonts gnome
 MASTER_SITES=	GNOME
 
--- x11-fonts/charis/Makefile	(revision 494833)
+++ x11-fonts/charis/Makefile	(working copy)
@@ -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
--- x11-fonts/charis-compact/Makefile	(revision 494833)
+++ x11-fonts/charis-compact/Makefile	(working copy)
@@ -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)
--- x11-fonts/clearsans/Makefile	(revision 494833)
+++ x11-fonts/clearsans/Makefile	(working copy)
@@ -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/
 
--- x11-fonts/code2000/Makefile	(revision 494833)
+++ x11-fonts/code2000/Makefile	(working copy)
@@ -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}
--- x11-fonts/comfortaa-ttf/Makefile	(revision 494833)
+++ x11-fonts/comfortaa-ttf/Makefile	(working copy)
@@ -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
--- x11-fonts/comic-neue/Makefile	(revision 494833)
+++ x11-fonts/comic-neue/Makefile	(working copy)
@@ -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}/
 
--- x11-fonts/consolamono-ttf/Makefile	(revision 494833)
+++ x11-fonts/consolamono-ttf/Makefile	(working copy)
@@ -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
--- x11-fonts/courier-prime/Makefile	(revision 494833)
+++ x11-fonts/courier-prime/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	courier-prime
 PORTVERSION=	g20180831
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://quoteunquoteapps.com/downloads/
 DISTNAME=	${PORTNAME}
--- x11-fonts/croscorefonts-fonts-ttf/Makefile	(revision 494833)
+++ x11-fonts/croscorefonts-fonts-ttf/Makefile	(working copy)
@@ -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
--- x11-fonts/crosextrafonts-caladea-ttf/Makefile	(revision 494833)
+++ x11-fonts/crosextrafonts-caladea-ttf/Makefile	(working copy)
@@ -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
--- x11-fonts/crosextrafonts-carlito-ttf/Makefile	(revision 494833)
+++ x11-fonts/crosextrafonts-carlito-ttf/Makefile	(working copy)
@@ -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/
 
--- x11-fonts/cyberbit-ttfonts/Makefile	(revision 494833)
+++ x11-fonts/cyberbit-ttfonts/Makefile	(working copy)
@@ -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 \
--- x11-fonts/cyr-rfx/Makefile	(revision 494833)
+++ x11-fonts/cyr-rfx/Makefile	(working copy)
@@ -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 @@ 
 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
--- x11-fonts/datalegreya/Makefile	(revision 494833)
+++ x11-fonts/datalegreya/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	datalegreya
 PORTVERSION=	0.2017.03.29
+PORTREVISION=	1
 CATEGORIES=	x11-fonts math textproc
 
 MAINTAINER=	thierry@FreeBSD.org
--- x11-fonts/dejavu/Makefile	(revision 494833)
+++ x11-fonts/dejavu/Makefile	(working copy)
@@ -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}/
--- x11-fonts/dina/Makefile	(revision 494833)
+++ x11-fonts/dina/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	dina
 PORTVERSION=	2.92
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	LOCAL/rakuco
 
--- x11-fonts/doulos/Makefile	(revision 494833)
+++ x11-fonts/doulos/Makefile	(working copy)
@@ -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
--- x11-fonts/doulos-compact/Makefile	(revision 494833)
+++ x11-fonts/doulos-compact/Makefile	(working copy)
@@ -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)
--- x11-fonts/droid-fonts-ttf/Makefile	(revision 494833)
+++ x11-fonts/droid-fonts-ttf/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	droid-fonts-ttf
 PORTVERSION=	20131024
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	LOCAL/sunpoet
 
--- x11-fonts/exo/Makefile	(revision 494833)
+++ x11-fonts/exo/Makefile	(working copy)
@@ -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
--- x11-fonts/fantasque-sans-mono/Makefile	(revision 494833)
+++ x11-fonts/fantasque-sans-mono/Makefile	(working copy)
@@ -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}/
 
--- x11-fonts/fanwood/Makefile	(revision 494833)
+++ x11-fonts/fanwood/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	fanwood
 DISTVERSION=	g20110526
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	flo@snakeoilproductions.net
--- x11-fonts/farsifonts/Makefile	(revision 494833)
+++ x11-fonts/farsifonts/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	farsifonts
 PORTVERSION=	0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/farsi-fonts/
 
--- x11-fonts/fifteen/Makefile	(revision 494833)
+++ x11-fonts/fifteen/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	fifteen
 PORTVERSION=	20150410
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://fontlibrary.org/assets/downloads/${PORTNAME}/c1556403ec283a1b5a23ad483af659f9/
 DISTNAME=	${PORTNAME}
--- x11-fonts/fira/Makefile	(revision 494833)
+++ x11-fonts/fira/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	fira
 PORTVERSION=	4.301
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	trueos@norwegianrockcat.com
--- x11-fonts/firacode/Makefile	(revision 494833)
+++ x11-fonts/firacode/Makefile	(working copy)
@@ -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}
--- x11-fonts/firago/Makefile	(revision 494833)
+++ x11-fonts/firago/Makefile	(working copy)
@@ -1,6 +1,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	firago
+PORTREVISION=	1
 PORTVERSION=	1.001
 CATEGORIES=	x11-fonts
 
--- x11-fonts/font-adobe-100dpi/Makefile	(revision 494833)
+++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-adobe-100dpi
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-adobe-75dpi/Makefile	(revision 494833)
+++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-adobe-75dpi
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 494833)
+++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-adobe-utopia-100dpi
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 494833)
+++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-adobe-utopia-75dpi
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 494833)
+++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-adobe-utopia-type1
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-arabic-misc/Makefile	(revision 494833)
+++ x11-fonts/font-arabic-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-arabic-misc
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-awesome/Makefile	(revision 494833)
+++ x11-fonts/font-awesome/Makefile	(working copy)
@@ -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
--- x11-fonts/font-bh-100dpi/Makefile	(revision 494833)
+++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-bh-100dpi
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-bh-75dpi/Makefile	(revision 494833)
+++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-bh-75dpi
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 494833)
+++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-bh-lucidatypewriter-100dpi
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 494833)
+++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-bh-lucidatypewriter-75dpi
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-bh-ttf/Makefile	(revision 494833)
+++ x11-fonts/font-bh-ttf/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-bh-ttf
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-bh-type1/Makefile	(revision 494833)
+++ x11-fonts/font-bh-type1/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-bh-type1
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-bitstream-100dpi/Makefile	(revision 494833)
+++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-bitstream-100dpi
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-bitstream-75dpi/Makefile	(revision 494833)
+++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-bitstream-75dpi
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-bitstream-speedo/Makefile	(revision 494833)
+++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	font-bitstream-speedo
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-bitstream-type1/Makefile	(revision 494833)
+++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-bitstream-type1
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 494833)
+++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-cronyx-cyrillic
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-cursor-misc/Makefile	(revision 494833)
+++ x11-fonts/font-cursor-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-cursor-misc
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-daewoo-misc/Makefile	(revision 494833)
+++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-daewoo-misc
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-dec-misc/Makefile	(revision 494833)
+++ x11-fonts/font-dec-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-dec-misc
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-gost/Makefile	(revision 494833)
+++ x11-fonts/font-gost/Makefile	(working copy)
@@ -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
--- x11-fonts/font-ibm-type1/Makefile	(revision 494833)
+++ x11-fonts/font-ibm-type1/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-ibm-type1
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-isas-misc/Makefile	(revision 494833)
+++ x11-fonts/font-isas-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-isas-misc
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-jis-misc/Makefile	(revision 494833)
+++ x11-fonts/font-jis-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-jis-misc
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-micro-misc/Makefile	(revision 494833)
+++ x11-fonts/font-micro-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-micro-misc
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-misc-cyrillic/Makefile	(revision 494833)
+++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-misc-cyrillic
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-misc-ethiopic/Makefile	(revision 494833)
+++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	font-misc-ethiopic
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-misc-meltho/Makefile	(revision 494833)
+++ x11-fonts/font-misc-meltho/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	font-misc-meltho
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-misc-misc/Makefile	(revision 494833)
+++ x11-fonts/font-misc-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-misc-misc
 PORTVERSION=	1.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-mutt-misc/Makefile	(revision 494833)
+++ x11-fonts/font-mutt-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-mutt-misc
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-schumacher-misc/Makefile	(revision 494833)
+++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-schumacher-misc
 PORTVERSION=	1.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-screen-cyrillic/Makefile	(revision 494833)
+++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-screen-cyrillic
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-sony-misc/Makefile	(revision 494833)
+++ x11-fonts/font-sony-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-sony-misc
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-sun-misc/Makefile	(revision 494833)
+++ x11-fonts/font-sun-misc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-sun-misc
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-tex-gyre-bonum-math/Makefile	(revision 494833)
+++ x11-fonts/font-tex-gyre-bonum-math/Makefile	(working copy)
@@ -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/.//}
--- x11-fonts/font-tex-gyre-pagella-math/Makefile	(revision 494833)
+++ x11-fonts/font-tex-gyre-pagella-math/Makefile	(working copy)
@@ -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/.//}
--- x11-fonts/font-tex-gyre-schola-math/Makefile	(revision 494833)
+++ x11-fonts/font-tex-gyre-schola-math/Makefile	(working copy)
@@ -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/.//}
--- x11-fonts/font-tex-gyre-termes-math/Makefile	(revision 494833)
+++ x11-fonts/font-tex-gyre-termes-math/Makefile	(working copy)
@@ -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/.//}
--- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 494833)
+++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-winitzki-cyrillic
 PORTVERSION=	1.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/font-xfree86-type1/Makefile	(revision 494833)
+++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	font-xfree86-type1
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- x11-fonts/fonts-indic/Makefile	(revision 494833)
+++ x11-fonts/fonts-indic/Makefile	(working copy)
@@ -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/
 
--- x11-fonts/freefont-ttf/Makefile	(revision 494833)
+++ x11-fonts/freefont-ttf/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	freefont-ttf
 PORTVERSION=	20120503
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	GNU/freefont
 
--- x11-fonts/freefonts/Makefile	(revision 494833)
+++ x11-fonts/freefonts/Makefile	(working copy)
@@ -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%/   \
--- x11-fonts/geminifonts/Makefile	(revision 494833)
+++ x11-fonts/geminifonts/Makefile	(working copy)
@@ -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 @@ 
 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
--- x11-fonts/gentium-basic/Makefile	(revision 494833)
+++ x11-fonts/gentium-basic/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	GentiumBasic
 PORTVERSION=	1102
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://software.sil.org/downloads/gentium/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
--- x11-fonts/gentium-plus/Makefile	(revision 494833)
+++ x11-fonts/gentium-plus/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	GentiumPlus
+PORTREVISION=	1
 PORTVERSION=	5.000
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://software.sil.org/downloads/gentium/
--- x11-fonts/gnu-unifont/Makefile	(revision 494833)
+++ x11-fonts/gnu-unifont/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	unifont
 PORTVERSION=	10.0.07
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	GNU/${PORTNAME}/${PORTNAME}-${PORTVERSION}
--- x11-fonts/gofont-ttf/Makefile	(revision 494833)
+++ x11-fonts/gofont-ttf/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	gofont-ttf
 DISTVERSION=	g20180511
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	tobik@FreeBSD.org
--- x11-fonts/gohufont/Makefile	(revision 494833)
+++ x11-fonts/gohufont/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	gohufont
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://font.gohu.org/
 
--- x11-fonts/google-fonts/Makefile	(revision 494833)
+++ x11-fonts/google-fonts/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	google-fonts
 DISTVERSION=	0.0.0.20190118
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	dg@syrec.org
--- x11-fonts/hack-font/Makefile	(revision 494833)
+++ x11-fonts/hack-font/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	hack-font
 PORTVERSION=	3.003
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-fonts
 
--- x11-fonts/hanazono-fonts-ttf/Makefile	(revision 494833)
+++ x11-fonts/hanazono-fonts-ttf/Makefile	(working copy)
@@ -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}
--- x11-fonts/hermit/Makefile	(revision 494833)
+++ x11-fonts/hermit/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	hermit
 DISTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://pcaro.es/d/
 PKGNAMESUFFIX=	-font
--- x11-fonts/inconsolata-lgc-ttf/Makefile	(revision 494833)
+++ x11-fonts/inconsolata-lgc-ttf/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	Inconsolata-LGC
 PORTVERSION=	20131024
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	rum1cro@yandex.ru
--- x11-fonts/inconsolata-ttf/Makefile	(revision 494833)
+++ x11-fonts/inconsolata-ttf/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	inconsolata-ttf
 PORTVERSION=	2.001
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
--- x11-fonts/indic-ttf/Makefile	(revision 494833)
+++ x11-fonts/indic-ttf/Makefile	(working copy)
@@ -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
--- x11-fonts/intlfonts/Makefile	(revision 494833)
+++ x11-fonts/intlfonts/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	intlfonts
 PORTVERSION=	1.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-fonts
 MASTER_SITES=	GNU
 
--- x11-fonts/iosevka/Makefile	(revision 494833)
+++ x11-fonts/iosevka/Makefile	(working copy)
@@ -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} \
--- x11-fonts/isabella/Makefile	(revision 494833)
+++ x11-fonts/isabella/Makefile	(working copy)
@@ -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
--- x11-fonts/jmk-x11-fonts/Makefile	(revision 494833)
+++ x11-fonts/jmk-x11-fonts/Makefile	(working copy)
@@ -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 @@ 
 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
 
--- x11-fonts/junction/Makefile	(revision 494833)
+++ x11-fonts/junction/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	junction
 PORTVERSION=	20140329	# GH_TAGNAME's commit date.
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	rakuco@FreeBSD.org
--- x11-fonts/junicode/Makefile	(revision 494833)
+++ x11-fonts/junicode/Makefile	(working copy)
@@ -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/
--- x11-fonts/kaputa/Makefile	(revision 494833)
+++ x11-fonts/kaputa/Makefile	(working copy)
@@ -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
--- x11-fonts/khmeros/Makefile	(revision 494833)
+++ x11-fonts/khmeros/Makefile	(working copy)
@@ -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
--- x11-fonts/lato/Makefile	(revision 494833)
+++ x11-fonts/lato/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	lato
 PORTVERSION=	g20180831
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.latofonts.com/download/
 DISTNAME=	Lato2OFL
--- x11-fonts/league-gothic/Makefile	(revision 494833)
+++ x11-fonts/league-gothic/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	league-gothic
 DISTVERSION=	g20140319
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	flo@snakeoilproductions.net
--- x11-fonts/league-spartan/Makefile	(revision 494833)
+++ x11-fonts/league-spartan/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	league-spartan
 DISTVERSION=	g20140922
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	flo@snakeoilproductions.net
--- x11-fonts/lfpfonts-fix/Makefile	(revision 494833)
+++ x11-fonts/lfpfonts-fix/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	lfpfonts-fix
 PORTVERSION=	0.82
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/xfonts/${PORTNAME}/${PORTVERSION}
 
--- x11-fonts/lfpfonts-var/Makefile	(revision 494833)
+++ x11-fonts/lfpfonts-var/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	lfpfonts-var
 PORTVERSION=	0.83
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/xfonts/${PORTNAME}/${PORTVERSION}
 
--- x11-fonts/liberation-fonts-ttf/Makefile	(revision 494833)
+++ x11-fonts/liberation-fonts-ttf/Makefile	(working copy)
@@ -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/
--- x11-fonts/linden-hill/Makefile	(revision 494833)
+++ x11-fonts/linden-hill/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	linden-hill
 DISTVERSION=	g20110526
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	flo@snakeoilproductions.net
--- x11-fonts/linuxlibertine/Makefile	(revision 494833)
+++ x11-fonts/linuxlibertine/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	linuxlibertine
 PORTVERSION=	4.7.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF
 DISTNAME=	LinLibertineFont-${PORTVERSION}-2
--- x11-fonts/linuxlibertine-g/Makefile	(revision 494833)
+++ x11-fonts/linuxlibertine-g/Makefile	(working copy)
@@ -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}
--- x11-fonts/lohit/Makefile	(revision 494833)
+++ x11-fonts/lohit/Makefile	(working copy)
@@ -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}
--- x11-fonts/manu-gothica/Makefile	(revision 494833)
+++ x11-fonts/manu-gothica/Makefile	(working copy)
@@ -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/
--- x11-fonts/material-icons-ttf/Makefile	(revision 494833)
+++ x11-fonts/material-icons-ttf/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	material-icons
 DISTVERSION=	4.0.5
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 PKGNAMESUFFIX=	-ttf
 
--- x11-fonts/materialdesign-ttf/Makefile	(revision 494833)
+++ x11-fonts/materialdesign-ttf/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 PORTNAME=	materialdesign
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.93
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 PKGNAMESUFFIX=	-ttf
 
--- x11-fonts/meslo/Makefile	(revision 494833)
+++ x11-fonts/meslo/Makefile	(working copy)
@@ -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}
--- x11-fonts/mgopen/Makefile	(revision 494833)
+++ x11-fonts/mgopen/Makefile	(working copy)
@@ -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
--- x11-fonts/mkfontdir/Makefile	(revision 494833)
+++ x11-fonts/mkfontdir/Makefile	(nonexistent)
@@ -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>
--- x11-fonts/mkfontdir/distinfo	(revision 494833)
+++ x11-fonts/mkfontdir/distinfo	(nonexistent)
@@ -1,2 +0,0 @@ 
-SHA256 (xorg/app/mkfontdir-1.0.7.tar.bz2) = 56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530
-SIZE (xorg/app/mkfontdir-1.0.7.tar.bz2) = 108195
--- x11-fonts/mkfontdir/pkg-descr	(revision 494833)
+++ x11-fonts/mkfontdir/pkg-descr	(nonexistent)
@@ -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
--- x11-fonts/mkfontscale/Makefile	(revision 494833)
+++ x11-fonts/mkfontscale/Makefile	(working copy)
@@ -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 @@ 
 XORG_CAT=	app
 USE_XORG=	xorgproto fontenc
 
-CONFIGURE_ARGS+=--disable-maintainer-mode
+PLIST_FILES=	bin/mkfontdir \
+		bin/mkfontscale \
+		man/man1/mkfontdir.1.gz \
+		man/man1/mkfontscale.1.gz
 
-PLIST_FILES=	bin/mkfontscale man/man1/mkfontscale.1.gz
-
 .include <bsd.port.mk>
--- x11-fonts/mkfontscale/distinfo	(revision 494833)
+++ x11-fonts/mkfontscale/distinfo	(working copy)
@@ -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
--- x11-fonts/mondulkiri/Makefile	(revision 494833)
+++ x11-fonts/mondulkiri/Makefile	(working copy)
@@ -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
--- x11-fonts/montecarlo_fonts/Makefile	(revision 494833)
+++ x11-fonts/montecarlo_fonts/Makefile	(working copy)
@@ -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/
--- x11-fonts/montserrat/Makefile	(revision 494833)
+++ x11-fonts/montserrat/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	montserrat
 PORTVERSION=	7.200
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-fonts
 
--- x11-fonts/moveable-type-fonts/Makefile	(revision 494833)
+++ x11-fonts/moveable-type-fonts/Makefile	(working copy)
@@ -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 \
--- x11-fonts/nerd-fonts/Makefile	(revision 494833)
+++ x11-fonts/nerd-fonts/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 PORTNAME=	nerd-fonts
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	gregf@hugops.pw
--- x11-fonts/noto-basic/Makefile	(revision 494833)
+++ x11-fonts/noto-basic/Makefile	(working copy)
@@ -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
--- x11-fonts/noto-extra/Makefile	(revision 494833)
+++ x11-fonts/noto-extra/Makefile	(working copy)
@@ -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
--- x11-fonts/noto-jp/Makefile	(revision 494833)
+++ x11-fonts/noto-jp/Makefile	(working copy)
@@ -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
--- x11-fonts/noto-kr/Makefile	(revision 494833)
+++ x11-fonts/noto-kr/Makefile	(working copy)
@@ -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
--- x11-fonts/noto-sc/Makefile	(revision 494833)
+++ x11-fonts/noto-sc/Makefile	(working copy)
@@ -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
--- x11-fonts/noto-tc/Makefile	(revision 494833)
+++ x11-fonts/noto-tc/Makefile	(working copy)
@@ -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
--- x11-fonts/nucleus/Makefile	(revision 494833)
+++ x11-fonts/nucleus/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	nucleus
 PORTVERSION=	0.77
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/xfonts/OldFiles
 
--- x11-fonts/ohsnap/Makefile	(revision 494833)
+++ x11-fonts/ohsnap/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	ohsnap
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/osnapfont/
 
--- x11-fonts/oldschool-pc-fonts/Makefile	(revision 494833)
+++ x11-fonts/oldschool-pc-fonts/Makefile	(working copy)
@@ -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}
--- x11-fonts/p5-type1inst/Makefile	(revision 494833)
+++ x11-fonts/p5-type1inst/Makefile	(working copy)
@@ -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 @@ 
 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 \
--- x11-fonts/padauk/Makefile	(revision 494833)
+++ x11-fonts/padauk/Makefile	(working copy)
@@ -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=/
 
--- x11-fonts/paratype/Makefile	(revision 494833)
+++ x11-fonts/paratype/Makefile	(working copy)
@@ -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
--- x11-fonts/pingwi/Makefile	(revision 494833)
+++ x11-fonts/pingwi/Makefile	(working copy)
@@ -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/
--- x11-fonts/plex-ttf/Makefile	(revision 494833)
+++ x11-fonts/plex-ttf/Makefile	(working copy)
@@ -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=/
 
--- x11-fonts/powerline-fonts/Makefile	(revision 494833)
+++ x11-fonts/powerline-fonts/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	powerline-fonts
 PORTVERSION=	0.0.0.2017.07.26
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	swills@FreeBSD.org
--- x11-fonts/prociono/Makefile	(revision 494833)
+++ x11-fonts/prociono/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	prociono
 DISTVERSION=	g20110526
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	flo@snakeoilproductions.net
--- x11-fonts/profont/Makefile	(revision 494833)
+++ x11-fonts/profont/Makefile	(working copy)
@@ -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/
--- x11-fonts/proggy_fonts/Makefile	(revision 494833)
+++ x11-fonts/proggy_fonts/Makefile	(working copy)
@@ -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 \
--- x11-fonts/proggy_fonts-ttf/Makefile	(revision 494833)
+++ x11-fonts/proggy_fonts-ttf/Makefile	(working copy)
@@ -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 \
--- x11-fonts/raleway/Makefile	(revision 494833)
+++ x11-fonts/raleway/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	raleway
 DISTVERSION=	g20140205
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	flo@snakeoilproductions.net
--- x11-fonts/roboto-fonts-ttf/Makefile	(revision 494833)
+++ x11-fonts/roboto-fonts-ttf/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	roboto-fonts-ttf
 PORTVERSION=	2.134
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
--- x11-fonts/sgifonts/Makefile	(revision 494833)
+++ x11-fonts/sgifonts/Makefile	(working copy)
@@ -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
--- x11-fonts/sharefonts/Makefile	(revision 494833)
+++ x11-fonts/sharefonts/Makefile	(working copy)
@@ -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%/   \
--- x11-fonts/sourcecodepro-ttf/Makefile	(revision 494833)
+++ x11-fonts/sourcecodepro-ttf/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	sourcecodepro
 PORTVERSION=	2.030
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	R-ro/1.050R-it
 CATEGORIES=	x11-fonts
 PKGNAMESUFFIX=	-ttf
--- x11-fonts/sourcesanspro-ttf/Makefile	(revision 494833)
+++ x11-fonts/sourcesanspro-ttf/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	sourcesanspro
 PORTVERSION=	2.045
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	R-ro/1.095R-it
 CATEGORIES=	x11-fonts
 PKGNAMESUFFIX=	-ttf
--- x11-fonts/sourceserifpro-ttf/Makefile	(revision 494833)
+++ x11-fonts/sourceserifpro-ttf/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	sourceserifpro
 PORTVERSION=	2.010
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	R-ro/1.010R-it
 CATEGORIES=	x11-fonts
 PKGNAMESUFFIX=	-ttf
--- x11-fonts/spleen/Makefile	(revision 494833)
+++ x11-fonts/spleen/Makefile	(working copy)
@@ -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
--- x11-fonts/stix-fonts/Makefile	(revision 494833)
+++ x11-fonts/stix-fonts/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	stixfonts
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	thierry@FreeBSD.org
--- x11-fonts/suxus/Makefile	(revision 494833)
+++ x11-fonts/suxus/Makefile	(working copy)
@@ -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/
--- x11-fonts/symbola/Makefile	(revision 494833)
+++ x11-fonts/symbola/Makefile	(working copy)
@@ -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
--- x11-fonts/tamsyn/Makefile	(revision 494833)
+++ x11-fonts/tamsyn/Makefile	(working copy)
@@ -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/
 
--- x11-fonts/tamzen/Makefile	(revision 494833)
+++ x11-fonts/tamzen/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 PORTNAME=	tamzen-font
 DISTVERSIONPREFIX=	Tamzen-
 DISTVERSION=	1.11.4
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	voidanix@420blaze.it
--- x11-fonts/terminus-font/Makefile	(revision 494833)
+++ x11-fonts/terminus-font/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	terminus-font
 PORTVERSION=	4.47
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}
 
--- x11-fonts/terminus-ttf/Makefile	(revision 494833)
+++ x11-fonts/terminus-ttf/Makefile	(working copy)
@@ -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}/
 
--- x11-fonts/tmu/Makefile	(revision 494833)
+++ x11-fonts/tmu/Makefile	(working copy)
@@ -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
--- x11-fonts/tv-fonts/Makefile	(revision 494833)
+++ x11-fonts/tv-fonts/Makefile	(working copy)
@@ -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 @@ 
 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
--- x11-fonts/twemoji-color-font-ttf/Makefile	(revision 494833)
+++ x11-fonts/twemoji-color-font-ttf/Makefile	(working copy)
@@ -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}
--- x11-fonts/ubuntu-font/Makefile	(revision 494833)
+++ x11-fonts/ubuntu-font/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	ubuntu-font
 PORTVERSION=	0.83
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://font.ubuntu.com/download/
 
--- x11-fonts/urwfonts/Makefile	(revision 494833)
+++ x11-fonts/urwfonts/Makefile	(working copy)
@@ -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
--- x11-fonts/urwfonts-ttf/Makefile	(revision 494833)
+++ x11-fonts/urwfonts-ttf/Makefile	(working copy)
@@ -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
--- x11-fonts/uw-ttyp0/Makefile	(revision 494833)
+++ x11-fonts/uw-ttyp0/Makefile	(working copy)
@@ -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/
 
--- x11-fonts/vollkorn-ttf/Makefile	(revision 494833)
+++ x11-fonts/vollkorn-ttf/Makefile	(working copy)
@@ -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|.|-|}
--- x11-fonts/webfonts/Makefile	(revision 494833)
+++ x11-fonts/webfonts/Makefile	(working copy)
@@ -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 \
--- x11-fonts/wqy/Makefile	(revision 494833)
+++ x11-fonts/wqy/Makefile	(working copy)
@@ -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 \
--- x11-toolkits/xview/Makefile	(revision 494833)
+++ x11-toolkits/xview/Makefile	(working copy)
@@ -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 @@ 
 
 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 ""
--- x11-wm/libdockapp/Makefile	(revision 494833)
+++ x11-wm/libdockapp/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	libdockapp
 PORTVERSION=	0.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	LOCAL/xride