3 files changed, 43 insertions, 7 deletions

diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index cce109d35a30..bfb5fa5d098a 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	terminus-font
-PORTVERSION=	4.32
+PORTVERSION=	4.35
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME:L}/${PORTNAME}-${PORTVERSION}|}
 
@@ -23,11 +23,12 @@ USE_GMAKE=	yes
 
 OPTIONS=	AO2 "Variant of letter 'a'" off \
 		DV1 "Variant of cyrillic letters 'de' and 've'" off \
-		GE1 "Variant of cyrillic letter 'ge'" off \
+		GE2 "Variant of cyrillic letter 'ge'" off \
 		GQ2 "Variant of grave accent and apostrophe" off \
 		IJ1 "Variant of cyrillic letters 'i' and 'short i'" off \
 		KA2 "Variant of cyrillic letter 'ka'" off \
-		CM2 "Variant of letters with circumflex, caron and macron" off
+		CM2 "Variant of letters with circumflex, caron and macron" off \
+		HI2 "Higher uppercase letters, for size 18" off
 
 SUB_LIST=	FONTDIR="${PREFIX}/${FONTDIR}"
 SUB_FILES=	pkg-message
@@ -45,8 +46,8 @@ post-extract:
 .if defined(WITH_DV1)
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/dv1.diff
 .endif
-.if defined(WITH_GE1)
-	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ge1.diff
+.if defined(WITH_GE2)
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ge2.diff
 .endif
 .if defined(WITH_GQ2)
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/gq2.diff
@@ -60,6 +61,15 @@ post-extract:
 .if defined(WITH_CM2)
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/cm2.diff
 .endif
+.if defined(WITH_HI2)
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/hi2.diff
+.if defined(WITH_DV1)
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/hi2-dv1.diff
+.endif
+.if defined(WITH_KA2)
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/hi2-ka2.diff
+.endif
+.endif
 
 post-build:
 	@${GZIP_CMD} ${WRKSRC}/*.pcf
diff --git a/x11-fonts/terminus-font/distinfo b/x11-fonts/terminus-font/distinfo
index 436ad500c1b6..bc55d882ac13 100644
--- a/x11-fonts/terminus-font/distinfo
+++ b/x11-fonts/terminus-font/distinfo
@@ -1,2 +1,2 @@
-SHA256 (terminus-font-4.32.tar.gz) = f05a8afb426af080bc94b6ac9846daac2a3f2e2883feaf96a503bb2e5507aea4
-SIZE (terminus-font-4.32.tar.gz) = 278839
+SHA256 (terminus-font-4.35.tar.gz) = 6ae4cd2186050c96997052e167013aa21b6039a164f31fa06e9ae697f3d8b8dc
+SIZE (terminus-font-4.35.tar.gz) = 313577
diff --git a/x11-fonts/terminus-font/pkg-plist b/x11-fonts/terminus-font/pkg-plist
index f58b2028f718..fccb9c97cf73 100644
--- a/x11-fonts/terminus-font/pkg-plist
+++ b/x11-fonts/terminus-font/pkg-plist
@@ -208,4 +208,30 @@
 %%FONTDIR%%/ter-u14n.pcf.gz
 %%FONTDIR%%/ter-712n.pcf.gz
 %%FONTDIR%%/ter-716n.pcf.gz
+%%FONTDIR%%/ter-118b.pcf.gz
+%%FONTDIR%%/ter-118n.pcf.gz
+%%FONTDIR%%/ter-218b.pcf.gz
+%%FONTDIR%%/ter-218n.pcf.gz
+%%FONTDIR%%/ter-518b.pcf.gz
+%%FONTDIR%%/ter-518n.pcf.gz
+%%FONTDIR%%/ter-718b.pcf.gz
+%%FONTDIR%%/ter-718n.pcf.gz
+%%FONTDIR%%/ter-918b.pcf.gz
+%%FONTDIR%%/ter-918n.pcf.gz
+%%FONTDIR%%/ter-c18b.pcf.gz
+%%FONTDIR%%/ter-c18n.pcf.gz
+%%FONTDIR%%/ter-d18b.pcf.gz
+%%FONTDIR%%/ter-d18n.pcf.gz
+%%FONTDIR%%/ter-f18b.pcf.gz
+%%FONTDIR%%/ter-f18n.pcf.gz
+%%FONTDIR%%/ter-g18b.pcf.gz
+%%FONTDIR%%/ter-g18n.pcf.gz
+%%FONTDIR%%/ter-k18b.pcf.gz
+%%FONTDIR%%/ter-k18n.pcf.gz
+%%FONTDIR%%/ter-p18b.pcf.gz
+%%FONTDIR%%/ter-p18n.pcf.gz
+%%FONTDIR%%/ter-u18b.pcf.gz
+%%FONTDIR%%/ter-u18n.pcf.gz
+%%FONTDIR%%/ter-x18b.pcf.gz
+%%FONTDIR%%/ter-x18n.pcf.gz
 @dirrm %%FONTDIR%%