Index: head/x11-fonts/terminus-font/Makefile
===================================================================
--- head/x11-fonts/terminus-font/Makefile	(revision 454291)
+++ head/x11-fonts/terminus-font/Makefile	(revision 454292)
@@ -1,76 +1,83 @@
 # Created by: Michael Hsin <mhsin@mhsin.org>
 # $FreeBSD$
 
 PORTNAME=	terminus-font
-PORTVERSION=	4.40
+PORTVERSION=	4.46
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Terminus Font - a clean fixed width font
 
+LICENSE=	OFL11
+
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
-USES=		gmake fonts perl5
-USE_PERL5=	build
+USES=		gmake fonts python:build,3.4+ shebangfix
+NO_ARCH=	yes
 
+SHEBANG_FILES=	bin/*.py
+
 OPTIONS_DEFINE=	AO2 DV1 GE2 GQ2 IJ1 KA2 HI2 LL2 TD1
 AO2_DESC=	Variant of letter 'a'
 DV1_DESC=	Variant of cyrillic letters 'de' and 've'
 GE2_DESC=	Variant of cyrillic letter 'ge'
 GQ2_DESC=	Variant of grave accent and apostrophe
 IJ1_DESC=	Variant of cyrillic letters 'i' and 'short i'
 KA2_DESC=	Variant of cyrillic letter 'ka'
 HI2_DESC=	Higher uppercase letters, for size 18
 LL2_DESC=	Variant with more distinctive 'l' (ell)
 TD1_DESC=	Variant with centered '~'
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
-ALL_TARGET=	pcf
+ALL_TARGET=	pcf pcf-8bit
 
 post-extract:
 .if ${PORT_OPTIONS:MAO2}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ao2.diff
 .endif
 .if ${PORT_OPTIONS:MDV1} && !${PORT_OPTIONS:MHI2}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/dv1.diff
 .endif
 .if ${PORT_OPTIONS:MGE2}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ge2.diff
 .endif
 .if ${PORT_OPTIONS:MGQ2}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/gq2.diff
 .endif
 .if ${PORT_OPTIONS:MIJ1}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ij1.diff
 .endif
 .if ${PORT_OPTIONS:MKA2} && !${PORT_OPTIONS:MHI2}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ka2.diff
 .endif
 .if ${PORT_OPTIONS:MHI2}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/hi2.diff
 .if ${PORT_OPTIONS:MDV1}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/hi2-dv1.diff
 .endif
 .if ${PORT_OPTIONS:MKA2}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/hi2-ka2.diff
 .endif
 .endif
 .if ${PORT_OPTIONS:MLL2}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ll2.diff
 .endif
 .if ${PORT_OPTIONS:MTD1}
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/td1.diff
 .endif
+
+post-patch:
+	${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|g' ${WRKSRC}/Makefile
 
 post-build:
 	@${GZIP_CMD} ${WRKSRC}/*.pcf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
Index: head/x11-fonts/terminus-font/distinfo
===================================================================
--- head/x11-fonts/terminus-font/distinfo	(revision 454291)
+++ head/x11-fonts/terminus-font/distinfo	(revision 454292)
@@ -1,2 +1,3 @@
-SHA256 (terminus-font-4.40.tar.gz) = 64f52c24d3f1c1e39f21e6c43077a9be3e21d4384f176f5766c00558ba670711
-SIZE (terminus-font-4.40.tar.gz) = 558440
+TIMESTAMP = 1509656699
+SHA256 (terminus-font-4.46.tar.gz) = 4e29433e5699b76df1f5c9a96f1228cccf8ea8a16791cfef063f2b8506c75bcd
+SIZE (terminus-font-4.46.tar.gz) = 590210
Index: head/x11-fonts/terminus-font/pkg-plist
===================================================================
--- head/x11-fonts/terminus-font/pkg-plist	(revision 454291)
+++ head/x11-fonts/terminus-font/pkg-plist	(revision 454292)
@@ -1,234 +1,252 @@
 %%FONTSDIR%%/ter-112b.pcf.gz
 %%FONTSDIR%%/ter-112n.pcf.gz
 %%FONTSDIR%%/ter-114b.pcf.gz
 %%FONTSDIR%%/ter-114n.pcf.gz
 %%FONTSDIR%%/ter-116b.pcf.gz
 %%FONTSDIR%%/ter-116n.pcf.gz
 %%FONTSDIR%%/ter-118b.pcf.gz
 %%FONTSDIR%%/ter-118n.pcf.gz
 %%FONTSDIR%%/ter-120b.pcf.gz
 %%FONTSDIR%%/ter-120n.pcf.gz
 %%FONTSDIR%%/ter-122b.pcf.gz
 %%FONTSDIR%%/ter-122n.pcf.gz
 %%FONTSDIR%%/ter-124b.pcf.gz
 %%FONTSDIR%%/ter-124n.pcf.gz
 %%FONTSDIR%%/ter-128b.pcf.gz
 %%FONTSDIR%%/ter-128n.pcf.gz
 %%FONTSDIR%%/ter-132b.pcf.gz
 %%FONTSDIR%%/ter-132n.pcf.gz
 %%FONTSDIR%%/ter-212b.pcf.gz
 %%FONTSDIR%%/ter-212n.pcf.gz
 %%FONTSDIR%%/ter-214b.pcf.gz
 %%FONTSDIR%%/ter-214n.pcf.gz
 %%FONTSDIR%%/ter-216b.pcf.gz
 %%FONTSDIR%%/ter-216n.pcf.gz
 %%FONTSDIR%%/ter-218b.pcf.gz
 %%FONTSDIR%%/ter-218n.pcf.gz
 %%FONTSDIR%%/ter-220b.pcf.gz
 %%FONTSDIR%%/ter-220n.pcf.gz
 %%FONTSDIR%%/ter-222b.pcf.gz
 %%FONTSDIR%%/ter-222n.pcf.gz
 %%FONTSDIR%%/ter-224b.pcf.gz
 %%FONTSDIR%%/ter-224n.pcf.gz
 %%FONTSDIR%%/ter-228b.pcf.gz
 %%FONTSDIR%%/ter-228n.pcf.gz
 %%FONTSDIR%%/ter-232b.pcf.gz
 %%FONTSDIR%%/ter-232n.pcf.gz
 %%FONTSDIR%%/ter-512b.pcf.gz
 %%FONTSDIR%%/ter-512n.pcf.gz
 %%FONTSDIR%%/ter-514b.pcf.gz
 %%FONTSDIR%%/ter-514n.pcf.gz
 %%FONTSDIR%%/ter-516b.pcf.gz
 %%FONTSDIR%%/ter-516n.pcf.gz
 %%FONTSDIR%%/ter-518b.pcf.gz
 %%FONTSDIR%%/ter-518n.pcf.gz
 %%FONTSDIR%%/ter-520b.pcf.gz
 %%FONTSDIR%%/ter-520n.pcf.gz
 %%FONTSDIR%%/ter-522b.pcf.gz
 %%FONTSDIR%%/ter-522n.pcf.gz
 %%FONTSDIR%%/ter-524b.pcf.gz
 %%FONTSDIR%%/ter-524n.pcf.gz
 %%FONTSDIR%%/ter-528b.pcf.gz
 %%FONTSDIR%%/ter-528n.pcf.gz
 %%FONTSDIR%%/ter-532b.pcf.gz
 %%FONTSDIR%%/ter-532n.pcf.gz
 %%FONTSDIR%%/ter-712b.pcf.gz
 %%FONTSDIR%%/ter-712n.pcf.gz
 %%FONTSDIR%%/ter-714b.pcf.gz
 %%FONTSDIR%%/ter-714n.pcf.gz
 %%FONTSDIR%%/ter-716b.pcf.gz
 %%FONTSDIR%%/ter-716n.pcf.gz
 %%FONTSDIR%%/ter-718b.pcf.gz
 %%FONTSDIR%%/ter-718n.pcf.gz
 %%FONTSDIR%%/ter-720b.pcf.gz
 %%FONTSDIR%%/ter-720n.pcf.gz
 %%FONTSDIR%%/ter-722b.pcf.gz
 %%FONTSDIR%%/ter-722n.pcf.gz
 %%FONTSDIR%%/ter-724b.pcf.gz
 %%FONTSDIR%%/ter-724n.pcf.gz
 %%FONTSDIR%%/ter-728b.pcf.gz
 %%FONTSDIR%%/ter-728n.pcf.gz
 %%FONTSDIR%%/ter-732b.pcf.gz
 %%FONTSDIR%%/ter-732n.pcf.gz
 %%FONTSDIR%%/ter-912b.pcf.gz
 %%FONTSDIR%%/ter-912n.pcf.gz
 %%FONTSDIR%%/ter-914b.pcf.gz
 %%FONTSDIR%%/ter-914n.pcf.gz
 %%FONTSDIR%%/ter-916b.pcf.gz
 %%FONTSDIR%%/ter-916n.pcf.gz
 %%FONTSDIR%%/ter-918b.pcf.gz
 %%FONTSDIR%%/ter-918n.pcf.gz
 %%FONTSDIR%%/ter-920b.pcf.gz
 %%FONTSDIR%%/ter-920n.pcf.gz
 %%FONTSDIR%%/ter-922b.pcf.gz
 %%FONTSDIR%%/ter-922n.pcf.gz
 %%FONTSDIR%%/ter-924b.pcf.gz
 %%FONTSDIR%%/ter-924n.pcf.gz
 %%FONTSDIR%%/ter-928b.pcf.gz
 %%FONTSDIR%%/ter-928n.pcf.gz
 %%FONTSDIR%%/ter-932b.pcf.gz
 %%FONTSDIR%%/ter-932n.pcf.gz
 %%FONTSDIR%%/ter-c12b.pcf.gz
 %%FONTSDIR%%/ter-c12n.pcf.gz
 %%FONTSDIR%%/ter-c14b.pcf.gz
 %%FONTSDIR%%/ter-c14n.pcf.gz
 %%FONTSDIR%%/ter-c16b.pcf.gz
 %%FONTSDIR%%/ter-c16n.pcf.gz
 %%FONTSDIR%%/ter-c18b.pcf.gz
 %%FONTSDIR%%/ter-c18n.pcf.gz
 %%FONTSDIR%%/ter-c20b.pcf.gz
 %%FONTSDIR%%/ter-c20n.pcf.gz
 %%FONTSDIR%%/ter-c22b.pcf.gz
 %%FONTSDIR%%/ter-c22n.pcf.gz
 %%FONTSDIR%%/ter-c24b.pcf.gz
 %%FONTSDIR%%/ter-c24n.pcf.gz
 %%FONTSDIR%%/ter-c28b.pcf.gz
 %%FONTSDIR%%/ter-c28n.pcf.gz
 %%FONTSDIR%%/ter-c32b.pcf.gz
 %%FONTSDIR%%/ter-c32n.pcf.gz
 %%FONTSDIR%%/ter-d12b.pcf.gz
 %%FONTSDIR%%/ter-d12n.pcf.gz
 %%FONTSDIR%%/ter-d14b.pcf.gz
 %%FONTSDIR%%/ter-d14n.pcf.gz
 %%FONTSDIR%%/ter-d16b.pcf.gz
 %%FONTSDIR%%/ter-d16n.pcf.gz
 %%FONTSDIR%%/ter-d18b.pcf.gz
 %%FONTSDIR%%/ter-d18n.pcf.gz
 %%FONTSDIR%%/ter-d20b.pcf.gz
 %%FONTSDIR%%/ter-d20n.pcf.gz
 %%FONTSDIR%%/ter-d22b.pcf.gz
 %%FONTSDIR%%/ter-d22n.pcf.gz
 %%FONTSDIR%%/ter-d24b.pcf.gz
 %%FONTSDIR%%/ter-d24n.pcf.gz
 %%FONTSDIR%%/ter-d28b.pcf.gz
 %%FONTSDIR%%/ter-d28n.pcf.gz
 %%FONTSDIR%%/ter-d32b.pcf.gz
 %%FONTSDIR%%/ter-d32n.pcf.gz
 %%FONTSDIR%%/ter-f12b.pcf.gz
 %%FONTSDIR%%/ter-f12n.pcf.gz
 %%FONTSDIR%%/ter-f14b.pcf.gz
 %%FONTSDIR%%/ter-f14n.pcf.gz
 %%FONTSDIR%%/ter-f16b.pcf.gz
 %%FONTSDIR%%/ter-f16n.pcf.gz
 %%FONTSDIR%%/ter-f18b.pcf.gz
 %%FONTSDIR%%/ter-f18n.pcf.gz
 %%FONTSDIR%%/ter-f20b.pcf.gz
 %%FONTSDIR%%/ter-f20n.pcf.gz
 %%FONTSDIR%%/ter-f22b.pcf.gz
 %%FONTSDIR%%/ter-f22n.pcf.gz
 %%FONTSDIR%%/ter-f24b.pcf.gz
 %%FONTSDIR%%/ter-f24n.pcf.gz
 %%FONTSDIR%%/ter-f28b.pcf.gz
 %%FONTSDIR%%/ter-f28n.pcf.gz
 %%FONTSDIR%%/ter-f32b.pcf.gz
 %%FONTSDIR%%/ter-f32n.pcf.gz
 %%FONTSDIR%%/ter-g12b.pcf.gz
 %%FONTSDIR%%/ter-g12n.pcf.gz
 %%FONTSDIR%%/ter-g14b.pcf.gz
 %%FONTSDIR%%/ter-g14n.pcf.gz
 %%FONTSDIR%%/ter-g16b.pcf.gz
 %%FONTSDIR%%/ter-g16n.pcf.gz
 %%FONTSDIR%%/ter-g18b.pcf.gz
 %%FONTSDIR%%/ter-g18n.pcf.gz
 %%FONTSDIR%%/ter-g20b.pcf.gz
 %%FONTSDIR%%/ter-g20n.pcf.gz
 %%FONTSDIR%%/ter-g22b.pcf.gz
 %%FONTSDIR%%/ter-g22n.pcf.gz
 %%FONTSDIR%%/ter-g24b.pcf.gz
 %%FONTSDIR%%/ter-g24n.pcf.gz
 %%FONTSDIR%%/ter-g28b.pcf.gz
 %%FONTSDIR%%/ter-g28n.pcf.gz
 %%FONTSDIR%%/ter-g32b.pcf.gz
 %%FONTSDIR%%/ter-g32n.pcf.gz
+%%FONTSDIR%%/ter-i12b.pcf.gz
+%%FONTSDIR%%/ter-i12n.pcf.gz
+%%FONTSDIR%%/ter-i14b.pcf.gz
+%%FONTSDIR%%/ter-i14n.pcf.gz
+%%FONTSDIR%%/ter-i16b.pcf.gz
+%%FONTSDIR%%/ter-i16n.pcf.gz
+%%FONTSDIR%%/ter-i18b.pcf.gz
+%%FONTSDIR%%/ter-i18n.pcf.gz
+%%FONTSDIR%%/ter-i20b.pcf.gz
+%%FONTSDIR%%/ter-i20n.pcf.gz
+%%FONTSDIR%%/ter-i22b.pcf.gz
+%%FONTSDIR%%/ter-i22n.pcf.gz
+%%FONTSDIR%%/ter-i24b.pcf.gz
+%%FONTSDIR%%/ter-i24n.pcf.gz
+%%FONTSDIR%%/ter-i28b.pcf.gz
+%%FONTSDIR%%/ter-i28n.pcf.gz
+%%FONTSDIR%%/ter-i32b.pcf.gz
+%%FONTSDIR%%/ter-i32n.pcf.gz
 %%FONTSDIR%%/ter-k12b.pcf.gz
 %%FONTSDIR%%/ter-k12n.pcf.gz
 %%FONTSDIR%%/ter-k14b.pcf.gz
 %%FONTSDIR%%/ter-k14n.pcf.gz
 %%FONTSDIR%%/ter-k16b.pcf.gz
 %%FONTSDIR%%/ter-k16n.pcf.gz
 %%FONTSDIR%%/ter-k18b.pcf.gz
 %%FONTSDIR%%/ter-k18n.pcf.gz
 %%FONTSDIR%%/ter-k20b.pcf.gz
 %%FONTSDIR%%/ter-k20n.pcf.gz
 %%FONTSDIR%%/ter-k22b.pcf.gz
 %%FONTSDIR%%/ter-k22n.pcf.gz
 %%FONTSDIR%%/ter-k24b.pcf.gz
 %%FONTSDIR%%/ter-k24n.pcf.gz
 %%FONTSDIR%%/ter-k28b.pcf.gz
 %%FONTSDIR%%/ter-k28n.pcf.gz
 %%FONTSDIR%%/ter-k32b.pcf.gz
 %%FONTSDIR%%/ter-k32n.pcf.gz
 %%FONTSDIR%%/ter-p12b.pcf.gz
 %%FONTSDIR%%/ter-p12n.pcf.gz
 %%FONTSDIR%%/ter-p14b.pcf.gz
 %%FONTSDIR%%/ter-p14n.pcf.gz
 %%FONTSDIR%%/ter-p16b.pcf.gz
 %%FONTSDIR%%/ter-p16n.pcf.gz
 %%FONTSDIR%%/ter-p18b.pcf.gz
 %%FONTSDIR%%/ter-p18n.pcf.gz
 %%FONTSDIR%%/ter-p20b.pcf.gz
 %%FONTSDIR%%/ter-p20n.pcf.gz
 %%FONTSDIR%%/ter-p22b.pcf.gz
 %%FONTSDIR%%/ter-p22n.pcf.gz
 %%FONTSDIR%%/ter-p24b.pcf.gz
 %%FONTSDIR%%/ter-p24n.pcf.gz
 %%FONTSDIR%%/ter-p28b.pcf.gz
 %%FONTSDIR%%/ter-p28n.pcf.gz
 %%FONTSDIR%%/ter-p32b.pcf.gz
 %%FONTSDIR%%/ter-p32n.pcf.gz
 %%FONTSDIR%%/ter-u12b.pcf.gz
 %%FONTSDIR%%/ter-u12n.pcf.gz
 %%FONTSDIR%%/ter-u14b.pcf.gz
 %%FONTSDIR%%/ter-u14n.pcf.gz
 %%FONTSDIR%%/ter-u16b.pcf.gz
 %%FONTSDIR%%/ter-u16n.pcf.gz
 %%FONTSDIR%%/ter-u18b.pcf.gz
 %%FONTSDIR%%/ter-u18n.pcf.gz
 %%FONTSDIR%%/ter-u20b.pcf.gz
 %%FONTSDIR%%/ter-u20n.pcf.gz
 %%FONTSDIR%%/ter-u22b.pcf.gz
 %%FONTSDIR%%/ter-u22n.pcf.gz
 %%FONTSDIR%%/ter-u24b.pcf.gz
 %%FONTSDIR%%/ter-u24n.pcf.gz
 %%FONTSDIR%%/ter-u28b.pcf.gz
 %%FONTSDIR%%/ter-u28n.pcf.gz
 %%FONTSDIR%%/ter-u32b.pcf.gz
 %%FONTSDIR%%/ter-u32n.pcf.gz
 %%FONTSDIR%%/ter-x12b.pcf.gz
 %%FONTSDIR%%/ter-x12n.pcf.gz
 %%FONTSDIR%%/ter-x14b.pcf.gz
 %%FONTSDIR%%/ter-x14n.pcf.gz
 %%FONTSDIR%%/ter-x16b.pcf.gz
 %%FONTSDIR%%/ter-x16n.pcf.gz
 %%FONTSDIR%%/ter-x18b.pcf.gz
 %%FONTSDIR%%/ter-x18n.pcf.gz
 %%FONTSDIR%%/ter-x20b.pcf.gz
 %%FONTSDIR%%/ter-x20n.pcf.gz
 %%FONTSDIR%%/ter-x22b.pcf.gz
 %%FONTSDIR%%/ter-x22n.pcf.gz
 %%FONTSDIR%%/ter-x24b.pcf.gz
 %%FONTSDIR%%/ter-x24n.pcf.gz
 %%FONTSDIR%%/ter-x28b.pcf.gz
 %%FONTSDIR%%/ter-x28n.pcf.gz
 %%FONTSDIR%%/ter-x32b.pcf.gz
 %%FONTSDIR%%/ter-x32n.pcf.gz